Forráskód Böngészése

[changed] some schedule stuff

Anya 3 éve
szülő
commit
b100a1d89d
3 módosított fájl, 39 hozzáadás és 22 törlés
  1. 26 11
      locations/family_schedule.qsrc
  2. 2 0
      locations/korrPar.qsrc
  3. 11 11
      locations/kuhrPar.qsrc

+ 26 - 11
locations/family_schedule.qsrc

@@ -10,8 +10,8 @@ kolloc = 0
 !!---ANYA---------------------------------------
 !! sister_indorf = 1 means Anya is in the village
 !! anyaloc['athome'] = 1 means Anya is at home, awake, and not in an event (like having sex with Roma)
-!! 
-!! unused 8, 9, 18, 19, 20, 22, 25, 27+
+!! anyaloc['inroom'] = 1 means Anya is actually in the room, so masturbating while she is in the shower is possible
+!! unused - 6, 18, 19, 20, 22, 25, 27+
 if sister_indorf = 0:
 	if week <= 5:
 		if (hour < 6) or (hour = 6 and minut < 45):
@@ -41,15 +41,20 @@ if sister_indorf = 0:
 			anyaloc['inroom'] = 0
 			if vanrPar_suction_dildo > 0 and $loc ! 'vanrPar':anyaQW['bathroom_dildos'] = vanrPar_suction_dildo
 		elseif hour = 8 and minut < 30:
-			!!traveling
-			anyaloc = 6
+			!!traveling to work
+			anyaloc = 8
 			anyaloc['athome'] = 0
 			anyaloc['inroom'] = 0
-		elseif hour < 16:
+		elseif hour < 15 or (hour = 15 and minut < 50):
 			!!Work
 			anyaloc = 7
 			anyaloc['athome'] = 0
 			anyaloc['inroom'] = 0
+		elseif hour < 16:
+			!!traveling from work
+			anyaloc = 9
+			anyaloc['athome'] = 0
+			anyaloc['inroom'] = 0
 		elseif hour < 18:
 			if week = 5:
 				!!At the community center
@@ -291,13 +296,17 @@ if indorf = 0:
 				!! Visiting Luda on mondays for 3 hours
 				momloc = 20
 				momloc['athome'] = 0
-			else
+			elseif week < 5:
 				!! Watches TV with Vladimir
 				momloc = 19
 				momloc['athome'] = 1
+			else
+				!! Watches TV alone
+				momloc = 19
+				momloc['athome'] = 1
 			end
 		else
-			!! Sleep (Small chance she and step dad have sex before sleep)
+			!! Sleep (Small chance she and step dad have sex before sleep) - I think this was blocked off
 			momloc = 1
 			momloc['athome'] = 0
 		end
@@ -381,11 +390,17 @@ if indorf = 0:
 				momloc = 18
 			end
 		elseif hour < 22:
-			!! Watches TV with Vladimir
-			momloc = 19
-			momloc['athome'] = 1
+			if week = 7:
+				!! Watches TV with Vladimir
+				momloc = 19
+				momloc['athome'] = 1
+			else
+				!! Watches TV alone
+				momloc = 19
+				momloc['athome'] = 1
+			end
 		else
-			!! Sleep (Small chance she and step dad have sex before sleep)
+			!! Sleep (Small chance she and step dad have sex before sleep) - I think this was blocked off
 			momloc = 1
 			momloc['athome'] = 0
 		end

+ 2 - 0
locations/korrPar.qsrc

@@ -156,6 +156,8 @@ elseif sdadloc = 5 and sdadloc = 11:
 	end
 elseif kolloc = 10:
 	act 'Go to the bathroom':msg'You try to open the bathroom door but it immediately stops, banging against the latch. You hear the water running and your brother shout "I''m in the shower!"'
+elseif anyaloc = 5:
+	act 'Go to the bathroom':msg'You try to open the bathroom door but it immediately stops, banging against the latch. You hear the water running and your sister yell "I''ll be done in a few minutes!"'
 else
 	act 'Go to the bathroom':minut += 1 & gt 'vanrPar'
 end

+ 11 - 11
locations/kuhrPar.qsrc

@@ -54,19 +54,19 @@ if (hour = 6 and minut > 45) or (hour = 7 and minut < 15) and week < 6 and indor
 	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. You could sit down and join them for breakfast or just grab something and go.'
 elseif (hour = 6 and minut > 45) or (hour = 7 and minut < 15) and week > 5 and indorf = 0:
 	'<a href="exec:gt''father''">Your stepfather</a><<$mombreak>>, and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. It seems your sister is sleeping in again. You could sit down and join them for breakfast or just grab something and go.'
-elseif hour = 18 and minut <= 30 and indorf = 0 and anyaloc ! 25:
+elseif hour = 18 and minut < 30 and indorf = 0 and anyaloc = 12:
 	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
-elseif hour = 18 and minut <= 30 and indorf = 0:
-	if  anyaloc = 12:
-		'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
-	else
-		'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
-	end
+elseif hour = 18 and minut < 30 and indorf = 0:
+	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 else
 	'The kitchen is not very impressive, but it has everything your family needs. Since everyone can''t always join for family meals, your <<$npc_nickname[''A29'']>> usually pre-cooks some meals and stores them in the fridge. Of course, you could also just have a snack if you''re not that hungry.'
 end
 if momloc = 11: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here making diner.'
-if momloc = 13: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning up after dinner.'
+if momloc = 13 and anyaloc = 23: 
+	'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning up after dinner with <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> helping her. '
+elseif momloc = 13:
+	'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning up after dinner.'
+end
 if momloc = 23: 'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here cleaning.'
 
 if sdadloc = 4: '<a href="exec:gt''father''">Your stepfather</a> is here reading the paper.'
@@ -131,7 +131,7 @@ elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0:
 				'You''re about to respond when your mother interrupts you. "Of course not! She''s still too young to be thinking about boys!"'
 				'Kolka then chimes in. "Like any boy would date her when she sucks them all off anyways."'
 				'You mother turns towards Kolka. "That''s not funny! Apologize to your sister right now! Right now!"' 
-				if week < 5 or week = 7:
+				if anyaloc = 12:
 					'Anya smirks as Kolka freezes in place and decides he doesn''t want to be the one to tell her about your reputation and just apologizes to you.'
 				else
 					'Kolka freezes in place and decides he doesn''t want to be the one to tell her about your reputation and just apologizes to you.'
@@ -141,10 +141,10 @@ elseif hour = 18 and minut <= 30 and dinner_day ! daystart and indorf = 0:
 				'You''re about to respond when your mother interrupts you. "She''s too young to worry about that and... we talked about it." She gives you a meaningful glance and you shut your mouth.'
 				'Kolka then chimes in. "Like any boy would date her when she sucks them all off anyways."'
 				'You mother turns towards Kolka. "That''s not funny!" She then glances at you. "She might have made some mistakes, but she''s trying to be a better girl now. Now apologize to your sister right now!"' 
-				if week < 5 or week = 7:
+				if anyaloc = 12:
 					'Anya just smirks as Kolka freezes in place and then apologizes to you.'
 				else
-					'Kolka freezes in place and then apologizes to you.'
+					'Startled, Kolka freezes in place and then apologizes to you.'
 				end
 				'Your stepfather clears his throat and quickly changes the subject, talking about how his work went. After that, you have a fairly enjoyable dinner.'
 			else