Browse Source

Merge remote-tracking branch 'netuttki/master'

KevinSmarts 4 years ago
parent
commit
68ede05bdd
1 changed files with 31 additions and 28 deletions
  1. 31 28
      locations/saveupdater.qsrc

+ 31 - 28
locations/saveupdater.qsrc

@@ -813,35 +813,38 @@ end
 
 
 !!--------0.8.1--- Music variable names changed
-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_guitarlesson['lessonday'] = ml_lessonday
-$ml_guitarlesson['lessonday'] = $ml_lessonday
-ml_guitarlesson['lessonhour'] = 15
-ml_guitarlesson['nextlesson'] = daystart + (ml_guitarlesson['lessonday'] + 7 - week)
-ml_guitarlesson['advertisement'] = ml_guitarlessonadv
-ml_guitarlesson['enquired'] = ml_enquired
-
-if age < 18: 
-	ml_guitarlesson['lessoncost'] = 300
-else
-	ml_guitarlesson['lessoncost'] = 500
-end
-
-killvar 'ml_guitarWithMe'
-killvar 'ml_guitar'
-killvar 'ml_performed_minutes'
-killvar 'ml_max_perform_minutes'
-killvar 'ml_guitarlessonadv'
-killvar 'ml_enquired'
-killvar 'ml_lessonday'
-killvar '$ml_lessonday'
-killvar 'ml_lessoncost'
-!!--------0.8.1--- Music variable names changed
+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_guitarlesson['lessonday'] = ml_lessonday
+	$ml_guitarlesson['lessonday'] = $ml_lessonday
+	ml_guitarlesson['lessonhour'] = 15
+	ml_guitarlesson['nextlesson'] = daystart + (ml_guitarlesson['lessonday'] + 7 - week)
+	ml_guitarlesson['advertisement'] = ml_guitarlessonadv
+	ml_guitarlesson['enquired'] = ml_enquired
+
+	if age < 18: 
+		ml_guitarlesson['lessoncost'] = 300
+	else
+		ml_guitarlesson['lessoncost'] = 500
+	end
 
+	killvar 'ml_guitarWithMe'
+	killvar 'ml_guitar'
+	killvar 'ml_performed_minutes'
+	killvar 'ml_max_perform_minutes'
+	killvar 'ml_guitarlessonadv'
+	killvar 'ml_enquired'
+	killvar 'ml_lessonday'
+	killvar '$ml_lessonday'
+	killvar 'ml_lessoncost'
+	!!--------0.8.1--- Music variable names changed
+
+	ml_update_1 = 1
+end
 
 !! changed $metkaM to $locM_arg and $metka to $loc_arg in the code
 $locM_arg = $metkaM