浏览代码

[fixed] bugs found by the analyser

hornguy6 3 年之前
父节点
当前提交
5a4a63b2c9
共有 2 个文件被更改,包括 31 次插入32 次删除
  1. 30 32
      locations/music_delparco.qsrc
  2. 1 0
      locations/music_guitarlesson.qsrc

+ 30 - 32
locations/music_delparco.qsrc

@@ -1,14 +1,13 @@
 # music_delparco
 
-if $ARGS[0] = 'talkwithzariyah'
+if $ARGS[0] = 'talkwithzariyah':
 !!	TODO: Some small talk and a description here plus some paragraph depending on where the quest stands	
 	'You ask the first waitress about Zariyah, and she directs you to the office. As you approach, she waves at you through the open door, signaling to enter "Yes, yes Ruslan, don''t worry about it. No, I have to go, talk later."'
 	if ml_delparcoQW = 1:
 		'She puts down the phone "<<$pcs_nickname>>, so glad that you came. How are you? Did you think about the offer?" she smiles at you as you sit down.'
 		act 'Accept the offer to play at Del Parco': gt 'mod_musiclife_delparco', 'delparco_accept'
 	!!	act 'Decline the offer': gt 'mod_musiclife_delparco', 'delparco_decline'
-	else:
-	if ml_delparcoQW = 1:
+	elseif ml_delparcoQW = 1:
 		'She puts down the phone "<<$pcs_nickname>>, so glad that you came. How are you? Did you come to talk about the offer?" she smiles at you as you sit down.'
 		act 'Discuss the live music with': gt 'music_delparco', 'firstdiscussion'
 	end
@@ -51,12 +50,14 @@ if $ARGS[0] = 'firstdiscussion':
 		killvar 'ml_answerdeadline'
 		
 		act 'Leave': gt 'cafe_parco', 'start'
+	end
+	
 	act 'Ask for some time':
 		ml_delparcoQW = 3
 		ml_delparcogigdeadline = daystart + 2
 		ml_delparcooriginaldate = daystart
 		'"I have to think, I want to make sure that I can do it. It''s a big commitment and I don''t want to, you know.. not do it right."'
-		'Zariyah nods "Ok, <<$pcs_nickname>>, but please, let me know by <<$week['ml_answerdeadline']>>."'
+		'Zariyah nods "Ok, <<$pcs_nickname>>, but please, let me know by <<$week[''ml_answerdeadline'']>>."'
 		
 		killvar 'ml_answerdeadline'
 
@@ -93,35 +94,32 @@ if $ARGS[0] = 'eveningshow':
 	ml_performance['performed_minutes'] += 30
 	ml_performance['total_time_performed'] += 30
 
-	if perform_lvl < 45 = rand(1,3)	
-	'<center><video autoplay loop src="images/pc/activities/music/GigPlaceHolder.mp4"></video></center>'
-!!TODO: More scene, on set up, arriving, etc.	
-	if ml_success < ml_performance['set_quality']: 
-		ml_delparco['performance'] += 10
-		pav_music += rand(1,5)
-		pcs_mood += 15
-		'You played with no issues playing everything as it was meant to be.'
-	elseif ml_success < ml_correction_chance:
-		ml_delparco['performance'] += 5
-		pav_music += rand(1,3)
-		'You made some mistakes and forgot the lyrics in some places, but you were able to compensate by your performance and yes, your looks.'
-		pcs_mood += 5
-	elseif ml_success < ml_correction_chance + 10:
-		pav_music -= rand(0,2)
-		pcs_mood -= 5
-		'You made quite a few mistakes and forgot the lyrics in places, and even though you tried your best to compensate by your performance and your looks, you could see that people have noticed them. '
-		'You will have to practice even more and rehearse your songs before your next gig.'
-	else 
-		ml_delparco['performance'] -= 20
-		pav_music -= rand(5,10)
-		pcs_mood -= 15
-		'Today definitely wasn''t your day. You bombed, there is no better word for it. While you lasted your 30 minutes, you could see on the audience that they didn''t really enjoy it, even though they politely clapped at the end.'
-		'You will have to do some serious practicing if you want to have another chance to perform.'
+	if perform_lvl < 45 = rand(1,3):
+		'<center><video autoplay loop src="images/pc/activities/music/GigPlaceHolder.mp4"></video></center>'
+	!!TODO: More scene, on set up, arriving, etc.	
+		if ml_success < ml_performance['set_quality']: 
+			ml_delparco['performance'] += 10
+			pav_music += rand(1,5)
+			pcs_mood += 15
+			'You played with no issues playing everything as it was meant to be.'
+		elseif ml_success < ml_correction_chance:
+			ml_delparco['performance'] += 5
+			pav_music += rand(1,3)
+			'You made some mistakes and forgot the lyrics in some places, but you were able to compensate by your performance and yes, your looks.'
+			pcs_mood += 5
+		elseif ml_success < ml_correction_chance + 10:
+			pav_music -= rand(0,2)
+			pcs_mood -= 5
+			'You made quite a few mistakes and forgot the lyrics in places, and even though you tried your best to compensate by your performance and your looks, you could see that people have noticed them. '
+			'You will have to practice even more and rehearse your songs before your next gig.'
+		else 
+			ml_delparco['performance'] -= 20
+			pav_music -= rand(5,10)
+			pcs_mood -= 15
+			'Today definitely wasn''t your day. You bombed, there is no better word for it. While you lasted your 30 minutes, you could see on the audience that they didn''t really enjoy it, even though they politely clapped at the end.'
+			'You will have to do some serious practicing if you want to have another chance to perform.'
+		end
 	end
 end
 	
-
-
-end
-
 --- music_delparco ---------------------------------

+ 1 - 0
locations/music_guitarlesson.qsrc

@@ -132,6 +132,7 @@ if $ARGS[0] = 'getdate':
 			newday -= 29
 		else 
 			newday -= 28
+		end
 	elseif newday > 30:
 		newday -= 30
 	end