Browse Source

[fixed/changed] Fixed a missing parenthesis in the if check of seducing father, which made it possible to have sex with step father with the rest of the family present if you have had sex with once. Also renamed the variable momloc[1] to momloc['kitchen_action'], since it could overwrite the variable momloc['athome'].

bgkjdgbizgblzdgbr 2 years ago
parent
commit
552659b36c
3 changed files with 12 additions and 12 deletions
  1. 8 8
      locations/family_schedule.qsrc
  2. 1 1
      locations/father.qsrc
  3. 3 3
      locations/kuhrPar.qsrc

+ 8 - 8
locations/family_schedule.qsrc

@@ -172,16 +172,16 @@ if indorf = 0:
 			momloc['athome'] = 1
 			if hour = 6 and minut < 40:
 				!! Make Breakfast
-				momloc[1] = 1
+				momloc['kitchen_action'] = 1
 			elseif hour = 6 and minut < 45:
 				!! Set breakfast table - ask Sveta to do it if she comes into the kitchen at that time
-				momloc[1] = 2
+				momloc['kitchen_action'] = 2
 			elseif hour = 6 or (hour = 7 and minut < 15):
 				!! Family breakfast
-				momloc[1] = 3
+				momloc['kitchen_action'] = 3
 			else
 				!! Clean up breakfast table
-				momloc[1] = 4
+				momloc['kitchen_action'] = 4
 			end
 		elseif hour = 7 or (hour = 8 and minut < 30):
 			!!Cleaning random room in the house
@@ -260,15 +260,15 @@ if indorf = 0:
 			momloc['athome'] = 1
 			if hour = 6 and minut < 40:
 				!! Make Breakfast
-				momloc[1] = 1
+				momloc['kitchen_action'] = 1
 			elseif hour = 6 and minut < 45:
 				!! Set breakfast table - ask Sveta to do it if she comes into the kitchen at that time
-				momloc[1] = 2
+				momloc['kitchen_action'] = 2
 			elseif hour = 6 or (hour = 7 and minut < 15):
 				!! Family breakfast
-				momloc[1] = 3
+				momloc['kitchen_action'] = 3
 			else
-				momloc[1] = 4
+				momloc['kitchen_action'] = 4
 				!! Clean up breakfast table
 			end
 		elseif hour < 11:

+ 1 - 1
locations/father.qsrc

@@ -492,7 +492,7 @@ if (hour > 10 and week < 6) or week >= 6:
 	end
 end
 
-if sdadloc = 10 and momloc['athome'] = 0 and kolloc['athome'] = 0 and TouchedByFather = 1 and pcs_horny >= 50 or npc_sex['A28'] ! 0:
+if sdadloc = 10 and momloc['athome'] = 0 and kolloc['athome'] = 0 and TouchedByFather = 1 and (pcs_horny >= 50 or npc_sex['A28'] ! 0):
     act 'Seduce him':
 		menu_off = 1
         if npc_rel['A28'] < 20:

+ 3 - 3
locations/kuhrPar.qsrc

@@ -31,9 +31,9 @@ gs 'family_schedule'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/kuhrpar.jpg"></center>'
 
 if momloc = 4:
-	if momloc[1] = 1:
+	if momloc['kitchen_action'] = 1:
 		'You <<$npc_nickname[''A29'']>> is here, busy making breakfast.'
-	elseif momloc[1] = 2:
+	elseif momloc['kitchen_action'] = 2:
 		npc_rel['A29'] += 1
 		cla & *clr
 		minut += 5
@@ -42,7 +42,7 @@ if momloc = 4:
 		'Your <<$npc_nickname[''A29'']>> turns to you. "<<$pcs_nickname>>, please set the table for breakfast." You sigh and grab the dishes.'
 		act 'Set the table for breakfast': gt 'kuhrPar'
 		exit
-	elseif momloc[1] = 4:
+	elseif momloc['kitchen_action'] = 4:
 		$mombreak = ''
 		'Your <a href="exec:gt''mother''"><<$npc_nickname[''A29'']>></a> is here clearing away the breakfast dishes.'
 	else