Merge remote-tracking branch 'rachels/master'

# Conflicts:
#	locations/music_guitarlesson.qsrc

locations/music_buskingevents.qsrc

@@ -29,7 +29,8 @@ if $ARGS[0] = 'busking':
 !!	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'
+	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
@@ -72,7 +73,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>>."'

locations/music_guitarlesson.qsrc

@@ -128,10 +128,10 @@ if $ARGS[0] = 'getdate':
 	if (month = 1 or month = 3 or month = 5 or month = 7 or month = 8 or month = 10 or month = 12) and newday > 31:
 		newday -= 31
 	elseif month = 2:
-		if (year mod 4 = 0) and newday > 29:
-			newday -= 29
+		if (year mod 4 = 0):
+		  if newday > 29: newday -= 29
 		else 
-			newday -= 28
+		  if newday > 28: newday -= 28
 		end
 	elseif newday > 30:
 		newday -= 30