[changed] Changed some string variables to more appropriate numerical variables. Also move the option to take a photo, such that it does not have a artificial requirement of relationship whit sister above 70. Finally fixed a missing change of glake to pav_lake.

locations/camera.qsrc

@@ -63,7 +63,7 @@ $camera_locations['pav_park'] = {
 	$camera_return_loc_arg = 'start'
 }
 
-$camera_locations['glake'] = {
+$camera_locations['pav_lake'] = {
 	$camera_description = 'Pavlovsk Lake'
 	$camera_event = 'pav_lake'
 	$camera_return_loc = 'pav_lake'
@@ -85,7 +85,7 @@ $camera_people['mother'] = {
 	$camera_event = 'mother'
 	$camera_return_loc = ''
 	$camera_return_loc_arg = ''
-	$camera_requirement = (npc_rel['A29'] >= 50 and month > 2 and month < 9)
+	camera_requirement = (npc_rel['A29'] >= 50 and month > 2 and month < 9)
 }
 
 $camera_people['anya'] = {
@@ -93,7 +93,7 @@ $camera_people['anya'] = {
 	$camera_event = 'anya'
 	$camera_return_loc = ''
 	$camera_return_loc_arg = ''
-	$camera_requirement = (npc_rel['A33'] >= 50)
+	camera_requirement = (npc_rel['A33'] >= 50)
 }
 
 $camera_people['anushka'] = {
@@ -101,7 +101,7 @@ $camera_people['anushka'] = {
 	$camera_event = ''
 	$camera_return_loc = ''
 	$camera_return_loc_arg = ''
-	$camera_requirement = (npc_rel['A144'] >= 50)
+	camera_requirement = (npc_rel['A144'] >= 50)
 }
 
 $camera_people['lazar'] = {
@@ -109,7 +109,7 @@ $camera_people['lazar'] = {
 	$camera_event = 'lazar'
 	$camera_return_loc = ''
 	$camera_return_loc_arg = ''
-	$camera_requirement = (npc_rel['A149'] >= 50 and month > 2 and month < 9)
+	camera_requirement = (npc_rel['A149'] >= 50 and month > 2 and month < 9)
 }
 
 $camera_people['eugene'] = {
@@ -117,7 +117,7 @@ $camera_people['eugene'] = {
 	$camera_event = 'eugene'
 	$camera_return_loc = ''
 	$camera_return_loc_arg = ''
-	$camera_requirement = (LCEugenefirst >= 1)
+	camera_requirement = (LCEugenefirst >= 1)
 }
 
 
@@ -136,7 +136,7 @@ if $ARGS[0] = 'start':
 		! Assign the variables
 		dynamic $camera_locations[iterator]
 		! Show the player unphotographed locations
-		if $camera_found[$camera_event] ! 1: '<<$camera_description>>'
+		if camera_found[$camera_event] ! 1: '<<$camera_description>>'
 		iterator += 1
 		if iterator < location_count: jump 'location_loop'
 	end
@@ -149,7 +149,7 @@ if $ARGS[0] = 'start':
 		! Assign the variables
 		dynamic $camera_people[iterator]
 		! If the subject has not been photographed and requirements are met (-1), show the name
-		if $camera_found[$camera_event] ! 1 and $camera_requirement = -1: '<<$camera_description>>'
+		if camera_found[$camera_event] ! 1 and camera_requirement = -1: '<<$camera_description>>'
 		iterator += 1
 		if iterator < people_count: jump 'people_loop'
 	end
@@ -163,37 +163,50 @@ if $ARGS[0] = 'check_location':
 		! Assign the variables
 		dynamic $camera_locations[$loc]
 		! If they have not already photographed the location
-		if $camera_found[$camera_event] ! 1:
+		if camera_found[$camera_event] ! 1:
 			! Offer the action
 			act 'Photograph the <<$camera_description>>':
-				$camera_found[$camera_event] = 1
+				camera_found[$camera_event] = 1
 				$loc = $camera_return_loc
 				$loc_arg = $camera_return_loc_arg
 				gt 'camera', $camera_event
 			end
 		! If they photographed the lake but did not trigger the sonia conditions, offer her
-		elseif $camera_event = 'pav_lake' and $camera_found['sonia'] ! 1 and sunWeather = 1 and soniaPS > 0:
+		elseif $camera_event = 'pav_lake' and camera_found['sonia'] ! 1 and sunWeather = 1 and soniaPS > 0:
 			gs 'camera', 'pav_lake_sonia', 'describe'
 		end
 	end
 end
 
-if $ARGS[0] = 'check_person':
-	$targetPerson = $ARGS[1]
+!!if $ARGS[0] = 'check_person':
+!!	$targetPerson = $ARGS[1]
 	! If the player has a camera and this person exists in the array
-	if photographyEv >= 2 and $camera_people[$targetPerson] ! 0:
+!!	if photographyEv >= 2 and $camera_people[$targetPerson] ! 0:
 		! Assign the variables
-		dynamic $camera_people[$targetPerson]
+!!		dynamic $camera_people[$targetPerson]
 		! If they have not already photographed the person
-		if $camera_found[$targetPerson] ! 1 and $camera_requirement = -1:
+!!		if $camera_found[$targetPerson] ! 1 and $camera_requirement = -1:
 			! Offer the action
-			act 'Ask to take a photo':
-				$camera_found[$targetPerson] = 1
-				gt 'camera', $camera_event
-			end
-		end
-	end
+!!			act 'Ask to take a photo':
+!!				$camera_found[$targetPerson] = 1
+!!				gt 'camera', $camera_event
+!!			end
+!!		end
+!!	end
+!!end
+
 
+if $ARGS[0] = 'check_person':
+    ! If the player has a camera and this person exists in the array
+    if photographyEv >= 2 and $camera_people[$ARGS[1]] ! 0:
+        ! Assign the variables
+        dynamic $camera_people[$ARGS[1]]
+        ! If they have not already photographed the person
+        if camera_found[$ARGS[1]] ! 1 and camera_requirement = -1:
+            ! Offer the action
+            dynamic ' act ''Ask to take a photo'': camera_found["<<$ARGS[1]>>"] = 1 & gt ''camera'', $camera_event'
+        end
+    end
 end
 
 
@@ -405,7 +418,7 @@ if $ARGS[0] = 'pav_lake_sonia':
 	if $ARGS[1] = 'describe': 'You notice a girl sunbathing topless. It takes you a moment to realize it is Sonia, she appears to be alone. You wonder if she would make a good subject to photograph, a take on how innocence can get lost in a cruel world.'
 	act 'Take Sonia''s photograph':
 		*clr & cla
-		$camera_found['sonia'] = 1
+		camera_found['sonia'] = 1
 		photoskl_exp += rand(1,2)
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo1.jpg"></center>'

locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 3
-version_patch = 6
+version_patch = 7
 --- saveg ---------------------------------
 

locations/saveupdater.qsrc

@@ -1278,6 +1278,16 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 
 end
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080307:
+	!!Moving some string variables to more appropriate number variables in the camera files.
+	
+	i = 0
+	:camera_update_loop
+	camera_found[i] = 1
+	i += 1
+	if ARRSIZE('camera_found') > i: jump 'camera_update_loop'
+
+end
 
 gs 'saveg'
 --- saveupdater ---------------------------------

locations/sister_chat.qsrc

@@ -651,6 +651,9 @@ if $ARGS[0] = 'sister_chat':
 				act 'Move away': gt $loc, $loc_arg
 				act 'Keep talking': gt 'sister_chat', 'sister_chat'
 			end
+			!! Maybe show photo request
+			if $loc ! 'kuhrPar': gs 'camera', 'check_person', 'anya'
+
 			if $loc ! 'kuhrPar' and npc_rel['A33'] >= 70:
 				act 'Talk about sex':
 					*clr & cla
@@ -1083,8 +1086,6 @@ if $ARGS[0] = 'sister_chat':
 						end
 					end
 				end
-				!! Maybe show photo request
-				gs 'camera', 'check_person', 'anya'
 				!! talk about the twin sex request
 				if npc_rel['A33'] >= 80 and sisterknowslut > 0 and TwinQW >= 1 and TwinQW <= 5:
 					!! Note: the original code had "and sisterdialog < 2" but that var seems depricated