Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

glife.qproj

@@ -725,7 +725,7 @@
 		<Location name="volAndGev"/>
 	</Folder>
 	<Folder name="Station Campus">
-		<Location name="pav_train"/>
+		<Location name="pav_market"/>
 		<Location name="pav_train_hall"/>
 		<Location name="pav_train_hall_events"/>
 		<Location name="pav_train_market"/>
@@ -917,23 +917,14 @@
 		<Location name="graveyard"/>
 		<Location name="motel"/>
 		<Location name="road"/>
-		<Location name="youplace"/>
+		<Location name="city_mansion_entrance"/>
 		<Location name="furi"/>
 		<Location name="furisex"/>
 	</Folder>
 	<Folder name="Mansion">
-		<Location name="ybass"/>
-		<Location name="yban"/>
-		<Location name="ymans"/>
-		<Location name="ybedr"/>
-		<Location name="yvan"/>
-		<Location name="ykuh"/>
-		<Location name="yzal"/>
-		<Location name="ykamin"/>
-		<Location name="ydet"/>
-		<Location name="ybib"/>
-		<Location name="ysport"/>
-		<Location name="ykabinet"/>
+		<Location name="city_mansion_residence_1"/>
+		<Location name="city_mansion_residence_2"/>
+		<Location name="city_mansion_residence_3"/>
 	</Folder>
 	<Folder name="Porn">
 		<Location name="BDSM"/>

locations/bedrPar.qsrc

@@ -340,7 +340,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			!! Streaming music
-			if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
+			if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
 				ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 
 				if pcs_inhib < 30:
@@ -370,7 +370,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 
 			!! Recording music
-			if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+			if ml_guitar['hasguitar'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
 				if pcs_inhib < 20:
 					if pcs_inhib < 10:
 						$diff = 'medium'

locations/carF.qsrc

@@ -14,7 +14,7 @@ $enddrive = {
 	if cardrive = 12:gt 'obekt'
 	if cardrive = 13:gt 'dachi'	
 	if cardrive = 14:gt 'liam'
-	if cardrive = 18:gt 'youplace'
+	if cardrive = 18:gt 'city_mansion_entrance'
 	if cardrive = 19:gt 'city_industrial_train', 'outside'
 	if cardrive = 20:gt 'pav_residential'
 	if cardrive = 21: litltown = 1 & gt 'zaprF','start'
@@ -210,7 +210,7 @@ end
 if $ARGS[0] = 'other':
 	cla
 	if home_owned[5] > 0 and cardrive ! 18:
-		act 'Go to your mansion':
+		act 'Go to Matryona Mansion':
 			cla
 
 			if cardrive = 28:

locations/cikl.qsrc

@@ -1076,6 +1076,13 @@ if uglyduck_flag = 1 and hotcat >= 5:
 	killvar 'uglyduck_flag'
 	gs 'npc_relationship', 'socialgroup_setting_boys', 10, 10, 10, 10, 0, 0
 	grupvalue[1] += 100
+	grupvalue[2] += 100
+	grupvalue[3] += 100
+	grupvalue[4] += 100
+	old_grupvalue[1] += 100
+	old_grupvalue[2] += 100
+	old_grupvalue[3] += 100
+	old_grupvalue[4] += 100
 end
 
 !! Resetting relationships that go over the max

locations/city_center.qsrc

@@ -240,6 +240,8 @@ end
 $desc_txt7 = '<a href="exec: minut += 5 & gt ''police_station'',''start''">Main city police station</a>'
 'Away from the shops is both <<$desc_txt6>> and the <<$desc_txt7>>.'
 *nl
+'<a href="exec: minut += 5 & gt ''city_church'', ''start''">Kazan Cathedral</a>, also known as the Cathedral of Our Lady of Kazan, sits at the very center of the city.'
+*nl
 if nichHotelReferral = 2:
 	if hour >= 4 and hour < 16:
 		'You could go to the apartment of a man named Nicholas to apply for a job as a live-in maid. But it is too early for that. You should come back between 16:00 and 20:59.'

locations/city_church.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start':
 	'You can attend confession every weekday between 07:00 and 09:00 or 16:00 and 18:00, and on the weekend between 16:00 and 18:00.'
 	'Vigil is held on Saturdays at 19:00.'
 	'The Divine Liturgy is on Sundays between 09:00 and 12:00.'
-	act 'Go to the residential area':minut += 5 & gt 'city_residential'
+	act 'Return to the city':minut += 5 & gt 'city_residential'
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
 		act 'Attend vigil': gt 'city_church', 'vigil'
 	elseif week = 7 and hour >= 9 and hour < 12 and churchday ! daystart:

locations/city_mansion_entrance.qsrc

@@ -0,0 +1,386 @@
+# city_mansion_entrance
+
+if $ARGS[0] = '':
+	$loc_arg = ''
+	$loc = 'city_mansion_entrance'
+	$menu_loc = 'city_mansion_entrance'
+	$menu_arg = ''
+	menu_off = 0
+	gs 'stat'
+	
+	*clr & cla
+	if home_owned[5] < 2:
+		'<center><h4>Your Land</h4></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/o_empty_field.jpg"></center>'
+		'<center>An empty plot of land you own, suitable for building a large residence.</center>'
+	elseif home_owned[5] = 2:
+		'<center><h4>Your Mansion</h4></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/o_foundation.jpg"></center>'
+		'<center>The framework for your mansion stands here. It still needs more work.</center>'
+	elseif home_owned[5] = 3:
+		'<center><h4>Matryona Mansion</h4></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/matryona_mansion.jpg"></center>'
+		'<center>Your fully built mansion stands here. </center>'
+	end
+	
+	*nl
+	if car > 0 and cardrive = 18:
+		cardrive = 18
+		'<a href="exec:gs ''carF'', ''start''">Your <<$car>></a> is parked here.'
+	end
+
+	act 'Go to the suburbs':minut += 10 & gt 'city_suburbs', 'start'
+	if home_owned[5] = 3: act 'Walk inside the mansion': minut += 4 & gt 'city_mansion_residence_1', 'yfoyer'
+
+	if karta + bankDebtLimit >= 1500000 and home_owned[5] = 0:
+		act 'Buy the land lot for a mansion (1,500,000 <b>₽</b>)':
+			cls
+			karta -= 1500000
+			home_owned[5] = 1
+			minut += 5
+			menu_off = 1
+			gs 'stat'
+			'You have bought the land lot. You can finally build your own dream mansion.'
+
+			act 'Leave':gt $curloc
+		end
+	end
+
+	if karta + bankDebtLimit >= 500000 and home_owned[5] = 1:
+		act 'Pay for running utilities and the building foundation (500,000 <b>₽</b>)':
+			cls
+			karta -= 500000
+			home_owned[5] = 2
+			minut += 5
+			menu_off = 1
+			gs 'stat'
+			'You''ve paid for the utilities. You now have running water, sewage, electric power, and telephone lines. There''s even a foundation built on the land lot.'
+
+			act 'Leave':gt $curloc
+		end
+	end
+
+	if karta + bankDebtLimit >= 1500000 and home_owned[5] = 2:
+		act 'Pay for the finishing touches on the mansion (1,500,000 <b>₽</b>)':
+			cls
+			karta -= 1500000
+			home_owned[5] = 3
+			minut += 5
+			menu_off = 1
+			gs 'stat'
+			'You''ve paid for the construction of the mansion.'
+
+			act 'Leave':gt $curloc
+		end
+	end
+
+	if karta + bankDebtLimit >= 500000 and home_owned[5] = 3 and ymanrem[3] = 0:
+		act 'Pay for the construction of the rooms (500,000 <b>₽</b>)':
+			cls
+			karta -= 500000
+			ymanrem[3] = 1
+			minut += 5
+			menu_off = 1
+			gs 'stat'
+			'You paid for the construction of the rooms. You can finally begin designing the interior of the mansion.'
+
+			act 'Leave':gt $curloc
+		end
+	end
+
+	if home_owned[5] => 2:
+		if karta + bankDebtLimit >= 800000 and banaMansion = 0:
+			act 'Pay for the construction of the sauna (800,000 <b>₽</b>)':
+				cls
+				karta -= 800000
+				banaMansion = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'You paid for the construction of the sauna. You finally have a place where you can relax.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+
+		if karta + bankDebtLimit >= 500000 and bassMansion = 0:
+			act 'Pay for the construction of the pool area (500,000 <b>₽</b>)':
+				cls
+				karta -= 500000
+				bassMansion = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'You paid for the construction of the pool area. You can finally take relaxing swims in private.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+	end
+	if home_owned[5] = 3:
+		if karta + bankDebtLimit >= 250000 and ymanrem[3] = 1:
+			act 'Pay for the renovations of the main hall (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[3] = 2
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the main hall is finished.'
+
+				act 'Leave':gt $curloc
+			end
+
+		elseif karta + bankDebtLimit >= 150000 and ymanrem[3] = 2:
+			act 'Decorate the main hall (150,000 <b>₽</b>)':
+				cls
+				karta -= 150000
+				ymanrem[3] = 3
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the main hall is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+
+		if karta + bankDebtLimit >= 250000 and ymanrem[4] = 0:
+			act 'Pay for the renovations of the bedroom (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[4] = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the bedroom is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		elseif karta + bankDebtLimit >= 300000 and ymanrem[4] = 1:
+			act 'Decorate the bedroom (300,000 <b>₽</b>)':
+				cls
+				karta -= 300000
+				ymanrem[4] = 2
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the bedroom is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+
+		if karta + bankDebtLimit >= 250000 and ymanrem[5] = 0:
+			act 'Pay for the renovations of the bathroom (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[5] = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the bathroom is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		elseif karta + bankDebtLimit >= 250000 and ymanrem[5] = 1:
+			act 'Decorate the bathroom (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[5] = 2
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the bathroom is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+
+		if karta + bankDebtLimit >= 250000 and ymanrem[6] = 0:
+			act 'Pay for the renovations of the kitchen (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[6] = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the kitchen is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		elseif karta + bankDebtLimit >= 350000 and ymanrem[6] = 1:
+			act 'Decorate the kitchen (350,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[6] = 2
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the kitchen is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+
+		if karta + bankDebtLimit >= 250000 and ymanrem[7] = 0:
+			act 'Pay for the renovations of the living room (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[7] = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the living room is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		elseif karta + bankDebtLimit >= 250000 and ymanrem[7] = 1:
+			act 'Decorate the living room (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[7] = 2
+				if TV < 2: TV = 2
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the living room is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+
+		if karta + bankDebtLimit >= 250000 and ymanrem[8] = 0:
+			act 'Pay for the renovations of the fireplace room (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[8] = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the fireplace room is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		elseif karta + bankDebtLimit >= 250000 and ymanrem[8] = 1:
+			act 'Decorate the fireplace room (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[8] = 2
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the fireplace room is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+
+		if karta + bankDebtLimit >= 250000 and ymanrem[9] = 0:
+			act 'Pay for the renovations of the nursery room (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[9] = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the nursery is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		elseif karta + bankDebtLimit >= 250000 and ymanrem[9] = 1:
+			act 'Decorate the nursery (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[9] = 2
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the nursery is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+
+		if karta + bankDebtLimit >= 250000 and ymanrem[10] = 0:
+			act 'Pay for the renovations of the library (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[10] = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the library is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		elseif karta + bankDebtLimit >= 250000 and ymanrem[10] = 1:
+			act 'Decorate the library (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[10] = 2
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the library is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+
+		if karta + bankDebtLimit >= 250000 and ymanrem[11] = 0:
+			act 'Pay for the renovations of the gym (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[11] = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the gym is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		elseif karta + bankDebtLimit >= 250000 and ymanrem[11] = 1:
+			act 'Decorate the gym (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[11] = 2
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the gym is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+
+		if karta + bankDebtLimit >= 250000 and ymanrem[12] = 0:
+			act 'Pay for the renovations of the office (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[12] = 1
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the office is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		elseif karta + bankDebtLimit >= 250000 and ymanrem[12] = 1:
+			act 'Decorate the office (250,000 <b>₽</b>)':
+				cls
+				karta -= 250000
+				ymanrem[12] = 2
+				minut += 5
+				menu_off = 1
+				gs 'stat'
+				'The work on the office is finished.'
+
+				act 'Leave':gt $curloc
+			end
+		end
+	end
+end
+
+--- city_mansion_entrance ---------------------------------
+

locations/city_mansion_residence_1.qsrc

@@ -0,0 +1,221 @@
+# city_mansion_residence_1
+
+if $ARGS[0] = 'yfoyer':
+	$loc = 'city_mansion_residence_1'
+	$loc_arg = 'yfoyer'
+	$menu_loc = 'city_mansion_residence_1'
+	$menu_arg = 'yfoyer'
+	$locM = 'city_mansion_residence_1'
+	$locM_arg = 'yfoyer'
+	$location_type = 'private'
+	killvar '$locclass'
+
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	gs 'themes', 'indoors'
+	if frost > 0: frost = 0
+
+	*clr & cla
+	'<center><b><font color="maroon">Foyer</font></b></center>'
+	if ymanrem[3] = 3:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_foyer.jpg"></center>'
+	elseif ymanrem[3] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_finished.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
+	end
+	
+	if courtletter_date <= daystart and courtletter_date ! 0: gt 'sentence', 'letter'
+
+	act 'Walk outside':
+		if $clothingworntype ! 'nude':
+			minut += 5
+			gt 'city_mansion_entrance'
+		else
+			msg'<b><font color = red>You need to get dressed.</font></b>'
+			gt 'city_mansion_residence_1', 'yfoyer'
+		end
+	end
+
+	if ymanrem[3] >= 1:
+		'The main hall of Matryona Mansion. You can visit the different rooms in the mansion from here.'
+		'There''s a <a href="exec:gt ''mirror'', ''start''">mirror</a> hanging on the wall.'
+		if umbrella > 0:'There''s an umbrella hanging on a hook by the door.'
+		act 'Go to your bedroom': gt 'city_mansion_residence_1', 'ybedroom'
+		act 'Go to your nursery': gt 'city_mansion_residence_2', 'ynursery'
+		act 'Go to your bathroom': gt 'city_mansion_residence_1', 'ybathroom'
+		act 'Go to your kitchen': gt 'city_mansion_residence_1', 'ykitchen'
+		act 'Go to your living room': gt 'city_mansion_residence_2', 'yliving'
+		act 'Go to your lounge': gt 'city_mansion_residence_2', 'ylounge'
+		act 'Go to your library': gt 'city_mansion_residence_2', 'ylibrary'
+		act 'Go to your office': & gt 'city_mansion_residence_2', 'yoffice'
+		act 'Go to your nursery': gt 'city_mansion_residence_2', 'ynursery'
+		act 'Go to your gym': gt 'city_mansion_residence_3', 'ygym'
+	end
+	if bassMansion = 1:act 'Go to your pool': gt 'city_mansion_residence_3', 'ypool'
+	if banaMansion >= 1:act 'Go to your sauna': gt 'city_mansion_residence_3', 'ysauna'
+end
+
+if $ARGS[0] = 'ybedroom':
+	$loc = 'city_mansion_residence_1'
+	$loc_arg = 'ybedroom'
+	$menu_loc = 'city_mansion_residence_1'
+	$menu_arg = 'ybedroom'
+	$locM = 'city_mansion_residence_1'
+	$locM_arg = 'ybedroom'
+	$location_type = 'private'
+	$locclass = 'bedr'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Bedroom</font></b></center>'
+	if ymanrem[4] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_bedroom.jpg"></center>'
+		'<center>Your large bedroom with all the necessities that a modern bedroom has.</center>'
+	elseif ymanrem[4] = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_finished.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
+	end
+	
+	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
+	
+	if ymanrem[4] = 2:
+		*nl
+		'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>.'
+		*nl
+		'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
+		*nl
+		'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>.'
+	end
+end
+
+if $ARGS[0] = 'ybathroom':
+	$loc_arg = 'ybathroom'
+	$loc = 'city_mansion_residence_1'
+	$locM_arg = 'ybathroom'
+	$locM = 'city_mansion_residence_1'
+	$location_type = 'ybathroom'
+	$menu_loc = 'city_mansion_residence_1'
+	$menu_arg = 'ybathroom'
+	$bathtype = 'bathtub shower'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Bathroom</font></b></center>'
+	if ymanrem[5] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_bathroom.jpg"></center>'
+	elseif ymanrem[5] = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_finished.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
+	end
+
+	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
+
+	if ymanrem[5] = 2:
+		'The ornate room holds a shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a> where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
+		
+		gs' selfplay', 'suction_dildo'
+		*nl
+		gs 'din_van', 'private'
+		gs 'din_van', 'misery_2'
+	end
+end
+
+if $ARGS[0] = 'ykitchen':
+	$loc = 'city_mansion_residence_1'
+	$loc_arg = 'ykitchen'
+	$menu_loc = 'city_mansion_residence_1'
+	$menu_arg = 'ykitchen'
+	$locclass = 'kitr'
+
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+
+	*clr & cla
+	'<center><b><font color="maroon">Kitchen</font></b></center>'
+	if ymanrem[6] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_kitchen.jpg"></center>'
+	elseif ymanrem[6] = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_finished.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
+	end
+
+	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
+
+	if ymanrem[6] = 2:
+		'A well stocked kitchen containing all the necessities to make whatever meal you please.'
+		if dirttarelka > 0 and fairy >= dirttarelka:
+			cltarelka += dirttarelka
+			fairy -= dirttarelka
+			dirttarelka = 0
+			'You wash the dirty dishes in the dishwasher.'
+		elseif fairy < dirttarelka:
+			'You can''t use the dishwasher. You have no detergent.'
+		end
+
+		if cltarelka > 0:
+			'You have <b><<cltarelka>></b> clean plates left.'
+		else
+			'<b><font color="red">You don''t have any clean plates left.</font></b>'
+		end
+
+		if dirttarelka > 0:'There are <b><<dirttarelka>></b> dirty dishes in the sink. <a href="exec:dynamic $dirtarm">Wash the dishes</a>.'
+
+		if fairy > 0:
+			'Under the sink is some dishwashing detergent, which is enough for <b><<fairy>></b> ' + iif(fairy = 1, 'time.', 'times.')
+		else
+			'<b><font color="red">You have nothing to wash dishes with. You should buy some detergent.</font></b>'
+		end
+
+		if eda > 0:
+			if cltarelka = 0 or edahot > 0:$edagot = ''
+			if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal (0:30)</a>'
+
+			'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
+		elseif edaD = 0 and eda = 0:
+			'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
+		end
+
+		if edahot > 0:'<a href="exec:dynamic $edahotd">There''s a warm meal on the table.</a>'
+
+		if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
+			act 'Cook a meal for your husband, 2 servings (1:00)':
+				*clr & cla
+				husband += 5
+				eda -= 2
+				minut += 60
+				huseatday = daystart
+				'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
+				'You make some delicious food for you and your husband.'
+
+				act 'Put the food on the table': gt 'city_mansion_residence_1', 'ykitchen'
+			end
+		end
+
+		act 'Have a snack (0:15)':gs 'food', 'snack'
+
+		dynamic $sandwich
+		dynamic $driwater
+		dynamic $dritea
+		dynamic $fill_bottle
+		dynamic $edaD
+		dynamic $pranik
+		dynamic $fatdel
+		dynamic $lekarstvo
+		dynamic $vitamin
+	end
+end
+
+--- city_mansion_residence_1 ---------------------------------
+

locations/city_mansion_residence_2.qsrc

@@ -0,0 +1,346 @@
+# city_mansion_residence_2
+
+if $ARGS[0] = 'yliving':
+	$loc = 'city_mansion_residence_2'
+	$loc_arg = 'yliving'
+	$menu_loc = 'city_mansion_residence_2'
+	$menu_arg = 'yliving'
+	$location_type = 'private'
+	$locclass = 'livingr'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Living Room</font></b></center>'
+	if ymanrem[7] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_living.jpg"></center>'
+	elseif ymanrem[7] = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_finished.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
+	end
+
+	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
+
+	if ymanrem[7] = 2:
+		'A large room where you can watch <a href="exec:gt ''TV'',''start''">TV</a>, or relax on your luxury <a href="exec:gt ''divan'', ''start''">leather sofa</a>.'
+		gs 'subkid'
+	end
+end
+
+if $ARGS[0] = 'ylounge':
+	$loc = 'city_mansion_residence_2'
+	$loc_arg = 'ylounge'
+	$menu_loc = 'city_mansion_residence_2'
+	$menu_arg = 'ylounge'
+	$location_type = 'private'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Lounge</font></b></center>'
+	if ymanrem[8] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_lounge.jpg"></center>'
+	elseif ymanrem[8] = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_finished.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
+	end
+	
+	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
+
+	if ymanrem[8] = 2:
+		'The lounge, where you can work on your tapestries and relax in front of the fireplace.'
+
+		if sewing_kit = 1:
+			'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored next to your favorite chair.'
+			*nl
+			if gobelen > 0:
+				'You have completed <<gobelen>> tapestries.'
+				*nl
+			end
+			if tkan <= 0:
+				'You do not have any fabric.'
+			else
+				if pcs_sewng < 40:
+					'You have <<tkan>> pieces of sewing fabric left.'
+				elseif pcs_sewng < 80:
+					'You have enough fabric for <<tkan>> lessons.'
+				else
+					if newgobelen = 0:
+						act'Start a new tapestry (00:15)':
+							*clr & cla
+							menu_off = 1
+							tkan -= 1
+							newgobelen = 1
+							minut += 15
+							gs'stat'
+							'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
+
+							act'Set the tapestry aside':gt $curloc
+						end
+					end
+				end
+			end	
+			if newgobelen >= 1:
+				'Your tapestry is <<newgobelen/10>> percent finished.'
+				act'Work on the tapestry (01:00)':
+					*clr & cla
+					menu_off = 1
+					minut += 60
+					sewng_exp += rand(pcs_intel/10, pcs_intel/5)
+					gobramax = (pcs_sewng - 70) * 6
+					gobramin = (pcs_sewng - 70) * 2
+					newgobelen += rand(gobramin,gobramax)
+					gs'stat'
+					if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
+						if newgobelen >= 1000:
+						newgobelen = 0
+						gobelen += 1
+						'Your work on the tapestry is done.'
+					end
+					act'Set the tapestry aside':gt $curloc
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'ylibrary':
+	$loc = 'city_mansion_residence_2'
+	$loc_arg = 'ylibrary'
+	$menu_loc = 'city_mansion_residence_2'
+	$menu_arg = 'ylibrary'
+	$location_type = 'private'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Library</font></b></center>'
+	if ymanrem[10] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_library.jpg"></center>'
+	elseif ymanrem[10] = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_finished.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
+	end
+
+	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
+	
+	if ymanrem[10] = 2: 'A huge collection of books are neatly placed on the bookshelves.'
+end
+
+if $ARGS[0] = 'yoffice':
+	$loc = 'city_mansion_residence_2'
+	$loc_arg = 'yoffice'
+	$menu_loc = 'city_mansion_residence_2'
+	$menu_arg = 'yoffice'
+	$locM = 'city_mansion_residence_2'
+	$locM_arg = 'yoffice'
+	$location_type = 'private'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Office</font></b></center>'
+	if ymanrem[12] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_office.jpg"></center>'
+	elseif ymanrem[12] = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_finished.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
+	end
+
+	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
+
+	if ymanrem[12] = 2:
+		'Your work room where you spend most of the time signing important papers and handling your business needs.'
+		'There''s a <a href="exec:gt ''Komp'', ''start''">computer</a> sitting on your antique <a href="exec:gt ''stol'', ''start''">desk</a>.'
+
+		if ml_guitar['carried'] = 1:
+			act 'Place the guitar next to your desk':
+				ml_guitar['carried'] = 0
+				$ml_guitar['location'] = $curloc
+				gt $loc, $loc_arg
+			end
+		elseif $ml_guitar['location'] = $curloc:
+			act 'Pick up the guitar':
+				ml_guitar['carried'] = 1
+				$ml_guitar['location'] = ''
+				gt $loc, $loc_arg
+			end
+		end
+
+		if ml_online['account'] = 0 and internet > 0:
+			act 'Set up an online music account': gt 'music_onlinemusic', 'setupAccount'
+		end
+
+		!!Uploading recorded music if there are any not uploaded yet
+		if ml_uploadablemusic > 0 and internet > 0 and ml_online['account'] = 1:
+			if pcs_inhib < 30:
+				if pcs_inhib < 10:
+					$diff = 'hard'
+				elseif pcs_inhib < 20:
+					$diff = 'medium'
+				else
+					$diff = 'easy'
+				end
+				gs 'willpower', 'skill', 'self', $diff
+
+				will_cost = (will_cost * 2) - (pcs_perform)
+				if will_cost <= pcs_willpwr:
+					act 'Upload music (<<will_cost>> Willpower)': gt 'music_onlinemusic', 'uploadmusic'
+				else
+					act 'Upload music (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+			end
+			act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
+		end
+
+		if ml_uploadablemusic > 0:
+			act 'Delete old recordings': gt 'music_onlinemusic', 'deleteoldmusic'
+		end
+
+		if hour > 8 and hour < 22:
+			if ml_guitar['hasguitar'] = 1:
+				act 'Play something on the guitar':
+					pcs_mood += 10
+					minut += 10
+					gs 'stat'
+					'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
+					'You hum along to the tune, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
+				end
+			end
+
+			if ml_guitar['hasguitar'] = 1 and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+				if sisterHere = 1 and pcs_inhib < 30:
+					if pcs_inhib < 10:
+						$diff = 'hard'
+					elseif pcs_inhib < 20:
+						$diff = 'medium'
+					else
+						$diff = 'easy'
+					end
+					gs 'willpower', 'skill', 'self', $diff
+					will_cost = (will_cost * 3) - (pcs_perform)
+					if will_cost <= pcs_willpwr:
+						act 'Practice guitar (<<will_cost>> Willpower)':
+							inhib_exp += rand(1,2)
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'music_bedroomPractice', 'guitar'
+						end
+					else
+						act 'Practice guitar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
+					end
+				else
+					act 'Practice guitar': gt 'music_bedroomPractice', 'guitar'
+				end
+			end
+
+			!! Streaming music
+			if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
+				ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
+				if pcs_inhib < 30:
+					if pcs_inhib < 10:
+						$diff = 'hard'
+					elseif pcs_inhib < 20:
+						$diff = 'medium'
+					else
+						$diff = 'easy'
+					end
+					gs 'willpower', 'skill', 'self', $diff
+					will_cost = (will_cost * 3) - (pcs_perform)
+
+					if will_cost <= pcs_willpwr:
+						act 'Live stream (<<ml_streamtime>> minutes) (<<will_cost>> Willpower)':
+							inhib_exp += rand(1,3)
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'music_onlinemusic', 'liveStream'
+						end
+					else
+						act 'Live stream (<<ml_streamtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				else
+					act 'Live stream (<<ml_streamtime>> minutes)': gt 'music_onlinemusic', 'liveStream'
+				end
+			end
+
+			!! Recording music
+			if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+				if pcs_inhib < 20:
+					if pcs_inhib < 10:
+						$diff = 'medium'
+					elseif pcs_inhib < 20:
+						$diff = 'easy'
+					end
+					gs 'willpower', 'skill', 'self', $diff
+
+					if will_cost <= pcs_willpwr:
+						act 'Record a song with your phone (<<will_cost>> Willpower)':
+							inhib_exp += rand(1,2)
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'music_onlinemusic', 'recordSong'
+						end
+						if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
+							act 'Record and edit a song (<<will_cost>> Willpower)':
+								inhib_exp += rand(1,2)
+								gs 'willpower', 'pay', 'self'
+								gs 'stat'
+								gt 'music_onlinemusic', 'recordAndEditSong'
+							end
+						end
+					else
+						act 'Record a song (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						act 'Record and edit a song (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				else
+					act 'Record a song with your phone': gt 'music_onlinemusic', 'recordSong'
+					if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
+						act 'Record and edit a song': gt 'music_onlinemusic', 'recordAndEditSong'
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'ynursery':
+	$loc = 'city_mansion_residence_2'
+	$loc_arg = 'ynursery'
+	$menu_loc = 'city_mansion_residence_2'
+	$menu_arg = 'ynursery'
+	$location_type = 'private'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Nursery</font></b></center>'
+	if ymanrem[9] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_nursery.jpg"></center>'
+		'<center>The neatly designed nursery room, only the best for your children.</center>'
+	elseif ymanrem[9] = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_finished.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
+	end
+
+	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
+
+	if ymanrem[9] = 2: gs 'subkid'
+end
+
+--- city_mansion_residence_2 ---------------------------------
+

locations/city_mansion_residence_3.qsrc

@@ -0,0 +1,133 @@
+# city_mansion_residence_3
+
+if $ARGS[0] = 'ygym':
+	$loc = 'city_mansion_residence_3'
+	$loc_arg = 'ygym'
+	$menu_loc = 'city_mansion_residence_3'
+	$menu_arg = 'ygym'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Gym</font></b></center>'
+	if ymanrem[11] = 2:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_gym.jpg"></center>'
+	elseif ymanrem[11] = 1:
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_finished.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
+	end
+
+	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
+	if bassMansion = 1: act 'Go to your pool area': gt 'city_mansion_residence_3', 'ypool'
+	if banaMansion >= 1: act 'Go to your sauna': gt 'city_mansion_residence_3', 'ysauna'
+
+	if ymanrem[11] = 2:
+		'Your private gym with all the necessities to live a healthy life. From here you can walk over to the pool or relax in the sauna.'
+		gs 'exercise', 'start'
+	end
+end
+
+if $ARGS[0] = 'ypool':
+	$loc = 'city_mansion_residence_3'
+	$loc_arg = 'ypool'
+	$menu_loc = 'city_mansion_residence_3'
+	$menu_arg = 'ypool'
+	$location_type = 'private'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Swimming Pool</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_pool.jpg"></center>'
+
+	act 'Go back inside': gt 'city_mansion_residence_1', 'yfoyer'
+	act 'Go into your gym': gt 'city_mansion_residence_3', 'ygym'
+	act 'Go to your sauna': gt 'city_mansion_residence_3', 'ysauna'
+	act 'Swim (1:00)':
+		menu_off = 1
+		pcs_makeup = 1
+		cumspclnt = 10
+		gs 'cum_cleanup'
+		minut += 60
+		pcs_mood += 50
+		if pcs_sweat > 10:pcs_sweat = 10 + rand(0,4)
+		if pcs_stren < 40:stren_exp += 2
+		fat -= 1
+		gs 'stat'
+
+		*clr & cla
+		if func('body_din','pregnancyVisibility') = 0:
+			if $clothingworntype = 'nude':
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_nude_<<rand(1,10)>>.jpg"></center>'
+				inhib_exp += rand(2,4)
+			else
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_bikini_<<rand(1,8)>>.jpg"></center>'
+				if pcs_inhib < 50: inhib_exp += rand(2,4)
+			end
+		else
+			if $clothingworntype = 'nude':
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_nude_<<rand(1,2)>>.jpg"></center>'
+				inhib_exp += rand(2,4)
+			else
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'
+				if pcs_inhib < 50: inhib_exp += rand(2,4)
+			end
+		end
+		'You swim in your pool. The water refreshes and invigorates you.'
+		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
+
+		act 'Get out of the water':gt 'city_mansion_residence_3', 'ypool'
+	end
+end
+
+if $ARGS[0] = 'ysauna':
+	$loc = 'city_mansion_residence_3'
+	$loc_arg = 'ysauna'
+	$menu_loc = 'city_mansion_residence_3'
+	$menu_arg = 'ysauna'
+	$location_type = 'private'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	gs 'themes', 'indoors'
+
+	*clr & cla
+	'<center><b><font color="maroon">Sauna</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/y_sauna.jpg"></center>'
+
+	act 'Go back inside': gt 'city_mansion_residence_1', 'yfoyer'
+	act 'Go into your gym': gt 'city_mansion_residence_3', 'ygym'
+	act 'Go to your pool': gt 'city_mansion_residence_3', 'ypool'
+	act 'Use the sauna (1:00)':
+		minut += 60
+		pcs_mood = 25
+		if sauna_daystart ! daystart:
+			sauna_daystart = daystart
+			pcs_mood = 25
+			fat -= 5
+			pcs_skin += rand(4,8)
+			pcs_willpwr += 6
+		end
+		gs 'stat'
+		*clr & cla
+		if PCloswimwear = 1:
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunabikini.jpg"></center>'
+			if pcs_inhib < 40: inhib_exp += rand(1,2)
+		else
+			'<center><img <<$set_imgh>> src="images/locations/city/shared/sauna/sau.jpg"></center>'
+			if pcs_inhib < 60: inhib_exp += rand(2,4)
+		end
+
+		'You spend an hour relaxing in the heat of the sauna. You feel revitalised.'
+		act 'Leave the sauna':gt 'city_mansion_residence_3', 'ysauna'
+	end
+end
+
+--- city_mansion_residence_3 ---------------------------------
+

locations/city_suburbs.qsrc

@@ -27,14 +27,14 @@ if $ARGS[0]='start':
 	end
 
 	if home_owned[5] = 0:
-		'There is a vacant piece of land for sale where a large house could be constructed.'
-		act 'Visit the land for sale': minut += 10 & gt 'youplace'
+		'There is a vacant piece of land for sale where a large mansion could be constructed.'
+		act 'Visit the land for sale': minut += 10 & gt 'city_mansion_entrance'
 	elseif home_owned[5] < 3:
 		'You mansion is partially built near here.'
-		act 'Visit your mansion': minut += 10 & gt 'youplace'
+		act 'Visit your mansion': minut += 10 & gt 'city_mansion_entrance'
 	else
 		'One of the most impressive buildings is your newly built mansion.'
-		act 'Visit your mansion': gt 'youplace'
+		act 'Visit Matryona Mansion': gt 'city_mansion_entrance'
 	end
 	act 'View the insane asylum': minut += 2 & gt 'city_suburbs', 'ps1'
 	act 'View the creepy old building': minut += 2 & gt 'city_suburbs', 'ps2'

locations/din_van.qsrc

@@ -1197,7 +1197,7 @@ if $ARGS[0] = 'misery':
 			poroshok -= 2
 			minut += 60
 			husporday = daystart
-			pcs_mood -= 25
+			pcs_mood -= 20
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stir.jpg"></center>'
 			*nl
 			'You spend an hour washing your husband''s dirty laundry.'
@@ -1212,7 +1212,53 @@ if $ARGS[0] = 'misery':
 			husband += 5
 			minut += 60
 			huspolday = daystart
-			pcs_mood -= 25
+			pcs_mood -= 20
+			!!'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
+			*nl
+			'You take a rag and start cleaning the apartment.'
+
+			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
+		end
+	end
+end
+
+if $ARGS[0] = 'misery_2':
+	menu_off = 1
+
+	if stiralka > 0:
+		if husband > 0 and husbanday > 0 and husporday ! daystart and poroshok >= 1:
+			husband += 5
+			poroshok -= 1
+			husporday = daystart
+			'The washing machine washed your husband''s dirty laundry.'
+		elseif poroshok < 1:
+			'You have run out of washing powder for the washing machine.'
+		end
+	end
+
+	if husband > 0 and husbanday > 0 and husporday ! daystart and poroshok >= 2:
+		act 'Wash your husband''s clothes (2 units of washing powder) (1:00)':
+			*clr & cla
+			husband += 5
+			poroshok -= 2
+			minut += 60
+			husporday = daystart
+			pcs_mood -= 20
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stir.jpg"></center>'
+			*nl
+			'You spend an hour washing your husband''s dirty laundry.'
+
+			act 'Leave the bathroom':menu_off = 0 & gt $loc, $loc_arg
+		end
+	end
+
+	if husband > 0 and husbanday > 0 and huspolday ! daystart:
+		act 'Clean the apartment (1:00)':
+			*clr & cla
+			husband += 5
+			minut += 60
+			huspolday = daystart
+			pcs_mood -= 20
 			!!'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
 			*nl
 			'You take a rag and start cleaning the apartment.'

locations/gad_church.qsrc

@@ -29,8 +29,7 @@ if $ARGS[0] = 'start':
 	!!'You can attend confession every weekday between 07:00 and 09:00 or 16:00 and 18:00, and on the weekend between 16:00 and 18:00.'
 	'Vigil is held on Saturdays at 19:00.'
 	'The Divine Liturgy is on Sundays between 09:00 and 12:00.'
-!!this act needs to go to gad village not sure where in the village works best so left it as is.
-	act 'Go to the residential area':minut += 3 & gt 'gadukino'
+	act 'Go to the village square': minut += 3 & gt 'gadukino'
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
 		act 'Attend vigil': gt 'gad_church', 'vigil'
 	elseif week = 7 and hour >= 9 and hour < 12 and churchday ! daystart:

locations/gadukino.qsrc

@@ -121,12 +121,12 @@ if $ARGS[0] = '':
 
 		!Looks like no reference to Gadmarket exists. Adding it...FinnMacha
 		*nl
+		'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
+		'Near the square sits the old <a href="exec: minut += 3 & gt ''gad_church'',''start''">chapel</a>, it is not in the best shape, but it appears to be well loved.'
 		if hour >= 8 and hour < 20:
-			'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
 			'One of the buildings facing the square has a sign saying <a href="exec: minut += 5 & gt ''gadmarket''">General Store</a>. A sign in the door proclaims it "OPEN". It looks like the only place in the village to buy goods.'
 			act 'Go to the general store': minut += 5 & gt 'gadmarket'
 		else
-			'In the center of the village is a small grass covered square where villagers gather to meet and discuss or argue politics or village life.'
 			'One of the building facing the square has a sign saying General Store. A sign in the door proclaims it "CLOSED". It looks like the only place in the village to buy goods.'
 		end
 

locations/liam.qsrc

@@ -66,7 +66,11 @@ end
 act 'Walk to Okhlopkov Square (0:05)':minut += 5 & gt 'liames'
 act 'Walk to the highway (0:05)':minut += 5 & nroad = 15 & gt 'road'
 act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'pav_park', 'start'
-act 'Walk to the train station (0:15)':minut += 15 & nroad = 15 & gt 'pav_train'
+act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
+if Trainpass_day > daystart:
+	act 'Board train (0:20)':minut += 20 & gt 'pav_train_hall', 'platform'
+end
+act 'Walk to the Market (0:20)':minut += 20 & gt 'pav_market'
 act 'Walk to the Commercial area (0:25)':minut += 25 & gt 'pav_commercial'
 act 'Walk to the Residential area (0:30)':minut += 30 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:30)':minut += 30 & gt 'pav_industrial'

locations/mirror.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	gs 'stat' &! It should be here, because some of the strigs have to be initialized
 	!! first of all we have to check whether we can use the mirror
 	if mirror_steam ! hour: mirror_steam = 100
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour: gt'mirror','steam'
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' and mirror_steam = hour: gt'mirror','steam'
 
 	$makeupLight =   '<center><img <<$set_imgh>> src="images/pc/activities/routine/2.jpg"></center>&nbsp;<br>You subtly apply some neutral tones, with a light application of makeup to bring out your natural beauty.'
 	$makeupNatural = '<center><img <<$set_imgh>> src="images/pc/activities/routine/2.jpg"></center>&nbsp;<br>You apply some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
@@ -579,28 +579,28 @@ if $ARGS[0] = 'steam':
 end
 
 if $routine1 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' and mirror_steam = hour:
 
 	else
 		act 'Apply <<$routine1custname>>':gt 'mirror','works',mid($routine1,1,1),mid($routine1,2,1),mid($routine1,3,1)
 	end
 end
 if $routine2 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' and mirror_steam = hour:
 
 	else
 		act 'Apply <<$routine2custname>>':gt 'mirror','works',mid($routine2,1,1),mid($routine2,2,1),mid($routine2,3,1)
 	end
 end
 if $routine3 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' and mirror_steam = hour:
 
 	else
 		act 'Apply <<$routine3custname>>':gt 'mirror','works',mid($routine3,1,1),mid($routine3,2,1),mid($routine3,3,1)
 	end
 end
 if $routine4 ! '' and pcs_makeup < 2:
-	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc = 'yvan'and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' and mirror_steam = hour:
 
 	else
 		act 'Apply <<$routine4custname>>':gt 'mirror','works',mid($routine4,1,1),mid($routine4,2,1),mid($routine4,3,1)

locations/music_buskingevents.qsrc

@@ -52,6 +52,7 @@ if $ARGS[0] = 'calculate_tips':
 		ml_location_mod = 15
 	end 	
 
+	ml_time_mod = 5
 	if week >= 5: ml_time_mod += 10
 	if hour >= 17: ml_time_mod += 10
 		

locations/pav_commercial.qsrc

@@ -141,7 +141,11 @@ if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pav_complex', 'start'
-act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train'
+act 'Walk to the Market (0:05)':minut += 5 & gt 'pav_train'
+act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train_hall'
+if Trainpass_day > daystart:
+	act 'Board train (0:15)':minut += 15 & gt 'pav_train_hall', 'platform'
+end
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'liam'
 

locations/pav_complex.qsrc

@@ -146,7 +146,11 @@ if $ARGS[0] = 'start':
 	act 'Walk to the residential area (0:02)':minut += 2 & gt 'pav_residential'
 	act 'Walk to the commercial area (0:05)':minut += 5 & gt 'pav_commercial'
 	act 'Walk to the industrial region (0:05)':minut += 5 & gt 'pav_industrial'
-	act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train'
+	act 'Walk to the Market (0:10)':minut += 10 & gt 'pav_market'
+	act 'Walk to the train station (0:20)':minut += 20 & gt 'pav_train_hall'
+	if Trainpass_day > daystart:
+		act 'Board train (0:25)':minut += 25 & gt 'pav_train_hall', 'platform'
+	end
 	act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
 	if storyline = 1 and home_owned[2] = 1: 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'

locations/pav_industrial.qsrc

@@ -76,6 +76,12 @@ end
 act 'Walk to the Five Eight estate (0:05)':minut += 5 & gt 'pav_complex', 'start'
 act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
 act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
+act 'Walk to the Market (0:05)':minut += 5 & gt 'pav_market'
+act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
+if Trainpass_day > daystart:
+	act 'Board train (0:20)':minut += 20 & gt 'pav_train_hall', 'platform'
+end
+act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
 
 if week < 7 and hour >= 8 and hour < 18: 

locations/pav_train.qsrc → locations/pav_market.qsrc

@@ -1,8 +1,8 @@
-# pav_train
+# pav_market
 !2021/05/12
-$loc = 'pav_train'
+$loc = 'pav_market'
 $loc_arg = ''
-$menu_loc = 'pav_train'
+$menu_loc = 'pav_market'
 $menu_arg = ''
 menu_off = 0
 $location_type = 'public_outdoors'
@@ -19,8 +19,9 @@ end
 
 clr
 gs 'stat'
-'<center><h2>Pavlovsk''s train station</h2></center>'
+'<center><h2>Pavlovsk''s Market Square</h2></center>'
 if month >= 11 or month <= 3:
+!!need new images Anya
 	if hour >= 9 and hour <= 16:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_day.jpg"></center>'
 	else
@@ -34,9 +35,9 @@ else
 	end
 end
 *nl
-'Pavlovsk''s modest train station. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_train_hall''">train station</a>. Attached to the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Also nearby is the small <a href="exec:minut += 3 & gt ''pav_station'', ''station_outside''">police station</a> of Pavlovsk. '
+'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_market_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Also nearby is the small <a href="exec:minut += 3 & gt ''pav_station'', ''station_outside''">police station</a> of Pavlovsk. '
 *nl
-'The front of the train station has a large square, where you can find a <a href="exec:minut += 1 & gt ''pav_train_market'', ''start''">market</a> on most days.'
+'The other side of the train station is a large square, where you can find a <a href="exec:minut += 1 & gt ''pav_market_market'', ''start''">market</a> on most days.'
 *nl
 'A rather run-down <a href="exec:minut += 1 & gt ''HotelHole''">hotel</a> is just across the square, where travelers can spend the night. The manager is always looking for maids among the local young girls. Because of it''s frequent use by the local prostitutes, most people prefer to stay at the middle-class hotel by the main road.'
 
@@ -50,22 +51,10 @@ if kidaloa = 0:
 		menu_off = 1
 		monthKidalo = month
 		gs 'stat'
-		'<center><h4>Pavlovsk''s train station</h4></center>'
-		if month >= 11 or month <= 3:
-			if hour >= 9 and hour <= 16:
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_day.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_night.jpg"></center>'
-			end
-		else
-			if hour >= 7 and hour <= 18:
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_day.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_night.jpg"></center>'
-			end
-		end
+		'<center><h4>Pavlovsk''s Market Square</h4></center>'
+		!!need new image
 		
-		'When you arrive at the train station, it''s impossible to not notice a girl holding a microphone and a man following her with a large camera. They''re coming straight towards you. The girl beckons you to come closer and glances over at towards the man holding the camera, who gives her a subtle nod.'
+		'When you arrive at the Market Square, it''s impossible to not notice a girl holding a microphone and a man following her with a large camera. They''re coming straight towards you. The girl beckons you to come closer and glances over at towards the man holding the camera, who gives her a subtle nod.'
 		'She turns back to you and happily exclaims: "Hello! We''re shooting a pilot for TV. It''s going to be a novel program: it is a show in which we hand out gifts to random strangers, and then film their response. It''s called "Happiness in Russia", we''re hoping it will catch on all over the world. We have chosen you to be part of our pilot, congratulations!"'
 		'She grabs hold of a large box the camera man handed to her. It''s beautifully wrapped, with a nice bow to boot. She whispers to you: "This box contains a brand new laptop! Just act surprised when you open it!"'
 
@@ -73,20 +62,8 @@ if kidaloa = 0:
 			*clr & cla
 			gs 'stat'
 			kidaloa = 1
-			'<center><h4>Pavlovsk''s train station</h4></center>'
-			if month >= 11 or month <= 3:
-				if hour >= 9 and hour <= 16:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_day.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_night.jpg"></center>'
-				end
-			else
-				if hour >= 7 and hour <= 18:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_day.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_night.jpg"></center>'
-				end
-			end
+			'<center><h4>Pavlovsk''s Market Square</h4></center>'
+			!!need new image
 			
 			'Even though you definitely wouldn''t mind a new laptop, you simply don''t have time to talk to them right now. You politely decline and walk away before they can protest. A few minutes later you see the two of them hastily running across the square, while some poor guy opens the fancily packed box only to find a brick in it. By the time he realizes he got scammed, they are long gone. Looks like you dodged a bullet there!'
 			
@@ -96,20 +73,8 @@ if kidaloa = 0:
 		act 'Wow, this must be your lucky day!':
 			*clr & cla
 			gs 'stat'
-			'<center><h4>Pavlovsk''s train station</h4></center>'
-			if month >= 11 or month <= 3:
-				if hour >= 9 and hour <= 16:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_day.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_night.jpg"></center>'
-				end
-			else
-				if hour >= 7 and hour <= 18:
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_day.jpg"></center>'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_night.jpg"></center>'
-				end
-			end
+			'<center><h4>Pavlovsk''s Market Square</h4></center>'
+			!!need new image
 			
 			'You happily take the box from the girl''s hands as the man starts filming. The girl holds the microphone closer to her mouth, and invites you to give some shout-outs to relatives and friends while you''re on TV. Then she points the microphone at you. You gladly accept the invitation and address your friends and family enthusiastically while looking at the camera, sincerely hoping you did not leave anyone out. Then the man turns the camera away for a second.'
 			'The girl tells you: "Unfortunately, the government doesn''t just let us give away items for nothing. We''re legally obligated to have our winners pay VAT over the amount of money their gift is worth. In your case, this comes down to 5000 <b>₽</b>."'
@@ -120,21 +85,8 @@ if kidaloa = 0:
 				kidaloa = 1
 				if pcs_mood > 5: pcs_mood = 5
 				gs 'stat'
-				'<center><h4>Pavlovsk''s train station</h4></center>'
-				if month >= 11 or month <= 3:
-					if hour >= 9 and hour <= 16:
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_day.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_night.jpg"></center>'
-					end
-				else
-					if hour >= 7 and hour <= 18:
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_day.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_night.jpg"></center>'
-					end
-				end
-			
+				'<center><h4>Pavlovsk''s Market Square</h4></center>'
+			!!need new image
 				'You quickly give them the money and enthusiastically begin to pull at the bow. When you finally manage to tear the wrapping paper off and open the box, you only find a brick wrapped in newspaper. You look up trying to find the man and girl to get your money back, but they are nowhere to be found. You feel terrible for being scammed out of your money, and angrily stuff the box in a garbage can before you move on.'
 				
 				act 'Return to the train station':minut += 15 & gt $curloc
@@ -142,20 +94,8 @@ if kidaloa = 0:
 			act 'Say you can''t afford it right now':
 				*clr & cla
 				gs 'stat'
-				'<center><h4>Pavlovsk''s train station</h4></center>'
-				if month >= 11 or month <= 3:
-					if hour >= 9 and hour <= 16:
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_day.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_night.jpg"></center>'
-					end
-				else
-					if hour >= 7 and hour <= 18:
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_day.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_night.jpg"></center>'
-					end
-				end
+				'<center><h4>Pavlovsk''s Market Square</h4></center>'
+			!!need new image
 			
 				'With some regret in your voice, you apologize to the man and girl and explain that you can''t afford to pay the VAT right now. They try to explain to you that this could very well be a one-time opportunity and that you are missing out on a free laptop, but you have to decline. You simply cannot afford to spend the money you have right now on a frivolous purchase like a laptop, even if it comes really cheap.'
 				'Sympathizing with you, they promise to look for you if they ever come back to Pavlovsk for another episode of the show.'
@@ -175,20 +115,8 @@ if kidalob = 0:
 		monthKidalo = month
 		minut += 5
 		gs 'stat'
-		'<center><h4>Pavlovsk''s train station</h4></center>'
-		if month >= 11 or month <= 3:
-			if hour >= 9 and hour <= 16:
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_day.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_winter_night.jpg"></center>'
-			end
-		else
-			if hour >= 7 and hour <= 18:
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_day.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/pavtrainstation_night.jpg"></center>'
-			end
-		end
+		'<center><h4>Pavlovsk''s Market Square</h4></center>'
+			!!need new image
 			
 		'As you walk across the square towards the station, you notice two well dressed men staring at you. After some brief consideration they come towards you, and you can just about hear what they''re saying: "Wow, she''s just the model we need. She has this... Claudia Schiffer feel to her, don''t you agree?"'
 		'You can see the other man nod just as they get close to you, and one of the men stops you: "Excuse me, miss. We are opening a new fashion store in the city and are looking for a model to feature in our advertisements. We have been looking for just the right girl all day and... I think we just found her!"'
@@ -208,6 +136,7 @@ if kidalob = 0:
 			*clr & cla
 			minut += 2
 			gs 'stat'
+			!!need image
 			'Wow, this offer sounds amazing! There is no way you can decline. The guys take you to the back of the railway station, and the guy who hasn''t said anything to you pulls out an expensive looking camera, mounting it on a tripod near some trees.'
 			'The first guy approaches you and says: "The shoot will be against a natural background. We''ve done market research, and have determined that the picturesque background of the outdoors is by far the most desirable option for our campaign. There is only one problem... your dress is not what we are looking for at all. You''ll have to change."'
 			'The guy opens the trunk of his car and gives you a rather cheap looking sundress. "You can change your clothes inside the car, no one will notice", he says.'
@@ -238,6 +167,7 @@ if kidalob = 0:
 				KILLVAR 'lastwornclothingnumber'
 				
 				gs 'stat'
+				!!need image
 				'You quickly get into the car and take off your dress, and put on the dress the man gave you. You give your <<$titsize>> breasts a squeeze through the fabric, adjusting the dress a bit so it fits well around them for the photo shoot.'
 				
 				act 'Pose for the camera':
@@ -245,6 +175,7 @@ if kidalob = 0:
 					kidalob = 1
 					minut += 5
 					gs 'stat'
+					!!need image
 					'You get out of the car leaving your possessions in there, figuring it''s easier to just collect them when you change back to your regular clothes. You get out and walk to the tree the camera is aimed at. The guy who hasn''t said a word mans the camera, while the first guy instructs you how to stand in several poses. "Very nice, very nice... now turn your back to the camera!" The camera clicks several times. "Excellent. Now tilt your head backwards and close your eyes." You do as instructed, waiting for the now familiar click of the camera. It never comes.'
 					
 					act 'Ask what''s taking so long':
@@ -253,6 +184,7 @@ if kidalob = 0:
 						minut += 5
 						if pcs_mood > 50: pcs_mood = 50
 						gs 'stat'
+						!!need image
 						'After a while you turn around and open your eyes, wanting to ask the guys what''s taking so long. You open your eyes right on time to see the car, with the guys in it, speed off and zip around a corner. Then you realize: all your stuff is still on the back seat of the car! Slowly realizing you have just been scammed out of your good dress and all of your money, you sit down on a tree stump and hold your head in your hands for a minute or two, pondering how you could''ve been so stupid as to believe them.'
 						
 						act 'Return to the train station':gt $curloc
@@ -267,15 +199,18 @@ end
 
 gs 'family'
 
-act 'Enter the station building': minut += 3 & gt 'pav_train_hall'
+act 'Enter the station building': minut += 3 & gt 'pav_market_hall'
 act 'Walk to the Commercial area (0:10)':minut += 10 & gt 'pav_commercial'
 act 'Walk to the Residential area (0:15)':minut += 15 & gt 'pav_residential'
 act 'Walk to the Industrial region (0:15)':minut += 15 & gt 'pav_industrial'
 act 'Walk to the Five Eight estate (0:15)':minut += 15 & gt 'pav_complex', 'start'
+if Trainpass_day > daystart:
+	act 'Board train (0:15)':minut += 15 & gt 'pav_market_hall', 'platform'
+end
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:15)':minut += 15 & nroad = 19 & gt 'liam'
 
 gs 'camera', 'check_location'
 
---- pav_train ---------------------------------
+--- pav_market ---------------------------------
 

locations/pav_residential.qsrc

@@ -145,10 +145,14 @@ elseif InvitationToDimkaNYparty = 1 and month ! 12:
 end
 
 act 'Walk to the Five Eight estate (0:02)':minut += 2 & gt 'pav_complex', 'start'
-act 'Walk to the commercial area (0:05)':minut += 5 & gt 'pav_commercial'
-act 'Walk to the industrial region (0:05)':minut += 5 & gt 'pav_industrial'
-act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train'
-act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'liam'
+act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
+act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
+act 'Walk to the Market (0:05)':minut += 5 & gt 'pav_market'
+act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
+if Trainpass_day > daystart:
+	act 'Board train (0:20)':minut += 20 & gt 'pav_train_hall', 'platform'
+end
+act 'Walk to Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'liam'
 
 act 'Wait':gs 'obj_din', 'wait'
 

locations/pav_train_hall.qsrc

@@ -54,7 +54,7 @@ if $ARGS[0] = '':
 		*nl
 	end
 
-	act 'Leave the train station':minut += 3 & gt 'pav_train'
+	act 'Leave the train station':minut += 3 & gt 'pav_market'
 
 	if Trainpass_day > daystart:
 		'You have <<Trainpass_day - daystart>> days left on your train pass.'

locations/road.qsrc

@@ -30,8 +30,8 @@ if $ARGS[0] = '':
 	end
 	if nroad = 16:act 'Check out the construction site (1:00)':minut += 60 & gt 'obekt'
 	if nroad = 20:
-		act 'Walk to Pavlovsk train station (0:15)': minut += 15 & gt 'pav_train'
-		act 'Walk to Pavlovsk commercial area (0:15)': minut += 15 & gt 'pav_commercial'
+		act 'Walk to Pavlovsk train station (0:15)': minut += 15 & gt 'pav_train_hall'
+		act 'Walk to Pavlovsk Commercial area (0:15)': minut += 15 & gt 'pav_commercial'
 	end
 	if nroad < 20:act 'Walk towards Pavlovsk (0:20)':minut += 20 & nroad += 1 & gt $curloc
 	if nroad > 0:act 'Walk towards St. Petersburg (0:20)':minut += 20 & nroad -= 1 & gt $curloc

locations/set_home.qsrc

@@ -24,8 +24,8 @@ elseif curr_home = 4:
 elseif curr_home = 5:
 	$home_name = 'My mansion'
 	$home_town = 'city'
-	$home_location = 'youplace'
-	$home_entrance = 'ymans'
+	$home_location = 'city_mansion_entrance'
+	$home_entrance = 'city_mansion_residence'
 elseif curr_home = 6:
 	$home_name = 'My hotel room in Pavlovsk'
 	$home_town = 'pavlovsk'

locations/sitr.qsrc

@@ -152,7 +152,7 @@ if hour > 8 and hour < 22:
 	end
 
 	!! Streaming music 
-	if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
+	if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
 		ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
 
 		if pcs_inhib < 30:
@@ -182,7 +182,7 @@ if hour > 8 and hour < 22:
 	end
 
 	!! Recording music
-	if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+	if ml_guitar['hasguitar'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
 		if pcs_inhib < 20:
 			if pcs_inhib < 10: 
 				$diff = 'medium'

locations/succubus.qsrc

@@ -442,7 +442,7 @@ if $args[0] = 'sucwalkinginit':
 	!!Zone 2;
 	!!'bedrPar' = Parent''s apartment in Pavlovsk
 	!!'HotelRoom' = Hotel next to train station in Pavlovsk
-	!!Zone 3; 'ybedr' = Mansion outside city
+	!!Zone 3; 'ybedroom' = Mansion outside city
 	!!Zone 4; 'bedr2x' = Apartment in "Old Town" (aka Pushkin)
 	!!Zone 5; 'gadhouse' = Grandmother''s house in Gadukino
 
@@ -450,7 +450,7 @@ if $args[0] = 'sucwalkinginit':
 		sucslpzone = 1
 	elseif $loc = 'bedrPar' or $loc = 'HotelRoom':
 		sucslpzone = 2
-	elseif $loc = 'ybedr':
+	elseif $loc_arg = 'ybedroom':
 		sucslpzone = 3
 	elseif $loc = 'bedr2x':
 		sucslpzone = 4

locations/yban.qsrc

@@ -1,35 +0,0 @@
-# yban
-
-$loc_arg = ''
-$loc = 'yban'
-*clr & cla
-gs 'stat'
-gs 'themes', 'indoors'
-
-'<center><b><font color="maroon">Sauna</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yban.jpg"></center>'
-
-if $clothingworntype ! 'nude':act 'Walk back to the house':minut += 5 & gt 'youplace'
-act 'Go to the gym': minut += 5 & gt 'ysport'
-
-if saunaday ! daystart:
-	act 'Use the sauna':
-		cls
-		minut += 60
-		fat -= 10
-		pcs_sweat = rand(0,5)
-		noShampoo = 1
-		dynamic $showerdin
-		saunaday = daystart
-		pcs_mood = 100
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/sauna/sau.jpg"></center>'
-		'You spend an hour relaxing in the heat of the sauna. You take a shower after you''re done to cool down and get dressed. You feel revitalised.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
-
-		act 'Leave':gt 'yban'
-	end
-end
-
---- yban ---------------------------------
-

locations/ybass.qsrc

@@ -1,33 +0,0 @@
-# ybass
-
-$loc_arg = $ARGS[0]
-$loc = 'ybass'
-clr
-gs 'stat'
-'<center><b><font color="maroon">Swimming Pool</font></b></center>'
-'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ybass.jpg"></center>'
-
-if $clothingworntype ! 'nude': act 'Go to your house':minut += 5 & gt 'youplace'
-act 'Go into your gym': gt 'ysport'
-
-act 'Swim (1:00)':
-	cla
-	*clr
-	pcs_makeup = 1
-	cumspclnt = 10
-	gs 'cum_cleanup'
-	minut += 60
-	pcs_sweat = 10 + rand(0,4)
-	pcs_mood += 5
-	if willday_swim ! daystart: willday_swim = daystart & pcs_willpwr += 1
-	if pcs_stren < 40:stren_exp += 1
-
-	'<center><img <<$set_imgh>> src="images/locations/shared/lake/swim_swimsuit.jpg"></center>'
-	'You swim in the pool. The water refreshes and invigorates.'
-	if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
-
-	act 'Out of the water':gt 'ybass'
-end
-
---- ybass ---------------------------------
-

locations/ybedr.qsrc

@@ -1,31 +0,0 @@
-# ybedr
-
-$locM_arg = ''
-$locM = 'ybedr'
-$loc_arg = ''
-$loc = 'ybedr'
-$location_type = 'private'
-$locclass = 'bedr'
-$menu_loc = 'ybedr'
-$menu_arg = ''
-menu_off = 0
-*clr & cla
-gs 'stat'
-
-'<center><b><font color="maroon">Bedroom</font></b></center>'
-'<center>Your large bedroom with all the necessities that a modern bedroom has.</center>'
-
-if ymanrem[4] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[4] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
-if ymanrem[4] = 2:
-	'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ybedr.jpg"></center>'
-	*nl
-	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>.'
-	'On one side of the bed is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''main''">wardrobe</a>.'
-	'There''s a table and a <a href="exec:gt ''mirror'', ''start''">mirror</a> placed in one of the corners.'
-end
-
-act 'Leave the room':minut += 1 & gt 'ymans'
-
---- ybedr ---------------------------------
-

locations/ybib.qsrc

@@ -1,22 +0,0 @@
-# ybib
-
-$loc_arg = ''
-$loc = 'ybib'
-$menu_loc = 'ybib'
-$menu_arg = ''
-menu_off = 0
-*clr & cla
-gs 'stat'
-
-'<center><b><font color="maroon">Library</font></b></center>'
-'<center>A huge collection of books are neatly placed on the bookshelves.</center>'
-
-if ymanrem[10] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[10] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
-if ymanrem[10] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ybib.jpg"></center>'
-if ymanrem[10] = 2:''
-
-act 'Leave the room':minut += 1 & gt 'ymans'
-
---- ybib ---------------------------------
-

locations/ydet.qsrc

@@ -1,23 +0,0 @@
-# ydet
-
-$loc_arg = ''
-$loc = 'ydet'
-$menu_loc = 'ydet'
-$menu_arg = ''
-menu_off = 0
-*clr & cla
-gs 'stat'
-
-'<center><b><font color="maroon">Nursery</font></b></center>'
-'<center>The nursery room, that is neatly designed, only the best for your child.</center>'
-
-if ymanrem[9] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[9] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
-if ymanrem[9] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ydet.jpg"></center>'
-if ymanrem[9] = 2:''
-gs 'subkid'
-
-act 'Leave the room':minut += 1 & gt 'ymans'
-
---- ydet ---------------------------------
-

locations/ykabinet.qsrc

@@ -1,24 +0,0 @@
-# ykabinet
-
-$locM_arg = ''
-$locM = 'ykabinet'
-$loc_arg = ''
-$loc = 'ykabinet'
-$menu_loc = 'ykabinet'
-$menu_arg = ''
-menu_off = 0
-*clr & cla
-gs 'stat'
-
-'<center><b><font color="maroon">Work room</font></b></center>'
-'<center>Your work room where you spend most of the time signing important papers and working on your computer.</center>'
-
-if ymanrem[12] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[12] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
-if ymanrem[12] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ykabinet.jpg"></center>'
-if ymanrem[12] = 2:'There''s a <a href="exec:gt ''Komp'', ''start''">computer</a> sitting on your antique desk.'
-
-act 'Leave the room':minut += 1 & gt 'ymans'
-
---- ykabinet ---------------------------------
-

locations/ykamin.qsrc

@@ -1,58 +0,0 @@
-# ykamin
-
-$loc_arg = ''
-$loc = 'ykamin'
-$menu_loc = 'ykamin'
-$menu_arg = ''
-menu_off = 0
-*clr & cla
-gs 'stat'
-
-'<center><b><font color="maroon">Lounge</font></b></center>'
-'<center>The lounge, where you can work on your tapestry and relax in front of the fireplace.</center>'
-
-if ymanrem[8] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[8] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
-if ymanrem[8] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ykamin.jpg"></center>'
-if ymanrem[8] = 2:'There''s a <a href="exec:gt ''stol'', ''start''">table</a> which you can sit at.'
-
-act 'Leave the room':minut += 1 & gt 'ymans'
-
-if gobelen>0:'You have completed <<gobelen>> tapestries.'
-if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> more uses.'
-if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
-if pcs_sewng >= 80:
-	if newgobelen = 0 and tkan > 0:
-		act'Start a new tapestry':
-			cls
-			tkan -= 1
-			newgobelen = 1
-			minut += 15
-			gs'stat'
-			'You spend 15 minutes on the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-			act'Set the tapestry aside':gt $curloc
-		end
-	end
-	if newgobelen >= 1:
-		'Your tapestry is <<newgobelen/10>> percent finished.'
-		act'Work on the tapestry for an hour':
-			cls
-			minut += 60
-			sewng_exp += rand(pcs_intel/10, pcs_intel/5)
-			gobramax = (pcs_sewng - 70) * 6
-			gobramin = (pcs_sewng - 70) * 2
-			newgobelen += rand(gobramin,gobramax)
-			gs'stat'
-			if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-				if newgobelen >= 1000:
-				newgobelen = 0
-				gobelen+=1
-				'Your work on the tapestry is done. You feel pretty satisfied having finished a piece.'
-			end
-			act'Set the tapestry aside':gt $curloc
-		end
-	end
-end
-
---- ykamin ---------------------------------
-

locations/ykuh.qsrc

@@ -1,86 +0,0 @@
-# ykuh
-
-$loc_arg = ''
-$loc = 'ykuh'
-$locclass = 'kitr'
-$menu_loc = 'ykuh'
-$menu_arg = ''
-menu_off = 0
-*clr & cla
-gs 'stat'
-
-'<center><b><font color="maroon">Kitchen</font></b></center>'
-'<center>A well stocked kitchen containing all the necessities to make whatever meal you please.</center>'
-
-if ymanrem[6] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[6] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
-if ymanrem[6] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ykun.jpg"></center>'
-if ymanrem[6] = 2:''
-
-if dirttarelka > 0 and fairy >= dirttarelka:
-	cltarelka += dirttarelka
-	fairy -= dirttarelka
-	dirttarelka = 0
-	'You wash the dirty dishes in the dishwasher.'
-elseif fairy < dirttarelka:
-	'You can''t use the dishwasher. You have no detergent.'
-end
-
-if cltarelka > 0:
-	'You have <b><<cltarelka>></b> clean plates left.'
-else
-	'<b><font color="red">You don''t have any clean plates left.</font></b>'
-end
-
-if dirttarelka > 0:'There are <b><<dirttarelka>></b> dirty dishes in the sink. <a href="exec:dynamic $dirtarm">Wash the dishes</a>.'
-
-if fairy > 0:
-	'Under the sink is some dishwashing detergent, which is enough for <b><<fairy>></b> ' + iif(fairy = 1, 'time.', 'times.')
-else
-	'<b><font color="red">You have nothing to wash dishes with. You should buy some detergent.</font></b>'
-end
-
-if eda > 0:
-	if cltarelka = 0 or edahot > 0:$edagot = ''
-	if cltarelka > 0 and edahot = 0:$edagot = '<a href="exec:dynamic $edagotd">Cook a meal (0:30)</a>'
-
-	'There''s enough food for <b><<eda>></b> ' + iif(eda = 1, 'serving', 'servings') + '. <<$edagot>>'
-elseif edaD = 0 and eda = 0:
-	'<b><font color="red">The fridge is empty. You have nothing to eat.</font></b>'
-end
-
-act 'Leave the room':minut += 1 & gt 'ymans'
-
-if edahot > 0:'<a href="exec:dynamic $edahotd">There''s a warm meal on the table.</a>'
-
-if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
-	act 'Cook a meal for your husband, 2 servings (1:00)':
-		cla
-		*clr
-		husband += 5
-		eda -= 2
-		minut += 60
-		huseatday = daystart
-		pcs_mood -= 15
-		'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
-		'You make some delicious food for your husband.'
-
-		act 'Put the food on the table':gt $curloc
-	end
-end
-
-act 'Have a snack (0:15)':gs 'food', 'snack'
-
-dynamic $sandwich
-dynamic $driwater
-dynamic $dritea
-dynamic $fill_bottle
-dynamic $edaD
-dynamic $pranik
-dynamic $fatdel
-dynamic $lekarstvo
-dynamic $vitamin
-
-
---- ykuh ---------------------------------
-

locations/ymans.qsrc

@@ -1,44 +0,0 @@
-# ymans
-
-$locM = 'ymans'
-$locM_arg = ''
-$loc = 'ymans'
-$loc_arg = ''
-$menu_loc = 'ymans'
-$menu_arg = ''
-menu_off = 0
-$location_type = 'private'
-killvar '$locclass'
-clr
-gs 'stat'
-gs 'themes', 'indoors'
-
-if courtletter_date <= daystart and courtletter_date ! 0:
-	gt 'sentence', 'letter'
-end
-
-'<center><b><font color="maroon">House</font></b></center>'
-'<center>Hall</center>'
-'<center>The main hall of the mansion. From here you can visit the different rooms in the mansion.</center>'
-
-if ymanrem[3] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[3] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[3] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
-if ymanrem[3] = 3:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ymans.jpg"></center>'
-if ymanrem[3] = 3:'There''s a <a href="exec:gt ''mirror'', ''start''">mirror</a> hanging on the wall.'
-if umbrella > 0:'There''s an umbrella hanging on a hook.'
-if ymanrem[3] >= 1:act 'Go to the bedroom':minut += 1 & gt 'ybedr'
-if ymanrem[3] >= 1:act 'Go to the bathroom':minut += 1 & gt 'yvan'
-if ymanrem[3] >= 1:act 'Go to the kitchen':minut += 1 & gt 'ykuh'
-if ymanrem[3] >= 1:act 'Go to the living room':minut += 1 & gt 'yzal'
-if ymanrem[3] >= 1:act 'Go to the fireplace room':minut += 1 & gt 'ykamin'
-if ymanrem[3] >= 1:act 'Go to the nursery':minut += 1 & gt 'ydet'
-if ymanrem[3] >= 1:act 'Go to the library':minut += 1 & gt 'ybib'
-if ymanrem[3] >= 1:act 'Go the gym':minut += 1 & gt 'ysport'
-if ymanrem[3] >= 1:act 'Go to your work room':minut += 1 & gt 'ykabinet'
-if $clothingworntype ! 'nude':act 'Walk outside':minut += 5 & gt 'youplace'
-
-!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
-
---- ymans ---------------------------------
-

locations/youplace.qsrc

@@ -1,378 +0,0 @@
-# youplace
-*clr & cla
-$loc_arg = ''
-$loc = 'youplace'
-$menu_loc = 'youplace'
-$menu_arg = ''
-menu_off = 0
-gs 'stat'
-
-'<center><h4>Your land lot</h4></center>'
-
-if home_owned[5] < 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yzemelniy.jpg"></center>'
-if home_owned[5] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ystart.jpg"></center>'
-if home_owned[5] = 3:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yosobnak.jpg"></center>'
-
-''
-
-if car > 0 and cardrive = 18:
-	cardrive = 18
-	'<a href="exec:gs ''carF'', ''start''">Your <<$car>></a> is parked here.'
-end
-
-act 'Go to the suburbs':minut += 10 & gt 'city_suburbs', 'start'
-
-if bassMansion = 1:'<a href="exec:gt ''ybass''">Go to the pool</a>.'
-if banaMansion >= 1:'<a href="exec:gt ''yban''">Go to the sauna</a>.'
-if home_owned[5] = 3:'<a href="exec:gt ''ymans''">Walk inside the mansion</a>.'
-
-if karta + bankDebtLimit >= 1500000 and home_owned[5] = 0:
-	act 'Buy the land lot for a mansion (1,500,000 <b>₽</b>)':
-		cls
-		karta -= 1500000
-		home_owned[5] = 1
-		minut += 5
-		menu_off = 1
-		gs 'stat'
-		'You have bought the land lot. You can finally build your own dream mansion.'
-
-		act 'Leave':gt $curloc
-	end
-end
-
-if karta + bankDebtLimit >= 500000 and home_owned[5] = 1:
-	act 'Pay for running utilities and the building foundation (500,000 <b>₽</b>)':
-		cls
-		karta -= 500000
-		home_owned[5] = 2
-		minut += 5
-		menu_off = 1
-		gs 'stat'
-		'You''ve paid for the utilities. You now have running water, sewage, electric power, and telephone lines. There''s even a foundation built on the land lot.'
-
-		act 'Leave':gt $curloc
-	end
-end
-
-if karta + bankDebtLimit >= 1500000 and home_owned[5] = 2:
-	act 'Pay for the finishing touches on the mansion (1,500,000 <b>₽</b>)':
-		cls
-		karta -= 1500000
-		home_owned[5] = 3
-		minut += 5
-		menu_off = 1
-		gs 'stat'
-		'You''ve paid for the construction of the mansion.'
-
-		act 'Leave':gt $curloc
-	end
-end
-
-if karta + bankDebtLimit >= 500000 and home_owned[5] = 3 and ymanrem[3] = 0:
-	act 'Pay for the construction of the rooms (500,000 <b>₽</b>)':
-		cls
-		karta -= 500000
-		ymanrem[3] = 1
-		minut += 5
-		menu_off = 1
-		gs 'stat'
-		'You paid for the construction of the rooms. You can finally begin designing the interior of the mansion.'
-
-		act 'Leave':gt $curloc
-	end
-end
-
-if home_owned[5] => 2:
-	if karta + bankDebtLimit >= 800000 and banaMansion = 0:
-		act 'Pay for the construction of the sauna (800,000 <b>₽</b>)':
-			cls
-			karta -= 800000
-			banaMansion = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'You paid for the construction of the sauna. You finally have a place where you can relax.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-
-	if karta + bankDebtLimit >= 500000 and bassMansion = 0:
-		act 'Pay for the construction of the pool area (500,000 <b>₽</b>)':
-			cls
-			karta -= 500000
-			bassMansion = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'You paid for the construction of the pool area. You can finally take relaxing swims in private.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-end
-if home_owned[5] = 3:
-	if karta + bankDebtLimit >= 250000 and ymanrem[3] = 1:
-		act 'Pay for the renovations of the main hall (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[3] = 2
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the main hall is finished.'
-
-			act 'Leave':gt $curloc
-		end
-
-	elseif karta + bankDebtLimit >= 150000 and ymanrem[3] = 2:
-		act 'Decorate the main hall (150,000 <b>₽</b>)':
-			cls
-			karta -= 150000
-			ymanrem[3] = 3
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the main hall is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-
-	if karta + bankDebtLimit >= 250000 and ymanrem[4] = 0:
-		act 'Pay for the renovations of the bedroom (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[4] = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the bedroom is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	elseif karta + bankDebtLimit >= 300000 and ymanrem[4] = 1:
-		act 'Decorate the bedroom (300,000 <b>₽</b>)':
-			cls
-			karta -= 300000
-			ymanrem[4] = 2
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the bedroom is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-
-	if karta + bankDebtLimit >= 250000 and ymanrem[5] = 0:
-		act 'Pay for the renovations of the bathroom (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[5] = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the bathroom is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	elseif karta + bankDebtLimit >= 250000 and ymanrem[5] = 1:
-		act 'Decorate the bathroom (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[5] = 2
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the bathroom is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-
-	if karta + bankDebtLimit >= 250000 and ymanrem[6] = 0:
-		act 'Pay for the renovations of the kitchen (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[6] = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the kitchen is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	elseif karta + bankDebtLimit >= 350000 and ymanrem[6] = 1:
-		act 'Decorate the kitchen (350,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[6] = 2
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the kitchen is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-
-	if karta + bankDebtLimit >= 250000 and ymanrem[7] = 0:
-		act 'Pay for the renovations of the living room (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[7] = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the living room is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	elseif karta + bankDebtLimit >= 250000 and ymanrem[7] = 1:
-		act 'Decorate the living room (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[7] = 2
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the living room is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-
-	if karta + bankDebtLimit >= 250000 and ymanrem[8] = 0:
-		act 'Pay for the renovations of the fireplace room (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[8] = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the fireplace room is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	elseif karta + bankDebtLimit >= 250000 and ymanrem[8] = 1:
-		act 'Decorate the fireplace room (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[8] = 2
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the fireplace room is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-
-	if karta + bankDebtLimit >= 250000 and ymanrem[9] = 0:
-		act 'Pay for the renovations of the nursery room (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[9] = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the nursery is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	elseif karta + bankDebtLimit >= 250000 and ymanrem[9] = 1:
-		act 'Decorate the nursery (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[9] = 2
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the nursery is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-
-	if karta + bankDebtLimit >= 250000 and ymanrem[10] = 0:
-		act 'Pay for the renovations of the library (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[10] = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the library is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	elseif karta + bankDebtLimit >= 250000 and ymanrem[10] = 1:
-		act 'Decorate the library (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[10] = 2
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the library is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-
-	if karta + bankDebtLimit >= 250000 and ymanrem[11] = 0:
-		act 'Pay for the renovations of the gym (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[11] = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the gym is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	elseif karta + bankDebtLimit >= 250000 and ymanrem[11] = 1:
-		act 'Decorate the gym (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[11] = 2
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the gym is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-
-	if karta + bankDebtLimit >= 250000 and ymanrem[12] = 0:
-		act 'Pay for the renovations of the office (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[12] = 1
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the office is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	elseif karta + bankDebtLimit >= 250000 and ymanrem[12] = 1:
-		act 'Decorate the office (250,000 <b>₽</b>)':
-			cls
-			karta -= 250000
-			ymanrem[12] = 2
-			minut += 5
-			menu_off = 1
-			gs 'stat'
-			'The work on the office is finished.'
-
-			act 'Leave':gt $curloc
-		end
-	end
-end
-
---- youplace ---------------------------------
-

locations/ysport.qsrc

@@ -1,23 +0,0 @@
-# ysport
-
-$loc_arg = ''
-$loc = 'ysport'
-clr
-gs 'stat'
-'<center><b><font color="maroon">Detached</font></b></center>'
-'<center>Gym</center>'
-'Your private gym with all the necessities to live a healthy life. From here you can walk over to the pool or relax in the sauna.'
-
-if ymanrem[11] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[11] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
-if ymanrem[11] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ysport.jpg"></center>'
-if ymanrem[11] = 2:''
-
-gs 'exercise', 'start'
-
-act 'Leave the room':minut += 1 & gt 'ymans'
-if bassMansion = 1: act 'Go to the pool area': gt 'ybass'
-if banaMansion >= 1:act 'Go to the sauna': gt 'yban'
-
---- ysport ---------------------------------
-

locations/yvan.qsrc

@@ -1,25 +0,0 @@
-# yvan
-CLOSE ALL
-
-$loc_arg = ''
-$loc = 'yvan'
-$locM_arg = ''
-$locM = 'yvan'
-$location_type = 'bathroom'
-clr
-gs 'stat'
-'<center><b><font color="maroon">House</font></b></center>'
-'<center>Bathroom</center>'
-
-if ymanrem[5] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[5] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
-if ymanrem[5] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yvan.jpg"></center>'
-if ymanrem[5] = 2:'There''s a <a href="exec:gt ''mirror'', ''start''">mirror</a> hanging on the wall.'
-
-act 'Leave the room':minut += 1 & gt 'ymans'
-
-gs 'din_van', 'private'
-gs 'din_van', 'misery'
-
---- yvan ---------------------------------
-

locations/yzal.qsrc

@@ -1,24 +0,0 @@
-# yzal
-$loc_arg = ''
-$loc = 'yzal'
-$menu_loc = 'yzal'
-$menu_arg = ''
-menu_off = 0
-$location_type = 'private'
-$locclass = 'livingr'
-*clr & cla
-gs 'stat'
-
-'<center><b><font color="maroon">House</font></b></center>'
-'<center>Living Room</center>'
-
-if ymanrem[7] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
-if ymanrem[7] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
-if ymanrem[7] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yzal.jpg"></center>'
-if ymanrem[7] = 2:'You can watch <a href="exec:gt ''TV'',''start''">TV</a>, or relax on your luxury <a href="exec:gt ''divan'', ''start''">leather sofa</a>.'
-gs 'subkid'
-
-act 'Leave the room':minut += 1 & gt 'ymans'
-
---- yzal ---------------------------------
-