Parcourir la source

[fixed] A bug related to repeatedly declining to send pictures in the blackmail storyline. Reported by Vladzilla

anjuna krokus il y a 2 mois
Parent
commit
d736565923
1 fichiers modifiés avec 18 ajouts et 9 suppressions
  1. 18 9
      locations/blackmailer.qsrc

+ 18 - 9
locations/blackmailer.qsrc

@@ -736,10 +736,19 @@ if $ARGS[0] = 'set_SMSTree':
 						else
 							$SMSTree['a4'] = 'What do you want from me?'
 						end
-						if rand(0, 1) = 0:
-							$SMSTree['b4'] = 'Where am I going to get that much money from?'
+						if blackmailQQW['total_material'] <= 4:
+							if rand(0, 1) = 0:
+								$SMSTree['b4'] = 'Where am I going to get that much money from?'
+							else
+								$SMSTree['b4'] = 'How much do you want before it stops?'
+							end
 						else
-							$SMSTree['b4'] = 'How much do you want before it stops?'
+							if rand(0, 1) = 0:
+								$SMSTree['b4'] = 'What about lowering the amount?'
+							else
+								$SMSTree['b4'] = 'What can I do to lower that?'
+							end
+
 						end
 
 	$SMSTree['5'] = 'Just drop off the money'
@@ -752,8 +761,8 @@ if $ARGS[0] = 'set_SMSTree':
 		$SMSTree['11b'] = 'or you could do something special for us'
 
 			$SMSTree['a12'] = 'fuck you'
-			$SMSTree['b12'] = 'Send a (non-nude) selfie from your galleray'
-			$SMSTree['c12'] = 'Send a selfie from your galleray'
+			$SMSTree['b12'] = 'Send a (non-nude) selfie from your gallery'
+			$SMSTree['c12'] = 'Send a selfie from your gallery'
 			$SMSTree['d12'] = 'what?'
 			$SMSTree['e12'] = 'yes sir'
 
@@ -805,7 +814,7 @@ if $ARGS[0] = 'Add_SMS_repeat':
 		gs 'SMStext_builder', 'receive', $SMSTree['3']
 		if blackmailQW['next_payment'] < 2000 and blackmailQW['total_payment'] < 5000:
 			gs 'SMStext_builder', 'add_reply', $SMSTree['a4'], 'blackmailer', 'sms_repeat_end1', 'a4'
-		elseif blackmailQW['stage'] < 8 and blackmailQW['next_payment'] < 3000:
+		elseif blackmailQW['stage'] <= 6 or (blackmailQW['stage'] = 7 and blackmailQW['next_payment'] < 3000):
 			gs 'SMStext_builder', 'add_reply', $SMSTree['b4'], 'blackmailer', 'sms_repeat_switch1', 'a', $SMSTree['b4']
 		elseif blackmailQW['stage'] = 7:
 			gs 'SMStext_builder', 'add_reply', $SMSTree['b4'], 'blackmailer', 'sms_repeat_switch1', 'b', $SMSTree['b4']
@@ -852,7 +861,7 @@ if $ARGS[0] = 'sms_repeat_switch1':
 		gs 'SMStext_builder', 'receive', $SMSTree['11' + $ARGS[1]]
 
 		gs 'SMStext_builder', 'add_reply', $SMSTree['a12'], 'blackmailer', 'sms_repeat_end1', 'a12'
-		if blackmailQW['stage'] < 6:
+		if blackmailQW['stage'] <= 5:
 			gs 'SMStext_builder', 'send_selfie', $SMSTree['b12'], 'c|sw|u|ft|fa', 'blackmailer', 'sms_repeat_switch2'
 		else
 			gs 'SMStext_builder', 'send_selfie', $SMSTree['c12'], 'c|sw|u|n|b|sh|ft|fa|fp', 'blackmailer', 'sms_repeat_switch2'
@@ -894,13 +903,13 @@ if $ARGS[0] = 'sms_repeat_switch2':
 
 		elseif strpos('bath|shower|titflash|assflash', $ARGS[4]) > 0:
 			blackmailQW['next_payment'] -= 1000
-			if blackmailQW['stage'] = 5: blackmailQW['stage'] = 6
+			if blackmailQW['stage'] < 6: blackmailQW['stage'] = 6
 			gs 'blackmailer', 'add_blackmail_selfie', $ARGS[2], $ARGS[3], $ARGS[4], ARGS[5], ARGS[6]
 			$temp_path = 'c'
 
 		elseif strpos('nude|pussyflash', $ARGS[4]) > 0:
 			blackmailQW['next_payment'] -= 2000
-			if blackmailQW['stage'] = 6: blackmailQW['stage'] = 7
+			if blackmailQW['stage'] < 7: blackmailQW['stage'] = 7
 			gs 'blackmailer', 'add_blackmail_selfie', $ARGS[2], $ARGS[3], $ARGS[4], ARGS[5], ARGS[6]
 			$temp_path = 'd'
 		end