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

locations/family_schedule.qsrc

@@ -110,10 +110,10 @@ if week <= 5:
 		momloc = 1
 	elseif hour = 5 and minut < 50:
 		!!shower
-		momloc = 5
+		momloc = 2
 	elseif hour < 6 or (hour = 6 and minut < 10):
 		!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
-		momloc = 1
+		momloc = 3
 	elseif hour = 6 or (hour = 7 and minut < 30):
 		momloc = 4
 		if hour = 6 and minut < 40:
@@ -135,34 +135,34 @@ if week <= 5:
 		momloc = momcleaning
 	elseif hour = 8 and minut < 30:
 		!! Walking to work
-		momloc = 0
+		momloc = 5
 	elseif hour < 16 and week < 5:
 		!!Working in the cafe. On Friday she stays until 18:00
-		momloc = 7
+		momloc = 6
 	elseif hour = 16 and minut < 40 and week < 5:
 		!!Buying groceries for dinner and other stuff needed for home at the supermarket
-		momloc = 6
+		momloc = 7
 	elseif hour < 17 and week < 5:
 		!!Walking home
-		momloc = 0
+		momloc = 8
 	elseif hour = 17 and minut < 50 and week = 5:
 		!!Working in the cafe. On Friday she stays until 17:50
-		momloc = 7	
+		momloc = 9
 	elseif hour < 18 and week = 5:
 		!!Walking home
-		momloc = 4
+		momloc = 10
 	elseif hour < 18:
 		!!Making dinner (On Friday she brings home leftovers from the cafe)
-		momloc = 4
+		momloc = 11
 	elseif hour < 19:
 		!! Cleaning dinner table/Doing dishes
-		momloc = 4
+		momloc = 12
 	elseif hour < 20:
 		!! (cleaning the bathroom, sweeping, mopping, dusting, watching TV, taking a bath, etc in different rooms) (once/twice a week goes over to Luda)
 		momloc = momcleaning2
 	elseif hour < 22:
 		!! Watches TV with Vladimir
-		momloc = 3
+		momloc = 13
 	else
 		!! Sleep (Small chance she and step dad have sex before sleep)
 		momloc = 1
@@ -173,10 +173,10 @@ else
 		momloc = 1
 	elseif hour = 5 and minut < 50:
 		!! Shower, if Sveta knocks she''ll ask to wake Kolka
-		momloc = 5
+		momloc = 2
 	elseif hour < 6 or (hour = 6 and minut < 10):
 		!! Getting dressed in her room and wakes Vladimir, if Sveta walks by she''ll ask to wake Kolka (Occasional morning quicky)
-		momloc = 1
+		momloc = 3
 	elseif hour = 6 or (hour = 7 and minut < 30):
 		momloc = 4
 		if hour = 6 and minut < 40:
@@ -198,11 +198,11 @@ else
 		momloc = momcleaning
 	elseif hour = 11 and minut < 30:
 		!! Takes the car to town
-		momloc = 0
+		momloc = 14
 	elseif hour < 12 and minut < 30:
 		!! Gets her nails done/hair cut at the salon or such things - On Sunday goes to the church during these hours
 		if week = 5:
-			momloc = 13
+			momloc = 15
 		else
 			momloc = 16
 		end
@@ -210,29 +210,29 @@ else
 		momloc = 16
 	elseif hour < 14:
 		!! Walks around different shops, looking at and buying stuff - On Sunday goes to church during these hours
-		momloc = 0
+		momloc = 15
 	elseif hour < 17:
 		!!Helping out Sergey/Luda, going to Kolka's games?
 		momloc = rand(14,15)
 	elseif hour < 18:
 		!! Making dinner
-		momloc = 4
+		momloc = 11
 	elseif hour = 18 and minut < 30:
 		!!Family dinner (same as the family breakfast, Sveta doesn''t have to join it but we can have some family interactions like mom and step dad asking about how school was etc)
-		momloc = 4
+		momloc = 12
 	elseif hour < 19:
 		!! Cleaning dinner table/Doing dishes
-		momloc = 4
+		momloc = 13
 	elseif hour < 21:
 		!!Says she goes to see her sister, in reality sometimes see's her sister of fucks around with different people. - Sunday goes to evening mass
 		if week = 5:
-			momloc = 14
+			momloc = 17
 		else
-			momloc = 16
+			momloc = 18
 		end
 	elseif hour < 22:
 		!! Watches TV with Vladimir
-		momloc = 3
+		momloc = 13
 	else
 		!! Sleep (Small chance she and step dad have sex before sleep)
 		momloc = 1

locations/journal.qsrc

@@ -2,12 +2,12 @@
 
 if $ARGS[0] = 'records':
 	*clr & cla
-	act 'Put your notebook down': gt $menu_loc, $menu_arg
+	act 'Put your journal down': gt $menu_loc, $menu_arg
 	gs 'housing', 'rent'
 
 	$NoteBookLine = { $result = "<br><<$ARGS[0]>>" }
 
-	$tab_text = '<center><h1>Notebook</h1></center>'
+	$tab_text = '<center><h1>Journal</h1></center>'
 	if MagikDostup = 0:
 		$tab_text += '<center><h2>Spells to Cast</h2></center><br>'
 		$tab_text += func('spellBook','cast','$nonComSpells')

locations/sexshop.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	cla & *clr
-	if rand(1, 10) = 10 and hotcat >= 5 and kendrano ! 1:gt 'sexshop', 'kendra'
+	if rand(1, 10) = 10 and hotcat >= 5 and kendrano ! 1 and kendra[1] < daystart:gt 'sexshop', 'kendra'
 	if $pantyworntype = 'none' and rand(1, 10) = 10:gt 'sexshop', 'shprod'
 
 	clr
@@ -1012,6 +1012,7 @@ if $ARGS[0] = 'kendra':
 				'She smiles at that. "I think you are going to make a great little slave, we are going to have a lot of fun together. Now follow me to the basement slave so you can service me."'
 				act 'Serve Kendra':
 					*clr & cla
+					kendra = 1
 					lesbian += 1
 					kendratoy = rand(1,2)
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend1.jpg"></center>'
@@ -1238,6 +1239,7 @@ end
 
 if $ARGS[0] = 'kendrafinish':
 	$location_type = 'event'
+	kendra[1] = daystart + 6
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sex/shkend16.jpg"></center>'
@@ -1245,7 +1247,7 @@ if $ARGS[0] = 'kendrafinish':
 	'You do as she says and stick out your tongue. She licks your tongue with hers and the two of you lick each others tongue for a few moments. Finally she stops and grabs your butt cheek roughly and digs her nails into your backside. Hard enough it hurts a little, then she lets go and steps away and the pain quickly fades. She starts taking off her harness, she cleans the dildo and then puts it away, before getting dressed. Once she is fully dressed she finally turns to you again. "You may not get dressed slave."'
 	*nl
 	'"Thank you Mistress." You tell her as you get dressed.'
-	'Once you are both fully dressed she says. "Give me your number, so I can summon you, when I feel the need to use my little white slave." You do as you are told and give her your number. With that done, she gives you a little shooing motion. "You may go now."'
+	'Once you are both fully dressed she says. "Visit again and if I feel the need to use my little white slave, I might even let you." She gives you a little shooing motion. "You may go now."'
 	'"Yes Mistress Kendra." You reply, with that you leave the basement and go back up to the shop above.'
 	gs 'arousal', 'foreplay', 5, 'lesbian', 'sub'
 	gs 'arousal', 'end'