Browse Source

[changed] updated all teh flags for game start types so things like magic and magic story line will not seep in to teh regular game. Also removed teh storyline alternatives so that all Sveta's now have ties back to Pav

Kevin_Smarts 2 years ago
parent
commit
597d5081d9
95 changed files with 372 additions and 320 deletions
  1. 4 4
      locations/Cheatmenu_din.qsrc
  2. 1 1
      locations/Komp.qsrc
  3. 3 3
      locations/MartinTalk.qsrc
  4. 3 3
      locations/TV.qsrc
  5. 2 2
      locations/_difficulty.qsrc
  6. 3 8
      locations/alexandriaEv.qsrc
  7. 22 17
      locations/bed2.qsrc
  8. 1 1
      locations/bedrPar.qsrc
  9. 2 2
      locations/booty_call.qsrc
  10. 3 3
      locations/booty_call_after.qsrc
  11. 1 1
      locations/booty_call_morning.qsrc
  12. 1 1
      locations/brothel.qsrc
  13. 2 2
      locations/buklinik.qsrc
  14. 1 1
      locations/cikl.qsrc
  15. 1 1
      locations/city_drugden.qsrc
  16. 2 2
      locations/city_industrial.qsrc
  17. 11 0
      locations/city_island.qsrc
  18. 5 3
      locations/city_sauna.qsrc
  19. 1 1
      locations/city_trashplace.qsrc
  20. 1 1
      locations/clothing.qsrc
  21. 1 1
      locations/clothing_QV.qsrc
  22. 10 10
      locations/din_van.qsrc
  23. 2 2
      locations/dina.qsrc
  24. 1 1
      locations/dreams.qsrc
  25. 2 2
      locations/fame.qsrc
  26. 1 1
      locations/family.qsrc
  27. 1 1
      locations/fit.qsrc
  28. 1 1
      locations/food_menu.qsrc
  29. 1 1
      locations/foto_albums.qsrc
  30. 1 1
      locations/foto_events.qsrc
  31. 1 1
      locations/foto_model_documentary.qsrc
  32. 4 4
      locations/foto_models.qsrc
  33. 1 1
      locations/gaddvor.qsrc
  34. 1 1
      locations/gadfield.qsrc
  35. 82 84
      locations/gadforest.qsrc
  36. 8 8
      locations/gadforestlost.qsrc
  37. 1 1
      locations/gadriver.qsrc
  38. 1 1
      locations/gadroad.qsrc
  39. 1 1
      locations/gadsarai.qsrc
  40. 3 3
      locations/gadukino.qsrc
  41. 6 4
      locations/gameover.qsrc
  42. 2 2
      locations/gdksport.qsrc
  43. 1 1
      locations/gkafe.qsrc
  44. 1 1
      locations/grigory.qsrc
  45. 1 1
      locations/gschool_grounds.qsrc
  46. 3 3
      locations/hookup.qsrc
  47. 1 1
      locations/hookup_after.qsrc
  48. 2 2
      locations/hookup_morning.qsrc
  49. 1 1
      locations/ilyroom.qsrc
  50. 3 0
      locations/intro_city.qsrc
  51. 1 0
      locations/intro_city_m.qsrc
  52. 3 3
      locations/intro_city_tg.qsrc
  53. 4 0
      locations/intro_sg.qsrc
  54. 2 0
      locations/intro_sg_m.qsrc
  55. 1 1
      locations/intro_sg_select.qsrc
  56. 4 1
      locations/intro_sg_tg.qsrc
  57. 3 0
      locations/intro_uni.qsrc
  58. 1 0
      locations/intro_uni_m.qsrc
  59. 2 0
      locations/intro_uni_tg.qsrc
  60. 2 2
      locations/journal.qsrc
  61. 1 1
      locations/journal_quests.qsrc
  62. 4 2
      locations/mainQW.qsrc
  63. 2 2
      locations/miroslava.qsrc
  64. 1 1
      locations/miroslavahome.qsrc
  65. 14 4
      locations/mirror.qsrc
  66. 2 2
      locations/mitka.qsrc
  67. 1 1
      locations/npcstatic1.qsrc
  68. 2 2
      locations/obj_din.qsrc
  69. 7 7
      locations/pav_complex.qsrc
  70. 1 1
      locations/pav_complexb3.qsrc
  71. 9 9
      locations/pav_disco.qsrc
  72. 1 1
      locations/pav_hotel.qsrc
  73. 3 3
      locations/pav_lake.qsrc
  74. 1 1
      locations/pav_lake_nude.qsrc
  75. 2 2
      locations/pav_library.qsrc
  76. 1 1
      locations/pav_market.qsrc
  77. 5 5
      locations/pav_park.qsrc
  78. 2 2
      locations/pav_pharmacy.qsrc
  79. 1 1
      locations/pav_residential.qsrc
  80. 1 1
      locations/pav_train_hall.qsrc
  81. 5 3
      locations/placer_sex.qsrc
  82. 2 2
      locations/preSYS.qsrc
  83. 17 2
      locations/saveupdater.qsrc
  84. 1 1
      locations/sexshop.qsrc
  85. 1 1
      locations/shop.qsrc
  86. 1 1
      locations/sitrPar.qsrc
  87. 1 1
      locations/soniadisco.qsrc
  88. 12 12
      locations/stat_display.qsrc
  89. 1 1
      locations/street_event.qsrc
  90. 10 21
      locations/tatiana_missions.qsrc
  91. 2 2
      locations/telefon.qsrc
  92. 11 11
      locations/therapist.qsrc
  93. 7 5
      locations/tobiQW.qsrc
  94. 1 1
      locations/train.qsrc
  95. 1 1
      locations/wardrobe.qsrc

+ 4 - 4
locations/Cheatmenu_din.qsrc

@@ -1190,7 +1190,7 @@ $cheatmenu['stats'] = {
 	if workPTU > 1:*pl'<a href="exec:teachlevel += 10 & dynamic $cheatmenu[''stats'']">Reputation teacher+10: <<teachlevel>></a>'
 	if workPTU > 1:*pl'<a href="exec:teachlevel -= 10 & dynamic $cheatmenu[''stats'']">Reputation teacher-10: <<teachlevel>></a>'
 	*nl
-	if StoryLine = 1 and SchoolAtestat = 0:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 		*pl'<b>School:</b>'
 		if class['school_math_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''math'', 10 & dynamic $cheatmenu[''stats'']">Improve your Math grade: <<class[''school_math_grade'']>></a>'
 		if class['school_rus_grade'] < 100:*pl'<a href="exec:gs ''grades'', ''grade_award'',''school'', ''rus'', 10 & dynamic $cheatmenu[''stats'']">Improve your Russian grade: <<class[''school_rus_grade'']>></a>'
@@ -1272,7 +1272,7 @@ $cheatmenu['reputation'] = {
 	'<center>If they exceed this limit they will be reset overnight.</center>'
 	'<center><table  width="90%" cellspacing="0" cellpadding="0" valign="top">'
 	'<tr><td width="50%" cellpadding="10" valign="top">'
-	if storyline = 1:
+	if mid($start_type,1,2) = 'sg':
 		*nl
 		'Relationships in Pavlovsk'
 		*nl
@@ -1517,7 +1517,7 @@ $cheatmenu['reputation'] = {
 	end
 	*nl
 	if opusk > 0 or gnewQW > 0 or sipovka > 0:'<a href="exec:opusk = 0 & gnewQW = 0 & sipovka = 0 & dynamic $cheatmenu[''reputation'']">Clear reputation with Gopniks</a>'
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 
 		*nl
 		'<font color="red"><b>WARNING</b></font>: Clearing reputation flags with your family may cause bugs. Use at your own risk!'
@@ -1575,7 +1575,7 @@ $cheatmenu['documents'] = {
 	'<td width="300" cellspacing="0" cellpadding="20" valign="top">'
 	'<td width="400" cellspacing="0" cellpadding="20" valign="top">'
 	if SchoolAtestat = 0: '<a href="exec:SchoolAtestat = 1 & dynamic $cheatmenu[''documents'']">Get School Certificate</a>'
-	if storyline = 1 and SchoolAtestat = 0: '<font color="red"><b>WARNING!</b></font>: This will end your school year!' & *nl
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0: '<font color="red"><b>WARNING!</b></font>: This will end your school year!' & *nl
 	if SchoolAtestat = 1:'Already have a School Certificate'
 	if university['diploma'] > 0:
 		'You already have a Diploma'

+ 1 - 1
locations/Komp.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'brows':
 		if shantfoto > 0:act 'Find the girl you took photos of in the park on "Assbook"':gt 'komp', 'foto'
 		if gor_dorm = 7:act 'Read letter from Eugene':gt 'etoexhib', 'pos91'
 		if camwhore = 1 and $loc ! 'shulga_room' and $loc ! 'anushapt' and $loc ! 'artemhome' and $loc ! 'albinahome' and $loc ! 'pav_library':act 'Go to MyFreeCams.org':gt 'komp', 'mfc'
-		if (storyline = 1 and SchoolAtestat = 0) or func('uniutil', 'student', 'enrolled'):act 'Spend time studying':gt 'komp', 'study'
+		if (mid($start_type,1,2) = 'sg' and SchoolAtestat = 0) or func('uniutil', 'student', 'enrolled'):act 'Spend time studying':gt 'komp', 'study'
 		if sucpcinfo = 0 and succubxp > 0: act 'Research the strange feelings you''ve been having': gt 'succubus', 'kompresearch'
 	end
 end

+ 3 - 3
locations/MartinTalk.qsrc

@@ -819,13 +819,13 @@ if $ARGS[0] = '':
 		'"Yeah, I guess we are. We don''t talk much, but," he taps his chest, just above the heart, "in here, where it counts, we care about each other. Always have."'
 		*nl
 		
-		if StoryLine = 1 and (npc_rel['A33'] >= 50 or npc_rel['A34'] >= 50):
+		if mid($start_type,1,2) = 'sg' and (npc_rel['A33'] >= 50 or npc_rel['A34'] >= 50):
 			'"Yeah, I know what you mean," you nod, thinking of your own siblings. "No matter where they are, you always know that somebody''s there for you."'
 			'"You have siblings?"'
 			'"An older sister and a younger brother", you nod. "My ' + iif(npc_rel['A33']>=npc_rel['A34'],'sister','brother') + ' and I are really close, but I care about both of them."'
 			'"There''s always a favorite sibling," he chuckles. "Usually the one who shared the most candy with you."'
 
-		elseif Storyline = 1:
+		elseif mid($start_type,1,2) = 'sg':
 			'"I wish I knew what that''s like. I have siblings, but we''re not very close."'
 			'"I was the same around your age," Martin admits, "but trust me: That can change quickly. Sometimes, the tiniest event can pull you closer together."'
 
@@ -936,7 +936,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still smile and say "I always do" before he has to get back to work.'
 	
-	elseif StoryLine = 1 and home_owned[2] = 1:
+	elseif mid($start_type,1,2) = 'sg' and home_owned[2] = 1:
 		'"I still live with my parents, in Pavlovsk," you admit.'
 		*nl
 		'"Oh, well, that can''t be easy at your age."'

+ 3 - 3
locations/TV.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
 	end
 
-	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 	act 'Turn off the TV and get off the couch':
 		cla
 		gt $loc, $loc_arg
@@ -34,7 +34,7 @@ if $ARGS[0] = 'nokable':
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 	'You watch the network channel, lying on the couch. It''s all repeats and cheesy infomercials.'
 
-	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'nokable'
 	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
@@ -48,7 +48,7 @@ if $ARGS[0] = 'kable':
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 	'You watch cable television. It''s really good these days.'
 
-	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
 	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg

+ 2 - 2
locations/_difficulty.qsrc

@@ -27,8 +27,8 @@ end &! --- getdifficulty ---
 !! easy peasy: 20
 !! use func('_difficulty','getexpadj')
 if $ARGS[0] = 'getexpadj':
-	!!Trait ''Everything is new again'', gained from the cursed school boy start
-	if csb_start = 1 and daystart <= 84: 
+	!!Trait ''Everything is new again'', gained from the sg_tg start
+	if $start_type = 'sg_tg' and daystart <= 84: 
 		result = 10 * difficulty
 	else
 		result = 20 * difficulty

+ 3 - 8
locations/alexandriaEv.qsrc

@@ -210,16 +210,11 @@ if $ARGS[0] = 'interview3':
 	'<center><b><font color="maroon">Aleksei?</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/alexandria/chair.jpg"></center>'
 	'You finally reach a study where a morose... Alexandria? Sits on a couch, and in an interesting twist, there isn''t another one for you.'
-	if $start_type = 'tg':
+	if $start_type[1] = 'tg':
 		npc_rel['A241'] +=1
-		'"Yes Mr. Kuznetsu... I am another victim of Rikudo''s games, that is the reason for my interest in you."'
+		'"Yes Mr. Ivanov... I am another victim of Rikudo''s games, that is the reason for my interest in you."'
 	else
-		if csb_start = 1:
-			npc_rel['A241'] +=1
-			'"Yes Mr. Ivanov... I am another victim of Rikudo''s games, that is the reason for my interest in you."'
-		else
-			'"Yes... Cursed by Rikudo, the being that created The Talisman of Power, and the reason for my interest in you."'
-		end
+		'"Yes... Cursed by Rikudo, the being that created The Talisman of Power, and the reason for my interest in you."'
 	end
 	'After this little revelation, he exhales a big puff of smoke, and continue with his explanation.'
 	'"As I remember telling you the last time we meet, my name is Aleksei, and the hows and whys of my curse is better left for another time, suffice is to say, that is my understanding, that you and your relation with the powers that have been transferred to your persona, holds the key to break my current predicament. As you can see from our early confrontation, the powers that be, wanted the monopoly over your attention, so I looked for an alternative, that is the reason after the... convoluted way we met in Aphrodite, hm... as an afterthought, if you want to know, I took care of that little parasite, banishing it."'

+ 22 - 17
locations/bed2.qsrc

@@ -99,10 +99,12 @@ if $ARGS[0] = '':
 					gs 'underwear', 'wear'
 				end
 				if disable_autosave = 0:
-					if StoryLine = 0:
-						savegame 'autosave.sav'
+					if mid($start_type,1,4) = 'city':
+						savegame 'autosave_city.sav'
+					elseif mid($start_type,1,3) = 'uni':
+						savegame 'autosave_uni.sav'
 					else
-						savegame 'autosave_alt.sav'
+						savegame 'autosave_sg.sav'
 					end
 				end
 				if $clothingworntype ! 'nude':
@@ -183,13 +185,12 @@ if $ARGS[0] = 'sleep':
 	end
 	pcs_hairbsh = 0
 	pain['killer'] = 0
-	if StoryLine = 1 and $loc ! 'bedrPar' and SchoolAtestat = 0:
+	if mid($start_type,1,2) = 'sg' and $loc ! 'bedrPar' and SchoolAtestat = 0:
 		notathomesleep += 1
 	else
 		notathomesleep = 0
 	end
 
-	
 
 	if succubusflag = 1 and sucwalkday <= daystart and (succhungry < (0 - 1 - succublvl) or pcs_willpwr < ((succublvl * willpowermax) / 13) or sucpowzeroed >= 3): gs 'succubus', 'sucwalkinginit'
 
@@ -512,14 +513,14 @@ if $ARGS[0] = 'wake_horny':
 end
 
 if $ARGS[0] = 'wake':
-	if StoryLine = 1 and indorf = 0 and motherQW['bathroom_dildos'] > 0 and MarishaQW["marisha_sleepover"] = 0:gt'mother_sextalk','dildo_wakeup1'
+	if mid($start_type,1,2) = 'sg' and indorf = 0 and motherQW['bathroom_dildos'] > 0 and MarishaQW["marisha_sleepover"] = 0:gt'mother_sextalk','dildo_wakeup1'
 	menu_off = 1
 	InSleep = 1
 	gs 'stat'
 	if MarishaQW["marisha_sleepover"] = 1: gs 'marisha_ev', 'morning'
-	if daystart < 10 and StoryLine = 0 and ntstart = 0:'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
-	if daystart >= 10 and daystart < 30 and StoryLine = 0 and ntstart = 0:'Looking at your female body, you are still a little surprised it''s actually you.'
-	if slept_in = 1 and kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 9 and hour < 14 and suspended['on'] ! 1:
+	if daystart < 10 and $start_type[1] = 'tg':'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
+	if daystart >= 10 and daystart < 30 and $start_type[1] = 'tg':'Looking at your female body, you are still a little surprised it''s actually you.'
+	if slept_in = 1 and kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 9 and hour < 14 and suspended['on'] ! 1:
 		if schoolprogul > 2 and schoolPredupr = 2:
 			pcs_mood -= 35
 			gs 'stat'
@@ -538,7 +539,7 @@ if $ARGS[0] = 'wake':
 			msg '<center>Damn it''s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be very upset if I''m not at school every day.</center>'
 		end
 	end
-	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
+	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
 		if slept_in = 1 and (hour = 7 or hour = 8) and suspended['on'] ! 1:
 			pcs_mood -= 10
 			gs 'stat'
@@ -575,7 +576,7 @@ if $ARGS[0] = 'wake':
 			end
 			gs 'bed2', 'end'
 		end
-		if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9 and suspended['on'] ! 1:
+		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9 and suspended['on'] ! 1:
 			act 'Full morning routine for School (01:00)':
 				fullmorrout = 1
 				minut += 15
@@ -635,10 +636,12 @@ if $ARGS[0] = 'succhoice':
 	'<font color="red"><b>You also feel that both are <i>permanent</i> choices.</b></font>'
 	act 'Try to ignore it and go to sleep':
 		if disable_autosave = 0:
-			if StoryLine = 0:
-				savegame 'autosave.sav'
+			if mid($start_type,1,4) = 'city':
+				savegame 'autosave_city.sav'
+			elseif mid($start_type,1,3) = 'uni':
+				savegame 'autosave_uni.sav'
 			else
-				savegame 'autosave_alt.sav'
+				savegame 'autosave_sg.sav'
 			end
 		end
 		gt 'bed2', 'sleep'
@@ -663,10 +666,12 @@ if $ARGS[0] = 'succhoiceNO':
 	gs 'stat'
 	act 'Go to sleep':
 		if disable_autosave = 0:
-			if StoryLine = 0:
-				savegame 'autosave.sav'
+			if mid($start_type,1,4) = 'city':
+				savegame 'autosave_city.sav'
+			elseif mid($start_type,1,3) = 'uni':
+				savegame 'autosave_uni.sav'
 			else
-				savegame 'autosave_alt.sav'
+				savegame 'autosave_sg.sav'
 			end
 		end
 		gt 'bed2', 'sleep'

+ 1 - 1
locations/bedrPar.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
 		end
 		
-		if StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and SchoolAtestat = 0 and detention_warning ! daystart:
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and SchoolAtestat = 0 and detention_warning ! daystart:
 			detention_warning = daystart
 			msg 'You have detention this morning and must be at school before 09:00.'
 		end

+ 2 - 2
locations/booty_call.qsrc

@@ -954,7 +954,7 @@ if $ARGS[0] = 'bj_react1.2':
 						gs'booty_call','generous_lick'
 					else
 						'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-						if StoryLine = 1: 
+						if mid($start_type,1,2) = 'sg': 
 							'"I don''t know. Ask my mom why it matters so much," you shrug.'
 						else
 							'You shrug. "I''m still a virgin aren''t I?"'
@@ -1014,7 +1014,7 @@ if $ARGS[0] = 'bj_react2':
 						gs'booty_call','generous_lick'
 					else
 						'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-						if StoryLine = 1: 
+						if mid($start_type,1,2) = 'sg': 
 							'"I don''t know. Ask my mom why it matters so much," you shrug.'
 						else
 							'You shrug. "I''m still a virgin aren''t I?"'

+ 3 - 3
locations/booty_call_after.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'no_cum_end':
 					'"Because I want to," you say, a little annoyed. "I have to explain myself to you?"'
 					gs'booty_call_after','after_sex1'
 				end
-				if StoryLine = 1:
+				if mid($start_type,1,2) = 'sg':
 					act'Ask my mom':
 						cla & *nl
 						'"I don''t know," you shrug. "Ask my mom why it''s so important."'
@@ -446,7 +446,7 @@ if $ARGS[0] = 'after_sex2':
 				gs'booty_call_after','spend_night'
 			end
 			
-			if StoryLine = 1:
+			if mid($start_type,1,2) = 'sg':
 				act'I''m sick of my mom':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
@@ -1017,7 +1017,7 @@ if $ARGS[0] = 'sleep':
 				gs'sleep','simple'
 			end	
 			
-			if StoryLine = 1 and home_owned[2] = 1: sveta_punishment['no_come_home'] = 1
+			if mid($start_type,1,2) = 'sg' and home_owned[2] = 1: sveta_punishment['no_come_home'] = 1
 			gt'booty_call_morning','morning'
 		end
 	end

+ 1 - 1
locations/booty_call_morning.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'morning':
 		'Your mind stirs and you slowly come to consciousness. Your first thoughts are...'
 		act'<i>Yawn</i>':gt'booty_call_morning','yawn_wake'
 !!	end
-	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
+	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
 		act'School!':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'

+ 1 - 1
locations/brothel.qsrc

@@ -281,7 +281,7 @@ if $ARGS[0] = 'abducted4':
 	pcs_hairbsh = 0
 	InSleep = 1
 	pain['killer'] = 0
-	if StoryLine = 1 and SchoolAtestat = 0:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 		notathomesleep += 1
 	else
 		notathomesleep = 0

+ 2 - 2
locations/buklinik.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'holl':
 	'<center><b>Entrance</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_holl.jpg"></center>'
 	'The interior is even worse than the exterior, the paint on the wall is falling off and hasn''t been repainted for quite a while. There are some lights working but not all of them and there is this weird smell that you can''t really pinpoint what it is.'
-	if StoryLine = 1 and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
 		'You can volunteer here on the weekends.'
 	else
 		if bumtolik > 4:'There is a lock on the <a href="exec:gt ''buklinik'', ''sklad''">storage</a> room.'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'registr':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_reg.jpg"></center>'
 	'You approach the counter as you see two women in white coats sitting and chatting with each other, laughing.'
 
-	if StoryLine = 1 and SchoolAtestat = 0 and bumtolik < 5:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and bumtolik < 5:
 		!r125
 		'You clear you throat to get their attention, "Hello, my name is <<$pcs_firstname>>, I read on that note that you were looking for volunteers..."'
 		'The two women cheerfully reply, "Hello! Welcome to our little humble shelter. As you probably noticed we really need some volunteers, just a fair warning the job is not always fun and there''s always lots to do. What you see here is just a small part of it, we even help out the elderly and the less fortunate ones outside the shelter.'

+ 1 - 1
locations/cikl.qsrc

@@ -967,7 +967,7 @@ killvar 'pcs_drank'
 !!suspension ends
 if suspended['day'] = daystart:	suspended['on'] = 0
 
-if storyline = 1:
+if mid($start_type,1,2) = 'sg':
 !!Party refresh if you didn''t see sis
 	if week = 1 and sisboyparty ! 2:
 		if sisterQW['party'] = -1: sisterQW['party'] = 0

+ 1 - 1
locations/city_drugden.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 		act 'Ask for amphetamine': gt 'city_drugden', 'amphetamine'
 		act 'Ask for weed': gt 'city_drugden', 'joints'
 		act 'Ask for cocaine': gt 'city_drugden', 'cocaine'
-		if StoryLine = 1 and snarkozak = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'narkozakladka'
+		if mid($start_type,1,2) = 'sg' and snarkozak = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'narkozakladka'
 	elseif drugUser = 0:
 		'"Ahhh, what do you have?" you ask.'
 		'His eyes light up at a freshy and smiles wildy, "Well I have some H and amphetamine."'

+ 2 - 2
locations/city_industrial.qsrc

@@ -100,9 +100,9 @@ if $ARGS[0] = '':
 		'The community centre is currently closed. It''s only open during the week between 09:00 and 17:00.'
 	end
 
-	if hour >= 9 and hour <= 17 and (StoryLine = 1 and SchoolAtestat = 0) or bumtolik > 3: 
+	if hour >= 9 and hour <= 17 and (mid($start_type,1,2) = 'sg' and SchoolAtestat = 0) or bumtolik > 3: 
 		'<a href="exec: gt ''buklinik'',''start''">Mercy clinic</a> is open.'
-	elseif (hour < 9 or hour > 17) and (StoryLine = 1 and SchoolAtestat = 0) or bumtolik > 3:
+	elseif (hour < 9 or hour > 17) and (mid($start_type,1,2) = 'sg' and SchoolAtestat = 0) or bumtolik > 3:
 		'Mercy clinic is closed.'
 	end
 	if hour >= 8 and hour <= 20:

+ 11 - 0
locations/city_island.qsrc

@@ -77,6 +77,17 @@ end
 
 if home_owned[11] = 1 or university['student'] = 1 or hour >= 6:'The <a href="exec:gt ''uni_dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
 
+if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,3) = 'uni':
+	*clr & cla
+	menu_off = 1
+	mainQW = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main.jpg"></center>'
+	'In front of your dorm, you see Tatiana and Gustav. Tatiana adjusts her glasses and looks around, while Gustav seems to be distracted, glancing here and there with a strange look on his face as his tattoos are not visible.'
+	'Tatiana looks at you closely, "I felt a burst of energy. Were you attacked by a magician?"'
+	act 'No':gt 'mainQW'
+	exit
+end
 
 --- city_island ---------------------------------
 

+ 5 - 3
locations/city_sauna.qsrc

@@ -220,10 +220,12 @@ if $ARGS[0] = 'saunaroom':
 						money -= 850
 					end
 					if disable_autosave = 0:
-						if StoryLine = 0:
-							savegame 'autosave.sav'
+						if mid($start_type,1,4) = 'city':
+							savegame 'autosave_city.sav'
+						elseif mid($start_type,1,3) = 'uni':
+							savegame 'autosave_uni.sav'
 						else
-							savegame 'autosave_alt.sav'
+							savegame 'autosave_sg.sav'
 						end
 					end
 					if $clothingworntype ! 'nude': gs 'clothing', 'strip'

+ 1 - 1
locations/city_trashplace.qsrc

@@ -302,7 +302,7 @@ if bomzQW = 0 and rand(1, 10) >= 8 and hour <= 16 and week ! 4:
 		*clr & cla
 		gs 'stat'
 
-		if storyline = 0:
+		if $start_type[1] = 'tg':
 			if daystart < 10 or stat['vaginal'] <= 2:
 				'"I''d love to, but I don''t have much money." Hell, you''re not even accustomed to your new body, but you take care not to say anything.'
 				'"Are you alright?" He looks you up and down.'

+ 1 - 1
locations/clothing.qsrc

@@ -409,7 +409,7 @@ if $ARGS[0] = 'clothing_list':
 			:loopgm_school_filter
 		end
 
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
 			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'gm_school', 6)
 		end
 

+ 1 - 1
locations/clothing_QV.qsrc

@@ -276,7 +276,7 @@ if $ARGS[0] = 'clothing_list':
 				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0:
 					!! Default school uniform
 					if i = 6:
-						if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0: *p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
+						if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0: *p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
 					elseif CloInhibit <= pcs_inhib:
 						if gm_school_s[i] = 0 and gm_school_h[i] > 0 and gm_school_b[i] >= (pcs_hips - 8) and gm_school_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', <<i>>"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
 					end

+ 10 - 10
locations/din_van.qsrc

@@ -79,10 +79,10 @@ $shower = {
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></center>'
 		*nl
 		'You undress and turn on the water in the shower. When it hits the right temperature, you step into the shower and let the warm water rain down on you.'
-		if daystart < 10 and (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:
+		if daystart < 10 and $start_type[1] = 'tg':
 			pcs_horny += rand(6,10)
 			'It''s really arousing to see your new body with all its smooth curves, breasts with large nipples, wide hips and smooth legs. You begin to lather your body, noticing how soft and tender it feels. Once you''re sure you haven''t missed a single spot, you begin to wash yourself off, continuing to experience new and strange sensations.'
-		elseif daystart < 30 and (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:
+		elseif daystart < 30 and $start_type[1] = 'tg':
 			pcs_horny += rand(2,6)
 			'You''ve already gotten used to your feminine body and its softness doesn''t surprise you very much anymore, but you still let your hands wander a bit over your soft curves before you begin to wash yourself in earnest.'
 		else
@@ -223,11 +223,11 @@ $bath = {
 		*nl
 		'You undress while the bathtub fills up and dip a toe into the water. It is just the right temperature, so you climb in and let yourself sink into the warm water, moaning softly as you feel your muscles start to relax.'
 
-		if daystart < 10 and StoryLine = 0 and ntstart = 0:
+		if daystart < 10 and $start_type[1] = 'tg':
 			pcs_horny += rand(6,10)
 			'You stare at the smooth, soft legs sticking out of the water. You''re still not used to this new body and the look of all this roundness.'
 			'As you start to soap yourself, you unwittingly turn your attention to your breasts. They''re so soft and big, and when you touch them you feel an unfamiliar but pleasant sensation. You take your time getting familiar with your new body, then you begin to wash yourself in earnest.'
-		elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
+		elseif daystart < 30 and $start_type[1] = 'tg':
 			pcs_horny += rand(2,6)
 			'You have become a little accustomed to your female body and casually soap up all these soft curves and rinse yourself off, rubbing your hands all over your feminine body to make sure you didn''t miss a spot.'
 		else
@@ -296,11 +296,11 @@ $brit = {
 	if shave_menu = 1 and stanok > 1:
 		if pcs_leghair > 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
 			if pcs_leghair > 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
-				if daystart < 10 and StoryLine = 0 and ntstart = 0:
+				if daystart < 10 and $start_type[1] = 'tg':
 					$shave_act = 'Shave your legs and pussy'
 					$shave_txt1 = 'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
 					$shave_txt2 = 'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
-				elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
+				elseif daystart < 30 and $start_type[1] = 'tg':
 					pcs_mood += 10
 					$shave_txt1 = 'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
 				elseif pubestyle = 1:
@@ -389,10 +389,10 @@ $brit = {
 					if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 					*nl
-					if daystart < 10 and StoryLine = 0 and ntstart = 0:
+					if daystart < 10 and $start_type[1] = 'tg':
 						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
 						'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
-					elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
+					elseif daystart < 30 and $start_type[1] = 'tg':
 						pcs_mood += 10
 						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
 					else
@@ -494,10 +494,10 @@ $brit = {
 				if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave2.jpg"></center>'
 				*nl
-				if daystart < 10 and StoryLine = 0 and ntstart = 0:
+				if daystart < 10 and $start_type[1] = 'tg':
 					'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
 					'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
-				elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
+				elseif daystart < 30 and $start_type[1] = 'tg':
 					pcs_mood += 10
 					'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
 				else

+ 2 - 2
locations/dina.qsrc

@@ -12,7 +12,7 @@ $brodila = {
 }
 
 $brodilr = {
-	if StoryLine = 1 and home_owned[2] = 1:
+	if mid($start_type,1,2) = 'sg' and home_owned[2] = 1:
 		gt 'pav_residential'
 	elseif home_owned[4] = 1:
 		gt'liames'
@@ -36,7 +36,7 @@ $brodils = {
 		gt'sitr','start'
 	elseif home_owned[4] = 1:
 		gt'sitr2x','start'
-	elseif StoryLine = 1 and home_owned[2] = 1:
+	elseif mid($start_type,1,2) = 'sg' and home_owned[2] = 1:
 		gt 'sitrPar'
 	else
 		gt'city_residential', 'start'

+ 1 - 1
locations/dreams.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'start':
 			gs 'dreams','d_dreams'
 		end
 	else
-		if storyline = 0:
+		if $start_type[1] = 'tg':
 			temp = rand(1, 10)
 			if temp = 1:
 				'You have hazy dreams about your past.'

+ 2 - 2
locations/fame.qsrc

@@ -494,7 +494,7 @@ if $ARGS[0] = 'calculate':
 	
 
 	!! Fame in the city will take alittle while before it start being noticed in other places. But the it will start spreading much faster than in the city. (The formula is +1050-52500000/(50000+(fame_city/10)^3 if the palyer is Sveta, but will spread a little slower for non Sveta starts using the formula +fame_city^2/1000)
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		if dyneval('RESULT = fame[''city_<<$ARGS[1]>>_core'']') >= 2000: 
 			dynamic 'fame[''city_<<$ARGS[1]>>_contribution_high''] = 1050'
 		else 
@@ -516,7 +516,7 @@ if $ARGS[0] = 'calculate':
 	end
 	
 	!!The fame from city takes sometime before it starts being noticed in the village, but after that it spread very fast (the formula is +1050 -672000000/(640000+(fame_city/10-20)^4) is player is Svata and +1050 -672000000/(640000+(fame_city/10-40)^4) in other starts).
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		if dyneval('RESULT = fame[''city_<<$ARGS[1]>>_core'']') >= 2000: 
 			dynamic 'fame[''city_<<$ARGS[1]>>_contribution_low''] = 1050'
 		elseif dyneval('RESULT = fame[''city_<<$ARGS[1]>>'']') >= 200:

+ 1 - 1
locations/family.qsrc

@@ -40,7 +40,7 @@ end
 if sisboyparty_day + 1 = daystart:sister_indorf = 0
 *nl
 
-if StoryLine = 1:
+if mid($start_type,1,2) = 'sg':
 	if sisboyparty_day + 1 = daystart and hour > 18 and sisboypartyQW = 1:
 		if sisboyparty = 1: sisboyparty = -1
 		if sisboyparty = 2:

+ 1 - 1
locations/fit.qsrc

@@ -334,7 +334,7 @@ if $ARGS[0] = 'gym':
 	*nl
 	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'
 
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		if hour >= 10 and hour < 12 and week = 7 and centr = 1: 'In the hall you see <a href="exec:gt ''VolleyTrenCentr''">Mikhail Nikolaevich</a> talking with a strange man.'
 		if hour >= 10 and hour < 12 and week = 7 and centr = 2 and ricewine < 2: 'In the hall you see <a href="exec:gt ''VolleyTrenCentr''">Guang</a>'
 	end

+ 1 - 1
locations/food_menu.qsrc

@@ -71,7 +71,7 @@ elseif $loc = 'gkafe':
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/menus/borislav.jpg"</center><br>'
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	if storyline = 1 and home_owned[2] = 1:
+	if mid($start_type,1,2) = 'sg' and home_owned[2] = 1:
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
 		$_eat['0,price'] = 'Free'

+ 1 - 1
locations/foto_albums.qsrc

@@ -345,7 +345,7 @@ if $ARGS[0] = 'anushka':
 	if nush_model >= 1:
 		'You open up the ninth album and browse through some of the pictures of Anushka placed inside. Well she did say she modeled here, so you are not really surprised to see a album of her here.'
 		'The photo''s all seem to be single pictures taken from past photo shoots.'
-	elseif storyline = 1:
+	elseif mid($start_type,1,2) = 'sg':
 		nush_model = 1
 		'You open up the ninth album and are surprised to see pictures of Anushka placed inside. She is one of the prettier girls in school and it is not surprising she would like being a model, she loves attention, still you are surprised no one has mentioned it at school, surely someone else has to know right?'
 		'The photo''s all seem to be single pictures taken from past photo shoots.'

+ 1 - 1
locations/foto_events.qsrc

@@ -2166,7 +2166,7 @@ if $ARGS[0] = 'runway2':
 								modelfoto['earnings'] += modelpayfin
 								gs'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-								if StoryLine = 1 and age < 18:
+								if mid($start_type,1,2) = 'sg' and age < 18:
 									'Another hour later, the show is over, the clothes are taken back, and you''re left naked in the studio, counting the <<modelpayfin>> <b>₽</b> you''ve been paid and musing over the happenings of the night. Working the runway isn''t too bad. But at the same time, this kind of thing has the tendency to circle around and you <i>really</i> hope nobody in Pavlovsk hears about this...'
 									act'Back in the studio':gt'foto','studio'
 								else

+ 1 - 1
locations/foto_model_documentary.qsrc

@@ -131,7 +131,7 @@ if $ARGS[0] = '1st_documentary':
 		end
 	end
 
-!!	if storyline = 1 and age < 18:
+!!	if mid($start_type,1,2) = 'sg' and age < 18:
 !!		act'No thanks (don''t want people to find out)':
 !!			cla & *clr
 !!			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'

+ 4 - 4
locations/foto_models.qsrc

@@ -149,7 +149,7 @@ if $ARGS[0] = 'mari_1':
 			'Something piques an interest in you as Mari mentions she''s from out of town, "If you don''t mind me asking where do you come from?"'
 			'"Oh, just some place called Gadukino. You''ve probably never heard of it. It''s a small village outside the city. Too small too be honest, same boring ins and outs every day. I wanted more excitement in my life! More than a simple farm girl would ever have. So I moved here."'
 
-			if storyline = 1:
+			if mid($start_type,1,2) = 'sg':
 				act'"You''re from Gadukino?"':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/mari_e/meeting/4a.jpg"></center>'
@@ -437,7 +437,7 @@ if $ARGS[0] = 'mari_chat':
 			'"Any siblings Mari?"'
 			*nl
 			'"No, none for me. I''m an only child. What about you?"'
-			if storyline = 1:
+			if mid($start_type,1,2) = 'sg':
 				if npc_rel['A34'] < 20:
 					'"Yeah, I''ve got two. My sister who''s about the same age as you are and my stupid little brother. He''s such a pain in the ass!"'
 					'Mari sits up a bit. "Really? What''s so bad about him?"'
@@ -738,7 +738,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 		end
 	end
 	
-	if mari['parent_ask'] < 1 and StoryLine = 1:
+	if mari['parent_ask'] < 1 and mid($start_type,1,2) = 'sg':
 		act'Ask about her parents':
 			mari['parent_ask'] = 1
 			cla & *clr
@@ -844,7 +844,7 @@ if $ARGS[0] = 'mari_modelling_chat':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/mari_e/talking/reading2.jpg"></center>'
 							'"I''m <<age>>. I didn''t work here when I was still underage, but I still needed the fake to buy booze and stuff," you grin.'
-							if StoryLine = 1:
+							if mid($start_type,1,2) = 'sg':
 								'"That''s fair enough I guess. Not everyone has a neighbor like Misha brewing moonshine vodka in his barn," she laughs.'
 							else
 								'"That''s fair enough I guess. I didn''t drink when I lived in the village, but if I ever wanted one, I had a neighbor who would brew moonshine in his barn," she laughs.'

+ 1 - 1
locations/gaddvor.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0]='':
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		'<center><h4>Your grandparents'' yard</h4></center>'
 	else
 		'<center><h4>Old couple''s yard</h4></center>'

+ 1 - 1
locations/gadfield.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'field':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadfield_night.jpg"></center>'
 		end
-		if hour >= 9 and hour <= 17 and npc_qw['A221'] = 0 and storyline = 1: gs 'grigory', 'meet' & exit
+		if hour >= 9 and hour <= 17 and npc_qw['A221'] = 0 and mid($start_type,1,2) = 'sg': gs 'grigory', 'meet' & exit
 	else
 		if hour >= 8 and hour < 18:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadfield_winter.jpg"></center>'

+ 82 - 84
locations/gadforest.qsrc

@@ -207,7 +207,7 @@ if $ARGS[0] = 'forest_edge':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				if StoryLine = 1 and grandaQW['block'] = 0:
+				if mid($start_type,1,2) = 'sg' and grandaQW['block'] = 0:
 					if hour >= 10 and hour < 16 and month >= 4 and month <= 10:
 						forestcaughtrand = rand(4,10)
 					elseif hour >= 6 and hour < 20 and month >= 4 and month <= 10:
@@ -809,105 +809,103 @@ end
 ! $forest_args1 - location of forest where this is called from
 ! Example: gs 'gadforest', 'picking'
 if $ARGS[0] = 'picking':
-	if StoryLine = 1 or (StoryLine = 0 and mirapickingtalk = 1):
-		if hour >= 6 and hour <= 22 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
-			if ($forest_args1 = 'forest_edge' and edge_pickingday ! daystart) or ($forest_args1 = 'forest_outskirts' and outskirts_pickingday ! daystart) or ($forest_args1 = 'forest_center' and center_pickingday ! daystart) or ($forest_args1 = 'swamp_woods' and swamp_pickingday ! daystart):
-				act 'Look for mushrooms and berries'+iif(MiraLoc = 3 and $forest_args1 = 'forest_edge', ' with Mira (0:30)',' (0:30)'):
-					*clr & cla
-					menu_off = 1
+	if hour >= 6 and hour <= 22 and month >= 6 and month <= 9 and boletus + boletus_cooked + bilberry < 5:
+		if ($forest_args1 = 'forest_edge' and edge_pickingday ! daystart) or ($forest_args1 = 'forest_outskirts' and outskirts_pickingday ! daystart) or ($forest_args1 = 'forest_center' and center_pickingday ! daystart) or ($forest_args1 = 'swamp_woods' and swamp_pickingday ! daystart):
+			act 'Look for mushrooms and berries'+iif(MiraLoc = 3 and $forest_args1 = 'forest_edge', ' with Mira (0:30)',' (0:30)'):
+				*clr & cla
+				menu_off = 1
 
-					if $forest_args1 = 'forest_edge':
-						edge_pickingday = daystart
-						mushroom_pickers_check = 1
-						max_boletus = 1
-						max_bilberry = 1
-					elseif $forest_args1 = 'forest_outskirts':
-						outskirts_pickingday = daystart
-						mushroom_pickers_check = 2
-						max_boletus = 2
-						max_bilberry = 2
-					elseif $forest_args1 = 'forest_center':
-						center_pickingday = daystart
-						mushroom_pickers_check = 3
-						max_boletus = 3
-						max_bilberry = 3
-					elseif $forest_args1 = 'swamp_woods':
-						swamp_pickingday = daystart
-						mushroom_pickers_check = 4
-						max_boletus = 4
-						max_bilberry = 4
-					end
+				if $forest_args1 = 'forest_edge':
+					edge_pickingday = daystart
+					mushroom_pickers_check = 1
+					max_boletus = 1
+					max_bilberry = 1
+				elseif $forest_args1 = 'forest_outskirts':
+					outskirts_pickingday = daystart
+					mushroom_pickers_check = 2
+					max_boletus = 2
+					max_bilberry = 2
+				elseif $forest_args1 = 'forest_center':
+					center_pickingday = daystart
+					mushroom_pickers_check = 3
+					max_boletus = 3
+					max_bilberry = 3
+				elseif $forest_args1 = 'swamp_woods':
+					swamp_pickingday = daystart
+					mushroom_pickers_check = 4
+					max_boletus = 4
+					max_bilberry = 4
+				end
 
-					minut += 30
-					new_boletus = 0
-					new_bilberry = 0
-					gs 'gadforest', 'bushcraft', $forest_args1
-					if $clothingworntype = 'nude':
-						if pcs_inhib < 50:inhib_exp += rand(1,5)
-						if MiraLoc = 3 and $forest_args1 = 'forest_edge':
-							gs 'arousal', 'flash', 5
-							gs 'arousal', 'end'
-						end
+				minut += 30
+				new_boletus = 0
+				new_bilberry = 0
+				gs 'gadforest', 'bushcraft', $forest_args1
+				if $clothingworntype = 'nude':
+					if pcs_inhib < 50:inhib_exp += rand(1,5)
+					if MiraLoc = 3 and $forest_args1 = 'forest_edge':
+						gs 'arousal', 'flash', 5
+						gs 'arousal', 'end'
 					end
+				end
+				gs 'stat'
+
+				! mushroom_pickers are not at the location of the forest Sveta is in
+				if mushroom_pickers ! mushroom_pickers_check:
+					new_boletus += max_boletus
+					new_bilberry += max_bilberry
+					boletus += new_boletus
+					bilberry += new_bilberry
+					pcs_mood += 10
+					gs 'stat'
+
+					gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+					*nl
+					'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
+				! mushroom pickers are at the location of the forest Sveta is in
+				elseif mushroom_pickers = mushroom_pickers_check:
+					new_boletus += rand(0,max_boletus)
+					new_bilberry += rand(0,max_bilberry)
+					boletus += new_boletus
+					bilberry += new_bilberry
 					gs 'stat'
 
-					! mushroom_pickers are not at the location of the forest Sveta is in
-					if mushroom_pickers ! mushroom_pickers_check:
-						new_boletus += max_boletus
-						new_bilberry += max_bilberry
-						boletus += new_boletus
-						bilberry += new_bilberry
+					if new_boletus > 0 and new_bilberry > 0:
 						pcs_mood += 10
 						gs 'stat'
 
 						gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
 						*nl
 						'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
-					! mushroom pickers are at the location of the forest Sveta is in
-					elseif mushroom_pickers = mushroom_pickers_check:
-						new_boletus += rand(0,max_boletus)
-						new_bilberry += rand(0,max_bilberry)
-						boletus += new_boletus
-						bilberry += new_bilberry
+					elseif new_boletus = 0 and new_bilberry > 0:
+						pcs_mood += 5
 						gs 'stat'
 
-						if new_boletus > 0 and new_bilberry > 0:
-							pcs_mood += 10
-							gs 'stat'
-
-							gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
-							*nl
-							'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms and <<new_bilberry>> kg of berries.'
-						elseif new_boletus = 0 and new_bilberry > 0:
-							pcs_mood += 5
-							gs 'stat'
-
-							gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
-							*nl
-							'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
-						elseif new_boletus > 0 and new_bilberry = 0:
-							pcs_mood += 5
-							gs 'stat'
-
-							gs 'gadforest', 'picking_clothes', $forest_args1, 'mushroom'
-							*nl
-							'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms'
-						elseif new_boletus = 0 and new_bilberry = 0:
-							pcs_mood -= 5
-							gs 'stat'
-
-							gs 'gadforest', 'picking_clothes_empty', $forest_args1
-							*nl
-							'After searching for mushrooms and berries for half an hour you found nothing.'
-						end
-					end
+						gs 'gadforest', 'picking_clothes', $forest_args1, 'berry'
+						*nl
+						'After searching for mushrooms and berries for half an hour you found <<new_bilberry>> kg of berries.'
+					elseif new_boletus > 0 and new_bilberry = 0:
+						pcs_mood += 5
+						gs 'stat'
 
-					if $forest_args1 = 'swamp_woods':
-						act 'Continue': gt 'swamp_woods', 'start'
-					else
-						act 'Continue': gt 'gadforest', $forest_args1
+						gs 'gadforest', 'picking_clothes', $forest_args1, 'mushroom'
+						*nl
+						'After searching for mushrooms and berries for half an hour you found <<new_boletus>> kg of mushrooms'
+					elseif new_boletus = 0 and new_bilberry = 0:
+						pcs_mood -= 5
+						gs 'stat'
+
+						gs 'gadforest', 'picking_clothes_empty', $forest_args1
+						*nl
+						'After searching for mushrooms and berries for half an hour you found nothing.'
 					end
 				end
+
+				if $forest_args1 = 'swamp_woods':
+					act 'Continue': gt 'swamp_woods', 'start'
+				else
+					act 'Continue': gt 'gadforest', $forest_args1
+				end
 			end
 		end
 	end

+ 8 - 8
locations/gadforestlost.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'forest_outskirts':
 	foresteventrand = rand(1,40)
 	if foresteventrand <= (2+(bonfire*5)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', 'forest_outskirts'
 	if foresteventrand <= (4+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and daystart > forest_lostday + 1: gt 'gadforestlost', 'rescue', 'hunters', 'forest_outskirts'
-	if foresteventrand <= (6+(bonfire*5)) and StoryLine = 1 and daystart > forest_lostday: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
+	if foresteventrand <= (6+(bonfire*5)) and mid($start_type,1,2) = 'sg' and daystart > forest_lostday: gt 'gadforestlost', 'rescue', 'ranger', 'forest_outskirts'
 	if foresteventrand <= (8-(bonfire*5)) and (hour < 6 or hour > 22): gt 'gadforestlost', 'wolves', 'forest_outskirts'
 
 	gs 'gadforestlost', 'wander'
@@ -57,7 +57,7 @@ if $ARGS[0] = 'forest_center':
 	! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 	foresteventrand = rand(1,40)
 	if foresteventrand <= (1+(bonfire*2)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)) and daystart > forest_lostday: gt 'gadforestlost', 'rescue', 'hunters', 'forest_center'
-	if foresteventrand <= (3+(bonfire*2)) and StoryLine = 1 and daystart > forest_lostday + 1: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
+	if foresteventrand <= (3+(bonfire*2)) and mid($start_type,1,2) = 'sg' and daystart > forest_lostday + 1: gt 'gadforestlost', 'rescue', 'ranger', 'forest_center'
 	if foresteventrand <= (8-(bonfire*2)) and (hour < 6 or hour > 22): gt 'gadforestlost', 'wolves', 'forest_center'
 
 	gs 'gadforestlost', 'wander'
@@ -152,12 +152,12 @@ if $ARGS[0] = 'relax':
 		foresteventrand = rand(1,30)
 		if foresteventrand <= (2+(bonfire*5)) and daystart >= forest_lostday and month >= 6 and month <= 9 and hour >= 8 and hour <= 16 and mushroom_pickersday ! daystart: mushroom_pickers = 2 & gt 'gadforestlost', 'rescue', 'pickers', $forest_args1
 		if foresteventrand <= (4+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
-		if foresteventrand <= (6+(bonfire*5)) and StoryLine = 1 and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+		if foresteventrand <= (6+(bonfire*5)) and mid($start_type,1,2) = 'sg' and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
 	elseif $forest_args1 = 'forest_center':
 		! having a bonfire increases chances of being rescued and decreases chances of wolves attacking
 		foresteventrand = rand(1,40)
 		if foresteventrand <= (1+(bonfire*5)) and daystart > forest_lostday and month >= 4 and month <= 10 and ((hour >= 8 and hour < 12) or (hour >= 14 and hour < 18)): gt 'gadforestlost', 'rescue', 'hunters', $forest_args1
-		if foresteventrand <= (3+(bonfire*5)) and StoryLine = 1 and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
+		if foresteventrand <= (3+(bonfire*5)) and mid($start_type,1,2) = 'sg' and daystart > forest_lostday+1: gt 'gadforestlost', 'rescue', 'ranger', $forest_args1
 	end
 
 	'<center><H4>Somewhere in the forest</H4></center>'
@@ -491,7 +491,7 @@ if $ARGS[0] = 'rescue':
 	bonfire = 0
 	pcs_mood += 20
 	bushcraft_exp += rand(1,5)
-	if StoryLine = 0: lost_girl = 0
+	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.','.')
 		gs 'clothing', 'strip', 'gadforest'
@@ -504,7 +504,7 @@ if $ARGS[0] = 'rescue':
 		*nl
 		'Suddenly you hear the sounds of people approaching. A group of pickers from the village appear out of the bushes.'
 		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
-		if StoryLine = 1 and grandmaQW['block'] = 0:
+		if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 			'They walk up to you and say, "Your grandparents are very worried about you. They asked us to keep an eye out for you. Follow us, we will lead you back '+iif($clothingworntype ! 'nude','to their house."','to the edge of the forest."')
 			if $clothingworntype ! 'nude':
 				if $ARGS[2] = 'forest_outskirts':
@@ -540,7 +540,7 @@ if $ARGS[0] = 'rescue':
 		*nl
 		'Suddenly you hear the sounds of people approaching. '+iif(hunters_were_met=1,'The hunters from the swamp ','A group of hunters ')+'appear out of the bushes.'
 		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
-		if StoryLine = 1 and grandmaQW['block'] = 0:
+		if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 			'They walk up to you and say, "Your grandparents are very worried about you. They asked us to keep an eye out for you. Follow us, you can stay at our camp for the time being until someone can take you back."'
             if $ARGS[2] = 'forest_outskirts':
                 act 'Continue': minut += 45 & gt 'hunter_interactions', 'meet_hunters_after_rescue'
@@ -560,7 +560,7 @@ if $ARGS[0] = 'rescue':
 		*nl
 		'Suddenly you hear the sound of a person approaching. A man you vaguely recognize from the village appears out of the bushes.'
 		if bonfire = 1:'They notice your fire and praise you, "When lost, it''s very smart if you stay in one place and make a fire. It will keep you warm, and make you visible to others."'
-		if StoryLine = 1 and grandmaQW['block'] = 0:
+		if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 			'He walks up to you and says, "Your grandparents are very worried about you. They asked me to keep an eye out for you. Follow me, I will lead you back '+iif($clothingworntype ! 'nude','to their house."','to the edge of the forest."')
 			if $clothingworntype ! 'nude':
 				if $ARGS[2] = 'forest_outskirts':

+ 1 - 1
locations/gadriver.qsrc

@@ -1233,7 +1233,7 @@ if $ARGS[0] = 'fishing':
 
 				act 'Leave':gt $loc, $loc_arg
 			end
-			if StoryLine = 1 and grandmaQW['block'] = 0:
+			if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 				act 'Bring a fish to Boniface':
 					cla
 					*clr

+ 1 - 1
locations/gadroad.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = 'drinking_invite':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drunk.jpg"></center>'
 	'You quickly catch up to the boys who have already started drinking.'
 	!School girl Sveta
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		! Sveta has never been drinking with Mitka before
 		if mitka_first_drink = 1:
 			'Mitka is the first to greet you, "Hey <<$pcs_nickname>>, glad you decided to join us today!"'

+ 1 - 1
locations/gadsarai.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = 'search':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/necklace.jpg"></center>'
 		*nl
-		if altQS = 1:
+		if $start_type[1] ! 'nomagic':
 			'While looking through the barn your foot goes through a rotten floorboard. You suddenly feel the presence of something magical under the floor. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The feeling of power is coming from within the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You feel the power coming from the necklace, but it doesn''t feel like any power you have ever felt.'
 		else
 			'While looking through the barn your foot goes through a rotten floorboard and gets stuck. As you work your foot free, you glimpse something underneath the floor - a box or something. You get on your belly and look through the hole in the floor. You find a small box made of a black wood. You pick up the box and see the box is covered in a strange writing and glyphs that look like serpents. The exotic look of the box gives you gooseflesh and you find yourself holding your breath as you prepare to open the box. You lift the lid of the box and see a black metal necklace that looks like a coiled snake with ruby eyes. You let your breath out slowly as you tilt the necklace from side to side, watching the light sparkle as it is reflected by the facets on the deep red rubies. You cannot begin to guess what this necklace must be worth.'

+ 3 - 3
locations/gadukino.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = '':
 		gs 'stat'
 		'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big63.jpg"></center>'
-		if StoryLine = 1:
+		if mid($start_type,1,2) = 'sg':
 			'As you walk through the village, you are approached by Mitka, your childhood friend.'
 		else
 			if npc_rel['A63'] = 0:
@@ -99,7 +99,7 @@ if $ARGS[0] = '':
 		*nl
 		'A small village with many old wooden houses and even more in various states of disrepair. It has certainly seen better times.'
 		if car > 0 and cardrive = 23: '<a href="exec:GS ''carF'',''start''">Your <<$car>></a> is close by.'
-		if StoryLine = 1 and grandmaQW['block'] = 0:
+		if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 			'Several small farms are scattered around the outskirts of the village, one of which belongs to <a href="exec:minut += 5 & gt ''gaddvor''">your grandparents</a>.'
 			act 'Go to your grandparent''s house': minut += 5 & gt 'gaddvor'
 		end
@@ -327,7 +327,7 @@ if $ARGS[0] = 'mira_events':
 			'You decide to lend a hand to help the girl with the calf. You are lonely in the village, and maybe this girl, if you get to know her, could make your trips to Gadukino less boring. You walk over to the girl and introduce yourself and ask if she wants help. She nods and resumes pulling on the rope, while you walk over behind the calf and give it a load slap on the rump. The calf is surprised and immediately moves forward away from you. The girl smiles in thanks and tells you her name is Miroslava, but everyone calls her Mira.'
 			'Together you are able to guide the calf back into its pen. Mira turns out to be quite a sociable girl and conversationalist. You learn that her family was recently forced to move to the village from the city. Her father''s huge gambling debts to some questionable men forced him to eventually sell the family''s property in the city to pay them back. Mira is having a rough time adjusting to the life in a small village. She misses the apartment in the center of the city and the money to buy nice dresses and makeup with. After selling everything and paying off the debt, her father was told to leave the city "or else...".'
 			'They were left quite poor and could only afford to buy a house in this run-down, dust-covered village.'
-			if StoryLine = 1:
+			if mid($start_type,1,2) = 'sg':
 				'You walk with her and chat until you reach her house, which turns out to be just down the road from your grandparent''s place. Mira invites you to come and visit her any time. She is just as bored in the village as you are.'
 			else
 				'You walk with her and chat until you reach her house, which is close by to the center of the village. Mira invites you to come and visit her at any time. She is just as bored in the village as you are.'

+ 6 - 4
locations/gameover.qsrc

@@ -14,7 +14,7 @@ if over = 1:
 	'You are dragged out by the morgue attendants. The pathologist notes that you died from an unknown cause. Soon, your body is handed over to your parents...'
 elseif over = 2:
 	'<center><img <<$set_imgh>> src="images/system/2_endings/over.jpg"></center>'
-	if StoryLine = 0 and ntstart = 0:
+	if $start_type[1] = 'tg':
 		'You go mad and start running around town naked screaming, "I am a man!". The police are quickly alerted, and you are taken to a mental hospital. There, you are put in a straitjacket then placed in a room with soft walls. You spend the rest of your days in happy delusions about your family and being a man again, but the delusions never became reality.'
 		*nl
 		'Hint:'
@@ -90,10 +90,12 @@ if $ARGS[0] = 'endscreen':
 end
 
 if $ARGS[0] = 'load_autosave':
-	if StoryLine = 0:
-		opengame 'autosave.sav'
+	if mid($start_type,1,4) = 'city':
+		opengame 'autosave_city.sav'
+	elseif mid($start_type,1,3) = 'uni':
+		opengame 'autosave_uni.sav'
 	else
-		opengame 'autosave_alt.sav'
+		opengame 'autosave_sg.sav'
 	end
 end
 

+ 2 - 2
locations/gdksport.qsrc

@@ -78,7 +78,7 @@ if $ARGS[0] = 'start':
 		gt 'wardrobe', 'start'
 	end
 
-	if shampoo > 0 or (StoryLine = 1 and (SchoolAtestat = 0 or SchoolBlock = 0)):
+	if shampoo > 0 or (mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0)):
 		act 'Take a shower': gt 'gdksport', 'shower'
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
@@ -579,7 +579,7 @@ if $ARGS[0] = 'shower':
 	menu_off = 1
 	*clr & cla
 	$location_type = 'bathroom'
-	if StoryLine = 1 and (SchoolAtestat = 0 or SchoolBlock = 0): noShampoo = 1
+	if mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0): noShampoo = 1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1

+ 1 - 1
locations/gkafe.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = '':
 					act '"Drink tea" with Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1-1'
 				end
 			end
-			if StoryLine = 1 and SchoolAtestat = 0:
+			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 				if (sunWeather = 0 or temper <= 0) and (hour >= 18 and hour < 20 and week < 6) or (week >= 6 and hour >= 9 and hour < 20):
 					'<a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> are sitting at a table in the far corner.'
 			end

+ 1 - 1
locations/grigory.qsrc

@@ -1046,7 +1046,7 @@ if $ARGS[0] = 'romantic_event':
 			'"Where were you thinking?" You ask.'
 			'"I can walk you back to your Grandparent''s home, or you could come back to mine," He looks you in the eye, a hopeful look on his face.'
 			
-			if StoryLine = 1 and grandmaQW['block'] = 0:
+			if mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 				act 'Grandparents Home':
 					'"I should probably get back to my Grandparent''s place," You say.'
 					'You see a rueful smile cross Grigory''s face, "Ok," Standing, he gives you a little hug, your feet dangling off the ground, before he lowers you to stand on your own two feet again.'

+ 1 - 1
locations/gschool_grounds.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'main':
 		'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
 
-	if day = nyp_day and month = 12 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+	if day = nyp_day and month = 12 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 		if hour >= 14 and hour < 17:
 			'All of the boys and girls are standing near the school. Everyone did their best to look good today, wearing their nicest clothes. Someone calls out to you. "Hey <<$pcs_nickname>>, are you coming to the New Year''s Eve party or not? You haven''t paid the 1000 <b>₽</b> entry fee yet!"'
 

+ 3 - 3
locations/hookup.qsrc

@@ -447,7 +447,7 @@ if $ARGS[0] = 'bj_react1.2':
 						gs'hookup','generous_lick'
 					else
 						'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-						if StoryLine = 1: 
+						if mid($start_type,1,2) = 'sg': 
 							'"I don''t know," you shrug. "Ask my mom why it matters so much."'
 						else
 							'You shrug. "I''m still a virgin aren''t I?"'
@@ -507,7 +507,7 @@ if $ARGS[0] = 'bj_react2':
 						gs'hookup','generous_lick'
 					else
 						'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-						if StoryLine = 1: 
+						if mid($start_type,1,2) = 'sg': 
 							'"I don''t know. Ask my mom why it matters so much," you shrug.'
 						else
 							'You shrug. "I''m still a virgin aren''t I?"'
@@ -666,7 +666,7 @@ if $ARGS[0] = 'bj2':
 						'"Sorry, but I''m saving myself for marriage," you say apologetically, reaching for your clothes.'
 						if rand(0,1) = 1:
 							'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-							if StoryLine = 1: 
+							if mid($start_type,1,2) = 'sg': 
 								'"I don''t know. Ask my mom why it matters so much," you shrug.'
 							else
 								'You shrug. "I''m still a virgin aren''t I?"'

+ 1 - 1
locations/hookup_after.qsrc

@@ -1817,7 +1817,7 @@ if $ARGS[0] = 'sleep':
 		gs'sleep','simple'
 	end	
 	
-	if StoryLine = 1 and home_owned[2] = 1: sveta_punishment['no_come_home'] = 1
+	if mid($start_type,1,2) = 'sg' and home_owned[2] = 1: sveta_punishment['no_come_home'] = 1
 	gt'hookup_morning','morning'
 end
 --- hookup_after ---------------------------------

+ 2 - 2
locations/hookup_morning.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'morning':
 		'Your mind stirs and you slowly come to consciousness. Your first thoughts are...'
 		act'<i>Yawn</i>':gt'hookup_morning','yawn_wake'
 	end
-	if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
+	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
 		act'School!':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
@@ -150,7 +150,7 @@ if $ARGS[0] = 'confused':
 		'"Yeah," you mumble back.'
 		gs'hookup_morning','wakeup'
 	end
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		act'Mom!':gt'hookup_morning','mom'
 	end
 end

+ 1 - 1
locations/ilyroom.qsrc

@@ -17,7 +17,7 @@ act 'Leave':
 	gt 'city_industrial'
 end
 
-if StoryLine = 0 or altQS = 1:
+if $start_type[1] ! 'nomagic':
 	if poverKAR = 1:
 		'As you approach the door, you hear a faint rustling behind you. You turn and see Gustav. He walks up to you and says, "This is Ilyushkin''s apartment. Take this camera and film. Now we''ll get him."'
 

+ 3 - 0
locations/intro_city.qsrc

@@ -1,7 +1,9 @@
 # intro_city
 
 gs 'themes', 'indoors'
+killvar '$start_type'
 $start_type = 'city'
+$start_type[1] = 'nomagic'
 
 if $ARGS[0] = 'start':
 
@@ -219,6 +221,7 @@ end
 if $ARGS[0] = 'welcome_intro':
 	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech
+	MagikDostup = 1
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'

+ 1 - 0
locations/intro_city_m.qsrc

@@ -1,6 +1,7 @@
 # intro_city_m
 
 gs 'themes', 'indoors'
+killvar '$start_type'
 $start_type = 'city_m'
 
 'Not yet available!!'

+ 3 - 3
locations/intro_city_tg.qsrc

@@ -1,7 +1,9 @@
 # intro_city_tg
 
 gs 'themes', 'indoors'
+killvar '$start_type'
 $start_type = 'city_tg'
+$start_type[1] = 'tg'
 
 if $ARGS[0] = 'start':
 	menu_off = 1
@@ -164,8 +166,6 @@ if $ARGS[0] = 'roadPRE':
 end
 
 if $ARGS[0] = 'otelPRE':
-	$temp_firstname = '<<$pcs_firstname>>'
-	$temp_lastname = '<<$pcs_lastname>>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/6.jpg"></center>'
 	'Your trip to the hotel is quite uneventful compared to your tomb raiding adventure.'
 	*nl
@@ -248,7 +248,7 @@ if $ARGS[0] = 'otelPRE':
 										StoryLine = 0
 										MagikDostup = 0
 										$pcs_firstname = 'Mikhail'
-										$pcs_lastname = 'Kuznetsov'
+										$pcs_lastname = 'Ivanov'
 										age = 35
 										vidage = 35
 										year = 2016

+ 4 - 0
locations/intro_sg.qsrc

@@ -1,6 +1,9 @@
 # intro_sg
 
 gs 'themes', 'indoors'
+killvar '$start_type'
+$start_type = 'sg'
+$start_type[1] = 'nomagic'
 
 if $ARGS[0] = 'start':
 	menu_off = 1
@@ -47,6 +50,7 @@ end
 if $ARGS[0] = 'five':
 	gs 'intro_sg_select', 'sg_settings'
 	gs 'intro_initialization'
+	MagikDostup = 1
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'

+ 2 - 0
locations/intro_sg_m.qsrc

@@ -1,6 +1,8 @@
 # intro_sg_m
 
 gs 'themes', 'indoors'
+killvar '$start_type'
+$start_type = 'sg_m'
 
 if $ARGS[0] = 'four':
 	*clr & cla

+ 1 - 1
locations/intro_sg_select.qsrc

@@ -1,7 +1,7 @@
 # intro_sg_select
 
 if $ARGS[0] = 'start':
-	StoryLine = 1
+	mid($start_type,1,2) = 'sg'
 	ml_update_1 = 1
 	birthyear = 1999
 	yearlefttemp = 1

+ 4 - 1
locations/intro_sg_tg.qsrc

@@ -1,6 +1,9 @@
 # intro_sg_tg
 
 gs 'themes', 'indoors'
+killvar '$start_type'
+$start_type[1] = 'tg'
+$start_type = 'sg_tg'
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -152,7 +155,7 @@ end
 if $ARGS[0] = 'settings':
 	*clr & cla
 
-	StoryLine = 1
+	mid($start_type,1,2) = 'sg'
 	ml_update_1 = 1
 	!! NPC Data and Relations
 	gs 'npcstatic1'

+ 3 - 0
locations/intro_uni.qsrc

@@ -1,7 +1,9 @@
 # intro_uni
 
 gs 'themes', 'indoors'
+killvar '$start_type'
 $start_type = 'uni'
+$start_type[1] = 'nomagic'
 
 !!if $ARGS[0] = 'elective_choice':
 !!	
@@ -224,6 +226,7 @@ end
 if $ARGS[0] = 'welcome_intro':
 	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech
+	MagikDostup = 1
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'

+ 1 - 0
locations/intro_uni_m.qsrc

@@ -1,6 +1,7 @@
 # intro_uni_m
 
 gs 'themes', 'indoors'
+killvar '$start_type'
 $start_type = 'uni_m'
 
 'Not yet available!!'

+ 2 - 0
locations/intro_uni_tg.qsrc

@@ -1,7 +1,9 @@
 # intro_uni_tg
 
 gs 'themes', 'indoors'
+killvar '$start_type'
 $start_type = 'uni_tg'
+$start_type[1] = 'tg'
 
 'Not yet available!!'
 

+ 2 - 2
locations/journal.qsrc

@@ -191,13 +191,13 @@ if $ARGS[0] = 'records':
 	'<center><a href="exec: gt ''journal_quests'', ''start''">Quests</a></center>'
 	'<br><center><a href="exec: gt ''journal'', ''locations''">Locations</a></center>'
 	'<br><center><a href="exec: gt ''journal'', ''friends_family''">Friends & Family</a></center>'
-	if SchoolAtestat = 0 and storyline = 1 and SchoolBlock = 0: '<br><center><a href="exec: gt ''journal'', ''school''">School</a></center>'
+	if SchoolAtestat = 0 and mid($start_type,1,2) = 'sg' and SchoolBlock = 0: '<br><center><a href="exec: gt ''journal'', ''school''">School</a></center>'
 	if university['student'] = 1: '<br><center><a href="exec: gt ''journal'', ''uni''">University</a></center>'
 	'<br><center><a href="exec: gt ''journal'', ''clothing''">Clothing information</a></center>'
 	
 	'<center><h2>Relationships</h2></center>'
 	
-	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 	
 		if grupTipe < 5 and grupvalue[grupTipe] > 700:
 			$journal_school_standing = ' You are well respected and liked within your clique.'

+ 1 - 1
locations/journal_quests.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'start':
 	'<center><h1>Quests</h1></center>'
 
 !!to check Sveta is at school. All school quests must pass this and it should become a category as we expand
-	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 		'<center><h1>Cheerleading</h1></center>'
 		*nl
 		if (month > 11 or month < 6) and cheerleadingQW['quest_stage'] = 0:

+ 4 - 2
locations/mainQW.qsrc

@@ -54,7 +54,7 @@ act 'Investigate':
 				'"We met Reinhold there, he represents the council of the highest order. They are the old ones and hold council on the highest matters of magic we must be careful not to upset them or attract the attention of demons."'
 				'"Woah! Demons?'
 				'"Demons, you know, creatures from other plains of existence. It''s possible that Rikudo was a demon, but demons unlike him are beings with terrible force, blunt and aggressive. Something like beasts woven from pure magic. Much like the fae, they have different types and they possess different magics and skills, but these are not cute or friendly."'
-				if StoryLine = 0 and magikDostup = 0:
+				if $start_type[1] = 'tg':
 					'"Got it. Hey, you can turn me back into a man?"'
 					'"I can''t. I drew the energy you were emitting from the amulet, I don''t hold anything like the energy required and you have only access to the smallest hint of the potential of the amulet. It might be possible if your magical energies are much higher and you somehow pass me all your energy that I can reverse the spell, but this is unlikely and could put you back in the position you were in when we met. I''m sorry."'
 				end
@@ -63,8 +63,10 @@ act 'Investigate':
 
 				act 'Leave':
 					minut += 15
-					if StoryLine = 0:
+					if mid($start_type,1,4) = 'city':
 						gt 'city_residential'
+					elseif mid($start_type,1,3) = 'uni':
+						gt 'city_island'
 					else
 						gt 'pav_residential'
 					end

+ 2 - 2
locations/miroslava.qsrc

@@ -483,7 +483,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 
-		if npc_rel['A60'] >= 15 and MiraLoc ! 3 and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1) and StoryLine = 1 and grandmaQW['block'] = 0:
+		if npc_rel['A60'] >= 15 and MiraLoc ! 3 and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1) and mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 			if mira_guest = 0:
 				act 'Invite to your grandparent''s':
 					menu_off = 1
@@ -563,7 +563,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 		end
 
 		if npc_rel['A60'] >= 15 and Mira_no = 0 and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1):
-			if mira_guest = 0 and mira_temp >= 1 and mira_temp <= 2 and mira_go_blok = 0 and MiraLoc ! 3 and StoryLine = 1 and grandmaQW['block'] = 0:
+			if mira_guest = 0 and mira_temp >= 1 and mira_temp <= 2 and mira_go_blok = 0 and MiraLoc ! 3 and mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
 				menu_off = 1
 				*clr & cla
 				minut += 1

+ 1 - 1
locations/miroslavahome.qsrc

@@ -193,7 +193,7 @@ if $ARGS[0] = 'mirabrother':
 														'After a couple of minutes you feel his warm sticky cum hit the back of your throat and begin to swallow it all down. Mira''s brother stands still for a minute, his eyes closed in bliss. Finally, he takes his cock out of your mouth and zips up his pants. You put your helmets back on, get on the motorcycle once again, and he drives you back to the village...'
 
 														act 'Ask him to take you back to Mira''s house': gt 'MiroslavaHome', 'start'
-														if StoryLine = 1  and grandaQW['block'] = 0:act 'Ask him to drop you off at your grandparents house': gt 'gaddvor'
+														if mid($start_type,1,2) = 'sg'  and grandaQW['block'] = 0:act 'Ask him to drop you off at your grandparents house': gt 'gaddvor'
 													end
 												end
 											end

+ 14 - 4
locations/mirror.qsrc

@@ -146,8 +146,13 @@ if $ARGS[0] = 'start':
 
 
 		!########## main desc ##########
-		if daystart < 10 and (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:'In the mirror, you see a strange woman''s face looking back at you that exactly copies all your actions. You can hardly accept the idea that this is now you.'
-		if daystart >= 10 and daystart < 30 and (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:'In the mirror you see a woman''s face to which you have become accustomed to. But sometimes, you get the feel that this is not your face.'
+		if $start_type[1] = 'tg':
+			if daystart < 10:
+				'In the mirror, you see a strange woman''s face looking back at you that exactly copies all your actions. You can hardly accept the idea that this is now you.'
+			elseif daystart < 30:
+				'In the mirror you see a woman''s face to which you have become accustomed to. But sometimes, you get the feel that this is not your face.'
+			end
+		end
 		'<<$pcs_apprnc>>'
 		'<<$hair>>'
 		'<<$pcs_makeup>>. Your<<$pcdesc_eyesizeinsertive>> eyes are <<$pcdesc_eyecolour>> <<$pcs_lashes>>, and you have <<$pcdesc_fulllipswordy>>.'
@@ -175,8 +180,13 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 		end
 		*nl
-		if daystart < 10 and (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:'In the mirror, you see a strange woman''s face looking back at you that exactly copies all your actions. You can hardly accept the idea that this is now you.'
-		if daystart >= 10 and daystart < 30 and (StoryLine = 0 or (StoryLine = 1 and csb_start = 1)) and ntstart = 0:'In the mirror you see a woman''s face to which you have become accustomed to. But sometimes, you get the feel that this is not your face.'
+		if $start_type[1] = 'tg':
+			if daystart < 10:
+				'In the mirror, you see a strange woman''s face looking back at you that exactly copies all your actions. You can hardly accept the idea that this is now you.'
+			elseif daystart < 30:
+				'In the mirror you see a woman''s face to which you have become accustomed to. But sometimes, you get the feel that this is not your face.'
+			end
+		end
 		'<<$hair>>'
 		'<<$pcs_makeup>>. Your<<$pcdesc_eyesizeinsertive>> eyes are <<$pcdesc_eyecolour>> <<$pcs_lashes>>, and you have <<$pcdesc_fulllipswordy>>.'
 		'<<$skin>>'

+ 2 - 2
locations/mitka.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = '':
 		'You and Mitka are best friends.'
 	end
 	! School girl Sveta already knows Mitka
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		$mitkaInvitation = 'Listen, we have a fresh batch of our home brew. Come drink with us at eight o''clock. We meet by the forest road outside the village. We''ll hang out with some friends, and have fun. What do you say?'
 		
 		'He is barely older than you, you remember him from your childhood. You both used to swim in the local river together.'
@@ -127,7 +127,7 @@ if $ARGS[0] = 'sex_chat':
 		*nl
 		'Mitka scratches his balls and adds with a grin: "Hey <<$pcs_nickname>>, do you want to have some fun?"'
 		if pcs_vag = 0:
-			if StoryLine = 1:
+			if mid($start_type,1,2) = 'sg':
 				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'I don''t know. My mother is obsessed with me staying a virgin. (<<will_cost>> Willpower)':

+ 1 - 1
locations/npcstatic1.qsrc

@@ -229,7 +229,7 @@ gs 'npcstaticdefaults', 'group', 'gopnik'
 $npc_thdick['A<<npctemp>>'] = 'massive'
 npc_dick['A<<npctemp>>'] = 15
 npc_sexskill['A<<npctemp>>'] = rand(0,2)
-if storyline = 1: npc_rel['A<<npctemp>>'] = 40
+if mid($start_type,1,2) = 'sg': npc_rel['A<<npctemp>>'] = 40
 npc_intel['A<<npctemp>>'] = 33
 hotcat_rating['A<<npctemp>>'] = 4
 

+ 2 - 2
locations/obj_din.qsrc

@@ -915,7 +915,7 @@ if $ARGS[0] = 'reputation':
 			if rinslut > 0 or kavslut > 0:'In the residential area of ​​you are known as a whore that sleeps with Caucasians.'
 			if afra > 80: 'In the student hostel, you are known for bedding blacks.'
 			if opusk > 0 or gnewQW >= 5: 'In the residential area it is well known by all the guys that you are a whore.'
-			if StoryLine = 1:
+			if mid($start_type,1,2) = 'sg':
 				*nl
 				if motherKnowWhore > 0:
 					'Your mother knows that you are sexually active and considers you a whore.'
@@ -2016,7 +2016,7 @@ if $ARGS[0] = 'emergency':
 	*nl
 
 	cla
-	if StoryLine = 1:act 'Go to Pavlovsk':gt 'pav_residential'
+	if mid($start_type,1,2) = 'sg':act 'Go to Pavlovsk':gt 'pav_residential'
 	act 'Go to City Residental':gt 'city_residential'
 	act 'Remove all mods':
 		killqst

+ 7 - 7
locations/pav_complex.qsrc

@@ -78,7 +78,7 @@ if $ARGS[0] = 'start':
 		act 'Join Rex in his car':gt 'rex_events','avto2'
 	end
 
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg':
 		'Located in the old part of Pavlovsk, these Soviet era apartment blocks are the Five Eight Estate. Your family''s apartment is on the second floor of the nearest building'+iif(home_owned[2] = 1, '.', ', but you are no longer welcome there.')
 	else
 		'Located in the old part of Pavlovsk, these Soviet era apartment blocks are the Five Eight Estate.'
@@ -139,7 +139,7 @@ if $ARGS[0] = 'start':
 	
 	if rolanmeet = 8 and rolanblockhome ! 1: '<br>Mr. Matveev''s is living in an <a href="exec:minut += 5 & gt ''rolanapt'',''home''">apartment</a> in the Five Eight Estate.'
 	
-!!	if StoryLine = 1: '<br>Nearby, in another block of apartments, there''s an <a href="exec:minut += 3 & gt ''pavComplexOld'',''etaj_1''">old apartment building</a> that looks quite rundown and possibly abandoned.'
+!!	if mid($start_type,1,2) = 'sg': '<br>Nearby, in another block of apartments, there''s an <a href="exec:minut += 3 & gt ''pavComplexOld'',''etaj_1''">old apartment building</a> that looks quite rundown and possibly abandoned.'
 	
 	if home_owned[2] = 1: act '<b>Go Home</b> (Parents'' Apartment)': minut += 4 & pavhome_enter = 1 & gt 'korrPar'
 	if pavSharedAptEnabled = 1: act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pav_shared_apt', 'start'
@@ -149,12 +149,12 @@ if $ARGS[0] = 'start':
 	act 'Walk to the Market (0:10)':minut += 10 & gt 'pav_market'
 	act 'Walk to the train station (0:20)':minut += 20 & gt 'pav_train_hall'
 	act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
-	if storyline = 1 and home_owned[2] = 1: 
+	if mid($start_type,1,2) = 'sg' and home_owned[2] = 1: 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
-	elseif storyline = 1 and (home_owned[2] = 0 or pavSharedAptEnabled = 1):
+	elseif mid($start_type,1,2) = 'sg' and (home_owned[2] = 0 or pavSharedAptEnabled = 1):
 		act 'Go to your parent''s apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	end
-!!	if StoryLine = 1: act 'Go to the old apartment building':minut += 1 & gt 'pavComplexOld', 'etaj_1'
+!!	if mid($start_type,1,2) = 'sg': act 'Go to the old apartment building':minut += 1 & gt 'pavComplexOld', 'etaj_1'
 	act 'Sit on a bench':gt 'pav_aptcourtev', 'bench'
 	gs 'camera', 'check_location'
 end
@@ -168,7 +168,7 @@ if $ARGS[0] = 'garages':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/garages.jpg"></center>'
 	'Along the back street is a row of garages available for the residents of the apartments to rent. The weather in Pavlovsk can be brutal, especially in the winter, so people who own a car often have a garage to put it away safely. Between the garages and the courtyard is a series of smaller storage buildings that can be rented, as well as the complex''s maintenance and laundry buildings. The layout of the buildings leaves a maze of walkways between them, which are a popular place for kids to play or for teenagers to hang out.'
 	*nl
-	if StoryLine = 1:'Your <a href="exec:minut += 5 & gt ''gargazel''">stepfather''s garage</a> is around here somewhere.'
+	if mid($start_type,1,2) = 'sg':'Your <a href="exec:minut += 5 & gt ''gargazel''">stepfather''s garage</a> is around here somewhere.'
 	if bandpracticeinvite = 1:'The converted <a href="exec:minut += 5 & gt ''praiders_garage'', ''band_garage''">band garage</a> the band uses to practice in is around here.'
 	if gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour = 20: act '<b>Meet Lena and Lera</b>': gt 'gopnik_initiation','initiation'
 	if ((week < 6 and hour => 18 and hour < 22) or (week >= 6 and hour >= 15 and hour < 22)) and ed_event_day ! daystart:
@@ -493,7 +493,7 @@ if $ARGS[0] = 'garages':
 	if $CURACTS = '':
 		gs 'stat'
 		act 'Go back to the courtyard':minut += 2 & gt 'pav_complex', 'start'
-		if StoryLine = 1: act 'Go to your stepfather''s garage': minut += 5 & gt 'gargazel'
+		if mid($start_type,1,2) = 'sg': act 'Go to your stepfather''s garage': minut += 5 & gt 'gargazel'
 	end
 end
 

+ 1 - 1
locations/pav_complexb3.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'etaj_1':
 	act 'Leave the building': minut += 1 & gt 'pav_complex', 'start'
 	act 'Go up to the second floor': minut +=1 &  gt 'pav_complexb3','etaj_2'
 	act 'Take the elevator': gt 'pav_complexb3','lift','etaj_1'
-!!	if rolanblockhome ! 1 and storyline = 1:
+!!	if rolanblockhome ! 1 and mid($start_type,1,2) = 'sg':
 !!		act 'Apartment 1: Mr. Matveev''s': gt 'rolanapt','home'
 !!	end
 end

+ 9 - 9
locations/pav_disco.qsrc

@@ -76,11 +76,11 @@ if $ARGS[0] = '':
 
 		act 'Go to the toilets': gt 'gdktoilet', 'start'
 
-		if StoryLine = 1 and SchoolAtestat = 0: 'You see a few of your <a href="exec: gt ''pav_disco_classmates'', ''classmates''">classmates</a>. Some of them dancing, while others stick to their own groups and talk.'
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0: 'You see a few of your <a href="exec: gt ''pav_disco_classmates'', ''classmates''">classmates</a>. Some of them dancing, while others stick to their own groups and talk.'
 
 		if dimaRevenge = 7 and dimaRevChoice = 4 and dimadisco = 0: gt 'dimaRevenge', 5, 'disco'
 
-		if rand(1,3) = 2 and soniaPS < 1 and soniadisco_day ! daystart and SchoolAtestat = 0 and month > 9 and npc_grupTipe['A25'] ! 5 and StoryLine = 1 and BeInSchool > 0 and hour < 22:
+		if rand(1,3) = 2 and soniaPS < 1 and soniadisco_day ! daystart and SchoolAtestat = 0 and month > 9 and npc_grupTipe['A25'] ! 5 and mid($start_type,1,2) = 'sg' and BeInSchool > 0 and hour < 22:
 			'You notice Sonia talking to Vitek about something.'
 			act 'Watch Sonia': soniadisco_day = daystart & gt 'soniadisco', 'start'
 		end
@@ -199,7 +199,7 @@ if $ARGS[0] = '':
 						grupvalue[4] += 1
 						'You''re having a lot of fun out on the dance floor. Most people would have a hard time telling you were drunk as you expertly move your body in a seductive manner to the beat of the music.'
 					end
-					if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,10) = 1: 
+					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,10) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
 					elseif npc_rel['A25'] >= 50 and rand(1,10) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
@@ -233,7 +233,7 @@ if $ARGS[0] = '':
 							grupvalue[4] += 2
 							'You''re very drunk and forget that you don''t have any panties on. Most people would have a hard time knowing you were very drunk as you expertly move your body around in a seductive manner, but you are too drunk to notice your skirt riding up, exposing your pussy to the observant people on the dance floor with you.'
 						end
-						if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
+						if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
 							gt 'pav_disco', 'katja_too_drunk'
 						elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
 							gt 'pav_disco', 'sonia_too_drunk' 
@@ -262,7 +262,7 @@ if $ARGS[0] = '':
 							grupvalue[2] -= 1
 							'You''re very drunk, but are having a lot of fun out on the dance floor anyway. Most people would have a hard time knowing you were drunk as you expertly move your body around in a seductive manner to the beat of the music.'
 						end
-						if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
+						if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
 							gt 'pav_disco', 'katja_too_drunk'
 						elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
 							gt 'pav_disco', 'sonia_too_drunk' 
@@ -276,7 +276,7 @@ if $ARGS[0] = '':
 					grupvalue[4] -= 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wasted_dance.jpg"></center>'
 					'You''re far too drunk and are barely able to stay on your feet. You''re mostly just drunkenly bumping into other people as you try and dance.'
-					if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,3) = 1: 
+					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,3) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
 					elseif npc_rel['A25'] >= 50 and rand(1,5) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
@@ -325,7 +325,7 @@ if $ARGS[0] = '':
 				elseif alko < 4:
 					'You''re tipsy and stand against the wall, watching the others dance.'
 				elseif alko < 6:
-					if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,10) = 1: 
+					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,10) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
 					elseif npc_rel['A25'] >= 50 and rand(1,10) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
@@ -335,7 +335,7 @@ if $ARGS[0] = '':
 						'You''re pretty drunk and stand against the wall, for support, as you watch the others dance.'
 					end	
 				else
-					if StoryLine = 1 and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
+					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
 						gt 'pav_disco', 'katja_too_drunk'
 					elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
 						gt 'pav_disco', 'sonia_too_drunk' 
@@ -371,7 +371,7 @@ if $ARGS[0] = '':
 			gs 'stat'
 			act 'Continue': gt 'pav_disco'
 		end
-		if StoryLine = 1 and SchoolAtestat = 0: act 'Look for your classmates': gt 'pav_disco_classmates', 'classmates'
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0: act 'Look for your classmates': gt 'pav_disco_classmates', 'classmates'
 	elseif hour < 20:
 		'<center><b><font color="maroon">Disco</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/closing.jpg"></center>'

+ 1 - 1
locations/pav_hotel.qsrc

@@ -345,7 +345,7 @@ if $ARGS[0] = 'Pavlin' :
 			act 'Move away':gt'pav_hotel','skip_resepevent'
 		end
 	end
-	if npc_rel['A217'] > 19 and proshotelday ! daystart and storyline = 1 and TwinQW < 0:
+	if npc_rel['A217'] > 19 and proshotelday ! daystart and mid($start_type,1,2) = 'sg' and TwinQW < 0:
 		!!! TwinQW: 0 quest not started; > 0: quest started; < 5: talking with sis; 5: sis agreed; 6: finished
 		!!! changing 'TwinQW < 0' in the above if statement to 'TwinQW < 1' reenables the quest line
 		!!! Kevin Smarts:

+ 3 - 3
locations/pav_lake.qsrc

@@ -55,13 +55,13 @@ elseif month < 3 or month = 12:
 	if pcs_icesktng>0: 'Your ice skating skill is <<pcs_icesktng>>.'
 end
 
-if storyline = 1 and (month <= 2 or month = 12):
+if mid($start_type,1,2) = 'sg' and (month <= 2 or month = 12):
 	if week >= 6 and hour >= 8 and hour <= 11:
 		'Looking out over the frozen lake, you see a figure in the distance figure skating and doing all types of crazy moves. Stepping onto the ice and skating out, you notice that it''s <a href="exec:gt ''gschool_socialchg1'', ''tVeronika''">Veronika</a>.'
 	end
 end
 
-if storyline = 1 and temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9 and hour >= 12 and hour <= 14 and ((kanikuli = 0 and week = 7) or week mod 2 = 0):
+if mid($start_type,1,2) = 'sg' and temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9 and hour >= 12 and hour <= 14 and ((kanikuli = 0 and week = 7) or week mod 2 = 0):
 	if $clothingworntype = 'nude':
 		'As you walk down to the beach area of the lake you see a group of kids from your school hanging out on the beach. It looks like it is the jocks and cool kids. You hope none of them have seen you naked, it would be such a scandal if they seen you like this. You should put on a bikini before approaching them if you want to hang out, or just avoid them and do your own thing today.'
 	else
@@ -70,7 +70,7 @@ if storyline = 1 and temper >= 20 and sunWeather = 1 and month >= 5 and month <=
 	end
 end
 
-if StoryLine = 1 and SchoolAtestat = 0 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)) and week <= 5 and hour >= 15 and hour <= 20 and (christinaQW['dompath'] >= 6 or christinaQW['subpath'] = 1) and socialchg['tChristina_day'] ! daystart:
+if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)) and week <= 5 and hour >= 15 and hour <= 20 and (christinaQW['dompath'] >= 6 or christinaQW['subpath'] = 1) and socialchg['tChristina_day'] ! daystart:
 	if christinaQW['subpath'] = 1:
 		'<a href="exec:gt ''Zvereva_sub_1'', ''chris_sub''">Christina</a> is standing by the beach looking out over the lake as Lina stands next to her, breathing heavily.'
 	else

+ 1 - 1
locations/pav_lake_nude.qsrc

@@ -46,7 +46,7 @@ elseif month < 3 or month = 12:
 	*nl
 end
 
-if storyline = 1 and month >= 3 and month <= 8 and week >= 6 and hour >= 8 and hour <= 10 and ivanfedorseennaked ! daystart and rand(0,3) = 0 and fedorKozlovQW >= 0:
+if mid($start_type,1,2) = 'sg' and month >= 3 and month <= 8 and week >= 6 and hour >= 8 and hour <= 10 and ivanfedorseennaked ! daystart and rand(0,3) = 0 and fedorKozlovQW >= 0:
 	if $clothingworntype = 'nude':
 		gs 'arousal', 'flash', -5, 'exhibitionism'
 		gs 'fame', 'pav', 'sex', 3

+ 2 - 2
locations/pav_library.qsrc

@@ -17,7 +17,7 @@ gs 'themes', 'indoors'
 if lernHome > 0:
 'You could do your homework with the help of one of the computers.'
 end
-if 	storyline = 1 and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
+if 	mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
 	'The nerds are sitting at a table studying together.'
 end
 
@@ -148,7 +148,7 @@ if hour >= 8 and hour < 18:
 	elseif lernHome > 0 and will_cost > pcs_willpwr:
 		act 'Do your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	if storyline = 1 and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
+	if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
 		act 'Join the nerd''s study group': gt 'pav_library_nerdstudy', 'nerd_study_night'
 	end
 else

+ 1 - 1
locations/pav_market.qsrc

@@ -34,7 +34,7 @@ else
 	end
 end
 *nl
-'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_train_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Next to the train station you can see the <a href="exec:minut += 5 & gt ''pav_station'', ''station_outside''">Pavlovsk police station</a> where you can find Pavlovsk''s finest.'
+'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_train_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(mid($start_type,1,2) = 'sg',' where your mother works','') + '. Next to the train station you can see the <a href="exec:minut += 5 & gt ''pav_station'', ''station_outside''">Pavlovsk police station</a> where you can find Pavlovsk''s finest.'
 *nl
 'The other side of the train station is a large square, where you can find a <a href="exec:minut += 1 & gt ''pav_train_market'', ''start''">market</a> on most days.'
 *nl

+ 5 - 5
locations/pav_park.qsrc

@@ -116,7 +116,7 @@ if $ARGS[0] = 'start':
 
 	if GvstreBoy = 1:'You see <a href="exec:numnpc = SkverBoy & gt ''Gnpc''"><<$nameBoyfrend[SkverBoy]>></a> walking across the main square of Pavlovsk Park. He doesn''t look like he''s going anywhere in particular, and seems to just be enjoying his walk.'
 	!!if kotovLoveQW > 0 and hour >= 18 and hour < 20 and week < 6 or week >= 6 and kotovLoveQW > 0 and hour >= 9 and hour < 20:'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> sitting on a bench in the park, drinking beer by himself. Judging from the empty bottles near the bench, he''s already had a few.'
-	if StoryLine = 1 and SchoolAtestat = 0:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 		if (sunWeather = 1 and temper > 0) and (hour >= 18 and hour < 20 and week < 6) or (week >= 6 and hour >= 9 and hour < 20):
 			'You see your classmates <a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> sitting on a park bench, drinking beer.'
 		end
@@ -133,9 +133,9 @@ if $ARGS[0] = 'start':
 		act 'Go and see Rex':gt 'rex_events', 'skver'
 	end
 
-	if week >= 6 and hour >= 8 and hour <= 9 and StoryLine = 1 and socialchg['tVanya_day'] ! daystart: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
+	if week >= 6 and hour >= 8 and hour <= 9 and mid($start_type,1,2) = 'sg' and socialchg['tVanya_day'] ! daystart: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
 
-	if month > 8 and month < 6 and week < 6 and hour >= 16 and hour <= 20 and storyline = 1 and christinaQW['dompath'] = 0 and christinaQW['subpath'] = 0 and socialchg['tChris_Lina_jog'] ! daystart:
+	if month > 8 and month < 6 and week < 6 and hour >= 16 and hour <= 20 and mid($start_type,1,2) = 'sg' and christinaQW['dompath'] = 0 and christinaQW['subpath'] = 0 and socialchg['tChris_Lina_jog'] ! daystart:
 		if rand(1,4) = 1:'You spot <a href="exec:gt ''Zvereva_events'',''Chris_Lina_park''">Christina</a> and Lina jogging around the park.'
 	end
 
@@ -143,7 +143,7 @@ if $ARGS[0] = 'start':
 		menu_off = 1
 		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
 
-		if StoryLine = 1 and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart and locat['Vicky'] = 11:
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart and locat['Vicky'] = 11:
 			gs 'mey_vika_events', 'park_meet'
 			gs 'stat'
 		else
@@ -292,7 +292,7 @@ if $ARGS[0] = 'start':
 		if home_owned[2] = 0 and workPTU <= 2 and HotelRoom < 1:
 			!nowhere to live in town
 			'It''s quite dark now, and you have no where to stay nearby. Maybe you should try to sleep on a bench?'
-			if StoryLine = 1: 'Or try your luck and go to Uncle Shulgin''s Apartment?'
+			if mid($start_type,1,2) = 'sg': 'Or try your luck and go to Uncle Shulgin''s Apartment?'
 		elseif home_owned[2] = 1 and (hour >= 22 or hour < 6):
 			'It''s quite dark outside, and you feel tired. Maybe you should head home.'
 		else

+ 2 - 2
locations/pav_pharmacy.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'start' or $message ! '':
 		killvar '$message'
 		'"Do you need anything else?"'
 	else
-		if StoryLine = 0 or gaptek_aunt_hours = 0:
+		if gaptek_aunt_hours = 0:
 			'The woman behind the counter in a white coat greets you, "Hello, what you need?"'
 		else
 			'Aunt Luda is sitting behind the counter, as usual. She gives you a friendly nod when she sees you: "Hi <<$pcs_firstname>>! How are you?"'
@@ -50,7 +50,7 @@ if $ARGS[0] = 'start' or $message ! '':
 	*nl
 	*pl '<center><table align="center" width=80%>'
 	!!I want to change this so Sveta can always buy the stuff below regardless who is working. Not sure how to change the code so just leaving this note. The first time Sveta buys condoms, pregnancy test, birth control, or lubricant I want it to go to if $ARGS[0] = 'first_time_buy_luda':
-	if gaptek_aunt_hours = 0 or StoryLine = 0:
+	if gaptek_aunt_hours = 0:
 		if preziktype = 0:
 			*P FUNC ('$stock_item', 5, 'Condoms', 300, 'prezik', 'pav_pharmacy', 'start')
 		elseif preziktype = 1 or preziktype = 2:

+ 1 - 1
locations/pav_residential.qsrc

@@ -207,7 +207,7 @@ if StoryLine ! 0 and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3)
 	exit
 end
 
-if pcs_magik >= 1 and mainQW = 0 and altQS = 1:
+if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,2) = 'sg':
 	menu_off = 1
 	*clr & cla
 	mainQW = 1

+ 1 - 1
locations/pav_train_hall.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = '':
 			end
 		end
 	end
-	if StoryLine = 1 and SchoolAtestat = 0:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 		if (sunWeather = 0 or temper <= 0) and hour >= 18 and hour < 20 and week < 6:'You see your classmates <a href="exec:minut += 3 & $prevloc = $loc & gt ''gopskver''">Vitek, Dan and Vasily</a> hanging around here.'
 	end
 	*nl

+ 5 - 3
locations/placer_sex.qsrc

@@ -1423,10 +1423,12 @@ end
 
 if $args[0] = 'sleep':
 	if disable_autosave = 0:
-		if StoryLine = 0:
-			SAVEGAME 'autosave.sav'
+		if mid($start_type,1,4) = 'city':
+			savegame 'autosave_city.sav'
+		elseif mid($start_type,1,3) = 'uni':
+			savegame 'autosave_uni.sav'
 		else
-			SAVEGAME 'autosave_alt.sav'
+			savegame 'autosave_sg.sav'
 		end
 	end
 	*clr & cla

+ 2 - 2
locations/preSYS.qsrc

@@ -35,7 +35,7 @@ end
 if $ARGS[0] = 'CSBStart':
 	*clr & cla
 
-	StoryLine = 1
+	mid($start_type,1,2) = 'sg'
 	ml_update_1 = 1
 	!! NPC Data and Relations
 	gs 'npcstatic1'
@@ -216,7 +216,7 @@ end
 !!******************** SG Start Background Options ******************************
 if $ARGS[0] = 'SGStart':
 
-	StoryLine = 1
+	mid($start_type,1,2) = 'sg'
 	ml_update_1 = 1
 	birthyear = 1999
 	yearlefttemp = 1

+ 17 - 2
locations/saveupdater.qsrc

@@ -233,7 +233,7 @@ end
 	killvar 'natfuck'
 
 
-	if StoryLine = 1:
+	if mid($start_type,1,2) = 'sg' or storyline = 1:
 
 		if fuckornot_update = 0:
 			fuckornot_update = 1
@@ -1435,7 +1435,22 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 
 	!!Christinas chat have to stay in the jocks file even if she is an outcast
 	$npcGoSchool['A18'] = '<a href="exec:gt ''gschool_jock_chats'', ''' + $lcase($npc_usedname['A18']) + '''"><<$npc_usedname["A18"]>></a>'
-
+	
+	if storyline = 1 and MagikDostup = 1:
+		$start_type = 'sg'
+		$start_type[1] = 'nomagic'
+	elseif $start_type = 'csb':
+		$start_type = 'sg_tg'
+		$start_type[1] = 'tg'
+	elseif storyline = 1:
+		$start_type = 'sg_m'
+	elseif MagikDostup = 1:
+		$start_type = 'city'
+		$start_type[1] = 'nomagic'
+	else
+		$start_type = 'city_tg'
+		$start_type[1] = 'tg'
+	end
 end
 
 gs 'saveg'

+ 1 - 1
locations/sexshop.qsrc

@@ -626,7 +626,7 @@ if $ARGS[0] = 'kendra':
 			meet_kendra = 1
 			npc_rel['A84'] = 40
 			'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sex/shkend01.jpg"></center>'
-			if Storyline = 1 and SchoolAtestat = 0:
+			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 			  'You ask her about her clothes and start talking with her. You tell her that you live in Pavlovsk and are in your final year of school and she replies by saying that she''s a student from the Republic of Congo and is attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says "You''re very pretty. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			else
 			  'You ask her about her clothes and start talking with her. You tell her a bit about yourself and she replies by saying that she''s a student from the Republic of Congo and is attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says "You''re very pretty. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'

+ 1 - 1
locations/shop.qsrc

@@ -45,7 +45,7 @@ if $shoplocation = 'main':
 	gs 'family_schedule'
 	
 	!! The store in the town and in the altstart only
-	if $loc = 'pav_commercial' and StoryLine = 1:
+	if $loc = 'pav_commercial' and mid($start_type,1,2) = 'sg':
 		if anyaloc = 7:
 			*nl
 			'Your sister <a href="exec:$shoplocation = ''Anya'' & gt ''shop'', ''move''">Anya</a> is sitting at the cash register.'

+ 1 - 1
locations/sitrPar.qsrc

@@ -74,7 +74,7 @@ if $ARGS[0] = '':
 		end
 	elseif momloc = 24:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka1.jpg"></center>'
-		if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 			if CloStyle2 = 4:
 				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing home? Go to school, now!" With that, she practically pushes you out of the apartment and closes the door. As she does, she adds once more, "Go to school."' 
 				act 'Continue': gt'pod_ezd','etaj_2'

+ 1 - 1
locations/soniadisco.qsrc

@@ -4,7 +4,7 @@
 
 if $ARGS[0] = 'cikl':
 !!Making Sonia''s fall progress if the player do not see the scenes at the disco, by making it such that if at a Sunday her fall have not advanced this weekend it will automatically advance.
-	if storyline = 1 and week = 7 and soniaPS = 0 and month > 9 and daystart >= soniafallDay + 6:
+	if mid($start_type,1,2) = 'sg' and week = 7 and soniaPS = 0 and month > 9 and daystart >= soniafallDay + 6:
 		if soniafall < 7:
 			soniafallDay = daystart -1
 			soniafall += 1

+ 12 - 12
locations/stat_display.qsrc

@@ -314,10 +314,10 @@ if SchoolBlock = 0:
 		$stat_school_schedule = ''	
 	end
 
-	if StoryLine = 1 and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
 		$stat_school_msg = 'You have to be at school before 07:55 if you don''t want to be late.'
 		$stat_school_tooltip = 'School starts at 07:55.'
-	elseif StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
+	elseif mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
 		$stat_school_msg = 'You have detention this morning and must be at school before 09:00.'
 		$stat_school_tooltip = 'Detention starts at 09:00.'
 	else
@@ -1779,9 +1779,9 @@ if enable_extra_msg = 1:
 	$stat_msg += $stat_clothes_text
 	
 	if SchoolBlock = 0:
-		if $stat_school_msg ! '' and StoryLine = 1 and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
+		if $stat_school_msg ! '' and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
 			$stat_msg += '<BR><b><<$stat_school_msg>></b>'
-		elseif $stat_school_msg ! '' and StoryLine = 1 and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
+		elseif $stat_school_msg ! '' and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
 			$stat_msg += '<BR><b><<$stat_school_msg>></b>'
 		end
 	end
@@ -1832,20 +1832,20 @@ end
 if StrongNarkota > 20 or jointhigh > 0:$stat_msg += '<BR><b><font color="red">You are stoned.</font></b>'
 if amphHigh > 0: $stat_msg += '<BR><b><font color="red">You feel a little wired.</font></b>'
 
-!!--------------- Storyline = 1 Events (Start) ------------------------
+!!--------------- mid($start_type,1,2) = 'sg' Events (Start) ------------------------
 
-if StoryLine = 1 and sisboyday + 1 = daystart and hour < 18 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or (npc_QW['A33'] >= 9 and sisboytrioQW ! 1)):$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister not to go into your room at 16:00.'
-if StoryLine = 1 and sisboyday + 1 = daystart and hour < 18 and sisboytrioQW = 1:$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister to meet her in your room at 16:00.'
+if mid($start_type,1,2) = 'sg' and sisboyday + 1 = daystart and hour < 18 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or (npc_QW['A33'] >= 9 and sisboytrioQW ! 1)):$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister not to go into your room at 16:00.'
+if mid($start_type,1,2) = 'sg' and sisboyday + 1 = daystart and hour < 18 and sisboytrioQW = 1:$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister to meet her in your room at 16:00.'
 
-if StoryLine = 1 and day = nyp_day and month = 12 and SchoolAtestat = 0 and hour >= 5 and hour <= 14 and StoryLine = 1:
+if mid($start_type,1,2) = 'sg' and day = nyp_day and month = 12 and SchoolAtestat = 0 and hour >= 5 and hour <= 14 and mid($start_type,1,2) = 'sg':
 	$stat_msg += '<BR>At 14:00, your school''s New Year''s party will start.'
-elseif StoryLine = 1 and InvitationToDimkaNYparty = 1 and month = 12 and day = 31:
+elseif mid($start_type,1,2) = 'sg' and InvitationToDimkaNYparty = 1 and month = 12 and day = 31:
 	$stat_msg += '<BR><b>Go to the residential area between 15:00 and 18:00 to go to Dimka''s New Year party.</b>'
 end
-if StoryLine = 1 and gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Meet Lena and Lera at the apartment garages at eight.</b>'
-if StoryLine = 1 and nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight.</b>'
+if mid($start_type,1,2) = 'sg' and gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Meet Lena and Lera at the apartment garages at eight.</b>'
+if mid($start_type,1,2) = 'sg' and nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight.</b>'
 
-!!--------------- Storyline = 1 Events (End) ------------------------
+!!--------------- mid($start_type,1,2) = 'sg' Events (End) ------------------------
 
 if home_owned[1] = 1 and home_owned[4] > 0:
 	$stat_msg += '<BR>You have rented an apartment in the city residential area, which is paid up for <b><<ArendHouseSL>></b> days, and you also have an apartment in Pushkin, which is paid up for <b><<ArendHouseSL4>></b> days. Utilities are due on the 25th of <<$month>>.'

+ 1 - 1
locations/street_event.qsrc

@@ -558,7 +558,7 @@ if $ARGS[1] = 'main':
 			exit
 		end
 
-		if pcs_magik >= 1 and mainQW = 0 and StoryLine = 0:
+		if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,4) = 'city':
 			*clr & cla
 			menu_off = 1
 			mainQW = 1

+ 10 - 21
locations/tatiana_missions.qsrc

@@ -138,10 +138,8 @@ if $ARGS[0] = 'mission1':
 				'"What do you mean, ''most of us?''"'
 				'"It might have something to do with a lack of imagination, or maybe it''s some weird interaction between magic and our biology, but as far as I know, only female mages can see fairies, which might explain why she doesn''t have anybody to talk to - that and what with Pavlovsk being a backwater."'
 				!Comment by cursed schoolgirl only - correct variable?
-				if altQS = 1:
-					'"Hey, I''m from Pavlovsk," you pout.'
-					'"And you turned out pretty well, considering," Tatiana grins.'
-				end
+				'"Hey, I''m from Pavlovsk," you pout.'
+				'"And you turned out pretty well, considering," Tatiana grins.'
 				'"How are we gonna find her, though? I thought she doesn''t come out during the day at all."'
 				'"Did you actually go looking for her during the day?"'
 				'"Not really," you concede, "I first met her at night, so I thought..."'
@@ -155,10 +153,8 @@ if $ARGS[0] = 'mission1':
 				'"What do you mean, ''most of us?''"'
 				'"It might have something to do with a lack of imagination, or maybe it''s some weird interaction between magic and our physiology, but as far as I know, only female mages can see fairies, which might explain why no one''s run into her before - that and what with Pavlovsk being a backwater."'
 				!Comment by cursed schoolgirl only - correct variable?
-				if altQS = 1:
-					'"Hey, I''m from Pavlovsk," you pout.'
-					'"And you turned out pretty well, considering," Tatiana grins.'
-				end
+				'"Hey, I''m from Pavlovsk," you pout.'
+				'"And you turned out pretty well, considering," Tatiana grins.'
 				'"So we''re just gonna walk into the park and go looking for a fairy?"'
 				'"Well, most fairies don''t like places that are lively, so she could be spending the day hours in the thicket, but if we watch out for a floating ball of light, we might get lucky."'
 				'You give her a sceptical look as the train arrives in Pavlovsk.'
@@ -193,9 +189,7 @@ if $ARGS[0] = 'mission1':
 				minut += 30
 				'The walk to the park takes a while, given the lack of public transportation in Pavlovsk, and it is boring to boot. To you, at least - Tatiana has an amused look on her face all along the way and seems to be silently laughing at anything that catches her eye in this "backwater".'
 				!Comment by cursed schoolgirl only - correct variable?
-				if altQS = 1:
-					'You see a few familiar faces along the way, mostly schoolmates of yours who give the woman next to you curious, in the case of the gopniks outright lustful looks. To your eternal gratitude, none of them stop you and the few who greet you are content with your saying that you''re "in a hurry".'
-				end
+				'You see a few familiar faces along the way, mostly schoolmates of yours who give the woman next to you curious, in the case of the gopniks outright lustful looks. To your eternal gratitude, none of them stop you and the few who greet you are content with your saying that you''re "in a hurry".'
 				'The park is the same as always - the same people hang or stroll around. You look in all directions, but you cannot, for the life of you, make out anything even remotely resembling a fairy. "I don''t see any fairy here."'
 				'"What would I do without your keen observations?" Tatiana mocks.'
 				'"So, what, would you like to go looking for her in the undergrowth?"'
@@ -416,7 +410,7 @@ if $ARGS[0] = 'mission2A':
 					'<center><b><font color="maroon">Blondie?</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria.jpg"></center>'
 					'Blinking in confusion, you find yourself sitting back in the props room, in front of a pissed-looking blonde in a suit who''s going off on a tirade.'
-					if csb_start = 1 or $start_type = 'tg':
+					if $start_type[1] = 'tg':
 						'"Is this some kind of joke?! The final taunt from that three-times-damned Rikudo?! He cursed you to be a vapid woman?!"'
 					else
 						'"Is this some kind of joke?! The ultimate power falling into the hands of a vapid woman?!"'
@@ -567,7 +561,7 @@ if $ARGS[0] = 'mission2C':
 			'<center><b><font color="maroon">Blondie?</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria.jpg"></center>'
 			'Blinking in confusion, you find yourself sitting back in the props room, in front of a pissed-looking blonde in a suit who is giving you a tirade.'
-			if csb_start = 1 or $start_type = 'tg':
+			if $start_type[1] = 'tg':
 				'"Is this some kind of joke?! The final taunt from that three-times-damned Rikudo?! He cursed you to be a vapid woman?!"'
 			else
 				'"Is this some kind of joke?! The ultimate power falling into the hands of a vapid woman?!"'
@@ -592,16 +586,11 @@ if $ARGS[0] = 'mission2D':
 	'<center><b><font color="maroon">Aleksei</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/city/alexandria/alexandria.jpg"></center>'
 	'"...<<$pcs_lastname>>, <<$pcs_firstname>> <<$pcs_lastname>>."'
-	if $start_type = 'tg':
+	if $start_type[1] = 'tg':
 		npc_rel['A241'] +=1
-		'"Isn''t it Mr. Kuznetsu?" You blink, surprised at her words, and she smiles at your reaction. "Yes, <<$pcs_lastname>>, I know who you <i>really</i> are."'
+		'"Isn''t it Mr. Ivanov?" You blink, surprised at her words, and she smiles at your reaction. "Yes, <<$pcs_lastname>>, I know who you <i>really</i> are."'
 	else
-		if csb_start = 1:
-			npc_rel['A241'] +=1
-			'"Isn''t it Mr. Ivanov?" You blink, surprised at her words, and she smiles at your reaction. "Yes, <<$pcs_lastname>>, I know who you <i>really</i> are."'
-		else
-			'"So here we are, <<$pcs_lastname>>."'
-		end
+		'"So here we are, <<$pcs_lastname>>."'
 	end
 	'As the powerful magician in front of you continues with her presentation, you become aware that this is a trap.'
 	'"I admit that your presence here was all according to my design. Your -- let''s be generous -- <i>friend</i> sent you on a fool''s errand so that we could have some privacy, beyond Reinhold''s prying eyes. It was I who sent that trickster the information about the curse and--"'

+ 2 - 2
locations/telefon.qsrc

@@ -1241,7 +1241,7 @@ if $ARGS[0] = 'Phone_notebook':
 		if m1 = 6 and d1 = 13:$calendarday += $list + 'National holiday'
 		if m1 = 11 and d1 = 4:$calendarday += $list + 'Unity Day'
 
-		if storyline = 1 and SchoolAtestat = 0:
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
 			if m1 = 1 and d1 = 1:$calendarday += $list + 'First day of Winter break.'
 			if m1 = 1 and d1 = 15:$calendarday += $list + 'Last day of Winter break.'
 			if m1 = 3 and d1 = 20:$calendarday += $list + 'First day of Spring break.'
@@ -1267,7 +1267,7 @@ if $ARGS[0] = 'Phone_notebook':
 !!		if maidqw > 0:$calendarday += '<br>&emsp;<b>•</b> Working as maid. <i>(16:00 - 19:00)</i>'
 		if pfilmday[i] > 0:$calendarday += $list + 'Porn shoot: <i><<$porndesc[pfilmday[i]]>></i>'
 		if d1 = 25 and (BurgerQW['Secretary'] = 1 or workKafe = 1 or workhosp = 1 or worksalon = 1 or tanwork = 1 or workSec = 1 or workFabrika = 1):$calendarday += $list + '<i>Pay day!</i>'
-		if d1 = nyp_day and m1 = 12 and SchoolAtestat = 0 and StoryLine = 1:$calendarday += $list + 'New Year''s party at 14:00!'
+		if d1 = nyp_day and m1 = 12 and SchoolAtestat = 0 and mid($start_type,1,2) = 'sg':$calendarday += $list + 'New Year''s party at 14:00!'
 		if (npc_QW['A33']-2) mod 2 = 1 and sisboyday+1 = daynum:
 			if sisboytrioQW = 1:
 				$calendarday += $list + '<font color="orange">Threesome with Anya and Roma at 18:00</font>'

+ 11 - 11
locations/therapist.qsrc

@@ -6,7 +6,7 @@ $loc = 'pav_clinic'
 $location_type = 'public_indoors'
 thingsTheTherapistLikes = 0
 if age < 18:thingsTheTherapistLikes += 1
-if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:thingsTheTherapistLikes += 1
+if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:thingsTheTherapistLikes += 1
 
 if $ARGS[0] = '':
 	$cumdesciption3 = ''
@@ -525,7 +525,7 @@ if $ARGS[0] = 'firstHypnoStage':
 							*clr
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
 							'Very good, a fresh young virgin. You must be in school, are you?'
-							if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+							if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 								act 'Yes, <i>Master</i>':
 									cla
 									*clr
@@ -562,7 +562,7 @@ if $ARGS[0] = 'firstHypnoStage':
 							*clr
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
 							'Ah, what a shame... You are young though, are you in school?'
-							if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+							if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 								act 'Yes, <i>Master</i>':
 									cla
 									*clr
@@ -602,7 +602,7 @@ if $ARGS[0] = 'firstHypnoStage':
 							*clr
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
 							'Very good, a fresh young virgin. Are you in school?'
-							if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+							if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 								act 'Yes, <i>Master</i>':
 									cla
 									*clr
@@ -639,7 +639,7 @@ if $ARGS[0] = 'firstHypnoStage':
 							*clr
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
 							'No? That''s too bad. Are you in school?'
-							if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+							if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 								act 'Yes, <i>Master</i>':
 									cla
 									*clr
@@ -1186,7 +1186,7 @@ if $ARGS[0] = 'fuck':
 	'<<$hypnofuck>> As soon as he is inside your pussy, he starts to fuck you.'
 	if pcs_vag = 0 and stat['hidden_vaginal'] = 0:
 		gs 'pain', 5, 'vaginal', 'stretch'
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 			'You feel a sharp pain as Dr. Pavlov pushes through your maidenhead, taking it away. "Fresh virgin school girl pussy! So tight..."'
 		else
 			'You feel a sharp pain as Dr. Pavlov pushes through your maidenhead, taking it away. "Ahhh, nothing beats a virgin hole." He pushes himself deeper into your unexplored depths, enjoying himself immensely.'
@@ -1204,7 +1204,7 @@ if $ARGS[0] = 'fuck':
 	else
 		$therapistDoneFuckingDesc0 = 'You feel his cock expanding inside of you. He groans loudly.'
 	end
-	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0: 
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0: 
 		$therapistDoneFuckingDesc1 = '"This school girl pussy is too tight...! Cum now!"'
 	elseif rand(0,2) = 0:
 		$therapistDoneFuckingDesc1 = '"So tight! Cum! Cum now!"'
@@ -1220,7 +1220,7 @@ if $ARGS[0] = 'fuck':
 	else
 		$therapistDoneCumDesc1 = 'You feel his dick press deep into your pussy and feel his cock swell inside of you. His grip tightens on your hips. You feel a huge load of cum spurting into you. You obediently cum on his cock.'
 	end
-	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0: 
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0: 
 		$therapistDoneFuckingDesc3 = '"Your little school girl pussy was amazing, Miss <<$pcs_lastname>>."'
 	elseif rand(0,2) = 0:
 		$therapistDoneFuckingDesc3 = '"Ahh, dumping a load in a young girl is the best." he says as he wipes his dick on your ass.'
@@ -1302,7 +1302,7 @@ if $ARGS[0] = 'hypnoFuck':
 	'As soon as he is inside your pussy, he starts to fuck you.'
 	if pcs_vag = 0 and stat['hidden_vaginal'] = 0:
 		gs 'pain', 5, 'vaginal', 'stretch'
-		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 			'You feel a sharp pain as your <i>Master</i> pushes through your maidenhead, taking it away. "Fresh virgin school girl pussy! So tight... I will pump you full of cum every day until you bear my child."'
 		else
 			'You feel a sharp pain as your <i>Master</i> pushes through your maidenhead, taking it away. "Ahhh, nothing beats a virgin hole." He pushes himself deeper into your unexplored depths, enjoying himself immensely.'
@@ -1320,7 +1320,7 @@ if $ARGS[0] = 'hypnoFuck':
 	else
 		$therapistDoneFuckingDesc0 = 'You feel his cock expanding inside of you. He groans loudly.'
 	end
-	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0: 
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0: 
 		$therapistDoneFuckingDesc1 = '"This school girl pussy is too tight...! Cum now, <i>Cunt</i>!"'
 	elseif rand(0,2) = 0:
 		$therapistDoneFuckingDesc1 = '"So tight! Cum <i>Cunt</i>! Cum now!"'
@@ -1336,7 +1336,7 @@ if $ARGS[0] = 'hypnoFuck':
 	else
 		$therapistDoneCumDesc1 = 'You feel his dick press deep into your pussy and feel his cock swell inside of you. His grip tightens on your hips. You feel a huge load of cum spurting into you. You obediently cum on his cock.'
 	end
-	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0: 
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0: 
 		$therapistDoneFuckingDesc3 = '"Your little school girl pussy was amazing, <i>Cunt</i>."'
 	elseif rand(0,2) = 0:
 		$therapistDoneFuckingDesc3 = '"Ahh, dumping a load in a young girl is the best." he says as he wipes his dick on your ass.'

+ 7 - 5
locations/tobiQW.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	tobiQW = 1
 	minut += 60
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_reinhold.jpg"></center>'
-	if StoryLine = 0 and MagikDostup = 0:
+	if $start_type[1] = 'tg':
 		'"Hi Mikhail, how''s it going?"'
 	else
 		'"Hi <<$pcs_nickname>>, how''s it going?"'
@@ -63,7 +63,7 @@ if $ARGS[0] = '4':
 	'Reinhold laughs, then looks to Tatiana, "That''s a story the fairies tell their young."'
 	'Tatiana replies, "There''s no fooling you. I didn''t have time to explain it properly, and you have to admit this is funny."'
 	'"Toying with potentially the most powerful mage any of us will ever meet, it''s a good thing your trickster alignment was able to save her in the first place, or you''d be screwed."'
-    if StoryLine = 0:
+    if $start_type[1] = 'tg':
         '"This is nice and everything, but I was a man and would quite like to be one again.'
         'Reinhold shakes his head.'
         '"No, I have no idea how you''d manage to survive trying that. I have consulted more powerful friends, and they all think that you''d receive a rush of power that you could never control. The result would be a gruesome death, but the exact nature of that death is still being debated."'
@@ -145,11 +145,13 @@ if $ARGS[0] = '10':
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_reinhold.jpg"></center>'
 	'"OK, I have to go. Look after yourself, and don''t do anything to attract too much attention."'
 	'After these words, Reinhold creates a vortex into which he is pulled, and everything is back to normal.'
-	
-	if StoryLine = 0:
+
+	if mid($start_type,1,4) = 'city':
 		act 'Get out of bed':gt 'bedr'
-	else
+	elseif mid($start_type,1,3) = 'uni':
 		act 'Get out of bed':gt 'bedrPar'
+	else
+		act 'Get out of bed':gt 'uni_dorm', 'dorm_room'
 	end
 
 	act 'Try to sleep':gt 'bed2'

+ 1 - 1
locations/train.qsrc

@@ -156,7 +156,7 @@ if $ARGS[0] = 'village':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/gadplat.jpg" ></center>'
-	if storyline = 1:
+	if mid($start_type,1,2) = 'sg':
 		'A fairly nondescript railway platform. The small village of Gadukino where your grandparents reside is not far from here.'
 	else
 		'A fairly nondescript railway platform. The small village of Gadukino where some farmers reside is not far from here.'

+ 1 - 1
locations/wardrobe.qsrc

@@ -484,7 +484,7 @@ if $ARGS[0] = 'default_entry_wear':
 	end
 
 	!! default school girl uniform is always allowed to be worn if still in school
-	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $temp1 = 'gm_school' and temp2 = 6:
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and $temp1 = 'gm_school' and temp2 = 6:
 		cls
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'