Browse Source

Merge remote-tracking branch 'julzor/master'

KevinSmarts 4 years ago
parent
commit
288bf9f53c

+ 3 - 0
locations/gschool_lessons1.qsrc

@@ -20,6 +20,7 @@ if $ARGS[0] = 'russian':
 			grupvalue[3] +=1
 			pcs_grades += rand(0,1)
 			intel_exp += rand(0,1)
+			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
@@ -519,6 +520,7 @@ if $ARGS[0] = 'geography':
 			grupvalue[3] += 1
 			intel_exp += rand(0,1)
 			pcs_grades += rand(0,1)
+			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
@@ -1020,6 +1022,7 @@ if $ARGS[0] = 'history':
 			grupvalue[3] += 1
 			intel_exp += rand(0,1)
 			pcs_grades += rand(0,1)
+			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'

+ 4 - 0
locations/gschool_lessons2.qsrc

@@ -22,6 +22,7 @@ if $ARGS[0] = 'computer':
 			pcs_grades += rand(0,1)
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
+			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
@@ -536,6 +537,7 @@ if $ARGS[0] = 'science':
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			intel_exp += rand(0,1)
+			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
@@ -925,6 +927,7 @@ if $ARGS[0] = 'music':
 			instrmusic_exp += rand(1,2)
 			vokal_exp += rand(1,2)
 			chrsm_exp += rand(1,2)
+			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
@@ -1413,6 +1416,7 @@ if $ARGS[0] = 'biology':
 			grupvalue[3] += 1
 			intel_exp += rand(0,1)
 			pcs_grades += rand(0,1)
+			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'

+ 4 - 1
locations/gschool_lessons3.qsrc

@@ -21,6 +21,7 @@ if $ARGS[0] = 'literature':
 			grupvalue[3] += 1
 			pcs_grades += rand(0,1)
 			intel_exp += rand(0,1)
+			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
@@ -457,7 +458,8 @@ if $ARGS[0] = 'art':
 			pcs_grades += rand(0,1)
 			artslks_exp += rand(1,2)
 			agil_exp += rand(0,1)
-					if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			traits['nerd_lessons'] += 1
+			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned a lot about the history of art and famous artist.'
@@ -1011,6 +1013,7 @@ if $ARGS[0] = 'shop':
 			pcs_grades += rand(0,1)
 			hndiwrk_exp += rand(1,2)
 			agil_exp += rand(0,1)
+			traits['nerd_lessons'] += 1
 			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'

+ 2 - 0
locations/gschool_lessons4.qsrc

@@ -89,6 +89,7 @@ if $ARGS[0] = 'math':
 				grupvalue[3] +=1
 				pcs_grades += rand(0,1)
 				intel_exp += rand(0,1)
+				traits['nerd_lessons'] += 1
 				if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
@@ -399,6 +400,7 @@ if $ARGS[0] = 'english':
 				grupvalue[3] += 1
 				pcs_grades += rand(0,1)
 				intel_exp += rand(0,1)
+				traits['nerd_lessons'] += 1
 				if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 				gs 'stat'				
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'

+ 5 - 8
locations/preSYS.qsrc

@@ -593,6 +593,9 @@ if $ARGS[0] = 'nerd':
 	grupvalue[6] = 10
 	genbsize = 22
 	salo = 100
+	traits['nerd_points'] = 60
+	traits['nerd_status'] = 2
+	traits['nerd_lernHome'] = 5
 end
 
 if $ARGS[0] = 'nerdqueen':
@@ -602,9 +605,6 @@ if $ARGS[0] = 'nerdqueen':
 	'While you love all things nerdy or geeky, what you love the most is hanging out with your fellow nerds and doing nerdy things together. This has made you fairly social for a nerd and more general in your areas of knowledge. As you got older and started to develop as a girl, it also made you much more aware of your sexuality than most nerds are comfortable with. As such, you cultivated that awareness more than most and are now more at ease with your body than most of the other nerds. By the usual nerd standards you are confident, dynamic, and attractive. This has lead to you being the leader of your group of friends, and you are more acceptable to other social groups as a result, especially the cool kids who seem to respect your social skills and looks.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = 50
-		traits['nerd_status'] = 1
-		traits['nerd_lernHome'] = 5
 		gs 'preSYS', 'nerd'
 		alterstrtimg = 8
 		pcs_intel = 40
@@ -648,10 +648,9 @@ if $ARGS[0] = 'goodstudent':
 	'You just love school, and your grades are more than good enough to attend the university of your choosing after graduation - all you have to do is not let your grades slip. You have always tried to absorb every bit of knowledge possible and have done everything you could to excel in school. While this attitude has gained you a lot of respect from the other nerds, it did not earn you a lot of friends and you never found the time for sports. You are often asked to be a tutor and sometimes find yourself forced to do others'' homework for them. You have excellent grades, and your mother is very proud of you. She has shown her appreciation for your hard work by rewarding you with money.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = 70
-		traits['nerd_status'] = 2
-		traits['nerd_lernHome'] = 5
 		gs 'preSYS', 'nerd'
+		traits['nerd_points'] = 100
+		traits['nerd_status'] = 3
 		alterstrtimg = 9
 		if glass < 1 : glass = 1
 		pcs_intel = 50
@@ -674,7 +673,6 @@ if $ARGS[0] = 'computergeek':
 	'You were always into computers, whether it be by playing video games, taking computers apart, or learning programing and even hacking. You love everything about computers, but this passion left you little time to make friends - real-life friends, at least. You have managed to befriend many online players that you talk to while you play various video games, however, and you rarely spend any time outdoors, nor money on clothes or other girly stuff. You are far more interested in saving your money for a better computer in order to play even better games. You have considered hosting a web series of video games or vlogs - you even took the time to learn how to video edit - but you aren’’t sure if you want to put yourself out there like that.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = 30
 		gs 'preSYS', 'nerd'
 		alterstrtimg = 10
 		if glass < 1 : glass = 1
@@ -703,7 +701,6 @@ if $ARGS[0] = 'chessplayer':
 	'You were always into chess as a child, and you have studied all the great chess masters. You can even name them all as well as their favorite strategies! You find nothing more interesting than matching your wits against someone else’’s in a game of chess. It has left you with the ability to often see the consequences of your actions better than most as you are used to looking several moves ahead. All of this has left you with little time to make many friends, and you rarely spend any time outdoors.'
 	act 'Select another': gt 'preSYS', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = 30
 		gs 'preSYS', 'nerd'
 		alterstrtimg = 11
 		pcs_intel = 55

+ 7 - 0
locations/preSYS2.qsrc

@@ -13,6 +13,13 @@ if $ARGS[0] = 'start':
 	act 'Set money (<<money>>₽)': money = input 'Set Cash Amount' & gt'preSYS2','start'
 	if custom_csb ! 1: act 'Return to preset character menu': gt 'preSYS', 'charselect'
 	act 'Confirm these options':
+		if $soc_grup = 'nerd':
+			traits['nerd_points'] = 60
+			traits['nerd_status'] = 2
+			traits['nerd_lernHome'] = 5
+		elseif $soc_grup = 'gopnik':
+			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
 		if pcs_inhib > 50: gs 'clothing', 'wear', 'school', 6