[changed] all traits are now part of the pcs_traits array

locations/Cum_Manage.qsrc

@@ -875,7 +875,7 @@ if $ARGS[0] = 'cum_stat_display':
 					end
 				end
 				$icon_txtiscum = $txtiscum
-				if j <= 4 and trait['cumeater'] = 1 and $txtiscum = 'cum': $txtiscum = '<a href="exec:gs ''cum_manage'', ''cumeater'', <<i>>"><font color=#0064FF>' + $txtiscum + '</font></a>'
+				if j <= 4 and pcs_traits['cumeater'] = 1 and $txtiscum = 'cum': $txtiscum = '<a href="exec:gs ''cum_manage'', ''cumeater'', <<i>>"><font color=#0064FF>' + $txtiscum + '</font></a>'
 				if $txtperson ! '':
 					$txtperson = ' from ' + $txtperson
 				end

locations/MartinSex2.qsrc

@@ -954,7 +954,7 @@ if $ARGS[0] = 'MartinCumshot_Mouth':
 	*nl
 	$orgasm_txt = 'The taste of Martin''s hot cum on your tongue finally pushes you over the edge, causing you to moan around his cock as you keep pleasing him, both him and you completely taken off-guard by your oral orgasm.'
 	gs 'arousal', 'bj', 1
-	'When his ' + iif(pcs_horny=0,'and your orgasm have','orgasm has') + ' subsided, you release his softening dick from your mouth once more and show Martin his jizz on your tongue before swallowing it' + iif(trait['cumeater']=1,', savoring the taste you come to love as the thick liquid goes down your throat',' reluctantly, knowing that men love it when women do that') + '. The smile he gives you as you show him your clean tongue is simply priceless.'
+	'When his ' + iif(pcs_horny=0,'and your orgasm have','orgasm has') + ' subsided, you release his softening dick from your mouth once more and show Martin his jizz on your tongue before swallowing it' + iif(pcs_traits['cumeater']=1,', savouring the taste you come to love as the thick liquid goes down your throat',' reluctantly, knowing that men love it when women do that') + '. The smile he gives you as you show him your clean tongue is simply priceless.'
 	$orgasm_txt = ''
 	pcs_energy += 5
 	gs 'cum_call', 'mouth', $boy, 1

locations/albina_house_events.qsrc

@@ -644,9 +644,9 @@ if $ARGS[0] = 'hot_tub_no_panties':
 		'"You already know I don''t wear them," you smirk back.'
 	elseif albina['commando_know'] > 0:
 		'"You already know I consider panties to be optional," you smirk back.'
-	elseif trait['commando_lvl'] = 3:
+	elseif pcs_traits['commando_lvl'] = 3:
 		'"I hate wearing panties," you smirk, stepping into the tub with her.'
-	elseif trait['commando_lvl'] > 0:	
+	elseif pcs_traits['commando_lvl'] > 0:	
 		'"I don''t always wear them," you smirk back, stepping into the tub with her.'
 	else
 		'"I uhh, may have forgotten to wear them today..." you blush, stepping into the tub with her.'
@@ -656,15 +656,15 @@ if $ARGS[0] = 'hot_tub_no_panties':
 	else
 		gs 'albina_house_events', 'hot_tub_no_panties2'
 	end
-	albina['commando_know'] = trait['commando_lvl']
+	albina['commando_know'] = pcs_traits['commando_lvl']
 end
 	
 	
 if $ARGS[0] = 'hot_tub_no_panties2':
 	*nl
-	'She grins back at you and starts wriggling around beneath the bubbling water. Her knees briefly breach the surface and a moment later, she tosses something over her shoulder. Black fabric wetly slaps onto the poolside and peering past her, you realize it''s Albina''s thong. She leans back into the hot tub''s jets just before taking a sharp gasp.'
+	'Albina grins back at you and starts wriggling around beneath the bubbling water. Her knees briefly breach the surface and a moment later, she pulls up a thin, stringy, piece of fabric. She stretches it between her hands and slingshots it past your head, making a wet slapping sound when it lands on the deck. Turning your head to see what it was, you realize as soon as you lay eyes on it: it''s her thong. As you turn around, Albina takes a sharp gasp.'
 	*nl
-	'"Oh <i>fuck...</i>" she moans. "I should do this more often..."'
+	'"Oh <i>fuck...</i>" she moans, leaning further into the water. "I should do this more often..."'
 	*nl
 	gs 'albina_house_events', 'hot_tub_no_panties3'
 end
@@ -719,7 +719,7 @@ if $ARGS[0] = 'goodie_two_shoes':
 		'"Look who''s talking, bitch," you scowl at Albina, making her laugh out loud.'
 		gs 'albina_house_events', 'hot_tub_no_panties2'
 	end
-	if trait['commando_lvl'] > 0:
+	if pcs_traits['commando_lvl'] > 0:
 		albina['goodie_two_shoes_commando'] = 1
 		act 'Guess you didn''t know me':
 			cla & *nl

locations/albina_wine_event.qsrc

@@ -574,7 +574,7 @@ if $ARGS[0] = 'wine_chat1':
 				albina['wine_convo_7'] = daystart
 			end
 			'"So, you really don''t wear panties?" Albina slurs while turning her head toward your pussy. "Like, ever?"'
-			if trait['commando_lvl'] = 3:
+			if pcs_traits['commando_lvl'] = 3:
 				act 'Only when I have to':
 					cla & *nl
 					'"Only when I have to," you say, wrinkling your nose in annoyance. "Sometimes you just can''t get away with it."'
@@ -627,7 +627,7 @@ if $ARGS[0] = 'wine_chat1':
 					'"What?" Albina looks confused. "That doesn''t make any sense at all..."'
 					gs 'albina_wine_event','wine_chat2'
 				end
-			elseif trait['commando_lvl'] > 0:
+			elseif pcs_traits['commando_lvl'] > 0:
 				act 'I just forget sometimes':
 					cla & *nl
 					'"Not <i>never</i>," you slur. "I just...  forget to put them on sometimes..."'
@@ -671,7 +671,7 @@ if $ARGS[0] = 'wine_chat1':
 					end
 				end
 				
-				if trait['commando_lvl'] = 1:
+				if pcs_traits['commando_lvl'] = 1:
 					act 'Only with skirts':
 						cla & *nl
 						'"Only when I''m wearing skirts," you say. "My pussy gets itchy when it rubs against my pants."'
@@ -760,7 +760,7 @@ if $ARGS[0] = 'wine_chat2':
 			'"Damn straight," Albina says, throwing up her hand and high fiving you.'
 			act 'Continue':gt 'albina_wine_event','wine_chat1'
 		end
-		if trait['cumeater'] > 0:
+		if pcs_traits['cumeater'] > 0:
 			act 'I love the taste':
 				cla & *nl
 				'"Me too," you smile. "I love the way it feels going down my throat. Taste is pretty good too."'

locations/arousal.qsrc

@@ -188,10 +188,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['rimming'] = 1
 		stim['act'] = 30
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 2
 			stim['act'] = 50
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 4
 			stim['act'] = 80
 		end
@@ -208,9 +208,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		else
 			count['anal'] = 1
 		end
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 1
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 3
 		end
 		if pcs_ass < temp_dick:pcs_ass += 1
@@ -243,10 +243,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['anal_finger'] = 1
 		stim['act'] = 40
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 1
 			stim['act'] = 60
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 1
 			stim['act'] = 80
 		end
@@ -254,9 +254,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['anal_fist'] = 1
 		stim['act'] = 30
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] = 50
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['act'] = 70
 		end
 		if pcs_ass + anal_slip < 30:
@@ -268,9 +268,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['self_fisting_anal'] = 1
 		stim['act'] = 30
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] = 50
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['act'] = 70
 		end
 		if pcs_ass + anal_slip < 30:
@@ -292,9 +292,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] += 10
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 1
 		end
 		if agrdif < 0: agrdif = 0
@@ -316,9 +316,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] += 10
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 1
 		end
 		if agrdif < 0: agrdif = 0
@@ -331,16 +331,16 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		count['anal_vibe'] = 1
 		stim['mag'] += 1
 		stim['act'] = 60
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 1
 			stim['act'] = 70
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 2
 			stim['act'] = 90
 		end
 	elseif $ARGS[0] = 'vaginal':
+		
 		orgasm_flag['vaginal'] = 1
-
 		!! pre-cum check
 		if rand(0,120) < ARGS[1]: cumprecheck = 1 & gs 'cum_manage'
 		
@@ -552,7 +552,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 
 	!! anal acts
 	if (mid($ARGS[0],1,4) = 'anal' and mid($ARGS[0],len($ARGS[0])-3,len($ARGS[0])) ! 'give') or $ARGS[0] = 'rimming':
-		if traits['buttslut_lvl'] = 3:
+		if pcs_traits['buttslut_lvl'] = 3:
 			stim['act'] += 20
 		end
 	end

locations/audition_sex1.qsrc

@@ -338,7 +338,7 @@ if $ARGS[0] = 'reluctant_bj2':
 						cla & *clr
 						'<center><video autoplay loop src="images/shared/sex/cum/mouth/gag1.mp4"></video></center>'
 						'With a deep breath through your nose, you try to swallow but just feel too disgusted to do it. You gag hard and cough it all back up. Instinctively, you put your hands up to catch some but the most spatters all down your neck and across your breasts.'
-						if trait['cumeater'] = 1:
+						if pcs_traits['cumeater'] = 1:
 							'It''s not that you''re unaccustomed to swallowing cum or even mind most of the time, you just don''t want to do it <i>this</i> time. Everything about this situation turns you off.'
 						elseif swallow > 0:
 							'You''ve swallowed a few times before but it''s still gross. <i>Ugh.</i> Even after spitting it out, the aftertaste still lingers.'
@@ -388,7 +388,7 @@ if $ARGS[0] = 'reluctant_bj2':
 						'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow2.mp4"></video></center>'
 						audition['cast_couch'] = 1
 						swallow += 1
-						if trait['cumeater'] = 1:
+						if pcs_traits['cumeater'] = 1:
 							'You swallow pretty regularly, so it''s not like this is any real big ask for you to do.'
 						elseif swallow > 0:
 							'You''ve swallowed a few times before but... this is still kind of...'

locations/drugs.qsrc

@@ -128,9 +128,9 @@ elseif $ARGS[0] = 'alcohol':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	if $ARGS[1] = 'beer':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += rand(1,2)
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += rand(0,1)
 		else
 			alko += 1
@@ -142,11 +142,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra += 10
 		end
-		traits['alko_day'] += 1
+		pcs_traits['alko_day'] += 1
 	elseif $ARGS[1] = 'wine' or $ARGS[1] = 'champagne':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += 3
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += 1
 		else
 			alko += 2
@@ -158,11 +158,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra += 10
 		end
-		traits['alko_day'] += 2
+		pcs_traits['alko_day'] += 2
 	elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += rand(4,5)
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += rand(1,2)
 		else
 			alko += 3
@@ -173,11 +173,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra -= 10
 		end
-		traits['alko_day'] += 3
+		pcs_traits['alko_day'] += 3
 	elseif $ARGS[1] = 'moonshine':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += rand(7,8)
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += rand(2,3)
 		else
 			alko += 5
@@ -188,7 +188,7 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra -= 10
 		end
-		traits['alko_day'] += 5
+		pcs_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

locations/gschool_lessons1.qsrc

@@ -10,17 +10,17 @@ 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 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)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] +=1
 			gs 'grades', 'class_activity_attributes', 'school', 'rus', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_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 manages to make today''s lesson very interesting and informative, and you feel like you have learned something from actively taking part in the discussion.'
@@ -565,17 +565,17 @@ 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 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)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			grupvalue[4] -=1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'geo', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_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.'
@@ -1090,17 +1090,17 @@ 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 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)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'his', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_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.'

locations/gschool_lessons2.qsrc

@@ -12,18 +12,18 @@ 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 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)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'compskl', rand(1,2)
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'comp', pcs_intel
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_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.'
@@ -589,17 +589,17 @@ 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 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)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'school', 'sci', pcs_intel
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_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.'
@@ -1012,10 +1012,10 @@ 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 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)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
@@ -1023,8 +1023,8 @@ if $ARGS[0] = 'music':
 			gs 'exp_gain', 'instrmusic', rand(1,2)
 			gs 'exp_gain', 'vokal', rand(1,2)
 			gs 'exp_gain', 'chrsm', rand(1,2)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_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 artists.'
@@ -1540,17 +1540,17 @@ 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 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)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'bio', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_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.'

locations/gschool_lessons3.qsrc

@@ -11,17 +11,17 @@ 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 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)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			grupvalue[4] -=1
 			grupvalue[3] += 1
 			gs 'grades', 'class_activity_attributes', 'school', 'lit', pcs_intel
-			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			intel_exp += rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_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
@@ -373,18 +373,18 @@ 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 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)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'grades', 'class_activity_attributes', 'school', 'art', pcs_intel
-			gs 'exp_gain', 'artskls', rand(1,2)
-			gs 'exp_gain', 'agil', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			artskls_exp += rand(1,2)
+			agil_exp += rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_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.'
@@ -958,18 +958,18 @@ 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 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)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'grades', 'class_activity_attributes', 'school', 'shop', pcs_intel
-			gs 'exp_gain', 'hndiwrk', rand(1,2)
-			gs 'exp_gain', 'agil', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			hndiwrk_exp += rand(1,2)
+			agil_exp += rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_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. Kuznetsov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'

locations/gschool_lessons4.qsrc

@@ -88,17 +88,17 @@ if $ARGS[0] = 'math':
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
 	else
-		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)')+' ':
+		gs 'willpower', 'misc', '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)')+' ':
 				*clr & cla
 				grupvalue[4] -= 1
 				grupvalue[3] += 1
 				gs 'grades', 'class_activity_attributes', 'school', 'math', pcs_intel
 				gs 'exp_gain', 'intel', rand(0,1)
-				traits['nerd_lessons'] += 1
-				if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+				pcs_traits['nerd_lessons'] += 1
+				if pcs_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.'
@@ -360,17 +360,17 @@ if $ARGS[0] = 'english':
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
 	else
-		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)')+' ':
+		gs 'willpower', 'misc', '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)')+' ':
 				*clr & cla
 				grupvalue[4] -= 1
 				grupvalue[3] += 1
 				gs 'grades', 'class_activity_attributes', 'school', 'mus', pcs_intel
 				gs 'exp_gain', 'intel', rand(0,1)
-				traits['nerd_lessons'] += 1
-				if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+				pcs_traits['nerd_lessons'] += 1
+				if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 				gs 'stat'				
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
 				'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.'

locations/intro_city_select.qsrc

@@ -367,9 +367,9 @@ if $ARGS[0] = 'nerd':
 	npc_rel['A29'] += 10
 	genbsize = 13 
 !!b cup for ideal bmi
-	traits['nerd_points'] = 60
-	traits['nerd_status'] = 2
-	traits['nerd_lernHome'] = 5
+	pcs_traits['nerd_points'] = 60
+	pcs_traits['nerd_status'] = 2
+	pcs_traits['nerd_lernHome'] = 5
 end
 
 if $ARGS[0] = 'nerdqueen':
@@ -439,8 +439,8 @@ if $ARGS[0] = 'goodstudent':
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'nerd'
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
 		alterstrtimg = 9
 		if glass < 1 : glass = 1
 		pcs_intel = 70
@@ -1009,7 +1009,7 @@ if $ARGS[0] = 'troublemaker':
 	'Now you are in the big city, a whole new playground to find trouble in.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -50
+		pcs_traits['nerd_points'] = -50
 		gs 'intro_city_select', 'gopnik'
 		alterstrtimg = 19
 		pcs_stren = 65
@@ -1068,7 +1068,7 @@ if $ARGS[0] = 'alternative':
 	'That doesn''t matter now since you''re out in the city on your own, ready to do as you please.'
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -20
+		pcs_traits['nerd_points'] = -20
 		pcs_exhib = 25
 		Exhibitionist_lvl = 1
 		addictive_exp = 1
@@ -1258,9 +1258,9 @@ if $ARGS[0] = 'goodgirl':
 	'Now you are in the big city and have suddenly found there are no teachers or adults to impress. In fact, it seems buttering up to the adults your entire life has become something of a hinderance.'
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
-		traits['nerd_lernHome'] = 5
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
+		pcs_traits['nerd_lernHome'] = 5
 		gs 'intro_city_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -10, -5, 10, -20, 0, 20
 		npc_rel['A25'] -= 5
@@ -1315,8 +1315,8 @@ if $ARGS[0] = 'slut':
 	'However, your resultant addiction to sex made you a social pariah, and you were constantly mocked by your peers. Now you are in the big city where nobody knows you, giving you a chance to either start over or continue your life of debauchery.'
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		trait['commando_lvl'] = 2
-		trait['cumeater'] = 1 and cumeater_cheat = 1
+		pcs_traits['commando_lvl'] = 2
+		pcs_traits['cumeater'] = 1 and cumeater_cheat = 1
 		pcs_exhib = 40
 		Exhibitionist_lvl = 1
 		gs 'intro_city_select', 'outcast'
@@ -1382,7 +1382,7 @@ if $ARGS[0] = 'slut':
 		guy = 15
 		orgasm = 120
 		swallow = 40
-		trait['cumeater'] = 1
+		pcs_traits['cumeater'] = 1
 		willpowermax = 50
 		motherKnowWhore = 1
 		sisterknowslut = 1
@@ -1411,7 +1411,7 @@ if $ARGS[0] = 'goth':
 	'With school over, you''ve moved to the city, where you feel a lot more accepted, although people still give you the odd stare.'
     act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -10
+		pcs_traits['nerd_points'] = -10
 		gs 'intro_city_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 5, +20, 0, 0
         npc_rel['A28'] -= 20

locations/intro_sg_select.qsrc

@@ -440,9 +440,9 @@ if $ARGS[0] = 'nerd':
 	grupvalue[6] = 600
 	genbsize = 13 
 !!b cup for ideal bmi
-	traits['nerd_points'] = 60
-	traits['nerd_status'] = 2
-	traits['nerd_lernHome'] = 5
+	pcs_traits['nerd_points'] = 60
+	pcs_traits['nerd_status'] = 2
+	pcs_traits['nerd_lernHome'] = 5
 end
 
 if $ARGS[0] = 'nerdqueen':
@@ -514,8 +514,8 @@ if $ARGS[0] = 'goodstudent':
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_sg_select', 'nerd'
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
 		alterstrtimg = 9
 		if glass < 1 : glass = 1
 		pcs_intel = 60
@@ -1106,7 +1106,7 @@ if $ARGS[0] = 'troublemaker':
 	'You have problems at home and school due to your antisocial behavior. This is especially true with your mother and stepfather, who see you going down the wrong path. You are well known to both your teachers and the police.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -50
+		pcs_traits['nerd_points'] = -50
 		gs 'intro_sg_select', 'gopnik'
 		alterstrtimg = 19
 		pcs_stren = 60
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'vitekgf':
 	'As you developed, he started to take an interest in you as well and you soon started dating. You''re not technically a gopnik - you are considered more of a wannabe - 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 option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -10
+		pcs_traits['nerd_points'] = -10
 		gs 'intro_sg_select', 'gopnik'
 		alterstrtimg = 20
 		pcs_chrsm = 40
@@ -1236,7 +1236,7 @@ if $ARGS[0] = 'alternative':
 	'However, you have problems at home and school due to your behavior. This is especially true with your mother and stepfather, who see you going down the wrong path.'
 	act 'Select another': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -20
+		pcs_traits['nerd_points'] = -20
 		pcs_exhib = 25
 		Exhibitionist_lvl = 1
 		addictive_exp = 1
@@ -1434,9 +1434,9 @@ if $ARGS[0] = 'goodgirl':
 	'You love the attention you get from adults, and while you can feel lonely at times, you''re pretty happy knowing you''re a good girl. The nerds seem to tolerate you the most, likely because they almost never misbehave and always do their homework anyways.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
-		traits['nerd_lernHome'] = 5
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
+		pcs_traits['nerd_lernHome'] = 5
 		gs 'intro_sg_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -10, -5, 10, -20, 0, 20
 		npc_rel['A25'] -= 5
@@ -1493,8 +1493,8 @@ if $ARGS[0] = 'slut':
 	'However, your sex addiction has made you a social pariah. The girls all despise you and the boys publicly mock you, although they don''t mind using you. The nerds completely avoid you, while the gopniks seem to tolerate you the most, likely because they enjoy taking advantage of you.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		trait['commando_lvl'] = 2
-		trait['cumeater'] = 1 and cumeater_cheat = 1
+		pcs_traits['commando_lvl'] = 2
+		pcs_traits['cumeater'] = 1 and cumeater_cheat = 1
 		pcs_exhib = 40
 		Exhibitionist_lvl = 1
 		motherKnowSpravka = 1
@@ -1567,7 +1567,7 @@ if $ARGS[0] = 'slut':
 		guy = 15
 		orgasm = 120
 		swallow = 40
-		trait['cumeater'] = 1
+		pcs_traits['cumeater'] = 1
 		grupvalue[4] = 100
 		willpowermax = 50
 		motherKnowWhore = 1
@@ -1598,7 +1598,7 @@ if $ARGS[0] = 'goth':
 	'Fortunately, not everyone listens to them. 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 night one day. A few of the gopniks like your party attitude, specifically those in the band, who seem to respect your artistic disposition. Or their lead singer just wants to get in your panties. It''s hard to tell.'
     act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -10
+		pcs_traits['nerd_points'] = -10
 		gs 'intro_sg_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -5, 0, 0, +10, 0, -10
         npc_rel['A28'] -= 20

locations/intro_sg_select_custom.qsrc

@@ -6,11 +6,11 @@ if $ARGS[0] = 'start':
 	act 'Confirm these options':
 		dynamic 'grupvalue[<<grupTipe>>] = 600'
 		if $soc_grup = 'nerd':
-			traits['nerd_points'] = 60
-			traits['nerd_status'] = 2
-			traits['nerd_lernHome'] = 5
+			pcs_traits['nerd_points'] = 60
+			pcs_traits['nerd_status'] = 2
+			pcs_traits['nerd_lernHome'] = 5
 		elseif $soc_grup = 'gopnik':
-			traits['nerd_points'] = -20
+			pcs_traits['nerd_points'] = -20
 		end
 		if pcs_inhib < 10: pcs_inhib = 10
 		!!This line should get sveta to wear school uniform because she has no other clothing with > 50

locations/katja_uni.qsrc

@@ -1003,7 +1003,7 @@ if $ARGS[0] = 'studying_exam':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/studying_together.jpg"></center>'
 	!!Nerds like studying and so their mood improves a little. Everybody else gets in a worse mood by studying.
 	gs 'exp_gain', 'intel', max(0,rand(-1,1))
-	pcs_mood += (traits['nerd_status']*5 -10)
+	pcs_mood += (pcs_traits['nerd_status']*5 -10)
 	minut += 30
 	'You and Katja start studying for the <<$ARGS[2]>> exam. The library is mostly quiet, so you try to keep your voices down, though she can''t always help herself when she gets excited about the material before realizing her volume and turning red with embarrassment.'
 	if pcs_sleep < 5:

locations/model_mari.qsrc

@@ -509,7 +509,7 @@ if $ARGS[0] = 'mari_chat':
 			act'I buy from Fashionista':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading2.jpg"></center>'
-				'"I get most of my underwear from Pussy Kats," you tell her.'
+				'"I get most of my underwear from Fashionista," you tell her.'
 				'"Oh yeah? I''ve never shopped there before. What kind of stuff do they have?"'
 				'"Super stylish and fancy. Very lacy. I really like it."'
 				'"Oh. I''m not really into lace. A bit uncomfortable for me. Maybe I''ll try something else. Thanks for the suggestion though!"'
@@ -540,7 +540,7 @@ if $ARGS[0] = 'mari_chat':
 				end
 			end
 			
-			if trait['commando_lvl'] = 3:
+			if pcs_traits['commando_lvl'] = 3:
 				act'I don''t wear underwear':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading5.jpg"></center>'

locations/natkolEv.qsrc

@@ -830,7 +830,7 @@ end
 
 if $ARGS[0] = 'cumeater':
 	!! viable locations: face, tits, belly, labia, pussy, butt, anus
-	if trait['cumeater'] = 1 and brotherSex >= 6:
+	if pcs_traits['cumeater'] = 1 and brotherSex >= 6:
 		cla
 		$temp_loc = $ARGS[1]
 		*nl

locations/pav_disco_sex.qsrc

@@ -684,7 +684,7 @@ if $ARGS[0] = 'handjob_end':
 		'"See you later!" you grin while waggling your cum covered fingers at him, leaving him with his cock hanging out and covered in his own cum.'
 		act 'Head back inside':gt'pav_disco'
 		
-		if trait['cumeater'] < 0:
+		if pcs_traits['cumeater'] < 0:
 			act 'Lick your hand clean on the way':
 				cla & *clr
 				stat['swallow'] += 1
@@ -1062,7 +1062,7 @@ if $ARGS[0] = 'disco_cum':
 		act 'Suck him off instead':gt'pav_disco_sex','disco_cum_mouth'
 	elseif gdk['cum'] = 4:
 		if gdk['condom'] = 1:
-			gs'cum_call','', $boy, 3
+			gs'cum_call','', $boy, 1, 3
 			$gdk['cum'] = 'condom'
 			act 'Continue':gt'pav_disco_sex','disco_condom1'
 		elseif gdk['condom'] = 2:

locations/pav_library.qsrc

@@ -127,18 +127,18 @@ 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 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):
-		act 'Do your homework (1:00'+iif(traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
+	gs 'willpower', 'misc', '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')+')':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/homework.jpg"></center>'
 			minut += 60
-			pcs_mood += 5 * traits['nerd_status']
+			pcs_mood += 5 * pcs_traits['nerd_status']
 			lern += 1
-			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 'willpower', 'misc', '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'
 			gs 'grades', 'homework', 'school', 'yes', 1, 0, 0
 			'You sit down at one of the tables with a a computer and use it to help you do your homework.'

locations/pav_parkev.qsrc

@@ -1752,7 +1752,7 @@ if $ARGS[0] = 'drinking_game':
 	player_tol = (pcs_health/4)/10
 	
 
-	if traits['alko_status'] ! 1:
+	if pcs_traits['alko_status'] ! 1:
 	 !lightweight
 		player_time = rand(player_tol,99) - 29
 	else 

locations/qwBarBilliard.qsrc

@@ -306,12 +306,12 @@ if $ARGS[0] = 'billiard_ev1':
 										'As Martin groans quietly, moments away from climax, you become acutely aware of the heat between your legs. The forbidden nature of what you''re doing apparently isn''t lost on your pussy, regardless of whether your conscious mind is turned on or scared.'
 										*nl
 										'Finally, your latin lover bends his head back as he empties his sperm into your mouth. You double your efforts, licking and sucking even harder.'
-										$orgasm_txt = 'Or at least you try: You moan around Martin''s cock when the first jet of his ' + iif(trait['cumeater']=1,'tasty ','') + 'cum lands on your tongue and pushes you over the edge, making it difficult to focus on his pleasure. You think you manage quite well, but you don''t have to look up to see the self-satisfied expression on Martin''s face when he realizes that you came from sucking his cock - from him cumming in your mouth, in fact.'
+										$orgasm_txt = 'Or at least you try: You moan around Martin''s cock when the first jet of his ' + iif(pcs_traits['cumeater']=1,'tasty ','') + 'cum lands on your tongue and pushes you over the edge, making it difficult to focus on his pleasure. You think you manage quite well, but you don''t have to look up to see the self-satisfied expression on Martin''s face when he realizes that you came from sucking his cock - from him cumming in your mouth, in fact.'
 										gs 'arousal', 'bj', 2, 'exhibitionism'
 										gs 'stat'
 										gs 'cum_call', 'mouth', $boy, 1
 										*nl
-										'When his orgasm subsides, you audibly swallow Martin''s ' + iif(trait['cumeater']=1,'delicious ','') + 'load and show him your clean tongue. The barkeeper smiles at how ' + iif(pcs_dom>=30,'bold','shy') + ' you are about this gesture.'
+										'When his orgasm subsides, you audibly swallow Martin''s ' + iif(pcs_traits['cumeater']=1,'delicious ','') + 'load and show him your clean tongue. The barkeeper smiles at how ' + iif(pcs_dom>=30,'bold','shy') + ' you are about this gesture.'
 										'After that, you quickly return to reality when the sound of breaking glass reminds you of the bar behind the curtain. Martin zips his pants back up and you barely have time to get up on your feet when two guys pull the veil aside, looking to play a game of billiards.'
 										*nl
 										'They seem just as surprised as you to see each other, but they just give Martin a friendly "hello" before the two of you leave. As Martin strides towards the source of the noise you heard, you stay back long enough to hear the guys at the pool table break into wild speculations.'

locations/saveupdater.qsrc

@@ -236,19 +236,19 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	!! ----- Mom, Luda & Olu stuff ----- 0.8.0
 
 	!!trait update
-	if traits['update_1'] = 0:
-		traits['update_1'] = 1
+	if pcs_traits['update_1'] = 0:
+		pcs_traits['update_1'] = 1
 
-		traits['alko_day'] = alko_trait_day
-		traits['alko_points'] = alko_trait_counter
-		traits['alko_status'] = alko_trait
+		pcs_traits['alko_day'] = alko_trait_day
+		pcs_traits['alko_points'] = alko_trait_counter
+		pcs_traits['alko_status'] = alko_trait
 
 		killvar 'alko_trait_day'
 		killvar 'alko_trait_counter'
 		killvar 'alko_trait'
 	end
 	
-	if trt_cumeater = 1:trait['cumeater'] = 1 & trt_cumeater = 7
+	if trt_cumeater = 1:pcs_traits['cumeater'] = 1 & trt_cumeater = 7
 
 	!! ----- Other bug fixes and cleanup ----- 0.8.0
 	if pcs_gaming_exp > 0: gs 'exp_gain', 'gaming', pcs_gaming_exp & killvar 'pcs_gaming_exp'
@@ -1504,6 +1504,21 @@ end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080806:
 	if $wardrobeDefaultPagePref = 'savedOutfits':$wardrobeDefaultPagePref = 'default1'
+if traits > 0 or trait > 0:
+	
+	pcs_traits['nerd_status'] = traits['nerd_status']
+	pcs_traits['cumeater'] = trait['cumeater']
+	pcs_traits['commando_lvl'] = trait['commando_lvl']
+	pcs_traits['commando_exp'] = trait['commando_exp']
+	pcs_traits['alko_status'] = traits['alko_status']
+	pcs_traits['alko_points'] = traits['alko_points']
+	pcs_traits['buttslut_lvl'] = traits['buttslut_lvl']
+	pcs_traits['nerd_lernHome'] = traits['nerd_lernHome']
+	pcs_traits['nerd_points'] = traits['nerd_points']
+	pcs_traits['nerd_lessons'] = traits['nerd_lessons']
+	
+	killvar 'traits'
+	killvar 'trait'
 end
 
 gs 'saveg'

locations/stat.qsrc

@@ -423,6 +423,8 @@ if sec >= 60:
 	if sec >= 60:jump 'loopsec'
 end
 
+!! Hourly Changes
+
 if minut >= 60:
 	:loopmin
 	hour += 1
@@ -547,10 +549,10 @@ if minut >= 60:
 		end
 	end
 
-	if $pantyworntype = 'none' and PCloPants > 0 and PCloPanties = 0 and $clothingworntype ! 'nude' and trait['commando_lvl'] < 2:
-		if trait['commando_lvl'] < 1:
+	if $pantyworntype = 'none' and PCloPants > 0 and PCloPanties = 0 and $clothingworntype ! 'nude' and pcs_traits['commando_lvl'] < 2:
+		if pcs_traits['commando_lvl'] < 1:
 			mosol += 2
-		elseif trait['commando_lvl'] = 1:
+		elseif pcs_traits['commando_lvl'] = 1:
 			mosol += 1
 		end
 		
@@ -643,6 +645,8 @@ if minut >= 60:
 	if minut >= 60:jump 'loopmin'
 end
 
+!! End of Hourly Changes
+
 if hour >= 24: gs 'cikl'
 
 if minut < 10:
@@ -773,55 +777,60 @@ else
 		if $clothingworntype ! 'nude':
 			if $pantyworntype = 'none':
 !! Addition to trait exp/lvls
-				if trait['commando_lvl'] = 0:
+				if pcs_traits['commando_lvl'] = 0:
 					if PCloSkirt > 0:
-						trait['commando_exp'] += 2
+						pcs_traits['commando_exp'] += 2
 					else
-						trait['commando_exp'] += 1
+						pcs_traits['commando_exp'] += 1
 					end
-					if trait['commando_exp'] >= 1000:
-						trait['commando_exp'] = 50
-						trait['commando_lvl'] = 1
+					if pcs_traits['commando_exp'] >= 1000:
+						pcs_traits['commando_exp'] = 50
+						pcs_traits['commando_lvl'] = 1
 						msg'You have gained the Commando trait! You have become accustomed to the idea you don''t have to wear panties all the time and can now comfortably wear skirts without panties. Pants are still a little itchy though...'
 					end
-				elseif trait['commando_lvl'] = 1:
-					trait['commando_exp'] += 2
-					if trait['commando_exp'] >= 1000:
-						trait['commando_exp'] = 50
-						trait['commando_lvl'] = 2
+				elseif pcs_traits['commando_lvl'] = 1:
+					pcs_traits['commando_exp'] += 2
+					if pcs_traits['commando_exp'] >= 1000:
+						pcs_traits['commando_exp'] = 50
+						pcs_traits['commando_lvl'] = 2
 						msg'You have gained the 2nd level of the Commando trait! You have become very comfortable without panties and the raw insides of your pants no longer irritate your pussy.'
 					end
-				elseif trait['commando_lvl'] = 2:
+				elseif pcs_traits['commando_lvl'] = 2:
 					mosol = 0
-					trait['commando_exp'] += 2
-					if trait['commando_exp'] >= 1000:
-						trait['commando_exp'] = 500
-						trait['commando_lvl'] = 3
+					pcs_traits['commando_exp'] += 2
+					if pcs_traits['commando_exp'] >= 1000:
+						pcs_traits['commando_exp'] = 500
+						pcs_traits['commando_lvl'] = 3
 						msg'You have gained the 3rd level of the Commando trait! You have become so accustomed to going commando that any kind of underwear over your hips just feels <i>wrong</i>. You suffer mood penalties while wearing panties.'
 					end
-				elseif trait['commando_lvl'] = 3:
-					trait['commando_exp'] += 1
+				elseif pcs_traits['commando_lvl'] = 3:
+					pcs_traits['commando_exp'] += 1
 				end
-			elseif trait['commando_lvl'] > 0:
+			elseif pcs_traits['commando_lvl'] > 0:
 !!Reduction from exp/lvls
-				if trait['commando_lvl'] = 3:
-					trait['commando_exp'] -= 1
+				if pcs_traits['commando_lvl'] = 3:
+					pcs_traits['commando_exp'] -= 1
 					pcs_mood -= 1
-					if trait['commando_exp'] <= 0:
-						trait['commando_exp'] = 500
-						trait['commando_lvl'] = 2
+					if pcs_traits['commando_exp'] <= 0:
+						pcs_traits['commando_exp'] = 500
+						pcs_traits['commando_lvl'] = 2
 						msg'You have lost the 3rd level of the Commando trait! You are now only comfortable not wearing panties and will not suffer irritation from wearing pants while going commando.'
 					end
 				else
-					trait['commando_exp'] -= 1
-					if trait['commando_exp'] <= -0:
-						trait['commando_exp'] = 900
-						trait['commando_lvl'] -= 1
+					pcs_traits['commando_exp'] -= 1
+					if pcs_traits['commando_exp'] <= -0:
+						pcs_traits['commando_exp'] = 900
+						pcs_traits['commando_lvl'] -= 1
 					end
 				end
 			end
+!!{			
+			if $braworntype = 'none':
+				
+			end}
 		end
 
+
 !!	This is the Succubus non-direct injection (pun intented) sex to sexnutrition and the sexnutrition conversion handling
 		if succubusflag = 1:
 			if hypnoAddict > 0: dynamic $RestTherapyVariables

locations/stat_display.qsrc

@@ -548,19 +548,19 @@ if $pantyworntype = 'none' and PCloswimwear = 0 and PCloPanties = 0:
 	elseif PCloBimbo = 1 or bimbolevel > 0 and PCloSkirt > 3 and cheatBimbo = 0:
 		$stat_panty_msg = 'You like, totally forgot to put on any panties. You are such a bimbo.'
 		$stat_panty_text = '<BR><font color = #FF00FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and trait['commando_lvl'] > 0:
+	elseif PCloSkirt > 3 and pcs_traits['commando_lvl'] > 0:
 		$stat_panty_msg = 'You feel liberated not wearing panties as your naked ass flashes from under your short skirt.'
 		$stat_panty_text = '<BR><font color=#0064FF><<$stat_panty_msg>></font>'
-	elseif PCloSkirt > 3 and trait['commando_lvl'] < 1:
+	elseif PCloSkirt > 3 and pcs_traits['commando_lvl'] < 1:
 		if pcs_inhib <= 50:
 			$stat_panty_msg = 'Your face is flushed with shame. You are not wearing panties, and your naked ass flashes from under your short skirt.'
 		else
 			$stat_panty_msg = 'It feels odd and a bit uncomfortable not wearing panties with such a short skirt. Your naked ass flashes from under it.'
 		end
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif PCloPants > 0 and trait['commando_lvl'] = 2:
+	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 2:
 		$stat_panty_msg = 'You are comfortably commando, not bothered at all by your bare pussy rubbing against the inside of your pants.'
-	elseif PCloPants > 0 and trait['commando_lvl'] = 3:
+	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 3:
 		$stat_panty_msg = 'You are happily commando, feeling very comfortable with your ass and pussy touching the inside of your pants.'
 	elseif PCloPants > 0 and $braworntype = 'none':
 		$stat_panty_msg = 'You aren''t wearing underwear, and your bare pussy is rubbing against your clothing.'
@@ -571,7 +571,7 @@ if $pantyworntype = 'none' and PCloswimwear = 0 and PCloPanties = 0:
 	elseif towel = 1:
 		$stat_panty_msg = 'Your naked body is covered only by a short towel.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
-	elseif $clothingworntype ! 'nude' and trait['commando_lvl'] < 1:
+	elseif $clothingworntype ! 'nude' and pcs_traits['commando_lvl'] < 1:
 		$stat_panty_msg = 'You are not wearing panties and it makes you uncomfortable.'
 		$stat_panty_text = '<BR><font color = #AB052A><<$stat_panty_msg>></font>'
 	elseif $clothingworntype ! 'nude':
@@ -587,11 +587,11 @@ elseif $pantyworntype = 'exhibitionist' and PCloswimwear = 0:
 	elseif PCloSkirt > 3 and pcs_inhib <= 50:
 		$stat_panty_msg = 'Your face is flushed with shame. You are wearing panties so thin they leave your ass clearly visible as it flashes from under your short skirt.'
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
-	elseif PCloPants > 0 and trait['commando_lvl'] = 3:
+	elseif PCloPants > 0 and pcs_traits['commando_lvl'] = 3:
 		$stat_panty_msg = 'You wearing transparent panties, but that you''re wearing any at all is bringing down your mood.'
 		$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
 	end
-elseif $pantyworntype ! 'none' and trait['commando_lvl'] = 3:
+elseif $pantyworntype ! 'none' and pcs_traits['commando_lvl'] = 3:
 	$stat_panty_msg = 'You wearing panties and it makes you uncomfortable.'
 	$stat_panty_text = '<BR><b><font color="red"><<$stat_panty_msg>></font></b>'
 end
@@ -1104,9 +1104,9 @@ if cheatStatusIcons = 0:
 
 	if $stat_visible_cum_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_visible_cum_msg"><img title="People can see the cum on your body!" height = <<set_siconht>> src="images/system/icons/status/visible_cum.png"></a></td>'
 
-	if stat_cumloc_check = 1 and trait['cumeater'] = 1 and cumeater_cheat = 0 and menu_off = 0:
+	if stat_cumloc_check = 1 and pcs_traits['cumeater'] = 1 and cumeater_cheat = 0 and menu_off = 0:
 		$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
-	elseif stat_cumloc_check = 1 and trait['cumeater'] = 1 and cumeater_cheat = 0 and menu_off = 1:
+	elseif stat_cumloc_check = 1 and pcs_traits['cumeater'] = 1 and cumeater_cheat = 0 and menu_off = 1:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/cum_eater.png"></a></td>'
 	end
 
@@ -1280,9 +1280,9 @@ if cheatStatusIcons = 0:
 
 	if $stat_bra_msg ! '' and $braworntype = 'none': $statusIconBarTab += '<td><a href="exec: msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = <<set_siconht>> src="images/system/icons/status/boobs_'+iif(night_mode ! 3 and (($location_type = 'public_outdoors' and daystage = 5) or night_mode = 1 or night_mode = 2), 'white', 'black')+'.png"></a></td>'
 
-	if $stat_panty_msg ! '' and $pantyworntype ! 'none' and trait['commando_lvl'] < 3:
+	if $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] < 3:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/panties.png"></a></td>'
-	elseif $stat_panty_msg ! '' and $pantyworntype ! 'none' and trait['commando_lvl'] = 3:
+	elseif $stat_panty_msg ! '' and $pantyworntype ! 'none' and pcs_traits['commando_lvl'] = 3:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = <<set_siconht>> src="images/system/icons/status/panties_red.png"></a></td>'
 	end
 

locations/stol.qsrc

@@ -148,19 +148,19 @@ 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 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):
+	gs 'willpower', 'misc', '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.')
-		act 'Do some homework (1:00'+iif(traits['nerd_status'] = 3, '', ' and <<will_cost>> Willpower')+')':
+		act 'Do some homework (1:00'+iif(pcs_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']
+			pcs_mood += 5 * pcs_traits['nerd_status']
 			lern += 1
-			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 'willpower', 'misc', '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'
 			if komp = 1:
 				gs 'grades', 'homework', 'school', 'yes', 1, 0, 0
@@ -176,16 +176,16 @@ if $ARGS[0] = 'stolPar':
 	end
 	
 	will_cost = will_cost * lernHome
-	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')+')':
+	if lernHome > 1 and (will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3):
+		act 'Finish all of your homework (<<lernHome>>:00'+iif(pcs_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 <<temp>> hours to complete your homework.'
 			minut += 60 * lernHome
-			pcs_mood += 5 * traits['nerd_status'] *lernHome
+			pcs_mood += 5 * pcs_traits['nerd_status'] *lernHome
 			lern += 1 + lernHome/2
 			temp = lernHome
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs'stat'
 			if komp = 1:
 				gs 'grades', 'homework', 'school', 'yes', lernHome, 0, 0
@@ -420,7 +420,7 @@ if $ARGS[0] = 'studying_exam':
 	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/homework.jpg"></center>'
 	!!Nerds likes studying and so their mood improves a little. Everbody else get in a worse mood by studying.
 	gs 'exp_gain', 'intel', max(0,rand(-1,1))
-	pcs_mood += (traits['nerd_status']*5 -10)
+	pcs_mood += (pcs_traits['nerd_status']*5 -10)
 	minut += 30
 	if pcs_sleep < 5:
 		no_study = 1

locations/therapist.qsrc

@@ -1753,7 +1753,7 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
 		'"Cunt, It seems like you are still trying to resist my rules regarding panties. We need to change these rebelious behaviours as soon as possible. From now on you prefer not wearing panties than wearing panties. In fact, you <i>hate</i> wearing them! You find them to be restrictive and annoying. Just the thought of wearing panties make you feel uncomfortable"'
-		trait['commando_lvl'] = 3
+		pcs_traits['commando_lvl'] = 3
 		act 'Continue':
 		msg 'You have gained the 3rd level of the Commando trait! From now on any kind of underwear over your hips just feels <i>wrong</i>. You suffer mood penalties while wearing panties.'
 			gt 'therapist', 'hypnoEnd'

locations/traits.qsrc

@@ -73,18 +73,18 @@ if $ARGS[0] = 'menu':
 	
 	*nl
 	
-	if traits['nerd_status'] = 0:
+	if pcs_traits['nerd_status'] = 0:
 		'<center><b>Likes learning</b></center>'
-		'You don''t have this trait but have <<traits[''nerd_points'']>> points. You need to earn <<40 - traits[''nerd_points'']>> more points to get level 1 of this trait.'
-	elseif traits['nerd_status'] = 1:
+		'You don''t have this trait but have <<pcs_traits[''nerd_points'']>> points. You need to earn <<40 - pcs_traits[''nerd_points'']>> more points to get level 1 of this trait.'
+	elseif pcs_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:
+		'You have level 1 of this trait and <<pcs_traits[''nerd_points'']>> points. You need to earn <<60 - pcs_traits[''nerd_points'']>> more points to get level 2 of this trait. If you fall below 20 points, you''ll lose this trait.'
+	elseif pcs_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 <<80 - traits[''nerd_points'']>> more points to get level 3 of this trait. If you fall below 40 points, you''ll fall back to level 1.'		
-	elseif traits['nerd_status'] = 3:
+		'You have level 2 of this trait and <<pcs_traits[''nerd_points'']>> points. You need to earn <<80 - pcs_traits[''nerd_points'']>> more points to get level 3 of this trait. If you fall below 40 points, you''ll fall back to level 1.'		
+	elseif pcs_traits['nerd_status'] = 3:
 		'<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.'		
+		'You have level 3 of this trait and <<pcs_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.'
 	
@@ -111,11 +111,11 @@ if $ARGS[0] = 'menu':
 	*nl
 	
 	'<center><b>Cumeater</b></center>'
-	if trait['cumeater'] = 0 and cumeater_cheat = 0:
+	if pcs_traits['cumeater'] = 0 and cumeater_cheat = 0:
 		'You do not have this trait.'
 		'To gain this trait, you must swallow cum 10 times.'
 		'You have swallowed cum <<stat[''swallow'']>> times.'
-	elseif trait['cumeater'] = 0 and cumeater_cheat = 1:
+	elseif pcs_traits['cumeater'] = 0 and cumeater_cheat = 1:
 		'You do not have this trait.'
 	else
 		'You have this trait.'
@@ -124,26 +124,26 @@ if $ARGS[0] = 'menu':
 	end
 	
 	*nl
-	if trait['commando_exp'] > 0 or trait['commando_lvl'] > 0:'<center><b>Commando</b></center>'
-	if trait['commando_lvl'] = 0 and trait['commando_exp'] > 0:
+	if pcs_traits['commando_exp'] > 0 or pcs_traits['commando_lvl'] > 0:'<center><b>Commando</b></center>'
+	if pcs_traits['commando_lvl'] = 0 and pcs_traits['commando_exp'] > 0:
 		'You need to gain more experience not wearing panties with clothing to gain this trait.'
-	elseif trait['commando_lvl'] = 1:
+	elseif pcs_traits['commando_lvl'] = 1:
 		'You have this trait at level 1.'
 		'You''re starting to get used to not wearing panties. Skirts are quite comfortable without them, but you still find the friction of pants to be a bit irritating.'
-	elseif trait['commando_lvl'] = 2:
+	elseif pcs_traits['commando_lvl'] = 2:
 		'You have this trait at level 2.'
 		'You are perfectly comfortable wearing any kind of clothing without panties. Your pussy is no longer irritated when wearing pants without panties.'
-	elseif trait['commando_lvl'] = 3:
+	elseif pcs_traits['commando_lvl'] = 3:
 		'You have this trait at level 3.'
 		'You are more comfortable without panties than with them. In fact, you <i>hate</i> wearing them! They''re restrictive and annoying. You suffer mood penalties when wearing panties.'
 	end
 	
 	*nl
 	
-	if traits['alko_status'] = -1:
+	if pcs_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 effects of alcohol.'
-	elseif traits['alko_status'] = 1:
+	elseif pcs_traits['alko_status'] = 1:
 		'<center><b>Heavyweight</b></center>'
 		'You''ve built up a tolerance, making it harder for you to feel the effects of alcohol.'
 	end
@@ -152,20 +152,20 @@ if $ARGS[0] = 'menu':
 
 	!!exp earned from anal sex but degrades over time. Level 3 can be lost but lvl1 and 2 cannot
 	'<center><b>Buttslut</b></center>'
-	if traits['buttslut_lvl'] = 0:
+	if pcs_traits['buttslut_lvl'] = 0:
 		'You need to have more anal orgasms to gain this trait. To reach lvl 1 you need to have more than 10 anal orgasms.'
 		'You currently have had <<orgasm_anal>> anal orgasms.'
-	elseif traits['buttslut_lvl'] = 1:
+	elseif pcs_traits['buttslut_lvl'] = 1:
 		'You have this trait at level 1. To reach lvl 2 you need to gain more anal orgasm exp.'
-		'You currently have <<traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
+		'You currently have <<pcs_traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
 		'You''re starting to enjoy anal sex ' + iif(stat['think_virgin'] = 0, 'almost as much as regular sex.', 'more than before.')
-	elseif traits['buttslut_lvl'] = 2:
+	elseif pcs_traits['buttslut_lvl'] = 2:
 		'You have this trait at level 2. To reach lvl 3 you need to gain more anal orgasm exp.'
-		'You currently have <<traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
+		'You currently have <<pcs_traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
 		'You''re enjoy anal sex ' + iif(stat['think_virgin'] = 0, 'as much as regular sex.', 'a great deal.')
-	elseif traits['buttslut_lvl'] = 3:
+	elseif pcs_traits['buttslut_lvl'] = 3:
 		'You have this trait at level 3. This is the highest level.'
-		'You currently have <<traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
+		'You currently have <<pcs_traits[''buttslut_exp'']>> experience. Having more anal orgasms will increase this, otherwise it will degrade over time.'
 		if stat['think_virgin'] = 0:
 			'You now enjoy anal sex more than regular sex.'
 		else
@@ -178,114 +178,136 @@ if $ARGS[0] = 'menu':
 end
 
 if $ARGS[0] = 'hourly':
-	if stat['swallow'] >= 10 and trait['cumeater'] = 0 and cumeater_cheat = 0:
-		trait['cumeater'] = 1
+	if stat['swallow'] >= 10 and pcs_traits['cumeater'] = 0 and cumeater_cheat = 0:
+		pcs_traits['cumeater'] = 1
 		msg 'You have gained the trait "Cumeater"'
 	end
 end
 
+if $ARGS[0] = 'creampie_fetish':
+	pcs_traits['creampie_fetish'] = 1
+	msg 'You have gained the Creampie Fetish trait! Your desire for creampies are so strong that you can''t help but orgasm when a big load of spunk is poured into your pussy, whether you asked for it or not ;)'
+end
+
+if $ARGS[0] = 'fitness_freak':
+	pcs_traits['fitness_freak'] = 1
+	msg '"You don''t know if it''s something you learned or something is just wrong with your brain. You love exercise. It feels good. *Really* good. Yeah. *That* kind of good. You get turned on when you exercise and the people around you can subconsciously sense it.'
+	
+	'Exercise increases your arousal and for a short time after, you ignore the appearance penalties of sweat, adding them as a bonus to your appearance instead."'
+end
+
+if $ARGS[0] = 'stiff_nipples':
+	pcs_traits['pokies'] = 1
+	msg 'You have particularly stiff nipples. They''re always hard, even when you''re not aroused. So hard that they''ll give you pokies through a bra that other girls would get away with without one.'
+end
+
+if $ARGS[0] = 'wet_pussy':
+	pcs_traits['wet_pussy'] = 1
+	msg 'You get wetter than other girls, especially when aroused.'
+end
+
 if $ARGS[0] = 'overnight':
-	!!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
+	!!pcs_traits['alko_status']: light weight (-1), normal (0), heavy weight (+1)
+	!!pcs_traits['alko_points']: between -100 and 100, tracks if sveta is a light or heavy wight
+	!!pcs_traits['alko_day']: amount of alko sveta has drunk today
 	
 	!!Gains/Decay
-	if traits['alko_day'] > 0:
-		if traits['alko_day'] > 9:
-			traits['alko_points'] += 9
+	if pcs_traits['alko_day'] > 0:
+		if pcs_traits['alko_day'] > 9:
+			pcs_traits['alko_points'] += 9
 		else
-			traits['alko_points'] += traits['alko_day']
+			pcs_traits['alko_points'] += pcs_traits['alko_day']
 		end
-	elseif traits['alko_day'] = 0:
-		traits['alko_points'] -= 2
+	elseif pcs_traits['alko_day'] = 0:
+		pcs_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
+			pcs_traits['nerd_lernHome'] = 0
+			pcs_traits['nerd_points'] -= 1
+		elseif lernHome = 0 and pcs_traits['nerd_lernHome'] < 5:
+			pcs_traits['nerd_lernHome'] += 1
+		elseif pcs_traits['nerd_lernHome'] = 5:
+			pcs_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)
+		if pcs_traits['nerd_lessons'] > 20:
+			pcs_traits['nerd_points'] += pcs_traits['nerd_lessons'] - 17
+		elseif pcs_traits['nerd_lessons'] < 14:
+			pcs_traits['nerd_points'] -= iif(pcs_traits['nerd_status'] > 0, 5, 10)
 		end
-		traits['nerd_lessons'] = 0
+		pcs_traits['nerd_lessons'] = 0
 	elseif university['semester_week'] > 0 and university['student'] = 1 and week = 5:
 		!!This is for being a university student, with only 9 weekly classes and no homework the gain is a little more aggressive from classes.
-		if traits['nerd_lessons'] > 7:
-			traits['nerd_points'] += (traits['nerd_lessons']-7)*5
-		elseif traits['nerd_lessons'] < 4:
-			traits['nerd_points'] -= iif(traits['nerd_status'] > 0, 5, 10)
+		if pcs_traits['nerd_lessons'] > 7:
+			pcs_traits['nerd_points'] += (pcs_traits['nerd_lessons']-7)*5
+		elseif pcs_traits['nerd_lessons'] < 4:
+			pcs_traits['nerd_points'] -= iif(pcs_traits['nerd_status'] > 0, 5, 10)
 		end
-		traits['nerd_lessons'] = 0	
+		pcs_traits['nerd_lessons'] = 0	
 	end	
 	
 	!!Trait selection
-	if traits['alko_points'] > 50 and traits['alko_status'] < 1:
-		traits['alko_status'] = 1
+	if pcs_traits['alko_points'] > 50 and pcs_traits['alko_status'] < 1:
+		pcs_traits['alko_status'] = 1
 		msg 'You have gained the trait ''Heavyweight''.'
-	elseif traits['alko_points'] < -50 and traits['alko_status'] > -1:
-		traits['alko_status'] = -1	
+	elseif pcs_traits['alko_points'] < -50 and pcs_traits['alko_status'] > -1:
+		pcs_traits['alko_status'] = -1	
 		msg 'You have gained the trait ''Lightweight''.'
-	elseif traits['alko_status'] = -1 and traits['alko_points'] > 0:
-		traits['alko_status'] = 0
+	elseif pcs_traits['alko_status'] = -1 and pcs_traits['alko_points'] > 0:
+		pcs_traits['alko_status'] = 0
 		msg 'You have lost the trait ''Lightweight''.'
-	elseif traits['alko_status'] = 1 and traits['alko_points'] < 0:
-		traits['alko_status'] = 0
+	elseif pcs_traits['alko_status'] = 1 and pcs_traits['alko_points'] < 0:
+		pcs_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
+	if pcs_traits['nerd_points'] > 80 and pcs_traits['nerd_status'] < 3:
+		pcs_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
+	elseif pcs_traits['nerd_points'] > 60 and pcs_traits['nerd_status'] < 2:
+		pcs_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
+	elseif pcs_traits['nerd_points'] > 40 and pcs_traits['nerd_status'] < 1:
+		pcs_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
+	elseif pcs_traits['nerd_points'] < 60 and pcs_traits['nerd_status'] = 3:
+		pcs_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
+	elseif pcs_traits['nerd_points'] < 40 and pcs_traits['nerd_status'] = 2:
+		pcs_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
+	elseif pcs_traits['nerd_points'] < 20 and pcs_traits['nerd_status'] = 1:
+		pcs_traits['nerd_status'] = 0
 		msg 'You have lost the trait ''Likes learning''.'		
 	end
 	
 	!!Trait effects
-	if traits['nerd_status'] = 3:
+	if pcs_traits['nerd_status'] = 3:
 		grupvalue[1] -= 1
 		grupvalue[3] += rand(1,2)
 		grupvalue[4] -= rand(1,2)		
-	elseif traits['nerd_status'] = 2:
+	elseif pcs_traits['nerd_status'] = 2:
 		grupvalue[3] += 1
 		grupvalue[4] -= 1
-	elseif traits['nerd_status'] = 1:
+	elseif pcs_traits['nerd_status'] = 1:
 		grupvalue[3] += rand(0,1)
 	end
 
 	!!Cleanup
-	traits['alko_day'] = 0
-	if traits['alko_points'] > 100: 
-		traits['alko_points'] = 100
-	elseif traits['alko_points'] < -100: 
-		traits['alko_points'] = -100
+	pcs_traits['alko_day'] = 0
+	if pcs_traits['alko_points'] > 100: 
+		pcs_traits['alko_points'] = 100
+	elseif pcs_traits['alko_points'] < -100: 
+		pcs_traits['alko_points'] = -100
 	end
 	
-	if traits['nerd_points'] > 100:
-		traits['nerd_points'] = 100
-	elseif traits['nerd_points'] < -100:
-		traits['nerd_points'] = -100
+	if pcs_traits['nerd_points'] > 100:
+		pcs_traits['nerd_points'] = 100
+	elseif pcs_traits['nerd_points'] < -100:
+		pcs_traits['nerd_points'] = -100
 	end
 end
 

locations/uni_lessons1.qsrc

@@ -18,15 +18,15 @@ 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 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. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'general education 101', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Kovalyov for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you''ve learned something from actively taking part in the discussion.'
@@ -256,15 +256,15 @@ 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 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. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'teaching methods 101', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Pasternak for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
@@ -509,15 +509,15 @@ 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 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. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_1', 'learning theories 101', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mrs. Kovalchuk for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'

locations/uni_lessons2.qsrc

@@ -13,15 +13,15 @@ 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 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. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'general education 102', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Kovalyov for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you''ve learned something from actively taking part in the discussion.'
@@ -251,15 +251,15 @@ 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 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. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'teaching methods 102', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Pasternak for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
@@ -504,15 +504,15 @@ 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 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. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_2', 'psychology of a student 101', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mrs. Kovalchuk for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'

locations/uni_lessons3.qsrc

@@ -13,15 +13,15 @@ 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 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. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'general education 201', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Kovalyov for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you''ve learned something from actively taking part in the discussion.'
@@ -251,15 +251,15 @@ 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 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. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'assessment 201', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Pasternak for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
@@ -504,15 +504,15 @@ 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 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. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_3', 'learning theories 201', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mrs. Kovalchuk for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'

locations/uni_lessons4.qsrc

@@ -13,15 +13,15 @@ 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 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. Kovalyov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'general education 202', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Kovalyov for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you''ve learned something from actively taking part in the discussion.'
@@ -251,15 +251,15 @@ 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 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. Pasternak'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'assessment 202', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mr. Pasternak for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'
@@ -504,15 +504,15 @@ 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 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. Kovalchuk'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', '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)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'uni_teaching_studies_semester_4', 'psychology of a student 201', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/attentive<<rand(1,4)>>.jpg"></center>'
 			'You listen attentively to Mrs. Kovalchuk for the duration of the class. Today''s lesson was interesting and informative, and you feel like you''ve learned something from taking part in the class.'

locations/uni_library.qsrc

@@ -116,7 +116,7 @@ if $ARGS[0] = 'studying_exam':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/study' + rand(1,7) + '.jpg"></center>'
 	!!Nerds like studying and so their mood improves a little. Everybody else gets in a worse mood by studying.
 	gs 'exp_gain', 'intel', max(0,rand(-1,1))
-	pcs_mood += (traits['nerd_status']*5 -10)
+	pcs_mood += (pcs_traits['nerd_status']*5 -10)
 	minut += 30
 	'You open the books and start studying for your <<$ARGS[2]>> exam. The library is mostly quiet, but you hear occasional noises, some of them hard to make out and some of them fairly suspicious. Despite this, it is a good environment to study in and you can see a number of other students studying as well.'
 	if pcs_sleep < 5:

locations/willpower.qsrc

@@ -592,16 +592,16 @@ if $ARGS[0] = 'swallow':
 	
 	if $ARGS[1] = 'self':
 		if missCum >= timeTresh: will_calc = 0
-		if trait['cumeater'] = 1 or cumloc[12] > 0:
+		if pcs_traits['cumeater'] = 1 or cumloc[12] > 0:
 			will_cost = (10 + will_calc - will_arousal_mod)/10
 		else
 			will_cost = (100 + will_calc - will_arousal_mod)/10
 		end
 	elseif $ARGS[1] = 'force':
-		will_cost = (80 - will_enforced - trait['cumeater'] * 10 + will_calc - will_arousal_mod)/10
+		will_cost = (80 - will_enforced - pcs_traits['cumeater'] * 10 + will_calc - will_arousal_mod)/10
 	else
 		if missCum >= timeTresh: will_calc += 100
-		if trait['cumeater'] = 1 or cumloc[12] > 0:
+		if pcs_traits['cumeater'] = 1 or cumloc[12] > 0:
 			will_cost = (100 + will_calc + will_arousal_mod)/10
 		else
 			will_cost = (10 + will_calc + will_arousal_mod)/10