Bladeren bron

[added] Portfolio image variables and image viewer for journal

Kevin_Smarts 3 jaren geleden
bovenliggende
commit
640f0a6e41
4 gewijzigde bestanden met toevoegingen van 30 en 12 verwijderingen
  1. 1 0
      glife.qproj
  2. 12 1
      locations/camera.qsrc
  3. 4 0
      locations/journal.qsrc
  4. 13 11
      locations/shop_photography.qsrc

+ 1 - 0
glife.qproj

@@ -10,6 +10,7 @@
 	<Location name="obj_din"/>
 	<Location name="journal"/>
 	<Location name="journal_quests"/>
+	<Location name="journal_portfolio"/>
 	<Location name="Cheatmenu_din"/>
 	<Location name="themes"/>
 	<Folder name="System">

+ 12 - 1
locations/camera.qsrc

@@ -182,6 +182,7 @@ if $ARGS[0] = 'city_library':
 	*clr & cla
 	minut += 15
 	photoskl_exp += rand(3,5)
+	portfolio_locations[1] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'You make your way over to the city library, it is a grand building and would make a wonderful photograph. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
@@ -194,6 +195,7 @@ if $ARGS[0] = 'city_uni':
 	*clr & cla
 	minut += 25
 	photoskl_exp += rand(5,7)
+	portfolio_locations[2] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'You make your way over to the city University, it is a grand building and would make a wonderful photograph. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. You can''t help but also notice all the students moving around the quad and feel that would be a amazing photo as well. You stop and take several photos of the students moving around. Happy with your results you know you have something to add to your portfolio.'
@@ -206,6 +208,7 @@ if $ARGS[0] = 'gadukino':
 	*clr & cla
 	minut += 25
 	photoskl_exp += rand(5,7)
+	portfolio_locations[4] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'Standing in the village you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. You can''t help but also notice the houses and feel they would be a amazing photo as well. You stop and take several photos of different houses, finally settling on your grandparents home. Happy with your results you know you have something to add to your portfolio.'
@@ -218,6 +221,7 @@ if $ARGS[0] = 'gadforest':
 	*clr & cla
 	minut += 15
 	photoskl_exp += rand(3,5)
+	portfolio_locations[6] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'Standing in the forest you amazed by how breath takingly beautiful it is out here. You walk around taking photos of the trees until you are happy with the results. Checking one last time all the photo''s you took, you feel confident you found something to add to your portfolio and put the camera away.'
@@ -230,6 +234,7 @@ if $ARGS[0] = 'pav_church':
 	*clr & cla
 	minut += 25
 	photoskl_exp += rand(5,7)
+	portfolio_locations[12] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'Standing in front of the local church you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. With that done you spot the cemetery and walk near it and start taking photos of it as well. Happy with your results you know you have something to add to your portfolio.'
@@ -242,6 +247,7 @@ if $ARGS[0] = 'pav_train':
 	*clr & cla
 	minut += 15
 	photoskl_exp += rand(3,5)
+	portfolio_locations[8] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'Standing in front of the local train station you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
@@ -254,6 +260,7 @@ if $ARGS[0] = 'pav_complex':
 	*clr & cla
 	minut += 15
 	photoskl_exp += rand(3,5)
+	portfolio_locations[7] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'Standing in the courtyard you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
@@ -266,6 +273,7 @@ if $ARGS[0] = 'pav_school':
 	*clr & cla
 	minut += 15
 	photoskl_exp += rand(3,5)
+	portfolio_locations[9] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'Standing in front of the school you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
@@ -278,6 +286,7 @@ if $ARGS[0] = 'pav_park':
 	*clr & cla
 	minut += 15
 	photoskl_exp += rand(3,5)
+	portfolio_locations[10] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'Walking through the park you realize what a wonderful photo this place would make. You move around looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
@@ -290,6 +299,7 @@ if $ARGS[0] = 'pav_lake':
 	*clr & cla
 	minut += 15
 	photoskl_exp += rand(3,5)
+	portfolio_locations[11] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'As you look out over the lake you realize what a wonderful photo this place would make. You walk around the shore looking through the camera several times until you find just the perfect spot. You take several photos, then you pause and check them. Happy with your results you know you have something to add to your portfolio.'
@@ -311,7 +321,7 @@ if $ARGS[0] = 'pav_lake_sonia':
 		photoskl_exp += rand(3,5)
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/school/girls/sonia/lake/photography/photo1.jpg"></center>'
-		'You get a little closer to her and then start taking her photograph, you move around and take a couple of photo''s from different places and angles. It seems you made to much noise as she suddenly sits up partial and looks your direction.'
+		'You get a little closer to her and then start taking her photograph, you move around and take a couple of photo''s from different places and angles. It seems you made too much noise as she suddenly sits up partial and looks your direction.'
 		act 'Caught':
 			*clr & cla
 			minut += 2
@@ -349,6 +359,7 @@ if $ARGS[0] = 'pav_lake_sonia':
 							*clr & cla
 							minut += 5
 							photoskl_exp += rand(3,5)
+							portfolio_people[4] = 1
 							gs 'stat'
 							'<center><img src="images/characters/pavlovsk/school/girls/sonia/lake/photography/photo6.jpg"></center>'
 							'With her now completely naked you keep taking photo''s of her and start getting a lot closer to her as you. The longer it goes on the more turned on she seems to get, eventually she starts playing with her pussy as you take her photographs. Finally haven taken several dozen photo''s you feel you have taken enough and stop taking her photographs. "Thanks Sonia, I got what I needed."'

+ 4 - 0
locations/journal.qsrc

@@ -18,6 +18,10 @@ if $ARGS[0] = 'records':
 		'<br><center><h3>Non-Combat</h3></center><br>'
 		func('spellBook','learn','$nonComSpells')
 	end
+	
+	if ARRSIZE('$portfolio_locations') > 0 or ARRSIZE('$portfolio_people') > 0:
+		act 'View your photography portfolio': gt 'journal_portfolio'
+	end
 
 	'<center><h2>Housing</h2></center>'
 	

+ 13 - 11
locations/shop_photography.qsrc

@@ -1,13 +1,15 @@
 # shop_photography
 
-! Photography shop in the City Center Mall
-! Variables used:
-! photographyEv = Track shop progression through buying a camera
-!	0 = First visit
-!	1 = Return visitor, but have not bought camera
-!	2 = Bought camera, unlocks portfolio sharing
-! photography_job = Track progression through job events
-! photojob_daystart = Track when job last accepted - only allowed one job per week
+!! Photography shop in the City Center Mall
+!! Variables used:
+!! photographyEv = Track shop progression through buying a camera
+!!	0 = First visit
+!!	1 = Return visitor, but have not bought camera
+!!	2 = Bought camera, unlocks portfolio sharing
+!! photography_job = Track progression through job events
+!! photojob_daystart = Track when job last accepted - only allowed one job per week
+!! portfolio_locations[n] for storing which images Sveta has of locations (value of 1 for have)
+!! portfolio_people[n] for storing which images Sveta has of people
 
 ! The owner of the shop is Branko Volenskii
 if $ARGS[0] = 'start':
@@ -305,7 +307,7 @@ if $ARGS[0] = 'phototank':
 	*clr & cla
 	minut += 20
 	gs 'stat'
-	'<center><img src="images/characters/shared/37.jpg"></center>'
+	'<center><img src="images/characters/shared/headshots_generic/37.jpg"></center>'
 	'You head over to the Industrial Region where you quickly meet up with your contact at the Experience Center.'
 	'"Hi there; you must be <<$pcs_firstname>>. The group is already on their way to the site so I''ll take you up there in my car. I am sure you know everything you will need to do but feel free to ask if you have any queries"'
 	'You get in the car and ride for nearly half a hour until you reach the location of the Experience Center. Once there the representative parks the car, you get out and head inside.'
@@ -342,7 +344,7 @@ if $ARGS[0] = 'photowedding':
 	*clr & cla
 	minut += rand(10,18)
 	gs 'stat'
-	'<center><img src="images/characters/shared/18.jpg"></center>'
+	'<center><img src="images/characters/shared/headshots_generic/18.jpg"></center>'
 	'You head over to the Residential District where you meet one of the family members of the betrothed.'
 	'"Hello, you must be the photographer! If you follow me then I will take you to the happy couple to take the pictures of them."'
 	act 'Follow them':
@@ -364,7 +366,7 @@ if $ARGS[0] = 'photomotorsport':
 	*clr & cla
 	minut += rand(15,20)
 	gs 'stat'
-	'<center><img src="images/characters/shared/11.jpg"></center>'
+	'<center><img src="images/characters/shared/headshots_generic/11.jpg"></center>'
 	'You head over to the Industrial Region and meet a representative of the Autodrome who will take you to racetrack and give you a VIP pass; there you will be expected to take pictures of the event and deliver them back to your contact at the track.'
 	'"Why hello there, you must be the person Branko said they would be sending. As I''m sure you know everything you have to do at the track I will give you this Press Pass and take you to the Autodrome!"'
 	'You look at the pass they gave you and confirm it is all legitimate then get into their car to be taken to the track.'