Merge branch 'master' of https://git.catrenelle.com/julzor/glife

locations/MartinTalk.qsrc

@@ -130,7 +130,7 @@ if $ARGS[0] = '':
 		'"Excuse me?"' 
 		'You ' + iif($body='skinny','would call yourself skinny, too, but','see yourself as <<$body>> rather than skinny, so') + ' you don''t really see why he would bring this up.'
 		*nl
-		'"Are you eating right, <<pcs_firstname>>?" He inquires, completely ignoring your visible confusion.'
+		'"Are you eating right, <<$pcs_firstname>>?" He inquires, completely ignoring your visible confusion.'
 		'"Uh... I guess. Wait, you didn''t, by any chance, talk to my mother, did you?"'
 		'"Hmm? Oh, no no no, mi amor, but I''m sure she''d agree that you could use a good meal every now and then - good meat, not the filth they sell you everywhere."'
 		*nl
@@ -193,7 +193,7 @@ if $ARGS[0] = '':
 		*nl
 		'He recoils in mock-shock. "That you would even <b>suggest</b> that! The insolence!"'
 		'You grin at his antics, but your question is still to the point: "Do you do anything besides working out?"'
-		'"This and that," he replies, now more serious. "I don''t know what you want to hear, <<pcs_firstname>>. I don''t run a drug ring or strip club on the side, if that''s what you want to know. Days pass pretty quickly, even when all you do is sleep, work out and go for a walk every now and then."'
+		'"This and that," he replies, now more serious. "I don''t know what you want to hear, <<$pcs_firstname>>. I don''t run a drug ring or strip club on the side, if that''s what you want to know. Days pass pretty quickly, even when all you do is sleep, work out and go for a walk every now and then."'
 		'"You should share that thought at the next book club meeting," you comment dryly.'
 		'"I''d rather not. It would only disturb the other housewives," Martin retorts.'
 		*nl

locations/mother.qsrc

@@ -252,8 +252,8 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if mother_go = 0 or (week < 6 and hour >= 16 and hour < 21) or (week >= 6 and hour >= 7 and hour < 21):
-			if (week < 6 and hour >= 17 and hour < 21) or (week >= 6 and hour >= 7 and hour < 21 and hour ! 16):
+		if mother_go = 0 or ((week < 6 and (hour >= 17 and hour < 21) or (hour >= 7 and hour < 8)) or (week >= 6 and hour >= 7 and hour < 21)):
+			if (week < 6 and (hour >= 17 and hour < 21) or (hour >= 7 and hour < 8)) or (week >= 6 and hour >= 7 and hour < 21 and hour ! 16):
 				! schedule copied from #family - should be identical.
 				act 'Chat':
 					*clr & cla

locations/placer_gskver.qsrc

@@ -86,12 +86,14 @@ gs 'placer_man'
 
 if month=3 or month=4 or month=5:
 	if hour>=6 and hour<=17:
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.spring.jpg"></center>'
 		'The main square of Pavlovsk Park. Spring has come, melting the worst of the snow. The trees are sprouting new leaves.'
 		'There are puddles on the ground everywhere, all remains from the melted snow. A lot of people in the park are having fun with them, trying to jump over them and mocking those that fail. They''re not particularly deep though, and plenty of others just walk through without giving them a second thought.'
 		'The park is not particularly crowded, this time of year. Many people think it''s still too cold.'
 		''
 	else
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.spring.night.jpg"></center>'
 		'The main square of Pavlovsk Park. Spring has come, melting the worst of the snow. The trees are sprouting new leaves.'
 		'There is no particular reason to visit the park during the night, and as a result it''s largely deserted. In the distance you see one person running through the park, probably using it as a shortcut to go home faster.'
@@ -100,10 +102,12 @@ if month=3 or month=4 or month=5:
 end
 if month=6 or month=7 or month=8:
 	if hour>=6 and hour<=19:
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
 		'The main square of Pavlovsk Park. At this time of year, it''s one of the primary places locals and tourists enjoy spending their spare time in. It''s always busy: people are resting, walking, playing and dating to their heart''s desires, enjoying the nice surroundings.'
 		''
 	else
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.summer.night.jpg"></center>'
 		'The main square of Pavlovsk Park. At this time of year, it''s one of the places where locals and tourists enjoy going in their spare time.'
 		'However, there is no particular reason to visit the park during the night, and as a result it''s largely deserted. In the distance you see one person running through the park, probably using it as a shortcut to go home faster.'
@@ -112,11 +116,13 @@ if month=6 or month=7 or month=8:
 end
 if month=9 or month=10 or month=11:
 	if hour>=6 and hour<=18:
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.autumn.jpg"></center>'
 		'The main square of Pavlovsk Park. Autumn has come, and some of the trees are already shedding their leaves. The leaves that are still on the trees have changed colour, and are an colourful mix of red and brown.'
 		'Everywhere in the park, people are enjoying nature. Some are taking photos of the fallen leaves, kids are playing everywhere, and couples are walking hand-in-hand, simply enjoying each other''s company.'
 		''
 	else
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.autumn.night.jpg"></center>'
 		'The main square of Pavlovsk Park. Autumn has come, and some of the trees are already shedding their leaves.'
 		'It gets quite cold at night, and you try to stay active to keep yourself warm. The lone soul you see running across the park is probably trying to get home faster, to warm up with some nice cocoa.'
@@ -125,11 +131,13 @@ if month=9 or month=10 or month=11:
 end
 if month=1 or month=2 or month=12:
 	if hour>=7 and hour<=16:
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.jpg"></center>'
 		'The main square of Pavlovsk Park. It''s winter, and the park is quite busy with locals and tourists alike.'
 		'There''s snow everywhere, and kids from the whole town have gathered here to make snowmen and enjoy snowball fights. Some of the adults are joining them, happy to play like kids again for just a moment.'
 		''
 	else
+		'<center><h2>Pavlovsk Park</h2></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skver.winter.night.jpg"></center>'
 		'The main square of Pavlovsk Park. It''s winter, and the nights in Pavlovsk are very cold.'
 		'As you expected, the park is mostly deserted at this time of day. You occasionally see a wild animal, scrounging for food.'

locations/shoplifting.qsrc

@@ -498,7 +498,7 @@ if $ARGS[0] = 'punish':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/shoplift/sex/revenge/revenge1.jpg"></center>'
 	'The guard forcefully drags you into the room and shoves you towards the chair, "Well well, look who''s back...If it isn''t the little rat!" he heatedly comments.'
-	'<i>Fuck it''s the same guard, now you''ve done it, <<pcs_nickname>>, get prepared for whatever awaits you...Your fate is in his hands...</i>'
+	'<i>Fuck it''s the same guard, now you''ve done it, <<$pcs_nickname>>, get prepared for whatever awaits you...Your fate is in his hands...</i>'
 	'"I hate you fucking rats. Do you know what I had to go through to get away from ending up in jail. Luckily one of the pigs didn''t mind getting bribed so I got away," he grins, "And now for your punishment."'
 
 	act 'Beg':

locations/shulga_room.qsrc

@@ -80,14 +80,15 @@ if $ARGS[0] = 'start':
 	end
 
 	'There are two sofas next to a <a href="exec: gt ''shulga_room'', ''shultv''">TV</a>, and a <a href="exec:GT ''Komp'',''start''">laptop</a> sitting on a table covered in empty beer bottles.'
-	if hour >= 0 and hour < 7: '<a href="exec: gt ''shulga_room'', ''shulga_bazar_sleep''">Vasily</a> is sleeping on the big couch'
+	if (week < 6 and hour >= 0 and hour < 7) or (week >= 6 and hour >= 3 and hour < 7): '<a href="exec: gt ''shulga_room'', ''shulga_bazar_sleep''">Vasily</a> is sleeping on the big couch'
+	
 	shulga_room_rnd = RAND(0,2)
 	if shulga_room_rnd = 0:$shulga_room_rnd = 'The boys are sitting on the couch talking and drinking beer.'
 	if shulga_room_rnd = 1:$shulga_room_rnd = 'The boys are drinking beer and playing cards.'
 	if shulga_room_rnd = 2:$shulga_room_rnd = 'The boys are drinking beer while watching TV.'
 
 	if week < 6 and hour >= 20: '<<$shulga_room_rnd>> <a href="exec: gt ''shulga_room'', ''shulga_bazar_night''">Vasily</a>, <a href="exec: gt ''shulga_room'', ''den_bazar''">Dan</a> and <a href="exec: gt ''shulga_room'', ''vitek_bazar''">Vitek</a>, invites you to <a href="exec: gt ''shulga_room'', ''shulga_beer''">have a drink with them</a>.'
-	if week >= 6 and hour >= 10 and hour < 17 or week >= 6 and hour >= 0 and hour < 3: 'Sergey''s son <a href="exec: gt ''shulga_room'', ''shulga_bazar_day''">Vasily</a> is sitting on the big sofa.'
+	if (week >= 6 and hour >= 10 and hour < 17) or (week >= 6 and hour >= 0 and hour < 3): 'Sergey''s son <a href="exec: gt ''shulga_room'', ''shulga_bazar_day''">Vasily</a> is sitting on the big sofa.'
 
 	if week < 6 and hour >= 20:
 		act 'Drink beer with the guys': gt 'shulga_room', 'shulga_beer'
@@ -692,7 +693,7 @@ if $ARGS[0] = 'drunken_sex':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/sex/cum'+rand(1,9)+'.jpg"></center>'
 			shulga_whore = daystart + 7
 			'It feels so intense!'
-			'Head spinning, you find yourself back on your knees, and quickly realize the boys weren''t finished. Hot cum and laughter rains down on you. You make a final effort to finish what you started. You open wide for your boys and smile up at them seeking approval. After you have milked the last drop from each of them. Dan pats you on the head and says:  "What a good little slut you are <<$pcs_nickname>>. From now on you get to be our personal whore. You are going to have so much fun with us. Now, what do you say? Or we will tell the whole school what a whore you are."' 
+			'Head spinning, you find yourself back on your knees, and quickly realize the boys weren''t finished. Hot cum and laughter rains down on you. You make a final effort to finish what you started. You open wide for your boys and smile up at them seeking approval. After you have milked the last drop from each of them. Dan pats you on the head and says: "What a good little slut you are <<$pcs_nickname>>. From now on you get to be our personal whore. You are going to have so much fun with us. Now, what do you say? Or we will tell the whole school what a whore you are."' 
 			'You gaze up at him, with your <<$pcs_eyecol>> eyes open wide as saucers and whisper, "Thank you."'
 			'Dan continues: "For your first official duty you will lick me clean"'
 			'With some hesitation and maybe a little excitement you bend down and lick Dan''s cock clean, occasionally moving to gently suckle on the tip'
@@ -791,7 +792,7 @@ if $ARGS[0] = 'view_pornotv_evgr':
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvporn'+rand(1,5)+'.mp4" width="748" height="540"></video></center> You switched to porn channel.'
 		'The guys getting excited watching porn with you.'
 		'Vasily asks if you would like to help them get some relief.'
-		'Everyone''s  eyes are fixed on you, as they await your answer.'
+		'Everyone''s eyes are fixed on you, as they await your answer.'
 		if pav_slut < 75 or kotovLoveQW > 0: 
 			act 'Flee the scene': gt 'shulga_room', 'start'
 		else
@@ -813,7 +814,7 @@ if $ARGS[0] = 'view_pornotv_evgr':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/tv_ev/sex_group/bj'+rand(1,13)+'.jpg"></center>'
 				'When you nod yes, the boys start laughing and get their dicks out and form a pinwheel of flesh around your mouth. You roll your eyes and smile saying: "One at a time at boys. I would tell you to settle down, but I think we''re well past that."'
 				'You decide to reward Vitek for his patience by slowly licking him from base to tip, before wrapping your <<$liptalk3>> lips around him. For a good five minutes you slowly suck, savoring the taste his hard cock.' 
-				'Eventually Dan and Vasily get their turns too. While dutifully sucking away at one boy,  you worked your hands on whoever was waiting, doing your best to make sure nobody felt left out.'
+				'Eventually Dan and Vasily get their turns too. While dutifully sucking away at one boy, you worked your hands on whoever was waiting, doing your best to make sure nobody felt left out.'
 				if pav_slut >= 75 and pcs_horny < 30 or pav_slut < 75:
 
 					act 'Open wide and stick out your tongue':