Merge remote-tracking branch 'Rin_the_Trap/master'

locations/nichBedroomServant.qsrc

@@ -26,9 +26,12 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'<center><b>Your Bedroom in Nicholas'' Apartment</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bedroomServant.jpg"></center>'
 
-	'Your bedroom is fairly large, considering you''re only an employee. There is a small <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a>.'
+	'Your bedroom is fairly large, considering you''re only an employee.'
+	'There is a small <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a>.'
 	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
-	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
+	*nl
+	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
+	'There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> beside the wardrobe.'
 	if mc_inventory['tech_computer'] = 1:
 		!! TODO: Sveta can''t do camshows from this place - unless Gala makes her at some point, but unlikely.
 		gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
@@ -36,13 +39,16 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	else
 		$komp = '.'
 	end
-	'A luxurious <a href="exec:gt ''divan'', ''start''">leather sofa</a> is also part of the ensemble. Mounted on the wall opposite the sofa is a big flat <a href="exec:gt ''TV'', ''start''">TV</a>. Under the window, you see a brand-new <a href="exec:gt ''nichBedroomServant'', ''desk''">desk</a><<$komp>>'
+	*nl
+	'A luxurious <a href="exec:gt ''divan'', ''start''">leather sofa</a> is on the other side of the wardrobe.'
+	'Mounted on the wall opposite the sofa is a big flat screen <a href="exec:gt ''TV'', ''start''">TV</a>.'
+	'Under the window is a nice <a href="exec:gt ''nichBedroomServant'', ''desk''">desk</a><<$komp>>'
+	*nl
 	if mc_inventory['hula_hoop'] > 0:'<br>Your hula hoop stands in a corner of the room. '
 	if mc_inventory['skipping_rope'] > 0:'Your jump rope is sitting on a shelf. '
 	if mc_inventory['book_yoga'] > 0:'A yoga mat is rolled up in a corner next to the wardrobe. '
 
 	if mishka > 0:'On one of the shelves, you''ve placed your <<mishka>> teddy bear'+iif(mishka = 1, '', 's')+'.'
-	gs 'music_actions', 'music_icon'
 	gs 'exercise', 'start'
 
 	if nichSalaryOutstanding > 0:
@@ -51,7 +57,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	end
 	
 	act 'Go to the hallway':
-		if nichEvtGalaTele1 = 1 and nichGalaOpinion = 1 and (rand(1,100) <= 40 or nichDebug = 1):
+		if nichEvtGalaTele1 = 1 and nichGalaOpinion = 1 and (rand(1,100) <= 20 or nichDebug = 1):
 			gt 'nichBedroomServant', 'evtBodyguardIntim1'
 		elseif nichGalaOpponent = 31 and (rand(1,100) <= 10 or nichDebug = 1):
 			!!Todo: Sveta gets abducted
@@ -66,7 +72,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 			end
 		end
 	end
-
+	act 'Relax on your bed': gt 'bed', 'start'
+	act 'Open wardrobe': gt 'wardrobe', 'start'
 	act 'Go to the servant bathroom':
 		gt 'nichBathServant'
 	end
@@ -83,7 +90,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	end
 
 	gs 'events', 'read'
-
+	gs 'music_actions', 'music_icon'
 	if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 
 	if sick >= 1:

locations/nichTanya.qsrc

@@ -1684,7 +1684,7 @@ if $ARGS[0] = 'chat':
 		end
 	end
 
-	if nichJobRefused = 2:
+	if nichJobRefused = 2 and (SchoolAtestat = 1 or SchoolBlock = 1):
 		act 'Job offer':
 			gt 'nichTanya', 'jobOffer'
 		end

locations/npcstatic5.qsrc

@@ -384,6 +384,7 @@ $npc_usedname['A<<npctemp>>'] = 'Tanya'
 $npc_notes['A<<npctemp>>'] = 'A girl you met at the city gym.'
 npc_dob['A<<npctemp>>'] = 19980622
 npc_gender['A<<npctemp>>'] = 1
+npc_height['A<<npctemp>>'] = 160
 
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'skills', 'combat', 'dance', 'sport'