Merge branch 'typos_2016-05-22' of http://git.tfgamessite.com/s4n/girllife-ecv

glife-notepad++

@@ -556,7 +556,6 @@
             <File name="locations\saunawork" />
             <File name="locations\saveg" />
             <File name="locations\sbReksHome" />
-            <File name="locations\scale.table" />
             <File name="locations\seeparentsex" />
             <File name="locations\seeporn" />
             <File name="locations\selfplay" />

glife.qproj

@@ -9,7 +9,6 @@
     <Location name="onobjsel"/>
     <Location name="obj_din"/>
     <Location name="Cheatmenu_din"/>
-    <Location name="scale.table"/>
     <Folder name="System">
       <Location name="counter"/>
       <Location name="init_music"/>

locations/din_van

@@ -58,7 +58,7 @@ $shower = {
 		else
 			'You carefully lather soap over your body trying not to miss any spot, and then wash off in the shower.'
 		end
-		act 'Get dressed and get out':mirror_steam = hour & gt $locM, $metkaM
+
 		if vanr_lock = 0 and $loc = 'vanrPar':
 			'Trying to quickly wash up and get back to business, you forget to close the door - not before.'
 			'<br>The idea that the door is open, overtakes you at the end when you wipe with a towel. It would be very embarrassing if the brother or stepfather looked at wrong times.'
@@ -105,7 +105,8 @@ $shower = {
 				act 'Get dressed and get out':mirror_steam = hour & gt $locM, $metkaM
 			end
 		end	
-	
+
+		act 'Get dressed and get out':mirror_steam = hour & gt $locM, $metkaM
 	end
 }
 

locations/event

@@ -985,7 +985,7 @@ if $ARGS[0] = 'lesbi2':
 	minut += 5
 	gs 'stat'
 	'<center><img src="images/picQW/lesbi.jpg"></center>'
-	'"Paris?! You''re cute, but for that you'd need to be absolutely stunning." She laughs and you feel a little embarrassed.'
+	'"Paris?! You''re cute, but for that you''d need to be absolutely stunning." She laughs and you feel a little embarrassed.'
 	'"Heh, thanks, but I was looking for a rich man, good effort".'
 	'"Guys? You can twist them around your little finger, if you want, you little cutie, but have you ever managed to force another girl to obey and do anything you desire?"'
 	if lesbian > 0:'Nuu..no..I haven''t - You mumble. I''ve been with girls, but not like that...'

locations/party_boys

@@ -382,8 +382,7 @@ $party_boys_boobs ={
 	'"You are a straight up sex grenade, and I would like to pull off the pin." one of the guys answers. With these words, they come over to you.'
 	if Rex_Love = 1:'Rex looks unhappily in your direction, his eyes flashing with anger and jealousy.'
 	if Rex_Love = 1: act 'Drag Rex to the restroom':dynamic $party_girls_rex
-	act 'Closer':dynamic $party_boys_
-_yes
+	act 'Closer':dynamic $party_boys_boobs_yes
 	act 'Move away':gt $locM,$metkaM
 }
 

locations/scale.table

@@ -1,35 +0,0 @@
-# scale.table
-!'
-"Scale rendering using the table:"
-
-$func('scale.table', 275, 420) + ' 275 / 420'
-$func('scale.table', 400, 420) + ' 400 / 420'
-$func('scale.table', 420, 420) + ' 420 / 420'
-$func('scale.table', 157, 420) + ' 157 / 420'
-$func('scale.table', 42, 420) + ' 42 / 420'
-$func('scale.table', 0, 420) + ' 0 / 420'
-
-'!
-
-!!-----scale.table------
-args[0] = args[0] & ! the current value of the parameter
-args[1] = args[1] & ! the maximum value
-
-if args[2] = 0:args[2] = 200 & ! Span (tables) pixels. default 350 px
-if $ARGS[3] = "":$ARGS[3] = "FF0000" & ! the color of the filled part of the scale in the format RRGGBB. default - red
-
-$ARGS['table'] = '<table width="<<args[2]>>" border="0" cellspacing="0" cellpadding="0"><tr>'
-args['x'] = (args[0] * 100) / args[1]
-args['empty'] = 100 - args['x']
-
-if args['x'] > 0:
-	$ARGS['table'] += '<td width='<<args['x']>>%' bgcolor='#' + $ARGS[3] + ''>&nbsp;</td>'
-elseif args['empty'] > 0:
-	$ARGS['table'] += '<td width='<<args['empty']>>%' bgcolor='#888888'>&nbsp;</td>'
-end
-
-$ARGS['table'] += '</tr></table>'
-$result = $ARGS['table']
-
---- scale.table ---------------------------------
-

locations/shulgabath

@@ -17,7 +17,7 @@ gs'gopsex'
 if $ARGS[0] = 'start':
 	!Sonia opening event in the bathroom
 	if soniaPS >= 2:
-		if RAND(0,100) >= 90 and sh_sonya_sexev > 2 and sonya_bazar_count > 0 and ev_sonya_count > 0:
+		if RAND(0,100) >= 90 and sh_sonya_sexev > 2 and sonya_bazar_count > 0 and ev_sonya_count > 0 and hour <= 23 and ((week < 6 and hour >= 16) or (week >= 6 and hour >= 10)):
 			gt 'shulgabath', 'ev'
 			exit
 		elseif RAND(0,90) <= 5 and serge_shulgin >= 20 and sexev_sonya_count > 0 and hour <= 23 and ((week < 6 and hour >= 16) or (week >= 6 and hour >= 10)):
@@ -221,12 +221,10 @@ if $ARGS[0] = 'sexev2':
 end
 
 if $ARGS[0] = 'ev':
-	if soniaPS >= 1 and hour <= 23 and ((week < 6 and hour >= 16) or (week >= 6 and hour >= 10)):
-		if RAND(0,100) <= 80:
-			gt 'shulgabath', 'ev1'
-		else
-			gt 'shulgabath', 'ev2'
-		end
+	if RAND(0,100) <= 80:
+		gt 'shulgabath', 'ev1'
+	else
+		gt 'shulgabath', 'ev2'
 	end
 end
 

locations/sister

@@ -586,7 +586,7 @@ if hour >= 7 and hour < 24:
 		act '<B>Move away</B>':gt $loc, $metka
 	end
 
-	if sister >= 80 and sisterknowslut > 0:
+	if sister >= 80 and sisterknowslut > 0 and sisterdialog < 2:
 		act 'Talk about sex':
 			cla
 			cls