Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

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'

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?"'

locations/gad_beach.qsrc

@@ -504,13 +504,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

locations/gad_forest.qsrc

@@ -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

locations/gad_forest_events.qsrc

@@ -57,8 +57,8 @@ 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'
@@ -78,8 +78,8 @@ 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'
@@ -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

locations/gad_gpyard.qsrc

@@ -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

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'
 

locations/mirafather.qsrc

@@ -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.'

locations/miroslava.qsrc

@@ -134,11 +134,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

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

locations/saveupdater.qsrc

@@ -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

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'