1
0
Эх сурвалжийг харах

[changed] Moved Igor's quest to use daystart instead of cikl and a numerical variable for numbers instead of string variables.

bgkjdgbizgblzdgbr 2 жил өмнө
parent
commit
b247bb7683

+ 0 - 3
locations/cikl.qsrc

@@ -998,9 +998,6 @@ if storyline = 1 and week = 7 and soniaPS = 0 and month > 9 and daystart >= soni
 	end
 end
 
-!!Counter for dimka/igor date
-if igor_DimaNos = 2 or igor_DimaNos = 3: $igor_DimaNos_day += 1
-
 dmishaevent = 0
 
 if Gspravka <= 0 and GspravkaT = 1:GspravkaT = 0 & Gspravka = 0

+ 4 - 4
locations/igorev.qsrc

@@ -1305,9 +1305,9 @@ if $ARGS[0] = 'Dimka':
 								minut += 23
 								igor_DimaNos = 2
 								if week > 4:
-									$igor_DimaNos_day = week - 7
+									igor_DimaNos_day = daystart - week + 13
 								else
-									$igor_DimaNos_day = week
+									igor_DimaNos_day = daystart -week + 6
 								end
 								gs 'stat'
 								gs 'igorev', 'kruglov_desc'
@@ -1335,9 +1335,9 @@ if $ARGS[0] = 'Ask about Dianas date':
 		*clr & cla
 		igor_DimaNos = 3
 		if week > 4:
-			$igor_DimaNos_day = week - 7
+			igor_DimaNos_day = daystart - week + 13
 		else
-			$igor_DimaNos_day = week
+			igor_DimaNos_day = daystart -week + 6
 		end
 		gs 'igorev', 'kruglov_desc'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/talk.jpg"></center>'

+ 1 - 1
locations/igorhome.qsrc

@@ -254,7 +254,7 @@ if $ARGS[0] = 'Chat':
 		act 'Lets go for walk': gt 'igorev', 'walk'
 	end
 !!This one only shows up if Igor went on a date with Dimka.
-	if (igor_DimaNos = 2 or igor_DimaNos = 3) and $igor_DimaNos_day > 5:
+	if (igor_DimaNos = 2 or igor_DimaNos = 3) and igor_DimaNos_day > daystart:
 		act 'How was your date?': gt 'igorev', 'Ask about Dianas date'
 	end
 	act 'Excuse yourself': gt 'igorhome','hallway'

+ 9 - 0
locations/saveupdater.qsrc

@@ -1287,6 +1287,15 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	i += 1
 	if ARRSIZE('camera_found') > i: jump 'camera_update_loop'
 
+	!!Moved Igor''s quest to use daystart.
+	
+	if igor_DimaNos = 2 or igor_DimaNos = 3:
+		if $igor_DimaNos_day > 5:
+			igor_DimaNos_day = daystart
+		else
+			igor_DimaNos_day = daystart +6 - $igor_DimaNos_day
+		end
+	end
 end
 
 gs 'saveg'