Browse Source

Merge remote-tracking branch 'netuttki/master'

# Conflicts:
#	locations/music_buskingevents.qsrc
KevinSmarts 4 years ago
parent
commit
a8208fc508
2 changed files with 7 additions and 6 deletions
  1. 4 5
      locations/music_buskingevents.qsrc
  2. 3 1
      locations/saveupdater.qsrc

+ 4 - 5
locations/music_buskingevents.qsrc

@@ -26,12 +26,11 @@ if $ARGS[0] = 'busking':
 	'<center><img <<$set_imgh>> src="images/pc/activities/music/guitarf'+ rand(1,2) +'.jpg"></center>'	
 	'You start to play the songs you know, pushing your open guitar case forward a little in case people drop some change there.' + iif(ml_online['account'] = 1 and ml_online['active'] = 1, ' You also set up the sign with the link to your webprofile.', '') + ' After playing for an hour you have made <<ml_tipsearned>> <b>P</b> in tips.'
 
-
+!!	act 'Finish': gt $curloc, 'start'	
 !!  Random events come here. The displayed actions depend on the event
 	ml_rand_event = rand(0,100)
-	if ml_rand_event <= 10 and $ARGS[1] = 'pav' and npc_rel['A144'] > 40: 
-		gs 'music_buskingevents', 'anushka'
-	elseif ml_rand_event < 15 and $ARGS[1] = 'pav' and (npc_rel['A20'] < 20 or npc_rel['A21'] < 20):
+	if ml_rand_event <= 10 and $ARGS[1] = 'pav' and npc_rel['A144'] > 40: gs 'music_buskingevents', 'anushka'
+!!	elseif ml_rand_event < 15 and $ARGS[1] = 'pav' and ((npc_rel['A20'] < 20 or npc_rel['A21'] < 20):
 !! TODO: if the gopniks don''t like the PC and/or her music is awful, there is a chance that Lena and Lera harasses her.
 !!		gs 'music_buskingevents', 'lena_and_lera', 1
 !!	elseif ml_rand_event < 15 and $ARGS[1] = 'pav' and ( (npc_rel['A20'] < 40 or npc_rel['A21'] < 40) and (pcs_instrmusic < 30 or pcs_perform < 30 or pcs_vokal < 30) ):
@@ -73,7 +72,7 @@ if $ARGS[0] = 'anushka':
 !!TODO: A few scenarios: Friends, besties, neutral. Player is an awful, bad, ok, good musician. Anushka has seen PC play music before (either busking or they played together).	
 	npc_rel['A144'] += 2
 	*nl	
-	'As you stop playing and get ready to pack up you spot <<$npc_firstname[''A144'']>> standing not far from you, watching you quietly.'
+	'As you stop playing and get ready to pack up you spot <<$npc_firstname['A144']>> standing not far from you, watching you quietly.'
 
 	if npc_rel['A144'] > 60:
 		'As she notices that you saw her she grins and starts to walk up to you "I didn''t know you turned into a wandering minstrel, <<$pcs_nickname>>."'

+ 3 - 1
locations/saveupdater.qsrc

@@ -813,12 +813,14 @@ end
 
 
 !!--------0.8.1--- Music variable names changed
-if ml_update_1 ! 0:
+if ml_update_1 = 0:
 	ml_guitar['carried'] = ml_guitarWithMe
 	ml_guitar['hasguitar'] = ml_guitar
 	ml_performance['performed_minutes'] = ml_performed_minutes
 	ml_performance['max_perform_minutes'] = ml_max_perform_minutes
+	ml_guitar['chordbook'] = ml_chordbook
 
+	ml_guitarlesson['lessoncount'] = ml_lessoncount
 	ml_guitarlesson['lessonday'] = ml_lessonday
 	$ml_guitarlesson['lessonday'] = $ml_lessonday
 	ml_guitarlesson['lessonhour'] = 15