Jelajahi Sumber

[added] willpower to the school, nerd trait and added the traits to certain starts
[changed] variables for the alko trait

julzor 4 tahun lalu
induk
melakukan
caff0671a2

+ 12 - 12
locations/drugs.qsrc

@@ -122,9 +122,9 @@ elseif $ARGS[0] = 'alcohol':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	if $ARGS[1] = 'beer':
-		if alko_trait = -1:
+		if traits['alko_status'] = -1:
 			alko += rand(1,2)
-		elseif alko_trait = 1:
+		elseif traits['alko_status'] = 1:
 			alko += rand(0,1)
 		else
 			alko += 1
@@ -136,11 +136,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra += 10
 		end
-		alko_trait_day += 1
+		traits['alko_day'] += 1
 	elseif $ARGS[1] = 'wine' or $ARGS[1] = 'champagne':
-		if alko_trait = -1:
+		if traits['alko_status'] = -1:
 			alko += 3
-		elseif alko_trait = 1:
+		elseif traits['alko_status'] = 1:
 			alko += 1
 		else
 			alko += 2
@@ -152,11 +152,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra += 10
 		end
-		alko_trait_day += 2
+		traits['alko_day'] += 2
 	elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
-		if alko_trait = -1:
+		if traits['alko_status'] = -1:
 			alko += rand(4,5)
-		elseif alko_trait = 1:
+		elseif traits['alko_status'] = 1:
 			alko += rand(1,2)
 		else
 			alko += 3
@@ -167,11 +167,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra -= 10
 		end
-		alko_trait_day += 3
+		traits['alko_day'] += 3
 	elseif $ARGS[1] = 'moonshine':
-		if alko_trait = -1:
+		if traits['alko_status'] = -1:
 			alko += rand(7,8)
-		elseif alko_trait = 1:
+		elseif traits['alko_status'] = 1:
 			alko += rand(2,3)
 		else
 			alko += 5
@@ -182,7 +182,7 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra -= 10
 		end
-		alko_trait_day += 5
+		traits['alko_day'] += 5
 	else
 		'<br><font color = red>Developer note: The type of alcohol is missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 	end

+ 69 - 39
locations/gschool_lessons1.qsrc

@@ -10,24 +10,34 @@ if $ARGS[0] = 'russian':
 	'You walk into the classroom and take a seat farthest to the right, next to a window. The rest of your fellow classmates walk in one by one. Mr. Yenotin enters the classroom, and just as he is about to close the door, one of your classmates grabs the door from outside the room. Mr. Yenotin turns to the tardy student and informs them that they are late and that next time he will have to report them. This instruction is followed by an awkward wink and the student is allowed in to find a seat.  All the students know that he never reports the tardy students. As everyone settles in Mr. Yenotin does a roll call and opens a grammar book telling you to open your textbooks to where you left off last lesson.'
 	*nl
 	'After a while he tells the students to do the assignments on the last page of the chapter. He starts walking up and down the classroom mostly talking to the students about off topic things like how thier time off was often disrupting them from thier focus. He''s always trying to impress the students with his endeavors but no one really believes what he says because most of it sounds exaggerated or simply not possible. When someone has a real question he''s quick to answer as fair as possible without being arrogant no matter what kind of question it is.'
-	act 'Listen attentively to Mr. Yenotin':
-		*clr & cla
-		grupvalue[4] -= 1
-		grupvalue[3] +=1
-		pcs_grades += rand(0,1)
-		intel_exp += rand(0,1)
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
-		'You listen attentively to Mr. Yenotin for the duration of the class. He managed to make today''s lesson very interesting and informative, and you feel like you have learned something from actively taking part in the discussion.'
-		act 'Ask a question about the lesson':
+	
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Yenotin'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
+			grupvalue[4] -= 1
+			grupvalue[3] +=1
 			pcs_grades += rand(0,1)
-			intel_exp += rand(1,2)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/class1.jpg"></center>'
-			'Mr. Yenotin nods approvingly, happy to see his students engaged in class, trying their best. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+			intel_exp += rand(0,1)
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
+			'You listen attentively to Mr. Yenotin for the duration of the class. He managed to make today''s lesson very interesting and informative, and you feel like you have learned something from actively taking part in the discussion.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				pcs_grades += rand(0,1)
+				intel_exp += rand(1,2)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/class1.jpg"></center>'
+				'Mr. Yenotin nods approvingly, happy to see his students engaged in class, trying their best. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
+			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
+	else
+		act 'Listen attentively to Mr. Yenotin (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	
 	act 'Don''t pay attention in class':
 		*clr & cla
 		pcs_grades -= rand(0,1)
@@ -499,24 +509,34 @@ if $ARGS[0] = 'geography':
 	'You walk into the classroom seeing Mrs. Sokoloff sitting by her desk. The rest of your fellow classmates walk in one by one under the watchful eye of Mrs. Sokoloff. Some of the students get a friendly smile while others get a stern look.'
 	*nl
 	'Without wasting time she sternly tells the class to open the page <<openpage>>. "I hope you all have done your homework." Mrs. Sokoloff is really a take no prisoners kind of teacher, she expects discipline and hard work, the ones able to abide by her rules are treated very kindly.'
-	act 'Listen attentively to Mrs. Sokoloff':
-		*clr & cla
-		grupvalue[4] -=1
-		grupvalue[3] += 1
-		intel_exp += rand(0,1)
-		pcs_grades += rand(0,1)
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
-		'You listen attentively to Mrs. Sokoloff for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
-		act 'Ask a question about the lesson':
+	
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Sokoloff'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
-			intel_exp += rand(1,2)
+			grupvalue[4] -=1
+			grupvalue[3] += 1
+			intel_exp += rand(0,1)
 			pcs_grades += rand(0,1)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
-			'Mrs. Sokoloff nods approvingly, always happy to see her students engaged in her class. She happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
+			'You listen attentively to Mrs. Sokoloff for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				intel_exp += rand(1,2)
+				pcs_grades += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
+				'Mrs. Sokoloff nods approvingly, always happy to see her students engaged in her class. She happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
+			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
+	else
+		act 'Listen attentively to Mrs. Sokoloff (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	
 	act 'Don''t pay attention in class':
 		*clr & cla
 		pcs_grades -= rand(0,1)
@@ -990,24 +1010,34 @@ if $ARGS[0] = 'history':
 	'You walk into the classroom seeing Mrs. Sokoloff sitting by her desk. The rest of your fellow classmates walk in one by one under the watchful eye of Mrs. Sokoloff. Some of the students get a friendly smile while others get a stern look.'
 	*nl
 	'Without wasting time she sternly tells the class to open the page <<openpage>>. "I hope you all have done your homework." Mrs. Sokoloff is really a take no prisoners kind of teacher, she expects discipline and hard work, the ones able to abide by her rules are treated very kindly.'
-	act 'Listen attentively to Mrs. Sokoloff':
-		*clr & cla
-		grupvalue[4] -= 1
-		grupvalue[3] += 1
-		intel_exp += rand(0,1)
-		pcs_grades += rand(0,1)
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
-		'You listen attentively to Mrs. Sokoloff for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
-		act 'Ask a question about the lesson':
+	
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Sokoloff'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
-			intel_exp += rand(1,2)
+			grupvalue[4] -= 1
+			grupvalue[3] += 1
+			intel_exp += rand(0,1)
 			pcs_grades += rand(0,1)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
-			'Mrs. Sokoloff nods approvingly, always happy to see her students engaged in her class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
+			'You listen attentively to Mrs. Sokoloff for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				intel_exp += rand(1,2)
+				pcs_grades += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
+				'Mrs. Sokoloff nods approvingly, always happy to see her students engaged in her class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
+			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
+	else
+		act 'Listen attentively to Mrs. Sokoloff (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	
 	act 'Don''t pay attention in class':
 		*clr & cla
 		pcs_grades -= rand(0,1)

+ 100 - 61
locations/gschool_lessons2.qsrc

@@ -11,30 +11,40 @@ if $ARGS[0] = 'computer':
 	'You go to your computer class and find a seat at one of the computer stations. Before long all of your fellow students file in and takes their seats as well. Once the bell rings Mr. Ivanov takes roll call, you say here when your name is called. With that done, he gets up and starts walking around the room explaining todays lessons. Occasionally stopping to look at the screen of varies students to make sure they are doing it right.'
 	*nl
 	'If he has to correct one of the nerds he will take his time and quietly explain it to them, giving them lots of encouragement. For everyone else he loudly proclaims what you did wrong, drawing attention to how easy this is. He makes sure the whole class knows about their mistake and he does it in a condescending manner, like he is trying to prove to everyone how much smarter he is than you are, or maybe he just wants the others students to make fun of them. With Mr. Ivanov it is hard to tell. He doesn''t seem to approve of anyone but the nerds and harshly grades everyone else.'
-	act 'Listen attentively to Mr. Ivanov':
-		*clr & cla
-		compskl_exp += rand(1,2)
-		intel_exp += rand(0,1)
-		pcs_grades += rand(0,1)
-		grupvalue[4] -= 1
-		grupvalue[3] +=1
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
-		'You listen attentively to Mr. Ivanov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
-		act 'Ask a question about the lesson':
+	
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Ivanov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
-			pcs_grades += rand(0,1)
-			compskl_exp += rand(0,1)
+			compskl_exp += rand(1,2)
 			intel_exp += rand(0,1)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
-			if grupTipe=3:
-				'Mr. Ivanov nods approvingly. He happily spends some extra time explaining the topic again to you, and answers any extra questions you might have. You feel like you learned a lot, thoroughly understanding today''s lessons now.'
-			else
-				'Mr. Ivanov audibly sighs. "Why are you unable to grasp this. I know you are not the smartest student, but this is really very simple. Even a small child should be able to grasp it." He goes on to explain the part you asked about again, but he does so in a completely belittling manner.'
+			pcs_grades += rand(0,1)
+			grupvalue[4] -= 1
+			grupvalue[3] += 1
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
+			'You listen attentively to Mr. Ivanov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				pcs_grades += rand(0,1)
+				compskl_exp += rand(0,1)
+				intel_exp += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
+				if grupTipe=3:
+					'Mr. Ivanov nods approvingly. He happily spends some extra time explaining the topic again to you, and answers any extra questions you might have. You feel like you learned a lot, thoroughly understanding today''s lessons now.'
+				else
+					'Mr. Ivanov audibly sighs. "Why are you unable to grasp this. I know you are not the smartest student, but this is really very simple. Even a small child should be able to grasp it." He goes on to explain the part you asked about again, but he does so in a completely belittling manner.'
+				end
+				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
-	end
+	else
+		act 'Listen attentively to Mr. Ivanov (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end		
+		
 	act 'Don''t pay attention in class':
 		*clr & cla
 		pcs_grades -= rand(0,1)
@@ -516,23 +526,32 @@ if $ARGS[0] = 'science':
 	'You go to your biology class and find a seat at your lab station. Before long all of your fellow students file in and takes their seats as well. Once the bell rings Miss Orlov takes roll call, you say here when your name is called. With that done, she gets up and starts writing on the blackboard, she is wearing a fairly short skirt that nearly rides to high when she reaches up to write at the top of the blackboard. Which the boys often encourage by asking her questions about what ever it is she has written at the top of the blackboard that day.'
 	*nl
 	'She occasionally asks questions of the studens and those that get them right receive heaps of praise. Those that get them wrong, she takes the time to explain why they were wrong and what the correct answer is. Then making sure the student understands, once she is sure the student understands their mistake she moves on with her lesson. She is always quick to help anyone with a problem or answer questions about class, always with that shy smile of hers.'
-	act 'Listen attentively to Miss Orlov':
-		*clr & cla
-		pcs_grades += rand(0,1)
-		grupvalue[4] -= 1
-		grupvalue[3] += 1
-		intel_exp += rand(0,1)
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
-		'You listen attentively to Miss Orlov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
-		act 'Ask a question about the lesson':
+	
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Miss Orlov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			pcs_grades += rand(0,1)
+			grupvalue[4] -= 1
+			grupvalue[3] += 1
 			intel_exp += rand(0,1)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
-			'Miss Orlov nods approvingly. She happily spends some extra time explaining the topic again to you, and answers any extra questions you might have. She only moves on with the lesson once she is sure she has fully answered your question. You feel like you learned a lot, thoroughly understanding today''s lessons now.'
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
+			'You listen attentively to Miss Orlov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				pcs_grades += rand(0,1)
+				intel_exp += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
+				'Miss Orlov nods approvingly. She happily spends some extra time explaining the topic again to you, and answers any extra questions you might have. She only moves on with the lesson once she is sure she has fully answered your question. You feel like you learned a lot, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
+			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
+	else
+		act 'Listen attentively to Miss Orlov (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	act 'Don''t pay attention in class':
 		*clr & cla
@@ -894,28 +913,38 @@ if $ARGS[0] = 'music':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classmusic.jpg"></center>'
 	'You sit in the classroom and listen to Mr Vasilyev go on about how great music is while you wait for class to start. You  do have him one thing, he is always up beat and positive about teaching music and encourages all of his students to take part.'
-	act 'Listen attentively to Mr. Vasilyev':
-		*clr & cla
-		grupvalue[4] -= 1
-		grupvalue[3] += 1
-		pcs_grades += rand(0,1)
-		instrmusic_exp += rand(1,2)
-		vokal_exp += rand(1,2)
-		chrsm_exp += rand(1,2)
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
-		'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned a lot about the history of music and famous artist.'
-		act 'Ask a question about the lesson':
+	
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Vasilyev'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
-			instrmusic_exp += rand(0,1)
-			vokal_exp += rand(0,1)
-			chrsm_exp += rand(0,1)
+			grupvalue[4] -= 1
+			grupvalue[3] += 1
 			pcs_grades += rand(0,1)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classmusic.jpg"></center>'
-			'Mr. Vasilyev smiles, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+			instrmusic_exp += rand(1,2)
+			vokal_exp += rand(1,2)
+			chrsm_exp += rand(1,2)
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
+			'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned a lot about the history of music and famous artist.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				instrmusic_exp += rand(0,1)
+				vokal_exp += rand(0,1)
+				chrsm_exp += rand(0,1)
+				pcs_grades += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classmusic.jpg"></center>'
+				'Mr. Vasilyev smiles, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
+			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
+	else
+		act 'Listen attentively to Mr. Vasilyev (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+		
 	act 'Don''t pay attention in class':
 		*clr & cla
 		pcs_grades -= rand(0,1)
@@ -1374,24 +1403,34 @@ if $ARGS[0] = 'biology':
 	'You go to your biology class and find a seat at your lab station. Before long all of your fellow students file in and takes their seats as well. Once the bell rings Miss Orlov takes roll call, you say here when your name is called. With that done, she gets up and starts walking around the room explaining todays lessons. Occasionally stopping at each lab station to make sure the students are doing the work correctly, she often gives words of encouragement if things are going well or stops and helps the student understand what they are doing wrong.'
 	*nl
 	'She occasionally asks questions and those that get them right, she heaps praise upon them. Those that get them wrong, she takes the time to explain why they were wrong and what the correct answer is. Then making sure the student understands, once she is sure the student understands their mistake she moves on with her lesson. She is always quick to help anyone with a problem or answer questions about class, always with that shy smile of hers.'
-	act 'Listen attentively to Miss Orlov':
-		*clr & cla
-		grupvalue[4] -= 1
-		grupvalue[3] += 1
-		intel_exp += rand(0,1)
-		pcs_grades += rand(0,1)
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
-		'You listen attentively to Miss Orlov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
-		act 'Ask a question about the lesson':
+	
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+		act 'Listen attentively to Miss Orlov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
-			intel_exp += rand(1,2)
+			grupvalue[4] -= 1
+			grupvalue[3] += 1
+			intel_exp += rand(0,1)
 			pcs_grades += rand(0,1)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
-			'Miss Orlov nods approvingly. She happily spends some extra time explaining the topic again to you, and answers any extra questions you might have. She only moves on with the lesson once she is sure she has fully answered your question. You feel like you learned a lot, thoroughly understanding today''s lessons now.'
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
+			'You listen attentively to Miss Orlov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				intel_exp += rand(1,2)
+				pcs_grades += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
+				'Miss Orlov nods approvingly. She happily spends some extra time explaining the topic again to you, and answers any extra questions you might have. She only moves on with the lesson once she is sure she has fully answered your question. You feel like you learned a lot, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
+			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
+	else
+		act 'Listen attentively to Miss Orlov (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	
 	act 'Don''t pay attention in class':
 		*clr & cla
 		pcs_grades -= rand(0,1)

+ 91 - 62
locations/gschool_lessons3.qsrc

@@ -11,44 +11,54 @@ if $ARGS[0] = 'literature':
 	'"She''s always piling on the work and expects everyone to have it finished by the end of class." You overhear a girl complain with a heavy sigh.'
 	*nl
 	'Clearing her throat, Ms. Braakman raises her voice to speak over the noise, "The sooner everyone takes out their textbooks, the quicker we can get started. Who knows, maybe we''ll finish early and you''ll have some free time." Hearing this, the room settles down and soon the lesson begins.'
-	act 'Listen attentively':
-		*clr & cla
-		grupvalue[4] -=1
-		grupvalue[3] += 1
-		pcs_grades += rand(0,1)
-		intel_exp += rand(0,1)
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
-		*nl
-		'Obediently, you open your textbook and start following along, even taking notes when you need to. Eventually, Ms. Braakman stops reading the passages herself and starts looking for volunteers to read.'
-		act 'Volunteer to read':gt 'gschool_lessonsev3', 'reading'
-		act 'Avoid being chosen':
+	
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:
+		act 'Listen attentively'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
-			$boy = 'A'+str( val($mid(' 004 140 156 157 144 006 152 159 145',4*rand(0,8)+2,3)))
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work.jpg"></center>'
-			'You keep your head down and pretend to be deep in thought as Ms. Braakman scans the rooms for a moment. Luckily, she stops and points to someone else in the class. "Please read the next passage."'
+			grupvalue[4] -=1
+			grupvalue[3] += 1
+			pcs_grades += rand(0,1)
+			intel_exp += rand(0,1)
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
 			*nl
-			if $boy = 'A4':
-				'You watch Igor sink lower into his seat; apparently he was also trying to hide. Reluctantly, he quietly starts to read the passage, but Ms. Braakman interrupts to remind him to speak clearly. Some kids start to snicker and whisper to each other, causing Igor to awkwardly clear his throat before continuing. By the time he''s finished reading, his cheeks are colored a rosy red and he refuses to look up from his desk for the rest of the class.'
-			elseif $boy = 'A140':
-				'Upon being called on, Lizaveta quickly hides her phone under her desk, an innocent smile gracing her face as Ms. Braakman glares at her. "Uh...what page are we on?" she asks with a nervous chuckle. There''s a few scattered laughs, but Ms. Braakman quickly silences the room. A nearby girl points out the right page number and paragraph, and with a smile Lizaveta starts reading as if nothing happened.'
-			elseif $boy = 'A156':
-				'"Give me a fucking break..." Arkadi mutters under his breath. Either Ms. Braakman didn''t hear him, or she''s choosing to avoid confrontation with the gopnik since she continues to wait in silence. Realizing there''s no avoiding this, Arkadi clears his throat and begins reading; his voice is flat and at times he pretends not to be able to pronounce a word just to annoy the teacher. Fed up with his antics, Ms. Braakman cuts him off, sarcastically thanks him for reading and quickly chooses a more competent student. With a triumphant smile, the gopnik closes his book and relaxes into his seat.'
-			elseif $boy = 'A157':
-				'Roman scoffs, "Fuck that." He says nonchalantly. You can feel the tension growing as Ms. Braakman narrows her eyes and tells him again to read, only to be met with a taunting smile and silent defiance from the gopnik. After what feels like an eternity, Ms. Braakman chooses a different student and continues on with the lesson like nothing ever happened.'
-			elseif $boy = 'A144':
-				'Anushka throws her head back and sighs dramatically. "The quicker you read, the sooner this will be over." Ms. Braakman insists. Hearing this, Anushka straightens up and starts to read, taking Ms. Braakman''s comment literally and speaking so fast that you can barely understand her.'
-			elseif $boy = 'A6':
-				'Obediently, Petka reads the passage and does so without any mistakes. "It''s always a pleasure to hear you read, Petka. If only your fellow students took their studies as seriously as you." Ms. Braakman compliments. Petka smiles slightly, but you can tell that he doesn''t like being openly complimented by the teacher, especially when students start to groan and call him a teacher''s pet.'
-			elseif $boy = 'A152':
-				'You watch Feofan frantically hide the comic book he was secretly reading before trying to find the right passage to read. "Save the cartoons for after class." Ms. Braakman warns. Feofan starts to correct her, but the laughter from the other students silences him.'
-			elseif $boy = 'A159':
-				'"Can''t you pick someone else?" Petia asks, slumping back into his seat. "I don''t even know what page we''re on." He garners a few laughs, but Ms. Braakman is quick to reprimand him, reminding him that if he keeps this up he''ll end up in detention and fail her class.'
-			elseif $boy = 'A145':
-				'You look over to see Ekaterina has her head down, presumably asleep. Again, Ms. Braakman asks her to read but the gopnik doesn''t respond. "We can always continue the lesson during detention." She threatens. After a moment, Ekaterina slowly sits up and lazily stretches before asking a nearby student for the page number and reading as instructed.'
+			'Obediently, you open your textbook and start following along, even taking notes when you need to. Eventually, Ms. Braakman stops reading the passages herself and starts looking for volunteers to read.'
+			act 'Volunteer to read':gt 'gschool_lessonsev3', 'reading'
+			act 'Avoid being chosen':
+				*clr & cla
+				$boy = 'A'+str( val($mid(' 004 140 156 157 144 006 152 159 145',4*rand(0,8)+2,3)))
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work.jpg"></center>'
+				'You keep your head down and pretend to be deep in thought as Ms. Braakman scans the rooms for a moment. Luckily, she stops and points to someone else in the class. "Please read the next passage."'
+				*nl
+				if $boy = 'A4':
+					'You watch Igor sink lower into his seat; apparently he was also trying to hide. Reluctantly, he quietly starts to read the passage, but Ms. Braakman interrupts to remind him to speak clearly. Some kids start to snicker and whisper to each other, causing Igor to awkwardly clear his throat before continuing. By the time he''s finished reading, his cheeks are colored a rosy red and he refuses to look up from his desk for the rest of the class.'
+				elseif $boy = 'A140':
+					'Upon being called on, Lizaveta quickly hides her phone under her desk, an innocent smile gracing her face as Ms. Braakman glares at her. "Uh...what page are we on?" she asks with a nervous chuckle. There''s a few scattered laughs, but Ms. Braakman quickly silences the room. A nearby girl points out the right page number and paragraph, and with a smile Lizaveta starts reading as if nothing happened.'
+				elseif $boy = 'A156':
+					'"Give me a fucking break..." Arkadi mutters under his breath. Either Ms. Braakman didn''t hear him, or she''s choosing to avoid confrontation with the gopnik since she continues to wait in silence. Realizing there''s no avoiding this, Arkadi clears his throat and begins reading; his voice is flat and at times he pretends not to be able to pronounce a word just to annoy the teacher. Fed up with his antics, Ms. Braakman cuts him off, sarcastically thanks him for reading and quickly chooses a more competent student. With a triumphant smile, the gopnik closes his book and relaxes into his seat.'
+				elseif $boy = 'A157':
+					'Roman scoffs, "Fuck that." He says nonchalantly. You can feel the tension growing as Ms. Braakman narrows her eyes and tells him again to read, only to be met with a taunting smile and silent defiance from the gopnik. After what feels like an eternity, Ms. Braakman chooses a different student and continues on with the lesson like nothing ever happened.'
+				elseif $boy = 'A144':
+					'Anushka throws her head back and sighs dramatically. "The quicker you read, the sooner this will be over." Ms. Braakman insists. Hearing this, Anushka straightens up and starts to read, taking Ms. Braakman''s comment literally and speaking so fast that you can barely understand her.'
+				elseif $boy = 'A6':
+					'Obediently, Petka reads the passage and does so without any mistakes. "It''s always a pleasure to hear you read, Petka. If only your fellow students took their studies as seriously as you." Ms. Braakman compliments. Petka smiles slightly, but you can tell that he doesn''t like being openly complimented by the teacher, especially when students start to groan and call him a teacher''s pet.'
+				elseif $boy = 'A152':
+					'You watch Feofan frantically hide the comic book he was secretly reading before trying to find the right passage to read. "Save the cartoons for after class." Ms. Braakman warns. Feofan starts to correct her, but the laughter from the other students silences him.'
+				elseif $boy = 'A159':
+					'"Can''t you pick someone else?" Petia asks, slumping back into his seat. "I don''t even know what page we''re on." He garners a few laughs, but Ms. Braakman is quick to reprimand him, reminding him that if he keeps this up he''ll end up in detention and fail her class.'
+				elseif $boy = 'A145':
+					'You look over to see Ekaterina has her head down, presumably asleep. Again, Ms. Braakman asks her to read but the gopnik doesn''t respond. "We can always continue the lesson during detention." She threatens. After a moment, Ekaterina slowly sits up and lazily stretches before asking a nearby student for the page number and reading as instructed.'
+				end
+				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
+	else
+		act 'Listen attentively (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	
 	act'Daydream':
 		*clr & cla
 		pcs_grades -= rand(0,1)
@@ -436,26 +446,36 @@ if $ARGS[0] = 'art':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classart.jpg"></center>'
 	'You sit in the classroom and listen to Mr Vasilyev go on about how great art is, you will give him one thing. He is always up beat and positive about teaching art and encourages all of his students to take part.'
-	act 'Listen attentively to Mr. Vasilyev':
-		*clr & cla
-		grupvalue[4] -= 1
-		grupvalue[3] += 1
-		pcs_grades += rand(0,1)
-		artslks_exp += rand(1,2)
-		agil_exp += rand(0,1)
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
-		'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned a lot about the history of art and famous artist.'
-		act 'Ask a question about the lesson':
+	
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:
+		act 'Listen attentively to Mr. Vasilyev'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
-			artslks_exp += rand(0,1)
-			agil_exp += rand(0,1)
+			grupvalue[4] -= 1
+			grupvalue[3] += 1
 			pcs_grades += rand(0,1)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
-			'Mr. Vasilyev smiles, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+			artslks_exp += rand(1,2)
+			agil_exp += rand(0,1)
+					if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
+			'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned a lot about the history of art and famous artist.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				artslks_exp += rand(0,1)
+				agil_exp += rand(0,1)
+				pcs_grades += rand(0,1)
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
+				'Mr. Vasilyev smiles, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
+			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'art'
+	else
+		act 'Listen attentively to Mr. Vasilyev (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	
 	act 'Don''t pay attention in class':
 		*clr & cla
 		pcs_grades -= rand(0,1)
@@ -980,28 +1000,37 @@ if $ARGS[0] = 'shop':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classshop.jpg"></center>'
 	'You sit in the classroom and listen to the monotonous droning of your teacher, doing your best not to fall asleep.'
-	act 'Listen attentively to Mr. Kuznetsov':
-		*clr & cla
-		grupvalue[4] -= 1
-		grupvalue[3] += 1
-		pcs_grades += rand(0,1)
-		hndiwrk_exp += rand(1,2)
-		agil_exp += rand(0,1)
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
-		'You listen attentively to Mr. Kuznetsov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
-		act 'Ask a question about the lesson':
+	
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:		
+		act 'Listen attentively to Mr. Kuznetsov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
+			grupvalue[4] -= 1
+			grupvalue[3] += 1
 			pcs_grades += rand(0,1)
 			hndiwrk_exp += rand(1,2)
 			agil_exp += rand(0,1)
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/class1.jpg"></center>'
-			'Mr. Kuznetsov nods approvingly, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
+			'You listen attentively to Mr. Kuznetsov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
+			act 'Ask a question about the lesson':
+				*clr & cla
+				pcs_grades += rand(0,1)
+				hndiwrk_exp += rand(1,2)
+				agil_exp += rand(0,1)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/class1.jpg"></center>'
+				'Mr. Kuznetsov nods approvingly, always happy to see his students engaged in his class. He happily spends some extra time explaining the topic again, and answers any extra questions you might have. You feel smarter, thoroughly understanding today''s lessons now.'
+				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
+			end
 			act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
 		end
-		act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'shop'
+	else
+		 act 'Listen attentively to Mr. Kuznetsov (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
+	
 	act 'Don''t pay attention in class':
 		*clr & cla
 		pcs_grades -= rand(0,1)

+ 132 - 116
locations/gschool_lessons4.qsrc

@@ -80,25 +80,32 @@ if $ARGS[0] = 'math':
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
 	else
-		act 'Focus on your school work':
-			*clr & cla
-			grupvalue[4] -= 1
-			grupvalue[3] +=1
-			pcs_grades += rand(0,1)
-			intel_exp += rand(0,1)
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
-			'You carefully follow today''s lesson trying to take in as much as possible.'
-			act 'Ask a question about the lesson':
+		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+		if traits['nerd_status'] = 2: will_cost = will_cost / 2
+		if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+			act 'Focus on your school work'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 				*clr & cla
+				grupvalue[4] -= 1
+				grupvalue[3] +=1
 				pcs_grades += rand(0,1)
-				intel_exp += rand(1,2)
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/class1.jpg"></center>'
-				'You take a second to ask a question about a part of the lesson that you don''t fully understand and Mr. Tsarev nods approvingly then says, "Sure thing, we can over the solution again and I will show you the many ways that you can find the solution to these problems." Anatoly happily spends some time explaining the topic in greater detail, and answers any questions you might have, teaching you some new ways of solving many problems, in the process.'
-				*nl
+				intel_exp += rand(0,1)
+				if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
+				'You carefully follow today''s lesson trying to take in as much as possible.'
+				act 'Ask a question about the lesson':
+					*clr & cla
+					pcs_grades += rand(0,1)
+					intel_exp += rand(1,2)
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/class1.jpg"></center>'
+					'You take a second to ask a question about a part of the lesson that you don''t fully understand and Mr. Tsarev nods approvingly then says, "Sure thing, we can over the solution again and I will show you the many ways that you can find the solution to these problems." Anatoly happily spends some time explaining the topic in greater detail, and answers any questions you might have, teaching you some new ways of solving many problems, in the process.'
+					*nl
+					act 'Wait for the end of the lesson': gt 'gschool_lessonsev2', 'math'
+				end
 				act 'Wait for the end of the lesson': gt 'gschool_lessonsev2', 'math'
 			end
-			act 'Wait for the end of the lesson': gt 'gschool_lessonsev2', 'math'
+		else
+			act 'Focus on your school work (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 
 		act'Daydream':
@@ -383,119 +390,128 @@ if $ARGS[0] = 'english':
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
 	else
-		act 'Listen attentively':
-			*clr & cla
-			grupvalue[4] -=1
-			grupvalue[3] += 1
-			pcs_grades += rand(0,1)
-			intel_exp += rand(0,1)
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
-			*nl
-			'You actively take part in the lesson, raising your hand to answer questions, following along in your textbook, and working quietly on the worksheets when given them.'
-			act 'Keep working':
+		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+		if traits['nerd_status'] = 2: will_cost = will_cost / 2
+		if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
+			act 'Listen attentively'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 				*clr & cla
-				grupvalue[3] +=1
+				grupvalue[4] -=1
+				grupvalue[3] += 1
 				pcs_grades += rand(0,1)
-				intel_exp += rand(1,2)
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
-				'Unlike most of the students in your class, you stay focused on your work.'
-				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'working'
-			end
-			act 'Talk to someone':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				pcs_grades -= rand(0,1)
-				'You tell yourself that you''ve worked long enough and deserve a break. Looking around the room, you decide to talk to...'
-				act 'Vicky':
-					*clr & cla
-					pcs_mood += 10
-					chrsm_exp += rand(1,2)
-					npc_rel['A15'] += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkgirl' + rand(1,3) + '.jpg"></center>'
-					'"I saw this video of an American girl dancing all sexy and stuff, and I''m thinking of learning the dance. Next time I go to the community center, I''ll show up all the girls and steal their boyfriends!" she jokes with a playful smile, but you notice a wicked twinkle in her eyes.'
-					*nl
-					'Vicky''s bubbly personality makes her easy and fun to talk to, and you end up spending the rest of class smiling and laughing with her.'
-					act 'Finish class': gt 'gschool_lessons', 'short_break'
-				end
-				act 'Lena':
-					*clr & cla
-					chrsm_exp += rand(1,2)
-					npc_rel['A20'] += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkgirl' + rand(1,3) + '.jpg"></center>'
-					'Lena sighs heavily, "Fuck, what''s taking her so long?"'
-					*nl
-					'"Who are you waiting for?" you ask.'
-					*nl
-					'"Lera! She had to go take a piss but she''s taking forever," she snaps back. "Her tongue probably needed a break anyways..." she mumbles quietly after a moment, a small smile spreading across her face.'
-					act 'Finish class': gt 'gschool_lessons', 'short_break'
-				end
-				act 'Lera':
-					*clr & cla
-					chrsm_exp += rand(1,2)
-					npc_rel['A21'] += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkgirl' + rand(1,3) + '.jpg"></center>'
-					'"It''s hard enough having my dad as a teacher at school, but now that freak Lesco is living with us." Lera spends the rest of class talking about all the awkward run-ins she''s had with her dad in school, and how she and Lena had to beat the shit out of anyone that tried spreading weird rumors about her being "close" to her cousin Lesco.'
-					act 'Finish class': gt 'gschool_lessons', 'short_break'
-				end
-				act 'Radomir':
-					*clr & cla
-					chrsm_exp += rand(1,2)
-					npc_rel['A154'] += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkboy' + rand(1,3) + '.jpg"></center>'
-					'You try talking to Radomir, but it''s hard to get a word in with how hard he''s stroking his own ego. "You should have heard me last night, I killed it. You should come hear us play. Everyone thinks we''re amazing, especially the girls. I know you''ll love it, too," he says with a wink. He keeps saying "we" a lot to refer to the rest of the band, but something tells you he''s still talking about himself.'
-					act 'Finish class': gt 'gschool_lessons', 'short_break'
-				end
-				act 'Ivan':
-					*clr & cla
-					chrsm_exp += rand(1,2)
-					npc_rel['A3'] += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkboy' + rand(1,3) + '.jpg"></center>'
-					'With a confident smile, Ivan starts to tell you about a recent match he had at the community center. "This kid I''ve never seen before comes up to me and starts talking shit, saying my form is bad and that I couldn''t hit someone even if they were standing still right in front of me," he says with a scoff. "I told him to put his money where his mouth is and get in the ring, and guess what happened?"'
-					*nl
-					'"You beat the crap out of him?" You say with a smile.'
-					*nl
-					'Ivan laughs and you can see his chest puff out slightly. "Of course! The best part is that his girlfriend was there to see it happen, and while he was lying on the mat knocked out, she gave me her number."'
-					act 'Finish class': gt 'gschool_lessons', 'short_break'
-				end
-				act 'Bella':
+				intel_exp += rand(0,1)
+				if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+				gs 'stat'				
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
+				*nl
+				'You actively take part in the lesson, raising your hand to answer questions, following along in your textbook, and working quietly on the worksheets when given them.'
+				act 'Keep working':
 					*clr & cla
-					chrsm_exp += rand(1,2)
-					npc_rel['A22'] += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkgirl' + rand(1,3) + '.jpg"></center>'
-					'"God, this place is more like a daycare than a high school." Bella says, scoffing in disgust. A moment later, a group of kids start talking and laughing loud enough to disrupt the class. "See what I mean?" she adds as she rolls her eyes. "They''re practically adults but they act so childish. I hate it. They need to act their age, like I do."'
-					act 'Finish class': gt 'gschool_lessons', 'short_break'
+					grupvalue[3] +=1
+					pcs_grades += rand(0,1)
+					intel_exp += rand(1,2)
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/ask.jpg"></center>'
+					'Unlike most of the students in your class, you stay focused on your work.'
+					act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'working'
 				end
-				act 'Veronika':
+				act 'Talk to someone':
 					*clr & cla
-					chrsm_exp += rand(1,2)
-					npc_rel['A141'] += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkgirl' + rand(1,3) + '.jpg"></center>'
-					'You try talking to Veronika, but she has little to say, which is no surprise; she''s always been standoffish. Still, she doesn''t outright tell you to leave you alone, so you take it as a sign that she''s okay with listening to you talk.'
-					act 'Finish class': gt 'gschool_lessons', 'short_break'
-				end
-				if npc_grupTipe['A189'] = 4:
-					act 'Niko':
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
+					pcs_grades -= rand(0,1)
+					'You tell yourself that you''ve worked long enough and deserve a break. Looking around the room, you decide to talk to...'
+					act 'Vicky':
 						*clr & cla
+						pcs_mood += 10
 						chrsm_exp += rand(1,2)
-						gs 'stat'
-						'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-						if NikoPayback > 0:
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-							'As you approach Niko, he sneers at you before saying, "What do you want?" You carefully reply with, "Hey I just want to talk." Scoffs then says, "Fine, why not?" You and Niko spend the next few minutes having a strained conversation until the end of the period.'
-						elseif NikoVolkovQW >= 5:
-							npc_rel['A189'] += 2
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-							'As you approach Niko, he gives you a warm smile before saying, "My princess graces with me with her presence. How can be of assistance?" You giggle before replying, "I have spare time and I can''t think of a better use of my time then spending it with you." Niko chuckles then grabs onto your hand, lifting it toward his face and giving it a soft kiss before saying, "Your wish is my command." You both the next few minutes chatting while exchanging loving glares until the end of the period.'
-						else
-							npc_rel['A189'] += 1
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-							'As you approach Niko, he gives you a warm smile before saying, "Ahh a lovely princess decides to grace me with her presence. How can I be of assistance?" You giggle before replying, "You''re so weird, I just want to chat for a bit okay?" Niko chuckles then grabs onto your hand, lifting it toward his face and giving it a soft kiss before saying, "Your wish is my command." You both begin chatting until the end of the period.'
-						end
+						npc_rel['A15'] += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkgirl' + rand(1,3) + '.jpg"></center>'
+						'"I saw this video of an American girl dancing all sexy and stuff, and I''m thinking of learning the dance. Next time I go to the community center, I''ll show up all the girls and steal their boyfriends!" she jokes with a playful smile, but you notice a wicked twinkle in her eyes.'
+						*nl
+						'Vicky''s bubbly personality makes her easy and fun to talk to, and you end up spending the rest of class smiling and laughing with her.'
+						act 'Finish class': gt 'gschool_lessons', 'short_break'
+					end
+					act 'Lena':
+						*clr & cla
+						chrsm_exp += rand(1,2)
+						npc_rel['A20'] += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkgirl' + rand(1,3) + '.jpg"></center>'
+						'Lena sighs heavily, "Fuck, what''s taking her so long?"'
+						*nl
+						'"Who are you waiting for?" you ask.'
+						*nl
+						'"Lera! She had to go take a piss but she''s taking forever," she snaps back. "Her tongue probably needed a break anyways..." she mumbles quietly after a moment, a small smile spreading across her face.'
 						act 'Finish class': gt 'gschool_lessons', 'short_break'
 					end
+					act 'Lera':
+						*clr & cla
+						chrsm_exp += rand(1,2)
+						npc_rel['A21'] += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkgirl' + rand(1,3) + '.jpg"></center>'
+						'"It''s hard enough having my dad as a teacher at school, but now that freak Lesco is living with us." Lera spends the rest of class talking about all the awkward run-ins she''s had with her dad in school, and how she and Lena had to beat the shit out of anyone that tried spreading weird rumors about her being "close" to her cousin Lesco.'
+						act 'Finish class': gt 'gschool_lessons', 'short_break'
+					end
+					act 'Radomir':
+						*clr & cla
+						chrsm_exp += rand(1,2)
+						npc_rel['A154'] += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkboy' + rand(1,3) + '.jpg"></center>'
+						'You try talking to Radomir, but it''s hard to get a word in with how hard he''s stroking his own ego. "You should have heard me last night, I killed it. You should come hear us play. Everyone thinks we''re amazing, especially the girls. I know you''ll love it, too," he says with a wink. He keeps saying "we" a lot to refer to the rest of the band, but something tells you he''s still talking about himself.'
+						act 'Finish class': gt 'gschool_lessons', 'short_break'
+					end
+					act 'Ivan':
+						*clr & cla
+						chrsm_exp += rand(1,2)
+						npc_rel['A3'] += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkboy' + rand(1,3) + '.jpg"></center>'
+						'With a confident smile, Ivan starts to tell you about a recent match he had at the community center. "This kid I''ve never seen before comes up to me and starts talking shit, saying my form is bad and that I couldn''t hit someone even if they were standing still right in front of me," he says with a scoff. "I told him to put his money where his mouth is and get in the ring, and guess what happened?"'
+						*nl
+						'"You beat the crap out of him?" You say with a smile.'
+						*nl
+						'Ivan laughs and you can see his chest puff out slightly. "Of course! The best part is that his girlfriend was there to see it happen, and while he was lying on the mat knocked out, she gave me her number."'
+						act 'Finish class': gt 'gschool_lessons', 'short_break'
+					end
+					act 'Bella':
+						*clr & cla
+						chrsm_exp += rand(1,2)
+						npc_rel['A22'] += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkgirl' + rand(1,3) + '.jpg"></center>'
+						'"God, this place is more like a daycare than a high school." Bella says, scoffing in disgust. A moment later, a group of kids start talking and laughing loud enough to disrupt the class. "See what I mean?" she adds as she rolls her eyes. "They''re practically adults but they act so childish. I hate it. They need to act their age, like I do."'
+						act 'Finish class': gt 'gschool_lessons', 'short_break'
+					end
+					act 'Veronika':
+						*clr & cla
+						chrsm_exp += rand(1,2)
+						npc_rel['A141'] += 1
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkgirl' + rand(1,3) + '.jpg"></center>'
+						'You try talking to Veronika, but she has little to say, which is no surprise; she''s always been standoffish. Still, she doesn''t outright tell you to leave you alone, so you take it as a sign that she''s okay with listening to you talk.'
+						act 'Finish class': gt 'gschool_lessons', 'short_break'
+					end
+					if npc_grupTipe['A189'] = 4:
+						act 'Niko':
+							*clr & cla
+							chrsm_exp += rand(1,2)
+							gs 'stat'
+							'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+							if NikoPayback > 0:
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
+								'As you approach Niko, he sneers at you before saying, "What do you want?" You carefully reply with, "Hey I just want to talk." Scoffs then says, "Fine, why not?" You and Niko spend the next few minutes having a strained conversation until the end of the period.'
+							elseif NikoVolkovQW >= 5:
+								npc_rel['A189'] += 2
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
+								'As you approach Niko, he gives you a warm smile before saying, "My princess graces with me with her presence. How can be of assistance?" You giggle before replying, "I have spare time and I can''t think of a better use of my time then spending it with you." Niko chuckles then grabs onto your hand, lifting it toward his face and giving it a soft kiss before saying, "Your wish is my command." You both the next few minutes chatting while exchanging loving glares until the end of the period.'
+							else
+								npc_rel['A189'] += 1
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
+								'As you approach Niko, he gives you a warm smile before saying, "Ahh a lovely princess decides to grace me with her presence. How can I be of assistance?" You giggle before replying, "You''re so weird, I just want to chat for a bit okay?" Niko chuckles then grabs onto your hand, lifting it toward his face and giving it a soft kiss before saying, "Your wish is my command." You both begin chatting until the end of the period.'
+							end
+							act 'Finish class': gt 'gschool_lessons', 'short_break'
+						end
+					end
 				end
 			end
+		else
+			 act 'Listen attentively (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
+		
 		act'Daydream':
 			*clr & cla
 			pcs_grades -= rand(0,1)

+ 15 - 0
locations/preSYS.qsrc

@@ -602,6 +602,9 @@ if $ARGS[0] = 'nerdqueen':
 	'While you love all things nerdy or geeky, what you love the most is hanging out with your fellow nerds and doing nerdy things together. This has made you fairly social for a nerd and more general in your areas of knowledge. As you got older and started to develop as a girl, it also made you much more aware of your sexuality than most nerds are comfortable with. As such, you cultivated that awareness more than most and are now more at ease with your body than most of the other nerds. By the usual nerd standards you are confident, dynamic, and attractive. This has lead to you being the leader of your group of friends, and you are more acceptable to other social groups as a result, especially the cool kids who seem to respect your social skills and looks.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
+		traits['nerd_points'] = 50
+		traits['nerd_status'] = 1
+		traits['nerd_lernHome'] = 5
 		gs 'preSYS', 'nerd'
 		alterstrtimg = 8
 		pcs_intel = 40
@@ -645,6 +648,9 @@ if $ARGS[0] = 'goodstudent':
 	'You just love school, and your grades are more than good enough to attend the university of your choosing after graduation - all you have to do is not let your grades slip. You have always tried to absorb every bit of knowledge possible and have done everything you could to excel in school. While this attitude has gained you a lot of respect from the other nerds, it did not earn you a lot of friends and you never found the time for sports. You are often asked to be a tutor and sometimes find yourself forced to do others'' homework for them. You have excellent grades, and your mother is very proud of you. She has shown her appreciation for your hard work by rewarding you with money.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
+		traits['nerd_points'] = 70
+		traits['nerd_status'] = 2
+		traits['nerd_lernHome'] = 5
 		gs 'preSYS', 'nerd'
 		alterstrtimg = 9
 		if glass < 1 : glass = 1
@@ -668,6 +674,7 @@ if $ARGS[0] = 'computergeek':
 	'You were always into computers, whether it be by playing video games, taking computers apart, or learning programing and even hacking. You love everything about computers, but this passion left you little time to make friends - real-life friends, at least. You have managed to befriend many online players that you talk to while you play various video games, however, and you rarely spend any time outdoors, nor money on clothes or other girly stuff. You are far more interested in saving your money for a better computer in order to play even better games. You have considered hosting a web series of video games or vlogs - you even took the time to learn how to video edit - but you aren’’t sure if you want to put yourself out there like that.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
+		traits['nerd_points'] = 30
 		gs 'preSYS', 'nerd'
 		alterstrtimg = 10
 		if glass < 1 : glass = 1
@@ -696,6 +703,7 @@ if $ARGS[0] = 'chessplayer':
 	'You were always into chess as a child, and you have studied all the great chess masters. You can even name them all as well as their favorite strategies! You find nothing more interesting than matching your wits against someone else’’s in a game of chess. It has left you with the ability to often see the consequences of your actions better than most as you are used to looking several moves ahead. All of this has left you with little time to make many friends, and you rarely spend any time outdoors.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
+		traits['nerd_points'] = 30
 		gs 'preSYS', 'nerd'
 		alterstrtimg = 11
 		pcs_intel = 55
@@ -1065,6 +1073,7 @@ if $ARGS[0] = 'troublemaker':
 	'You are a troublemaker. Nothing makes you happier than causing problems, whether it be petty larceny, getting into fights, or vandalizing. You live for the thrill of breaking the rules. You get along fairly well with the gopniks and they accept you as a kindred spirit. They seem to love your willingness to jump head first into any and all trouble you run across - and if you can''t find any, you will happily make your own, which keeps things lively. Because of your behavior, you have problems at home and school. This is especially true with your mother and stepfather, who see you going down the wrong path. The teachers and the police all know who you are.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
+		traits['nerd_points'] = -50
 		gs 'preSYS', 'gopnik'
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, -10, 0, -10, 0
 		alterstrtimg = 19
@@ -1108,6 +1117,7 @@ if $ARGS[0] = 'vitekgf':
 	'As you developed, he started to take an interest in you as well. Soon thereafter the two of you started dating. You’’re not technically a gopnik - you are considered more of a wanna-be - but the rest of the gopniks seem to accept you anyways. You’’re not sure what would happen if you ever broke up with <<$npc_nickname[''A9'']>>, however, as being his girlfriend and hanging out with the other gopniks has cost you any real, close friends outside of their group.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
+		traits['nerd_points'] = -10
 		gs 'preSYS', 'gopnik'
 		alterstrtimg = 20
 		pcs_sprt = 30
@@ -1173,6 +1183,7 @@ if $ARGS[0] = 'alternative':
 	'Unlike the gopniks, you have far less interest in fighting or causing problems and a far more interest in looking for a good time - you love to party more than anything else. The cool kids don''t completely look down their nose at you, even if they don''t aprove or you clothes, they respect your love of looking nice and having a good time. Because of your behavior, you have problems at home and school. This is especially true with your mother and stepfather, who see you going down the wrong path.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
+		traits['nerd_points'] = -20
 		gs 'preSYS', 'gopnik'
 		alterstrtimg = 21
 		pcs_vital = 40
@@ -1309,6 +1320,9 @@ if $ARGS[0] = 'goodgirl':
 	'You are a good girl, the kind parents, teachers and adults love, but the other kids hate. You always reminded the teacher to give out homework and you would tell on anyone for doing anything. You love the attention you get from adults, and while at times it can be lonely you are still pretty happy knowing you''re a good girl. You also regularly attend church just like any good girl should. The nerds seem to tolerate you the most, you suppose because they almost never misbehave and always do their homework anyways.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
+		traits['nerd_points'] = 100
+		traits['nerd_status'] = 3
+		traits['nerd_lernHome'] = 5
 		gs 'preSYS', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -5, -5, 0, -20, 0, 0
 		alterstrtimg = 24
@@ -1425,6 +1439,7 @@ if $ARGS[0] = 'goth':
     'You are the school''s resident Goth. The Dark Temptress that all the boys secretly dream of, weaver of bad poetry and suicide covenants... Yep, people have too much imagination. Most adults think that you are going to sacrifice their children, everyone seems to think you are going to sacrifice someone or commit suicide. The school''s kids aren''t better, with the so-called "cool girls" leading an ostracism campaign against you... Sigh... Fortunately, not everyone is a brainwashed sheep happily following all along, a few think for themselves. The nerds like your reading proclivity and that you are into some of the same things they are; you think they might even invite you to their game one day. A couple of the Gopniks like your party attitude, specifically the kids in the band Pizdá Buysto seem to respect your artistic disposition. Or maybe their lead singer just wants to get in your panties, it''s hard to tell.'
     act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
+		traits['nerd_points'] = -10
 		gs 'preSYS', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -20, -10, 0, -10, 0, -10
 		gs 'npc_relationship', 'socialgroup_setting_boys', +5, +5, +5, +5, +5, +5

+ 14 - 0
locations/saveupdater.qsrc

@@ -897,5 +897,19 @@ killvar 'oluuosegunday_count'
 killvar 'oluuosegunday_day'
 !! ----- Mom, Luda & Olu stuff ----- 0.8.0
 
+!!trait update
+if traits['update_1'] = 0:
+	traits['update_1'] = 1
+	
+	traits['alko_day'] = alko_trait_day 
+	traits['alko_points'] = alko_trait_counter
+	traits['alko_status'] = alko_trait
+	
+	killvar 'alko_trait_day'
+	killvar 'alko_trait_counter'
+	killvar 'alko_trait'
+end
+
+
 --- saveupdater ---------------------------------
 

+ 12 - 11
locations/stol.qsrc

@@ -119,17 +119,20 @@ if $ARGS[0] = 'stolPar':
 	if steroid_have > 0: '<a href="exec:dynamic $use_steroids & gt ''stol'', ''stolPar''"><b>Take steroids.</b></a> Uses left: <<steroid_have>>.'
 	if aphrodisiac_have > 0: '<a href="exec:dynamic $use_aphrodisiac & gt ''stol'', ''stolPar''"><b>Chew aphrodisiac gum.</b></a> Uses left: <<aphrodisiac_have>>.'
 	
-	gs 'willpower', 'misc', 'self', iif((pcs_grades < 50 or grupTipe = 3) and grupTipe ! 4, 'easy', iif(pcs_grades < 90 and grupTipe ! 4, 'medium', 'hard'))
-	if lernHome > 0 and will_cost <= pcs_willpwr:
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+	if traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if lernHome > 0 and (will_cost <= pcs_willpwr or traits['nerd_status'] = 3):
 		'<br>You have to your homework. Finishing everything will take <<lernHome>> hours.'
-		act 'Do your homework (1:00 and <<will_cost>> Willpower)':
+		act 'Do your homework (1:00'+iif(traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'
 			minut += 60
+			pcs_mood += 5 * traits['nerd_status']
 			lernHome -= 1
 			lern += 1
-			gs 'willpower', 'misc', 'self', iif((pcs_grades < 50 or grupTipe = 3) and grupTipe ! 4, 'easy', iif(pcs_grades < 90 and grupTipe ! 4, 'medium', 'hard'))
-			gs 'willpower', 'pay', 'self'
+			gs 'willpower', 'misc', 'self', iif(grupTipe = 4, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
+			if traits['nerd_status'] = 2: will_cost = will_cost / 2
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs'stat'
 			'It took you one hour to '+iif(lernHome = 0, 'complete', 'do a part of')+' your homework.'
 			
@@ -140,18 +143,16 @@ if $ARGS[0] = 'stolPar':
 	end
 	
 	will_cost = will_cost * lernHome
-	if lernHome > 1 and will_cost <= pcs_willpwr:
-		act 'Finish all of your homework (<<lernHome>>:00 and <<will_cost>> Willpower)':
+	if lernHome > 1 and (will_cost <= pcs_willpwr or traits['nerd_status'] = 3):
+		act 'Finish all of your homework (<<lernHome>>:00'+iif(traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'
 			'It took you <<lernHome>> hours to complete your homework.'
-			
 			minut += 60 * lernHome
+			pcs_mood += 5 * traits['nerd_status'] *lernHome
 			lern += 1 + lernHome/2
 			lernHome = 0
-			gs 'willpower', 'misc', 'self', iif((pcs_grades < 50 or grupTipe = 3) and grupTipe ! 4, 'easy', iif(pcs_grades < 90 and grupTipe ! 4, 'medium', 'hard'))
-			will_cost = will_cost * lernHome
-			gs 'willpower', 'pay', 'self'
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs'stat'
 			
 			act 'Continue':gt 'stol', 'stolPar'

+ 98 - 24
locations/traits.qsrc

@@ -73,6 +73,23 @@ if $ARGS[0] = 'menu':
 	
 	*nl
 	
+	if traits['nerd_status'] = 0:
+		'<center><b>Likes learning</b></center>'
+		'You don''t have this trait and <<traits[''nerd_points'']>> points. You need to earn '+iif(traits['nerd_points'] > 0, '<<40 - traits[''nerd_points'']>>', '<<40 + traits[''nerd_points'']>>')+' more points to get level 1 of this trait.'
+	elseif traits['nerd_status'] = 1:
+		'<center><b>Likes learning</b></center>'
+		'You have level 1 of this trait and <<traits[''nerd_points'']>> points. You need to earn <<60 - traits[''nerd_points'']>> more points to get level 2 of this trait. If you fall below 20 points, you''ll lose this trait.'
+	elseif traits['nerd_status'] = 2:
+		'<center><b>Loves to learn</b></center>'
+		'You have level 2 of this trait and <<traits[''nerd_points'']>> points. You need to earn <<60 - traits[''nerd_points'']>> more points to get level 2 of this trait. If you fall below 40 points, you''ll fall back to level 1.'		
+	elseif traits['nerd_status'] = 2:
+		'<center><b>Teacher''s pet</b></center>'
+		'You have level 3 of this trait and <<traits[''nerd_points'']>> points. If you fall below 60 points, you''ll fall back to level 2.'		
+	end
+	'Listening to more than 80% of lessons and doing your homework regularly earns you points for this trait, but you''ll lose points if you listen to less than 60% of lessons or if you don''t do your homework.'
+	
+	*nl
+	
 	'<center><b>Addictive Personality</b></center>'
 	if addictive_trait_lvl = 0 and addictive_cheat = 0:
 		'You do not have this trait.'
@@ -108,10 +125,10 @@ if $ARGS[0] = 'menu':
 	
 	*nl
 	
-	if alko_trait = -1:
+	if traits['alko_status'] = -1:
 		'<center><b>Lightweight</b></center>'
 		'It doesn''t take much for you to get drunk. You don''t have to drink as much to feel the affects of alcohol.'
-	elseif alko_trait = 1:
+	elseif traits['alko_status'] = 1:
 		'<center><b>Heavyweight</b></center>'
 		'You''ve built up a tolerance, making it harder for you to feel the affects of alcohol.'
 	end
@@ -128,42 +145,99 @@ if $ARGS[0] = 'hourly':
 end
 
 if $ARGS[0] = 'overnight':
-	!!alko_trait: light weight (-1), normal (0), heavy weight (+1)
-	!!alko_trait_counter: between -100 and 100, tracks if sveta is a light or heavy wight
-	!!alko_trait_day: amount of alko sveta has drunk today
+	!!traits['alko_status']: light weight (-1), normal (0), heavy weight (+1)
+	!!traits['alko_points']: between -100 and 100, tracks if sveta is a light or heavy wight
+	!!traits['alko_day']: amount of alko sveta has drunk today
 	
 	!!Gains/Decay
-	if alko_trait_day > 0:
-		if alko_trait_day > 9:
-			alko_trait_counter += 9
+	if traits['alko_day'] > 0:
+		if traits['alko_day'] > 9:
+			traits['alko_points'] += 9
 		else
-			alko_trait_counter += alko_trait_day
+			traits['alko_points'] += traits['alko_day']
 		end
-	elseif alko_trait_day = 0:
-		alko_trait_counter -= 2
+	elseif traits['alko_day'] = 0:
+		traits['alko_points'] -= 2
 	end
 	
+	if kanikuli = 0 and week < 6:
+		if lernHome > 0:
+			traits['nerd_lernHome'] = 0
+			traits['nerd_points'] -= 1
+		elseif lernHome = 0 and traits['nerd_lernHome'] < 5:
+			traits['nerd_lernHome'] += 1
+		elseif traits['nerd_lernHome'] = 5:
+			traits['nerd_points'] += 1
+		end
+	elseif kanikuli = 0 and week = 6:
+		!!This check has to be changed if the number of non-sport lessons ever changes (27 right now)
+		if traits['nerd_lessons'] > 20:
+			traits['nerd_points'] += traits['nerd_lessons'] - 17
+		elseif traits['nerd_lessons'] < 14:
+			traits['nerd_points'] -= iif(traits['nerd_status'] > 0, 5, 10)
+		end
+		traits['nerd_lessons'] = 0
+	end	
+	
 	!!Trait selection
-	if alko_trait_counter > 50 and alko_trait < 1:
-		alko_trait = 1
+	if traits['alko_points'] > 50 and traits['alko_status'] < 1:
+		traits['alko_status'] = 1
 		msg 'You have gained the trait ''Heavyweight''.'
-	elseif alko_trait_counter < -50 and alko_trait > -1:
-		alko_trait = -1	
+	elseif traits['alko_points'] < -50 and traits['alko_status'] > -1:
+		traits['alko_status'] = -1	
 		msg 'You have gained the trait ''Lightweight''.'
-	elseif alko_trait = -1 and alko_trait_counter > 0:
-		alko_trait = 0
+	elseif traits['alko_status'] = -1 and traits['alko_points'] > 0:
+		traits['alko_status'] = 0
 		msg 'You have lost the trait ''Lightweight''.'
-	elseif alko_trait = 1 and alko_trait_counter < 0:
-		alko_trait = 0
+	elseif traits['alko_status'] = 1 and traits['alko_points'] < 0:
+		traits['alko_status'] = 0
 		msg 'You have lost the trait ''Heavyweight''.'
 	end
 	
+	if traits['nerd_points'] > 80 and traits['nerd_status'] < 3:
+		traits['nerd_status'] = 3
+		msg 'You have gained the trait ''Teacher''s pet''.'
+	elseif traits['nerd_points'] > 60 and traits['nerd_status'] < 2:
+		traits['nerd_status'] = 2
+		msg 'You have gained the trait ''Loves to learn''.'		
+	elseif traits['nerd_points'] > 40 and traits['nerd_status'] < 1:
+		traits['nerd_status'] = 1
+		msg 'You have gained the trait ''Likes learning''.'
+	elseif traits['nerd_points'] < 60 and traits['nerd_status'] = 3:
+		traits['nerd_status'] = 2
+		msg 'You have lost the trait ''Teacher''s pet''.'
+	elseif traits['nerd_points'] < 40 and traits['nerd_status'] = 2:
+		traits['nerd_status'] = 1
+		msg 'You have lost the trait ''Loves to learn''.'	
+	elseif traits['nerd_points'] < 20 and traits['nerd_status'] = 1:
+		traits['nerd_status'] = 0
+		msg 'You have lost the trait ''Likes learning''.'		
+	end
+	
+	!!Trait effects
+	if traits['nerd_status'] = 3:
+		grupvalue[1] -= 1
+		grupvalue[3] += rand(1,2)
+		grupvalue[4] -= rand(1,2)		
+	elseif traits['nerd_status'] = 2:
+		grupvalue[3] += 1
+		grupvalue[4] -= 1
+	elseif traits['nerd_status'] = 1:
+		grupvalue[3] += rand(0,1)
+	end
+
 	!!Cleanup
-	alko_trait_day = 0
-	if alko_trait_counter > 100: 
-		alko_trait_counter = 100
-	elseif alko_trait_counter < -100: 
-		alko_trait_counter = -100
+	traits['alko_day'] = 0
+	if traits['alko_points'] > 100: 
+		traits['alko_points'] = 100
+	elseif traits['alko_points'] < -100: 
+		traits['alko_points'] = -100
+	end
+	
+	if traits['nerd_points'] > 100:
+		traits['nerd_points'] = 100
+	elseif traits['nerd_points'] < -100:
+		traits['nerd_points'] = -100
 	end
 end