Răsfoiți Sursa

[added] new house - hopefully without breaking everything, but #blamekevin if I did.

Anya 2 ani în urmă
părinte
comite
339d77065d

+ 6 - 0
glife.qproj

@@ -406,6 +406,12 @@
 		<Location name="korr"/>
 		<Location name="housecall"/>
 	</Folder>
+	<Folder name="House">
+		<Location name="city_house_res_misc"/>
+		<Location name="city_house_res_bedr"/>
+		<Location name="city_house_res_bathr"/>
+		<Location name="city_house_res_kitch"/>
+	</Folder>
 	<Folder name="Block">
 		<Location name="pav_complex"/>
 		<Location name="pav_complexb2"/>

+ 37 - 3
locations/agentned.qsrc

@@ -35,10 +35,11 @@ if $ARGS[0] = 'start':
 		*nl
 		'You own the following property:'
 		*nl
-		if home_owned[1] = 2: 'An apartment in St. Petersburg residential area'
-		if home_owned[1] = 3: 'An apartment in St. Petersburg residential area which is currently occupied by your tenants'
+		if home_owned[1] = 2: 'An apartment in St. Petersburg''s residential area'
+		if home_owned[1] = 3: 'An apartment in St. Petersburg''s residential area which is currently occupied by your tenants'
 		if home_owned[3] > 0: 'An cottage located in the cooperative village'
-		if home_owned[5] = 1: 'A plot of land in the St. Petersburg suburbs'
+		if home_owned[5] = 1: 'A plot of land in the St. Petersburg''s suburbs'
+		if home_owned[15] = 1: 'A house in the St. Petersburg''s residential area'
 		*nl
 		'We are at your service if you decide to <a href="exec:gt ''agentned'',''sell''">sell</a>.'
 	end
@@ -106,6 +107,12 @@ if $ARGS[0] = 'buy':
 			*nl
 			if karta + bankDebtLimit >= home_value[5]:act 'Buy the land plot in the suburbs': gt 'agentned','buy_Mansion'
 		end
+		
+		if home_owned[15] = 0:
+			'There is a small house on the edge of the city residential area for <<$home_value_txt[15]>> <b>₽</b>.'
+			*nl
+			if karta + bankDebtLimit >= home_value[15]:act 'Buy the house on the edge of the city residential area': gt 'agentned','buy_city_house_res'
+		end
 	else
 		'We currently have no properties listed for sale.'
 	end
@@ -244,6 +251,10 @@ if $ARGS[0] = 'sell':
 	if home_owned[1] = 0 and home_owned[3] = 0 and home_owned[4] = 0 and home_owned[5] = 0:
 		'You don''t currently own any property.'
 	end
+	if home_owned[15] = 1:
+		!! - might do later - Alaratt.
+		'Sorry, we are unable to find a buyer for your house at this time.'
+	end
 end
 
 if $ARGS[0] = 'rent':
@@ -458,5 +469,28 @@ if $ARGS[0] = 'buy_Mansion':
 	act 'Return':gt'agentned', 'start'
 end
 
+if $ARGS[0] = 'buy_city_house_res':
+	*clr & cla
+	menu_off = 1
+	gs 'housing', 'sale'
+	minut += 30
+	karta -= home_value[15]
+	home_owned[15] = 1
+	if ARRSIZE('home_owned') = 0:
+		gs 'set_home', 15
+	else
+		$set_homeyn = input("Would you like to set this as your new home? (yes/no)")
+		if $set_homeyn = 'yes': gs 'set_home', 15
+		killvar '$set_homeyn'
+	end
+	gs'stat'
+	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
+	*nl
+	'You spend half an hour filling in the paperwork for the purchase of a house on the edge of the city residential area. <<$home_value_txt[15]>> <b>₽</b> has been removed from your bank account.'
+
+	act 'Return':gt'agentned', 'start'
+end
+
 --- agentned ---------------------------------
 

+ 4 - 0
locations/carF.qsrc

@@ -8,6 +8,7 @@ $enddrive = {
 	if cardrive = 5:gt 'city_park', 'start'
 	if cardrive = 6: litltown = 0 & gt 'zaprF', 'start'
 	if cardrive = 7:gt 'autoservisF', 'start'
+	if cardrive = 8: gt 'city_house_res_misc', 'fronty'
 	if cardrive = 9:gt 'autotraidF', 'start'
 	if cardrive = 10:gt 'city_park', 'whore'
 	if cardrive = 11:gt 'city_sauna'
@@ -89,6 +90,7 @@ if $ARGS[0] = 'salon':
 	if cardrive = 5:'Through the windshield, you can see the park.'
 	if cardrive = 6:'Through the windshield, you can see the gas station in the city industrial region.'
 	if cardrive = 7:'Through the windshield, you can see the car service centre.'
+	if cardrive = 8:'Through the windshield, you see your house in St. Petersburg''s residential area.'
 	if cardrive = 9:'Through the windshield, you can see many of the cars for sale outside the showroom.'
 	if cardrive = 10:'Through the windshield, you can see hookers outside the park.'
 	if cardrive = 11:'Through the windshield, you can see the sauna.'
@@ -336,6 +338,7 @@ end
 
 if $ARGS[0] = 'city':
 	cla
+	if home_owned[15] = 1 and cardrive ! 8: act 'Go home':gs 'carF', 'nearby', 8
 	if cardrive ! 3:act 'Go to St. Petersburg''s Industrial Region':gs 'carF', 'nearby', 3
 	if cardrive ! 1:act 'Go to St. Petersburg''s residential area':gs 'carF', 'nearby', 1
 	if cardrive ! 2:act 'Go to St. Petersburg city center':gs 'carF', 'nearby', 2
@@ -355,6 +358,7 @@ if $ARGS[0] = 'nearby':
 	benz -= 1
 	teh -= rand(1, 3)
 	cardrive = ARGS[1]
+	if cardrive = 8: minut += 5
 	'5 minutes later, you arrive at your destination.'
 	dynamic $enddrive
 end

+ 33 - 0
locations/city_house_res_bathr.qsrc

@@ -0,0 +1,33 @@
+# city_house_res_bathr
+
+
+if $ARGS[0] = 'bathr':
+	$loc = 'city_house_res_bathr'
+	$loc_arg = 'bathr'
+	$locM = 'city_house_res_bathr'
+	$locM_arg = 'bathr'
+	$menu_loc = 'city_house_res_bathr'
+	$menu_arg = 'bathr'
+	$location_type = 'bathroom'
+	$bathtype = 'bathtub shower'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Bathroom</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_bathroom.jpg"></center>'
+
+	act 'Leave the room': gt 'city_house_res_misc', 'hallw'
+
+	'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'
+end
+
+--- city_house_res_bathr ---------------------------------
+

+ 41 - 0
locations/city_house_res_bedr.qsrc

@@ -0,0 +1,41 @@
+# city_house_res_bedr
+
+
+if $ARGS[0] = 'bedro':
+	$loc = 'city_house_res_bedr'
+	$loc_arg = 'bedro'
+	$menu_loc = 'city_house_res_bedr'
+	$menu_arg = 'bedro'
+	$locM = 'city_house_res_bedr'
+	$locM_arg = 'bedro'
+	$location_type = 'private'
+	$locclass = 'bedr'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Bedroom</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_bedroom.jpg"></center>'
+	
+	act 'Leave the room': gt 'city_house_res_misc', 'hallw'
+
+	act 'Relax on your bed': gt 'bed', 'start'
+
+	if pornMagazine > 0:gs 'events', 'read_porn'
+
+	if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
+
+	*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.'
+	if pornMagazine > 0:'You have hidden your porn magazine in your nightstand.'
+	*nl
+	'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
+
+end
+
+--- city_house_res_bedr ---------------------------------
+

+ 82 - 0
locations/city_house_res_kitch.qsrc

@@ -0,0 +1,82 @@
+# city_house_res_kitch
+
+
+if $ARGS[0] = 'kitch':
+	$loc = 'city_house_res_kitch'
+	$loc_arg = 'kitch'
+	$menu_loc = 'city_house_res_kitch'
+	$menu_arg = 'kitch'
+	$locclass = 'kitr'
+
+	menu_off = 0
+	minut += 1
+	gs 'kit_din'
+	gs 'stat'
+
+	*clr & cla
+	'<center><b><font color="maroon">Kitchen</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_kitchen.jpg"></center>'
+
+	act 'Leave the room': gt 'city_house_res_misc', 'hallw'
+
+	'A well stocked kitchen containing all the necessities to make whatever meal you please.'
+
+	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</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 husbandrink ! 10:
+		if hour = 7 or hour = 17:'<a href="exec:gt ''husb'', ''start''">Your husband is eating at the table.</a>'
+	end
+
+	if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
+		act 'Cook a meal for your husband and yourself (1:00)':
+			cla
+			*clr
+			husband += 5
+			eda -= 2
+			minut += 60
+			huseatday = daystart
+			pcs_mood -= 25
+			'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
+			'You prepare a meal for your husband and yourself.'
+
+			act 'Leave the meal':gt 'kuhr'
+		end
+	end
+
+	dynamic $edasnack
+	dynamic $sandwich
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $fill_bottle
+	dynamic $edaD
+	dynamic $pranik
+	dynamic $fatdel
+	dynamic $lekarstvo
+	dynamic $vitamin
+end
+
+--- city_house_res_kitch ---------------------------------
+

+ 356 - 0
locations/city_house_res_misc.qsrc

@@ -0,0 +1,356 @@
+# city_house_res_misc
+
+
+!!Small frontyard
+if $ARGS[0] = 'fronty':
+	$loc = 'city_house_res_misc'
+	$loc_arg = 'fronty'
+	$menu_loc = 'city_house_res_misc'
+	$menu_arg = 'fronty'
+	$location_type = 'public_outdoors'
+	killvar '$locclass'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+
+	if sound = 0:
+		if month >=11 and month <= 12 or month >=1 and month <=3:
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
+		else
+			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
+			if hour >= 0 and hour <= 7: PLAY 'sound/street_night_leto.mp3' & PLAY 'sound/street_night.mp3',30
+		end
+	end
+
+	*clr & cla
+	'<center><b><font color="maroon">Living Room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_fronty.jpg"></center>'
+	'Your small two story house sits on the edge of the residential area. Despite that, your neighbors are pretty close and the sounds of the street fill the air.'
+	*nl
+	if car > 0 and cardrive = 8: '<a href="exec:GS ''carF'', ''start''">Your <<$car>></a> is in the driveway.'
+
+	act 'Go inside': gt 'city_house_res_misc', 'hallw'
+	act 'Go to the city':
+		minut += 10
+		gt 'city_residential'
+	end
+	if curr_home ! 15:
+		act 'Set this house as your main home':gs 'set_home', 15 & gt 'city_house_res_misc', 'fronty'
+	end
+
+end
+
+if $ARGS[0] = 'hallw':
+	CLOSE ALL
+	$loc = 'city_house_res_misc'
+	$loc_arg = 'hallw'
+	$menu_loc = 'city_house_res_misc'
+	$menu_arg = 'hallw'
+	$locM = 'city_house_res_misc'
+	$locM_arg = 'hallw'
+	$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">Hallway</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_hallway.jpg"></center>'
+	
+	if courtletter_date <= daystart and courtletter_date ! 0: gt 'sentence', 'letter'
+
+	act 'Go out front':
+		if $clothingworntype ! 'nude':
+			minut += 1
+			gt 'city_house_res_misc', 'fronty'
+		else
+			msg'<b><font color = red>You need to get dressed.</font></b>'
+			gt 'city_house_res_misc', 'hallw'
+		end
+	end
+
+	'The main hallway of your house. You can visit the different rooms 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_house_res_bedr', 'bedro'
+	act 'Go to your bathroom': gt 'city_house_res_bathr', 'bathr'
+	act 'Go to your kitchen': gt 'city_house_res_kitch', 'kitch'
+	act 'Go to your living room': gt 'city_house_res_misc', 'livroom'
+	act 'Go to your backyard': gt 'city_house_res_misc', 'backy'
+	
+end
+
+!!Small backyard for outdoor working out or maybe gardening?
+if $ARGS[0] = 'backy':
+	$loc = 'city_house_res_misc'
+	$loc_arg = 'backy'
+	$menu_loc = 'city_house_res_misc'
+	$menu_arg = 'backy'
+	$location_type = 'secluded'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Living Room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_backy.jpg"></center>'
+	'Your small backyard is fenced in, with a few plots intended for gardening.'
+
+	act 'Go inside': gt 'city_house_res_misc', 'hallw'
+
+	if sunWeather = 1:
+		if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):
+			if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
+				*nl
+				'You can do some exercises here.'
+				act 'Exercise': gt 'exercise', 'workout'
+			else
+				*nl
+				'You could do some exercises here if you were wearing exercise clothes.'
+			end
+		end
+	end
+
+end
+
+if $ARGS[0] = 'livroom':
+	$loc = 'city_house_res_misc'
+	$loc_arg = 'livroom'
+	$menu_loc = 'city_house_res_misc'
+	$menu_arg = 'livroom'
+	$location_type = 'private'
+	$locclass = 'livingr'
+	
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	
+	*clr & cla
+	'<center><b><font color="maroon">Living Room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_living.jpg"></center>'
+
+	act 'Leave the room': gt 'city_house_res_misc', 'hallw'
+
+	'A place where you can watch <a href="exec:gt ''TV'',''start''">TV</a>, or relax on your <a href="exec:gt ''divan'', ''start''">sofa</a>.'
+
+	if komp = 1:
+		'There''s a <a href="exec:gt ''Komp'', ''start''">computer</a> sitting on your <a href="exec:gt ''stol'', ''start''">desk</a>.'
+	else
+		'A small <a href="exec:gt ''stol'', ''start''">desk</a> is against the wall.'
+	end
+
+	'There is enough space to workout.'
+	gs 'exercise', 'start'
+
+	gs 'subkid'
+
+	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 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 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 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
+
+	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
+
+--- city_house_res_misc ---------------------------------
+

+ 12 - 1
locations/city_residential.qsrc

@@ -66,7 +66,13 @@ end
 
 housrA = 0
 
-if car > 0 and cardrive = 1: '<a href="exec:GS ''carF'', ''start''">Your <<$car>></a> is in the parking lot.'
+if car > 0 and cardrive = 1 or cardrive = 8:
+	if cardrive = 8:
+		'<a href="exec: minut += 10 & gs ''carF'', ''start''">Your <<$car>></a> is in your driveway.'
+	else
+		'<a href="exec:gs ''carF'', ''start''">Your <<$car>></a> is in the parking lot.'
+	end
+end
 
 if home_owned[1] > 0:
 	act '<b>Go home</b>':
@@ -84,6 +90,11 @@ if home_owned[1] > 0:
 		minut += 1
 		gt 'korr'
 	end
+elseif home_owned[15] = 1:
+	act '<b>Go home</b>':
+		minut += 10
+		gt 'city_house_res_misc', 'fronty'
+	end
 end
 
 act 'Wait':gs 'obj_din', 'wait'

+ 6 - 0
locations/housing.qsrc

@@ -10,6 +10,7 @@
 ! home_owned[3] > 0: 'An cottage located in the cooperative village.'
 ! home_owned[4] = 1: 'An apartment in Pushkin.'
 ! home_owned[5] = 1: 'A plot of land in the St. Petersburg suburbs.'
+! home_owned[5] = 1: 'A house on the edge of St. Petersburg residential area.'
 
 if $ARGS[0] = 'rent':
 	if month = 1:
@@ -67,6 +68,9 @@ if $ARGS[0] = 'sale':
 
 	home_value[5] = 1500000
 	$home_value_txt[5] = '1,500,000'
+	
+	home_value[15] = 800000
+	$home_value_txt[15] = '800,000'
 end
 
 if $ARGS[0] = 'util':
@@ -75,6 +79,7 @@ if $ARGS[0] = 'util':
 	if home_owned[3] > 1: hcount_util += 1
 	if home_owned[4] > 0: hcount_util += 1
 	if home_owned[5] > 2: hcount_util += 1
+	if home_owned[15] = 1: hcount_util += 1
 end
 
 if $ARGS[0] = 'cable':
@@ -82,6 +87,7 @@ if $ARGS[0] = 'cable':
 	!if home_owned[3] > 1: hcount_cable += 1
 	if home_owned[4] > 0: hcount_cable += 1
 	if home_owned[5] > 2: hcount_cable += 1
+	if home_owned[15] = 1: hcount_cable += 1
 end
 
 --- housing ---------------------------------

+ 1 - 0
locations/journal.qsrc

@@ -35,6 +35,7 @@ if $ARGS[0] = 'records':
 	if home_owned[5] = 1:'You own a vacant block in the city suburbs. Your utility bills are due on the 25th of each month.'
 	if home_owned[5] = 2:'You own a plot of land in the city suburbs upon which you are building a house. Your utility bills are due on the 25th of each month.'
 	if home_owned[5] = 3:'You own an impressive mansion in the city suburbs. Your utility bills are due on the 25th of each month.'
+	if home_owned[15] = 1:'You own a nice house on the edge of the city residential district. Your utility bills are due on the 25th of each month.'
 	*nl
 	if car > 0:
 		'<center><h2>Car</h2></center>'

+ 4 - 4
locations/mirror.qsrc

@@ -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_arg = 'ybathroom' and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = city_house_res_bathr 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_arg = 'ybathroom' and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = city_house_res_bathr 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_arg = 'ybathroom' and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = city_house_res_bathr 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_arg = 'ybathroom' and mirror_steam = hour:
+	if $loc = 'vanrPar' and mirror_steam = hour or $loc = 'vanr' and mirror_steam = hour or $loc_arg = 'ybathroom' or $loc = city_house_res_bathr and mirror_steam = hour:
 
 	else
 		act 'Apply <<$routine4custname>>':gt 'mirror','works',mid($routine4,1,1),mid($routine4,2,1),mid($routine4,3,1)

+ 5 - 0
locations/set_home.qsrc

@@ -71,6 +71,11 @@ elseif curr_home = 14:
 	$home_town = 'gadukino'
 	$home_location = 'gaddvor'
 	$home_entrance = 'gaddvor'
+elseif curr_home = 15:
+	$home_name = 'City residential house'
+	$home_town = 'city'
+	$home_location = 'city_residential'
+	$home_entrance = 'city_house_res_misc'
 end
 
 --- set_home ---------------------------------

+ 2 - 1
locations/succubus.qsrc

@@ -439,6 +439,7 @@ if $args[0] = 'sucwalkinginit':
 	!!'nichBedroomServant' = Tanya''s apartment downtown
 	!!'dom_gor' = Hostel downtown
 	!!'uni_dorm' = Dorm at the university
+	!!'city_hous_res_bedr'
 	!!Zone 2;
 	!!'bedrPar' = Parent''s apartment in Pavlovsk
 	!!'HotelRoom' = Hotel next to train station in Pavlovsk
@@ -446,7 +447,7 @@ if $args[0] = 'sucwalkinginit':
 	!!Zone 4; 'bedr2x' = Apartment in "Old Town" (aka Pushkin)
 	!!Zone 5; 'gadhouse' = Grandmother''s house in Gadukino
 
-	if $loc = 'bedr' or $loc = 'nichBedroomServant' or $loc = 'dom_gor' or $loc = 'uni_dorm':
+	if $loc = 'bedr' or $loc = 'nichBedroomServant' or $loc = 'dom_gor' or $loc = 'uni_dorm' or $loc = 'city_house_res_bedr':
 		sucslpzone = 1
 	elseif $loc = 'bedrPar' or $loc = 'HotelRoom':
 		sucslpzone = 2

+ 1 - 1
locations/uni_dorm.qsrc

@@ -398,7 +398,7 @@ if $ARGS[0] = 'dorm_room':
 	dynamic $removepan
 
 	if curr_home ! 11:
-		act 'Set the this dorm room as your main home':gs 'set_home', 11 & gt 'uni_dorm', 'dorm_room'
+		act 'Set this dorm room as your main home':gs 'set_home', 11 & gt 'uni_dorm', 'dorm_room'
 	end
 end