ソースを参照

Merge remote-tracking branch 'Anjuna/master'

Kevin_Smarts 1 ヶ月 前
コミット
770c07d17a
2 ファイル変更6 行追加6 行削除
  1. 3 3
      locations/blackmailer.qsrc
  2. 3 3
      locations/pav_clinic.qsrc

+ 3 - 3
locations/blackmailer.qsrc

@@ -86,10 +86,10 @@ if $ARGS[0] = 'blackmail_dreams':
 	elseif blackmailQW['stage'] = 2:
 		$sleep_events_priority[] = 'gt ''blackmailer'', ''photo_dream2'' '
 	else
-		temp_rand = rand(0, 1)
+		temp_rand = rand(-2, 1)
 		if temp_rand >= 1 and blackmailQW['stage'] >= 2:
 			$sleep_events[] = 'gt ''blackmailer'', ''photo_dream2'' '
-		else
+		elseif temp_rand = 0:
 			$sleep_events[] = 'gs ''blackmailer'', ''photo_dream1'' '
 		end
 	end
@@ -98,7 +98,7 @@ end
 
 if $ARGS[0] = 'photo_dream1':
 	if blackmailQW['stage'] = 1: blackmailQW['stage'] = 2
-	blackmailQW['dream_day'] = daystart + 3
+	blackmailQW['dreamday'] = daystart + 3
 	if strpos('panty_pantyrear_bra', $blackmailQW['init_flashaction']):
 		gs 'arousal', 'flashlite', -5
 	else

+ 3 - 3
locations/pav_clinic.qsrc

@@ -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':