Browse Source

[fixed] make the Vika birthday event condition in obroom file match the one in Vika file (fixes are (1) changing day to daystart like was done for the Vika file version and (2) removing the checks that bordel = 1 and slutty > 0 as I think the Vika file version without them makes more sense since the scene where you reject Vika's present (getting gangbanged) has you tell her "What do you take me for?" which wouldn't make sense if she already got you a job as a prostitute). also simplify the conditionals for accessing Vika here and make all checks against the brothel's opening and closing hours use the functions defined in the brothel file instead of the raw value

Spackled Lanturn 3 years ago
parent
commit
9de4c23313
1 changed files with 12 additions and 12 deletions
  1. 12 12
      locations/obroom.qsrc

+ 12 - 12
locations/obroom.qsrc

@@ -27,20 +27,20 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	gs 'exercise', 'start'
 	''
-	if hour > 14 and hour < 20 and npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and bordel = 1 and slutty > 0 and b_vika_present_Day ! day:
+	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_sleep = 0
-		'<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you, trying to hide a box behind her back.'
-	elseif hour > 14 and hour < func('bordel', 'open_hour'):
-		vika_sleep = 0
-		'<a href="exec:gt''Vika''">Vika</a> is lying on her bed.'
-	end
-	if hour > 3 and hour < 8 and vikaslut = 0:
-		vika_sleep = 1
-		'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after being out the whole night.'
-	end
-	if hour > 3 and hour < 8 and vikaslut = 1:
+		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
+			'<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you, trying to hide a box behind her back.'
+		else
+			'<a href="exec:gt''Vika''">Vika</a> is lying on her bed.'
+		end
+	elseif hour > func('bordel', 'close_hour') and hour < 8:
 		vika_sleep = 1
-		'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
+		if vikaslut = 0:
+			'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after being out the whole night.'
+		elseif vikaslut = 1:
+			'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
+		end
 	end
 
 	act 'Walk out in the corridor':