瀏覽代碼

Merge remote-tracking branch 'Lydia/master'

Kevin_Smarts 1 年之前
父節點
當前提交
31b6c1873e
共有 2 個文件被更改,包括 37 次插入36 次删除
  1. 36 36
      locations/camera.qsrc
  2. 1 0
      locations/hookahlounge.qsrc

+ 36 - 36
locations/camera.qsrc

@@ -123,7 +123,7 @@ $camera_people['eugene'] = {
 if $ARGS[0] = 'start':
 	*clr & cla
 	'<center><img src="images/pc/items/accessories/camera.jpg"></center>'
-	'You can''t help but smile as you check your camera. You love capturing life as it happens, but can be hard to decide exactly who or what you want to take photographs of.'
+	'You can''t help but smile as you check your camera. You love capturing life as it happens, but it can take time to decide precisely who or what you want to take photographs of.'
 	'You spend a few minutes thinking about places and people that might make for interesting subjects. Perhaps...'
 	*nl
 	! Get the number of locations in the array
@@ -198,30 +198,30 @@ if $ARGS[0] = 'eugene':
 	npc_rel['A89'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big89.jpg"></center>'
 	'"Hey, can I ask you something?"'
-	'She smiles and nods. "Sure. What is it sweetie?"'
+	'She smiles and nods. "Sure. What is it, sweetie?"'
 	'"Can I take your photo?"'
 	'"Sure thing, sweetie." She stops to let you take a photo, misunderstanding what you meant.'
 	'You shake your head and pull out your camera. "No, I meant with this."'
 	'She looks a little surprised and sheepish. "Oh! Are you working on becoming a photographer?"'
 	*nl
 	'You nod. "Yes, I just need more practice. Which is where you come in."'
-	'She laughs softly. "Okay, why not? I havn''t taken a break yet today. We can go to my place and you can take my picture there. Sound good?"'
-	'You nod. "Sure, that works for me." She tells her sister that she''s taking a break and leads you out of the cafe to her apartment building. She leads you upstairs and into her apartment. Once inside, you take out your camera.'
+	'She laughs softly. "Okay, why not? I haven''t taken a break yet today. So we can go to my place, and you can take my picture there. Sound good?"'
+	'You nod. "Sure, that works for me." She tells her sister she''s taking a break and leads you out of the cafe to her apartment building. She leads you upstairs and into her apartment. Once inside, you take out your camera.'
 	act 'Start taking her picture': gt 'eugeneev1', 'photography'
 end
 
 if $ARGS[0] = 'mother':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-	'You take our your camera. "Hey <<$npc_nickname[''A29'']>>, do you mind if I take your photograph for my portfolio?"'
+	'You take out your camera. "Hey, <<$npc_nickname[''A29'']>>, do you mind if I take your photograph for my portfolio?"'
 	'She frowns at you. "Where did you get that camera?"'
-	'You shrug a little. "I saved up and bought it. Please? I need the practice and I think you would make a great subject."'
+	'You shrug a little. "I saved up and bought it. Please? I need the practice, and I think you would make a great subject."'
 	'She shakes her head. "Seems like a waste of money to me."'
-	'You sigh. "I love doing it, plus I can make a living from it. Please?"'
+	'You sigh. "I love doing it, and I can make a living. Please?"'
 	*nl
 	'She sighs. "Fine, but I still think it''s a waste of time."'
 	'You nod. "I know. Let''s go outside."'
-	'"I don''t have time for that, just take my picture." she sternly replies'
+	'"I don''t have time for that. Just take my picture." she sternly replies.'
 	'"Please?" you plead.'
 	'She shakes her head. "Fine. The things I do for you kids..."'
 	act 'Take her photo':
@@ -233,9 +233,9 @@ if $ARGS[0] = 'mother':
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/1.jpg"></center>'
 		'You go outside and have her stand in a few poses around the courtyard before finally settling on her standing in front of some flowers. "I got it!"'
 		'She walks over to you. "Finally. Now I can get back to the housework."'
-		'You show her the photos you took and the one you finally decided on. "Here look, this one here is the one I will use for my portfolio."'
-		'She smiles. "They do look nice... I still say it''s a waste of time though."'
-		'You roll your eyes. "I know <<$npc_nickname[''A29'']>>." you reply as she walks back inside.'
+		'You show her your photos and the one you finally decided on. "Here, look, this is the one I will use for my portfolio."'
+		'She smiles. "They do look nice... I still say it''s a waste of time, though."'
+		'You roll your eyes. "I know, <<$npc_nickname[''A29'']>>," you reply as she walks back inside.'
 		act 'Put your camera away': gt 'pav_complex', 'start'
 	end
 end
@@ -245,7 +245,7 @@ if $ARGS[0] = 'anya':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_05.jpg"></center>'
 	'You climb off the bed and grab your camera off your desk. "Hey, do you mind if I take your photograph for my portfolio?"'
 	'She smiles. "What is it with you and that camera?"'
-	'You shrug a little. "I just love doing it. If I get good enough I could do it for a living. So please? I need the practice and I think you would make a great subject."'
+	'You shrug a little. "I just love doing it. If I get good enough, I could do it for a living. So, please? I need the practice, and I think you would make a great subject."'
 	'She giggles. "Fine, but something classy."'
 	'You nod. "Deal."'
 	act 'Take her photo':
@@ -257,9 +257,9 @@ if $ARGS[0] = 'anya':
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/2.jpg"></center>'
 		'You direct her to lie on the bed in several poses, then stand in various spots around the room before you finally find the perfect image. Once you''ve taken it, you sit down on the bed. "I got it."'
 		'She sits down next to you. "Let me see."'
-		'You show her the photos you took and the one you finally decided on. "You sure my ass doesn''t look fat in this? I think it looks fat." she says with a pout.'
+		'You show her your photos and the one you finally decided on. "You sure my ass doesn''t look fat in this? I think it looks fat," she says with a pout.'
 		'You shake your head and reassure her. "Your ass looks perfect. That''s why I took this photo. Trust me."'
-		'"Fine!" she pouts before sits back down on her bed. You put your camera away and join her.'
+		'"Fine!" she pouts before sitting back down on her bed. You put your camera away and join her.'
 		act 'Finish': gt 'sister_chat', 'sister_chat'
 	end
 end
@@ -277,7 +277,7 @@ if $ARGS[0] = 'lazar':
 		portfolio_people[3] = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/3.jpg"></center>'
-		'You watch as he starts showing off his skills, pretending to be teaching them, but you''re fairly sure he''s just showing off for you. You start taking several photos of him and they''re looking pretty good. He then suddenly pulls off his shirt and you keep taking photographs as you try to remain focused. You finally get the shot you want and put your camera away before giving Lazar a wave. He returns the wave as you leave.'
+		'You watch as he starts showing off his skills, pretending to be teaching them, but you''re reasonably sure he''s just showing off for you. You begin taking several photos of him, and they''re looking pretty good. He then suddenly pulls off his shirt, and you keep taking photographs as you try to remain focused. You finally get the shot you want and put your camera away before giving Lazar a wave. He returns the wave as you leave.'
 		act 'Walk off the pitch': gt 'gschool_grounds', 'sports'
 	end
 end
@@ -289,7 +289,7 @@ if $ARGS[0] = 'city_library':
 	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 for a wonderful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'You make your way over to the city library. It is a grand building and would make for a beautiful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -300,7 +300,7 @@ if $ARGS[0] = 'city_uni':
 	portfolio_locations[2] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'You make your way over to the university. It is a grand building and would make for a wonderful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You can''t help but notice all the students moving around and feel that they would make for a great photo as well. You stop and take several more photos of the students before stopping. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'You make your way over to the university. It is a grand building and would make for a beautiful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You can''t help but notice all the students moving around and feel they would make for a great shot. You stop and take several more photos of the students before stopping. You''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'gadukino':
 	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 photograph this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You can''t help but notice the houses and feel that they would make for a great photo as well. You stop and take several photos of different houses before finally settling on your grandparents home. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in the village, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. You can''t help but notice the houses and feel that they would also make for a great photo. You stop and take several pictures of different places before finally settling on your grandparents'' home. You''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -322,7 +322,7 @@ if $ARGS[0] = 'gadforest':
 	portfolio_locations[6] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in the forest, you are amazed by how breathtakingly beautiful it is out here. You walk around taking photos of the trees until you''re happy and check all the photos you''ve taken. You feel confident that you''ve found something to add to your portfolio and put your camera away.'
+	'Standing in the forest, you are amazed by how breathtakingly beautiful it is. You take photos of the trees until you''re happy and check all the shots you''ve taken. Finally, you feel confident that you''ve found something to add to your portfolio and put your camera away.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -333,7 +333,7 @@ if $ARGS[0] = 'pav_church':
 	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 several times until you find the perfect spot and take several photos before pausing and checking them. You then spot the cemetery and walk over to take some photos of it as well. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in front of the local church, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. You then spot the cemetery and take some photos of it. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -344,7 +344,7 @@ if $ARGS[0] = 'pav_train_hall':
 	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 several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in front of the local train station, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -355,7 +355,7 @@ if $ARGS[0] = 'pav_complex':
 	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 several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in the courtyard, you realize this place would make a wonderful photo. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -366,7 +366,7 @@ if $ARGS[0] = 'pav_school':
 	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 several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in front of the school, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -377,7 +377,7 @@ if $ARGS[0] = 'pav_park':
 	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 several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Walking through the park, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -388,10 +388,10 @@ if $ARGS[0] = 'pav_lake':
 	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 several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'As you look out over the lake, you realize what a wonderful photo this place would make. You walk around the shore several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 	if soniaPS > 0 and sunWeather = 1 and temp > 15 and hour > 6 or hour < 22:
-		'Just as you''re about to put your camera away, you notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia and she appears to be alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
+		'Just as you''re about to put your camera away, you notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia, and she appears alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
 		gs 'camera', 'pav_lake_sonia'
 	else
 		act 'Put your camera away': gt $loc, $loc_arg
@@ -399,14 +399,14 @@ if $ARGS[0] = 'pav_lake':
 end
 
 if $ARGS[0] = 'pav_lake_sonia':
-	if $ARGS[1] = 'describe': 'You notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia and she appears to be alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
+	if $ARGS[1] = 'describe': 'You notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia, and she appears alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
 	act 'Take her photograph':
 		*clr & cla
 		camera_found['sonia'] = 1
 		gs 'exp_gain', 'photoskl', rand(1,2)
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo1.jpg"></center>'
-		'You get a little closer and start taking her photograph, moving around and taking a number of shots from different angles before she suddenly sits up and looks in your direction.'
+		'You get a little closer and start taking her photograph, moving around and taking several shots from different angles before she suddenly sits up and looks in your direction.'
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
 		act 'Caught':
@@ -414,11 +414,11 @@ if $ARGS[0] = 'pav_lake_sonia':
 			gs 'exp_gain', 'photoskl', rand(1,2)
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo2.jpg"></center>'
-			'She covers herself up and looks at you in surprise. "What the fuck <<$pcs_nickname>>?! What are you doing?"'
-			'You smile and take another photo of her. "Sorry, I was just taking your photo. You''re just so beautiful and I couldn''t help myself."'
+			'She covers herself up and looks at you in surprise. "What the fuck, <<$pcs_nickname>>?! What are you doing?"'
+			'You smile and take another photo of her. "Sorry, I was just taking your photo. You''re just so beautiful, and I couldn''t help myself."'
 			'She smiles at the compliment. "Really?"'
 			'You nod as you take another photo of her. "Yes, now why don''t you get up and stop covering up?"'
-			'She smiles even more. "Okay, but just a few." She gets up on her knees and removes her hands, giving you a nice shot of her topless body.'
+			'She smiles even more. "Okay, but just a few." Then, she gets up on her knees and removes her hands, giving you a nice shot of her topless body.'
 			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Take more photos':
@@ -427,7 +427,7 @@ if $ARGS[0] = 'pav_lake_sonia':
 				gs 'exp_gain', 'photoskl', rand(1,2)
 				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo3.jpg"></center>'
-				'She is a little awkward at first, not knowing what to do, but as you continue taking more photos, she starts to relax and become more natural in her poses. She even starts to get into it herself and enjoying it.'
+				'She is a little awkward at first, not knowing what to do, but as you take more photos, she starts to relax and become more natural in her poses. She even starts to get into it herself and enjoys it.'
 				act 'Take more photos':
 					*clr & cla
 					gs 'exp_gain', 'photoskl', rand(1,2)
@@ -451,11 +451,11 @@ if $ARGS[0] = 'pav_lake_sonia':
 							portfolio_people[4] = 1
 							gs 'stat'
 							'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo6.jpg"></center>'
-							'You continue taking photos of her now naked body and start getting a lot closer to her. The longer it goes on, the more turned on she seems to get, eventually playing with her pussy. Finally, having taken several dozen photos, you feel that you''ve taken enough and stop. "Thanks Sonia, I got what I needed."'
-							'She frowns before bobbing her head slightly and smiling. "It was my pleasure, I really liked it. M-Maybe we can do it again sometime?" You can hear her shy sweet former self coming out.'
-							'You feel bad for her, knowing that almost nobody talks to her anymore. "Yeah sure, I would like that."'
+							'You continue taking photos of her naked body and start getting closer to her. The longer it goes on, the more turned on she seems to get, eventually playing with her pussy. Finally, having taken several dozen photos, you feel you''ve taken enough and stop. "Thanks, Sonia. I got what I needed."'
+							'She frowns before bobbing her head slightly and smiling. "It was my pleasure. I really liked it. M-Maybe we can do it again sometime?" You can hear her shy, sweet former self coming out.'
+							'You feel bad for her, knowing that almost nobody talks to her anymore. "Yeah, sure, I would like that."'
 							'She breaks into a huge smile and looks happier than you''ve seen her in a long time. "Okay, just let me know or maybe stop by my house sometime?"'
-							'You nod. "I will, but for now I''ve got all I need. I''ll let you get back to sunbathing. Thanks again." She smiles and gets dressed as you put your camera away.'
+							'You nod. "I will, but I''ve got all I need now. I''ll let you get back to sunbathing. Thanks again." She smiles and gets dressed as you put your camera away.'
 							gs 'arousal', 'voyeur', 5
 							gs 'arousal', 'end'
 							gs 'stat'

+ 1 - 0
locations/hookahlounge.qsrc

@@ -4,6 +4,7 @@
 !!I intend on adding 2 NPCs, a Muslim woman and a man of undecided origin. Unclear at the moment on what their connection is.
 !!Possibility to unlock more drugs to take using the hookah as relationship with Muslim woman progresses.
 !!I have an idea to possibly enable Sveta to work at the Hookah Lounge in the future
+!!I want something where on repeat visits, Aliyyah (the woman at the counter) greets Sveta by name instead of by "ma'am"
 if $ARGS[0] = 'start':
 	*clr & cla
 	$loc = 'hookahlounge'