Merge remote-tracking branch 'Hooded_Silence/master'

locations/gp_elene_schedule.qsrc

@@ -28,7 +28,7 @@ if day <= 3 and (hour >= 8 and hour <= 11):
     if loc_switch = 0 and sunWeather = 1:
         $locat['elene'] = 'garden'
     else
-        locat['elene'] = 'lounge'
+        $locat['elene'] = 'lounge'
     end
     killvar 'loc_switch'
 end

locations/pushkin_ballet_init.qsrc

@@ -63,7 +63,6 @@ if $ARGS[0] = 'init':
 	If mod_ballet['blocker'] = 1:   
 		mod_ballet['blocker'] = 2
 		gs 'fame', 'pushkin', 'ballet', 30, 'local'
-		gs 'ballet_npc'
 	end
 end
 

locations/pushkin_ballet_secrets.qsrc

@@ -246,8 +246,7 @@ if $ARGS[0] = 'ballet_courses':
 			gs 'pain', 2, 'armR', 'stretch'
 			gs 'pain', 2, 'back', 'stretch'
 			gs 'pain', 2, 'chest', 'stretch'
-			gs 'exercise', 'tier1', 120, 'agil', 'stren', 'danc'
-			gs 'exp_gain', 'danc', rand(1,5)
+			gs 'exercise', 'tier3', 120, 'agil', 'stren', 'danc'
 			'you enter the classroom and the practice barres are set up for usage. You start to perform warm ups before your introductory ballet lesson starts along your fellow students.'
 
 		elseif pcs_danc >= 50 or dance_skill <= 74:
@@ -259,7 +258,7 @@ if $ARGS[0] = 'ballet_courses':
 			gs 'pain', 3, 'back', 'stretch'
 			gs 'pain', 3, 'chest', 'stretch'
 			gs 'exercise', 'tier2', 120, 'agil', 'stren', 'danc'
-			gs 'exp_gain', 'danc', rand(1,10)
+
 			'you enter the classroom and the practice barres are set up for usage. You start to perform warm ups before your intermediate lesson starts along your fellow students.'
 		else
 			gs 'pain', 3, 'legL', 'stretch'
@@ -270,7 +269,6 @@ if $ARGS[0] = 'ballet_courses':
 			gs 'pain', 3, 'back', 'stretch'
 			gs 'pain', 3, 'chest', 'stretch'
 			gs 'exercise', 'tier3', 120, 'agil', 'stren', 'danc'
-			gs 'exp_gain', 'danc', rand(5,10)
 			'you enter the classroom and the practice barres are set up for usage. You start to perform warm ups before your advanced lesson starts along your fellow students.'
 		end
 		gs 'stat'

locations/pushkin_sq.qsrc

@@ -34,7 +34,7 @@ if week < 7 and hour >= 9 and hour <= 17:
 	'Tsar Bomba, Flamingos and Fansy Pansy,  are all current closed, they are open open Mon - Sat day 9:00 - 18:00'
 end
 if week < 7 and hour >= 9 and hour <= 17:
-	'<a href="exec:gt ''ballet_secrets'',''init''">Ballet Secrets</a> is located at the end of a well maintained alleyway with a flamboyant ballet shop display and despite it''s name the premises offers a wide range of services for dancers and athletes. '
+	'<a href="exec:gt ''pushkin_ballet_secrets'',''init''">Ballet Secrets</a> is located at the end of a well maintained alleyway with a flamboyant ballet shop display and despite it''s name the premises offers a wide range of services for dancers and athletes. '
 elseif 	week = 7 and (hour >= 10 and hour <=16):
 	'The dance shop is closed, but you can still access the <a href="exec:gt ''pushkin_ballet_secrets'',''init''">Members Area</a> with your card.'
 else