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

locations/Cheatmenu_din

@@ -1,7 +1,7 @@
 # Cheatmenu_din
 !All the active dynamics for the cheat menu are here
 
-$din_cheat_statusbars = {
+$cheatmenu[statusbars] = {
 	if cheatStatusBars = 0:
 		cheatStatusBars = 1
 		dynamic $din_cheat_menu_view
@@ -12,7 +12,7 @@ $din_cheat_statusbars = {
 	end
 }
 
-$din_cheat_work = {
+$cheatmenu[work] = {
 	if cheatWork = 0:
 		cheatWork = 1
 		dynamic $din_cheat_menu_permanent
@@ -23,7 +23,7 @@ $din_cheat_work = {
 	end
 }
 
-$din_cheat_hapri = {
+$cheatmenu[hair] = {
 	if cheatHapri = 0:
 		cheatHapri = 1
 		dynamic $din_cheat_menu_permanent
@@ -34,7 +34,7 @@ $din_cheat_hapri = {
 	end
 }
 
-$din_cheat_klisma = {
+$cheatmenu[enema] = {
 	if cheatKlisma = 0:
 		cheatKlisma = 1
 		dynamic $din_cheat_menu_permanent
@@ -45,7 +45,7 @@ $din_cheat_klisma = {
 	end
 }
 
-$din_cheat_nomakeup = {
+$cheatmenu[nomakeup] = {
 	if cheatNomakeup = 0:
 		cheatNomakeup = 1
 		dynamic $din_cheat_menu_permanent
@@ -201,10 +201,10 @@ $din_cheat_menu_permanent = {
 
 	pl'<center><a href="exec:dynamic $objcheat_menu"><b>Cheat menu</b></a></center>'
 	pl''
-	pl'<a href="exec:dynamic $din_cheat_work">Disable the requirement of labor</a>: <<$cheatWork>>'
-	pl'<a href="exec:dynamic $din_cheat_hapri">Always combed</a>: <<$cheatHapri>>'
-	pl'<a href="exec:dynamic $din_cheat_klisma">Always do an enema</a>: <<$cheatKlisma>>'
-	pl'<a href="exec:dynamic $din_cheat_nomakeup">Cosmetics never smeared</a>: <<$cheatNomakeup>>'
+	pl'<a href="exec:dynamic $cheatmenu[work]">Disable the requirement of labor</a>: <<$cheatWork>>'
+	pl'<a href="exec:dynamic $cheatmenu[hair]">Always combed</a>: <<$cheatHapri>>'
+	pl'<a href="exec:dynamic $cheatmenu[enema]">Always do an enema</a>: <<$cheatKlisma>>'
+	pl'<a href="exec:dynamic $cheatmenu[nomakeup]">Cosmetics never smeared</a>: <<$cheatNomakeup>>'
 	pl'<a href="exec:dynamic $din_cheat_Nosweat">Never sweat</a>: <<$cheatNosweat>>'
 	pl'<a href="exec:dynamic $din_cheat_NoEat">Never eat or drink</a>: <<$cheatNoEat>>'
 	pl'<a href="exec:dynamic $din_cheat_NoSleep">Never sleep</a>: <<$cheatNoSleep>>'
@@ -702,11 +702,11 @@ $din_cheat_menu_time = {
 	pl $SS
 	$SS=''
 	pl'Minutes:'
-	if minut>0:$SS='<a href="exec:minut -= 15 & dynamic $din_cheat_menu_time">-15</a> ' else $SS='    '
-	if minut>0:$SS='<a href="exec:minut -= 1 & dynamic $din_cheat_menu_time">-1</a> ' else $SS='    '
-	if minut!0:$SS=$SS+'<a href="exec:minut = 0 & dynamic $din_cheat_menu_time">0</a> ' else $SS=$SS+'   '
-	if minut<59:$SS=$SS+'<a href="exec:minut += 1 & dynamic $din_cheat_menu_time">+1</a>'
-	if minut<59:$SS=$SS+'<a href="exec:minut += 15 & dynamic $din_cheat_menu_time">+15</a>'
+	if minut>14:$SS+='<a href="exec:minut -= 15 & dynamic $din_cheat_menu_time">-15</a> ' else $SS='    '
+	if minut>0:$SS+='<a href="exec:minut -= 1 & dynamic $din_cheat_menu_time">-1</a> ' else $SS='    '
+	if minut!0:$SS+='<a href="exec:minut = 0 & dynamic $din_cheat_menu_time">0</a> ' else $SS=$SS+'   '
+	if minut<59:$SS+='<a href="exec:minut += 1 & dynamic $din_cheat_menu_time">+1</a> '
+	if minut<59:$SS+='<a href="exec:minut += 15 & dynamic $din_cheat_menu_time">+15</a>'
 	pl $SS
 }
 
@@ -957,7 +957,7 @@ $din_cheat_menu_view = {
 	end
 	if cheatStatusBars = 0:$cheatStatusBars = 'OFF'
 	if cheatStatusBars = 1:$cheatStatusBars = '<b>ON</b>'
-	pl'<a href="exec:dynamic $din_cheat_statusbars">Switch to smaller status bars</a>: <<$cheatStatusBars>>'
+	pl'<a href="exec:dynamic $cheatmenu[statusbars]">Switch to smaller status bars</a>: <<$cheatStatusBars>>'
 }
 
 $objcheat_menu = {

locations/Snpc

@@ -292,7 +292,7 @@ if numnpc = 14 and rand(1,5) = 1 and Katja_tanga_end=1  and horny > 60 :
 					'But Kate recovered, said:'
 					'- That I without problems, - and began to repeat your route, hot kissing couple.'
 					'And you, kissed the last one in your class, turned around to see, Katya how to cope with their kisses, but then the bell rang, you all rushed to class.'
-					act 'Go to afternoon lessons': dynamic $din_sekondparturok
+					act 'Go to afternoon lessons': gt 'gschool2', 'afternoon'
 				end	
 			end
 			
@@ -323,7 +323,7 @@ if numnpc = 14 and rand(1,5) = 1 and Katja_tanga_end=1  and horny > 60 :
 							'You only snorted at Katja`s words, although it should be noted, butt is it really good.'
 						end
 
-						act 'Go to afternoon lessons': dynamic $din_sekondparturok
+						act 'Go to afternoon lessons': gt 'gschool2', 'afternoon'
 					end
 				end	
 			end

locations/gskver

@@ -87,53 +87,7 @@ if rexPark = 1 and rexParkDay = daystart and hour >= 16 and hour < 18:
 	act 'Go and see Rex':gt 'reks', 'skver'
 end
 
-if hour > 6 and hour < 23 and month >= 5 and month <= 10:
-	act 'Sit down on the bench and rest':
-		cla
-       	*clr
-       	gs 'outdoors'
-       	gs'stat'
-        '<center><img src="images/lmps/сидит.jpg"></center>'
-		waiting = input ("How long would you like to rest? (No more than 120 minutes)")
-		if alco > 0:
-        	act 'Sleep on the park bench':
-                cla
-                *clr
-			health = health + 5
-			hapri = 0
-			InSleep = 1
-			cloth_vid = 0
-			if tanga = 1:tanga = 0
-			gs 'outdoors'
-                '<center><img src="images/lmps/спитл.jpg"></center>'
-        
-                if mop > 1:mop = 0 & vidageday = vidageday - 1 & 'Your make-up ended up getting smeared all across your face. You realize this is probably very bad for your skin, you really shouldn''t sleep before cleaning your face.'
-        
-                'You''re feeling tired, and decide to try and get some sleep on the park bench. To your surprise no one disturbs you, and you wake up feeling rested.'
-                ''
-		        act 'Get up':
-				cla
-				InSleep = 0
-				minut += 480
-				son = 30
-				gt'gskver'
-			end
-        	end
-	end		
-
-		if waiting <= 0 or waiting > 120:
-			minut = minut + 15
-		elseif waiting > 0 and waiting <= 120:
-			minut = minut + waiting
-			manna = manna + 10
-			willpower = willpower + 10
-			if son < 30:son += 2
-		end
-
-		act 'Check the time and get up from the bench':gt curloc
-	end	
-
-end
+act 'Sit down on the bench': ParkBench = 0 & gt'placer_sex','sleeping_parc_alco'
 
 act 'Go for a walk (0:15)':
 	cla

locations/katja_sex

@@ -194,24 +194,32 @@ if $ARGS[0] = 'prohorov_sex':
 										'- Girls it was great.'
 										act 'Go to afternoon lessons': gt 'gschool2', 'afternoon'
 									end
+								else
+									'You wanted, to add something to this jerk, but then suddenly the bell rang. You some-how, clean yourself up, ran to class.'
+									'The campaign overtook Ivan, turned around and shouted: '
+									'- Girls it was great.'
+									act 'Go to afternoon lessons': gt 'gschool2', 'afternoon'
 								end
-								'You wanted, to add something to this jerk, but then suddenly the bell rang. You some-how, clean yourself up, ran to class.'
-								'The campaign overtook Ivan, turned around and shouted: '
-								'- Girls it was great.'
-								act 'Go to afternoon lessons': gt 'gschool2', 'afternoon'
 							end
+						else
+							'Only you are going to continue the fun, as then suddenly, the bell rang. You some-how, clean yourself up, ran to class.'
+							'The campaign overtook Ivan, turned around and shouted:' 
+							'- Girls it was great.'
+							act 'Go to afternoon lessons': gt 'gschool2', 'afternoon'
 						end
-						'Only you are going to continue the fun, as then suddenly, the bell rang. You some-how, clean yourself up, ran to class.'
-						'The campaign overtook Ivan, turned around and shouted:' 
-						'- Girls it was great.'
-						act 'Go to afternoon lessons': gt 'gschool2', 'afternoon'
 					end
+				else
+					'Only you are going to continue the fun, as then suddenly, the bell rang. You some-how, clean yourself up, ran to class.'
+					'The campaign overtook Ivan, turned around and shouted:' 
+					'- Girls it was great.'
+					act 'Go to afternoon lessons': gt 'gschool2', 'afternoon'
 				end
-				'Only you are going to continue the fun, as then suddenly, the bell rang. You some-how, clean yourself up, ran to class.'
-				'The campaign overtook Ivan, turned around and shouted:' 
-				'- Girls it was great.'
-				act 'Go to afternoon lessons': gt 'gschool2', 'afternoon'
 			end
+		else
+			'Only you are going to continue the fun, as then suddenly, the bell rang. You some-how, clean yourself up, ran to class.'
+			'The campaign overtook Ivan, turned around and shouted:' 
+			'- Girls it was great.'
+			act 'Go to afternoon lessons': gt 'gschool2', 'afternoon'
 		end
 	end
 end		

locations/loadg

@@ -41,20 +41,22 @@ if menoage = 0:
 	end
 end
 
-monthsEnd[0] = 31
-monthsEnd[1] = 31
-monthsEnd[2] = 28
-monthsEnd[3] = 31
-monthsEnd[4] = 30
-monthsEnd[5] = 31
-monthsEnd[6] = 30
-monthsEnd[7] = 31
-monthsEnd[8] = 31
-monthsEnd[9] = 30
-monthsEnd[10] = 31
-monthsEnd[11] = 30
-monthsEnd[12] = 31
-monthsEnd[13] = 31
+monthsend[1] = 31
+if year = 2016 or year = 2020 or year = 2024 or year = 2028 or year = 2032:
+	monthsend[2] = 29
+else
+	monthsend[2] = 28
+end
+monthsend[3] = 31
+monthsend[4] = 30
+monthsend[5] = 31
+monthsend[6] = 30
+monthsend[7] = 31
+monthsend[8] = 31
+monthsend[9] = 30
+monthsend[10] = 31
+monthsend[11] = 30
+monthsend[12] = 31
 
 !MJ: Months names.
 $monthName[1] = 'January'

locations/park

@@ -70,23 +70,7 @@ if $ARGS[0] = 'start':
 		act 'Have some food in the cafe (0:30)': gt 'ParkKafe', 'food'
 	end
 	
-	act 'Sit on a bench':
-		cla
-		*clr
-		'<center><img src="images/lmps/сидит.jpg"></center>'
-		waiting = input ("How many minutes to sit down? (Not more 120 minutes)")
-
-		if waiting <= 0 or waiting > 120:
-			minut = minut + 15
-		elseif waiting > 0 and waiting <= 120:
-			minut += waiting
-			manna += 10
-			willpower += 10
-			if son < 95 and waiting >= 60:son += 6
-		end
-		
-		act 'Consult a watch':gt'park','start'
-	end
+	act 'Sit on a bench': ParkBench = 1 & gt'placer_sex','sleeping_parc_alco'
 
 	if pusher = 1 and hour >= 6 and hour <= 21:
 		'There''s a drug dealer casually sitting on one of the benches. He''s trying not to be too suspicious.'

locations/placer_sex

@@ -1640,6 +1640,94 @@ if $args[0] = 'rape_end':
 end
 
 if $ARGS[0] = 'sleeping_parc_alco':
+	if alko > 0:
+		if alko > 3 and vnesh >= 120 : gt'placer_sex','sleeping_parc_alco_rape'
+		act 'Sleep on a bench':
+			cla & *clr
+			health += 5
+			hapri = 0
+			InSleep = 1
+			minut += 480
+			son += 80
+			gs 'stat'
+			InSleep = 0            
+			gs 'outdoors'
+			!Hoping these were not that wrong. by illume
+			if $clothingworntype = 'school':
+				'<center><img src="images/gevent/sleeping_park_form.jpg"></center>'
+			elseif PCloSkirt > 0:
+				'<center><img src="images/gevent/sleeping_park_dress.jpg"></center>'
+			elseif PCloPants > 3: 
+				'<center><img src="images/gevent/sleeping_park_shorts.jpg"></center>'
+			else
+				'<center><img src="images/gevent/sleeping_park_jeans.jpg"></center>'
+			end               
+
+			if mop > 1:mop = 0 & vidageday = vidageday - 1 & 'Makeup smeared in the face, you think, that is harmful to the appearance of sleep with makeup, skin ages faster from this.'
+
+			'You''re feeling tired, and decide to try and get some sleep on the park bench. To your surprise no one disturbs you, and you wake up feeling rested.'
+			''
+
+			act 'Wake up':
+				cla & *clr
+				!Hoping these were not that wrong. by illume
+				if $clothingworntype = 'school':
+					'<center><img src="images/gevent/sleeping_park1.jpg"></center>'
+					if tanga = 1:
+						tanga = 0
+						'You sweetly smiled, spreading his arms and legs, and felt, that panties, where-so share, clenching his legs frightened you frightened thought: «I hope whoever took them panties only and limited, and did not take advantage of your condition and not made of something better».'
+					else
+						'You sweetly smiled, spreading his arms and legs, flashing her bare pussy for the entire Park.'
+					end
+				elseif CloSkirtShortness > 0:
+					'<center><img src="images/gevent/sleeping_park.jpg"></center>'
+					if tanga = 1:
+						tanga = 0
+						'You sweetly smiled, spreading his arms and legs, and felt, that panties, where-so share, clenching his legs frightened you frightened thought: «I hope whoever took them panties only and limited, and did not take advantage of your condition and not made of something better».'
+					else
+						'You sweetly smiled, spreading his arms and legs, flashing her bare pussy for the entire Park.'
+					end
+				else
+					'<center><img src="images/gevent/sleeping_park2.jpg"></center>'
+					'You sweetly smiled.'
+				end   
+               
+				act 'Up':
+					if ParkBench = 1:
+						gt 'park', 'start'
+					else
+						gt 'gskver'
+					end
+				end
+			end
+		end
+	else
+		cla
+		*clr
+		'<center><img src="images/lmps/сидит.jpg"></center>'
+		waiting = input ("How many minutes to sit down? (Not more 120 minutes)")
+
+		if waiting <= 0 or waiting > 120:
+			minut = minut + 15
+		elseif waiting > 0 and waiting <= 120:
+			minut += waiting
+			manna += 10
+			willpower += 10
+			if son < 95 and waiting >= 60:son += 6
+		end
+
+		act 'Consult a watch':
+			if ParkBench = 1:
+				gt 'park', 'start'
+			else
+				gt 'gskver'
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'sleeping_parc_alco_rape':
 	cla & *clr
     '<center><img src="images/gevent/sleeping_parc_alco/sleeping_parc_alco1_1.jpg"></center>'
 	'Maybe it''s the alcohol, or maybe you just haven''t slept well... but you feel tired. You sit down on the park bench, wanting to rest your exhausted body for a while. Slowly, your eyes begin to close. Realizing that it could be dangerous to fall asleep in a public place like the park, you do your best to stay awake. The alcohol in your blood makes it impossible though, and you slowly feel your consciousness drift away.'
@@ -1755,7 +1843,7 @@ if $ARGS[0] = 'sleeping_parc_alco':
 														spafinloc = 12 & gs 'cum_manage'
 														swallow += 1
 														Act 'Leave the apartment': 
-															if StoryLine = 1:
+															if ParkBench = 1:
 																gt'pavResidential'
 															else
 																gt'street'
@@ -1804,7 +1892,7 @@ if $ARGS[0] = 'sleeping_parc_alco':
 													willpower += 25
 													if dick - vagina > 8: vgape = 2
 													Act 'Leave the apartment': 
-														if StoryLine = 1:
+														ParkBench = 1:
 															gt'pavResidential'
 														else
 															gt'street'

locations/start

@@ -180,20 +180,22 @@ ashrink = 1
 ashrinkdays = 3
 
 !MJ: The day the month ends. Including possible rollover months 0 and 13.
-monthEnd[0] = 31
-monthEnd[1] = 31
-monthEnd[2] = 28
-monthEnd[3] = 31
-monthEnd[4] = 30
-monthEnd[5] = 31
-monthEnd[6] = 30
-monthEnd[7] = 31
-monthEnd[8] = 31
-monthEnd[9] = 30
-monthEnd[10] = 31
-monthEnd[11] = 30
-monthEnd[12] = 31
-monthEnd[13] = 31
+monthsend[1] = 31
+if year = 2016 or year = 2020 or year = 2024 or year = 2028 or year = 2032:
+	monthsend[2] = 29
+else
+	monthsend[2] = 28
+end
+monthsend[3] = 31
+monthsend[4] = 30
+monthsend[5] = 31
+monthsend[6] = 30
+monthsend[7] = 31
+monthsend[8] = 31
+monthsend[9] = 30
+monthsend[10] = 31
+monthsend[11] = 30
+monthsend[12] = 31
 
 !MJ: Months names.
 $monthName[1] = 'January'