[fixes] missing cla in foto_events, endless inhibition increases in gadbana

[changed] nord to give the player more information about the opening hours of shops and other places

locations/Gadbana.qsrc

@@ -46,8 +46,11 @@ if mira = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			inhib_exp += rand(0,2)
-			grandma_trouble += rand(0,1)
+			if gadbana_stripping ! daystart: 
+				gadbana_stripping = daystart
+				inhib_exp += 2
+				grandma_trouble += 1
+			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
 			!!gs 'clothing', 'recover_lost_clothes', 'Gadbana'
 			gs 'arousal', 'voyeur', 10, 'exhibitionism'
@@ -60,8 +63,11 @@ if mira = 0:
 			*clr & cla
 			menu_off = 1
 			minut += 1
-			inhib_exp += rand(0,2)
-			grandma_trouble += rand(0,1)
+			if gadbana_stripping ! daystart: 
+				gadbana_stripping = daystart
+				inhib_exp += 1
+				grandma_trouble += rand(0,1)
+			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
 			!!gs 'clothing', 'recover_lost_clothes', 'Gadbana'
 			gs 'arousal', 'voyeur', 10, 'exhibitionism'

locations/Nord.qsrc

@@ -20,13 +20,11 @@ if $ARGS[0] = '':
 		end
 	end
 
-	clr
 	gs 'stat'
 
 	!call random events from [street_events], and display them before show location.
 	if streetevent_hour + 2 < hour: gt 'street_event','Nord', 'main'
 
-
 	'<center><h2>St. Petersburg</h2></center>'
 	'<center><b>Industrial Region</b></center>'
 	if month >= 11 or month <= 3:
@@ -52,13 +50,15 @@ if $ARGS[0] = '':
 
 	gs 'taxi'
 
-	if car > 0:
-		if cardrive = 3 or cardrive >= 6 and cardrive <= 9:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
-	end
+	if car > 0 and cardrive = 3 or cardrive >= 6 and cardrive <= 9:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
 
 	'The towns <a href="exec:hour += 1 & gt ''park'', ''start''">central park</a> is an hours walk from here.'
 
-	if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''Nord'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+	if hour > 7 and hour < 23:
+		'You can see the <a href="exec:$locM = ''Nord'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
+	else
+		'The kiosk is closed between 23:00 and 07:00.'
+	end
 
 	'<a href="exec:minut += 15 & gt ''nordtrain'', ''outside''">Train Station</a> to get to the small Town.'
 
@@ -72,19 +72,51 @@ if $ARGS[0] = '':
 	litltown = 0
 	'There is a <a href="exec: minut += 5 & gt ''zaprF'', ''start''">Gas</a> Station near the street'
 
-	if hour >= 5 and hour <= 23:'The <a href="exec:gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
-	if hour >= 9 and hour <= 20 and week < 7:'<a href="exec: minut += 5 & gt ''autoservisF'', ''start''">Repair Shop</a>'
-	if hour >= 9 and hour <= 17 and week > 1:'<a href="exec: minut += 5 & gt ''autotraidF'', ''start''">Car Dealership</a>'
-	if hour >= 9 and hour < 17 and week < 6:'<a href="exec: minut += 5 & gt ''dk'', ''start''">Community centre</a>'
+	if hour >= 5 and hour <= 23:
+		'The <a href="exec:gt ''metro'', ''start''">metro</a> station is within a 5 minute walk from here.'
+	else
+		'The metro station is within a 5 minute walk from here. The metro system is closed between midnight and 05:00.'
+	end
+	if hour >= 9 and hour < 18 and week > 1:
+		'A <a href="exec: minut += 5 & gt ''autotraidF'', ''start''">car dealership</a> is nearby.'
+	else
+		'A car dealership is nearby'+iif(week = 1, ', but it''s closed on mondays.', '. It''s currently closed and will open between 09:00 and 18:00.')
+	end
+	if hour >= 9 and hour <= 20 and week < 7:
+		'Next to the car dealership is a <a href="exec: minut += 5 & gt ''autoservisF'', ''start''">repair shop</a>.'
+	else
+		'Next to the car dealership is a repair shop.'+ iif(week = 7, 'It''s closed on sundays.', 'It will be open between 09:00 and 20:00.')
+	end
+	if hour >= 9 and hour < 17 and week < 6:
+		'The <a href="exec: minut += 5 & gt ''dk'', ''start''">community centre</a> is currently open.'
+	else
+		'The community centre is currently closed. It''s only open during the week between 09:00 and 17:00.'
+	end
 
-	if hour >= 9 and hour <= 17 and (StoryLine = 1 and SchoolAtestat = 0) or bumtolik > 3: '<a href="exec:gt ''buklinik'',''start''">Mercy clinic</a>'
-	if hour >= 8 and hour <= 20:'The parking lot, which is engulfed in bright lights, belongs to a <a href="exec: minut += 2 & gt ''shop'', ''start''">Supermarket</a>'
-	if hour >= 12 and hour <= 19:'Above the door to a basement room is a bright neon sign for the <a href="exec: minut += 5 & gt ''pirsingsalon'', ''start''">Tattoo & Piercing parlor</a>'
+	if hour >= 9 and hour <= 17 and (StoryLine = 1 and SchoolAtestat = 0) or bumtolik > 3: 
+		'<a href="exec: gt ''buklinik'',''start''">Mercy clinic</a> is open.'
+	elseif (hour < 9 or hour > 17) and (StoryLine = 1 and SchoolAtestat = 0) or bumtolik > 3:
+		'Mercy clinic is closed.'
+	end
+	if hour >= 8 and hour <= 20:
+		'The parking lot, which is engulfed in bright lights, belongs to a <a href="exec: minut += 2 & gt ''shop'', ''start''">supermarket</a>.'
+	else
+		'The empty parking lot, which is engulfed in bright lights, belongs to a supermarket that opens between 08:00 and 20:00'
+	end
+	if hour >= 12 and hour <= 19:
+		'Above the door to a basement room is a bright neon sign for the <a href="exec: minut += 5 & gt ''pirsingsalon'', ''start''">Tattoo & Piercing parlor</a>.'
+	else
+		'Above the door to a basement room is a bright neon sign for the Tattoo & Piercing parlor. The opening hours are 12:00 to 20:00'
+	end
 	if tobiQW >= 1:'The old mansion, home to <a href="exec:gt ''kakuzu'', ''start''">Kakuzu</a>'
 
 	'There is a huge building, with bright lights, which houses a <a href="exec: minut += 10 & gt ''casino'', ''outside''">Casino</a>.'
 
-	if hour >= 14 or hour < 4:'Located far away from the buildings <a href="exec: minut += 2 & gt ''lakecafe'', ''main''">barbecue</a>.'
+	if hour >= 14 or hour < 4:
+		'Located far away from the buildings is a <a href="exec: minut += 2 & gt ''lakecafe'', ''main''">barbecue</a>.'
+	else
+		'Located far away from the buildings is a barbecue. It''ll be open between 14:00 and 04:00'
+	end
 	if jouryResult = 10:'You can go to one of the apartment blocks and visit <a href="exec:gt ''youry'',''start''">Yuri''s</a> flat'
 	if IvanKvartira > 0:'In one of these building is <a href="exec:gt ''ivanRoom''">Manager Ivans</a> apartment'
 
@@ -108,7 +140,6 @@ if $ARGS[0] = 'redlight':
 		end
 	end
 
-	clr
 	gs 'stat'
 	'<center><h2>St. Petersburg</h2></center>'
 	'<center><b>Red Light District</b></center>'

locations/andrey.qsrc

@@ -35,6 +35,7 @@ if $ARGS[0] = 'apply':
 	*nl
 	'You knock on the door and someone calls you in from the other side, telling you to enter. When you enter, you''re greeted by the sight of a sour-faced older man reading papers at his desk. When he sees you, his expression hardens. "Surprised to see an old man managing a clothing store for teenage girls?" he grunts. You didn''t even say anything yet, but he doesn''t seem to care. "Yeah, I get that a lot..." he adds under his breath before sighing and looking back to his papers. "What do you need?"'
 
+	act 'Leave':gt 'young_shop', 'start'
 	act 'Mention the for hire sign':
 		minut += 5
 		cla
@@ -83,8 +84,6 @@ if $ARGS[0] = 'apply':
 !!			end
 		end
 	end
-
-	act 'Leave':gt 'young_shop', 'start'
 end
 
 if $ARGS[0] = 'regular':

locations/foto_events.qsrc

@@ -482,6 +482,7 @@ if $ARGS[0] = 'fine_art2':
 			if fine_art_deal = 1:'	"Zis is for ze job," she says, placing wad of <<modelpayfin>> <b>₽</b> into your hand. "And zis, is for your contribution to art!" she says, placing in your other hand a large stack of bills equaling to 30,000 <b>₽</b>. "Zis vill be a famous piece to go down in the history of ze world! Do not forget and take pride in your part of what began here today!"'
 			if fine_art_deal = 2:'	"Zis is for ze job," she says, placing wad of <<modelpayfin>> <b>₽</b> into your hand. "And be proud," she says, placing her other hand on your shoulder. "Zis vill be a famous piece to go down in the history of ze world! One day, vhen you see ze statue, remember and be proud of ze young woman whose loss of virtue vas immortalized in stone. Remember and <i>be proud.</i>"'
 			act'Continue':
+				cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 				'	As the people around you pack up the equipment and depart, the artist and Alexander disappearing with them, you stand there, feeling the throbbing ache between your legs and the blood still dripping down your thighs. While you stand, all you can do is stare at the stacks of cash you have been given; the money that bought your virginity. And while you stand and stare, you think to yourself...'
 				*nl

locations/pavResidential.qsrc

@@ -102,10 +102,7 @@ end
 
 gs 'stat'
 
-if car > 0 and cardrive = 20:
-	cardrive = 20
-	'Your <a href="exec:gs ''carF'', ''start''">car<<$car>></a> is parked in the street.'
-end
+if car > 0 and cardrive = 20: 'Your <a href="exec:gs ''carF'', ''start''">car<<$car>></a> is parked in the street.'
 
 if fedorKozlovQW >= 20 and FedorKozHome = 1 or fedorKozlovQW = -15 and FedorKozHome = 1: '<a href="exec:gt ''FedorEv4'', ''Home Entrance''">Fedor''s</a> house.'
 

locations/street.qsrc

@@ -46,7 +46,6 @@ if opusk > 0 or gnewQW = 5:
 	if home_owned[1] > 0:'Near the entrance to where you live there is something written on the wall. It says:<b>"<<$pcs_nickname>> from apartment 69 is a cheap slut!"</b>'
 end
 
-clr
 gs 'stat'
 palMir = 0
 bordysh = 0
@@ -66,10 +65,7 @@ end
 
 housrA = 0
 
-if car > 0 and cardrive = 1:
-	cardrive = 1
-	'In the parking lot is <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
-end
+if car > 0 and cardrive = 1: 'In the parking lot is <a href="exec:GS ''carF'', ''start''">your <<$car>></a>.'
 
 if home_owned[1] > 0:
 	act '<b>GO HOME</b>':
@@ -128,7 +124,6 @@ if hour >= 12 and hour <= 22 and week ! 1:'In a side alley, next to the uniquely
 if hour > 22 or hour <= 3:'In one of the parking lots you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">gopniks</a>.'
 if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec: minut += 5 & gt ''clener'', ''start''">cleaning lady</a> is needed.'
 
-
 'The city''s large <a href="exec:minut += 20 & gt ''park'', ''start''">central park</a> is about a 20-minute walk away.'
 'The city''s only <a href="exec:minut += 40 & gt ''lake'', ''start''">lake</a> is just a 40-minute walk away.'
 '24 Hour <a href="exec:$loc = ''street'' & gt ''pharmacy'', ''start''">Pharmacy</a>.'