Parcourir la source

Merge remote-tracking branch 'rachels/master'

Kevin_Smarts il y a 2 ans
Parent
commit
b88718624d

+ 9 - 0
isample_mod/locations/mod_isample_saveupdater.qsrc

@@ -0,0 +1,9 @@
+# mod_isample_saveupdater
+!! This file is for updating save game when one variable have been replaced by another.
+!! The code in this location will be processed by the main game saveupdater routine as a subroutine
+!! First will be processed the code in the main routine and then all the installed mods in the order of their installation
+
+
+--- mod_isample_saveupdater ---------------------------------
+
+

+ 3 - 3
locations/gschool_lessons.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'morning':
 		gs 'gschool_socialchg', 'test'
 	end
 		
-	if $breaktype ! 'first':	
+	if $breaktype ! 'first':
 		if detention_set = 1 and week = 1:
 			detention_set = 2
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big134.jpg"></center>'
@@ -45,7 +45,7 @@ if $ARGS[0] = 'morning':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
 			'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to.'
 			gs 'gschool_gossip', 'morning'
-			*nl			
+			*nl
 			gs 'gschool_lessons', 'uniform_check'
 			gs 'gschool_schedule'
 			act 'Go to first period': school_period = 0 & gt 'gschool_lessons', 'schedule'
@@ -55,7 +55,7 @@ if $ARGS[0] = 'morning':
 			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
 			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'
 			if week = 1 and class['grade_check_day'] ! daystart:
-				act 'Check you grades': gt 'gschool_lessons', 'grade_check'
+				act 'Check your grades': gt 'gschool_lessons', 'grade_check'
 			end
 		end
 	else

+ 14 - 0
locations/saveupdater.qsrc

@@ -1346,6 +1346,20 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	if flag_start_parc > 0: katjaQW['school_kiss'] = flag_start_parc & killvar 'flag_start_parc'
 
 end
+if mod_list > 0:
+	mod_i=1
+	:mod_data_updater
+	if $mod_name[mod_i] ! '':
+		$mod_su_name = 'mod_<<$mod_name[mod_i]>>_saveupdater'
+		if LOC($mod_su_name): gs $mod_su_name
+	end
+	if mod_list > mod_i:
+		mod_i+=1
+		jump 'mod_data_updater'
+	end
+	killvar '$mod_su_name'
+	killvar 'mod_i'
+end
 
 gs 'saveg'
 --- saveupdater ---------------------------------