Browse Source

[fixed] small layout fixes

anjuna krokus 2 days ago
parent
commit
91fd6f5465
3 changed files with 5 additions and 6 deletions
  1. 2 2
      locations/bedrPar.qsrc
  2. 2 2
      locations/cafe_parco.qsrc
  3. 1 2
      locations/shortgs.qsrc

+ 2 - 2
locations/bedrPar.qsrc

@@ -1,7 +1,6 @@
 # bedrPar
 # bedrPar
 
 
 *clr & cla
 *clr & cla
-fromoutside = iif($loc = 'bedrPar',0,1)
 menu_off = 0
 menu_off = 0
 minut += 1
 minut += 1
 !!day check so mom doesn''t think you have been out all night if you get up very early
 !!day check so mom doesn''t think you have been out all night if you get up very early
@@ -20,7 +19,7 @@ gs 'music_actions', 'clear_restrictions'
 if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
 if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
 
 
 if $ARGS[0] = '' or $ARGS[0] = 'start':
 if $ARGS[0] = '' or $ARGS[0] = 'start':
-	if locat['Mother'] = 26 and fromoutside and func('homes_properties', 'can_live_here'):
+	if locat['Mother'] = 26 and $prevloc = 'bedrPar' and func('homes_properties', 'can_live_here'):
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		if mc_inventory['equipped_condoms'] > 0 and rand(1,3) = 1 and mom['condoms'] = 0:
 		if mc_inventory['equipped_condoms'] > 0 and rand(1,3) = 1 and mom['condoms'] = 0:
 			gt 'mother', 'condom_find'
 			gt 'mother', 'condom_find'
@@ -280,4 +279,5 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	end
 	end
 end
 end
 
 
+
 --- bedrPar ---------------------------------
 --- bedrPar ---------------------------------

+ 2 - 2
locations/cafe_parco.qsrc

@@ -37,11 +37,11 @@ if $args[0]= 'inner':
 		act 'Accept Zariyah''s offer': gt 'music_delparco', 'acceptafterthinking'
 		act 'Accept Zariyah''s offer': gt 'music_delparco', 'acceptafterthinking'
 	end
 	end
 
 
-	!! The very first gig - this will be a separate scene from the repeating ones. 
+	!! The very first gig - this will be a separate scene from the repeating ones.
 	if ml_venues['del_parco'] = 1 and ml_delparcoQW['Stage'] = 4 and ml_gigday['delparco'] = daystart and ml_gighour['delparco'] = hour:
 	if ml_venues['del_parco'] = 1 and ml_delparcoQW['Stage'] = 4 and ml_gigday['delparco'] = daystart and ml_gighour['delparco'] = hour:
 		act 'Perform at the cafe': gt 'music_delparco', 'eveningshow'
 		act 'Perform at the cafe': gt 'music_delparco', 'eveningshow'
 	end
 	end
-	
+
 	if LariskaQW['story'] = 12 and week = 6: act 'Join Lariska and Lev': gt 'lariska_storyline','Boyfriend_3'
 	if LariskaQW['story'] = 12 and week = 6: act 'Join Lariska and Lev': gt 'lariska_storyline','Boyfriend_3'
 
 
 	if (sunWeather = 0 or temper < 5) and week mod 2 = 0 and (hour >= 14 and hour < 20) and mey_vika_qw_day ! daystart:
 	if (sunWeather = 0 or temper < 5) and week mod 2 = 0 and (hour >= 14 and hour < 20) and mey_vika_qw_day ! daystart:

+ 1 - 2
locations/shortgs.qsrc

@@ -900,13 +900,12 @@ if $ARGS[0] = 'setloc':
 	!! Sets the location variables based on $ARGS[1] = loc, $ARGS[2] = loc arg
 	!! Sets the location variables based on $ARGS[1] = loc, $ARGS[2] = loc arg
 	!! Primary key
 	!! Primary key
 	$prevloc = $loc
 	$prevloc = $loc
-	$prevarg = $loc_arg
-
 	$loc = $ARGS[1]
 	$loc = $ARGS[1]
 	$menu_loc = $ARGS[1]
 	$menu_loc = $ARGS[1]
 	$locM = $ARGS[1]
 	$locM = $ARGS[1]
 
 
 	!! Secondary key
 	!! Secondary key
+	$prevarg = $loc_arg
 	$loc_arg = $ARGS[2]
 	$loc_arg = $ARGS[2]
 	$menu_arg = $ARGS[2]
 	$menu_arg = $ARGS[2]
 	$locM_arg = $ARGS[2]
 	$locM_arg = $ARGS[2]