Merge branch 'master' into feature/quest_journal

locations/_attributes_moncheri_bodysuit.qsrc

@@ -30,8 +30,8 @@ elseif ARGS[1] = 2:
 	BraThinness = 5
 	BraCover = 3
 	PanThinness = 5
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverFront = 1
+	PanCoverBack = 2
 
 elseif ARGS[1] = 3:
 	BraType = 4
@@ -41,8 +41,8 @@ elseif ARGS[1] = 3:
 	BraThinness = 5
 	BraCover = 3
 	PanThinness = 5
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverFront = 2
+	PanCoverBack = 2
 
 elseif ARGS[1] = 4:
 	BraType = 6
@@ -52,8 +52,8 @@ elseif ARGS[1] = 4:
 	BraThinness = 5
 	BraCover = 3
 	PanThinness = 5
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanCoverFront = 1
+	PanCoverBack = 1
 
 elseif ARGS[1] = 5:
 	BraType = 7
@@ -511,11 +511,11 @@ elseif ARGS[1] = 46:
 	BraMaterial = 6
 	BraFun = 1
 	BraQuality = 6
-	BraThinness = 6
+	BraThinness = 5
 	BraCover = 3
-	PanThinness = 6
-	PanCoverFront = 3
-	PanCoverBack = 3
+	PanThinness = 4
+	PanCoverFront = 1
+	PanCoverBack = 1
 
 elseif ARGS[1] = 47:
 	BraType = 7

locations/albina_election_events.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'din_zajava_albfather':
 				*nl
 				'You look down at your phone and see that she hung up. Despite Chernov''s promise, it feels like you sold Albina out. Yet, just before she hung up, it sounded like she might have been... <i>happy?</i>'
 				'Did she <i>want</i> you to tell Chernov everything? The whole encounter has left you feeling bewildered and confused.'
-				act 'Leave':gt 'pav_commercial'
+				act 'Leave':gt 'pav_residential'
 			end
 		end
 	end
@@ -141,7 +141,7 @@ if $ARGS[0] = 'din_zajava_albfather_no2':
 			*nl
 			'You look down at your phone and see that she hung up. Despite Chernov''s promise, it feels like you were about to sell Albina out. Yet, just before she hung up, it sounded like she might have been... disappointed?'
 			'Did she <i>want</i> you to tell Chernov? The whole encounter has left you feeling bewildered and confused.'
-			act 'Leave':gt 'pav_commercial'
+			act 'Leave':gt 'pav_residential'
 		end
 	end
 end

locations/albina_house_events.qsrc

@@ -108,7 +108,7 @@ if $ARGS[0] = 'first_visit2':
 			gs 'willpower', 'pay', 'resist'
 			gs 'drugs', 'alcohol', 'wine'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 			'You jump back in fright, breaking the kiss and nearly falling off the sofa. In turn, Albina jumps back from you, looking distraught.'
 			'"I''m sorry <<$pcs_nickname>>! I-! I shouldn''t have... I don''t know what came over me! I... I''m sorry," she repeats. "You should go... I don''t want to..."'
 			act 'Do as she suggests':
@@ -130,14 +130,14 @@ if $ARGS[0] = 'first_visit2':
 					minut += 60
 					npc_rel['A23'] += 10
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 					'You sit by her side as she begins to tell you everything about herself that was once hidden from you. How her father never wanted children. How he abused her mother because of her birth. The way he chased her mother away and then blamed Albina for it after. Many of her rapes, described in graphic, painful detail. How she seeks comfort from women because of the abuse she''s endured at the hands of men. And finally, how she gathered evidence for years before submitting it to the police and having him arrested. You do nothing but sit and nod along the entire time, listening intently.'
 					*nl
 					'At the end of an hour, it seems a weight has been lifted from her shoulders and she has <i>slightly</i> sobered up.'
 					'"I''ve never told anyone that before," she says. "You... you really don''t think worse of me?"'
 					act 'No I don''t':
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinahome.jpg"></center>'
 						'"No," you shake your head. "I don''t. I think you''re one of the bravest people I''ve ever met."'
 						'Your friend truly comforted, you finally collect your things and bid her farewell. She takes you to the door and as you walk down the driveway, both of you waving goodbye, you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
 						act 'Leave':gt 'pav_residential'
@@ -244,7 +244,7 @@ if $ARGS[0] = 'first_sex':
 					'"Thanks <<$pcs_nickname>>. It was nice to let it all out... and I''m not just talking about my feelings..." she says, expression turning mischevious again. "Thanks for being a good friend."' 
 					act 'Get dressed':
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinahome.jpg"></center>'
 						'Albina helps you clean up before you get dressed and you finally collect your things, preparing to bid her farewell. She forgos her clothes, choosing to walk you to the door instead. As you walk down the driveway, you turn and see her, standing naked in the doorway waving you goodbye and you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
 						act 'Leave':gt 'pav_residential'
 					end

locations/albina_school_sex.qsrc

@@ -177,7 +177,7 @@ if $ARGS[0] = 'lunch_fun_1_2':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/threesome7.jpg"></center>'
 							'Albina pulls her into an embrace as you sit back on the desk alongside them. You sit quietly for a few minutes in post orgasm bliss before Julia suddenly scurries to her feet.'
-							'"Oh no no no! Lunch is almost over! I.. I need to go before Zinadia wonders where I am. I said I would discuss strategies for our game night with her after I finished studying."'
+							'"Oh no no no! Lunch is almost over! I.. I need to go before Zinaida wonders where I am. I said I would discuss strategies for our game night with her after I finished studying."'
 							'You and Albina sit and watch in amusement as Julia frantically picks up her clothes and stumbles around pulling them on as quickly as she can before she picks up her scattered belongings from the floor, stuffs them into her bag and runs out of the room.'
 							'Once she''s gone, the two of you share a laugh at what just happened before you both get dressed yourselves.'
 							'"Well that certainly was fun. I suspected Julia had a thing for me, but I wasn''t expecting her to be so... enthusiastic..." Albina says with a grin as she pulls her skirt back on. "The girl''s got some great tits and an amazing ass. Shame she hangs with those geeks." The bell rings as you finish dressing and you both head out to your next class.'

locations/anushka.qsrc

@@ -331,7 +331,7 @@ if $ARGS[0] = 'wedgie fight':
 									gt 'anushapt', 'livingroom'
 								else
 									AnushkaLoc = 2
-									gt 'anushapt', 'anushroom'
+									gt 'anush_bedroom', 'anushroom'
 								end
 							end
 						end

locations/booty_call_cum.qsrc

@@ -1683,7 +1683,7 @@ if $ARGS[0] = 'cum_force':
 	booty_call['creampie_force'] = 1
 	
 	!! differing descriptions based on position
-	if booty_call['condom'] = 1:
+	if booty_call['condom'] = 1 and booty_call['no_condom'] = 0:
 		gs'cum_call', '',$boy,1,3
 		if pcs_horny > 90:
 			$orgasm_or = 'yes'
@@ -1988,7 +1988,8 @@ if $ARGS[0] = 'creampie_surprise_cum_together':
 		'"Did... did we... did you...?" he pants.'
 	end
 	
-	gs'booty_call_reactions', 'creampie_react'
+!!	gs'booty_call_reactions', 'creampie_react'
+	gs'booty_call_reactions', 'react_menu'
 
 	if (booty_call['orgasm_count'] >= 5 or pcs_sleep < 20) and (hour >= 20 or hour =< 4):
 		act'Collapse':gt'booty_call_after', 'black_out'
@@ -2097,6 +2098,7 @@ if $ARGS[0] = 'cum_condom':
 		$booty_call['cum_describe2'] = 'settling your self down onto his rubber encased cock'
 	end
 	if condom_break > 0:
+		$booty_call['last_cum'] = 'broken_condom'
 		booty_call['broken_condom'] = 1
 		if booty_call['orgasm'] < orgasm:
 			booty_call['came_together'] = 2
@@ -2145,6 +2147,7 @@ if $ARGS[0] = 'broken_condom1':
 		end
 		gs'booty_call_reactions', 'oh_shit_options'
 		gs'booty_call_reactions', 'creampie_accident_birth_control'
+		gs'booty_call_reactions', 'creampie_safe_day'
 	end
 	
 	act'Come':
@@ -2177,6 +2180,7 @@ if $ARGS[0] = 'broken_condom1':
 			end
 			gs'booty_call_reactions', 'oh_shit_options'
 			gs'booty_call_reactions', 'creampie_accident_birth_control'
+			gs'booty_call_reactions', 'creampie_safe_day'
 		end
 	end
 end

locations/booty_call_favorite_part.qsrc

@@ -1345,7 +1345,7 @@ if $ARGS[0] = 'pc_creampie_fav1':
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			if $booty_call['boy_favorite'] = 'creampie' and npc_free_creampies[$boy] < 1 and booty_call['surprise_creampie_count'] > 0:
 				if npc_know_not_bc[$boy] = 1:
-					'"I... liked it when you came inside me," you admit, quickly holding up your finger before <<$npc_firstname[$boy]>> can say anything. "But you still need to ask before you do it! You know I''m on on birth control so it''s extra important!"'
+					'"I... liked it when you came inside me," you admit, quickly holding up your finger before <<$npc_firstname[$boy]>> can say anything. "But you still need to ask before you do it! You know I''m not on birth control so it''s extra important!"'
 				elseif birth_control['think_safe'] ! 1:
 					gs'booty_call_stats', 'no_birth_control_know'
 					'"I... liked it when you came inside me," you admit, quickly holding up your finger before <<$npc_firstname[$boy]>> can say anything. "But you still need to ask before you do it! I''m not on birth control so it''s dangerous."'

locations/booty_call_reactions.qsrc

@@ -1660,6 +1660,7 @@ if $ARGS[0] = 'no_cum_inside':
 				act'Danger day':
 					cla
 					if stat['dangerous_day'] = 1:
+						booty_call['danger_day'] = 1
 						act'(Apologetic)':
 							cla & *clr
 							gs'booty_call_reactions', 'no_cum_inside_pic'

locations/clothing.qsrc

@@ -222,7 +222,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 	if ARRSIZE('materinstvo_dress') > 0:'<center><a href="exec:$ward_list_store = ''materinstvo'' & gt ''clothing'', ''clothing_list'', ''materinstvo''"><img src="images/locations/city/citycenter/mall/mommy.png"></a></center>'
 
-	if ARRSIZE('market_outfits') > 0:'<center><a href="exec:$ward_list_store = ''market'' & gt ''clothing'', ''clothing_list'', ''market''">Clothes from the market</a></center>'
+	if ARRSIZE('market_outfits') > 0:'<center><a href="exec:$ward_list_store = ''market'' & gt ''clothing'', ''clothing_list'', ''market''"><img src="images/pc/items/market/market.png"></a></center>'
 
 	act 'Leave': killvar '$ward_list_store' & gt $loc, $loc_arg
 	act 'Your Clothes': gt 'wardrobe', 'main'

locations/npcgeneratec.qsrc

@@ -25,9 +25,12 @@ npctempgage = ARGS[2]
 !! 4 - St. Petersburg City Center
 temp_location = ARGS[3]
 
+
+dont_know_npc_name = ARGS[4]
+
 !! For example
-!! gs 'npcgeneratec', 0, 'stranger', rand(18,45)
-!! Which would generate a male named stranger between ages of 18 and 45
+!! gs 'npcgeneratec', 0, 'stranger', rand(18,45), 3, 1
+!! Which would generate a male named stranger between ages of 18 and 45 who lives in the St. Petersburg Residential Area who will be remembered as ''stranger''
 
 
 if temp_location = 0:
@@ -209,7 +212,11 @@ gs 'npcrnamefile', 'rusSur'
 $npc_firstname[$npclastgenerated] = $npctempgn[1]
 $npc_nickname[$npclastgenerated] = $npctempgn[2]
 $npc_lastname[$npclastgenerated] = $npctempgn[3]
-$npc_usedname[$npclastgenerated] = $npctempgn[0]
+if dont_know_npc_name = 0 or $npctempgn[0] = '':
+	$npc_usedname[$npclastgenerated] = $npctempgn[1]
+else
+	$npc_usedname[$npclastgenerated] = $npctempgn[0]
+end
 npc_intel[$npclastgenerated] = rand(1,npctempc2)
 
 !! set them to sober

locations/pav_lake.qsrc

@@ -195,7 +195,7 @@ if $ARGS[0] = '':
 				'You can''t believe your time skiing is already over. It feels like you just put on your ski boots and started around the lake. But now, as you sit down on the bench to take them off, your legs are tired and sore from a day of skiing. You unlace your boots and wiggle your toes, relieved to finally be able to stretch them out. You stand up and take a few steps, savouring the feeling of being barefoot after a day in stiff ski boots before you put your regular shoes back on.'
 				act'Continue':gt'pav_lake'
 			end
-			act'Ski around the park (30 mins)': gt 'pav_lake', 'ski'
+			act'Ski around the lake (30 mins)': gt 'pav_lake', 'ski'
 		elseif pcs_ski_owned > 0 and hour >= 8 and hour <= 17 and konki_cloth = 0:
 			act'Put your skis on':
 				*clr & cla
@@ -509,7 +509,7 @@ if $ARGS[0] = 'ski':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skiing_2.jpg"></center>'
 	'As you ski, you take in the breathtaking views of the snow-covered trees, the crisp blue sky above and all the people ice skating out on the lake. The sound of your skis slices through the snow filled air. You feel a sense of freedom and exhilaration as you carve your way around the lake. The cold air fills your lungs and you can''t help but smile, feeling alive and free.'
-	act 'Finish skiing':  gt 'pav_lake', 'start'
+	act 'Finish skiing':  gt 'pav_lake'
 end
 
 if $ARGS[0] = 'car_sex': 

locations/pav_library_nerdstudy.qsrc

@@ -125,7 +125,7 @@ if $ARGS[0] = 'nerd_study_night2':
 			if npc_rel['A142'] >= 60 and grupTipe = 3:
 				'You chat about the latest video games with Zinaida. "Hey, look at this. I got into the top ten with my last score." With a small smile, Zinaida shows you her phone, and sure enough she''s number five on the leaderboard. You congratulate her, which causes her cheeks to flush slightly as she tries to downplay it. The two of you go back to some idle chatter about video games.'
 			elseif npc_rel['A142'] <= 20 or fame['pav_slut'] >= 250:
-				'Zinadia is focused on studying the book in front of her and taking notes, so she rarely says anything back as you try and talk to her. "I''d like to talk, but I''m busy trying to study. I need to finish this." she says quietly while looking up at you through her messy hair that hangs down onto her face. She resumes her studying while ignoring you.'
+				'Zinaida is focused on studying the book in front of her and taking notes, so she rarely says anything back as you try and talk to her. "I''d like to talk, but I''m busy trying to study. I need to finish this." she says quietly while looking up at you through her messy hair that hangs down onto her face. She resumes her studying while ignoring you.'
 			else
 				'You strike up a conversation with Zinaida. She seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 			end

locations/underwear_descriptions.qsrc

@@ -223,33 +223,33 @@ elseif $ARGS[0] = 'bodysuit':
 
 	$description += ' bodysuit is '
 
-	if BraThinness = 1:
+	if BraThinness = 6:
 		$description += 'transparent'
-	elseif BraThinness = 2:
+	elseif BraThinness = 5:
 		$description += 'semi-transparent'
-	elseif BraThinness = 3:
-		$description += 'slightly transparent'
 	elseif BraThinness = 4:
+		$description += 'slightly transparent'
+	elseif BraThinness = 3:
 		$description += 'thin'
-	elseif BraThinness = 5:
+	elseif BraThinness = 2:
 		$description += 'not particularly thick or thin'
-	elseif BraThinness = 6:
+	elseif BraThinness = 1:
 		$description += 'thick'
 	end
 
 	$description += ' on top and '
 
-	if PanThinness = 1:
+	if PanThinness = 6:
 		$description += ' transparent'
-	elseif PanThinness = 2:
+	elseif PanThinness = 5:
 		$description += ' semi-transparent'
-	elseif PanThinness = 3:
-		$description += ' slightly transparent'
 	elseif PanThinness = 4:
+		$description += ' slightly transparent'
+	elseif PanThinness = 3:
 		$description += ' thin'
-	elseif PanThinness = 5:
+	elseif PanThinness = 2:
 		$description += ' not particularly thick or thin'
-	elseif PanThinness = 6:
+	elseif PanThinness = 1:
 		$description += ' thick'
 	end