Browse Source

[changed] Willpower now has "chore" option for things that would be misc and should not increase the willpower max. So far this is paying attention in school/uni and homework checks. Plus decreased the gains top max willpower from passing willpower checks

Kevin_Smarts 1 year ago
parent
commit
0c45d16e07

+ 3 - 3
locations/gschool_lessons1.qsrc

@@ -10,7 +10,7 @@ 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 classmates walk in one by one before Mr. Yenotin enters the classroom. Just as he''s 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. Everyone knows that he never reports the tardy students. As everyone settles in, Mr. Yenotin does a roll call before opening a grammar book, telling you to open your textbooks to where you left off last lesson.'
 	'After a while, he tells the class to do the assignments on the last page of the chapter as he starts walking up and down the classroom, mostly talking to the students about off topic things like how their time off was often disrupting them from their 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.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Yenotin'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -565,7 +565,7 @@ if $ARGS[0] = 'geography':
 	'You walk into the classroom and see Mrs. Sokoloff sitting by her desk. The rest of your classmates walk in one by one under her watchful eye. Some of them get a friendly smile while others get a stern look.'
 	'Without wasting any time, she sternly tells the class to open their textbooks. "I hope you have all done your homework." Mrs. Sokoloff is a no nonsense teacher. She expects discipline and hard work and the ones able to abide by her rules are treated very kindly.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mrs. Sokoloff'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -1090,7 +1090,7 @@ if $ARGS[0] = 'history':
 	'You walk into the classroom and see Mrs. Sokoloff sitting by her desk. The rest of your classmates walk in one by one under her watchful eye. Some of the students get a friendly smile while others get a stern look.'
 	'Without wasting time, she sternly tells the class to open their textbooks. "I hope you all have done your homework." Mrs. Sokoloff is a no nonsense teacher. She expects discipline and hard work and the ones able to abide by her rules are treated very kindly.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mrs. Sokoloff'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':

+ 4 - 4
locations/gschool_lessons2.qsrc

@@ -12,7 +12,7 @@ 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 classmates file in and takes their seats as well. Once the bell rings, Mr. Ivanov takes roll call and then gets up and starts walking around the room explaining today''s lesson. He occasionally stops to look at the screens of various students to make sure they are doing it right.'
 	'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 they did wrong, drawing attention to them. He makes sure the whole class knows about their mistake and does it in a condescending manner, like he is trying to prove how much smarter he is than them.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Ivanov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -589,7 +589,7 @@ if $ARGS[0] = 'science':
 	'You go to your science class and find a seat at your lab station. Before long all of your classmates file in and takes their seats as well. Miss Orlov takes roll call, then gets up and starts writing on the blackboard. She is wearing a fairly short skirt that nearly rides too high when she reaches up to write at the top of the blackboard, which the boys often encourage by asking her questions about whatever it is she has written at the top of the blackboard.'
     'She occasionally asks questions to the class and those that get them right receive heaps of praise while she takes the time to explain the answer to those that get them wrong. Once she is sure the student understands their mistake, she moves on with her lesson. She is quick to help anyone with a problem or answer questions and always does so with a shy smile.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Miss Orlov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -1012,7 +1012,7 @@ if $ARGS[0] = 'music':
 	'<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. He''s always upbeat and positive about teaching and encourages all of his students to take part.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Vasilyev'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -1540,7 +1540,7 @@ if $ARGS[0] = 'biology':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classbiology.jpg"></center>'
 	'You go to your biology class and find a seat at your lab station. Before long, all your classmates file in and take their seats as well. Miss Orlov takes roll call before she gets up and starts walking around the room explaining today''s 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.'
 	'She occasionally asks questions to the class and those that get them right receive heaps of praise while she takes the time to explain the answer to those that get them wrong. Once she is sure the student understands their mistake, she moves on with her lesson. She is quick to help anyone with a problem or answer questions and always does so with a shy smile.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Miss Orlov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':

+ 3 - 3
locations/gschool_lessons3.qsrc

@@ -11,7 +11,7 @@ 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.'
 	'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 the lesson begins.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
 		act 'Listen attentively'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -373,7 +373,7 @@ if $ARGS[0] = 'art':
 	'<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. He''s always upbeat and positive about teaching and encourages all of his students to take part.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
 		act 'Listen attentively to Mr. Vasilyev'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -958,7 +958,7 @@ if $ARGS[0] = 'shop':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classshop.jpg"></center>'
 	'You sit in the classroom and listen to Mr. Kuznetsov''s monotonous droning, doing your best not to fall asleep.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:		
 		act 'Listen attentively to Mr. Kuznetsov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':

+ 2 - 2
locations/gschool_lessons4.qsrc

@@ -88,7 +88,7 @@ if $ARGS[0] = 'math':
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
 	else
-		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+		gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 		if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 		if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 			act 'Focus on your school work'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -360,7 +360,7 @@ if $ARGS[0] = 'english':
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
 	else
-		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+		gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 		if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 		if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 			act 'Listen attentively'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':

+ 2 - 2
locations/pav_library.qsrc

@@ -127,7 +127,7 @@ if hour >= 8 and hour < 18:
 		'You read the book for an hour. Tolstoy is certainly a classic writer, no one denies this, but he used a shit-load of words.'
 		act 'Put the book back': gt 'pav_library'
 	end
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if lernHome > 0 and (will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3):
 		act 'Do your homework (1:00'+iif(pcs_traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
@@ -136,7 +136,7 @@ if hour >= 8 and hour < 18:
 			minut += 60
 			pcs_mood += 5 * pcs_traits['nerd_status']
 			lern += 1
-			gs 'willpower', 'misc', 'self', iif(grupTipe = 4, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+			gs 'willpower', 'chore', 'self', iif(grupTipe = 4, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 			if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs'stat'

+ 2 - 2
locations/stol.qsrc

@@ -148,7 +148,7 @@ 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(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if lernHome > 0 and (will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3):
 		'<br>You have homework to do. Finishing everything will take <<lernHome>> '+iif(lernHome = 1, 'hour.', 'hours.')
@@ -158,7 +158,7 @@ if $ARGS[0] = 'stolPar':
 			minut += 60
 			pcs_mood += 5 * pcs_traits['nerd_status']
 			lern += 1
-			gs 'willpower', 'misc', 'self', iif(grupTipe = 4, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+			gs 'willpower', 'chore', 'self', iif(grupTipe = 4, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 			if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs'stat'

+ 3 - 3
locations/uni_lessons1.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'general_education_101':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Kovalyov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -256,7 +256,7 @@ if $ARGS[0] = 'teaching_methods_101':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mr. Pasternak standing by his desk as the rest of your classmates walk in one by one under his watchful eye. Some of them get a friendly smile while others get a stern look. Not wasting any time, he launches straight into his lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Pasternak'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -509,7 +509,7 @@ if $ARGS[0] = 'learning_theories_101':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mrs. Kovalchuk'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':

+ 3 - 3
locations/uni_lessons2.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'general_education_102':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Kovalyov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -251,7 +251,7 @@ if $ARGS[0] = 'teaching_methods_102':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mr. Pasternak standing by his desk as the rest of your classmates walk in one by one under his watchful eye. Some of them get a friendly smile while others get a stern look. Not wasting any time, he launches straight \into his lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Pasternak'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -504,7 +504,7 @@ if $ARGS[0] = 'psychology_of_a_student_101':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mrs. Kovalchuk'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':

+ 3 - 3
locations/uni_lessons3.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'general_education_201':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Kovalyov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -251,7 +251,7 @@ if $ARGS[0] = 'assessment_201':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mr. Pasternak standing by his desk as the rest of your classmates walk in one by one under his watchful eye. Some of them get a friendly smile while others get a stern look. Not wasting any time, he launches straight into his lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Pasternak'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -504,7 +504,7 @@ if $ARGS[0] = 'learning_theories_201':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mrs. Kovalchuk'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':

+ 3 - 3
locations/uni_lessons4.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'general_education_202':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and take a seat next to a window. The rest of your classmates walk in one by one before Mr. Kovalyov enters the classroom and closes the door. He turns to the class and begins today''s lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Kovalyov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -251,7 +251,7 @@ if $ARGS[0] = 'learning_theories_202':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mr. Pasternak standing by his desk as the rest of your classmates walk in one by one under his watchful eye. Some of them get a friendly smile while others get a stern look. Not wasting any time, he launches straight into his lecture.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mr. Pasternak'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
@@ -504,7 +504,7 @@ if $ARGS[0] = 'psychology_of_a_student_201':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/lecture<<rand(1,5)>>.jpg"></center>'
 	'You walk into the classroom and see Mrs. Kovalchuk sitting behind her desk. The rest of your classmates walk in one by one and she smiles at each one as they enter.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	gs 'willpower', 'chore', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
 	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
 	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
 		act 'Listen attentively to Mrs. Kovalchuk'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':

+ 7 - 6
locations/willpower.qsrc

@@ -4,9 +4,10 @@
 !!Action: Determines what action sveta is resisting, forcing somebody to do or forcing herself to do
 !!List of actions: 
 !!		'voyeur', 'flash', 'mast', 'hj', 'bj', 'cuni', 'sex', 'anal', 'group', 'gangbang', 'prostitution', 'swallow', 'cum_inside', 'cum_inside_anal', 'rape',
-!!		'kiss', 'humiliation', 'footjob', 'titjob', 'trib', 'rimming', 'BDSM', 'pee', 'cum_outside', 'drink', 'drugs', 'crime', 'exhib', 'sleep'
+!!		'kiss', 'humiliation', 'footjob', 'titjob', 'trib', 'rimming', 'BDSM', 'pee', 'cum_outside', 'drink', 'drugs', 'crime', 'exhib', 'sleep', 'chore'
 !!		there is also 'foreplay' for things like touching and fondling
 !!		and two special cases 'misc' and 'skill' 
+!!		'chore' is meant to be used for menial tasks that should not greatly affect willpower max, only drain from the pool
 !!Type: Determines what kind of willpower check sveta needs to do ('resist', 'force', 'self'). 
 !!		-'resist' is used if sveta is resisting to do the 'action' somebody else wants her to do. 
 !!		-'force' is used if sveta forces somebody else to do the 'action'. 
@@ -847,8 +848,8 @@ if $ARGS[0] = 'sleep':
 	gs 'willpower', 'difficulty', '<<$ARGS[2]>>'
 end
 
-!!Choose this if nothing else fits
-if $ARGS[0] = 'misc':
+!!Choose this if nothing else fits and for chore which is same thing but with gains for max willpower
+if $ARGS[0] = 'misc' or $ARGS[0] = 'chore':
 	gs 'willpower', 'calc'
 
 	if $ARGS[1] = 'force':
@@ -927,15 +928,15 @@ if $ARGS[0] = 'pay':
 	pcs_willpwr -= will_cost
 	if $ARGS[1] = 'force':
 		if willpowermax < 150:
-			will_counter += 4
+			will_counter += 10
 		end
 		if will_enforced < 20: will_enforced += 1
-	else
+	elseif $ARGS[1] ! 'chore':
 		if willpowermax < 150:
 			will_counter += 1
 		end
 	end
-	if will_counter >= 8: will_counter = 0 & willpowermax += 1
+	if will_counter >= 20: will_counter = 0 & willpowermax += 1
 end
 
 --- willpower ---------------------------------