23 Commits 25b11dbe25 ... 0c86089ca1

Author SHA1 Message Date
  bgkjdgbizgblzdgbr 0c86089ca1 [cahnged] Resist willpower calls will now be modified by the spirit attibute, and passing such willpower checks will give experience for spirit. 1 month ago
  anjuna krokus 0dac820968 [added] Readable newspaper. Super barebones though 1 month ago
  anjuna krokus f92d7b6df6 [removed] duplicate line 1 month ago
  anjuna krokus 5ff25de665 [fixed] Set the correct variables for natbel's lover story. Added the variable to the description. Sveta now properly communicates when the next event happens, as it should. 1 month ago
  anjuna krokus 71b371a9bb [removed] removed trailing spaces 1 month ago
  anjuna krokus c07ab06b79 [fixed] mitkabuh links skipping the variable resets 1 month ago
  anjuna krokus b13c2701bc [changed] spaces to tabs 1 month ago
  anjuna krokus a3d7ec0620 [fixed] Typo in saveupdater. Reported by Skylah and Felix 1 month ago
  anjuna krokus bc867c36ad [fixed] Issues surrounding Mira and the beach. Reported by Honey 1 month ago
  anjuna krokus 7b5d2fcbdc [fixed/changed] vladimir was bugging out and money offered on subsequent visits is reduced. Reported by Skylah 1 month ago
  anjuna krokus a052c71400 [added] return option in the anorexic start. Reported by Honey 1 month ago
  anjuna krokus 5aab38946f [fixed] homes properties array not updated correctly in saveupdater. Reported by Netty 1 month ago
  Kevin_Smarts 474e227d18 Merge remote-tracking branch 'Awesome/master' 1 month ago
  Kevin_Smarts 19b89db11e [changed] update the version number 1 month ago
  Awesome f1dc7ecfba [fixed] saveupdater emptying the water bottle 1 month ago
  bgkjdgbizgblzdgbr 63fb4c23d9 [changed/fixed] Changed Katja's raction to you telling her to have sex with others if she already is. 1 month ago
  bgkjdgbizgblzdgbr fdd06b496c Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  bgkjdgbizgblzdgbr 6c6e7b1ede [fixed] Missing check for to much cleavage if you skirt is very short in the school clothing check. 1 month ago
  Kevin_Smarts f24aed6459 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  bgkjdgbizgblzdgbr 4a7c2693e9 [Changed] Made the effect of breast size on cleavage smaller and fixed a bug where the cleavage of a dress was set outside of the allowable range. 1 month ago
  anjuna krokus 50c8244403 [changed] Migrated the remaining persistent mira variables 1 month ago
  anjuna krokus 5ed31003a4 [fixed] Some fixes spotted and suggested by Lurk Morrison 1 month ago
  anjuna krokus aca54ff88e [fixed] wrong amount of money subtracted for a bus pass. This update will lower the actual cost. Noticed by Honey 1 month ago

+ 2 - 0
glife.qproj

@@ -352,6 +352,8 @@
 		<Location name="shop"/>
 		<Location name="bank"/>
 		<Location name="kiosk"/>
+		<Location name="newspaper"/>
+		<Location name="newspaper_pages"/>
 		<Location name="taxi"/>
 		<Location name="events"/>
 		<Location name="flash"/>

+ 2 - 3
locations/brother.qsrc

@@ -796,7 +796,6 @@ if $ARGS[0] = 'brotherSexStart':
 				*clr & cla
 				minut += 5
 				pcs_horny += 10
-				brotherfuck += 1
 				npc_rel['A34'] += 5
 				gs 'boyStat', 'A34'
 				gs 'cum_call', 'face', 'A34', 1
@@ -848,11 +847,11 @@ if $ARGS[0] = 'fuckvaginal':
 end
 
 if $ARGS[0] = 'fuckanal':
-	brotherfuck += 1
+	brotheranal += 1
 	npc_rel['A34'] += 5
 	*clr & cla
 	pcs_horny += 10
-	if brotherSex < 8:brotherSex = 8
+	if brotherSex < 8: brotherSex = 8
 	gs 'boyStat', 'A34'
 	gs 'arousal', 'anal', 5, 'incest'
 	gs 'arousal', 'end'

+ 1 - 1
locations/brother_shower_sex.qsrc

@@ -345,7 +345,7 @@ if $ARGS[0] = 'brother_shower_anal_vagv_analv':
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershowersex2.jpg"></center>'
 	'Kolka looks at you. You know he wants to go further, and you want to do more than a blowjob too, but you know you can''t.'
 	*nl
-	'"We have to stop. I want to do more, but if we continue... if I lose my virginity, then mother will kill me."' 
+	'"We have to stop. I want to do more, but if we continue... if I lose my virginity, then <<$npc_nickname[''A29'']>> will kill me."' 
 	'Kolka looks confused, and with a hint of pleading in his voice says "But... I don''t get it. How would she know?"'
 	'You are momentarily surprised he doesn''t know before realizing that he has no reason to know. "Why do you think I have to go to the doctors every month? I have to get checked."'
 	'Kolka thinks for a moment before smiling. "Are my grades good enough to become a doctor?"'

+ 5 - 2
locations/cikl.qsrc

@@ -1174,8 +1174,13 @@ if week = 1:
 
 	!! Reset therapist schedule
 	killvar 'therapist_weekly_block'
+elseif week = 7:
+	gs 'newspaper', 'cikl'
 end
 
+
+
+
 !!------------- Advance book loan debt  ------------------------------------------
 if $lib_book_loaned ! '': lib_debt += 50
 
@@ -1319,6 +1324,4 @@ end
 
 if blackmailQW['stage'] > 0: gs 'blackmailer', 'cikl'
 
-
 --- cikl ---------------------------------
-

+ 1 - 1
locations/clothing.qsrc

@@ -1712,7 +1712,7 @@ if $args[0] = 'school_check':
 			'<font color="blue">This uniform complies with the school regulations on skirt length. Nobody in school would be offended by you wearing it.</font>'
 		end
 	elseif CloSkirtShortness = 5 and CloThinness < 5 and CloBra = 0:
-		if CloInhibit >= 35:
+		if CloInhibit >= 35 or CloTopCut = 4:
 			'<font color="red">This uniform slightly breaches the school uniform regulations and it is too risqué. Everybody in school apart from the gopniks will think that you''re a slut.</font>'
 		elseif CloStyle = 2:
 			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that only the Gopniks will approve of.</font>'	

+ 10 - 5
locations/clothing_attributes.qsrc

@@ -277,11 +277,16 @@ if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! '
 	end
 end
 
-if CloTopCut > 1:
-	if tits = 2 or tits = 3: CloTopCut += 1
-	if tits >= 4: CloTopCut += 2
-	if CloTopCut > 2 and tits >=6: CloTopCut += 1
-end
+!! Adjusting the cleavage to the player characters breast size.
+if CloTopCut = 3 and tits >=4: CloTopCut = 4
+if CloTopCut = 2 and tits >=6: CloTopCut = 3
+!! This is the old version giving to drastic changes when the scal of CloTopCut is only 1-4
+!!if CloTopCut > 1:
+!!	if tits = 2 or tits = 3: CloTopCut += 1
+!!	if tits >= 4: CloTopCut += 2
+!!	if CloTopCut > 2 and tits >=6: CloTopCut += 1
+!!end
+!!if CloTopCut > 4: CloTopCut = 4
 
 --- clothing_attributes ---------------------------------
 

+ 142 - 143
locations/core_library.qsrc

@@ -9,54 +9,53 @@
 !! Ballet School Initiator - This class is to act as a gateway to the various locations for the ballet school
 
 if $ARGS[0] = 'init':
-
-    !!  Summer School
-    
-    !! $start_type['cat'] is the mc backstry, mod_ballet[beta] is a test variable to initiate regardless
-    if $start_type['cat'] = 'dancer' or mod_ballet['beta'] = 1: 
-        if daystart = 1:
-            mod_ballet['blocker'] = 1
-        end    
-        !! Parents Home Triggers
-        if $loc = 'kuhrPar':
-            if daystart < 6 and  mod_ballet['blocker'] = 1:
-                gs 'pushkin_ballet_init', 'init'
-            end
-    
-            if  ((daystart >= 6 and daystart <= 14) and mod_ballet['letter'] = 0) or (daystart >= 45 and balletqw['school'] > 1):	
-                gs 'pushkin_ballet_init', 'start'
-            end 
-        end
-    
-        !! Pavlovsk
-        if $loc = 'gdksport':
-            !! Close down Starlets
-            if mod_ballet['letter'] = 1 and (month = 7 or (month = 6 and day > 6)):
-                if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
-                    if hour = 15 and starlets_on = 1:
-                        act 'Tell Albina about the letter' : gt 'pushkin_ballet_evt', 'starlets'
-                    end
-                end
-            end
-            !! Dance job?
-    
-        end
-    
-        if $loc = 'pav_commcenter':
-            if month = 7 and day = 3 and (hour >= 16 and hour < 17) and mod_ballet['letter'] = 1:
-                ! Pre-flight - travel to school dorms
-                act 'Get on the bus': gt 'pushkin_ballet_res', 'start'	
-            end
-        end
-    
-        !! Pushkin
-    
-        !! Theatre 
-    
-        !! Other Events
-    end
+	!! Summer School
+	
+	!! $start_type['cat'] is the mc backstry, mod_ballet[beta] is a test variable to initiate regardless
+	if $start_type['cat'] = 'dancer' or mod_ballet['beta'] = 1: 
+		if daystart = 1:
+			mod_ballet['blocker'] = 1
+		end	
+		!! Parents Home Triggers
+		if $loc = 'kuhrPar':
+			if daystart < 6 and mod_ballet['blocker'] = 1:
+				gs 'pushkin_ballet_init', 'init'
+			end
+	
+			if ((daystart >= 6 and daystart <= 14) and mod_ballet['letter'] = 0) or (daystart >= 45 and balletqw['school'] > 1):	
+				gs 'pushkin_ballet_init', 'start'
+			end 
+		end
+	
+		!! Pavlovsk
+		if $loc = 'gdksport':
+			!! Close down Starlets
+			if mod_ballet['letter'] = 1 and (month = 7 or (month = 6 and day > 6)):
+				if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
+					if hour = 15 and starlets_on = 1:
+						act 'Tell Albina about the letter' : gt 'pushkin_ballet_evt', 'starlets'
+					end
+				end
+			end
+			!! Dance job?
+	
+		end
+	
+		if $loc = 'pav_commcenter':
+			if month = 7 and day = 3 and (hour >= 16 and hour < 17) and mod_ballet['letter'] = 1:
+				! Pre-flight - travel to school dorms
+				act 'Get on the bus': gt 'pushkin_ballet_res', 'start'	
+			end
+		end
+	
+		!! Pushkin
+	
+		!! Theatre 
+	
+		!! Other Events
+	end
  end
-    
+	
 !! --- Generic shared Locations and classes ---
 
 
@@ -67,15 +66,15 @@ if $ARGS[0] = 'init':
 !! $setloc[''StageTitle'']: Var to set up $loc h1 header
 !! $setloc[''StageImage'']: Var to set up $loc image - set 1 to randomise
 if $ARGS[0] = 'stage_title':
-    *clr & cla
-    '<center><h2><<$setloc[''StageTitle'']>></h2></center>'
-    '<center><img <<$set_imgh>> src="images/<<$setloc[''StageImage'']>>"></center>'
+	*clr & cla
+	'<center><h2><<$setloc[''StageTitle'']>></h2></center>'
+	'<center><img <<$set_imgh>> src="images/<<$setloc[''StageImage'']>>"></center>'
 
-    !! set indoor or outdoor location specific variables
+	!! set indoor or outdoor location specific variables
 
-    !! set standardised location variables such as kitchen, bathroom, personal bedroom
-    
-    !! npc location tracker - if tracking npc locations add them here.    
+	!! set standardised location variables such as kitchen, bathroom, personal bedroom
+	
+	!! npc location tracker - if tracking npc locations add them here.	
 end
 
 !! clothing_status - fnct to determine clothing status
@@ -84,107 +83,107 @@ if $ARGS[0] = 'clothing_status':
 	$apparel['panty'] = ''
 	$apparel['bra'] = ''
 	$apparel['status'] = ''
-    if $pantyworntype = 'none': $apparel['panty'] = 'pantyless'
-    if $braworntype = 'none': $apparel['bra'] = 'braless'
-    if $clothingworntype =  'nude': $apparel['status'] = 'nude'
-    if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':  $apparel['status'] = 'sport'
-    if $clothingworntype = 'ballet_secrets' and $shoeworntype = 'ballet_secrets':  $apparel['status'] = 'dance'
+	if $pantyworntype = 'none': $apparel['panty'] = 'pantyless'
+	if $braworntype = 'none': $apparel['bra'] = 'braless'
+	if $clothingworntype = 'nude': $apparel['status'] = 'nude'
+	if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich': $apparel['status'] = 'sport'
+	if $clothingworntype = 'ballet_secrets' and $shoeworntype = 'ballet_secrets': $apparel['status'] = 'dance'
 end
-    
+	
 if $ARGS[0] = 'corridor':
-    if frost > 0: frost = 0
-    music_loop = 0
-    menu_off = 0
-    CLOSE ALL
-    if $location_type = 'private':
-    elseif $location_type = 'public':
-    end
+	if frost > 0: frost = 0
+	music_loop = 0
+	menu_off = 0
+	CLOSE ALL
+	if $location_type = 'private':
+	elseif $location_type = 'public':
+	end
 end
 
 if $ARGS[0] = 'bathroom':
-    !! Location facilities
-    if $location_type = 'private':
-        'Your accommodation for the week has the luxury of a private shower and a bath. There''s a poster on the wall promoting the health benefits of ice baths and other advice on looking after your body.' 
-        *nl  
-        'There is a shower, toilet, sink, and a <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
-
-        gs 'din_van', 'private'
-    elseif $location_type = 'public':
-        act 'Take a shower':
-            *clr & cla
-            pcs_hairbsh = 0
-            pcs_makeup = 1
-            minut += 10
-            pcs_mood += 10
-            noShampoo = 1
-            dynamic $showerdin	
-            gs 'stat'
-            'You grab a quick shower, but you wish you could stay longer in the shower to let the heat soak into your muscles.'
-        
-            act 'Continue' : gt $loc, $loc_arg
-        end
-        'There is a shower and <a href="exec:gt ''mirror'',''start''">mirrors</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
-
-    elseif $location_type = 'communal':
-
-    end
-!! Default facilities    
-    dynamic $basin
-    dynamic $tampon
-    if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
-    if deodorant > 0 and deodorant_on = 0:
-        'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
-        act 'Apply deodorant (0:01)':
-            *clr & cla
-            menu_off = 1
-            minut += 1
-            deodorant -= 1
-            gs 'sweat', 'deo'
-            iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
-            'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
-            act 'Continue': menu_off = 0 & gt $loc, $loc_arg
-        end
-    end  
+	!! Location facilities
+	if $location_type = 'private':
+		'Your accommodation for the week has the luxury of a private shower and a bath. There''s a poster on the wall promoting the health benefits of ice baths and other advice on looking after your body.' 
+		*nl
+		'There is a shower, toilet, sink, and a <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+
+		gs 'din_van', 'private'
+	elseif $location_type = 'public':
+		act 'Take a shower':
+			*clr & cla
+			pcs_hairbsh = 0
+			pcs_makeup = 1
+			minut += 10
+			pcs_mood += 10
+			noShampoo = 1
+			dynamic $showerdin	
+			gs 'stat'
+			'You grab a quick shower, but you wish you could stay longer in the shower to let the heat soak into your muscles.'
+		
+			act 'Continue' : gt $loc, $loc_arg
+		end
+		'There is a shower and <a href="exec:gt ''mirror'',''start''">mirrors</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+
+	elseif $location_type = 'communal':
+
+	end
+!! Default facilities	
+	dynamic $basin
+	dynamic $tampon
+	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
+	if deodorant > 0 and deodorant_on = 0:
+		'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
+		act 'Apply deodorant (0:01)':
+			*clr & cla
+			menu_off = 1
+			minut += 1
+			deodorant -= 1
+			gs 'sweat', 'deo'
+			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
+			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
+			act 'Continue': menu_off = 0 & gt $loc, $loc_arg
+		end
+	end
 end
 
 if $ARGS[0] = 'kitchen':
-    !! Location facilities
-    if $location_type = 'private':
-        !! Home or parents kitchen
-        dynamic $edasnack
-        dynamic $sandwich
-        dynamic $pranik
-        dynamic $fatdel
-        dynamic $lekarstvo
-        dynamic $vitamin 
-    elseif $location_type = 'public_indoors':
-        !! canteen type location
-    elseif $location_type = 'communal':
-        !! shared or communal kitchen
-        dynamic $edasnack
-        dynamic $sandwich
-        dynamic $pranik
-        dynamic $vitamin 
-    end    
-    !! Default facilities
-    dynamic $driwater
-    dynamic $dritea
-    dynamic $fill_bottle
+	!! Location facilities
+	if $location_type = 'private':
+		!! Home or parents kitchen
+		dynamic $edasnack
+		dynamic $sandwich
+		dynamic $pranik
+		dynamic $fatdel
+		dynamic $lekarstvo
+		dynamic $vitamin 
+	elseif $location_type = 'public_indoors':
+		!! canteen type location
+	elseif $location_type = 'communal':
+		!! shared or communal kitchen
+		dynamic $edasnack
+		dynamic $sandwich
+		dynamic $pranik
+		dynamic $vitamin 
+	end	
+	!! Default facilities
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $fill_bottle
 end
 
 if $ARGS[0] = 'bedroom':
 !! Default facilities
-    if $location_type = 'private':   
-        if pcs_horny >= 50:
-            act 'Masturbate':gt 'selfplay', 'start'
-        end
-    elseif $location_type = 'guest':
-    elseif $location_type = 'private_shared': 
-    end
-    act 'Relax on your bed': gt 'bed', 'start'
-    act 'Open wardrobe': gt 'wardrobe', 'start'
-    gs 'events', 'read'
-    gs 'exercise', 'start'
+	if $location_type = 'private':
+		if pcs_horny >= 50:
+			act 'Masturbate':gt 'selfplay', 'start'
+		end
+	elseif $location_type = 'guest':
+	elseif $location_type = 'private_shared':
+	end
+	act 'Relax on your bed': gt 'bed', 'start'
+	act 'Open wardrobe': gt 'wardrobe', 'start'
+	gs 'events', 'read'
+	gs 'exercise', 'start'
 
 end
 --- core_library ---------------------------------

+ 2 - 0
locations/din_bad.qsrc

@@ -262,6 +262,8 @@ if $ARGS[0] = 'd_bag':
 	*nl
 	if $pursepantytype ! '' or $pursebratype ! '': 'You also have '+iif($pursepantytype ! '','<a href="exec:view''<<func(''$panty_image'', $pursepantytype, pursepantynumber)>>''">a pair of panties</a>','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','<a href="exec:view''<<func(''$bra_image'', $pursebratype, pursebranumber)>>''">a bra</a>','')+' in your purse, which you can put on in the nearest bathroom.'
 	if photographyEv >= 2: 'You have <a href="exec:gt''camera'',''start''">a camera</a> in your purse.'
+	if mc_inventory['newspaper'] = 1: newspaperVars['dbag'] = 1 & act 'Read your newspaper': gt 'newspaper', 'start'
+
 	act 'Return':gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 	'</td></tr></table></center>'
 end

+ 6 - 7
locations/gad_beach.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'start':
 			'<a href="exec:gt ''gad_beach'', ''Mira'', 1 ">Mira</a> is laying on the beach sunbathing.'
 			if npc_rel['A60'] < 15: npc_rel['A60'] += 1
 		else
-			'<a href="exec:& gt ''gad_beach'', ''Mira'', 0 ">Mira</a> is in the river splashing water around and having fun.'
+			'<a href="exec:gt ''gad_beach'', ''Mira'', 0 ">Mira</a> is in the river splashing water around and having fun.'
 			if npc_rel['A60'] < 15: npc_rel['A60'] += 1
 		end
 	end
@@ -100,8 +100,8 @@ if $ARGS[0] = 'start':
 !! extraordinary events at the river beach. Be aware, this part has to be at the end because it removes actions, which were set before.
 	if locat['A60'] ! 51 and locat['A60_prev'] = 51:
 		gt 'gad_beach', 'Mira_leaves'
-	elseif locat['A60'] = 51 and ARGS[1] = 0:
-		gt 'gad_beach', 'Arrive_Mira_already_there'
+	elseif locat['A60'] = 51 and ARGS[1] = 0 and miraVars['follow_time'] = 0:
+		gt 'gad_beach', 'arrive_Mira_already_there'
 	end
 end
 
@@ -495,7 +495,6 @@ if $ARGS[0] = 'Mira_leaves':
 end
 
 if $ARGS[0] = 'arrive_Mira_already_there':
-	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_in_river.jpg"></center>'
 	*nl
 	'Arriving at the beach, you see Mira lying down, sunbathing on a towel.'
@@ -504,13 +503,13 @@ if $ARGS[0] = 'arrive_Mira_already_there':
 	gs 'stat'
 
 	act 'Continue':
-		if Miraswimday ! daystart:
+		if MiraVars['swimday'] ! daystart:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirariver.jpg"></center>'
 			*nl
 			'"<<$pcs_nickname>>, why are you moping about on the shore? Get in the water and swim with me?" - Mira called out to you as she waded into the river.'
 			minut += 1
-			Miraswimday = daystart
+			MiraVars['swimday'] = daystart
 			gs 'stat'
 			act 'Agree and get changed':
 				*clr & cla
@@ -551,7 +550,7 @@ if $ARGS[0] = 'arrive_Mira_already_there':
 							pcs_sweat = 10 + rand(0,4)
 							gs'stat'
 
-							act 'Get out of the water': gt 'gad_beach', 1
+							act 'Get out of the water': gt 'gad_beach', 'start', 1
 						end
 					end
 				end

+ 3 - 3
locations/gad_field.qsrc

@@ -126,7 +126,7 @@ if $ARGS[0] = 'cow':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow.jpg"></center>'
 	'The cattle herd is standing in the middle of the field. Some cows are munching on grass, and others just stare idly around.'
-	if locat['A60'] = 70: '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is standing next to you.'
+	if locat['A60'] = 70: '<a href="exec: gt ''miroslava'', ''start''">Mira</a> is standing next to you.'
 
 	if grandpaQW['chore_herd_cattle'] = 0: act 'Leave them be': gt 'gad_field', 'field'
 	if hour = 19 and grandpaQW['chore_herd_cattle'] = 0:
@@ -249,7 +249,7 @@ if $ARGS[0] = 'cow2':
 
 	'The cattle herd is near the river. Some cows are munching on grass, some drink from the river, and some just stand or lie around.'
 
-	if locat['A60'] = 70: '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
+	if locat['A60'] = 70: '<a href="exec: gt ''miroslava'', ''start''">Mira</a> is sitting next to you.'
 	if temper >= 15 and sunWeather = 1:'"You can go for a swim if you want, <<$pcs_nickname>>. I''ll keep an eye on the herd," says your grandfather.'
 
 	if grandpaQW['chore_herd_cattle'] = 1:
@@ -317,7 +317,7 @@ if $ARGS[0] = 'cow3':
 
 	'The cattle herd is grazing in a field near the forest.'
 
-	if locat['A60'] = 70: '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
+	if locat['A60'] = 70: '<a href="exec: gt ''miroslava'', ''start''">Mira</a> is sitting next to you.'
 
 	if grandpaQW['chore_herd_cattle'] = 1:
 		if hour < 19:

+ 6 - 6
locations/gad_forest.qsrc

@@ -72,14 +72,14 @@ if $ARGS[0] = 'forest_edge':
 			'You can hear people picking mushrooms and berries deeper in the forest.'
 		end
 	end
-	if locat['A60'] = 60: '<a href="exec: gt ''Miroslava'' ">Mira</a> is here with you.'
+	if locat['A60'] = 60: '<a href="exec: gt ''Miroslava'', ''start'' ">Mira</a> is here with you.'
 
 	foresteventrand = rand(1, 20)
 	! Events with Mira
 	if locat['A60_prev'] = 60 and locat['A60'] ! 60:
 		*clr & cla
 
-		gs 'miroslava','miraclothes'
+		gs 'miroslava', 'miraclothes'
 		*nl
 		'"<<$pcs_nickname>>, I''m going to head home now, but we can hang out again later," Mira said as she began walking out of the forest.'
 
@@ -94,10 +94,10 @@ if $ARGS[0] = 'forest_edge':
 			gt 'gad_forest', 'forest_edge'
 		end
 	elseif locat['A60'] = 60:
-		if mirapickingtalk = 0 and miratalkday ! daystart: gt 'gad_forest_events', 'mira_picking_talk'
-		if miranudetalk = 0 and miratalkday ! daystart: gt 'gad_forest_events', 'mira_nude_talk'
+		if MiraVars['pickingtalk'] = 0 and MiraVars['talkday'] ! daystart: gt 'gad_forest_events', 'mira_picking_talk'
+		if MiraVars['nudetalk'] = 0 and MiraVars['talkday'] ! daystart: gt 'gad_forest_events', 'mira_nude_talk'
 		! stripping requires there to be no picnic going on, to have clothes on, for there to be no clothes already abandoned at the forest_edge, between april and october and already talked to Mira about being naked in the forest
-		if forestpicnic = 0 and $clothingworntype ! 'nude' and clothesAtLocation = 0 and month >= 4 and month <= 10 and hour >= 8 and hour <= 20 and miranudetalk = 1 and miratalkday ! daystart: gt 'gad_forest_events', 'mira_nude_event'
+		if forestpicnic = 0 and $clothingworntype ! 'nude' and clothesAtLocation = 0 and month >= 4 and month <= 10 and hour >= 8 and hour <= 20 and MiraVars['nudetalk'] = 1 and MiraVars['talkday'] ! daystart: gt 'gad_forest_events', 'mira_nude_event'
 	! Events without Mira
 	else
 		if npc_known['A60'] = 1 and locat['A60'] ! 60 and hour >= 8 and hour <= 10:
@@ -584,7 +584,7 @@ if $ARGS[0] = 'stripping':
 		! Mira only goes to the forest edge
 		if locat['A60'] = 60 and $forest_args1 = 'forest_edge':
 			! stripping with Mira requires completing talking to her about it already and doing their nude event in the forest already
-			if miranudetalk = 2:
+			if MiraVars['nudetalk'] = 2:
 				act 'Strip Naked with Mira (0:05)':
 					*clr & cla
 					menu_off = 1

+ 9 - 9
locations/gad_forest_events.qsrc

@@ -57,13 +57,13 @@ if $ARGS[0] = 'mira_picking_talk':
 	*clr & cla
 	menu_off = 1
 	minut += 15
-	mirapickingtalk = 1
-	miratalkday = daystart
+	MiraVars['pickingtalk'] = 1
+	MiraVars['talkday'] = daystart
 	npc_rel['A60'] += 2
 	gs 'gad_forest', 'bushcraft', 'forest_edge'
 	gs 'stat'
 
-	gs 'miroslava','miraclothes'
+	gs 'miroslava', 'miraclothes'
 	*nl
 	'"Hi, <<$pcs_nickname>>. I just wanted to tell you to be careful in the forest."'
 	'"It''s effortless to get lost if you wander away from the forest''s edge. But, the deeper you go into the forest, the more mushrooms and berries you can find."'
@@ -78,13 +78,13 @@ if $ARGS[0] = 'mira_nude_talk':
 	*clr & cla
 	menu_off = 1
 	minut += 15
-	miranudetalk = 1
-	miratalkday = daystart
+	MiraVars['nudetalk'] = 1
+	MiraVars['talkday'] = daystart
 	npc_rel['A60'] += 2
 	gs 'gad_forest', 'bushcraft', 'forest_edge'
 	gs 'stat'
 
-	gs 'miroslava','miraclothes'
+	gs 'miroslava', 'miraclothes'
 	*nl
 	'"Hey <<$pcs_nickname>>, guess what I overheard recently," Mira giggles as she whispers in your ear. "Some village elders talked about how walking naked in the woods is said to greatly improve your health and mood."'
 	'"I don''t know if it''s the fresh air or just being surrounded by nature, but it did make me feel better."'
@@ -97,8 +97,8 @@ if $ARGS[0] = 'mira_nude_event':
 	*clr & cla
 	menu_off = 1
 	minut += 15
-	miranudetalk = 2
-	miratalkday = daystart
+	MiraVars['nudetalk'] = 2
+	MiraVars['talkday'] = daystart
 	npc_rel['A60'] += 2
 	gs 'gad_forest', 'bushcraft', 'forest_edge'
 	pcs_horny += 10
@@ -172,7 +172,7 @@ end
 if $ARGS[0] = 'mira_morning_walk':
 	*clr & cla
 
-	gs 'Miroslava','miraclothes'
+	gs 'Miroslava', 'miraclothes'
 	*nl
 	'As you walk through the forest, you hear a familiar voice call out, "Hey, <<$pcs_nickname>>, wait up!" You turn around and see Mira excitedly bounding up behind you.'
 	'"Want to join me on my walk?" she asks. "I love walking through the forest in the morning."'

+ 2 - 1
locations/gad_gphouse.qsrc

@@ -306,6 +306,7 @@ if $ARGS[0] = 'main':
 	'A fairly simple cottage in the village of Gadukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
 	'There is an old <a href="exec:gt ''TV'',''gad''">television</a> in the living room. It''s positioned next to a body length <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
 	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight[0]>>.<<pcs_weight[1]>> kg<br>Your body mass index (BMI) is <<pcs_bmi[0]>>.<<pcs_bmi[1]>>.<br><<$bodyVars[''bmi_desc'']>></center>''">scales</a>.'
+	'Your grandfather''s <a href="exec: newspaperVars[''dbag''] = 0 & gs ''newspaper'', ''start''">newspaper</a> is lying to the side.'
 
 	if hour < 8:
 		temp = rand(0,9)
@@ -360,7 +361,7 @@ if $ARGS[0] = 'main':
 		'Your grandparents are asleep. They sleep in separate beds, which is strange since they''re still madly in love.'
 	end
 
-	if MiraVars['guest'] = 1: locat['A60'] = 21 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
+	if MiraVars['guest'] = 1: locat['A60'] = 21 & '<a href="exec: gt ''miroslava'', ''start''">Mira</a> is sitting next to you.'
 
 	gs 'stat'
 	gs 'themes', 'indoors'

+ 1 - 2
locations/gad_gpyard.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if MiraVars['guest'] = 1: locat['A60'] = 20 & 'Your friend <a href="exec: gt ''miroslava'', ''Start''">Mira</a> stands next to you.'
+	if MiraVars['guest'] = 1: locat['A60'] = 20 & 'Your friend <a href="exec: gt ''miroslava'', ''start''">Mira</a> stands next to you.'
 	!if locat['A60'] ! 20: MiraVars['guest'] = 0
 
 	act '<b>Leave and go into the village</b>':
@@ -476,7 +476,6 @@ if $ARGS[0] = 'cikl':
 	!! vovan, from 1.2.5
 	hunters_check = 0
 	mushroom_pickers = 0
-	mira_go_river = 0
 	forestpicnic = 0
 
 	!! new grandparent chore stuff, for 0.8.0

+ 8 - 8
locations/gad_prostitutes.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if locat['A60'] ! 80 and MiraVars['QW'] > 15: 'You look around for Mira but don''t see her here. So she must be doing something else right now.'
-	!if GadBoy['river_gang'] = 2 and (mirapimp = 0 or mirapimp = 2):
+	!if GadBoy['river_gang'] = 2 and (MiraVars['pimp'] = 0 or MiraVars['pimp'] = 2):
 	!	if PCloStyle <> 4:
 	!		'You are not wearing the right clothes to prostitute yourself.'
 	!	elseif pcs_sleep <= 0:
@@ -35,20 +35,20 @@ if $ARGS[0] = 'start':
 		'It is not a good time of day for prostitution. Try coming back later in the evening.'
 	else
 		! event to remove Sveta from being miras pimp if she becomes the boys slut, the village whore
-		if locat['A60'] = 80 and mirapimp = 1 and (npc_QW['A63'] >= 11 or GadBoy['river_gang'] = 2): 
+		if locat['A60'] = 80 and MiraVars['pimp'] = 1 and (npc_QW['A63'] >= 11 or GadBoy['river_gang'] = 2): 
 			gs 'gad_prostitutes', 'mira_rebels'
 		else
 			if locat['A60'] = 80:
 				'You see Mira standing below a streetlight a little way down the road.'
 
 				! event to become miras pimp if not the boys slut, not the village whore
-				if mirapimp = 0 and npc_QW['A63'] < 11 and GadBoy['river_gang'] = 0: gt 'gad_prostitutes', 'pimp_mira'
+				if MiraVars['pimp'] = 0 and npc_QW['A63'] < 11 and GadBoy['river_gang'] = 0: gt 'gad_prostitutes', 'pimp_mira'
 				
 				! events to prostitute just Mira
 				act 'Watch Mira prostitute herself': gt 'gad_prostitutes', 'just_mira'
 
 				! can do prostitution with Mira if Sveta is the village whore - this can be achieved by doing Mitka''s questline
-				!if GadBoy['river_gang'] = 2 and (mirapimp = 0 or mirapimp = 2) and PCloStyle = 4 and pcs_sleep > 0:
+				!if GadBoy['river_gang'] = 2 and MiraVars['pimp'] ! 0 and PCloStyle = 4 and pcs_sleep > 0:
 					! act 'Prostitute yourself with Mira':gt 'gad_prostitutes', 'with_mira'
 				!end
 			end
@@ -67,7 +67,7 @@ if $ARGS[0] = 'pimp_mira':
 		act 'Make Mira your prostitute (<<will_cost>> Willpower)':
 			*clr & cla
 
-			mirapimp = 1
+			MiraVars['pimp'] = 1
 			minut += 5
 			gs 'willpower', 'misc', 'force', 'hard'
 			gs 'willpower', 'pay', 'force'
@@ -92,7 +92,7 @@ end
 
 if $ARGS[0] = 'mira_rebels':
 	*clr & cla
-	mirapimp = 2
+	MiraVars['pimp'] = 2
 	gs 'prostitution_functions', 'set_gadukion_prostitute'	
  	minut += 5
 	gs 'stat'
@@ -192,7 +192,7 @@ if $ARGS[0] = 'watch_from_hiding':
 
 		act 'Finish':
 			*clr & cla
-			if mirapimp = 1: money += 200
+			if MiraVars['pimp'] = 1: money += 200
 			gs 'arousal', 'end'
 			gs 'stat'
 
@@ -222,7 +222,7 @@ if $ARGS[0] = 'watch_close':
 
 		act 'Finish':
 			*clr & cla
-			if mirapimp = 1: money += 200
+			if MiraVars['pimp'] = 1: money += 200
 			gs 'arousal', 'end'
 			gs 'stat'
 

+ 3 - 3
locations/gad_road.qsrc

@@ -42,12 +42,12 @@ if $ARGS[0] = 'start':
 
 		if locat['A60'] = 42:
 			if MiraVars['QW'] >= 16 and GadBoy['river_gang'] = 2:
-				'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh_group'',''partywithMira''">trailer</a> hidden in the woods.'
+				'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh_group''">trailer</a> hidden in the woods.'
 			else
-				'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partywithMira''">trailer</a> hidden in the woods.'
+				'You can go drink with Mira, Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh''">trailer</a> hidden in the woods.'
 			end
 		else
-			'You can go drink with Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh'',''partyalone''">trailer</a> hidden in the woods.'
+			'You can go drink with Mitka, Kolyamba and Vasyan at their <a href="exec:gt ''mitkabuh''">trailer</a> hidden in the woods.'
 		end
 	end
 

+ 1 - 1
locations/gschool_lessons.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = 'uniform_check':
 			'<font color="blue">This uniform complies with the school regulations on skirt length.</font>'
 		end
 	elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-		if PCloInhibit >= 35:
+		if PCloInhibit >= 35 or PCloTopCut = 4:
 			grupvalue[1] -= 1
 			grupvalue[2] -= 1
 			grupvalue[3] -= 1

+ 2 - 0
locations/intro_city_select.qsrc

@@ -1095,6 +1095,8 @@ elseif $ARGS[0] = 'anorexic':
 	
 		gt $loc, $loc_arg
 	end
+	act 'Return to starting options': gt 'intro_city_select', 'charselect'
+
 elseif $ARGS[0] = 'bimbo':
 	'<center><h4><font color="maroon">Simply Stunning</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/popular_4.jpg"></center>'

+ 2 - 2
locations/intro_initialization.qsrc

@@ -15,8 +15,6 @@ denypreg = 0
 pertemp = 1
 pillcvrt = 1
 
-gs 'transport_functions', 'init_all'
-
 pcs_naturallashes = pcs_lashes
 
 !!	Initializing elasticity
@@ -107,6 +105,8 @@ gs 'dina'
 gs 'din_van'
 gs 'din_bad'
 gs 'dinSex'
+
+gs 'newspaper', 'cikl'
 !! KEY! I merged 'dinBoroda' with 'clener' and removed the dynamics. This line was at the end of dinBoroda, so I moved it here just in case. Sicaa
 rikudootvet = 1415
 gs 'BanSexType'

+ 2 - 3
locations/intro_initialization_city.qsrc

@@ -22,9 +22,6 @@ denypreg = 0
 pertemp = 1
 pillcvrt = 1
 
-gs 'transport_functions', 'init_all'
-
-
 pcs_naturallashes = pcs_lashes
 
 !!	Initializing elasticity
@@ -118,6 +115,8 @@ gs 'dina'
 gs 'din_van'
 gs 'din_bad'
 gs 'dinSex'
+
+gs 'newspaper', 'cikl'
 !! KEY! I merged 'dinBoroda' with 'clener' and removed the dynamics. This line was at the end of dinBoroda, so I moved it here just in case. Sicaa
 rikudootvet = 1415
 gs 'BanSexType'

+ 15 - 7
locations/katja_dorm.qsrc

@@ -1352,15 +1352,19 @@ if $ARGS[0] = 'relationship_talk':
 		act 'Friends with benefits':
 			cla & *clr
 			minut += 5
-			if katjaQW['liberated'] = 0: katjaQW['liberated'] = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 			'"Sure, and it''s fun. I want to continue doing that. We are what you call ''friends with benefits''," you tell her.'
 			'"Okay," she answers. "You have brought a lot of excitement into my life, and I would like that to continue."'
 			'"Great," you answer. "So, we will continue to be friends, have sex with each other and whomever else we like," you say.'
-			'Katja takes a moment before realizing the implication of what you just said. "Are you telling me that I should go out and find other people to have sex with?"'
-			'"If you want to; I''m not keeping you from doing that. I fuck other people and have fun with it. So should you, if you want," you answer.'
-			'"Okay. I will think about it. But now I want to go to bed," Katja replies.'
+			if katjaQW['liberated'] = 0:
+				katjaQW['liberated'] = 1
+				'Katja takes a moment before realizing the implication of what you just said. "Are you telling me that I should go out and find other people to have sex with?"'
+				'"If you want to; I''m not keeping you from doing that. I fuck other people and have fun with it. So should you, if you want," you answer.'
+				'"Okay. I will think about it. But now I want to go to bed," Katja replies.'
+			else
+				'"Remember to tell me any good stories about the people you fuck. Then I will do the same" Katja says.'
+			end
 			'You say your goodbyes and leave her room.' 
 			act 'Go to the hallway': minut += 2 & gt 'uni_dorm', 'second_floor'
 		end
@@ -1413,9 +1417,13 @@ if $ARGS[0] = 'relationship_talk':
 			'"Yes, sex is fun. No reason to limit it to just one person. Just because you''re my girlfriend doesn''t mean we have to stop having sex with other people." you say. "I want us to have what you call an ''open relationship''," you tell her.'
 			'"What do you mean by that?" Katja asks.'
 			'"An open relationship is when you are in a relationship but are not bound to only have sex with your partner. You can fuck whoever you like, whenever you like, with or without your girlfriend," you explain.' 
-			'"So, you want me to have sex with other people when you are not there?" Katja asks.'
-			'"Only if you want to. But I would love to hear you tell stories about your sexual escapades, just like you love hearing mine," you say, making Katja''s face turn red.'
-			'"'+iif(katjaQW['QWstage'] >= 6 or katjaQW['anal_quest'] >=3 or katjaQW['simultanous_girls'] > 1, 'I do love it when we have fun with somebody else.', 'I guess we should try to have sex with somebody else together first.')+' You have given me some things to think about, but now I need to go to bed," Katja says, getting up and giving you a quick kiss.'
+			if katjaQW['liberated'] = 0:
+				'"So, you want me to have sex with other people when you are not there?" Katja asks.'
+				'"Only if you want to. But I would love to hear you tell stories about your sexual escapades, just like you love hearing mine," you say, making Katja''s face turn red.'
+				'"'+iif(katjaQW['QWstage'] >= 6 or katjaQW['anal_quest'] >=3 or katjaQW['simultanous_girls'] > 1, 'I do love it when we have fun with somebody else.', 'I guess we should try to have sex with somebody else together first.')+' You have given me some things to think about, but now I need to go to bed," Katja says, getting up and giving you a quick kiss.'
+			else
+				'"Remember to tell me any good stories about the people you fuck. Then I will do the same, but now I need to go to bed," Katja says, getting up and giving you a quick kiss.'
+			end
 			'"Sleep tight, my girlfriend," you say as you leave leave her room.'
 			'"Good night, my love," Katja replies.'
 			act 'Go to the hallway': minut += 2 & gt 'uni_dorm', 'second_floor'

+ 30 - 9
locations/kiosk.qsrc

@@ -114,17 +114,18 @@ if $ARGS[0] = 'counter':
 	menu_off = 0
 	gs 'stat'
 
-    gs 'item_cart', 'shoppping_aisle', 'kiosk'
-    gs 'stat'
-    gs 'themes', 'outdoors'
+	gs 'item_cart', 'shoppping_aisle', 'kiosk'
+	gs 'stat'
+	gs 'themes', 'outdoors'
 	
 	$backimage='images/locations/city/shared/kiosk/kiosk123.jpg'
 	act 'Leave':minut += 1 & gt $loc
 	
-	if money >= 100:
+	if money < 100:
+		'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You don''t have enough money to buy some snack.</TD></TR></table></center>'
+	else
 		act 'Buy a snack (100 <b>₽</b>) (0:05)':
 			*clr & cla
-			gs 'stat'
 			minut += 5
 			money -= 100
 			pcs_health += 10
@@ -140,15 +141,17 @@ if $ARGS[0] = 'counter':
 			gs 'cum_cleanup'
 			pcs_breath = 0
 			gs 'stat'
+
 			'<center><img <<$set_imgh>> src="images/shared/food/food.jpg"></center>'
 			'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You enjoy a small tasty, but somewhat fattening, snack.</TD></TR></table></center>'
+
 			act 'return': gt 'kiosk', 'start'
 		end
-	else
-		'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You don''t have enough money to buy some snack.</TD></TR></table></center>'
 	end
 
-	if money >= 40:
+	if money < 40:
+		'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You don''t have enough money to buy some water.</TD></TR></table></center>'
+	else
 		act 'Buy some water (40 <b>₽</b>) (0:05)':
 			*clr & cla
 			frost = 1
@@ -167,12 +170,30 @@ if $ARGS[0] = 'counter':
 			pcs_breath = 0
 			gs 'cum_cleanup'
 			gs 'stat'
+
 			'<center><img <<$set_imgh>> src="images/locations/shared/brothel/barorderwater.jpg"></center>'
 			'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You enjoy a drink of water</TD></TR></table></center>'
+
 			act 'return': gt 'kiosk', 'start'
 		end
+	end
+
+	if money < 100 and mc_inventory['newspaper'] = 0:
+		'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You don''t have enough money to buy a newspaper.</TD></TR></table></center>'
+	elseif mc_inventory['newspaper'] = 1:
+		'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You already own today''s newspaper.</TD></TR></table></center>'
 	else
-		'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You don''t have enough money to buy some water.</TD></TR></table></center>'
+		act 'Buy a newspaper (100 <b>₽</b>) (0:05)':
+			*clr & cla
+			mc_inventory['newspaper'] = 1
+			minut += 5
+			money -= 100
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+			'<center><table><TR BGCOLOR="' + $theme['table_bg'] + '"><TD><b></b>You buy the daily newspaper</TD></TR></table></center>'
+			act 'return': gt 'kiosk', 'start'
+		end
 	end
 
 	act 'View phone themes': $kioskloc = '' & gt 'kiosk', 'themes'

+ 8 - 6
locations/kuhrPar.qsrc

@@ -16,11 +16,8 @@ act 'Return to the hallway':
 	gt 'korrPar'
 end
 
-$loc = 'kuhrPar'
-$loc_arg = ''
+gs 'shortgs', 'setloc', 'kuhrPar', ''
 $locclass = 'kitr'
-$menu_loc = 'kuhrPar'
-$menu_arg = ''
 menu_off = 0
 minut += 1
 gs 'stat'
@@ -77,8 +74,13 @@ if locat['Mother'] = 23: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29
 
 !! Clean up of code to ensure stepdad doesn''t warp you to the living room
 killvar 'kit_dad'
-if locat['Stepdad'] = 4: '<a href="exec:gt''father'',''kit''">Your stepfather</a> is here reading the paper.'
-if locat['Stepdad'] = 7: '<a href="exec:gt''father'',''kit''">Your stepfather</a> is here setting the table for dinner.'
+if locat['Stepdad'] = 4:
+	'<a href="exec:gt ''father'', ''kit''">Your stepfather</a> is here reading the paper.'
+elseif locat['Stepdad'] = 7:
+	'<a href="exec:gt''father'',''kit''">Your stepfather</a> is here setting the table for dinner.'
+else
+	'A <a href="exec: newspaperVars[''dbag''] = 0 & gs ''newspaper'', ''start''">newspaper</a> lies on the kitchen table.'
+end
 
 if week = 6 and locat['Fam_set_month_inGad'] = 1 and grandmaQW['block'] = 0 and hour > 9 and hour < 12 and func('homes_properties', 'can_live_here'):'Your parents are getting ready to go to <a href="exec:gt ''gad_gphouse'', ''to_gadukino''">Gadukino</a> to visit your great grandparents. You can go with them if you want, or stay home like Anya usually does.'
 

+ 3 - 3
locations/mirafather.qsrc

@@ -43,11 +43,11 @@ if daystart < MiraVars['emb_day'] and mirafathertalk = 0 and MiraVars['event_day
 	mirafathertalk = 1
 	gs'stat'
 
-	act 'Continue':gt 'miroslava', 'Start'
+	act 'Continue': gt 'miroslava', 'start'
 else
 	act 'Ask if Mira is home':
 		if locat['A60'] = 10:
-			gt 'miroslava', 'Start'
+			gt 'miroslava', 'start'
 		else
 			*clr & cla
 			menu_off = 1
@@ -95,7 +95,7 @@ else
 			elseif locat['A60'] = 80:
 				'Mira''s father tells you that she''s not home. She left without telling him where she was going.'
 
-				if mirapimp = 1:
+				if MiraVars['pimp'] = 1:
 					'Mira is not home, but you know exactly where to find her. She has been working as your prostitute on the highway.'
 				elseif MiraVars['prostitute'] > 1:
 					'Mira is not home, but you know exactly where to find her. You have seen her working as a prostitute on the highway.'

+ 39 - 49
locations/miroslava.qsrc

@@ -4,12 +4,8 @@
 !locat['A60'] = Mira''s location. See 'miroslava_schedule'
 !!Model used - Pyanzina Svetlana Petrovna
 
-if $ARGS[0] = 'Start' or $ARGS[0] = '':
-	$loc = 'miroslava'
-	$loc_arg = $ARGS[0]
-
-	$menu_loc = 'miroslava'
-	$menu_arg = $ARGS[0]
+if $ARGS[0] = 'start' or $ARGS[0] = '':
+	gs 'shortgs', 'setloc', 'miroslava', 'start'
 	menu_off = 0
 
 	gs 'boyStat', 'A60'
@@ -67,7 +63,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			if MiraVars['had_sex'] = 2 and npc_rel['A60'] >= 15: act 'Talk to Mira in the meadow': gt 'gad_meadow', 'lesb_mira'
 		end
 
-		act 'Leave': gt 'miroslava','Leave'
+		act 'Leave': gt 'miroslava', 'leave'
 		act 'Chat': gt 'miroslava', 'miratalk'
 
 		if month >= 4 and month <= 10 and sunWeather = 1:
@@ -109,7 +105,6 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				*clr & cla
 				minut += 2
 				npc_rel['A60'] += 1
-				MiraVars['follower'] = 1
 				if ($clothingworntype = 'nude' or PCloswimwear = 1):
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 					gs 'underwear', 'wear'
@@ -118,6 +113,8 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 				gs 'miroslava', 'miraclothes'
 				'You ask Mira if she has already met everyone in the village. When she says no, you offer to introduce her to some local guys, and she readily agrees, asking you to wait a few minutes while she changes and freshens up. When she comes out, you go drinking with the group of boys near your house...'
 
+				MiraVars['follower'] = 1
+				MiraVars['follow_time'] = 24 - hour
 				act 'Continue': minut += 15 & gt 'mitkabuh'
 			end
 		end
@@ -134,11 +131,11 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			act 'Offer to go to the river': gt 'miroslava', 'offer_go_river'
 		end
 
-		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and locat['A60'] ! 60 and mirapickingtalk > 0 and npc_rel['A60'] >= 5:
+		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and locat['A60'] ! 60 and MiraVars['pickingtalk'] > 0 and npc_rel['A60'] >= 5:
 			act 'Offer to go to the forest': gt 'miroslava', 'offer_go_forest'
 		end
 
-		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and locat['A60'] = 60 and miranudetalk > 1 and npc_rel['A60'] >= 5 and $clothingworntype ! 'nude' and forestpicnic = 0:
+		if sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and locat['A60'] = 60 and MiraVars['nudetalk'] > 1 and npc_rel['A60'] >= 5 and $clothingworntype ! 'nude' and forestpicnic = 0:
 			if pcs_inhib >= 25 or exhibitionist_lvl > 1:
 				act 'Offer to walk naked':
 					menu_off = 1
@@ -232,7 +229,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Continue': gt 'miroslava', 'Start'
+					act 'Continue': gt 'miroslava', 'start'
 				end
 
 			elseif (temp_rand = 3 or temp_rand = 4) and MiraVars['guest'] = 1:
@@ -301,7 +298,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Continue': gt 'miroslava', 'Start'
+					act 'Continue': gt 'miroslava', 'start'
 				end
 
 			elseif (temp_rand = 6 or temp_rand = 7) and locat['A60'] ! 51 and locat['A60'] ! 60 and sunWeather = 1 and temper >= 15 and month >= 5 and month <= 9 and MiraVars['follow_time'] = 0 and hour < 18:
@@ -326,7 +323,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/girls_go.jpg"></center>'
 					'You decided to go with Mira to the village beach, and all the way, she goes, merrily chattering and telling stories.'
 
-					act 'Continue': gt 'gad_beach', 'start'
+					act 'Continue': gt 'gad_beach', 'start', 1
 				end
 
 				act 'Refuse':
@@ -337,7 +334,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
 					'You tell Mira that you don''t feel like going to the river now.'
 
-					act 'Continue': gt 'miroslava', 'Start'
+					act 'Continue': gt 'miroslava', 'start'
 				end
 
 			elseif temp_rand = 8 or temp_rand = 9:
@@ -360,7 +357,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira.jpg"></center>'
 					'"Not right now, Mira," you say. "I''m not in the mood to talk right now."'
 
-					act 'Continue': gt 'miroslava', 'Start'
+					act 'Continue': gt 'miroslava', 'start'
 				end
 
 			elseif temp_rand > 10 and locat['A60'] ! 60 and hour >= 20 and sunWeather = 1 and MiraVars['follow_time'] = 0 and MiraVars['QW'] > 0:
@@ -393,7 +390,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 					'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
 					'You deny Mira, saying that you don''t want to right now.'
 
-					act 'Continue': gt 'miroslava', 'Start'
+					act 'Continue': gt 'miroslava', 'start'
 				end
 			end
 			killvar 'temp_rand'
@@ -537,7 +534,7 @@ if $ARGS[0] = 'cattle_chore_acts':
 end
 
 
-if $ARGS[0] = 'Walk_together':
+if $ARGS[0] = 'walk_together':
 	menu_off = 1
 	if daystart < MiraVars['emb_day']:
 		minut += 5
@@ -545,7 +542,7 @@ if $ARGS[0] = 'Walk_together':
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_shy.jpg"></center>'
 		'You ask Mira to stroll around the village, but Mira only shakes her head, saying she is too ashamed to leave the house.'
 
-		act 'Leave': gt 'miroslava', 'Leave'
+		act 'Leave': gt 'miroslava', 'leave'
 	else
 		if npc_QW['A63'] >= 13 and MiraVars['QW'] < 10 and MiraVars['had_sex'] <= 1:
 			minut += 5
@@ -553,7 +550,7 @@ if $ARGS[0] = 'Walk_together':
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_said_no.jpg"></center>'
 			'You ask Mira to walk around the village, but she tells you that she does not want people to see you walking together and then wonder if she, too, is such a whore...'
 
-			act 'Leave': gt 'miroslava', 'Leave'
+			act 'Leave': gt 'miroslava', 'leave'
 		else
 			if locat['A60'] = 60:
 				minut += 85
@@ -563,8 +560,6 @@ if $ARGS[0] = 'Walk_together':
 
 			if npc_rel['A60'] < 15: npc_rel['A60'] += 1
 
-			MiraVars['follower'] = 1
-			MiraVars['follow_time'] = 1
 			MiraVars['guest'] = 0
 
 			if ($clothingworntype = 'nude' or PCloswimwear = 1):
@@ -612,8 +607,8 @@ if $ARGS[0] = 'Walk_together':
 				end
 				killvar 'temp_rand'
 			end
-			!! HOW TO DO THIS??
-			act 'Finish your walk': gt 'miroslava', 'Start'
+
+			act 'Finish your walk': gt 'miroslava', 'start'
 		end
 	end
 end
@@ -628,7 +623,7 @@ if $ARGS[0] = 'offer_go_meadow':
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_shy.jpg"></center>'
 		'You ask Mira if she wants to go to the meadow, but Mira only shakes her head, saying she is too ashamed to leave the house.'
 
-		act 'Leave': gt 'miroslava','Leave'
+		act 'Leave': gt 'miroslava', 'leave'
 	else
 		if npc_QW['A63'] >= 13 and MiraVars['QW'] < 5 and MiraVars['had_sex'] <= 1:
 			minut += 5
@@ -637,7 +632,7 @@ if $ARGS[0] = 'offer_go_meadow':
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_said_no.jpg"></center>'
 			'You offer to walk with Mira outside the village, but she says she doesn''t want to wander that far away from home.'
 
-			act 'Leave': gt 'miroslava','Leave'
+			act 'Leave': gt 'miroslava', 'leave'
 
 		else
 			if npc_rel['A60'] < 50: npc_rel['A60'] += 1
@@ -671,7 +666,7 @@ if $ARGS[0] = 'offer_drink_boys':
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_shy.jpg"></center>'
 		'You ask Mira if she wants to go drink with the boys, but she only shakes her head, saying she is too ashamed and will not leave the house.'
 
-		act 'Leave': gt 'miroslava','Leave'
+		act 'Leave': gt 'miroslava', 'leave'
 
 	else
 		minut += 5
@@ -710,7 +705,7 @@ if $ARGS[0] = 'offer_steam_bath':
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_shy.jpg"></center>'
 		'You ask Mira if she wants to come over and take a steam bath, but she only shakes her head, saying that after what she did, she is too ashamed to leave the house.'
 
-		act 'Leave': gt 'miroslava', 'Leave'
+		act 'Leave': gt 'miroslava', 'leave'
 	else
 		if npc_QW['A63'] >= 13 and MiraVars['QW'] < 10 and MiraVars['had_sex'] <= 1:
 			minut += 5
@@ -719,7 +714,7 @@ if $ARGS[0] = 'offer_steam_bath':
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_said_no.jpg"></center>'
 			'You offer Mira together to relax you in the bath, but she rudely answers that she will never go bathe with such a whore like you.'
 
-			act 'Leave': gt 'miroslava','Leave'
+			act 'Leave': gt 'miroslava', 'leave'
 		else
 			minut += 10
 			if npc_rel['A60'] < 50: npc_rel['A60'] += 1
@@ -757,7 +752,7 @@ if $ARGS[0] = 'offer_go_river':
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_shy.jpg"></center>'
 		'You ask Mira if she wants to go to the river with you, but she only shakes her head, saying that she will not leave the house after her humiliation.'
 
-		act 'Leave': gt 'miroslava','Leave'
+		act 'Leave': gt 'miroslava', 'leave'
 	else
 		if npc_QW['A63'] >= 13 and MiraVars['QW'] < 10 and MiraVars['had_sex'] <= 1:
 			minut += 5
@@ -766,20 +761,16 @@ if $ARGS[0] = 'offer_go_river':
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_said_no.jpg"></center>'
 			'You suggest going to the river together, but she snorts contemptuously at you and says that she is not going anywhere with a slut like you.'
 
-			act 'Leave':gt 'miroslava','Leave'
+			act 'Leave': gt 'miroslava', 'leave'
 		else
-			minut += 2
+			minut += 17
 			if npc_rel['A60'] < 30: npc_rel['A60'] += 1
 			MiraVars['guest'] = 0
 			if ($clothingworntype = 'nude' or PCloswimwear = 1):
 				gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 				gs 'underwear', 'wear'
 			end
-			if locat['A60'] = 60:
-				minut += 45
-			else
-				minut += 15
-			end
+			if locat['A60'] = 60: minut += 30
 
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
@@ -787,11 +778,10 @@ if $ARGS[0] = 'offer_go_river':
 			'You suggest going to the river to swim or sunbathe, and Mira readily agrees.'
 
 			MiraVars['follower'] = 1
-			MiraVars['follow_time'] = 1
-			act 'Go to the river': gt 'gad_beach', 'start'
+			MiraVars['follow_time'] = 2
+			act 'Go to the river': gt 'gad_beach', 'start', 1
 		end
 	end
-
 end
 
 
@@ -804,7 +794,7 @@ if $ARGS[0] = 'offer_go_forest':
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_shy.jpg"></center>'
 		'You ask Mira to go to the forest with you to look for mushrooms and berries, but she only shakes her head, saying that she will not leave the house after her humiliation.'
 
-		act 'Leave': gt 'miroslava','Leave'
+		act 'Leave': gt 'miroslava', 'leave'
 	else
 		if npc_QW['A63'] >= 13 and MiraVars['QW'] < 10 and MiraVars['had_sex'] <= 1:
 			minut += 5
@@ -813,7 +803,7 @@ if $ARGS[0] = 'offer_go_forest':
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_said_no.jpg"></center>'
 			'You have to offer Mira together to go to the forest for mushrooms and berries. Still, she contemptuously snorts in response and says she''s not going anywhere with a slut like you.'
 
-			act 'Leave': gt 'miroslava','Leave'
+			act 'Leave': gt 'miroslava', 'leave'
 		else
 			minut += 2
 			if npc_rel['A60'] < 30: npc_rel['A60'] += 1
@@ -838,6 +828,7 @@ end
 if $ARGS[0] = 'guest_acts':
 	if MiraVars['guest'] = 0:
 		act 'Invite to your grandparent''s':
+			*clr & cla
 			menu_off = 1
 			minut += 5
 			MiraVars['guest'] = 1
@@ -866,8 +857,8 @@ if $ARGS[0] = 'guest_acts':
 		end
 	else
 		act 'Watch TV':
-			menu_off = 1
 			*clr & cla
+			menu_off = 1
 			minut += 60
 			if npc_rel['A60'] < 20:npc_rel['A60'] += 1
 			pcs_mood += 10
@@ -881,8 +872,8 @@ if $ARGS[0] = 'guest_acts':
 
 		if hour >= 18:
 			act 'Sleep over':
-				menu_off = 1
 				*clr & cla
+				menu_off = 1
 				minut += 60
 				if npc_rel['A60'] < 20: npc_rel['A60'] += rand(1,2)
 				gs 'stat'
@@ -898,13 +889,13 @@ if $ARGS[0] = 'guest_acts':
 		end
 
 		act 'Say goodbye to Mira':
-			menu_off = 1
 			*clr & cla
+			menu_off = 1
 			minut += 5
 			MiraVars['guest'] = 0
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
-			!! GOES HOME??
+
 			'You say goodbye to Mira, and she goes home.'
 
 			act 'Walk back home': gt 'gad_gphouse', 'start'
@@ -1009,7 +1000,6 @@ end
 
 
 if $ARGS[0] = 'miratalk':
-	*clr & cla
 	minut += 10
 	menu_off = 1
 	if MiraVars['QW'] = 0:
@@ -1130,7 +1120,7 @@ if $ARGS[0] = 'miratalk':
 				'  - Wait, so it''s screaming at you in the back of Mira, but you pretend to not notice and go on.'
 				' - Well, <<$pcs_nickname>>, - after a couple of seconds until you hear a hysterical scream from Mira, I''ll think of something!'
 
-				act 'Leave':gt 'miroslava','Leave'
+				act 'Leave':gt 'miroslava', 'leave'
 			end
 		end
 	elseif MiraVars['QW'] = 4 and MiraVars['event_day'] ! daystart:
@@ -1175,7 +1165,7 @@ if $ARGS[0] = 'miratalk':
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira3.jpg"></center>'
 			'You tell Mira that you have now seen Mitka fuck her in the ass. Maliciously you ask, does she like having her ass fucked? To your surprise, Mira responds that she does like it a bit. You are slightly disappointed because this was supposed to be a punishment. Remind her that she still has two wishes to fulfil. Once they are all fulfilled, she will have satisfied her debt to you. Mira nods and says she is ready to redeem your wishes upon demand. You think it over for several moments before walking away...'
 
-			act 'Leave':gt 'miroslava','Leave'
+			act 'Leave':gt 'miroslava', 'leave'
 		end
 	else
 		if (npc_QW['A63'] > 0 and npc_QW['A63'] < 13) and npc_rel['A60'] < 50: npc_rel['A60'] += 1
@@ -1229,7 +1219,7 @@ if $ARGS[0] = 'mira_river':
 	if $clothingworntype = 'nude':'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirarivernudetalk.jpg"></center>'
 end
 
-if $ARGS[0] = 'Leave':
+if $ARGS[0] = 'leave':
 	if locat['A60'] = 10:
 		gt 'gad_miroslava_home','start'
 	elseif locat['A60'] = 60:

+ 4 - 0
locations/miroslava_schedule.qsrc

@@ -84,6 +84,9 @@ if $ARGS[0] = 'get_locat_from_loc':
 		result = 81
 	elseif $loc = 'furi' and nroad = 10:
 		result = 82
+	
+	else
+		result = 10
 	end
 end
 
@@ -126,6 +129,7 @@ if $ARGS[0] = 'update_locat':
 		exit
 	elseif Miravars['follow_time'] > 0:
 		locat['A60'] = locat['A60_prev']
+		exit
 	end
 
 	if MiraVars['guest'] = 1:

+ 1 - 0
locations/mitkabuh.qsrc

@@ -1,6 +1,7 @@
 # mitkabuh
 !2021/05/05
 
+$loc = 'mitkabuh'
 gs 'miroslava_schedule'
 
 

+ 17 - 7
locations/natbel_chat.qsrc

@@ -514,7 +514,7 @@ if $ARGS[0] = 'lover_chat':
 	elseif NatbelQW['FriendLover'] >= 7:
 		if money >= 25 and (week = 5 or week = 6) and (hour = 20 or hour = 21): act 'Ask Natasha to the disco': gt 'natbel_friend', 'disco_2'
 
-	elseif NatbelQW['FriendLover'] >= 8:
+	elseif NatbelQW['disco_invite'] = 3 and NatbelQW['shopping'] = 2:
 		act 'Natasha asks a question': gs 'natbel_chat', 'job_questions'
 	end
 end
@@ -666,6 +666,9 @@ if $ARGS[0] = 'job_question':
 				end
 				'"One second <<$pcs_nickname>>, I''l be back in a moment. Just need to go to the kitchen quickly. I left something on the stove..."'
 
+				natbelQW['StP_trip_daystart'] = daystart + 14 + (13 - week) mod 7		& ! Saturday 2 weeks from now
+				natbelQW['shopping'] = 3
+
 				if temp_runner = 1:
 					gs 'natbel_chat', 'job_questions_runner'
 				else
@@ -800,7 +803,16 @@ if $ARGS[0] = 'job_questions_runner':
 													'Natasha slowly regains her composure. "Oh yes <<$pcs_nickname>>! I''d love that! Thank you so much." She pauses then gives you a big hug then jumps up.'
 													'"One second <<$pcs_nickname>>, I''ll be back in a moment. Just need to go to the kitchen quickly. I left something on the stove and it should be cooked by now..."'
 													'Natasha returns still holding a wooden spoon and sits next to you so you continue.'
-													gs 'natbel_chat', 'job_questions_natbel_returns'
+													'Shall we go Saturday and we can have a look in some of the shops and maybe see if there''s anything we like? How about I pick you up outside between 12:00 and 2:00PM? Whilst we''re there I''ll tell you where I work and I''ll get you a ticket so you can watch the race."'
+													'Natasha''s smile widens. "Oh yes <<$pcs_nickname>>! That''ll be lovely. Umm... However, you need to give me a couple of weeks as I want to arrange a small surprise for you as a thank you for all your help."'
+													'"There''s really no need for anything special Natasha. I was just thinking about a day out and having a browse."'
+													'"Yes I know <<$pcs_nickname>> but I want to. I''ll need a couple of weeks if that''s okay?"'
+													'"Okay... So how about I pick you up outside between 12:00 and 2:00PM in two weeks? "'
+
+													killvar 'temp_city_work'
+													killvar 'temp_pav_work'
+													act 'Keep talking': gt 'natbel_chat', 'chat'
+													act 'Stop talking': gt 'natbelapt', 'natroom'
 												end
 											end
 
@@ -827,12 +839,12 @@ if $ARGS[0] = 'job_questions_runner':
 													'Natasha''s smile widens. "Oh yes <<$pcs_nickname>>! That''ll be lovely. Umm... However, you need to give me a couple of weeks as I want to arrange a small surprise for you as a thank you for all your help."'
 													'"There''s really no need for anything special Natasha. I was just thinking about a day out and having a browse."'
 													'"Yes I know <<$pcs_nickname>> but I want to. I''ll need a couple of weeks if that''s okay?"'
-												
+
 													act 'Slap':
 														*clr & cla
 														minut += 5
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/events/bullied/natasha41.jpg"></center>'
-														'"Of course Natasha, no problem, a couple of weeks it is." You pause then continue. "Just make sure it doesn..."'
+														'"Of course Natasha, no problem, how about I pick you up outside between 12:00 and 2:00PM in two weeks." You pause then continue. "Just make sure it doesn..."'
 														'Natasha interrupts. "Yes <<$npc_nickname[''A29'']>>!" She says grinning and rolling her eyes.'
 														'"You cheeky mere! If you keep that up you''re asking for a butt slap!" You respond laughing.'
 														'Natasha laughs and stands up then slowly lifts her dress higher and higher exposing her butt and green panties.'
@@ -891,8 +903,6 @@ if $ARGS[0] = 'job_questions_natbel_returns':
 
 			killvar 'temp_city_work'
 			killvar 'temp_pav_work'
-			natbelQW['StP_trip_daystart'] = daystart + 14 + (13-week) mod 7		& ! Saturday 2 weeks from now
-			natbelQW['FriendLover'] = 9
 			act 'Keep talking': gt 'natbel_chat', 'chat'
 			act 'Stop talking': gt 'natbelapt', 'natroom'
 		end
@@ -985,7 +995,7 @@ if $ARGS[0] = 'friend_chat':
 	end
 
 
-	if  NatbelQW['shopping'] = 1 and (NatbelQW['evt_day'] + 14 <= daystart):
+	if NatbelQW['shopping'] = 1 and (NatbelQW['evt_day'] + 14 <= daystart):
 		if (week >= 6 and hour < 15) and money >= 2000: 
 			act 'Go on shopping spree (2:30)': gt 'natbel_friend', 'shopping_spree'
 		elseif (hour >= 15):

+ 5 - 0
locations/natbel_cp_1.qsrc

@@ -40,6 +40,11 @@ NatbelQW['disco_invite'] = 1: Disco invite available
 NatbelQW['disco_invite'] = 2: Invited her to Disco
 NatbelQW['disco_invite'] = 3: Going to disco with Nat
 
+NatbelQW['shopping'] = 1: Planned first shopping trip
+NatbelQW['shopping'] = 2: Completed first shopping trip
+NatbelQW['shopping'] = 3: Planned second shopping trip
+
+
 NatbelQW['chrispaid'] = 1: Sveta leaves Natasha to pay Christina (end quest).
 NatbelQW['chrispaid'] = 2: Sveta tells Natasha she''ll pay Christina.
 NatbelQW['chrispaid'] = 3: Sveta to repay Christina.

+ 92 - 0
locations/newspaper.qsrc

@@ -0,0 +1,92 @@
+# newspaper
+
+	!!=======================================================!!
+	!!                                                       !!
+	!!                         CIKL                          !!
+	!!                                                       !!
+	!!=======================================================!!
+
+
+if $ARGS[0] = 'cikl':
+	mc_inventory['newspaper'] = 0
+	gs 'newspaper_pages', 'init'
+
+
+	idx = rand(0, arrsize('np_front_pages') - 1)
+	$newspaperVars['page_0'] = $np_front_pages[idx]
+
+	killvar 'np_front_pages'
+
+	i = 1
+	:newspaper_shuffle_loop
+		idx = rand(0, arrsize('np_pages') - 1)
+		$newspaperVars['page_<<i>>'] = $np_pages[idx]
+
+		i += 1
+		killvar 'np_pages', idx
+	if arrsize('np_pages') > 0: jump 'newspaper_shuffle_loop'
+
+	newspaperVars['max_page_num'] = i - 1
+
+	killvar 'i'
+	killvar 'np_pages'
+end
+
+
+
+
+
+
+
+	!!=======================================================!!
+	!!                                                       !!
+	!!                         VIEW                          !!
+	!!                                                       !!
+	!!=======================================================!!
+
+if $ARGS[0] = 'start':
+	temp_np_page = 0
+	gs 'newspaper', 'view'
+end
+
+
+if $ARGS[0] = 'view':
+	*clr & cla
+	'<center><h2>Delovoy Petersburg</h2></center>'
+
+	act 'Put the newspaper away':
+		killvar 'temp_np_page'
+		if newspaperVars['dbag'] = 0:
+			gt $menu_loc, $menu_arg
+		else
+			gs 'din_bad', 'd_bag'
+		end
+	end
+
+	if temp_np_page < newspaperVars['max_page_num']:
+		act 'Flip to the next article':
+			temp_np_page += 1
+			gs 'newspaper', 'view'
+		end
+	end
+	if temp_np_page > 0:
+		act 'Flip to the previous article':
+			temp_np_page -= 1
+			gs 'newspaper', 'view'
+		end
+	end
+
+	dynamic $newspaperVars['page_<<temp_np_page>>']
+
+end
+
+
+
+
+
+
+
+
+
+
+--- newspaper ----------------------------

+ 123 - 0
locations/newspaper_pages.qsrc

@@ -0,0 +1,123 @@
+# newspaper_pages
+
+
+if $ARGS[0] = 'init':
+	killvar 'np_front_pages'
+	killvar 'np_pages'
+
+	gs 'newspaper_pages', 'add_event_pages'
+	gs 'newspaper_pages', 'cikl_mod'
+	gs 'newspaper_pages', 'fill_arrays'
+end
+
+
+if $ARGS[0] = 'add_event_pages':
+!	if ...:
+!		$np_front_pages[] = 'gs ''loc'', ''loc_arg'' '
+!	end
+
+!	if ...:
+!		$np_pages[] = 'gs ''loc'', ''loc_arg'' '
+!	end
+
+	if rand(0, 9) = 0 and NewspaperVars['gad_missing_day'] < daystart:
+		$NewspaperVars['gad_missing_name'] = $randname
+		NewspaperVars['gad_missing_age'] = rand(9, 69)
+		if NewspaperVars['gad_missing_counter'] ! 0:
+			NewspaperVars['gad_missing_counter'] += 1
+		else
+			NewspaperVars['gad_missing_counter'] = rand(13, 17)
+			NewspaperVars['gad_missing_counter'] += daystart / 35
+		end
+		NewspaperVars['gad_missing_day'] = daystart + 15 + NewspaperVars['gad_missing_counter']
+		$np_pages[] = 'gs ''newspaper_pages'', ''gad_missing'' '
+	end
+
+end
+
+
+if $ARGS[0] = 'cikl_mod':
+	$old_curloc = $curloc
+	$old_loc = $loc
+	$curloc = 'newspaper_cikl'
+	$loc = 'newspaper_cikl'
+
+	gs 'LOCA', 'newspaper', 'cikl'
+
+	$curloc = $old_curloc
+	$loc = $old_loc
+	killvar 'old_curloc'
+	killvar 'old_loc'
+end
+
+if $ARGS[0] = 'fill_arrays':
+	if arrsize('np_front_pages') = 0:
+		gs 'newspaper_pages', 'add_generic_frontpage'
+	end
+
+	:fill_newspaper_loop
+	if arrsize('np_pages') < 3:
+		gs 'newspaper_pages', 'add_generic_page'
+		jump 'fill_newspaper_loop'
+	end
+end
+
+if $ARGS[0] = 'add_generic_frontpage':
+!	$np_front_pages[] = 'gs ''newspaper_pages'', ''generic_front_<<rand(0, 1)>>'' '
+
+	$np_front_pages[] = 'gs ''newspaper_pages'', ''generic_<<rand(0, 2)>>'' '
+
+end
+
+if $ARGS[0] = 'add_generic_page':
+	$np_pages[] = 'gs ''newspaper_pages'', ''generic_<<rand(0, 2)>>'' '
+end
+
+
+
+	!!=======================================================!!
+	!!                                                       !!
+	!!                        GENERIC                        !!
+	!!                                                       !!
+	!!=======================================================!!
+
+if $ARGS[0] = 'generic_0':
+	'<center>Mayor Election Scandal</center>'
+	*nl
+	'In a shocking turn of events the Mayoral candidate Boris Barlovsky has been arrested and is under investigation for numerous offences including running an escort services in Pavlosk.'
+	'We can exclusively reveal the full scandal on page 3.'
+end
+
+if $ARGS[0] = 'generic_1':
+	'<center>Mysterious Lights over Pushkin</center>'
+	*nl
+	'Last night there was several reports of floating lights over Pushkin lake, authorities have dismissed it as light bouncing off the water into low mist. However eye witness reports and photographs discredit the official report.'
+	'Read more on page 4.'
+end
+
+if $ARGS[0] = 'generic_2':
+	'<center>Missing cosmonaut found living in cave in Vladivostok</center>'
+	*nl
+	'Former cosmonaut Valentin Vitalyevich Lebedev (82) had been reported missing 3 weeks ago after he failed to turn up for a state function celebrating the 25th anniversary of the Scientific Geoinformation Center of the Russian Academy of Science which Valentin started and is the director of. He was found in a cave with only basic amenities and a small supply of food. When asked why he was there he simply said he''d grown sick of fancy dinners and red tape. He plans to return to his home and duties next week.'
+end
+
+
+
+
+
+	!!=======================================================!!
+	!!                                                       !!
+	!!                        EVENTS                         !!
+	!!                                                       !!
+	!!=======================================================!!
+
+
+if $ARGS[0] = 'Gad_missing':
+	'<center>More missing people in Gadukino</center>'
+	*nl
+	'Today <<$NewspaperVars[''gad_missing_name'']>> name, <<NewspaperVars[''gad_missing_age'']>> has been reported missing in Gadukino. They was last seen four days ago foraging in the forest. This makes this the <<NewspaperVars[''gad_missing_counter'']>> person that has gone missing in recent months and the authorities are at a loss in trying to locate to what has happened to them.'
+end
+
+
+
+--- newspaper_pages ------------------------------------------

+ 1 - 1
locations/prostitution_functions.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'set_pavlovsk_prostitute':
 end
 
 if $ARGS[0] = 'set_gadukion_prostitute':
-	if GadBoy['river_gang'] = 2 and (mirapimp = 0 or mirapimp = 2) and prostitute['full_block'] = 0:
+	if GadBoy['river_gang'] = 2 and MiraVars['pimp'] ! 1 and prostitute['full_block'] = 0:
 		prostitute['gadukino'] = 1
 		prostitute['active'] = 1
 		prostitute['payment_method'] = 1

+ 1 - 1
locations/pushkin_ballet_init.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = 'start':
 		if locat['Mother'] = 4 and mod_ballet['letter'] < 1 and daystart <= 14 :
 			! Trigger first act
 			gs 'ballet_npc'
-			act 'Read the letter': gt 'pushkin_ballet_evt', 'letter'			
+			act 'Read the letter': gt 'pushkin_ballet_evt', 'letter'
 		end
 		if locat['Mother'] = 4 and mod_ballet['letter'] < 1 and daystart >=45:
 			! Trigger second act

+ 1 - 1
locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 9
 version_revision = 2
-version_patch = 3
+version_patch = 4
 --- saveg ---------------------------------
 

+ 92 - 74
locations/saveupdater.qsrc

@@ -250,9 +250,9 @@ if temp_current_save_version  < 00080000:
 
 	!!-----------Adding pube colours for 0.8.0-----------
 
-	if pcs_pubecol[1] = 0: 
-		pcs_pubecol = pcs_haircol 
-		pcs_pubecol[1] = 1 
+	if pcs_pubecol[1] = 0:
+		pcs_pubecol = pcs_haircol
+		pcs_pubecol[1] = 1
 		pcs_pubecol[2] = pcs_haircol
 	end
 
@@ -399,13 +399,13 @@ if temp_current_save_version  < 00080100:
 
 		krystal['saveupdate'] = 1
 	end
-	
+
 	if $model['firstname'] = '':
 		$model['firstname'] = $pcs_firstname
 		$model['nickname']  = $pcs_nickname
 		$model['lastname']  = $pcs_lastname
 	end
-	
+
 	if $model['pay_method'] = '': $model['pay_method'] = 'cash_envelope'
 
 	!! Fixing Katja and Natasha relationship
@@ -441,7 +441,7 @@ if temp_current_save_version  < 00080100:
 		elseif pubestyle = 11:
 			shave_length  = 2
 			shave_trigger = 10
-		
+
 		!elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
 		else
 			shave_length  = 16
@@ -609,7 +609,7 @@ if temp_current_save_version  < 00080200:
 		gm_outfits_b[50] = pcs_hips
 		gs 'clothing', 'wear', 'gm_outfits', 50
 	end
-	
+
 		!! Shave updater
 	if shave_update ! 1:
 		if pubestyle = 1:
@@ -623,7 +623,7 @@ if temp_current_save_version  < 00080200:
 		elseif pubestyle = 11:
 			shave_length  = 2
 			shave_trigger = 8
-		
+
 		!elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
 		else
 			shave_length  = 16
@@ -837,13 +837,13 @@ if temp_current_save_version  < 00080304:
 
 	if dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 400:
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>_core''] = <<$fametown>>_<<$fameact>>'
-		
+
 	elseif dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 1100:
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>_core''] = 400 + (<<$fametown>>_<<$fameact>>-400)/3'
-		
+
 	elseif dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 2900:
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>_core''] = 700 + (<<$fametown>>_<<$fameact>>-1100)/6'
-		
+
 	else
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>_core''] = 1000 +(<<$fametown>>_<<$fameact>> -2900)/10'
 	end
@@ -854,51 +854,51 @@ if temp_current_save_version  < 00080304:
 	if $fameact = 'acting':
 		$fameact = 'dance'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'dance':
 		$fameact = 'painting'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'painting':
 		$fameact = 'music'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'music':
 		$fameact = 'ballet'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'ballet':
 		$fameact = 'modelling'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'modelling':
 		$fameact = 'porn'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'porn':
 		$fameact = 'stripping'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'stripping':
 		$fameact = 'kickboxing'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'kickboxing':
 		$fameact = 'running'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'running':
 		$fameact = 'volleyball'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'volleyball':
 		$fameact = 'chess'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'chess':
 		$fameact = 'teaching'
 		jump 'fameactloop'
-		
+
 	elseif $fameact = 'teaching':
 		$fameact = 'media'
 		jump 'fameactloop'
@@ -911,17 +911,17 @@ if temp_current_save_version  < 00080304:
 
 	if dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 400:
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>''] = <<$fametown>>_<<$fameact>>'
-		
+
 	elseif dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 1100:
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>''] = 400 + (<<$fametown>>_<<$fameact>>-400)/3'
-		
+
 	elseif dyneval('RESULT = <<$fametown>>_<<$fameact>>') < 2900:
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>''] = 700 + (<<$fametown>>_<<$fameact>>-1100)/6'
-		
+
 	else
 		dynamic 'fame[''<<$fametown>>_<<$fameact>>''] = 1000 +(<<$fametown>>_<<$fameact>> -2900)/10'
 	end
-	
+
 	killvar '<<$fametown>>_<<$fameact>>'
 
 	if $fameact = 'sex':
@@ -1235,7 +1235,7 @@ if temp_current_save_version  < 00080503:
 	if hotelroom1day ! 0:
 		hotelRoomDays['pav_hotel'] = hotelroom1day
 		hotelRoom['pav_hotel'] = hotelroom
-		
+
 		killvar 'hotelroom1day'
 		hotelroom = 0
 	end
@@ -1252,18 +1252,18 @@ if temp_current_save_version  < 00080504:
 	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'
@@ -1361,7 +1361,7 @@ if temp_current_save_version  < 00080700:
 	killvar 'momloc'
 	killvar 'momclean1'
 	killvar 'momclean2'
-	
+
 	if mother_go > 0:
 		locat['Mom_cafe_sex'] = mother_go
 	end
@@ -1530,7 +1530,7 @@ if temp_current_save_version < 00080804:
 	! city apartment
 	if home_owned[1] = 1 or owned_property['city_apartment'] = 1:
 		gs 'homes_properties', 'rent_property', 'city_apartment', ArendHouseSL
-		
+
 	elseif home_owned[1] = 2 or owned_property['city_apartment'] = 2:
 		gs 'homes_properties', 'buy_property', 'city_apartment'
 
@@ -1598,10 +1598,10 @@ if temp_current_save_version < 00080804:
 
 
 	!! Setting the current home and fixing potential missing access issues
-	if curr_home > 0 and $home['current'] = '': 
+	if curr_home > 0 and $home['current'] = '':
 		gs 'homes_properties', 'set_home', '', STR(curr_home)
 	end
-	if $home['current'] = 'parents_home' and accessible_property['parents_home'] = 0: 
+	if $home['current'] = 'parents_home' and accessible_property['parents_home'] = 0:
 		gs 'homes_properties', 'give_access', 'parents_home'
 	end
 
@@ -1760,7 +1760,7 @@ if temp_current_save_version < 00080900:
 		killvar 'nichTanyaBFState'
 		killvar 'nichTanyaFuckDom'
 		killvar 'nichTanyaFuckSub'
-		
+
 	end
 end
 
@@ -1879,7 +1879,7 @@ if temp_current_save_version < 00080901:
 		if i <= ARRSIZE('sport_bras'): jump 'loopsportbras'
 
 	killvar 'sport_bras'
-	
+
 	if metmira = 1: npc_known['A60'] = 1 & killvar 'metmira'
 
 end
@@ -1958,7 +1958,7 @@ if temp_current_save_version < 00090000:
 		$fuckbuddy = $_fuckbuddies
 		killvar '$_fuckbuddies' & killvar 'i_fb'
 	end
-	
+
 	if stat['virgin'] > 0:
 		stat['think_virgin'] = stat['virgin']
 		gs 'shortgs', 'remove_array_element', 'stat', 'virgin'
@@ -2039,21 +2039,21 @@ if temp_current_save_version < 00090003:
 	if bpbottles > 0:			mc_inventory['bottle_s']			= bpbottles				& killvar 'bpbottles'
 	if bpbottlem > 0:			mc_inventory['bottle_m']			= bpbottlem				& killvar 'bpbottlem'
 	if bpnipplebalm > 0:		mc_inventory['nipple_cream']		= bpnipplebalm			& killvar 'bpnipplebalm'
-!	if Kandidoz > 0:			mc_inventory['thrush_meds']			= Kandidoz				& killvar 'Kandidoz' ! No clue what to do with this 
+!	if Kandidoz > 0:			mc_inventory['thrush_meds']			= Kandidoz				& killvar 'Kandidoz' ! No clue what to do with this
 	if fatdel > 0:				mc_inventory['weight_loss_pill']	= fatdel				& killvar 'fatdel'
 	if morning_after_pill > 0:	mc_inventory['morning_after_pill']	= morning_after_pill	& killvar 'morning_after_pill'
 	if prezik > 0:				mc_inventory['equipped_condoms']	= prezik				& killvar 'prezik'
 	if prezikcount > 0:			mc_inventory['normal_condoms']		= prezikcount			& killvar 'prezikcount'
 	if preziksabo > 0: 			mc_inventory['sabotaged_condoms']	= preziksabo			& killvar 'preziksabo'
 	if badprezik > 0:			mc_inventory['bad_condoms']			= badprezik				& killvar 'badprezik'
-	if tabletki > 0:			mc_inventory['contraceptive_pill']	= tabletki				& killvar 'tabletki' 
-	if siga > 0:				mc_inventory['cigarettes']			= siga					& killvar 'siga' 
-	if fashmag > 0:				mc_inventory['mag_fashion']			= fashmag				& killvar 'fashmag' 
-	if compmag > 0:				mc_inventory['mag_computer']		= compmag				& killvar 'compmag' 
-	if biomag > 0:				mc_inventory['mag_biography']		= biomag				& killvar 'biomag' 
-	if cookmag > 0:				mc_inventory['mag_cooking']			= cookmag				& killvar 'cookmag' 
-	if knitmag > 0:				mc_inventory['mag_knitting']		= knitmag				& killvar 'knitmag' 
-	if fitmag > 0:				mc_inventory['mag_fitness']			= fitmag				& killvar 'fitmag' 
+	if tabletki > 0:			mc_inventory['contraceptive_pill']	= tabletki				& killvar 'tabletki'
+	if siga > 0:				mc_inventory['cigarettes']			= siga					& killvar 'siga'
+	if fashmag > 0:				mc_inventory['mag_fashion']			= fashmag				& killvar 'fashmag'
+	if compmag > 0:				mc_inventory['mag_computer']		= compmag				& killvar 'compmag'
+	if biomag > 0:				mc_inventory['mag_biography']		= biomag				& killvar 'biomag'
+	if cookmag > 0:				mc_inventory['mag_cooking']			= cookmag				& killvar 'cookmag'
+	if knitmag > 0:				mc_inventory['mag_knitting']		= knitmag				& killvar 'knitmag'
+	if fitmag > 0:				mc_inventory['mag_fitness']			= fitmag				& killvar 'fitmag'
 	if umbrella > 0:			mc_inventory['umbrella']			= umbrella				& killvar 'umbrella'
 	if pornMagazine > 0:		mc_inventory['mag_porn']			= pornMagazine			& killvar 'pornMagazine'
 	if vibrator > 0:			mc_inventory['vibe']				= vibrator				& killvar 'vibrator'
@@ -2147,8 +2147,8 @@ if temp_current_save_version < 00090003:
 
 
 	if legal_fine > 0: policeQW['legal_fine'] = legal_fine & killvar 'legal_fine'
-	
-	
+
+
 	!! Sleep update.
 	killvar 'varsleep'
 
@@ -2158,7 +2158,7 @@ if temp_current_save_version < 00090003:
 	if cheatVib       > 0: sleepVars['cheatVib']             = cheatVib       & killvar 'cheatVib'
 	if notathomesleep > 0: sleepVars['notathomesleep']       = notathomesleep & killvar 'notathomesleep'
 	if Enable_nodream > 0: sleepVars['cheat_nodream_chance'] = Enable_nodream & killvar 'Enable_nodream'
-	
+
 	sleepVars['events_active'] = 1
 	sleepVars['dreams_active'] = 1
 
@@ -2180,16 +2180,16 @@ if temp_current_save_version < 00090003:
 		npc_dob['A<<npctemp>>'] = 19961215
 		$npc_notes['A<<npctemp>>'] = 'Yakov is a fitness-focused sports enthusiast with blond hair and a tanned complexion.'
 		npc_gender['A<<npctemp>>'] = 0
-		
+
 		gs 'npcstaticdefaults', 'defaults'
-		
+
 		$npc_thdick['A<<npctemp>>'] = 'well proportioned'
 		npc_dick['A<<npctemp>>'] = 14
 		npc_sexskill['A<<npctemp>>'] = 1
 		$npc_occupation['A<<npctemp>>'] = 'personal_trainer'
 		npc_style['A<<npctemp>>'] = 5
-		
-		
+
+
 		npctemp = 265
 		$npc_dna['A<<npctemp>>'] = '1085950303 4348731991 6618084127 9067996922 8669859044 9431283301 0673267503'
 		$npc_firstname['A<<npctemp>>'] = 'Nestor'
@@ -2199,16 +2199,16 @@ if temp_current_save_version < 00090003:
 		npc_dob['A<<npctemp>>'] = 19930127
 		$npc_notes['A<<npctemp>>'] = 'Nestor is a gopnik with a reputation for being rude and aggressive. His motto seems to be "the younger, the better," which can be concerning. He has a tough demeanor, with dark hair and dark skin, giving off an intimidating presence.'
 		npc_gender['A<<npctemp>>'] = 0
-		
+
 		gs 'npcstaticdefaults', 'defaults'
-		
+
 		$npc_thdick['A<<npctemp>>'] = 'massive'
 		npc_dick['A<<npctemp>>'] = 22
 		npc_sexskill['A<<npctemp>>'] = 1
 		npc_style['A<<npctemp>>'] = 2
-		
-		
-		
+
+
+
 		npctemp = 266
 		$npc_dna['A<<npctemp>>'] = '5654106058 6395942483 3363408422 7113656738 1111862818 8859290040 7960339191'
 		$npc_firstname['A<<npctemp>>'] = 'Oleg'
@@ -2218,9 +2218,9 @@ if temp_current_save_version < 00090003:
 		npc_dob['A<<npctemp>>'] = 19950712
 		$npc_notes['A<<npctemp>>'] = 'Oleg is a shy, young-looking guy with thick glasses, a slim frame, and very pale skin.'
 		npc_gender['A<<npctemp>>'] = 0
-		
+
 		gs 'npcstaticdefaults', 'defaults'
-		
+
 		$npc_thdick['A<<npctemp>>'] = 'thick'
 		npc_dick['A<<npctemp>>'] = 17
 		npc_sexskill['A<<npctemp>>'] = 1
@@ -2278,7 +2278,7 @@ if temp_current_save_version < 00090003:
 	if sp_pornPos              > 0: yakov_pornPos               = sp_pornPos              &killvar 'sp_pornPos'
 	if sp_hj                   > 0: yakov_hj                    = sp_hj                   &killvar 'sp_hj'
 	if sp_dildo                > 0: yakov_dildo                 = sp_dildo                &killvar'sp_dildo'
-	
+
 	if oleg_analCumInside           > 0: oleg_cumAnal                  = oleg_analCumInside
 	if oleg_analCumInside           > 0: oleg_analCumInside           -= oleg_analCumInsideUnwanted
 	if oleg_analCumInsideUnwanted   > 0: oleg_analCumInsideUnwanted   -= oleg_analCumInside
@@ -2312,7 +2312,7 @@ if temp_current_save_version < 00090003:
 
 	!! New variables to manage a homeless Sveta and travel.
 	gs 'homes_properties_attr'
-	if accessible_property['accessible_home_count'] < 1: 
+	if accessible_property['accessible_home_count'] < 1:
 		gs 'homes_properties', 'set_homeless'
 	else
 		gs 'homes_properties', 'set_home', $home['current']
@@ -2406,7 +2406,7 @@ if temp_current_save_version < 00090200:
 	!!update_clothing
 	!! Do not think we need this anymore. Since pcs_hips should now be basically unchanged.
 	!!gs 'tailor2'
-	
+
 	!! Typo Correction -- By Derryth_Love
 	if katjaQW['knows_masterbation'] > 0:
 		katjaQW['knows_masturbation'] = katjaQW['knows_masterbation']
@@ -2628,7 +2628,7 @@ if temp_current_save_version < 00090203:
 
 	i = 0 & x = 1
 	:rstloop
-	expadj = func('_difficulty','getexpadj')	
+	expadj = func('_difficulty','getexpadj')
 	tl = 0
 	:trtrstloop
 	tltp = 0
@@ -2651,8 +2651,8 @@ if temp_current_save_version < 00090203:
 
 	dynamic "
 		if <<$attskltmp>>_lvl > 0:
-			<<$attskltmp>>_exp -= (expadj * (<<$attskltmp>>_lvl - 1) * (<<$attskltmp>>_lvl - 1) / 180) 
-			<<$attskltmp>>_exp += (expadj *73* (<<$attskltmp>>_lvl - 1) * (<<$attskltmp>>_lvl - 1) / 2730) 
+			<<$attskltmp>>_exp -= (expadj * (<<$attskltmp>>_lvl - 1) * (<<$attskltmp>>_lvl - 1) / 180)
+			<<$attskltmp>>_exp += (expadj *73* (<<$attskltmp>>_lvl - 1) * (<<$attskltmp>>_lvl - 1) / 2730)
 			<<$attskltmp>>_mem = <<$attskltmp>>_exp
 		end
 	"
@@ -2663,8 +2663,8 @@ if temp_current_save_version < 00090203:
 	if x < 3: jump 'rstloop'
 	killvar 'i' & killvar 'x'
 end
-	
-!!------------------------------------!!Version 0.9.3.0!!-----------------------------------------------!!
+
+!!------------------------------------!!Version 0.9.2.5!!-----------------------------------------------!!
 
 if temp_current_save_version < 00090204:
 
@@ -2733,7 +2733,7 @@ if temp_current_save_version < 00090204:
 	if GarTorgItem					> 0:			mc_inventory['trinkets_garage']	= GarTorgItem					& killvar 'GarTorgItem'
 	if TovarL						> 0:			mc_inventory['trinkets_home']	= TovarL						& killvar 'TovarL'
 	if perenGarTov > 0: killvar 'perenGarTov'
-	if mc_inventory['refill_bottle'] > 0:		mc_inventory['refill_bottle_water'] = mc_inventory['refill_bottle']	& mc_inventory['refill_bottle'] = 1
+	if mc_inventory['refill_bottle'] > 0 and mc_inventory['refill_bottle_water'] = 0:		mc_inventory['refill_bottle_water'] = mc_inventory['refill_bottle']	& mc_inventory['refill_bottle'] = 1
 	killvar'kuhdrova'
 	if Oleg['analCumInside']			> 0: Oleg['cumAnal']					 = Oleg['analCumInside']
 	if Oleg['analCumInside']			> 0: Oleg['analCumInside']				-= Oleg['analCumInsideUnwanted']
@@ -2851,8 +2851,8 @@ if temp_current_save_version < 00090204:
 	if LocalRun		> 0:	runnerQW['pav_stage']		= LocalRun		& killvar 'LocalRun'
 	if swinbeg		> 0:	runnerQW['pav_wins1']		= swinbeg		& killvar 'swinbeg'
 	if swinbeggor	> 0:	runnerQW['pav_wins2']		= swinbeggor	& killvar 'swinbeggor'
- 
- 
+
+
 	!! Flash variable migration to singular array (which is killvared on site)
 	if dress_ind_bra			> 0:	killvar 'dress_ind_bra'
 	if dress_ind_tits			> 0:	killvar 'dress_ind_tits'
@@ -3020,7 +3020,7 @@ if temp_current_save_version < 00090204:
 	if cheatHapri				! 0 or $cheatHapri				! '':		cheatVars['always_brushed']		= cheatHapri				& killvar 'cheatHapri'
 	if autohairbrush			! 0 or $autohairbrush			! '':		cheatVars['auto_brush']			= autohairbrush				& killvar 'autohairbrush'
 	if no_cum_leak				! 0 or $no_cum_leak				! '':		cheatVars['no_cum_leak']		= no_cum_leak				& killvar 'no_cum_leak'
-	if cyccustom				! 0 or $cyccustom				! '':		cheatVars['track_period']		= cyccustomkillvar			& killvar 'cyccustom'
+	if cyccustom				! 0 or $cyccustom				! '':		cheatVars['track_period']		= cyccustom					& killvar 'cyccustom'
 	if cheatNomakeup			! 0 or $cheatNomakeup			! '':		cheatVars['makeup_smear']		= cheatNomakeup				& killvar 'cheatNomakeup'
 	if cheatNoSweat				! 0 or $cheatNoSweat			! '':		cheatVars['no_sweat']			= cheatNoSweat				& killvar 'cheatNoSweat'
 	if cheatNoEat				! 0 or $cheatNoEat				! '':		cheatVars['hunger']				= cheatNoEat				& killvar 'cheatNoEat'
@@ -3098,6 +3098,11 @@ if temp_current_save_version < 00090204:
 	if mira_go_blok		! 0:	MiraVars['follow_time']		= mira_go_blok			& killvar 'mira_go_blok'
 	if mira_guest		! 0:	MiraVars['guest']			= 1						& killvar 'mira_guest'
 	if mira_guestday	! 0:	MiraVars['guestday']		= mira_guestday			& killvar 'mira_guestday'
+	if miratalkday		! 0:	MiraVars['talkday']			= miratalkday			& killvar 'miratalkday'
+	if miranudetalk		! 0:	MiraVars['nudetalk']		= miranudetalk			& killvar 'miranudetalk'
+	if mirapickingtalk	! 0:	MiraVars['pickingtalk']		= mirapickingtalk		& killvar 'mirapickingtalk'
+	if mirapimp			! 0:	MiraVars['pimp']			= mirapimp				& killvar 'mirapimp'
+	if Miraswimday		! 0:	MiraVars['swimday']			= Miraswimday			& killvar 'Miraswimday'
 	if meadow > 0:
 		gad_meadow_found = 1
 		MiraVars['meadow'] = meadow -1
@@ -3146,6 +3151,19 @@ if temp_current_save_version < 00090204:
 end
 
 
+!!------------------------------------!!Version 0.9.2.5!!-----------------------------------------------!!
+
+if temp_current_save_version < 00090205:
+	$home_name['gad_swamphouse'] = 'hunters_lodge'
+	$home_name['gad_swamp_yard'] = 'hunters_lodge'
+
+	gs 'shortgs', 'remove_array_element', '$home_name', 'swamphouse'
+	gs 'shortgs', 'remove_array_element', '$home_name', 'swamp_yard'
+
+	!gs 'newspaper', 'cikl'
+end
+
+
 killvar 'temp_current_save_version'
 gs 'saveg'
 

+ 4 - 4
locations/transport_functions.qsrc

@@ -395,7 +395,7 @@ if $ARGS[0] = 'buy_bus_pass':
 		if money >= 100:
 			dynamic 'act ''Buy a daily bus pass (1 day - 100 <b>₽</b>)'':
 				cla
-				money -= 250
+				money -= 100
 				transportVars[''buspass_day''] = daystart + 1
 				act ''Return'': gt ''<<$loc>>'', ''<<$loc_arg>>''
 			end'
@@ -404,7 +404,7 @@ if $ARGS[0] = 'buy_bus_pass':
 		if money >= 500:
 			dynamic 'act ''Buy a weekly bus pass (7 days - 500 <b>₽</b>)'':
 				cla
-				money -= 1500
+				money -= 500
 				transportVars[''buspass_day''] = daystart + 7
 				act ''Return'': gt ''<<$loc>>'', ''<<$loc_arg>>''
 			end'
@@ -413,7 +413,7 @@ if $ARGS[0] = 'buy_bus_pass':
 		if money >= 1500:
 			dynamic 'act ''Buy a monthly bus pass (30 days - 1500 <b>₽</b>)'':
 				cla
-				money -= 5500
+				money -= 1500
 				transportVars[''buspass_day''] = daystart + 30
 				act ''Return'': gt ''<<$loc>>'', ''<<$loc_arg>>''
 			end'
@@ -422,7 +422,7 @@ if $ARGS[0] = 'buy_bus_pass':
 		if money >= 13000:
 			dynamic 'act ''Buy a yearly bus pass (365 days - 13000 <b>₽</b>)'':
 				cla
-				money -= 75000
+				money -= 13000
 				transportVars[''buspass_day''] = daystart + 365
 				act ''Return'': gt ''<<$loc>>'', ''<<$loc_arg>>''
 			end'

+ 13 - 14
locations/uni_dorm.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = 'second_floor':
 	if katjaQW['knows_dorm_room_number'] > 0 and yearstart > 1:
 		act 'Katja''s room':
 			*clr & cla 
-			if locat['katja'] = 24 or locat['katja']  = 31 or locat['katja']  = 35 or locat['katja']  = 51 or locat['katja']  = 52:
+			if locat['katja'] = 24 or locat['katja'] = 31 or locat['katja'] = 35 or locat['katja'] = 51 or locat['katja'] = 52:
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'Katja opens the door. "Hey <<$pcs_nickname>>, come on in!" She stands aside to let you enter before closing the door behind you.'
 
@@ -235,7 +235,7 @@ if $ARGS[0] = 'second_floor':
 				elseif (locat['katja'] = 32 or locat['katja'] = 33) and katjaQW['kitchen_day'] ! daystart:
 					'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 					'You knock on the door, but no one answers. Noticing what time it is, you realise that Katja is likely in the shared kitchen.'
-					act 'Check if Katja is in the kitchen': gt 'katja_pantyquest', 'kitchen',  'from_room'
+					act 'Check if Katja is in the kitchen': gt 'katja_pantyquest', 'kitchen', 'from_room'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 					'You knock on the door, but no one answers. She must be asleep or not home.'
@@ -557,7 +557,7 @@ if $ARGS[0] = 'eighth_floor':
 								act 'Leave': gt 'uni_dorm', 'eighth_floor'
 							else
 								if kendra_male_slave = 0:
-									'You knock on the door, and after a few seconds, Kendra opens it. She is completely naked and wearing a strapon harness around her hips. She plays with the large black dildo attached to it as she looks at you.  "Well if it isn''t my new favorite white slave bitch. I''m kind of busy punishing one of my other slaves right now."'
+									'You knock on the door, and after a few seconds, Kendra opens it. She is completely naked and wearing a strapon harness around her hips. She plays with the large black dildo attached to it as she looks at you. "Well if it isn''t my new favorite white slave bitch. I''m kind of busy punishing one of my other slaves right now."'
 									'She starts to close the door before you can reply, then stops and smiles at you. "You could come in and watch." She holds the door open and stands aside to let you enter. You glance into the room and see a naked college boy kneeling next to the couch. When he notices you, he blushes bright red and moves to cover himself up, but stops with one look from Kendra and instead just lowers his gaze to the floor. You have no doubt what she''s going to do to him, but is it something you want to watch? It could be interesting and you might learn something from her as well. On the other hand, do you want to humiliate him more than he already is?'
 								else
 									'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. She plays with the large black dildo attached to it as she looks at you. "Well if it isn''t my new favorite white slave bitch. I''m punishing one of the boys again. Want to come in and watch again?"'
@@ -754,11 +754,8 @@ if $ARGS[0] = 'tenth_floor':
 end
 
 if $args[0] = 'dorm_lounge':
-	$loc_arg = 'dorm_lounge'
-	$loc = 'uni_dorm'
-    $location_type = 'private'
-	$menu_loc = 'uni_dorm'
-	$menu_arg = 'dorm_lounge'
+	gs 'shortgs', 'setloc', 'uni_dorm', 'dorm_lounge'
+	$location_type = 'private'
 	menu_off = 0
 	minut += 1
 	gs 'stat'
@@ -766,6 +763,8 @@ if $args[0] = 'dorm_lounge':
 	'<center><b>Dorm Lounge</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_lounge.jpg"></center>'
 	'This is the large shared lounge for this floor. It is fairly tidy, with a few little squares. A tv on along a wall creates one side of the square while couches or chairs make up the other three sides, with just enough space between them to allow people to enter or leave the little squares. Several such entertainment squares line the room with a few vending machines.'
+	'A free <a href="exec: newspaperVars[''dbag''] = 0 & gs ''newspaper'', ''start''">newspaper</a> is available.'
+
 	act 'Return to the corridor': gt 'uni_dorm', $uni_dorm['floor']
 	act 'Watch tv': gt 'uni_dorm', 'dorm_lounge_watch_tv'
 	act 'Relax': gt 'uni_dorm', 'dorm_lounge_relax'
@@ -776,7 +775,7 @@ end
 if $args[0] = 'dorm_lounge_watch_tv':
 	$loc_arg = 'dorm_lounge_watch_tv'
 	$loc = 'uni_dorm'
-    $location_type = 'private'
+	$location_type = 'private'
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_lounge_watch_tv'
 	menu_off = 0
@@ -794,7 +793,7 @@ end
 if $args[0] = 'dorm_lounge_relax':
 	$loc_arg = 'dorm_lounge_relax'
 	$loc = 'uni_dorm'
-    $location_type = 'private'
+	$location_type = 'private'
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_lounge_relax'
 	menu_off = 0
@@ -812,7 +811,7 @@ end
 if $args[0] = 'dorm_kitchen':
 	$loc_arg = 'dorm_kitchen'
 	$loc = 'uni_dorm'
-    $location_type = 'private'
+	$location_type = 'private'
 	$locclass = 'kitr'
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_kitchen'
@@ -839,7 +838,7 @@ if $args[0] = 'dorm_kitchen':
 	end
 
 	act 'Return to the corridor': gt 'uni_dorm', $uni_dorm['floor']
-	if  $uni_dorm['floor'] = 'tenth_floor':
+	if $uni_dorm['floor'] = 'tenth_floor':
 		if mc_inventory['food_basic'] > 0:
 			if edahot = 0:
 				$edagot = '<a href="exec:dynamic $edagotd">Cook a meal</a>'
@@ -999,7 +998,7 @@ if $ARGS[0] = 'dorm_room':
 	$loc = 'uni_dorm'
 	$locM_arg = 'dorm_room'
 	$locM = 'uni_dorm'
-    $location_type = 'private'
+	$location_type = 'private'
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_room'
 	menu_off = 0
@@ -1023,7 +1022,7 @@ if $ARGS[0] = 'dorm_room':
 		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
 			$vikatext = '<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you. She is trying to hide a box behind her back.'
 		else
-			$vikatext =  '<a href="exec:gt''Vika''">Vika</a> is lying on her bed.'
+			$vikatext = '<a href="exec:gt''Vika''">Vika</a> is lying on her bed.'
 		end
 		gs 'music_actions', 'not_alone'
 	elseif hour > func('bordel', 'close_hour') and hour < 8:

+ 19 - 8
locations/vladimirQW_loc.qsrc

@@ -1,5 +1,6 @@
 # vladimirQW_loc
 $location_type = 'event_outdoors'
+
 if $ARGS[0] = '':
 	minut += 5
 	menu_off = 1
@@ -89,7 +90,6 @@ if $ARGS[0] = '2':
 
 	act 'Hello, of course I remember':
 		cla
-		vladimirQW['stage'] = 21
 		'"Hey, of course I remember. How could I forget?" You respond.'
 		'"The offer to take you to dinner at the restaurant is still on the table. Would you like to go?" Vladimir asks.'
 
@@ -97,10 +97,13 @@ if $ARGS[0] = '2':
 			cla
 			vladimirQW['stage'] = 20
 			vladimirQW['day'] = daystart
+			gs 'telefon', 'SetCallSchedule', 'A108', "", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6"
+
+			!! Don''t think there is any event on sunday??
 			'You explain that you simply can''t today, as busy as you are.'
 			'"Okay. Then I''ll call you tomorrow at 16:00." Vladimir promises.'
 
-			act 'Hang up':gt $loc, $loc_arg
+			act 'Hang up': gt $loc, $loc_arg
 		end
 
 		act 'I wouldn''t mind':
@@ -108,10 +111,12 @@ if $ARGS[0] = '2':
 			vladimirQW['stage'] = 21
 			vladimirQW['day'] = daystart
 			gs 'telefon', 'SetCallSchedule', 'A108', "", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6"
+
 			'"I would like that," you tell him.'
 			'"Wonderful!" says Vladimir. "Then I''ll meet you at the restaurant at 20:00."'
 			'"I''ll see you then!"'
-			act 'Hang up':gt $loc, $loc_arg
+
+			act 'Hang up': gt $loc, $loc_arg
 		end
 	end
 end
@@ -123,10 +128,12 @@ if $ARGS[0] = '3':
 	act 'Oh, I have a lot to do today, I''m sorry':
 		cla
 		vladimirQW['day'] = daystart
+		gs 'telefon', 'SetCallSchedule', 'A108', "", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6"
+
 		'You explain that you simply can''t today, as busy as you are.'
 		'"Okay. Then I''ll call you another time." Vladimir promises.'
 
-		act 'Hang up':gt $loc, $loc_arg
+		act 'Hang up': gt $loc, $loc_arg
 	end
 
 	act 'I''d like that':
@@ -137,7 +144,7 @@ if $ARGS[0] = '3':
 		'"I''d like that." you tell him.'
 		'You can hear that Vladimir''s pleased over the phone. "Wonderful, my driver will come to pick you up."'
 
-		act 'Hang up':gt $loc, $loc_arg
+		act 'Hang up': gt $loc, $loc_arg
 	end
 end
 
@@ -148,6 +155,8 @@ if $ARGS[0] = '4':
 	act 'Oh, I have a lot to do today, I''m sorry':
 		cla
 		vladimirQW['day'] = daystart
+		gs 'telefon', 'SetCallSchedule', 'A108', "", "0", "gs 'vladimirQW_loc', 'telephone_call'", "vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17 and week = 6"
+
 		'You explain that you simply can''t today, as busy as you are.'
 		'"Okay. Then I''ll call you another day." Vladimir promises.'
 
@@ -173,11 +182,13 @@ if $ARGS[0] = 'telephone_call':
 	gs 'stat'
 	gs 'telefon','phone_ring'
 
-	if vladimirQW['stage'] = 20:
+	if vladimirQW['stage'] = 20 or vladimirQW['stage'] = 21:
 		gt 'vladimirQW_loc', '2'
-	elseif vladimirQW['stage'] = 25 and week = 6:
+	elseif vladimirQW['stage'] = 25 or vladimirQW['stage'] = 30:
 		gt 'vladimirQW_loc', '3'
-	elseif vladimirQW['stage'] = 35 and week = 6:
+	elseif vladimirQW['stage'] = 35 or vladimirQW['stage'] = 40:
+		gt 'vladimirQW_loc', '4'
+	else
 		gt 'vladimirQW_loc', '4'
 	end
 end

+ 9 - 3
locations/vladimirQW_meet.qsrc

@@ -534,10 +534,16 @@ if $ARGS[0] = 'qwmeetdin':
 					InYouHome = 1
 					harakBoy = 0
 					finance = 2
-					money += 5000
-					'You walked with Vladimir into the bedroom. Vladimir sceptically cast his gaze about your humble abode and took out his wallet. "I hope you will not mind if I give you some money?" He handed you five thousand. You took the money you were offered.'
+					if vladimirQW['money_given'] = 0:
+						temp_money += 5000
+					else
+						temp_money += 2000
+					end
+					money += temp_money
+					vladimirQW['money_given'] += temp_money
+					'You walked with Vladimir into the bedroom. Vladimir sceptically cast his gaze about your humble abode and took out his wallet. "I hope you will not mind if I give you some money?" He handed you' + iif(temp_money = 5000, 'five', 'two') + ' thousand. You took the money you were offered.'
 
-					act 'Continue':gt 'BDsex', 'start'
+					act 'Continue': gt 'BDsex', 'start'
 				end
 			elseif husband > 0 and VladimirKnowAboutHusband = 0:
 				act 'I am married':

+ 4 - 1
locations/willpower.qsrc

@@ -22,7 +22,7 @@
 
 !!There are two special cases: 'misc' and 'skill'
 
-!!'skill': Bridging a gap in skill for doing something, for succeeding when not quite meeting the required skill/attribute: gs 'willpower', '<skill>_lvl'
+!!'skill': Bridging a gap in skill for doing something, for succeeding when not quite meeting the required skill/attribute: gs 'willpower', '(skill)_lvl'
 !!Example for 'skill': gs 'willpower', 'skill', 'resist', 'pcs_makupskl_lvl' for a willpower check regarding something with pcs_makupskl_lvl (you can also apply 'easy' or 'hard' difficulty to a skill check)
 
 !!'misc': Use this 'action' if no other 'action' fits the scene. You can set three difficulty levels for this check 'easy', 'medium', 'hard' (Difficulty is only for 'misc' checks)
@@ -928,6 +928,8 @@ if $ARGS[0] = 'difficulty':
 	end
 	if $ARGS[1] = 'force':
 		will_cost = will_cost*(200-pcs_persuas)/100
+	elseif $ARGS[1] = 'resist':
+		will_cost = will_cost*(200-pcs_sprt)/100
 	end
 	if cheatVars['willpower'] = 1: will_cost = 0
 end
@@ -945,6 +947,7 @@ if $ARGS[0] = 'pay':
 		if willpowermax < 150:
 			will_counter += 1
 		end
+		if $ARGS[1] = 'resist': gs 'exp_gain', 'sprt', rand(1,2)
 	end
 	if will_counter >= 20: will_counter -= 20 & willpowermax += 1
 end