Browse Source

Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife.git

rachels 2 years ago
parent
commit
8796f6c341

+ 3 - 3
locations/Cheatmenu_din.qsrc

@@ -1083,7 +1083,7 @@ $cheatmenu['setAttrs'] = {
 		"
 		loop_index += 1
 		! Magic is the last attribute, so if it's a non-magic game we'll end the loop one iteration early
-		if MagikDostup = 0 and loop_index < arrsize('$att_name'):
+		if $start_type[1] ! 'nomagic' and loop_index < arrsize('$att_name'):
 			jump 'set_attrs_loop'
 		elseif loop_index < arrsize('$att_name') - 1:
 			jump 'set_attrs_loop'
@@ -1180,7 +1180,7 @@ $cheatmenu['stats'] = {
 	*p 'Spirit (<<sprt_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'sprt', 'Spirit'
 	*p 'Charisma (<<chrsm_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'chrsm', 'Charisma'
 	*p 'Perception (<<prcptn_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'prcptn', 'Perception'
-	if MagikDostup = 0: *p 'Magic (<<magik_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'magik', 'Magic'
+	if $start_type[1] ! 'nomagic': *p 'Magic (<<magik_lvl>>): ' & dynamic $cheatmenu['printStatLinks'], 'magik', 'Magic'
 	*nl
 	*pl'<b>Sexual:</b>'
 	*pl 'Inhibition level (<<100 - inhib_lvl>>): ' & dynamic $cheatmenu['printStatLinks1'], 'inhib', 'Inhibition'
@@ -1223,7 +1223,7 @@ $cheatmenu['stats'] = {
 	*p 'Handy-work (<<hndiwrk_lvl>>) - Total (<<pcs_hndiwrk>>): ' & dynamic $cheatmenu['printStatLinks'], 'hndiwrk', 'Handy-work'
 	*p 'Pool (<<pool_lvl>>) - Total (<<pcs_pool>>): ' & dynamic $cheatmenu['printStatLinks'], 'pool', 'Pool'
 	*p 'Heels (<<pcs_heels>>) - Total (<<pcs_heels>>): ' & dynamic $cheatmenu['printStatLinks'], 'heels', 'Heels'
-	if MagikDostup = 0: *p 'Spell Casting (<<splcstng_lvl>>) - Total (<<pcs_splcstng>>): ' & dynamic $cheatmenu['printStatLinks'], 'splcstng', 'Spellcasting'
+	if $start_type[1] ! 'nomagic': *p 'Spell Casting (<<splcstng_lvl>>) - Total (<<pcs_splcstng>>): ' & dynamic $cheatmenu['printStatLinks'], 'splcstng', 'Spellcasting'
 	'</td><td width="50%" cellpadding="10" valign="top">'
 	*pl'<b>Combat:</b>'
 	*p 'Jabs (<<jab_lvl>>)- Total (<<pcs_jab>>): ' & dynamic $cheatmenu['printStatLinks'], 'jab', 'Jabs'

+ 1 - 1
locations/MartinTalk.qsrc

@@ -390,7 +390,7 @@ if $ARGS[0] = '':
 			'His face darkens. "You have no idea. There is no good god in Colombia." It''s the first hint Martin has given you about his past since you met him, but beyond the obvious conclusion that something awful must have happened, you can''t draw any conclusions, and he doesn''t seem to want to linger there, either.' 
 			'"What about you, <<$pcs_firstname>>? Do you believe in some higher power?"'
 			*nl
-			if MagikDostup = 1:
+			if $start_type[1] = 'nomagic':
 				'You ponder the question for a moment before you answer.' 
 				'"I''m not sure, actually. I used to go to church more when I was younger. My parents would take me there, but I didn''t really think about it, you know? I just went because I had to."' 
 				*nl

+ 3 - 5
locations/arousal.qsrc

@@ -324,6 +324,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 			count['vaginal'] = 1
 		end
 		stim['mag'] += 3
+		if pcs_vag < dick:pcs_vag += 1
+		if pcs_vag*2 < dick:pcs_vag += 1
 		!! length and girth abilities of vagina are not separated , but I suppose that they are related
 		!! we can estimate difference in girth and length vaginal_girth_difference and vaginal_lenght_difference - names are shortened
 		vgrdif = grange - pcs_vag
@@ -359,11 +361,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['act'] = 70
 		if pcs_vag + vaginal_slip < 30:
 			!! same as for 'vaginal'
-			if temp_unaware = 0 or count['vaginal'] > 0:
-				pcs_vag += 3
-			else
-				pcs_hidden_vag += 3
-			end
+			pcs_vag += 3
 			gs 'pain', 3 - vgape, 'vaginal', 'stretch'
 			if vgape < 3:vgape = 3
 		end

+ 1 - 1
locations/cikl.qsrc

@@ -440,7 +440,7 @@ end
 !!	Arousal
 !!------------------------------------------------------------------------------------------------------------
 
-if magikDostup = 0:
+if $start_type[1] ! 'nomagic':
 	if pcs_horny < 100:pcs_horny += pcs_vag
 else
 	if stat['virgin'] = 1:

+ 5 - 0
locations/city_market.qsrc

@@ -237,6 +237,11 @@ end
 if $ARGS[0] = 'tailor':
 	CLOSE ALL
 	cls
+	$loc = 'city_market'
+	$loc_arg = 'tailor'
+	$menu_loc = 'city_market'
+	$menu_arg = 'tailor'
+	menu_off = 0
 	gs 'stat'
 	'A sign reads: "Jacob Solomonovich Schneersohn, tailor, 8:00-16:00 Monday - Friday"'
 	act 'Speak to the tailor':

+ 1 - 1
locations/clothing.qsrc

@@ -1620,7 +1620,7 @@ if $ARGS[0] = 'view_clothing_item':
 				act 'Resize':
 					money -= 500
 					dynamic '<<$ARGS[1]>>_b[<<ARGS[2]>>] = pcs_hips'
-					gt 'clothing', 'clothing_list', 'resize'
+					gt 'clothing', 'view_clothing_list', 'resize'
 				end
 			end
 		end

+ 0 - 1
locations/intro_city.qsrc

@@ -219,7 +219,6 @@ 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'

+ 2 - 2
locations/intro_customization.qsrc

@@ -421,7 +421,7 @@ if $ARGS[0] = 'modatt':
 	gs 'intro_customization', 'modrel_setup2', 'pcs_react', 'Reaction'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_chrsm', 'Charisma'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_prcptn', 'Perception'
-	if MagikDostup = 0: gs 'intro_customization', 'modrel_setup2', 'pcs_magik', 'Magic'
+	if $start_type[1] ! 'nomagic': gs 'intro_customization', 'modrel_setup2', 'pcs_magik', 'Magic'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_grades', 'Grades'
 	gs 'intro_customization', 'modrel_setup4', 'pcs_inhib', 'Inhibition'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_heels', 'Heels'
@@ -452,7 +452,7 @@ if $ARGS[0] = 'modskl_men':
 	'<center><b>Mental Skills</b></center>'
 	*nl
 	killvar '$table_display'
-	if MagikDostup = 0: gs 'intro_customization', 'modrel_setup2', 'pcs_splcstng', 'Spell Casting'
+	if $start_type[1] ! 'nomagic': gs 'intro_customization', 'modrel_setup2', 'pcs_splcstng', 'Spell Casting'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_humint', 'People skills'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_persuas', 'Persuasion'
 	gs 'intro_customization', 'modrel_setup2', 'pcs_observ', 'Observation'

+ 0 - 1
locations/intro_sg.qsrc

@@ -54,7 +54,6 @@ end
 if $ARGS[0] = 'five':
 	gs 'intro_sg_select', 'sg_settings'
 	gs 'intro_initialization'
-	MagikDostup = 1
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'

+ 3 - 9
locations/intro_uni.qsrc

@@ -1,16 +1,11 @@
 # intro_uni
 
 gs 'themes', 'indoors'
-killvar '$start_type'
-$start_type = 'uni'
-$start_type[1] = 'nomagic'
-
-!!if $ARGS[0] = 'elective_choice':
-!!	
-!!	
-!end
 
 if $ARGS[0] = 'start':
+	killvar '$start_type'
+	$start_type = 'uni'
+	$start_type[1] = 'nomagic'
 	!! Intro to starting uni
 	$loc = 'intro_uni'
 	$loc_arg = 'custom'
@@ -237,7 +232,6 @@ if $ARGS[0] = 'welcome_intro':
 	day = 25
 	gs 'intro_initialization_city'
 	!! Welcome to Girl Life speech
-	MagikDostup = 1
 	showstat 1
 	showobjs 1
 	gs 'obj_din', 'old'

+ 1 - 39
locations/intro_uni_tg.qsrc

@@ -432,41 +432,6 @@ if $ARGS[0] = 'sleepPRE':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/8.jpg"></center>'
 		'"Fuck," you say and immediately shut your mouth again. Your voice... it''s so feminine. Tatiana giggles.'
-
-		!!Default Names
-		$pcs_firstname = 'Svetlana'
-		$pcs_lastname = 'Lebedev'
-		$pcs_nickname = 'Sveta'
-
-		!!Player names are set here
-		if $temp_firstname = '':
-			$temp_firstname = 'Svetlana'
-		else
-			$temp_firstname = '<<$pcs_firstname>>'
-		end
-		$pcs_firstname = input("What is your first name? (Leave blank for Svetlana)")
-		if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
-		killvar '$temp_firstname'
-
-		
-		if $temp_lastname = '':
-			$temp_lastname = 'Lebedev'
-		else
-			$temp_lastname = '<<$pcs_lastname>>'
-		end
-		$pcs_lastname = input("What is your family name? (Leave blank for Lebedev)")
-		if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
-		killvar '$temp_lastname'
-
-		if $temp_nickname = '':
-			$temp_nickname = 'Sveta'
-		else
-			$temp_nickname = '<<$pcs_nickname>>'
-		end
-		$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
-		if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
-		killvar '$temp_nickname'
-
 		'"This is the first time I changed the gender of a person, therefore I just HAD to see your reaction. Totally worth it. But you turned out exactly like her."'
 		'Puzzled, you ask "Like who?"'
 		'"<<$pcs_firstname>> <<$pcs_lastname>> of course. It''s the dead girl I swapped you with. I found her in the morgue, erased evidence of her death,  made her look like you, and you like her. You needed an alibi, and I needed to throw Reinhold off your trail. Today, Mikhail crashed his car into the pit and died, it''s on the news." With these words, Tatiana picked up the remote and turned on the TV.'
@@ -496,14 +461,12 @@ if $ARGS[0] = 'sleepPRE':
 				'You arrive at an old apartment block in the town of Pavlovsk. Gustav stops the car and points a finger at the entrance. Your parents are on the third floor, the number is on your key Tatiana gave you. Tomorrow they are going to take you to your university dorm. Act natural and get some sleep, the changes to your body took a lot of energy out of you. Remember don''t just give up, not everyone gets an entirely new chance at life. Tatiana and me will keep an eye out for you."'
 				
 				act 'Go to the apartment':
-					$loc = 'intro_uni'
-					$loc_arg = 'custom'
 					'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_day.jpg"></center>'
 					'You are exhausted and trying to take in all the strange things you''ve learnt and barely speak to anyone at home. You remember your Mom sitting you down and making you eat something before you get an early night''s sleep.'
 					'The next morning you find you already have your bags packed, you get ready and throw some wash things in your bag. Your sister then takes some back out saying they are hers and puts some other things in there. Your family all head down stairs with you and pile into your stepfather''s Gazelle pickup and you all traveled from your hometown, Pavlovsk, to St. Petersburg.'
 					'As you approach the city, you read through the journal you have inherited and learn about the school days and kids. You find out what type of kid ''you'' were...'
 
-					act 'Continue': gt 'intro_city_select', 'start'
+					act 'Continue': gt 'intro_uni', 'vlad_intro'
 				end
 			end
 		end
@@ -514,7 +477,6 @@ 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'

+ 2 - 2
locations/journal.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'records':
 
 	'<center><h1>Journal</h1></center>'
 
-	if MagikDostup = 0:
+	if $start_type[1] ! 'nomagic':
 		'<center><h2>Spells</h2></center><br>'
 		'<center><h2>Spells to Cast</h2></center><br>'
 		func('spellBook','cast','$nonComSpells')
@@ -1607,7 +1607,7 @@ if $ARGS[0] = 'uni':
 			elseif dyneval( 'RESULT = class[''<<$class_list_institution[j]>>_<<$class_list_name[j]>>_grade'']') >= 40:
 				'You you think you are prepared enough to pass your <<$class_list_name[j]>> exam. But if you want a good grade you need to do some seriuos studying.'
 			else
-				'If your <<$class_list_name[j]>> exam was today you would afil. So time to hit the books if you don''t want to fail your semester.'
+				'If your <<$class_list_name[j]>> exam was today you would fail. So time to hit the books if you don''t want to fail your semester.'
 			end
 		end
 		j += 1

+ 1 - 1
locations/lug.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'prut2':
 		act 'Investigate a mysterious copse of trees': gt 'treeCircle', 'PushkinPark'
 	end
 
-	if MagikDostup ! 1 and rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
+	if $start_type[1] ! 'nomagic' and rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19):
 		if knowsfairy < 1 and fairyskip = 0:
 			$loc_arg = 'prut2'
 			xgt 'MagEncounterFairy'

+ 1 - 1
locations/metro.qsrc

@@ -188,7 +188,7 @@ if $ARGS[0] = 'shop':
 		'Buy breast cream 500 <b>₽</b> (You do not have enough money)'
 	end
 	'Uses left: <<bcream_have>>'
-	if MagikDostup = 0:
+	if $start_type[1] ! 'nomagic':
 		'Packet of pink chewing gum. There are 10 in one package.'
 		if money >= 200:
 			'<a href="exec:money -= 200 & aphrodisiac_have += 10 & gt ''metro'', ''shop''">Buy aphrodisiacs</a> 200 <b>₽</b>'

+ 80 - 55
locations/npcgeneratec.qsrc

@@ -176,12 +176,12 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 
 
 
-! npc_apt_type = 1: student dorm (only available in the city for obvious reasons)
-! npc_apt_type = 2: studio apartment
-! npc_apt_type = 3: one bedroom apartment (or 2 bedroom by UK/european definition, an apartment that has a separate bedroom unlike a studio)
-! npc_apt_type = 4: multi-bedroom apartment with roommates
-! npc_apt_type = 5: multi-bedroom apartment living alone
-! npc_apt_type = 6: high rise apartment (for rich people only)
+! npc_apt_type[$npclastgenerated] = 1: student dorm (only available in the city for obvious reasons)
+! npc_apt_type[$npclastgenerated] = 2: studio apartment
+! npc_apt_type[$npclastgenerated] = 3: one bedroom apartment (or 2 bedroom by UK/european definition, an apartment that has a separate bedroom unlike a studio)
+! npc_apt_type[$npclastgenerated] = 4: multi-bedroom apartment with roommates
+! npc_apt_type[$npclastgenerated] = 5: multi-bedroom apartment living alone
+! npc_apt_type[$npclastgenerated] = 6: high rise apartment (for rich people only)
 ! boyfriend attributes
 
 !! temp_location
@@ -220,63 +220,65 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		npc_occupation[$npclastgenerated] = rand(7,15)
 		npc_car[$npclastgenerated] = rand(-3,1)
 	elseif npc_finance[$npclastgenerated] = 2:
-		npc_apt_type[$npclastgenerated] = rand(5,6)
+		npc_apt_type[$npclastgenerated] = 5
+		!!npc_apt_type[$npclastgenerated] = rand(5,6)
+		!! apt_type 6 is disabled until pictures are added
 		npc_occupation[$npclastgenerated] = rand(14,18)
 		npc_car[$npclastgenerated] = rand(0,1)
 	end
 	
 	
-!	npc_style determines generally how they dress and what their "persona" is
+!	npc_style[$npclastgenerated] determines generally how they dress and what their "persona" is
 !	1 - "normal"
 !	2 - Gopnik
 !	3 - nerdy
 !	4 - sporty
 !	5 - fashionable
 !	6 - businessman
-	if npc_occupation < 15:
+	if npc_occupation[$npclastgenerated] < 15:
 		npc_style[$npclastgenerated] = rand(1,5)
 	else
 		npc_style[$npclastgenerated] = (rand(2,6) mod 6) + 1
 	end
 	
-	if npc_apt_type = 6:
+	if npc_apt_type[$npclastgenerated] = 6:
 		!! high rise
 		
 		!! this is to determine what their spare room is used for based on their personality type
-		if npc_style = 3:
-			npc_apt_spare = 1
-		elseif npc_style = 2 or npc_style = 4:
-			npc_apt_spare = 2
+		if npc_style[$npclastgenerated] = 3:
+			npc_apt_spare[$npclastgenerated] = 1
+		elseif npc_style[$npclastgenerated] = 2 or npc_style[$npclastgenerated] = 4:
+			npc_apt_spare[$npclastgenerated] = 2
 		else
-			npc_apt_spare = rand(1,2)
+			npc_apt_spare[$npclastgenerated] = rand(1,2)
 		end
-		if npc_apt_spare = 1:
-			$npc_apt_spare = 'gaming'
-		elseif npc_apt_spare = 2:
-			$npc_apt_spare = 'gym'
+		if npc_apt_spare[$npclastgenerated] = 1:
+			$npc_apt_spare[$npclastgenerated] = 'gaming'
+		elseif npc_apt_spare[$npclastgenerated] = 2:
+			$npc_apt_spare[$npclastgenerated] = 'gym'
 		end
 		npc_apt_number[$npclastgenerated] = rand(1,2)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
-		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
+		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/high_rise/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'		
-	elseif npc_apt_type = 4 or npc_apt_type = 5:
+	elseif npc_apt_type[$npclastgenerated] = 4 or npc_apt_type[$npclastgenerated] = 5:
 		!! multi-bedroom
-		!! npc_apt_type = 4 will one day be living with roommates but for now we''re just making it easy on ourselves. No roommates until later.
+		!! npc_apt_type[$npclastgenerated] = 4 will one day be living with roommates but for now we''re just making it easy on ourselves. No roommates until later.
 		
 		!! this is to determine what their spare room is used for based on their personality type
-		if npc_style = 3:
-			npc_apt_spare = 1
-		elseif npc_style = 2 or npc_style = 4:
-			npc_apt_spare = 2
+		if npc_style[$npclastgenerated] = 3:
+			npc_apt_spare[$npclastgenerated] = 1
+		elseif npc_style[$npclastgenerated] = 2 or npc_style[$npclastgenerated] = 4:
+			npc_apt_spare[$npclastgenerated] = 2
 		else
-			npc_apt_spare = rand(1,2)
+			npc_apt_spare[$npclastgenerated] = rand(1,2)
 		end
-		if npc_apt_spare = 1:
-			$npc_apt_spare = 'gaming'
-		elseif npc_apt_spare = 2:
-			$npc_apt_spare = 'gym'
+		if npc_apt_spare[$npclastgenerated] = 1:
+			$npc_apt_spare[$npclastgenerated] = 'gaming'
+		elseif npc_apt_spare[$npclastgenerated] = 2:
+			$npc_apt_spare[$npclastgenerated] = 'gym'
 		end
 		
 		npc_apt_number[$npclastgenerated] = rand(1,2)
@@ -286,7 +288,7 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
 		$npc_apt_spare[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<npc_apt_number[$npclastgenerated]>>/<<$npc_apt_spare[$npclastgenerated]>>.jpg"></center>'
-	elseif npc_apt_type = 3:
+	elseif npc_apt_type[$npclastgenerated] = 3:
 		!! one bedroom
 		npc_apt_number[$npclastgenerated] = rand(1,3)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
@@ -294,15 +296,15 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
 		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
-	elseif npc_apt_type = 2:
+	elseif npc_apt_type[$npclastgenerated] = 2:
 		!! studio apartment
 		npc_apt_number[$npclastgenerated] = rand(1,2)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_kitchen[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
 		$npc_apt_livingroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
-		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
+		$npc_apt_bathroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bath.jpg"></center>'
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
-	elseif npc_apt_type = 1:
+	elseif npc_apt_type[$npclastgenerated] = 1:
 		!! student dorm
 		npc_apt_number[$npclastgenerated] = rand(1,3)
 		$npc_apt_bedroom[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/1bedroom/<<npc_apt_number[$npclastgenerated]>>/bedroom.jpg"></center>'
@@ -312,26 +314,43 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 		$npc_apt_hall[$npclastgenerated] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/studio/<<npc_apt_number[$npclastgenerated]>>/living.jpg"></center>'
 	end
 	
-!!	if npc_occupation = 1: $npc_occupation = cashier at supermarket
-!!	if npc_occupation = 2: $npc_occupation = cashier at liquor store
-!!	if npc_occupation = 3: $npc_occupation = cashier at coffee shop
-!!	if npc_occupation = 4: $npc_occupation = barista
-!!	if npc_occupation = 5: $npc_occupation = cheap restaurant job
-!!	if npc_occupation = 6: $npc_occupation = taxi driver
-!!	if npc_occupation = 7: $npc_occupation = masseuse
-	
-!!	if npc_occupation = 8: $npc_occupation = sexual masseuse
-!!	if npc_occupation = 9: $npc_occupation = factory job
-!!	if npc_occupation = 10: $npc_occupation = bartender
-!!	if npc_occupation = 11: $npc_occupation = mechanic
-!!	if npc_occupation = 12: $npc_occupation = line cook
-!!	if npc_occupation = 13: $npc_occupation = waiter
-!!	if npc_occupation = 14: $npc_occupation = personal trainer
-!!	if npc_occupation = 15: $npc_occupation = programmer
-
-!!	if npc_occupation = 16: $npc_occupation = businessman
-!!	if npc_occupation = 17: $npc_occupation = lawyer
-!!	if npc_occupation = 18: $npc_occupation = investment banker
+	if npc_occupation[$npclastgenerated] = 1: 
+		$npc_occupation[$npclastgenerated] = 'cashier_supermarket'
+	elseif npc_occupation[$npclastgenerated] = 2: 
+		$npc_occupation[$npclastgenerated] = 'cashier_liquor'
+	elseif npc_occupation[$npclastgenerated] = 3: 
+		$npc_occupation[$npclastgenerated] = 'cashier_coffee'
+	elseif npc_occupation[$npclastgenerated] = 4: 
+		$npc_occupation[$npclastgenerated] = 'barista'
+	elseif npc_occupation[$npclastgenerated] = 5: 
+		$npc_occupation[$npclastgenerated] = 'fast_food'
+	elseif npc_occupation[$npclastgenerated] = 6: 
+		$npc_occupation[$npclastgenerated] = 'taxi_driver'
+	elseif npc_occupation[$npclastgenerated] = 7: 
+		$npc_occupation[$npclastgenerated] = 'masseuse'
+	elseif npc_occupation[$npclastgenerated] = 8: 
+		$npc_occupation[$npclastgenerated] = 'masseuse_sexual'
+	elseif npc_occupation[$npclastgenerated] = 9: 
+		$npc_occupation[$npclastgenerated] = 'factory'
+	elseif npc_occupation[$npclastgenerated] = 10: 
+		$npc_occupation[$npclastgenerated] = 'bartender'
+	elseif npc_occupation[$npclastgenerated] = 11: 
+		$npc_occupation[$npclastgenerated] = 'mechanic'
+	elseif npc_occupation[$npclastgenerated] = 12: 
+		$npc_occupation[$npclastgenerated] = 'line_cook'
+	elseif npc_occupation[$npclastgenerated] = 13: 
+		$npc_occupation[$npclastgenerated] = 'waiter'
+	elseif npc_occupation[$npclastgenerated] = 14: 
+		$npc_occupation[$npclastgenerated] = 'personal trainer'
+	elseif npc_occupation[$npclastgenerated] = 15: 
+		$npc_occupation[$npclastgenerated] = 'programmer'
+	elseif npc_occupation[$npclastgenerated] = 16: 
+		$npc_occupation[$npclastgenerated] = 'businessman'
+	elseif npc_occupation[$npclastgenerated] = 17: 
+		$npc_occupation[$npclastgenerated] = 'lawyer'
+	elseif npc_occupation[$npclastgenerated] = 18: 
+		$npc_occupation[$npclastgenerated] = 'investment banker'
+	end
 
 	npc_humor[$npclastgenerated] = rand(0,3)
 	
@@ -390,6 +409,12 @@ $npc_dna[$npclastgenerated] = func('DNA','create')
 !!	3 = serious relationship
 
 	npc_fidelity[$npclastgenerated] = rand(1,10)
+!!	npc_fidelity is how they will behave in a relationship
+!!	1-3 = will cheat on you 
+!!	4-6 = will cheat on others with you
+!!	7 = is fine with open relationship
+!!	8-10 = will be faithful
+	if npc_fidelity[$npclastgenerated] >= 4 and npc_fidelity[$npclastgenerated] <= 6: npc_girlfriend[$npclastgenerated] = rand(0,1)
 
 	npc_lover_days[$npclastgenerated] = 0
 

+ 3 - 0
locations/npcpreservec.qsrc

@@ -73,7 +73,9 @@ if mid($npctemp,1,1) = 'C':
 	npc_perv[$npclastsaved]			= npc_perv[$npctemp]
 	npc_outfit[$npclastsaved]		= npc_outfit[$npctemp]
 	npc_finance[$npclastsaved]		= npc_finance[$npctemp]
+	npc_occupation[$npclastsaved]	= npc_occupation[$npctemp]
 	$npc_occupation[$npclastsaved]	= $npc_occupation[$npctemp]
+	npc_car[$npclastsaved]  		= npc_car[$npctemp]
 	npc_intel[$npclastsaved]		= npc_intel[$npctemp]
 	npc_humor[$npclastsaved]		= npc_humor[$npctemp]
 	npc_fav_pos[$npclastsaved]		= npc_fav_pos[$npctemp]
@@ -82,6 +84,7 @@ if mid($npctemp,1,1) = 'C':
 	npc_bush_pref[$npclastsaved]	= npc_bush_pref[$npctemp]
 
 	npc_style[$npclastsaved]		= npc_style[$npctemp]
+	npc_smoker[$npclastsaved]		= npc_smoker[$npctemp]
 	npc_addit[$npclastsaved]		= npc_addit[$npctemp]
 	npc_doors[$npclastsaved]		= npc_doors[$npctemp]
 	npc_goal[$npclastsaved]			= npc_goal[$npctemp]

+ 3 - 3
locations/park_walkeventsrnd.qsrc

@@ -32,13 +32,13 @@ else
 !!night
 	!!Used to make a hunting easier the higher the suc level
 	if suchunt = 1: parkrand -= (succublvl-1)
-	if knowsfairy < 1 and MagikDostup ! 1:
+	if knowsfairy < 1 and $start_type[1] ! 'nomagic':
 		if rand (1, 4) <= pcs_magik:
 			fairyrand = 19
 		else
 			fairyrand = 21
 		end
-	elseif MagikDostup ! 1:
+	elseif $start_type[1] ! 'nomagic':
 		if (fairychat - fairyshoo) < 5 or ((fairychat - fairyshoo) < 10 and fairylooking = 1):
 			fairyrand = 19 - (fairychat - fairyshoo)
 		elseif fairylooking = 1:
@@ -50,7 +50,7 @@ else
 
 	if parkrand <= 5:
 		gt 'park_walkevents', '1'
-	elseif parkrand >= fairyrand and MagikDostup ! 1:
+	elseif parkrand >= fairyrand and $start_type[1] ! 'nomagic':
 		gt 'MagEncounterFairy'
 	else
 		gt 'park_walkevents', 'empty'

+ 4 - 4
locations/pav_disco_classmates.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = 'classmates':
 		if (npc_grupTipe['A<<i>>'] = 1 or $npc_nickname['A<<i>>'] = 'Natasha') and discoenable['A<<i>>'] = 1 and discobloc['A<<i>>'] ! daystart:
 			if i2 = 0: $table_disco += '<tr>'
 			i2 += 1
-			$table_disco += '<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''cool_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A<<i>>'']>></td></tr></table></td>'
+			$table_disco += '<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''cool_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_usedname[''A<<i>>'']>></td></tr></table></td>'
 			if i2 mod 8 = 0: i2 = 0 & $table_disco += '</tr>'
 		end
 		i += 1
@@ -47,7 +47,7 @@ if $ARGS[0] = 'classmates':
 		if npc_grupTipe['A<<i>>'] = 2 and discoenable['A<<i>>'] = 1 and discobloc['A<<i>>'] ! daystart:
 			if i2 = 0: $table_disco += '<tr>'
 			i2 += 1
-			$table_disco += '<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''jocks_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A<<i>>'']>></td></tr></table></td>'
+			$table_disco += '<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''jocks_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_usedname[''A<<i>>'']>></td></tr></table></td>'
 			if i2 mod 8 = 0: i2 = 0 & $table_disco += '</tr>'
 		end
 		i += 1
@@ -73,7 +73,7 @@ if $ARGS[0] = 'classmates':
 			$loopname = $lcase($loopname)
 			if i2 = 0: $table_disco += '<tr>'
 			i2 += 1
-			$table_disco += '<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''gop_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A<<i>>'']>></td></tr></table></td>'
+			$table_disco += '<td width =12.5%><table bgcolor=#FFF8DC><tr><td align=center><a href="exec: i = <<i>> & gt ''pav_disco_classmates'', ''gop_list''"><img  height="100" src="images/characters/shared/headshots_main/<<i>>.jpg"></a></td></tr><tr><td align=center><<$npc_usedname[''A<<i>>'']>></td></tr></table></td>'
 			if i2 mod 8 = 0: i2 = 0 & $table_disco += '</tr>'
 		end
 		if i = 144:
@@ -104,7 +104,7 @@ if $ARGS[0] = 'classmates':
 	end
 
 	if soniaPS > 0 and discoenable['A25'] = 1 and discobloc['A25'] ! daystart:
-		$table_disco += '<tr><td><table bgcolor=#FFF8DC><tr><td align=center><a href="exec:gt ''pav_disco_coolkids'', ''sonia_outcast'' "><img  height="100" src="images/characters/shared/headshots_main/25.jpg"></a></td></tr><tr><td align=center><<$npc_firstname[''A25'']>></td></tr></table></td><td colspan=7></td></tr>'
+		$table_disco += '<tr><td><table bgcolor=#FFF8DC><tr><td align=center><a href="exec:gt ''pav_disco_coolkids'', ''sonia_outcast'' "><img  height="100" src="images/characters/shared/headshots_main/25.jpg"></a></td></tr><tr><td align=center><<$npc_usedname[''A25'']>></td></tr></table></td><td colspan=7></td></tr>'
 	end
 	if hour >= 21 and hour < 23 and week=5:
 		$table_disco += '<tr><td bgcolor=#FFF8DC align=left width=12.5%><a href="exec: gt ''VolleyTrenerSpeak''"><img  height="100" src="images/characters/shared/headshots_main/69.jpg"></a></td><td valign=bottom align=left bgcolor=white colspan=7>Coach Mikhail Nikolayevich stands at the enterance of the hall.</td></tr>'

+ 1 - 1
locations/pav_park.qsrc

@@ -151,7 +151,7 @@ if $ARGS[0] = 'start':
 			minut += 15
 			place = 1
 			Frend_num = 0
-			if MagikDostup ! 1 and rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19): gt 'MagEncounterFairy'
+			if $start_type[1] ! 'nomagic' and rand (1, 4) <= pcs_magik and (hour <=6 or hour >=19): gt 'MagEncounterFairy'
 			gt 'placer'
 		end
 	end

+ 1 - 1
locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 6
-version_patch = 0
+version_patch = 1
 --- saveg ---------------------------------
 

+ 97 - 443
locations/saveupdater.qsrc

@@ -9,342 +9,7 @@
 
 !! When you do this you should always commit this file and saveg.qsrc at the same time.
 
-
-if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080202:
-
-	Msg 'Your save comes from some of previous versions of the game.<br>If it comes from ver. 0.8.1 or older, be prepare to buy new clothes.'
-	if housr = 1:
-		home_owned[1] = 1
-	elseif housr = 2:
-		home_owned[4] = 1
-	end
-	if BuyHous = 1: home_owned[1] = 2
-	if placeMansion > 0: home_owned[5] = placeMansion
-	if dachaest > 0: home_owned[3] = dachaest
-	killvar 'placemansion'
-	killvar 'dachaest'
-	killvar 'housr'
-	killvar 'BuyHous'
-
-	if alko < 0: alko = 0
-	if pranik < 0: pranik = 0
-	if poroshok < 0: poroshok = 0
-
-
-	!! set $home_town variable and remove consequential obsolete variables
-	if $home_town = '':
-		gs 'set_home', curr_home
-		killvar 'svidboykino'
-		killvar 'svidboypark'
-		killvar 'svidboypark1'
-		killvar 'svidboypark2'
-		killvar 'svidboykafe'
-	end
-
-	!! exhibition to inhib
-	if pcs_exhibition ! 0:
-		pcs_inhib = pcs_exhibition
-		inhib_exp = exhibition_exp
-		inhib_lvlst = pcs_exhibition
-		inhib_lvl = pcs_exhibition
-		killvar 'pcs_exhibition'
-		killvar 'exhibition_exp'
-	end
-
-	!! adds pregnancy progression images to saves that did not have them previously.
-	if arrsize('$bodimgsets') = 30:
-		$bodimgsets[30] = 'pregnant, but not showing'
-		$bodimgsets[31] = 'glowing'
-		$bodimgsets[32] = 'starting to show'
-		$bodimgsets[33] = 'clearly showing'
-		$bodimgsets[34] = 'fairly pregnant'
-		$bodimgsets[35] = 'quite pregnant'
-		$bodimgsets[36] = 'very pregnant'
-		$bodimgsets[37] = 'extremely pregnant'
-		$bodimgsets[38] = 'ready to pop'
-		$bodimgsets[39] = 'default_preg'
-	end
-
-	!! reorganizes old spell variables into new arrrays
-	if spell_update = 0:
-		spell_update = 1
-
-		if spelltuman = 1:spellKnown['fog'] = 1
-		if spellklon = 1:spellKnown['clone'] = 1
-		if spellstun = 1:spellKnown['stun'] = 1
-		if spellweap = 1:spellKnown['weapon'] = 1
-		if spellwind = 1:spellKnown['wind'] = 1
-		if spellklon2 = 1:spellKnown['multiclone'] = 1
-		if spellinit = 1:spellKnown['haste'] = 1
-		if spellhel = 1:spellKnown['heal'] = 1
-		if spellfire0 = 1:spellKnown['scaldingtouch'] = 1
-		if spellfire2 = 1:spellKnown['burninghands'] = 1
-		if spellfire3 = 1:spellKnown['firebarrier'] = 1
-		if spellfire4 = 1:spellKnown['firestorm'] = 1
-		if spellfire5 = 1:spellKnown['flameshield'] = 1
-		if spellele0 = 1:spellKnown['shock'] = 1
-		if spellele2 = 1:spellKnown['lightning'] = 1
-		if spellele3 = 1:spellKnown['electricbarrier'] = 1
-		if spellele4 = 1:spellKnown['1000birds'] = 1
-		if spellele5 = 1:spellKnown['dancingsphere'] = 1
-		if spellert0 = 1:spellKnown['quicksand'] = 1
-		if spellert2 = 1:spellKnown['earthshield'] = 1
-		if spellert3 = 1:spellKnown['abyss'] = 1
-		if spellert4 = 1:spellKnown['earthguardian'] = 1
-		if spellert5 = 1:spellKnown['sando'] = 1
-		if spellwind0 = 1:spellKnown['windgust'] = 1
-		if spellwind2 = 1:spellKnown['pressure'] = 1
-		if spellwind3 = 1:spellKnown['vacuum'] = 1
-		if spellwind4 = 1:spellKnown['vacuumshells'] = 1
-		if spellwind5 = 1:spellKnown['devouringvacuum'] = 1
-		if spellwater0 = 1:spellKnown['leechmana'] = 1
-		if spellwater2 = 1:spellKnown['flood'] = 1
-		if spellwater3 = 1:spellKnown['blister'] = 1
-		if spellwater4 = 1:spellKnown['sharkrockets'] = 1
-		if spellwater5 = 1:spellKnown['greatflood'] = 1
-	end
-
-	if spell_update < 2:
-		spell_update = 2
-		killvar '$basicSpells'
-	end
-	gs 'spellList'
-
-	if spell_update < 3:
-		spell_update = 3
-		! Fix Spell learn avaiability for Kakuzu if needed
-		if tobiQW = 3:
-			if stihia = 1:
-				gs 'spellList','addAvailableSpells','fireSpells', 20
-			end
-			if stihia = 2:
-				gs 'spellList','addAvailableSpells','electSpells', 20
-			end
-			if stihia = 3:
-				gs 'spellList','addAvailableSpells','earthSpells', 20
-			end
-			if stihia = 4:
-				gs 'spellList','addAvailableSpells','airSpells', 20
-			end
-			if stihia = 5:
-				gs 'spellList','addAvailableSpells','waterSpells', 20
-			end
-		end
-		! Fix Library spells found if needed
-		if arrsize('$ResearchingSP')>0:
-			gs 'spellList','addAvailableSpells','librarySpells', arrsize('$ResearchingSP')
-		end
-	end
-	gs 'spellList'
-	
-	if orgasm - orgasm_clit - orgasm_anal >= orgasm_vaginal: orgasm_vaginal = orgasm - orgasm_clit - orgasm_anal
-end
-
-
-	if array_updater = 0:
-		array_updater = 1
-		$oldnpcvars[0] = 'npc_app'
-		$oldnpcvars[1] = 'npc_int'
-		$oldnpcvars[2] = 'npc_Qstlvl'
-
-		$newnpcvars[0] = 'npc_apprnc'
-		$newnpcvars[1] = 'npc_intel'
-		$newnpcvars[2] = 'npc_QW'
-
-		i = 0
-		:npcvarloop
-		$oldnpcvar = $oldnpcvars[i]
-		if i < arrsize($oldnpcvars):
-			if 1 > arrsize('oldnpcvar'):i += 1 & jump 'npcvarloop'
-			$newnpcvar = $newnpcvars[i]
-			COPYARR 'newnpcvar', 'oldnpcvar'
-			i += 1
-			jump 'npcvarloop'
-		end
-		killvar 'npc_app'
-		killvar 'npc_int'
-		killvar 'npc_Qstlvl'
-		killvar 'oldnpcvar'
-		killvar 'newnpcvar'
-		killvar '$oldnpcsvars'
-		killvar '$newnpcvars'
-	end
-
-	!!Updates for the old school code
-	if NatBelLernQW > 0 and NatbelQW['QWstage'] = 0: NatbelQW['QWstage'] = NatBelLernQW & NatBelLernQW = 0
-
-
-	if npc_grupTipe['A133'] = 0: npc_grupTipe['A133'] = 6
-	if grupTipe[25] ! 0:
-		if npc_grupTipe['A25'] = 0: npc_grupTipe['A25'] = grupTipe[25]
-		grupTipe[25] = 0
-	end
-	if grupTipe[5] ! 0:
-		if npc_grupTipe['A5'] = 0: npc_grupTipe['A5'] = grupTipe[5]
-		grupTipe[5] = 0
-	end
-	if grupTipe[61] ! 0:
-		if npc_grupTipe['A189'] = 0: npc_grupTipe['A189'] = grupTipe[61]
-		grupTipe[61] = 0
-	end
-
-	if npcSex[1] > 0: npcSex[1] = 0 & npc_sex['A1'] = 1
-	if npcSex[2] > 0: npcSex[2] = 0 & npc_sex['A2'] = 1
-	if npcSex[3] > 0: npcSex[3] = 0 & npc_sex['A3'] = 1
-	if npcSex[4] > 0: npcSex[4] = 0 & npc_sex['A4'] = 1
-	if npcSex[6] > 0: npcSex[6] = 0 & npc_sex['A6'] = 1
-	if npcSex[9] > 0: npcSex[10] = 0 & npc_sex['A9'] = 1
-	if npcSex[10] > 0: npcSex[10] = 0 & npc_sex['A10'] = 1
-	if npcSex[11] > 0: npcSex[11] = 0 & npc_sex['A11'] = 1
-	if npcSex[14] > 0: npcSex[14] = 0 & npc_sex['A14'] = 1
-	if npcSex[16] > 0: npcSex[16] = 0 & npc_sex['A16'] = 1
-	if npcSex[23] > 0: npcSex[23] = 0 & npc_sex['A23'] = 1
-
-	if telefon_rev < 2:
-		killvar '$contact'
-		killvar '$contactIcon'
-		killvar '$contactOCode'
-		killvar '$contactOSche'
-		killvar '$contactICode'
-		killvar '$contactISche'
-		gs 'telefon', 'AddContact', 'A29', 'icon_npc1',"gs 'telefon', 'Phone_call'","hour >= 8 and hour <= 20"
-		if telkat > 0:
-			gs 'telefon', 'AddContact', 'A219', 'icon_kat',"$telsob = 'Kate' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20"
-		end
-		if npc_QW['A192'] > 0:
-			gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'","hour >= 8 and hour <= 20"
-		end
-		telefon_rev = 2
-	end
-
-	if stat['cum_facial'] = 0: stat['cum_facial'] = facial & facial =0
-	if pee > 0: stat['pee'] += pee & killvar 'pee'
-	! Since the arousal calls are seeded in all the scenes where these two variables occur, once they''ve been added to the stat, they should always be less or equal to it.
-	if NatbelQW['pee'] > stat['pee_give']: stat['pee_give'] += NatbelQW['pee']
-	if mistpiss > stat['pee_give'] - NatbelQW['pee']: stat['pee_give'] += mistpiss
-
-	if thpic ! 0: killvar 'thpic'
-	if puspic ! 0: killvar 'puspic'
-
-	if $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''christina''"><<$npc_usedname[''A18'']>></a>': $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''christina''"><<$npc_usedname[''A18'']>></a>'
-
-
-	!! Replacing some of the natasha variables with NatbelQW['QWstage'] levels.
-	killvar 'natsub'
-	killvar 'natotrab'
-	killvar 'natfuck'
-
-
-	if mid($start_type,1,2) = 'sg' or storyline = 1:
-
-		if fuckornot_update = 0:
-			fuckornot_update = 1
-			hotcat_rating['A22'] = 9
-			hotcat_rating['A17'] = 9
-			hotcat_rating['A23'] = 8
-			hotcat_rating['A144'] = 8
-			hotcat_rating['A19'] = 7
-			hotcat_rating['A18'] = 7
-			hotcat_rating['A14'] = 7
-			hotcat_rating['A12'] = 7
-			hotcat_rating['A140'] = 7
-			hotcat_rating['A141'] = 7
-			hotcat_rating['A15'] = 7
-			hotcat_rating['A143'] = 6
-			hotcat_rating['A13'] = 6
-			hotcat_rating['A16'] = 6
-			hotcat_rating['A25'] = 6
-			hotcat_rating['A139'] = 6
-			hotcat_rating['A20'] = 6
-			hotcat_rating['A21'] = 6
-			hotcat_rating['A24'] = 5
-			hotcat_rating['A142'] = 5
-			hotcat_rating['A145'] = 4
-		elseif fuckornot_update = 1:
-			fuckornot_update = 2
-			hotcat_rating['A145'] = 4
-			hotcat_movement['A145'] = 0
-		elseif fuckornot_update = 2:
-			fuckornot_update = 3
-			hotcat_rating['A1'] = 8
-			hotcat_rating['A2'] = 6
-			hotcat_rating['A3'] = 7
-			hotcat_rating['A4'] = 5
-			hotcat_rating['A5'] = 7
-			hotcat_rating['A6'] = 4
-			hotcat_rating['A7'] = 1
-			hotcat_rating['A8'] = 7
-			hotcat_rating['A9'] = 5
-			hotcat_rating['A10'] = 6
-			hotcat_rating['A11'] = 4
-			hotcat_rating['A34'] = 7
-			hotcat_rating['A58'] = 4
-			hotcat_rating['A59'] = 6
-			hotcat_rating['A146'] = 8
-			hotcat_rating['A147'] = 8
-			hotcat_rating['A148'] = 6
-			hotcat_rating['A149'] = 7
-			hotcat_rating['A152'] = 6
-			hotcat_rating['A153'] = 4
-			hotcat_rating['A154'] = 7
-			hotcat_rating['A155'] = 7
-			hotcat_rating['A156'] = 5
-			hotcat_rating['A157'] = 5
-			hotcat_rating['A158'] = 6
-			hotcat_rating['A159'] = 1
-		end
-
-		if grigoryEV ! 0:
-			npc_qw['A221'] = grigoryEV
-			killvar 'grigoryEV'
-		end
-
-		if SchoolAtestat = 0 and SchoolBlock = 0 and $schbrand = '':$schbrand = 'school'
-	end
-
-	if wombfather_update = 0: wombfather_update = 1 & gs 'din_bad'
-
-	!! This will unlock the Anushka photos if a player has already done the event.
-	if showerphotos = 1 and showerphotosupdater = 0:
-		showerphotosupdater = 1
-		anushkaphoto[1] = 1
-		anushkaphoto[2] = 1
-		anushkaphoto[3] = 1
-		anushkaphoto[4] = 1
-		anushkaphoto[5] = 1
-		anushkaphoto[6] = 1
-	end
-
-	!! Changes to the pregnancy due date dynamic format
-	if pregdateupdate = 0:
-		gs 'din_bad'
-		pregdateupdate = 1
-	end
-
-	if $npc_usedname['A<<npctemp>>'] = 'Inna': $npc_usedname['A<<npctemp>>'] = 'Irina'
-
-	!! Killing some useless variables used to trigger the Pavlin storyline
-	if totalmon ! 0:
-		montake = totalmon
-		killvar 'totalmon'
-		killvar 'mongiveback'
-	end
-
-	if cyc_update = 0:
-		cyc_update = 1
-		daylastperiod = firstmens
-		if difficulty = 4:
-			cyccustom = 0
-		else
-			cyccustom = 1
-		end
-	end
-
-	! Switching from tracking relationship with Rex from rex to npc_rel['A57']
-	if rex > 0 and rex > npc_rel['A57']: npc_rel['A57'] = rex & killvar 'rex'
-
-	!!------------------------------village variable clean up/translation---------------------------------------
-	if findvel > 0: BikeLoc = findvel & killvar 'findvel'
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080000:
 	!!------------------------------grandparent variable clean up---for 0.8.0 release---------------------------
 	!!---Grandpa
 	If grandpa_bilberry > 0: grandpaQW['chore_berry_quantity'] = grandpa_bilberry & killvar 'grandpa_bilberry'
@@ -459,7 +124,6 @@ end
 	if nhib_exp > 0: inhib_exp += nhib_exp & killvar 'nhib_exp'
 	killvar 'natsleeprand'
 	killvar 'imgrand'
-
 	!! ----- Natasha story variables migrated to array ----- 0.8.0
 
 	! ----- Parrot story variables migrated to array
@@ -592,7 +256,19 @@ end
 	!!Masturbation check wasn''t being cleared
 	mastrOnce = 0
 	!! ----- Other bug fixes and cleanup ----- 0.8.0
-
+end
+	
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080001:
+	!!--------0.8.0.1---school social group adjustment
+	if gruptipe[9000] = 0:
+		gruptipe[9000] = 1
+		grupvalue[1] = grupvalue[1] * 10
+		grupvalue[2] = grupvalue[2] * 10
+		grupvalue[3] = grupvalue[3] * 10
+		grupvalue[4] = grupvalue[4] * 10
+	end
+	!!--------0.8.0.1---school social group adjustment
+end
 
 	!!--------0.8.1--- Music variable names changed
 	if ml_update_1 = 0:
@@ -1011,76 +687,51 @@ end
 
 	!! 0.8.3 shoe package for old saves ---------------------------------------
 
-	if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080206:
-
-
-		i = 1
-		:sfetishmet
-		if sfetish[i] = 1: money += 300
-		i += 1
-		if i <= 27:jump 'sfetishmet'
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080206:
 
-		i = 1
-		:scatsmet
-		if scats[i] = 1: money += 300
-		i += 1
-		if i <= 38:jump 'scatsmet'
 
-		i = 1
-		:sgandmsmet
-		if sgandm[i] = 1: money += 300
-		i += 1
-		if i <= 40:jump 'sgandmsmet'
-
-		i = 1
-		:trainersmet
-		if trainers[i] = 1: money += 300
-		i += 1
-		if i <= 30:jump 'trainersmet'
-
-		i = 1
-		:sboutiquemet
-		if sboutique[i] = 1: money += 300
-		i += 1
-		if i <= 37:jump 'sboutiquemet'
-
-
-		killvar 'sfetish' & killvar 'sfetishS'
-		killvar 'scats' & killvar 'scatsS'
-		killvar 'sgandm' & killvar 'sgandmS'
-		killvar 'trainers' & killvar 'trainersS'
-		killvar 'sboutique' & killvar 'sboutiqueS'
+	i = 1
+	:sfetishmet
+	if sfetish[i] = 1: money += 300
+	i += 1
+	if i <= 27:jump 'sfetishmet'
 
+	i = 1
+	:scatsmet
+	if scats[i] = 1: money += 300
+	i += 1
+	if i <= 38:jump 'scatsmet'
 
-		sgm[5] = 1
-		sgm_s[5] = 0
-		gs 'shoes', 'wear', 'sgm', 5
-	end
+	i = 1
+	:sgandmsmet
+	if sgandm[i] = 1: money += 300
+	i += 1
+	if i <= 40:jump 'sgandmsmet'
 
-!!updater for sports clothing variable to unify it and fix bug
-i = 1
+	i = 1
+	:trainersmet
+	if trainers[i] = 1: money += 300
+	i += 1
+	if i <= 30:jump 'trainersmet'
 
-:danilovichfix
-	if danilovich[i] = 1:
-		danilovich_outfits[i] = 1
-		danilovich_outfits_s[i] = danilovich_s[i]
-		danilovich_outfits_h[i] = danilovich_h[i]
-		danilovich_outfits_b[i] = danilovich_b[i]
-	end
+	i = 1
+	:sboutiquemet
+	if sboutique[i] = 1: money += 300
 	i += 1
-if i <= 170:jump 'danilovichfix'
+	if i <= 37:jump 'sboutiquemet'
 
-killvar 'danilovich'
-killvar 'danilovich_s'
-killvar 'danilovich_h'
-killvar 'danilovich_b'
 
-!! New setting for gaping time per stage in minutes that can be made user definable
-if agape[4] = 0: agape[4] = 10
-if vgape[4] = 0: vgape[4] = 10
-	
-	
+	killvar 'sfetish' & killvar 'sfetishS'
+	killvar 'scats' & killvar 'scatsS'
+	killvar 'sgandm' & killvar 'sgandmS'
+	killvar 'trainers' & killvar 'trainersS'
+	killvar 'sboutique' & killvar 'sboutiqueS'
+
 
+	sgm[5] = 1
+	sgm_s[5] = 0
+	gs 'shoes', 'wear', 'sgm', 5
+end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080304:
 
@@ -1192,33 +843,32 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	gs 'fame', 'calculate', 'media'
 	gs 'fame', 'calculateSlut'
 
-end
-
-if modelfoto > 0 and modelfoto['saveupdater'] = 0:
-	!! changing modelling variables to arrays
-	if modelfoto > 0: modelfoto['shoots'] = modelfoto
-	if modelfotomoney > 0: modelfoto['earnings'] = modelfotomoney
-	if modelfoto_catalog > 0: modelfoto['catalog'] = modelfoto_catalog
-	if modelfoto_fashion > 0: modelfoto['fashion'] = modelfoto_fashion
-	if modelfoto_ero_clo > 0: modelfoto['sexy'] = modelfoto_ero_clo
-	if modelfoto_bikini > 0: modelfoto['bikini'] = modelfoto_bikini
-	if modelfoto_lingerie > 0: modelfoto['lingerie'] = modelfoto_lingerie
-	if modelfoto_trans_ling > 0: modelfoto['trans_ling'] = modelfoto_trans_ling
-	if modelfoto_transparent > 0: modelfoto['transparent'] = modelfoto_transparent
-	if modelfoto_fitness > 0: modelfoto['fitness'] = modelfoto_fitness
-	if modelfoto_glamour > 0: modelfoto['glamour'] = modelfoto_glamour
-	if modelfoto_topless > 0: modelfoto['topless'] = modelfoto_topless
-	if modelfoto_nude > 0: modelfoto['nude'] = modelfoto_nude
-	if modelfoto_tastenude > 0: modelfoto['tastenude'] = modelfoto_tastenude
-	if modelfoto_toplessnude > 0: modelfoto['toplessnude'] = modelfoto_toplessnude
-	if modelfoto_fullnude > 0: modelfoto['fullnude'] = modelfoto_fullnude
-	if modelfoto_erotic > 0: modelfoto['erotic'] = modelfoto_erotic
-	if modelfoto_nip > 0: modelfoto['nip'] = modelfoto_nip
-	if modelfoto_pussy > 0: modelfoto['pussy'] = modelfoto_pussy
-	if modelfoto_asshole > 0: modelfoto['asshole'] = modelfoto_asshole
-	
-	modelfoto['saveupdater'] = 1
+	if modelfoto > 0 and modelfoto['saveupdater'] = 0:
+		!! changing modelling variables to arrays
+		if modelfoto > 0: modelfoto['shoots'] = modelfoto
+		if modelfotomoney > 0: modelfoto['earnings'] = modelfotomoney
+		if modelfoto_catalog > 0: modelfoto['catalog'] = modelfoto_catalog
+		if modelfoto_fashion > 0: modelfoto['fashion'] = modelfoto_fashion
+		if modelfoto_ero_clo > 0: modelfoto['sexy'] = modelfoto_ero_clo
+		if modelfoto_bikini > 0: modelfoto['bikini'] = modelfoto_bikini
+		if modelfoto_lingerie > 0: modelfoto['lingerie'] = modelfoto_lingerie
+		if modelfoto_trans_ling > 0: modelfoto['trans_ling'] = modelfoto_trans_ling
+		if modelfoto_transparent > 0: modelfoto['transparent'] = modelfoto_transparent
+		if modelfoto_fitness > 0: modelfoto['fitness'] = modelfoto_fitness
+		if modelfoto_glamour > 0: modelfoto['glamour'] = modelfoto_glamour
+		if modelfoto_topless > 0: modelfoto['topless'] = modelfoto_topless
+		if modelfoto_nude > 0: modelfoto['nude'] = modelfoto_nude
+		if modelfoto_tastenude > 0: modelfoto['tastenude'] = modelfoto_tastenude
+		if modelfoto_toplessnude > 0: modelfoto['toplessnude'] = modelfoto_toplessnude
+		if modelfoto_fullnude > 0: modelfoto['fullnude'] = modelfoto_fullnude
+		if modelfoto_erotic > 0: modelfoto['erotic'] = modelfoto_erotic
+		if modelfoto_nip > 0: modelfoto['nip'] = modelfoto_nip
+		if modelfoto_pussy > 0: modelfoto['pussy'] = modelfoto_pussy
+		if modelfoto_asshole > 0: modelfoto['asshole'] = modelfoto_asshole
+		
+		modelfoto['saveupdater'] = 1
 
+	end
 end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080305:
@@ -1359,6 +1009,29 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if $loc='yzal':     $loc ='city_mansion_residence_2' & $loc_arg='yliving'   & $menu_loc ='city_mansion_residence_2' & $menu_arg='yliving'
 	if $loc='ysport':   $loc ='city_mansion_residence_3' & $loc_arg='ygym'      & $menu_loc ='city_mansion_residence_3' & $menu_arg='ygym'
 	if $loc='ykabinet': $loc ='city_mansion_residence_2' & $loc_arg='yoffice'   & $menu_loc ='city_mansion_residence_2' & $menu_arg='yoffice'
+
+
+	!!updater for sports clothing variable to unify it and fix bug
+	i = 1
+
+	:danilovichfix
+		if danilovich[i] = 1:
+			danilovich_outfits[i] = 1
+			danilovich_outfits_s[i] = danilovich_s[i]
+			danilovich_outfits_h[i] = danilovich_h[i]
+			danilovich_outfits_b[i] = danilovich_b[i]
+		end
+		i += 1
+	if i <= 170:jump 'danilovichfix'
+
+	killvar 'danilovich'
+	killvar 'danilovich_s'
+	killvar 'danilovich_h'
+	killvar 'danilovich_b'
+
+	!! New setting for gaping time per stage in minutes that can be made user definable
+	if agape[4] = 0: agape[4] = 10
+	if vgape[4] = 0: vgape[4] = 10
 end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080502:
@@ -1428,25 +1101,6 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	end
 end
 
-if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080601:
-
-	!!--------0.8.0.1---school social group adjustment
-	if gruptipe[9000] = 0:
-		gruptipe[9000] = 1
-		grupvalue[1] = grupvalue[1] * 10
-		grupvalue[2] = grupvalue[2] * 10
-		grupvalue[3] = grupvalue[3] * 10
-		grupvalue[4] = grupvalue[4] * 10
-	end
-	!!--------0.8.0.1---school social group adjustment
-
-	if pcs_skin < 150: pcs_skin = 7 * pcs_skin
-	gs 'body'
-	gs 'body', 'DailyUpdate'
-	gs 'AppearanceSystem', 'UpdateBaseAppearnce'
-	gs 'stat'
-end
-
 
 if mod_list > 0:
 	mod_i=1

+ 1 - 1
locations/stallion.qsrc

@@ -73,7 +73,7 @@ if $ARGS[0] = 'rape':
 	gs 'stat'
 	'You feel his hot breath against your ear as he continues to thrust into your body. "You know what they call me? Stallion. They call me that because when I ejaculate into a bitch, she ends up pregnant. I''ve already knocked up eleven girls. You''re gonna be number twelve."'
 	stallionQ = 5
-	if MagikDostup = 0 and broodcurse = 0:
+	if $start_type[1] ! 'nomagic' and broodcurse = 0:
 		broodcurse = 1
 		if $start_type[1] = 'nomagic':
 			'You feel a tingling in your body. You are pretty sure it is something Stallion has done to you.'

+ 7 - 7
locations/stat_display.qsrc

@@ -92,7 +92,7 @@ if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your bir
 if telefon['UnreadSMS'] > 0: $stat_msg += '<BR><b>You have <<telefon[''UnreadSMS'']>> unread message(s).</b><BR>'
 
 !New icon based menu.
-if MagikDostup = 0:
+if $start_type[1] ! 'nomagic':
 	$journal_tooltip = 'Spellbook & Journal'
 	$journalIcon = 'journal_magic.png'
 else
@@ -1036,8 +1036,8 @@ if cheatStatusIcons = 0:
 		elseif knowpreg = 1:
 			$stat_preg_tooltip = 'I''m pregnant.'
 			$stat_preg_msg = 'You are pregnant. Your due date is around <<$pregduedate>>.'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_preg_msg"><img title="<<$stat_preg_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/vpregnant.png"></a></td>'
 		end
-		$statusIconBarTab += '<td><a href="exec:msg $stat_preg_msg"><img title="<<$stat_preg_tooltip>>" height = <<set_siconht>> src="images/system/icons/status/vpregnant.png"></a></td>'
 	elseif preg = 2:
 		$stat_preg_msg = 'Broken water and contractions, it''s pretty clear what is going on. You need to get to a hospital ASAP.' 
 		$stat_preg_tooltip = 'Go to the hospital, ASAP! You''re in labour!'
@@ -1298,7 +1298,7 @@ if enable_show_status = 0:
 	elseif Enable_scalepic = 2:
 		$st_temp='rgb(<<(16777216 + fcolor) mod 256>>,<<(16777216 + fcolor)/256 mod 256>>,<<(16777216 + fcolor)/65536>>)'
 		$stat_extra_msg += '<p><font color="<<$st_temp>>"><TABLE width="300" cellpadding="1" cellspacing="0"><TR><TD width="85%">'+FUNC('indiktab', '2', pcs_horny, pcs_horny)+'</TD><TD> Arousal</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '2', pain['total'], pain['total'])+'</TD><TD> Pain</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_health * 100 / healthmax, pcs_health)+'</TD><TD> Health</TD></TR>'
-		if MagikDostup = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mana * 100 / manamax, pcs_mana)+'</TD><TD> Mana</TD></TR>'
+		if $start_type[1] ! 'nomagic': $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mana * 100 / manamax, pcs_mana)+'</TD><TD> Mana</TD></TR>'
 		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_willpwr * 100 / willpowermax, pcs_willpwr)+'</TD><TD> Willpower</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stam * 100 / stammax, pcs_stam)+'</TD><TD> Stamina</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_mood, pcs_mood)+'</TD><TD> Mood</TD></TR>'
 		if cheatNoEat = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_energy, pcs_energy)+'</TD><TD> Hunger</TD></TR>'
 		if cheatNoDrink = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_hydra, pcs_hydra)+'</TD><TD> Thirst</TD></TR>'
@@ -1313,7 +1313,7 @@ if enable_show_status = 0:
 		gs 'indik', '1', pcs_health * 100 / healthmax, pcs_health
 		$stat_extra_msg += '<BR><<$ind>> Health'
 
-		if MagikDostup = 0:
+		if $start_type[1] ! 'nomagic':
 			gs 'indik', '1', pcs_mana * 100 / manamax, pcs_mana
 			$stat_extra_msg += '<BR><<$ind>> Mana'
 		end
@@ -1355,7 +1355,7 @@ else
 	if $stat_extra_msg ! null: $stat_extra_msg += '<br><a href="exec:Enable_showattr = 0 & gs ''$menu_obnovit''">▲Attributes:</a>'
 	if Enable_scalepic = 2:
 		$stat_extra_msg += '<font color="<<$st_temp>>"><TABLE cellpadding="1" cellspacing="0" width="300"><TR><TD width="85%">'+FUNC('indiktab', '1', 100 - pcs_inhib, 100 - pcs_inhib)+'</TD><TD> Inhibition</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_stren, pcs_stren)+'</TD><TD> Strength</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_agil, pcs_agil)+'</TD><TD> Agility</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_vital, pcs_vital)+'</TD><TD> Endurance</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_intel, pcs_intel)+'</TD><TD> Intelligence</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_sprt, pcs_sprt)+'</TD><TD> Spirit</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_react, pcs_react)+'</TD><TD nowrap> Reaction</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_chrsm, pcs_chrsm)+'</TD><TD> Charisma</TD></TR><TR><TD width="85%">'+FUNC('indiktab', '1', pcs_prcptn, pcs_prcptn)+'</TD><TD> Perception</TD></TR>'
-		if MagikDostup = 0: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_magik, pcs_magik)+'</TD><TD> Magic</TD></TR>'
+		if $start_type[1] ! 'nomagic': $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_magik, pcs_magik)+'</TD><TD> Magic</TD></TR>'
 		if succubusflag = 1: $stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', sucexcess, sucexcess)+'</TD><TD> Succubus Energy</TD></TR>'
 		$stat_extra_msg += '<TR><TD width="85%">'+FUNC('indiktab', '1', pcs_apprnc / 2, pcs_apprnc)+'</TD><TD> Attractiveness</TD></TR>'
 		$stat_extra_msg += '</TABLE></font>'
@@ -1378,7 +1378,7 @@ else
 		$stat_extra_msg += '<BR><<$ind>> Charisma'
 		gs 'indik', '1', pcs_prcptn, pcs_prcptn
 		$stat_extra_msg += '<BR><<$ind>> Perception'
-		if MagikDostup = 0:
+		if $start_type[1] ! 'nomagic':
 			gs 'indik', '1', pcs_magik, pcs_magik
 			$stat_extra_msg += '<BR><<$ind>> Magic'
 			if succubusflag = 1:
@@ -1409,7 +1409,7 @@ else
 		$stat_sktool_msg += ' <a href="exec:Enable_show_mental_skill = 1 & gs ''$menu_obnovit''">◇Mental</a>'
 	else
 		$stat_sktool_msg += ' <a href="exec:Enable_show_mental_skill = 0 & gs ''$menu_obnovit''">◆Mental</a>'
-		if pcs_splcstng > 0 and MagikDostup = 0: gs 'show_table', '<<pcs_splcstng>> Spell Casting', '2'
+		if pcs_splcstng > 0 and $start_type[1] ! 'nomagic': gs 'show_table', '<<pcs_splcstng>> Spell Casting', '2'
 		if pcs_humint > 0: gs 'show_table', '<<pcs_humint>> People skills', '2'
 		if pcs_persuas > 0: gs 'show_table', '<<pcs_persuas>> Persuasion', '2'
 		if pcs_observ > 0: gs 'show_table', '<<pcs_observ>> Observation', '2'

+ 1 - 1
locations/treeCircEntry.qsrc

@@ -2,7 +2,7 @@
 ! Use this to insert an Entry Point to the Tree Cicle
 !	ARGS[0] = the EntryPoint ID name from $tpLocations[]
 
-if MagikDostup = 0:
+if $start_type[1] ! 'nomagic':
 
 	! Setup for teleport circle
 	if tpKnown[$ARGS[0]] = 1:

+ 24 - 12
locations/uni_programs.qsrc

@@ -226,14 +226,20 @@ if $ARGS[0] = 'uni_period_third':
 	!!Second if called as a function with the additional ARGS[1] of monday, tuesday, wednesday or thursday, it will print on the screen the name of the classe and the time period. 
 	if $university['enrolled_in']= 'teaching_studies':
 		if university['enrolled_in_semester'] = 1:
-			if $ARGS[1] = 'monday' and $university['elective1'] ! '':
-				$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
-			elseif $ARGS[1] = 'tuesday' and $university['elective2'] ! '':
-				$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+			if $ARGS[1] = 'monday':
+				if $university['elective1'] ! '':
+					$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
+				end
+			elseif $ARGS[1] = 'tuesday':
+				if $university['elective2'] ! '':
+					$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+				end
 			elseif $ARGS[1] = 'wednesday':
 				$Result = 'Learning Theories 101 (13:15 to 14:45)'
-			elseif $ARGS[1] = 'thursday' and $university['elective3'] ! '':
-				$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+			elseif $ARGS[1] = 'thursday' :
+				if $university['elective3'] ! '':
+					$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+				end
 			elseif week = 1 and $university['elective1'] ! '': 
 				!!*nl
 				!!'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
@@ -273,14 +279,20 @@ if $ARGS[0] = 'uni_period_third':
 				!!end
 			end
 		elseif university['enrolled_in_semester'] = 2:
-			if $ARGS[1] = 'monday' and $university['elective1'] ! '':
-				$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
-			elseif $ARGS[1] = 'tuesday' and $university['elective2'] ! '':
-				$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+			if $ARGS[1] = 'monday':
+				if $university['elective1'] ! '':
+					$Result = '<<$university[''elective1'']>> (13:15 to 14:45)'
+				end
+			elseif $ARGS[1] = 'tuesday':
+				if $university['elective2'] ! '':
+					$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
+				end
 			elseif $ARGS[1] = 'wednesday':
 				$Result = 'Phsychology of a Student 101 (13:15 to 14:45)'
-			elseif $ARGS[1] = 'thursday' and $university['elective3'] ! '':
-				$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+			elseif $ARGS[1] = 'thursday':
+				if $university['elective3'] ! '':
+					$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
+				end
 			elseif week = 1 and $university['elective1'] ! '': 
 				!!*nl
 				!!'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'

+ 3 - 0
locations/version.qsrc

@@ -2,6 +2,9 @@
 
 act 'Return': gt 'start'
 
+'0.8.6.1'
+'- Bugfixes from rachels, bgkjdgbizgblzdgbr, Anya and KS.'
+
 '0.8.6'
 '- Stretching in the BDSM brothel finished, text edits and some variable mis-matching fixed by Nekoforce'
 '- Processing from overnight file migrated to the respective files of their related content by rachels and bgkjdgbizgblzdgbr'