4 Комити 3768db4e1c ... 97d8265344

Аутор SHA1 Порука Датум
  bgkjdgbizgblzdgbr 97d8265344 [fixed] More places the credit card limit was missing пре 7 месеци
  Kevin_Smarts d4a77af02e [fixed] Dentist didn't include overdraft when checking card balance пре 7 месеци
  Kevin_Smarts b70c5de3cd [added] quick links for sports and school outfit defaults to pav shared and Pushkin apartments пре 7 месеци
  Kevin_Smarts 298f6ddfd0 [added] direct actions for changing into sports and school default outfits in hotel and Meynold guest bedroom пре 7 месеци

+ 1 - 0
locations/HotelRoom.qsrc

@@ -42,6 +42,7 @@ if $ARGS[0] = 'normal':
 		if money >= 100:act'Order room service (0:30) (100 <b>₽</b>)':gs 'food', 'h_food'
 		act 'Drink some water (0:01)': gs 'beverage', 'bev_wat'
 		if $hotel = 'pav_hotel': gs 'prostitution_functions', 'prostitute_outfit_at_home'
+		gs 'wardrobe', 'default_clothing_options'
 		dynamic $fatdel
 		dynamic $lekarstvo
 		dynamic $vitamin

+ 1 - 0
locations/bedr2x.qsrc

@@ -37,6 +37,7 @@ if husbandrinkday = daystart:
 	gs 'music_actions', 'no_music'
 end
 act 'Go to the corridor': gt 'korr2x'
+gs 'wardrobe', 'default_clothing_options'
 
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if hour > 22 or hour < 7:

+ 2 - 1
locations/mey_home.qsrc

@@ -300,7 +300,8 @@ if $ARGS[0] = 'guest_bedroom':
 	act 'Relax on your bed': gt 'bed', 'start'
 
 	act 'Wait':gs 'obj_din', 'wait'
-	gs 'prostitution_functions', 'prostitute_outfit_at_home'	
+	gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	gs 'wardrobe', 'default_clothing_options'
 	!!if rand (0,2) ! 0:gs 'din_bad' & dynamic $mobile_check
 end
 

+ 4 - 4
locations/pav_clinic.qsrc

@@ -167,7 +167,7 @@ if $ARGS[0] = '':
 						'The dentist examinees you and says it will cost you <<zubpay>><b>₽</b> to straighten your teeth and you will have to wear a brace for three months. However, he states that he can''t promise they will be completely straight after one treatment.'
 					end
 
-					if money < zubpay and karta < zubpay:
+					if money < zubpay and karta + bankDebtLimit < zubpay:
 						*nl
 						'You don''t have enough money to fix your teeth.'
 					else
@@ -254,7 +254,7 @@ if $ARGS[0] = '':
 				act 'Return to the entrance': gt 'pav_clinic'
 
 				if glass = 1:
-					if money < 4500 and karta < 4500:
+					if money < 4500 and karta + bankDebtLimit < 4500:
 						*nl
 						'You can''t afford the more stylish glasses.'
 					else
@@ -286,7 +286,7 @@ if $ARGS[0] = '':
 				end
 
 				if glass ! 0:
-					if money < 75000 and karta < 75000:
+					if money < 75000 and karta + bankDebtLimit < 75000:
 						*nl
 						'You can''t afford the laser eye correction surgery.'
 					else
@@ -715,7 +715,7 @@ if $ARGS[0] = 'sexual_health':
 	end
 
 	if GerpesNapr > 0 and GerpesUkolDay ! daystart:
-		if money < 450 and karta < 450: *nl & 'You can''t afford your herpes shot.'
+		if money < 450 and karta + bankDebtLimit < 450: *nl & 'You can''t afford your herpes shot.'
 
 		if money >= 450:
 			act 'Get herpes shot (450 <b>₽</b>) (cash) You need <<GerpesNapr>> more injections to complete the treatment':

+ 1 - 0
locations/pav_shared_apt.qsrc

@@ -229,6 +229,7 @@ if $ARGS[0] = 'start':
 		act '<font color=#<<$oleg_font>>><<$npc_firstname[''A266'']>>''s room</font>':gt 'pav_shared_apt', 'oleg_Room'
 		act '<font color=#<<$nestor_font>>><<$npc_firstname[''A265'']>>''s room</font>':gt 'pav_shared_apt', 'nestor_Room'
 		act '<font color=#<<$yakov_font>>><<$npc_firstname[''A264'']>>''s room</font>':gt 'pav_shared_apt', 'yakov_Room'
+		gs 'wardrobe', 'default_clothing_options'
 		if rentLeft = 0:
 			act '<font color=red>End your rental agreement and move out</font>':gt 'pav_shared_apt', 'eoleg_agreement'
 		end