Merge remote-tracking branch 'Anjuna/master'

locations/courtletter.qsrc

@@ -153,7 +153,7 @@ if $ARGS[0] = 'letter':
 		end
 
 
-	elseif mid('policeQW_courtletter_subjects', 1, 12) = 'missed_court':
+	elseif mid($policeQW_courtletter_subjects[0], 1, 12) = 'missed_court':
 		if week = 6:
 			policeQW_courthearing_dates[] = daystart + 9
 		elseif week = 7:

locations/sentence.qsrc

@@ -249,7 +249,7 @@ if $ARGS[0] = 'punishment':
 		policeQW['shoplift_counter'] += 1
 
 		if policeQW['shoplift_counter'] <= 5:
-			!present how much the player needs to pay
+		!Stage 1
 			if mid($policeQW_courthearing_subjects[0], 10, 4) = 'easy':
 				temp_fine += 5000 + (policeQW['shoplift_value'] / 2)
 
@@ -273,7 +273,7 @@ if $ARGS[0] = 'punishment':
 			end
 
 		elseif policeQW['shoplift_counter'] <= 10:
-		!present how much the player needs to pay
+		!Stage 2
 			if mid($policeQW_courthearing_subjects[0], 10, 4) = 'easy':
 				temp_fine += 7500 + (3 * policeQW['shoplift_value'] / 4)
 
@@ -297,6 +297,7 @@ if $ARGS[0] = 'punishment':
 			end
 
 		elseif policeQW['shoplift_counter'] <= 15:
+		!Stage 3
 			if mid($policeQW_courthearing_subjects[0], 10, 4) = 'easy':
 				temp_fine += 10000 + policeQW['shoplift_value']
 
@@ -320,6 +321,7 @@ if $ARGS[0] = 'punishment':
 			end
 
 		elseif policeQW['shoplift_counter'] <= 20:
+		!Stage 4
 			if mid($policeQW_courthearing_subjects[0], 10, 4) = 'easy':
 				temp_fine += 15000 + (5 * policeQW['shoplift_value'] / 4)
 
@@ -343,6 +345,7 @@ if $ARGS[0] = 'punishment':
 			end
 
 		elseif policeQW['shoplift_counter'] <= 25:
+		!Stage 5
 			if mid($policeQW_courthearing_subjects[0], 10, 4) = 'easy':
 				temp_fine += 25000 + (3 * policeQW['shoplift_value'] / 2)
 
@@ -363,10 +366,10 @@ if $ARGS[0] = 'punishment':
 				'"Well well, what a surprise, <<$pcs_lastname>> stands in front of me again. You''re starting to annoy me! Are you doing this on purpose? Don''t answer and instead pay the fine of <<temp_fine>> <b>₽</b> and enjoy your community service at the Mercy Clinic for 120 hours." the judge reads out your sentence.'
 				'"You can pay your fine at the post office and I suppose you know where to find the Mercy Clinic?" the judge finishes.'
 				'You nod and quickly make your way out of courtroom.'
-
 			end
 
 		else
+		!Stage 6
 			if mid($policeQW_courthearing_subjects[0], 10, 4) = 'easy':
 				temp_fine += 50000 + (2 * policeQW['shoplift_value'])
 
@@ -386,15 +389,14 @@ if $ARGS[0] = 'punishment':
 				'The judge sighs, "Here we are again <<$pcs_lastname>>! I''m getting tired of being lenient so you''re getting the maximum sentence. The fine will be set to <<temp_fine>> <b>₽</b> and the community service at the Mercy Clinic for 160 hours." the judge reads out your sentence.'
 				'"You already know what you need to do. I hope you will think about your actions before stealing again." the judge finishes.'
 				'You nod and quickly make your way out of courtroom.'
-
 			end
 		end
 
 	elseif mid($policeQW_courthearing_subjects[0], 1, 12) = 'prostitution':
 		policeQW['prostitution_counter'] += 1
 
-		if policeQW['shoplift_counter'] <= 5:
-			!present how much the player needs to pay
+		if policeQW['prostitution_counter'] <= 5:
+		!Stage 1
 			if mid($policeQW_courthearing_subjects[0], 14, 4) = 'easy':
 				temp_fine += 6000
 
@@ -418,7 +420,7 @@ if $ARGS[0] = 'punishment':
 			end
 
 		elseif policeQW['prostitution_counter'] <= 10:
-		!present how much the player needs to pay
+		!Stage 2
 			if mid($policeQW_courthearing_subjects[0], 14, 4) = 'easy':
 				temp_fine += 9000
 
@@ -436,7 +438,7 @@ if $ARGS[0] = 'punishment':
 			else
 				temp_fine += 11500
 
-				'"I sentence you hereby to pay back 11,500 <b>₽</b> you''ve stolen and I''ll also add some community service at the Mercy Clinic to 20 hours, hopefully this will help you reconsider your actions." the judge reads out your sentence.'
+				'"I sentence you hereby to pay a fine of 11,500 <b>₽</b> and I''ll also add some community service at the Mercy Clinic to 20 hours, hopefully this will help you reconsider your actions." the judge reads out your sentence.'
 				'"You can pay your fine at the post office and I suppose you know where to find the Mercy Clinic? I see you''ve still got an attitude issue." the judge finishes.'
 				'You nod and quickly make your way out of courtroom.'
 			end
@@ -519,21 +521,21 @@ if $ARGS[0] = 'punishment':
 				temp_fine += 55000
 
 				'The judge sighs, "Here we are again <<$pcs_lastname>>! I''m getting tired of being lenient so you''re getting the maximum sentence. The fine will be set to 55000 <b>₽</b> and the community service at the Mercy Clinic for 80 hours." the judge reads out your sentence.'
-				'"You already know what you need to do. I hope you will think about your actions before stealing again." the judge finishes.'
+				'"You already know what you need to do. I hope you will think about your actions before prostituting yourself again." the judge finishes.'
 				'You nod and quickly make your way out of courtroom.'
 
 			elseif mid($policeQW_courthearing_subjects[0], 14, 4) = 'norm':
 				temp_fine += 57500
 
 				'The judge sighs, "Here we are again <<$pcs_lastname>>! I''m getting tired of being lenient so you''re getting the maximum sentence. The fine will be set to 57500 <b>₽</b> and the community service at the Mercy Clinic for 120 hours." the judge reads out your sentence.'
-				'"You already know what you need to do. I hope you will think about your actions before stealing again." the judge finishes.'
+				'"You already know what you need to do. I hope you will think about your actions before prostituting yourself again." the judge finishes.'
 				'You nod and quickly make your way out of courtroom.'
 
 			else
 				temp_fine += 60000
 
 				'The judge sighs, "Here we are again <<$pcs_lastname>>! I''m getting tired of being lenient so you''re getting the maximum sentence. The fine will be set to 60000 <b>₽</b> and the community service at the Mercy Clinic for 160 hours." the judge reads out your sentence.'
-				'"You already know what you need to do. I hope you will think about your actions before stealing again." the judge finishes.'
+				'"You already know what you need to do. I hope you will think about your actions before prostituting yourself again." the judge finishes.'
 				'You nod and quickly make your way out of courtroom.'
 			end
 		end