Merge branch 'master' of http://git.tfgamessite.com/Anach/girllife-ecv

locations/Cheatmenu_din

@@ -1402,6 +1402,14 @@ $cheatmenu['display'] = {
 		pl'Always show face: <a href="exec:Enable_faceturn = 1 & dynamic $cheatmenu[''display'']">OFF</a>'
 	end
 	nl
+	if disable_LoadSave = 0:
+		pl'Save/Load Buttons: <a href="exec:disable_LoadSave = 2 & dynamic $cheatmenu[''display'']">Currently Image</a>'
+	elseif disable_LoadSave = 2:
+		pl'Save/Load Buttons: <a href="exec:disable_LoadSave = 1 & dynamic $cheatmenu[''display'']">Currently Text</a>'
+	elseif disable_LoadSave = 1:
+		pl'Save/Load Buttons: <a href="exec:disable_LoadSave = 0 & dynamic $cheatmenu[''display'']">Currently Off</a>'
+	end
+	nl
 	if Enable_tablemap = 1:
 		pl'List friends in table: <a href="exec:Enable_tablemap = 0 & dynamic $cheatmenu[''display'']">ON</a>'
 	else

locations/Meadow

@@ -21,8 +21,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	!events trigger before everything
 	if (meadow = 3 or meadow = 6) and MiraLoc = 0 and npc_QW['A60'] = 2 and temper >= 12 and sunWeather = 1:gt 'Meadow','mira_mitka'
 	if (meadow = 3 or meadow = 6) and Mira_no = 0 and MiraLoc = 0 and npc_QW['A60'] = 33 and temper >= 12 and sunWeather = 1:gt 'Meadow','mira_gang'
-	if npc_QW['A63'] > 13 and mirasex = 0 and npc_QW['A60'] < 11:gt 'Meadow','mira_lesb_talk1'
-	if npc_QW['A63'] > 13 and mirasex = 1 and npc_QW['A60'] < 11 and rand(1,5) = 1 and miraday ! daystart:gt 'Meadow','mira_lesb_talk3'
+	if npc_QW['A63'] > 13 and mirasex = 0 and npc_QW['A60'] > 11:gt 'Meadow','mira_lesb_talk1'
+	if npc_QW['A63'] > 13 and mirasex = 1 and npc_QW['A60'] > 11 and rand(1,5) = 1 and miraday ! daystart:gt 'Meadow','mira_lesb_talk3'
 	if npc_QW['A63'] > 13 and mirasex = 1 and npc_QW['A60'] > 11:gt 'Meadow','mira_lesb_talk2'
 	if mirasex = 2 and rand(1,5) > 3 and miraday ! daystart and npc_rel['A60'] >= 15:gt 'Meadow','mira_lesb'
 	!125e
@@ -120,7 +120,7 @@ if $ARGS[0] = 'Mira':
 				'You agree, intrigued.  You ask Mira what see has in mind?  After a few seconds, she tells you she saw her father masturbateing that morning.  She doesn''t think her father has been with a woman since her mother passed away.  Mira is sorry for her father''s lose, hers too for that matter, but she has an overwhelming desire to help him.  She can''t just do nothing.'
 				'You know Mira loves her father very much, you don''t know what you can do to help.  You don''t want or need this drama in your life.  First, you find out about migic being real.  School is rapid approaching.  You tell her that there is nothing you can do to help with her father''s depression.  Mira''s pouts and stands with her arms crossed. Her whole demeaner is one of injured innocence.'
 				'A few minutes later, to your surprise, you feel an unexpectedly nice itch and a wicked heat rises up in your crotch of thoughts of his sucking Mira''s father.'
-				act 'Maybe a little followup want hurt': gt 'Meadow', 'start'
+				act 'Maybe a little followup wont hurt': gt 'Meadow', 'start'
 			end
 			act 'Not interested': gt 'Meadow', 'start'
 		end

locations/Miroslava

@@ -212,10 +212,22 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			gt 'Meadow','lesb_talk_mira2'
 		end
 	else
-		!if mirasex = 1 and npc_QW['A63'] < 13 and miralick > 0 and MiraLoc = 2 and pcs_horny >= 40:act 'Ordered to lick':gt 'Meadow','lesb_talk_mira3' - Not certain this belongs here, looks like it belongs in Meadow
-		!if mirasex = 2 and MiraLoc = 2 and pcs_horny >= 40 and npc_rel['A60'] >= 15:act 'Stick':gt 'Meadow','lesb_mira' - not certain this belongs here, looks like it belongs in Meadow
+		if mirasex = 1 and npc_QW['A63'] < 13 and miralick > 0 and MiraLoc = 2 and pcs_horny >= 40:
+			
+			act 'Ordered to lick':
+				gt 'Meadow','lesb_talk_mira3'
+			end
+		end
+		if mirasex = 2 and MiraLoc = 2 and pcs_horny >= 40 and npc_rel['A60'] >= 15:
+		
+			act 'Stick':
+				gt 'Meadow','lesb_mira'
+			end
+		end
+		! not certain this belongs here, looks like it belongs in Meadow
 
 		act 'Chat':gt 'Miroslava', 'miratalk'
+
 		if month >= 4 and month <= 10 and sunWeather = 1:
 
 			act 'Offer to walk together':

locations/foto_events

@@ -82,6 +82,7 @@ if $ARGS[0] = 'list':
 !!	if specialjob7 >= 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
 !!		if specialjob8 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
 !!		if specialjob9 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
+end
 
 if $ARGS[0] = 'high_fasion':
 	cla & *clr
@@ -186,6 +187,7 @@ if $ARGS[0] = 'fine_art':
 										'	"Ugh," she rolls her eyes and waves her hand dismissively. "Vine, vine. I vill not take your virginity. Ve are vasting too much time. But Alexhandar, maintain your erection. I cannot have a flaccid penis in a piece that iz zat iz zupposed to exude <i>lust</i> and <i>eroticism!</i>"'
 										'	You breathe out a sigh of relief and resume the pose she wants, waiting for further instruction.'
 										act'. . .':gt'foto_events','fine_art2'
+									end
 									act'Take the deal':
 										cla & *clr
 										fine_art_deal = 1
@@ -317,7 +319,7 @@ if $ARGS[0] = 'fine_art2':
 			'	Alexander pushes himself inside you. You exhale slowly, relaxing to accommodate the enormous 32 cm cock sliding your <<$pcdesc_pussy>> pussy. You give yourself a moment to adjust to his sizable length and girth before settling back into the exact posture you were instructed to hold. The woman clicks a button and cameras flash all around you and the red line of scanners begin to slowly ascend your body from bottom to top. As the scanner moves, you see her sit down in front of an easel from the corner of your eye and begin to draw.'
 			*nl
 			'	90 minutes pass before she is finished sketching, your pussy snuggly filled by Alexander''s cock for the duration. When she is finished, she compares her sketch to a nearby computer screen, still trying to decide which form she wants her art to take. Clapping her hands, she calls an end to the shoot and you are allowed to break from your position, stretching your stiff muscles and sliding off of Alexander''s cock. Its absence leaves you feeling quite empty.'
-		elseif pcs_vag > 15 and <= 25:
+		elseif pcs_vag > 15 and pcs_vag <= 25:
 			'	Alexander pushes himself inside you. You relax, letting the enormous 32 cm cock slide into your <<$pcdesc_pussy>> pussy with relative ease. You check your position, making sure you can feel his balls against your clit and that he''s all the way inside before settling back into the exact posture you were instructed to hold. The woman clicks a button and cameras flash all around you and the red line of scanners begin to slowly ascend your body from bottom to top. As the scanner moves, you see her sit down in front of an easel from the corner of your eye and begin to draw.'
 			*nl
 			'	90 minutes pass before she is finished sketching, your pussy comfortably filled by Alexander''s cock for the duration. When she is finished, she compares her sketch to a nearby computer screen, still trying to decide which form she wants her art to take. Clapping her hands, she calls an end to the shoot and you are allowed to break from your position, stretching your stiff muscles and sliding off of Alexander''s cock. Its absence leaves you feeling quite empty.'
@@ -330,7 +332,7 @@ if $ARGS[0] = 'fine_art2':
 		*nl
 		if pcs_vag <= 10:'	You watch them leave, the money from the job in hand, feeling good about the day''s work. Though your pussy is a bit sore.'
 		if pcs_vag > 10 and pcs_vag <= 15:'	You watch them leave, the money from the job in hand, feeling good about the day''s work. Though your pussy does feel a bit stretched now.'
-		if pcs_vag > 15 and <= 25:'	You watch them leave, the money from the job in hand, feeling good about the day''s work. Though your pussy does feel a bit empty now.'
+		if pcs_vag > 15 and pcs_vag <= 25:'	You watch them leave, the money from the job in hand, feeling good about the day''s work. Though your pussy does feel a bit empty now.'
 		if pcs_vag > 25:'	You watch them leave, the money from the job in hand, feeling good about the day''s work. Though your pussy does feel a bit empty now. It''s not often you get filled by such a magnificent cock.'
 		act'Leave':
 			fine_art_deal = 0

locations/gadriver

@@ -174,8 +174,10 @@ if $ARGS[0] = 'Gadbitch':
 	if sunWeather = 1 and MiraLoc = 1:
 		if RAND(0,10) < 5:
 			'<a href="exec:sun = 1 & gt ''Gadriver'', ''Mira'' ">Mira</a> is laying on the beach sunbathing.'
+			if npc_rel['A60'] < 15:npc_rel['A60'] += 1
 		else
 			'<a href="exec:sun = 0 & gt ''Gadriver'', ''Mira'' ">Mira</a> is in the river splashing water around and having fun.'
+			if npc_rel['A60'] < 15:npc_rel['A60'] += 1
 		end
 	end
 
@@ -684,6 +686,7 @@ if $ARGS[0] = 'Mira':
 				'You decide to strike up some conversation with Mira, "So what is there to do here in the village?"'
 				'"Its a lot quicker than town, we do have a shop, this lovely beach and there are some beautiful walks. Other than that there''s only the gopnik guys but they are just after one thing and I don''t want that, plus dad would kill me."'
 			elseif npc_QW['A60'] < 7 and sunWeather = 1:
+				if npc_rel['A60'] < 15:npc_rel['A60'] += 1
 				'You and Mira are chatting about trivial things.'
 			end
 		end

locations/pavSharedApt

@@ -872,17 +872,7 @@ if $ARGS[0] = 'pcsRoom':
 
 	if komp = 1:'Your <a href="exec:gorodokKomp = 1 & GT ''Komp'',''start''">laptop</a> is on your desk.'
 
-	if pcs_horny >= 50:
-		act 'Masturbate':gt 'selfplay', 'start'
-	end
-
-	if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
-		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
-	elseif tabletki > 0:
-		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers.'
-	elseif prezik + prezikcount + preziksabo > 0:
-		'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
-	end
+	act 'Leave your room':gt 'pavSharedApt', 'start'
 
 	if student > 0 and kursovik < 100:
 		act 'Do coursework (1:00)':
@@ -901,7 +891,11 @@ if $ARGS[0] = 'pcsRoom':
 		end
 	end
 
-	if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry with you is 30.'
+	if pcs_horny >= 50:
+		act 'Masturbate':gt 'selfplay', 'start'
+	end
+	
+	gs 'events', 'read_porn'
 
 	if vcard > 0:
 		act 'Look at your deck of vintage porn cards':card_deck = 0 & gt 'card'
@@ -931,8 +925,6 @@ if $ARGS[0] = 'pcsRoom':
 		end
 	end
 
-	gs 'exercise', 'start'
-
 	if gobelen>0:'You have <<gobelen>> completed tapestries.'
 	if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> lessons.'
 	if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
@@ -968,9 +960,20 @@ if $ARGS[0] = 'pcsRoom':
 			end
 		end
 	end
+
+	if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
+		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
+	elseif tabletki > 0:
+		'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers.'
+	elseif prezik + prezikcount + preziksabo > 0:
+		'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
+	end
+
+	if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry with you is 30.'
+
+	gs 'exercise', 'start'
 	dynamic $wearpan
 	dynamic $removepan
-	gs 'events', 'read_porn'
 	!gs 'subkid'
 	if pcs_sleep <= 80:
 		if succubusQW = 2:
@@ -996,8 +999,6 @@ if $ARGS[0] = 'pcsRoom':
 			end
 		end
 	end
-
-	act 'Leave your room':gt 'pavSharedApt', 'start'
 end
 
 if $ARGS[0] = 'ndRoom':

locations/pavShared_sp

@@ -798,7 +798,7 @@ if $ARGS[0] = 'spSexAnal':
 		end
 		'<<$sp_name>> takes you by the waist, delicately kissing you.'
 		'<font color=#<<$sp_font>>>"Do you want to make love in a certain position, or should I choose?"</font>'
-		!if sp_pornPos = 0:hisPos = rand(1, 3)
+		if sp_pornPos = 0:hisPos = rand(1, 3)
 		!if sp_pornPos = 1:hisPos = rand(1, 4)
 		!if sp_pornPos = 2:hisPos = rand(1, 5)
 

locations/stat_display

@@ -1305,7 +1305,11 @@ if boletus + bilberry > 0:
 	if bilberry > 0:$stat_msg +='Berries: <b><<bilberry>></b> kg. '
 end
 
-$stat_msg += '<br><br><center><a href="exec:savegame ''quicksave.sav'' && pl''Quicksave Done''"><img height = 35 src="images/system/icon/stat_Qsave.png"></a>  <a href="exec:savegame"><img height = 35 src="images/system/icon/stat_save.png"></a>  <a href="exec:opengame"><img height = 35 src="images/system/icon/stat_load.png"></a>  <a href="exec:if input(''Input Anything to confirm Quick Load'') ! null: opengame ''quicksave.sav''"><img height = 35 src="images/system/icon/stat_Qload.png"></a></center>'
+if disable_LoadSave = 0:
+	$stat_msg += '<br><br><center><a href="exec:savegame ''quicksave.sav'' && pl''Quicksave Done''"><img height = 35 src="images/system/icon/stat_Qsave.png"></a>  <a href="exec:savegame"><img height = 35 src="images/system/icon/stat_save.png"></a>  <a href="exec:opengame"><img height = 35 src="images/system/icon/stat_load.png"></a>  <a href="exec:if input(''Input Anything to confirm Quick Load'') ! null: opengame ''quicksave.sav''"><img height = 35 src="images/system/icon/stat_Qload.png"></a></center>'
+elseif disable_LoadSave = 2:
+	$stat_msg += '<br><br><a href="exec:savegame ''quicksave.sav'' && pl''Quicksave Done''">Quick Save</a>  <a href="exec:savegame">Save</a>  <a href="exec:opengame">Load</a>  <a href="exec:if input(''Input Anything to confirm Quick Load'') ! null: opengame ''quicksave.sav''">Quick Load</a>'
+end
 
 $stat_android +=  ' <a href="exec:savegame ''quicksave.sav'' && pl''Quicksave Done''">Q.S</a>  <a href="exec:if input(''Input Anything to confirm Quick Load'') ! null: opengame ''quicksave.sav''">Q.L</a>'