Merge remote-tracking branch 'Sicaa/master'

locations/artemdate.qsrc

@@ -213,7 +213,7 @@ if $ARGS[0] = 'stand_up':
 				gs 'willpower', 'pay', 'resist'
 				*clr & cla
 				npc_rel['A2'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walkgop_udar2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_udar2.jpg"></center>'
 				'Wait, what!?'
 				'You answer: "No way, you perverts! Just leave us alone!"'
 				'The Gopnik walks back over to Artem and kicks him in the face. A few seconds later, one of his friends also kicks Artem in the back, soon they all join in kicking him. You can''t take it anymore and quickly throw yourself on top of Artem, so they can''t kick him any more.'
@@ -242,7 +242,7 @@ if $ARGS[0] = 'stand_up':
 				*clr & cla
 				inhib_exp += rand(0,1)
 				gs 'fame', 'pav', 'sex', 3
-				mood - 20
+				pcs_mood -= 20
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/strip2.jpg"></center>'
 				if hotcat <= 4:

locations/artemhome.qsrc

@@ -119,12 +119,13 @@ if $ARGS[0] = 'home':
 					if artlie = 2 or artembrokenheart = 1 or artemblok = 1:
 						'When she hears your name her demeanor changes swiftly. Frowning she says: "Oh, it''s you. I don''t know what you did to my sweet Artem but he says he never wants to see you again, so please leave." With that she closes the door in your face.'
 						act 'Leave': gt'pod_ezd','etaj_1'
+					else
+						'She keeps up her smile. "Is he going to tutor you dear?" Obviously expecting the answer to be yes.'
+						'You smile a bit. "Something like that, is he here?"'
+						'Her face tightens ever so slightly. "Yes he is in his room." Then she turns to face down the hall. "Artem dear, <<$pcs_nickname>> from your school is here." Before turning back to you. "Go on back he is in his room."'
+						act 'Leave': gt'pod_ezd','etaj_1'
+						act 'Enter': ArtemLoc = 2 & gt 'artemhome','hallway'
 					end
-					'She keeps up her smile. "Is he going to tutor you dear?" Obviously expecting the answer to be yes.'
-					'You smile a bit. "Something like that, is he here?"'
-					'Her face tightens ever so slightly. "Yes he is in his room." Then she turns to face down the hall. "Artem dear, <<$pcs_nickname>> from your school is here." Before turning back to you. "Go on back he is in his room."'
-					act 'Leave': gt'pod_ezd','etaj_1'
-					act 'Enter': ArtemLoc = 2 & gt 'artemhome','hallway'
 				else
 					if artlie = 2 or artembrokenheart = 1 or artemblok = 1:
 						'"Who should I tell him is here?"'
@@ -606,7 +607,7 @@ if $ARGS[0] = 'livingroom':
 	elseif hour > 22:
 		gt 'artemhome', 'timecheck'
 	else
-		if ArtemLoc = 5 and ArtemParentsLoc = 5 and artemmeetdad = 0 and hour < 22:
+		if ArtemLoc = 5 and ArtemParentsLoc = 5 and metArtemDad = 0 and hour < 22:
 			metArtemDad = 1
 			menu_off = 1
 			minut += 10

locations/gopskver.qsrc

@@ -822,7 +822,7 @@ if $ARGS[0] = 'BjBeerVag':
 	else
 		'Dan runs his hand over your bald pussy, and chuckles with satisfaction: "Very nice, <<$pcs_nickname>>. You got it all nice and smooth for us, so we can see what we''re fucking next."'
 	end
-	if pirsG = 1:
+	if pirsG > 0:
 		pcs_horny += 10
 		'The guys are intrigued by your intimate piercing, and playfully rub and tug at it, making you blush and moan with excitement.'
 	end

locations/lover_change.qsrc

@@ -268,7 +268,7 @@ if $ARGS[0] = 'Pier':
 						elseif randchan = 6 and pirsF = 0:
 							if pirsF = 0 and pierCount < pierPrefTmpMin:
 								'He motions for you to lift up your shirt. After you do the man grabs your breasts rather softly and carefully pierces each nipple.'
-								!!'<center><img <<$set_imgh>> src="images/pc/body/piercings/f1.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/body/piercings/f1.jpg"></center>'
 								pcs_horny += 5
 								pirsF = 1
 								pirsF1_owned = 1
@@ -280,7 +280,7 @@ if $ARGS[0] = 'Pier':
 							if pirsG = 0 and pierCount < pierPrefTmpMin:
 								'"Ma ''am can you take off your bottoms?", the man says. You realize that he plans to pierce your labia and you reluctantly present yourself.'
 								'You cover your mouth as you let out a quick "Eep!", as you feel a quick pain through your labia, but in a second, its over.'
-								!!'<center><img <<$set_imgh>> src="images/pc/body/piercings/g1.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/pc/body/piercings/g1.jpg"></center>'
 								pcs_horny += 7
 								pirsG = 1
 								pirsG1_owned = 1
@@ -520,7 +520,15 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your ankles.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/foot/tatankle<<tatankle>>.jpg"></center>'
 						end
-					elseif randchan = 8 and tatleg = 0:
+					elseif randchan = 8 and tathand = 0:
+						randchan = rand(1,9)
+						if tathand = 0 and tattCount < tattPrefTmpMin:
+							tathand = randchan
+							tattCount += 1
+							'He gives you a tattoo on your hand.'
+							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/hand/tathnd<<tathand>>.jpg"></center>'
+						end
+					elseif randchan = 9 and tatleg = 0:
 						randchan = rand(1,47)
 						if tatleg = 0 and tattCount < tattPrefTmpMin:
 							tatleg = randchan
@@ -528,7 +536,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your legs.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/legs/tatleg<<tatleg>>.jpg"></center>'
 						end
-					elseif randchan = 9 and tatlip = 0:
+					elseif randchan = 10 and tatlip = 0:
 						randchan = rand(1,9)
 						if tatlip = 0 and tattCount < tattPrefTmpMin:
 							tatlip = randchan
@@ -536,7 +544,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your bottom lip.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/lip/tatlip<<tatlip>>.jpg"></center>'
 						end
-					elseif randchan = 10 and tatneck = 0:
+					elseif randchan = 11 and tatneck = 0:
 						randchan = rand(1,30)
 						if tatneck = 0 and tattCount < tattPrefTmpMin:
 							tatneck = randchan
@@ -544,7 +552,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your neck.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/neck/tatnck<<tatneck>>.jpg"></center>'
 						end
-					elseif randchan = 11 and tatvag = 0:
+					elseif randchan = 12 and tatvag = 0:
 						randchan = rand(1,53)
 						if tatvag = 0 and tattCount < tattPrefTmpMin:
 							tatvag = randchan
@@ -552,7 +560,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo above your cunt.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/pubic/tatvag<<tatvag>>.jpg"></center>'
 						end
-					elseif randchan = 12 and tatlech = 0:
+					elseif randchan = 13 and tatlech = 0:
 						randchan = rand(1,25)
 						if tatlech = 0 and tattCount < tattPrefTmpMin:
 							tatlech = randchan
@@ -560,15 +568,15 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your shoulder.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/shoulder/tatshldr<<tatlech>>.jpg"></center>'
 						end
-					elseif randchan = 13 and tatside = 0:
-						randchan = rand(1,19)
+					elseif randchan = 14 and tatside = 0:
+						randchan = rand(1,23)
 						if tatside = 0 and tattCount < tattPrefTmpMin:
 							tatside = randchan
 							tattCount += 1
 							'He gives you a tattoo on your sides.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/side/tatside<<tatside>>.jpg"></center>'
 						end
-					elseif randchan = 14 and tatupb = 0:
+					elseif randchan = 15 and tatupb = 0:
 						randchan = rand(1,32)
 						if tatupb = 0 and tattCount < tattPrefTmpMin:
 							tatupb = randchan
@@ -576,7 +584,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tramp stamp.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/trampstamp/tatlowbck<<tatupb>>.jpg"></center>'
 						end
-					elseif randchan = 15 and tatunder = 0:
+					elseif randchan = 16 and tatunder = 0:
 						randchan = rand(1,22)
 						if tatunder = 0 and tattCount < tattPrefTmpMin:
 							tatunder = randchan
@@ -584,7 +592,7 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo under your breasts.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/underbreast/tatundbreast<<tatunder>>.jpg"></center>'
 						end
-					elseif randchan = 16 and tatwrist = 0:
+					elseif randchan = 17 and tatwrist = 0:
 						randchan = rand(1,51)
 						if tatwrist = 0 and tattCount < tattPrefTmpMin:
 							tatwrist = randchan
@@ -592,14 +600,6 @@ if $ARGS[0] = 'Tatt':
 							'He gives you a tattoo on your wrists.'
 							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/wrists/tatwrst<<tatwrist>>.jpg"></center>'
 						end
-					elseif randchan = 17 and tathand = 0:
-						randchan = rand(1,9)
-						if tathand = 0 and tattCount < tattPrefTmpMin:
-							tathand = randchan
-							tattCount += 1
-							'He gives you a tattoo on your hand.'
-							'<center><img <<$set_imgh>> src="images/pc/body/tattoos/hand/tathnd<<tathand>>.jpg"></center>'
-						end
 					elseif tattCount = 18:
 						''
 					else

locations/natkolEv.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = 'kolkabj':
 			gs 'arousal', 'voyeur_sex', 5, 'dom'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Let Kolka cum': gt 'natkolEv', 'kolkacum', 0
+			act 'Let Kolka cum': gs 'natkolEv', 'kolkacum', 0
 			if NatKolkaSex > 5: act 'Continue': gs 'natkolEv', 'softsex'
 		end
 	end
@@ -586,7 +586,7 @@ if $ARGS[0] = 'kolkacum':
 	end
 	act 'Let him cum on her tits':
 		*clr & cla
-		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/sex/natfacial.mp4"></video></center>'
+		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natasha/sex/natcumtits.mp4"></video></center>'
 		'"Jerk him off on your tits Natasha."'
 		'Natasha leans over Kolka''s cock and squeezes her tits together with one hand. With the other, she rapidly strokes his cock. With a grunt, Kolka shoots a huge load of his cum onto Natasha''s tits. By the time he''s done Natasha''s chest is covered in cum.'
 		'"That''s all for today Kolka. You can get dressed. I have a few things I want to discuss with Natasha."'

locations/pirsingsalon.qsrc

@@ -702,7 +702,7 @@ if $ARGS[0] = 'pirsvla':
 	:looppubic_pir
 		*p '<a href="exec:gt ''pirsingsalon'', ''pubic_pir'', <<i>>"><img src="images/pc/body/piercings/g<<i>>.jpg" 	height="250" /></a>'
 		i += 1
-	if i <= 7:jump 'looppubic_pir'
+	if i <= 10:jump 'looppubic_pir'
 
 	act 'Return':gt 'pirsingsalon', 'start'
 end
@@ -1133,7 +1133,7 @@ end
 if $ARGS[0] = 'face_get':
 	*clr
 	cla
-'<center><img src="images/pc/body/tattoos/face/tatfce<<n>>.jpg"></center>'
+	'<center><img src="images/pc/body/tattoos/face/tatfce<<n>>.jpg"></center>'
 
 	if (money < 10000) and (karta + bankDebtLimit < 10000):
 		'You cannot afford this tattoo.'
@@ -1220,6 +1220,61 @@ if $ARGS[0] = 'foot_get':
 	act 'Return': gt 'pirsingsalon', 'start'
 end
 
+if $ARGS[0] = 'hand':
+	*clr
+	cla
+	if tathand = 0:
+
+		n = 1
+		:looptathand
+		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''hand_get''"><img src="images/pc/body/tattoos/hand/tathnd<<n>>.jpg" height="250" /></a>'
+		n += 1
+		if n <= 9:jump 'looptathand'
+		*nl
+
+	else
+		'<center><img src="images/pc/body/tattoos/hand/tathnd<<tathand>>.jpg"></center>'
+		'You already have this tattoo here.'
+	end
+
+	act 'Return': gt 'pirsingsalon', 'start'
+end
+
+if $ARGS[0] = 'hand_get':
+	*clr
+	cla
+	'<center><img src="images/pc/body/tattoos/hand/tathnd<<n>>.jpg"></center>'
+
+	if (money < 7000) and (karta + bankDebtLimit < 7000):
+		'You cannot afford this tattoo.'
+	else
+		if money >= 7000:
+			act 'Get this tattoo 7,000 <b>₽</b> (cash)':
+				cla
+				tathand = n
+				money -= 7000
+				minut += 60
+				gs 'stat'
+
+				act 'Return': gt 'pirsingsalon', 'start'
+			end
+		end
+		if karta + bankDebtLimit >= 7000:
+			act 'Get this tattoo 7,000 <b>₽</b> (card)':
+				cla
+				tathand = n
+				karta -= 7000
+				minut += 60
+				gs 'stat'
+
+				act 'Return': gt 'pirsingsalon', 'start'
+			end
+		end
+	end
+
+	act 'Return': gt 'pirsingsalon', 'start'
+end
+
 if $ARGS[0] = 'leg':
 	*clr
 	cla
@@ -1504,7 +1559,7 @@ if $ARGS[0] = 'side':
 		:looptatside
 		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''side_get''"><img src="images/pc/body/tattoos/side/tatside<<n>>.jpg" height="250" /></a>'
 		n += 1
-		if n <= 19:jump 'looptatside'
+		if n <= 23:jump 'looptatside'
 		*nl
 
 	else
@@ -1715,60 +1770,5 @@ if $ARGS[0] = 'wrist_get':
 	act 'Return': gt 'pirsingsalon', 'start'
 end
 
-if $ARGS[0] = 'hand':
-	*clr
-	cla
-	if tathand = 0:
-
-		n = 1
-		:looptathand
-		*p '<a href="exec:n = <<n>> & gt ''pirsingsalon'', ''hand_get''"><img src="images/pc/body/tattoos/hand/tathnd<<n>>.jpg" height="250" /></a>'
-		n += 1
-		if n <= 9:jump 'looptathand'
-		*nl
-
-	else
-		'<center><img src="images/pc/body/tattoos/hand/tathnd<<tathand>>.jpg"></center>'
-		'You already have this tattoo here.'
-	end
-
-	act 'Return': gt 'pirsingsalon', 'start'
-end
-
-if $ARGS[0] = 'hand_get':
-	*clr
-	cla
-	'<center><img src="images/pc/body/tattoos/hand/tathnd<<n>>.jpg"></center>'
-
-	if (money < 7000) and (karta + bankDebtLimit < 7000):
-		'You cannot afford this tattoo.'
-	else
-		if money >= 7000:
-			act 'Get this tattoo 7,000 <b>₽</b> (cash)':
-				cla
-				tathand = n
-				money -= 7000
-				minut += 60
-				gs 'stat'
-
-				act 'Return': gt 'pirsingsalon', 'start'
-			end
-		end
-		if karta + bankDebtLimit >= 7000:
-			act 'Get this tattoo 7,000 <b>₽</b> (card)':
-				cla
-				tathand = n
-				karta -= 7000
-				minut += 60
-				gs 'stat'
-
-				act 'Return': gt 'pirsingsalon', 'start'
-			end
-		end
-	end
-
-	act 'Return': gt 'pirsingsalon', 'start'
-end
-
 --- pirsingsalon ---------------------------------
 

locations/sister_chat.qsrc

@@ -589,7 +589,13 @@ if $ARGS[0] = 'sister_chat':
 				end
 			end
 		else
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
+			if $loc = 'kuhrPar' and indorf = 1:
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat_kitchen_easteregg.jpg"></center>' & ! Snegurochka''s easter egg for when mom''s not around
+			elseif $loc = 'kuhrPar':
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat_kitchen<<rand(1,3)>>.jpg"></center>'
+			else
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
+			end
 			'You start a conversation with your sister.'
 			if trfatherQW = 0:
 				act 'Ask about your father':
@@ -605,7 +611,13 @@ if $ARGS[0] = 'sister_chat':
 				npc_rel['A33'] += 1
 				*clr & cla
 				temp = rand (1,15)
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
+				if $loc = 'kuhrPar' and indorf = 1:
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat_kitchen_easteregg.jpg"></center>' & ! Snegurochka''s easter egg for when mom''s not around
+				elseif $loc = 'kuhrPar':
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat_kitchen<<rand(1,3)>>.jpg"></center>'
+				else
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
+				end
 				if temp = 1:
 					'As you chat with your sister, she says it is possible to rent an apartment in the city and live and work there, but she is happy living in Pavlovsk, even with helping with the bills she has way more money to spend on herself this way.'	
 				elseif temp = 2:

locations/sistersleep.qsrc

@@ -225,6 +225,7 @@ if $ARGS[0] = 'sister_sleep_3':
 								gs 'stat'
 								act 'Move away':gt 'bedrPar'
 							end
+							!! Flagged for skill check (instead of willpower check, which has been removed)
 							act 'Convince her otherwise':
 								*clr & cla
 								girl += 1