Browse Source

[fixed] A number of other uses of storyline variable updated to new starting variable check

Kevin_Smarts 2 years ago
parent
commit
f6369ce0fc

+ 1 - 1
locations/MartinSex.qsrc

@@ -167,7 +167,7 @@ if $ARGS[0] = '':
 					'"Fine, you know what? Fuck this." You turn around, walking towards the door, barely able to contain your anger.'
 					'"<<$pcs_firstname>>," Martin begins, his voice taking on his most calming tone, but instead of calming you, it is the pinprick needed to set you off.'
 					*nl
-					'In the blink of an eye, you are face to face with him again, yelling at him unrestrainedly. "No! Apparently, you think I''m too young and too dumb to know what I want, so you don''t get to ''<<$pcs_firstname>>'' me! I don''t need ' + iif(StoryLine > 0,'another','a') + ' stepdad who knows what''s best for me!"'
+					'In the blink of an eye, you are face to face with him again, yelling at him unrestrainedly. "No! Apparently, you think I''m too young and too dumb to know what I want, so you don''t get to ''<<$pcs_firstname>>'' me! I don''t need another stepdad who knows what''s best for me!"'
 					'Before Martin could utter even another word, you had stormed out of the bar, livid at his paternalism and, deep down, below the layers of fury, wounded by his rejection.'
 
 					act 'Get out of the bar': gt 'city_industrial'

+ 2 - 2
locations/budilnik.qsrc

@@ -24,9 +24,9 @@ if $ARGS[0] = 'start':
 	'<center><b>Currently set for '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' </b></center>'
 	'<center><b><a href="exec:  bud_weekend = 1 & gt ''budilnik'', ''Reset''">Reset weekend alarm</a> <a href="exec: bud_weekend = 1 & gt ''budilnik'', ''Time''">Set</a> weekend alarm to this time</b></center>'
 	'<center><b>Currently set for '+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b></center>'
-	if Storyline > 0 and alarm_holiday = 0:
+	if mid($start_type,1,2) = 'sg' and alarm_holiday = 0:
 		'<center><b>Use weekend alarm for holidays - <a href="exec:  alarm_holiday = 1 & gt ''budilnik'', ''start''">OFF</a></b></center>'
-	elseif Storyline > 0 and alarm_holiday = 1:
+	elseif mid($start_type,1,2) = 'sg' and alarm_holiday = 1:
 		'<center><b>Use weekend alarm for holidays - <a href="exec:  alarm_holiday = 0 & gt ''budilnik'', ''start''">ON</a></b></center>'
 	end
 

+ 3 - 3
locations/gadforest.qsrc

@@ -188,15 +188,15 @@ if $ARGS[0] = 'forest_edge':
 			if gadforest_clothestorn = 1:
 				gadforest_clothestorn = 0
 				'Your clothes were torn to shreds in the woods, leaving you with no choice but to head back home naked.'
-				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
+				'You try your best to stay in the shadows as you move towards your grandparents house as stealthily as possible.'
 			! clothes are here
 			elseif clothesAtLocation = 1:
 				'You decide to leave your clothes behind and sneak home naked, purely for the thrill of it.'
-				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
+				'You try your best to stay in the shadows as you move towards your grandparents house as stealthily as possible.'
 			! no clothes here
 			elseif clothesAtLocation = 0:
 				'You seem to have misplaced your clothes, leaving you with no choice but to head back home naked. You wonder where you might have left your clothes.'
-				'You try your best to stay in the shadows as you move towards '+iif(StoryLine=1,'your grandparents house ','the village ')+'as stealthily as possible.'
+				'You try your best to stay in the shadows as you move towards your grandparents house as stealthily as possible.'
 			end
 			! Allow schoolgirl player to leave naked but go straight back home
 			! Non-schoolgirls will just find a random sweatshirt to put on - it is the same everytime but walking around naked in the village is not implemented yet

+ 1 - 1
locations/gadforestlost.qsrc

@@ -493,7 +493,7 @@ if $ARGS[0] = 'rescue':
 	bushcraft_exp += rand(1,5)
 	lost_girl = 0
 	if swamp_clothes = 1:
-		'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear'+iif(StoryLine=1,' at your grandparents house.','.')
+		'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents house.'
 		gs 'clothing', 'strip', 'gadforest'
 		gs 'clothing', 'swamp_clothes', 0
 	end

+ 1 - 1
locations/gadukino.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = '':
 			end
 		end
 		if npc_rel['A60'] > 0 and metmira = 1:
-			'Just down the road '+iif(StoryLine=1,'from your grandparents house ','')+'is <a href="exec:minut += 5 & gt ''miroslavahome'', ''start''">Mira''s house</a>.'
+			'Just down the road from your grandparents house is <a href="exec:minut += 5 & gt ''miroslavahome'', ''start''">Mira''s house</a>.'
 			act 'Go to Mira''s house': minut += 5 & gt 'miroslavahome', 'start'
 		end
 		*nl

+ 1 - 1
locations/gdksport.qsrc

@@ -269,7 +269,7 @@ if $ARGS[0] = 'dance2':
 
 		act 'Leave':
 			if rand (0,4) = 0:
-				if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and StoryLine ! 0 and ( month < 10 or ( month = 10 and day < 18 )):
+				if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and mid($start_type,1,2) = 'sg' and ( month < 10 or ( month = 10 and day < 18 )):
 					if alterstrtimg = 13:
 						gt 'albina_starlets', 'albina3'
 					elseif grupTipe = 1 or grupTipe = 2:

+ 5 - 5
locations/gkafe.qsrc

@@ -75,18 +75,18 @@ if $ARGS[0] = '':
 			
 			gs 'gkafe', 'menu'
 
-			if StoryLine > 0 and home_owned[2] = 1 and SchoolBlock = 0:
+			if mid($start_type,1,2) = 'sg' and home_owned[2] = 1 and SchoolBlock = 0:
 				'Since your <<$npc_nickname[''A29'']>> works here, you can eat-in for free.'
-			elseif StoryLine > 0 and home_owned[2] = 0 and SchoolBlock = 0:
+			elseif mid($start_type,1,2) = 'sg' and home_owned[2] = 0 and SchoolBlock = 0:
 				'Since your <<$npc_nickname[''A29'']>> kicked you out, you can no longer eat here for free.'
-			elseif StoryLine > 0 and home_owned[2] = 1 and SchoolBlock = 0:
+			elseif mid($start_type,1,2) = 'sg' and home_owned[2] = 1 and SchoolBlock = 0:
 				'Since you got kicked out of school, you can no longer eat here for free. Your <<$npc_nickname[''A29'']>> wants you to earn a living.'
-			elseif StoryLine > 0 and home_owned[2] = 0 and SchoolBlock = 1:
+			elseif mid($start_type,1,2) = 'sg' and home_owned[2] = 0 and SchoolBlock = 1:
 				'Since you were expelled from school and your <<$npc_nickname[''29'']>> kicked you out, you can no longer eat here for free.'
 			end
 
 			if week < 6:
-				if hour >= 6 and hour < 16 and StoryLine > 0:
+				if hour >= 6 and hour < 16:
 					'Your <a href="exec:gt ''mother''">mother</a> is currently working at the cafe, taking orders behind the counter.'
 				else
 					'The bar owner <a href="exec:gt ''gkafe'', ''boris''">Borislav</a> is currently taking orders at the counter. Most people call him Slava.'

+ 4 - 4
locations/gschool_grounds.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'main':
 	'Pavlovsk''s only school, where all the local children go for their education. Next to the school is the athletic field and a parking lot for the teachers, with a large grove of trees just beyond them.' 
 	'Hidden behind these trees is the old school building, which was supposed to be renovated and used for advance classes after the new one was built, but budget cuts meant the project was cancelled and now the old building stands empty and abandoned. It''s a popular spot for students to skip class or hang out outside of school.'
 
-	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and suspended['on'] ! 1:
+	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and suspended['on'] ! 1:
 		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
@@ -142,7 +142,7 @@ if $ARGS[0] = 'main':
 
 !!	act 'Go to the Principals Office': gt
 
-	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0 and suspended['on'] ! 1:
+	if week < 6 and hour >= 6 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0 and suspended['on'] ! 1:
 		if PCloStyle2 = 4 or Enable_sforma = 1:
 			if hour = 6:
 				if minut < 30:
@@ -189,7 +189,7 @@ if $ARGS[0] = 'main':
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint behind the school building': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
-	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and SchoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
+	if week = 6 and hour = 8 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and detention_set = 1 and SchoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
 
 	if christinaQW['dompath'] = 4: gt 'gschool_grounds', 'KristinaFight'
 
@@ -368,7 +368,7 @@ if $ARGS[0] = 'sports':
 		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 
-	if hour >= 9 and hour < 18 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0: 'With the school open, you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
+	if hour >= 9 and hour < 18 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0: 'With the school open, you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 
 	if week = 6 and SchoolSorev = 2 and hour = 10 and SchoolBlock = 0:
 		*nl

+ 87 - 213
locations/intro_city_select.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 	pcs_leghair = 12
 	pcs_makeup = 1
 
-	money = 2000
+	money = 20000
 	prezikProver = 3
 	brothersawpirsF = 0
 	dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
@@ -165,7 +165,6 @@ if $ARGS[0] = 'charselect':
 		gs 'intro_city_select', 'gopnikinfo'
 		act 'A gopnik': gt 'intro_city_select', 'gopnikstart'
 		act 'A punk or troublemaker': gt 'intro_city_select', 'troublemaker'
-		act '<<$npc_nickname[''A9'']>>''s girlfriend':  gt 'intro_city_select', 'vitekgf'
 		act 'An alternative, party girl or rebel': gt 'intro_city_select', 'alternative'
 	end
 
@@ -182,7 +181,7 @@ if $ARGS[0] = 'charselect':
 	act 'Random personality':
 !! This allows the player to select a random personality.
 		*clr & cla
-		persrand = rand(0, 18)
+		persrand = rand(0, 17)
 		if persrand <= 3:
 		!! Nerd
 			gs 'intro_city_select', 'nerdinfo'
@@ -235,28 +234,25 @@ if $ARGS[0] = 'charselect':
 				killvar 'persrand'
 				gs 'intro_city_select', 'troublemaker'
 			elseif persrand = 12:
-				killvar 'persrand'
-				gs 'intro_city_select', 'vitekgf'
-			elseif persrand = 13:
 				killvar 'persrand'
 				gs 'intro_city_select', 'alternative'
 			end
-		elseif persrand <= 18:
+		elseif persrand <= 17:
 		!! Outcast
 			gs 'intro_city_select', 'outcastinfo'
-			if persrand = 14:
+			if persrand = 13:
 				killvar 'persrand'
 				gs'intro_city_select', 'friendless'
-			elseif persrand = 15:
+			elseif persrand = 14:
 				killvar 'persrand'
 				gs 'intro_city_select', 'uglyduckling'
-			elseif persrand = 16:
+			elseif persrand = 15:
 				killvar 'persrand'
 				gs 'intro_city_select', 'goodgirl'
-			elseif persrand = 17:
+			elseif persrand = 16:
 				killvar 'persrand'
 				gs 'intro_city_select', 'slut'
-			elseif persrand = 18:
+			elseif persrand = 17:
 				killvar 'persrand'
 				gs 'intro_city_select', 'goth'
 			end
@@ -317,23 +313,17 @@ if $ARGS[0] = 'nerd':
 		pcs_lip = 1
 		pcs_lashes = 0
 	end
-	pcs_intel = 40
-	pcs_compskl = 20
+	pcs_intel = 50
+	pcs_compskl = 30
 	pcs_chess = 20
-	pcs_gaming = 20
-	pcs_skin = 20
-	pcs_inhib = 10
-	pcs_heels = 10
-	pcs_makupskl = 15
+	pcs_gaming = 30
+	pcs_inhib = 20
+	pcs_heels = 20
+	pcs_makupskl = 25
 	gs 'npc_relationship', 'socialgroup_setting', -10, 0, 25, 0, 5, 20
 	npc_rel['A129'] += 10
 	npc_rel['A28'] += 10
 	npc_rel['A29'] += 10
-	grupvalue[1] = 200
-	grupvalue[2] = 100
-	grupvalue[3] = 800
-	grupvalue[4] = 100
-	grupvalue[6] = 600
 	genbsize = 13 
 !!b cup for ideal bmi
 	traits['nerd_points'] = 60
@@ -344,13 +334,13 @@ end
 if $ARGS[0] = 'nerdqueen':
 	'<center><h4><font color="maroon">Queen of the nerds</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/nerd_1.jpg"></center>'
-	'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.'
+	'While you love all things nerdy or geeky, what you loved the most was hanging out with your fellow nerds and doing nerdy things together. This 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 was more at ease with your body than most of the other nerds. By the usual nerd standards you was confident, dynamic and attractive. This had lead to you being the leader of your group of friends, and you was more acceptable to other social groups as a result, especially the cool kids who seemed to respect your social skills and looks.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'nerd'
 		alterstrtimg = 8
-		pcs_chrsm = 40
-		pcs_sprt = 40
+		pcs_chrsm = 45
+		pcs_sprt = 45
 		pcs_icesktng = 10
 		pcs_humint = 20
 		pcs_persuas = 20
@@ -366,9 +356,6 @@ if $ARGS[0] = 'nerdqueen':
 		gs 'npc_relationship', 'socialgroup_setting', 10, 5, 10, 5, 5, 5
 		npc_rel['A18'] = 1
 !!make sure this coming after the gs code above will still set christina to a 1 relationship, if I did this code correctly, if not look for this code in other spots and fix it pls
-		grupvalue[1] = 300
-		grupvalue[3] = 900
-		grupvalue[6] = 700
 		kosmetica = 10
 		stanok = 10
 		if player_avatar = 0:
@@ -402,7 +389,7 @@ end
 if $ARGS[0] = 'goodstudent':
 	'<center><h4><font color="maroon">Good student</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/nerd_2.jpg"></center>'
-	'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.'
+	'You just loved school, and your grades was more than good enough to attend the university of your choosing after graduation. You have always tried to absorb every bit of knowledge possible and did everything you could to excel in school. While this attitude 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 was often asked to be a tutor and sometimes found yourself forced to do others'' homework for them. Now you are in the big city with a whole new world to absorb, though a part of you already misses school.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'nerd'
@@ -410,7 +397,7 @@ if $ARGS[0] = 'goodstudent':
 		traits['nerd_status'] = 3
 		alterstrtimg = 9
 		if glass < 1 : glass = 1
-		pcs_intel = 50
+		pcs_intel = 55
 		pcs_instrmusic = 10
 		pcs_artskls = 10
 		money += 2000
@@ -444,16 +431,16 @@ end
 if $ARGS[0] = 'computergeek':
 	'<center><h4><font color="maroon">Computer geek</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/nerd_3.jpg"></center>'
-	'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.'
+	'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. Now you are on your own in the big city, and you will need most of your money to live on, instead of spending it on a better computer or more games.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'nerd'
 		alterstrtimg = 10
 		if glass < 1 : glass = 1
-		pcs_intel = 45
-		pcs_compskl = 40
+		pcs_intel = 50
+		pcs_compskl = 50
 		pcs_comphckng = 20
-		pcs_gaming = 30
+		pcs_gaming = 40
 		internet = 20
 		pcs_skin = 200
 		salo = 33
@@ -485,12 +472,12 @@ end
 if $ARGS[0] = 'chessplayer':
 	'<center><h4><font color="maroon">Avid chess player</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/nerd_4.jpg"></center>'
-	'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.'
+	'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 left you with little time to make many friends, or spend much time outdoors. Now you are on your own living in the big city, you have already planned things out you thought. But now that you are here, you have more options than you thought. Get a job now or go to the university and get a better education like you had original planned.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'nerd'
 		alterstrtimg = 11
-		pcs_intel = 45
+		pcs_intel = 50
 		pcs_prcptn = 40
 		pcs_react = 40
 		pcs_chess = 40
@@ -520,11 +507,11 @@ if $ARGS[0] = 'chessplayer':
 end
 
 if $ARGS[0] = 'jock':
-	pcs_sprt = 40
-	pcs_stren = 40
-	pcs_vital = 40
-	pcs_react = 40
-	pcs_agil = 40
+	pcs_sprt = 45
+	pcs_stren = 45
+	pcs_vital = 45
+	pcs_react = 45
+	pcs_agil = 45
 	genbsize = 12
 !!b cup for ideal bmi
 	pcs_skin = 400
@@ -549,11 +536,6 @@ if $ARGS[0] = 'jock':
 	currentpursenumber = 11
 	fashionista_purses[11] = 1
 	bag = 1
-	grupvalue[1] = 400
-	grupvalue[2] = 800
-	grupvalue[3] = 100
-	grupvalue[4] = 300
-	grupvalue[6] = 200
 	gs 'npc_relationship', 'socialgroup_setting', 10, 25, -5, 0, -10, 0
 	npc_rel['A129'] -= 10
 	npc_rel['A18'] = 1
@@ -575,13 +557,13 @@ end
 if $ARGS[0] = 'volleyball':
 	'<center><h4><font color="maroon">Volleyball player</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/jock_1.jpg"></center>'
-	'Ever since the first time you played volleyball, you have been in love with the sport. You spent a lot of your free time trying to improve your ability, and it paid off; you''re actually quite good now! Your obsession with volleyball, however, has had some repercussions on your school performance. You''re a sub-par student, and you haven''t made many friends other than your fellow jocks. You are especially close with <<$npc_firstname[''A13'']>> and your coach.'
+	'Ever since the first time you played volleyball, you have been in love with the sport. You spent a lot of your free time trying to improve your ability, and it paid off; you''re actually quite good now! Your obsession with volleyball, however, had some repercussions on your school performance. You was a sub-par student, and you didn''t make many friends other than the jocks or your school. Now that you are in the big city, it seems your ability for volleyball is less well respected. Perhaps it is time to find something other than a sport to be passionate about.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'jock'
 		alterstrtimg = 12
-		pcs_react = 45
-		pcs_agil = 45
+		pcs_react = 50
+		pcs_agil = 50
 		genbsize = 17
 !!c cup for ideal bmi
 		salo = 80
@@ -611,17 +593,15 @@ end
 if $ARGS[0] = 'dancer':
 	'<center><h4><font color="maroon">Avid dancer</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/jock_2.jpg"></center>'
-	'You fell in love with dancing at an early age and never looked back. You spent a lot of your free time trying to improve your skills, and it paid off; you''re actually quite good now! <<$npc_firstname[''A11'']>> helpfully pointed out that an added benefit of dance was a greater increase in your flexibility (that is, of course, typical of <<$npc_firstname[''A11'']>>). Your obsession with dancing, however, has had some repercussions on your school performance. You''re a sub-par student, and you haven''t made many friends other than your fellow jocks.'
-	*nl
-	'You are particularly close with <<$npc_firstname[''A23'']>>, who is just as passionate about dancing as you are. You trained a lot together as children and have a mutual respect for each other''s abilities.'
+	'You fell in love with dancing at an early age and never looked back. You spent a lot of your free time trying to improve your skills, and it paid off; you''re actually quite good now! <<$npc_firstname[''A11'']>> helpfully pointed out that an added benefit of dance was a greater increase in your flexibility (that is, of course, typical of <<$npc_firstname[''A11'']>>). Your obsession with dancing, however, had some repercussions on your school performance. You was a sub-par student, and didn''t make many friends other than the jocks. Now that you are in the big city, it seems your ability for dance is less well respected. Perhaps it is time to find something other than a sport to be passionate about.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'jock'
 		alterstrtimg = 13
-		pcs_sprt = 45
+		pcs_sprt = 50
 		pcs_agil = 50
 		pcs_chrsm = 35
-		pcs_perform = 35
+		pcs_perform = 40
 		pcs_makupskl = 40
 		pcs_skin = 500
 		pcs_tan = 5
@@ -640,7 +620,6 @@ if $ARGS[0] = 'dancer':
 		gs 'npc_relationship', 'socialgroup_setting', 5, 0, 0, -5, 0, 0
 		npc_rel['A23'] += 25
 		npc_rel['A144'] += 10
-		grupvalue[1] = 500
 		willpowermax = 140
 		school_clothing = 7
 		gs 'grades', 'grade_award', 'school', 'math', 55
@@ -663,23 +642,22 @@ end
 if $ARGS[0] = 'runner':
 	'<center><h4><font color="maroon">Track runner</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/jock_3.jpg"></center>'
-	'Ever since you first tried track, you have been in love with the sport. When you’re running, the rest of the world fades away and you experience a natural high like no other. You spent a lot of your free time trying to get better at it, and it paid off; you''re actually quite good now! Your obsession with running, however, has had some repercussions on your school performance. You''re a sub-par student, and you haven''t made many friends other than your fellow jocks and your coach.'
+	'Ever since you first tried track, you have been in love with the sport. When you’re running, the rest of the world fades away and you experience a natural high like no other. You spent a lot of your free time trying to get better at it, and it paid off; you''re actually quite good now! Your obsession with running, however, had some repercussions on your school performance. You was a sub-par student, and you didn''t make many friends other than the jocks and your coach. Now that you are in the big city, it seems your ability for track is less well respected. Perhaps it is time to find something other than a sport to be passionate about.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'jock'
 		alterstrtimg = 14
-		pcs_vital = 50
+		pcs_vital = 55
 		pcs_agil = 50
 		pcs_inhib = 25
 		salo = 60
-		pcs_run = 50
+		pcs_run = 55
 		gsAboBeg += 30
 		npc_rel['A3'] += 10
 		npc_rel['A5'] += 10
 		npc_rel['A8'] += 5
 		npc_rel['A18'] = 1
 		npc_rel['A131'] += 10
-		grupvalue[2] = 850
 		willpowermax = 140
 		school_clothing = 7
 		gs 'grades', 'grade_award', 'school', 'math', 55
@@ -702,23 +680,22 @@ end
 if $ARGS[0] = 'football':
 	'<center><h4><font color="maroon">Football player</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/jock_4.jpg"></center>'
-	'Ever since your first football game, you have been in love with the sport. You spent a lot of your free time trying to get better at it, and it paid off; you''re actually quite good now! Your obsession with football has had some repercussions on your school performance, however, and you''re now a sub-par student. You haven''t made many friends other than your fellow jocks, especially <<$npc_firstname[''A149'']>> and your coach.'
+	'Ever since your first football game, you have been in love with the sport. You spent a lot of your free time trying to get better at it, and it paid off; you''re actually quite good now! Your obsession with football had some repercussions on your school performance, however, and you was a sub-par student. You didn''t make many friends other than the jocks, especially <<$npc_firstname[''A149'']>> and your coach. Now that you are in the big city, it seems your ability for football is less well respected. Perhaps it is time to find something other than a sport to be passionate about.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'jock'
 		alterstrtimg = 15
-		pcs_stren = 45
-		pcs_react = 45
-		pcs_vital = 45
+		pcs_stren = 50
+		pcs_react = 50
+		pcs_vital = 50
 		salo = 80
 		genbsize = 17
 !!c cup for ideal bmi
 		pcs_kick = 20
-		pcs_ftbll = 50
+		pcs_ftbll = 55
 		npc_rel['A131'] += 10
 		npc_rel['A149'] += 10
 		npc_rel['A34'] += 10
-		grupvalue[2] = 900
 		willpowermax = 140
 		$currentpursetype = 'fashionista'
 		currentpursenumber = 11
@@ -747,7 +724,7 @@ if $ARGS[0] = 'cool':
 	pcs_chrsm = 40
 	pcs_prcptn = 40
 	pcs_icesktng = 10
-	pcs_danc = 10
+	pcs_danc = 20
 	pcs_persuas = 30
 	pcs_inhib = 20
 	swim_start = 99
@@ -756,11 +733,6 @@ if $ARGS[0] = 'cool':
 	stanok = 20
 	tampon = 20
 	money += 1000
-	grupvalue[1] = 800
-	grupvalue[2] = 300
-	grupvalue[3] = 100
-	grupvalue[4] = 200
-	grupvalue[6] = 300
 	gs 'npc_relationship', 'socialgroup_setting', 25, 15, 0, -10, -20, 0
 	npc_rel['A129'] -= 20
 	npc_rel['A144'] += 10
@@ -782,12 +754,12 @@ end
 if $ARGS[0] = 'socialite':
 	'<center><h4><font color="maroon">Sociable</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/popular_1.jpg"></center>'
-	'You have a ton of friends! You''re friends with all of the important kids at school, anyways, which is what really matters. You were very social growing up and enjoyed being around others, often becoming the center of attention. You have always had a knack of knowing the right thing to say at the right moment, which led to many other students wanting to be your friend. You can with a little work get along with nearly anyone if you put your mind to it.'
+	'You have a ton of friends! You was friends with all of the important kids at school, anyways, which is what really mattered. You were very social growing up and enjoyed being around others, often becoming the center of attention. You have always had a knack of knowing the right thing to say at the right moment, which led to many other students wanting to be your friend. You can with a little work get along with nearly anyone if you put your mind to it. Now you find yourself in the big city and you no longer feel like the big important fish in a small pond, everyone is more busy and there is just so many more people.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'cool'
 		alterstrtimg = 16
-		pcs_chrsm = 45
+		pcs_chrsm = 55
 		genbsize = 18
 !!c cup for ideal bmi
 		pcs_humint = 40
@@ -825,14 +797,14 @@ end
 if $ARGS[0] = 'beautiful':
 	'<center><h4><font color="maroon">Beautiful</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/popular_2.jpg"></center>'
-	'You might not be the smartest and you might not be the most social or have the toughest attitude - but what you do have are natural good looks. That’s not something you can earn! You blossomed earlier than most girls and the boys took note, especially <<$npc_firstname[''A11'']>>, who started acting differently around you. You know he is attracted to you, but who can blame him? After all, you''re fairly certain that all of the boys (and even some of the girls) lust after you either openly or secretly. As you got older your looks only improved, and you are often considered one of the best looking girls in the room wherever you go. You are especially popular with the cool kids and jocks.'
+	'You might not be the smartest, the most social, be the most athletic, or have the toughest attitude - but what you do have are natural good looks. That’s not something you can earn! You blossomed earlier than most girls and the boys took note, especially <<$npc_firstname[''A11'']>>, who started acting differently around you. You know he is attracted to you, but who can blame him? After all, you''re fairly certain that all of the boys (and even some of the girls) lusted after you either openly or secretly in school. As you got older your looks only improved, and you was often considered one of the best looking girls in school. Now that you are in the city, you are still better looking than most but you can''t help but notice the occasional girl that is even better looking than you. Not to mention it seems the boys are not as impressed by your natural looks.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'cool'
 		alterstrtimg = 17
-		pcs_humint = 20
-		pcs_makupskl = 50
-		pcs_heels = 40
+		pcs_humint = 25
+		pcs_makupskl = 55
+		pcs_heels = 45
 		if player_avatar = 0:
 			pcs_hairlng = 300
 			pcs_eyesize = 2
@@ -860,8 +832,6 @@ if $ARGS[0] = 'beautiful':
 		PirsC2_owned = 1
 		gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 10, 10, 10, 0
 		salo = 80
-		grupvalue[1] = 900
-		grupvalue[4] = 300
 		gs 'fame', 'pav', 'sex', 20
 		willpowermax = 110
 		gs 'grades', 'grade_award', 'school', 'math', 60
@@ -882,11 +852,11 @@ if $ARGS[0] = 'beautiful':
 end
 
 if $ARGS[0] = 'gopnik':
-	pcs_sprt = 35
-	pcs_stren = 35
-	pcs_vital = 35
-	pcs_react = 35
-	pcs_agil = 35
+	pcs_sprt = 40
+	pcs_stren = 40
+	pcs_vital = 40
+	pcs_react = 40
+	pcs_agil = 40
 	genbsize = 13
 !!b cup for ideal bmi
 	pcs_inhib = 25
@@ -899,11 +869,6 @@ if $ARGS[0] = 'gopnik':
 	fakepassport = 1
 	pirsC = 1
 	PirsC1_owned = 1
-	grupvalue[1] = 100
-	grupvalue[2] = 300
-	grupvalue[3] = 100
-	grupvalue[4] = 800
-	grupvalue[6] = 100
 	gs 'npc_relationship', 'socialgroup_setting', 0, 0, -10, 25, 0, 0
 	npc_rel['A129'] -= 30
 	npc_rel['A11'] += 10
@@ -933,14 +898,14 @@ end
 if $ARGS[0] = 'gopnikstart':
 	'<center><h4><font color="maroon">Gopnik</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/gopnik_1.jpg"></center>'
-	'You are a gopnik. While you are still low in the gopnik pecking order, you have already proven yourself to them and most fully accept you as an equal. 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. The teachers and the police all know you''re one of the local gopniks. The jocks have a not so friendly rivalry with you and the other gopniks, while you don''t get along much, have some mutal respect for you.'
+	'You was a gopnik in school. While you was still low in the gopnik pecking order, you had already proven yourself to them and most of them fully accept you as an equal. You had problems at home and school due to your antisocial behavior. This is especially true with your mother and stepfather, who seen you going down the wrong path. The teachers and the police all knew you was one of the local gopniks. Now you are in the big city with a whole new play ground to find trouble in.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'gopnik'
 		gs 'npc_relationship', 'socialgroup_setting', -10, -10, -10, 20, -10, 0
 		alterstrtimg = 18
-		pcs_stren = 40
-		pcs_vital = 40
+		pcs_stren = 45
+		pcs_vital = 45
 		pcs_jab = 35
 		pcs_punch = 35
 		pcs_kick = 35
@@ -979,14 +944,14 @@ end
 if $ARGS[0] = 'troublemaker':
 	'<center><h4><font color="maroon">Troublemaker</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/gopnik_2.jpg"></center>'
-	'You are a troublemaker. Nothing makes you happier than causing problems, whether it be petty larceny, getting into fights or vandalism. You live for the thrill of breaking the rules. You get along fairly well with the gopniks and they accept you as a kindred spirit. They seem to love your willingness to jump head first into any and all trouble you run across - and if you can''t find any, you will happily make your own, which keeps things lively. 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. The teachers and the police all know who you are.'
+	'You was a troublemaker in school. Nothing made you happier than causing problems, whether it be petty larceny, getting into fights or vandalism. You lived for the thrill of breaking the rules. You got along fairly well with the gopniks and they accept you as a kindred spirit. They seemed to love your willingness to jump head first into any and all trouble you run across - and if you can''t find any, you would happily make your own, which keeps things lively. You had 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. The teachers and the police all knew who you was as well. Now you are in the big city with a whole new play ground to find trouble in.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		traits['nerd_points'] = -50
 		gs 'intro_city_select', 'gopnik'
 		alterstrtimg = 19
-		pcs_stren = 40
-		pcs_react = 40
+		pcs_stren = 45
+		pcs_react = 45
 		pcs_jab = 20
 		pcs_punch = 20
 		pcs_kick = 20
@@ -1031,90 +996,15 @@ if $ARGS[0] = 'troublemaker':
 	end
 end
 
-if $ARGS[0] = 'vitekgf':
-	'<center><h4><font color="maroon">Vitek''s girlfriend</font></h4></center>'
-	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/gopnik_3.jpg"></center>'
-	'You are <<$npc_nickname[''A9'']>>''s girlfriend. You love the thrill and danger of hanging out with the gopniks, even if you lack the true attitude yourself. You met <<$npc_nickname[''A9'']>> after he and <<$npc_firstname[''A11'']>> became friends. There was something about his bad boy attitude that drew you in, and you soon found yourself falling for him.'
-	'As you developed, he started to take an interest in you as well. Soon thereafter the two of you started dating. You''re not technically a gopnik - you are considered more of a 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': gt 'intro_city_select', 'charselect'
-	act 'Confirm this option':
-		traits['nerd_points'] = -10
-		gs 'intro_city_select', 'gopnik'
-		alterstrtimg = 20
-		pcs_sprt = 30
-		pcs_stren = 30
-		pcs_vital = 30
-		pcs_react = 30
-		pcs_agil = 30
-		pcs_chrsm = 40
-		genbsize = 32
-!!e cup for ideal bmi
-		pcs_humint = 20
-		pcs_makupskl = 30
-		pcs_heels = 30
-		pcs_jab = 10
-		pcs_punch = 10
-		pcs_kick = 10
-		pcs_def = 10
-		pirsD = 3
-		PirsD3_owned = 1
-		$currentpursetype = 'dolls'
-		currentpursenumber = 19
-		dolls_purses[19] = 1
-		bag = 1
-		npc_rel['A9'] += 50
-		npc_rel['A10'] += 5
-		npc_rel['A11'] += 5
-		npc_rel['A24'] -= 10
-		npc_rel['A28'] -= 10
-		npc_rel['A29'] -= 20
-		npc_rel['A33'] -= 10
-		grupvalue[4] = 700
-		if player_avatar = 0:
-			pcs_hairlng = 200
-			pcs_eyesize = 2
-			pcs_lip = 2
-			pcs_lashes = 1
-		end
-		pcs_skin = 500
-		pcs_tan = 5
-		pcs_vag = 1
-		pcs_throat = 1
-		salo = 87
-		stat['hj'] = 10
-		stat['bj'] = 5
-		stat['vaginal'] = 2
-		gs 'grades', 'grade_award', 'school', 'math', 55
-		gs 'grades', 'grade_award', 'school', 'rus', 55
-		gs 'grades', 'grade_award', 'school', 'lit', 55
-		gs 'grades', 'grade_award', 'school', 'art', 55
-		gs 'grades', 'grade_award', 'school', 'bio', 55
-		gs 'grades', 'grade_award', 'school', 'pe', 55
-		gs 'grades', 'grade_award', 'school', 'eng', 55
-		gs 'grades', 'grade_award', 'school', 'geo', 55
-		gs 'grades', 'grade_award', 'school', 'sci', 55
-		gs 'grades', 'grade_award', 'school', 'shop', 55
-		gs 'grades', 'grade_award', 'school', 'comp', 55
-		gs 'grades', 'grade_award', 'school', 'mus', 55
-		gs 'grades', 'grade_award', 'school', 'his', 55
-
-!! Vitek;s relationship
-		Gspassed = 0
-		kotovLoveQW = 1
-		vitekvisit = 5
-		npc_sex['A9'] += 5
-		willpowermax = 100
-		gt $loc, $loc_arg
-	end
-end
+!!vitek gf was removed as a choice as it doesn''t fit. He stayed in pav and wouldn''t let his GF move to the big city, so she would have to break up with him.
 
 if $ARGS[0] = 'alternative':
 !!can choose two more starting tattoo''s
 	'<center><h4><font color="maroon">Alternative</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/gopnik_4.jpg"></center>'
-	'You march to your own tune. You’’re not a follower - you’’re a leader! You just have no desire to actually lead anything. You do what you want when you want and you do it with a fuck-it-all attitude. The local gopniks respect you and for the most part you get along with them. You''re not one of them, however, but rather a kindred spirit looking to walk your own path and raise a little hell along the way.'
+	'You march to your own tune. You’’re not a follower - you’’re a leader! You just have no desire to actually lead anything. You do what you want when you want and you do it with a fuck-it-all attitude. In school the local gopniks respected you and for the most part you get along with them. You''re not one of them, however, but rather a kindred spirit looking to walk your own path and raise a little hell along the way.'
 	*nl
-	'Unlike the gopniks, you have far less interest in fighting or causing problems, instead just looking for a good time - you love to party more than anything else. The cool kids don''t completely look down their nose at you. Even if they don''t approve of your clothes, they respect your love of looking nice and having a good time. 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.'
+	'Unlike the gopniks, you have far less interest in fighting or causing problems, instead just looking for a good time - you love to party more than anything else. The cool kids don''t completely look down their nose at you. Even if they don''t approve of your clothes, they respect your love of looking nice and having a good time. You have problems at home and school due to your behavior. This was especially true with your mother and stepfather, who seen you going down the wrong path. Maybe you did, maybe you didn''t, doesn''t matter now as you are out on you own in the big city.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		traits['nerd_points'] = -20
@@ -1124,17 +1014,17 @@ if $ARGS[0] = 'alternative':
 		addictive_trait_lvl = 1
 		gs 'intro_city_select', 'gopnik'
 		alterstrtimg = 21
-		pcs_vital = 40
-		pcs_agil = 40
-		pcs_react = 40
+		pcs_vital = 45
+		pcs_agil = 45
+		pcs_react = 45
 		genbsize = 18
 !!c cup for ideal bmi
 		salo = 75
 		pcs_chrsm = 35
 		pcs_humint = 20
-		pcs_persuas = 10
-		pcs_makupskl = 40
-		pcs_danc = 20
+		pcs_persuas = 20
+		pcs_makupskl = 45
+		pcs_danc = 30
 		pcs_heels = 20
 		falselashesplain = 5
 		kosmetica = 20
@@ -1177,7 +1067,6 @@ if $ARGS[0] = 'alternative':
 		npc_rel['A28'] -= 10
 		npc_rel['A29'] -= 10
 		npc_rel['A33'] += 10
-		grupvalue[1] = 300
 		willpowermax = 120
 		gs 'grades', 'grade_award', 'school', 'math', 25
 		gs 'grades', 'grade_award', 'school', 'rus', 25
@@ -1199,11 +1088,6 @@ end
 if $ARGS[0] = 'outcast':
 	pcs_inhib = 10
 	pcs_makupskl = 0
-	grupvalue[1] = 100
-	grupvalue[2] = 100
-	grupvalue[3] = 300
-	grupvalue[4] = 100
-	grupvalue[6] = 200
 	gs 'npc_relationship', 'socialgroup_setting', -10, -5, 0, -5, 0, 0
 	npc_rel['A133'] += 20
 	npc_rel['A11'] -= 10
@@ -1226,7 +1110,7 @@ end
 if $ARGS[0] = 'friendless':
 	'<center><h4><font color="maroon">Friendless</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/outcast_1.jpg"></center>'
-	'You were never very social and never learned how to make friends. You were often made fun of or bullied by the other kids as you grew up. As such, you naturally shielded away from them, an action that only served to isolate you even further. Now, years later, you have yet to make any real friends - even Vasily, who is your closest friend, wouldn''t be considered a particularly close one. In public, he scorns you like all the rest, but is a little nicer in private.'
+	'You were never very social and never learned how to make friends. You were often made fun of or bullied by the other kids as you grew up. As such, you naturally shielded away from them, an action that only served to isolate you even further. Now, years later, you have yet to make any real friends - even Vasily, who was your childhood friend, wouldn''t be considered a particularly close one. Now that you have moved to the city you have a chance to do things different and make new friends and not be so social akward anymore.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'outcast'
@@ -1239,8 +1123,6 @@ if $ARGS[0] = 'friendless':
 		pcs_skin = 100
 		pcs_makupskl = 10
 		npc_rel['A11'] -= 20
-		grupvalue[1] = 50
-		grupvalue[3] = 200
 		willpowermax = 80
 		salo = 68
 		gs 'grades', 'grade_award', 'school', 'math', 55
@@ -1263,9 +1145,9 @@ end
 if $ARGS[0] = 'uglyduckling':
 	'<center><h4><font color="maroon">Ugly duckling</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/outcast_2.jpg"></center>'
-	'Some girls blossom early and some have natural good looks... you got neither. In fact, you seem to have been cursed with an androgynous face and body. You have been mistaken for a boy more times than you would care to admit. You have never learned to use makeup, but maybe you should. It might help make people realize you are indeed a girl.'
+	'Some girls blossom early and some have natural good looks... you got neither. In fact, you seem to have been cursed with an androgynous face and fat body. You have been mistaken for a boy more times than you would care to admit. You have never learned to use makeup, but maybe you should. It might help make people realize you are indeed a girl.'
 	*nl
-	'Your body seemed to have grown out of sync, leaving you looking odd and, at best, unattractive for most of your life. Now in your teens, your body is starting to even out in growth but you are still very androgynous and you are still considered by most to be ugly. Your lack of good looks has made you a social pariah. Nobody seems to like you or want to spend time with you unless they are making fun of you.'
+	'Your body seemed to have grown out of sync, leaving you looking odd and, at best, unattractive for most of your life. Now in your teens, your body is starting to even out in growth but you are still very androgynous and fat, you are still considered by most to be ugly. Your lack of good looks made you a social pariah in school. Nobody seems to like you or want to spend time with you unless they are making fun of you. Now that you have moved to the city you are hoping that is all about to change.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'outcast'
@@ -1306,7 +1188,7 @@ end
 if $ARGS[0] = 'goodgirl':
 	'<center><h4><font color="maroon">Good girl</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/outcast_3.jpg"></center>'
-	'You are a good girl. The kind parents, teachers and adults love, but the other kids hate. You always reminded the teacher to give out homework and you would tell on anyone for doing anything. You love the attention you get from adults, and while you can feel lonely at times, you are still pretty happy knowing you''re a good girl. You also regularly attend church just like any good girl should. The nerds seem to tolerate you the most, probably because they almost never misbehave and always do their homework anyways.'
+	'You are a good girl. The kind parents, teachers and adults love, but the other kids hate. You always reminded the teacher to give out homework and you would tell on anyone for doing anything. You loved the attention you got from adults, and while you use to feel lonely at times, you are still pretty happy knowing you''re a good girl. You also regularly attend church just like any good girl should. Now you are in the big city and you have suddenly found, there is no teachers or adults to impress, in fact it seems what use to be your good traits to the adults has become a negative trait to all.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		traits['nerd_points'] = 100
@@ -1318,10 +1200,9 @@ if $ARGS[0] = 'goodgirl':
 		npc_rel['A28'] += 10
 		npc_rel['A29'] += 10
 		npc_rel['A11'] -= 20
-		grupvalue[3] = 400
 		alterstrtimg = 24
-		pcs_intel = 35
-		pcs_sprt = 60
+		pcs_intel = 40
+		pcs_sprt = 65
 		pcs_inhib = 5
 		pcs_makupskl = 10
 		money += 1000
@@ -1366,7 +1247,7 @@ if $ARGS[0] = 'slut':
 	*nl
 	'The boys took advantage of your sexual needs and made you give them handjobs, which then led to blowjobs under the bleachers during recess and after school (sometimes they would return the favour by fingering you or a few times even eating you out) You always savored swallowing their cum, and you even love how it tastes. The only thing you like more than sucking cock and swallowing cum is getting fucked by a huge cock while sucking on another one.'
 	*nl
-	'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 your blowjobs)'
+	'However, your sex addiction made you a social pariah. The girls all despised you and the boys publicly mocked you, although they didn''t mind using you. The nerds completely avoided you, while the gopniks seemed to tolerate you the most (likely because they enjoy your blowjobs). Now you are in the big city and no one really knows about your soiled paste, now you have a chance to start over or just become the city bike instead of the town bike.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		trait['commando_lvl'] = 2
@@ -1383,13 +1264,9 @@ if $ARGS[0] = 'slut':
 		npc_rel['A33'] -= 10
 		npc_rel['A34'] -= 10
 		npc_rel['A144'] += 10
-		grupvalue[1] = 0
-		grupvalue[2] = 50
-		grupvalue[3] = 50
-		grupvalue[4] = 100
 		alterstrtimg = 25
-		pcs_makupskl = 30
-		pcs_danc = 20
+		pcs_makupskl = 40
+		pcs_danc = 30
 		pcs_heels = 50
 		genbsize = 22
 !!d cup for ideal bmi
@@ -1463,9 +1340,7 @@ end
 if $ARGS[0] = 'goth':
 	'<center><h4><font color="maroon">Goth</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/outcast_5.jpg"></center>'
-	'There is always an oddball, the weirdo at every school and at yours, it seems you are the one. You have always felt different, like a person standing outside looking in at the world. You never felt like you fit in, at least until you watched some American movies, saw some goths and suddenly you felt like you belonged. You quickly used all the allowance you had to buy new clothes and makeup so you could finally feel good about yourself. Your family doesn''t approve, hell no one seems to approve but you don''t care.'
-	*nl
-    'You are the school''s resident Goth. The Dark Temptress that all the boys secretly dream of, weaver of bad poetry and suicide covenants... Yep, people have too much imagination. Most adults think that you are going to sacrifice their children. In fact, everyone seems to think you are going to sacrifice someone or commit suicide. The school''s kids aren''t better, with the so-called "cool girls" leading an ostracism campaign against you... Sigh... Fortunately, not everyone is a brainwashed sheep happily following all along, a few think for themselves. The nerds like your reading proclivity and that you are into some of the same things they are; you think they might even invite you to their game one day. A couple of the Gopniks like your party attitude, specifically the kids in the band Pizdá Buysto, who seem to respect your artistic disposition. Or maybe their lead singer just wants to get in your panties, it''s hard to tell.'
+	'There is always an oddball, the weirdo at every school and at yours, it seems you awas the one. You have always felt different, like a person standing outside looking in at the world. You never felt like you fit in, at least until you watched some American movies, saw some goths and suddenly you felt like you belonged. You quickly used all the allowance you had to buy new clothes and makeup so you could finally feel good about yourself. Your family doesn''t approve, hell no one seems to approve but you don''t care. Now years later you are happier with your life than ever, with school over and moving to the city. You are a lot more accepted than you was, sure people still give you the odd look, but not nearly as much.'
     act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		traits['nerd_points'] = -10
@@ -1477,18 +1352,17 @@ if $ARGS[0] = 'goth':
 	    npc_rel['A34'] -= 20
 	    npc_rel['A144'] += 10
 		npc_rel['A155'] += 5
-		grupvalue[4] = 300
         alterstrtimg = 28
 		genbsize = 13
 !!b cup for ideal bmi
 		salo = 55
-		pcs_chrsm = 35
-		pcs_intel = 35
-		pcs_sprt = 45
+		pcs_chrsm = 40
+		pcs_intel = 40
+		pcs_sprt = 50
 		pcs_observ = 5
-		pcs_heels = 30
-		pcs_makupskl = 50
-		pcs_danc = 10
+		pcs_heels = 35
+		pcs_makupskl = 60
+		pcs_danc = 20
 		pcs_artskls = 20
 		pcs_sewng = 20
 		pcs_skin = 500

+ 0 - 1
locations/intro_city_tg.qsrc

@@ -245,7 +245,6 @@ if $ARGS[0] = 'otelPRE':
 										'The girl''s face drops. "Damn it!" She looks into your eyes. "Okay... Mikhail, we have to go somewhere else, there are too many people that might get hurt here. Gustav, come here!" The girl calls out to the corridor.'
 										*nl
 										'A tall man enters the room'
-										StoryLine = 0
 										MagikDostup = 0
 										$pcs_firstname = 'Mikhail'
 										$pcs_lastname = 'Ivanov'

+ 1 - 1
locations/kuhrPar.qsrc

@@ -84,7 +84,7 @@ if (hour = 6 and minut >= 45) or (hour = 7 and minut < 15) and breakfast_day ! d
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/breakfasthome.jpg"></center>'
 			'As you sit down and join your family for breakfast, your stepfather enages you in conversation. "How are you doing in school <<$pcs_nickname>>?"'
-			if kanikuli = 0 and StoryLine > 0 and SchoolAtestat = 0 and SchoolBlock = 0:
+			if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 				if class['school_grade_average'] >= 80:
 					'You smile at him. "Really great. We were just learning something interesting the other day." You go on to talk about some of the stuff you have learned recently in school. He just nods, while your mother gives you a proud smile and Kolka rolls his eyes.'
 					'The rest of breakfast is taken up with some small talk about what everyone has been up to of late. You thoroughly enjoy your breakfast with your family.'

+ 3 - 3
locations/obj_din.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = 'description':
 	'Your name is <<$pcs_firstname>> <<$pcs_lastname>>.'
 
 	!!!0.2.6 extension
-	if StoryLine > 0:
+	if mid($start_type,1,2) = 'sg':
 		'Your friends and family call you <<$pcs_nickname>>.'
 	else
 		'Your friends call you <<$pcs_nickname>>.'
@@ -341,7 +341,7 @@ if $ARGS[0] = 'skills':
 	*nl
 	'<b>Other Skills</b>'
 	*nl
-	if SchoolAtestat = 0 and StoryLine > 0:
+	if SchoolAtestat = 0 and mid($start_type,1,2) = 'sg':
 		if schoolprogul > 0: 'School absenteeism - <<schoolprogul>> days'
 	end
 	'</td><td width="25%" cellspacing="0" cellpadding="10" valign="top">'
@@ -402,7 +402,7 @@ if $ARGS[0] = 'stats':
 	if opPRE = 0: 'It has been <<daystart>> days since the game started.'
 	*nl
 
-	if SchoolAtestat = 0 and StoryLine > 0:
+	if SchoolAtestat = 0 and mid($start_type,1,2) = 'sg':
 		gs 'grades', 'assing_grade_description', 'school'
 	
 		gs 'grades', 'grade above', 'school', 90

+ 13 - 13
locations/pav_aptcourtev.qsrc

@@ -129,7 +129,7 @@ if $ARGS[0] = 'events1':
 	end
 
 	if anushkaFirstvisit = 0 and npc_rel['A144'] > 50 and rand(0,1) = 1 and anushka_met ! daystart:
-		if storyline ! 1: jump 'reroll_jump1'
+		if mid($start_type,1,2) ! 'sg': jump 'reroll_jump1'
 		if week < 6 and hour < 8: jump 'reroll_jump1'
 		*clr & cla
 		anushka_met = daystart
@@ -137,7 +137,7 @@ if $ARGS[0] = 'events1':
 		'As you walk into the building you nearly run into Anushka. "Hey <<$pcs_nickname>> whats up?"'
 		'A bit surprised to see her but not disappointed, you were just wandering around for the hell of it. "Just killing time, kinda bored you know?"'
 		'She nods a bit and finishes checking the mail. "Yeah I know how that is, hey want to come up to my place and hang out?"'
-		act 'Can''t, got to go.': minut += 1 & gt 'pav_complex', 'start'
+		act 'Can''t, got to go': minut += 1 & gt 'pav_complex', 'start'
 		act 'Sure': minut += 2 & gt 'anushapt', 'firstvisit'
 	elseif events = 0:
 		*clr & cla
@@ -155,7 +155,7 @@ if $ARGS[0] = 'events1':
 		'A boy and girl are sitting on one of the benches kissing. They are making out passionately, seemingly unaware that anyone is watching them or perhaps they just don''t care if anyone is watching them. You think you recognize the boy from smoking in the stairwell.'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif events = 2:
-		if storyline ! 1: jump 'reroll_jump1'
+		if mid($start_type,1,2) ! 'sg': jump 'reroll_jump1'
 		*clr & cla
 		minut += 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/evggkiss' + rand(1,3) + '.jpg"></center>'
@@ -205,7 +205,7 @@ if $ARGS[0] = 'events1':
 		'You notice three girls standing down near the garages, where they can see the alley. Each time a car drives down the alley they turn around and moon the car, laughing the whole time. After several times they seem to get bored with mooning cars and move off down the alley themselves.'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif events = 9:
-		if storyline ! 1 or (week = 3 and hour >= 16): jump 'reroll_jump1'
+		if mid($start_type,1,2) ! 'sg' or (week = 3 and hour >= 16): jump 'reroll_jump1'
 		*clr & cla
 		prcptn_exp += rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatu.jpg"></center>'
@@ -246,7 +246,7 @@ if $ARGS[0] = 'events1':
 		minut += 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evbj' + rand(1,2) + '.jpg"></center>'
 		text_rand = rand(0,2)
-		if text_rand = 0 or storyline ! 1:
+		if text_rand = 0 or mid($start_type,1,2) ! 'sg':
 			'You spot an extremely happy looking guy leaning up against the wall near the storage buildings, and squatting in front of him is a girl giving him an enthusiastic blowjob. You''re not exactly sure which of the two is enjoying it more. You don''t know either of these people, but you''ve seen them around here before. After a few minutes, you hear the guy moan, his cock never leaving the girl''s mouth. She continues to milk him for another minute before standing up and the two walk off together.'
 		elseif text_rand = 1:
 			'You see, between two of the storage buildings, Lena squatting down before Lavrenti as she sucks his dick. Lena seems to be enjoying this almost as much as Lavrenti is enjoying getting the blowjob. After a few minutes, you hear him moan, his cock never leaving her mouth. She continues to milk him for another minute before standing up and the two walk off together. You wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him, knowing his reputation, when it comes to his sister.'
@@ -261,7 +261,7 @@ if $ARGS[0] = 'events1':
 		gs 'stat'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif events = 15:
-		if storyline ! 1: jump 'reroll_jump1'
+		if mid($start_type,1,2) ! 'sg': jump 'reroll_jump1'
 		*clr & cla
 		prcptn_exp += rand(1,2)
 		minut += 3
@@ -280,7 +280,7 @@ if $ARGS[0] = 'events1':
 		gs 'stat'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif events = 16:
-		if storyline ! 1 or (week = 3 and hour >= 16): jump 'reroll_jump1'
+		if mid($start_type,1,2) ! 'sg' or (week = 3 and hour >= 16): jump 'reroll_jump1'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/nushbench.jpg"></center>'
 		'As you walk through the courtyard you see Anushka sitting on one of the benches, she hasn''t noticed you yet.'
@@ -348,7 +348,7 @@ if $ARGS[0] = 'events1':
 			end
 		end
 	elseif events >= 18:
-		if storyline ! 1: jump 'reroll_jump1'
+		if mid($start_type,1,2) ! 'sg': jump 'reroll_jump1'
 		gt 'pav_complexrolan'
 	end
 end
@@ -403,7 +403,7 @@ if $ARGS[0] = 'events2':
 		minut += 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evbjn.jpg"></center>'
 		text_rand = rand(0,2)
-		if text_rand = 0 or storyline ! 1:
+		if text_rand = 0 or mid($start_type,1,2) ! 'sg':
 			'You spot an extremely happy looking man leaned up against the wall near the storage buildings, and squatting in front of him is a girl giving him an enthusiastic blowjob. You''re not exactly sure which of the two is enjoying it more. You don''t know either of these people, but you''ve seen them around here before. After a few minutes, you hear the guy moan, his cock never leaving the girl''s mouth. She continues to milk him for another minute before standing up and the two walk off together.'
 		elseif text_rand = 1:
 			'You see, between two of the storage buildings, Lena squatting down before Lavrenti as she sucks his dick. Lena seems to be enjoying this almost as much as Lavrenti is enjoying getting the blowjob. After a few minutes, you hear him moan, his cock never leaving her mouth. She continues to milk him for another minute before standing up and the two walk off together. You wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him, knowing his reputation, when it comes to his sister.'
@@ -421,7 +421,7 @@ if $ARGS[0] = 'events2':
 		*clr & cla
 		prcptn_exp += rand(1,2)
 		minut += 3
-		if storyline ! 1: jump 'reroll_jump2'
+		if mid($start_type,1,2) ! 'sg': jump 'reroll_jump2'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evgopbjn.jpg"></center>'
 		if soniaPS > 0 and rand(0,1) = 0:
 			'Between two of the storage buildings you notice Sonia squatting between Vitek, Dan and Vasily, taking turns sucking their cocks. She seems quite into the blow-jobs, almost as much as the three guys. It doesn''t take too long before the three Gopniks start jerking their dicks and cumming all over Sonia''s face.'
@@ -448,7 +448,7 @@ if $ARGS[0] = 'events2':
 		'You notice a group of gopnik boys and a girl hanging out, they are manhandling her more than a bit, and she is stripped down to only her panties. She seems to be okay with it, or at least is not putting up a fight or trying to get away. One of the guys pulls her into his lap, she takes notice of you looking, she watches you a moment with a resigned look on her face before turning her attention back to the boys. Not wishing to get the guys attention you move on.'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif nightevents = 8:
-		if storyline ! 1: jump 'reroll_jump2'
+		if mid($start_type,1,2) ! 'sg': jump 'reroll_jump2'
 		if week < 6 and hour < 8: jump 'reroll_jump2'
 		*clr & cla
 		if month >= 11 or month <= 3:
@@ -519,7 +519,7 @@ if $ARGS[0] = 'events2':
 			end
 		end
 	elseif nightevents = 9:
-		if storyline ! 1 or (week = 3 and hour <= 23) or (week = 5 and hour >= 20) or (week = 6 and hour >= 20): jump 'reroll_jump2'
+		if mid($start_type,1,2) ! 'sg' or (week = 3 and hour <= 23) or (week = 5 and hour >= 20) or (week = 6 and hour >= 20): jump 'reroll_jump2'
 		if week < 6 and hour < 8: jump 'reroll_jump2'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/gopgirls.jpg"></center>'
@@ -570,7 +570,7 @@ if $ARGS[0] = 'events2':
 			end
 		end
 	elseif nightevents = 10:
-		if storyline ! 1: jump 'reroll_jump2'
+		if mid($start_type,1,2) ! 'sg': jump 'reroll_jump2'
 		if week < 6 and hour < 8: jump 'reroll_jump2'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/lelepa.jpg"></center>'

+ 2 - 2
locations/pav_clinic.qsrc

@@ -588,7 +588,7 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if narkoman = 1 and storyline > 0:
+		if narkoman = 1 and mid($start_type,1,2) = 'sg':
 			act 'Seek help for your weakness and pain':
 				*clr & cla
 				menu_off = 1
@@ -674,7 +674,7 @@ if $ARGS[0] = '':
 				end
 			end
 		end
-		if StoryLine > 0 and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0 and home_owned[2] = 1: act 'Go to the gynaecologist for a referral': gt 'pav_clinic', 'referral'
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0 and home_owned[2] = 1: act 'Go to the gynaecologist for a referral': gt 'pav_clinic', 'referral'
 	else
 		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
 	end

+ 1 - 1
locations/pav_commercial.qsrc

@@ -61,7 +61,7 @@ gs'street_event','pav_commercial', 'extras'
 if ((month = 9 and day > 16) or month >= 10) and (AlbinaQW['StarletsShutDown'] = 0 or AlbinaQW['Chernov'] = 0): 'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
 if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['Chernov'] = 0 and ((month = 11 and day > 18) or month = 12) and hour >= 14:gt 'albina_election_events', 'start'
 
-if StoryLine > 0 and hour < 4 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and home_owned[2] = 1:
+if mid($start_type,1,2) = 'sg' and hour < 4 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and home_owned[2] = 1:
 	motherWorry = 1
 end
 

+ 2 - 2
locations/pav_complex.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if StoryLine > 0 and hour < 5 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and home_owned[2] = 1: motherWorry = 1
+	if mid($start_type,1,2) = 'sg' and hour < 5 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and home_owned[2] = 1: motherWorry = 1
 
 	if ((minut + 60*(hour+daystart*24) - pavcomplexevent_time) > 60) or ((daystart+1)*1440 < pavcomplexevent_time):
 		if hour >= 8 and hour <= 20 and rand (0,2) = 0: 
@@ -66,7 +66,7 @@ if $ARGS[0] = 'start':
 		end
 	end	
 
-	if week <= 5 and cheerleaders_on = 0 and hour >= 14 and hour <= 18 and Storyline > 0 and (LariskaQW['story'] = 0 or LariskaQW['story'] = 1) and npc_rel['A13'] > 40 and lariska_ball ! daystart: 'Walking along the apartment complex, you hear a bouncing sound. Turning the corner, you see <a href="exec:gt ''lariska_storyline'', ''story_intro''">Lariska</a> hitting a volleyball against a wall.'
+	if week <= 5 and cheerleaders_on = 0 and hour >= 14 and hour <= 18 and mid($start_type,1,2) = 'sg' and (LariskaQW['story'] = 0 or LariskaQW['story'] = 1) and npc_rel['A13'] > 40 and lariska_ball ! daystart: 'Walking along the apartment complex, you hear a bouncing sound. Turning the corner, you see <a href="exec:gt ''lariska_storyline'', ''story_intro''">Lariska</a> hitting a volleyball against a wall.'
 	
 	if car > 0 and cardrive = 20: 'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked in the street.'
 	

+ 3 - 3
locations/pav_residential.qsrc

@@ -109,10 +109,10 @@ if fedorKozlovQW >= 20 and FedorKozHome = 1 or fedorKozlovQW = -15 and FedorKozH
 
 if hour >= 8 and hour <= 22:'<br>At the end of the street, there''s a small <a href="exec:$loc = ''pav_residential'' & gt ''kiosk'', ''start''">kiosk</a> selling a variety of items such as cigarettes, magazines, snacks, drinks and even themes for your phone.'
 
-if StoryLine > 0:
+if mid($start_type,1,2) = 'sg':
 	$schoolname = 'the <a href="exec: minut += 2 & gt ''gschool_grounds'', ''main''">local school</a>.'
 else
-	$schoolname = 'the local school.'
+	$schoolname = 'your old school.'
 end	
 
 '<br>In the center of Pavlovsk is the town square, which features the <a href="exec: minut += 2 & gt ''pav_commcenter''">community center</a>, a popular hotspot for the local teenagers to hang out after a long day at <<$schoolname>></b> Connected to the town center is the old palace grounds, which have been turned into a large <a href="exec:minut += 5 & gt ''pav_park'', ''start''">public park</a>. With the <a href="exec: minut += 5 & gt ''pav_lake''">lake</a> nearby, the area can get quite busy, especially during the summer and winter when people can swim or skate at the lake.'
@@ -136,7 +136,7 @@ else
 end
 !!end of code changes.
 
-if kanikuli = 0 and StoryLine > 0 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7 and hour < 9: 
+if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7 and hour < 9: 
 	act '<b>Go to school</b>': minut += 2 & gt 'gschool_grounds', 'main'
 end
 

+ 1 - 1
locations/stat.qsrc

@@ -1142,7 +1142,7 @@ if hotelRoom['city_hotel'] > 0:
 	if hotelRoomDays['city_hotel'] < daystart and hour >= 11: hotelRoom['city_hotel'] = 0
 end
 
-if hour >= 8 and hour < 14 and week < 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
+if hour >= 8 and hour < 14 and week < 6 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
 	!!absence from school
 	schoolprogul += 1
 	schoolProgulDay = daystart

+ 2 - 2
locations/stat_display.qsrc

@@ -87,7 +87,7 @@ $stat_disable_msg = 'Menu is disabled for this event.'
 if timeHidden = 0: $stat_msg += '<BR><<$stat_android>> <<$week[week]>> <<day>> <<$month>> <<year>>'
 $stat_android += '<<$week[week]>> <<day>>/<<month>>, <<money>> ₽, <a href="exec:clr & pl $stat_android">Status</a>'
 ! $stat_android for short desc in android mode, $stat_msg for status bar.
-if StoryLine > 0 and SchoolAtestat ! 1 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
+if mid($start_type,1,2) = 'sg' and SchoolAtestat ! 1 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
 if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your birthday.</b>' & $stat_msg += '<BR>'
 if telefon['UnreadSMS'] > 0: $stat_msg += '<BR><b>You have <<telefon[''UnreadSMS'']>> unread message(s).</b><BR>'
 
@@ -1526,7 +1526,7 @@ else
 	if pcs_lovers[0] = 1:gs'show_table', 'BF <<$loverdesc[0]>>: <<loverrelation[0]>>','2'
 	if pcs_lovers[1] = 1:gs'show_table', 'BF <<$loverdesc[1]>>: <<loverrelation[1]>>','2'
 	if pcs_lovers[2] = 1:gs'show_table', 'BF <<$loverdesc[2]>>: <<loverrelation[2]>>','2'
-	if StoryLine > 0:
+	if mid($start_type,1,2) = 'sg':
 		if npc_rel['A29'] > 0:gs'show_table','Mother: <<npc_rel[''A29'']>>','2'
 		if npc_rel['A28'] > 0:gs'show_table','Father: <<npc_rel[''A28'']>>','2'
 		if npc_rel['A33'] > 0:gs'show_table','Sister: <<npc_rel[''A33'']>>','2'

+ 1 - 1
locations/uni_admin.qsrc

@@ -59,7 +59,7 @@ if $ARGS[0] = 'start':
 	if university['entrance_exam_passed'] = 0 and university['prep_enrolled'] = 1 and month = 8: 
 		act 'Take the entrance exam (1:00)': gt 'uni_admin', 'take_test'
 	end
-	if (university['entrance_exam_passed'] = 1 or university['prep_enrolled'] = 0) and university['student'] = 0 and university['diploma'] = 0 and age >= 17 and (storyline ! 1 or SchoolAtestat = 1) and month < 9 and month > 4:
+	if (university['entrance_exam_passed'] = 1 or university['prep_enrolled'] = 0) and university['student'] = 0 and university['diploma'] = 0 and age >= 17 and (mid($start_type,1,2) ! 'sg' or SchoolAtestat = 1) and month < 9 and month > 4:
 		act 'Enroll at the university': gt 'uni_admin', 'enrollment'
 	end
 	if university['enrolled_in_semester'] > 0 and university['enrolled_in_semester'] = university['semester_passed'] and university['semeter_passed'] < 8: