Merge remote-tracking branch 'Sicaa/master'

locations/brothel.qsrc

@@ -1634,7 +1634,7 @@ if $ARGS[0] = 'brothel:section1:session:play:hangbytits':
 	'<b>Rage meter: <<rageMeter>> / 100</b>'
 	'<center><video autoplay loop src="images/locations/shared/brothel/hangbytits.mp4"></video></center>'
 	'Client attaches anoter rope to your already bound tits, using a pulley attached to the ceiling.'
-	'You start to shake in the moment you connect the ropes attached to your breats and the pulley above you..'
+	'You start to shake in the moment you connect the ropes attached to your breasts and the pulley above you..'
 	'<font color=#<<$pcs_font>>>"No Master, you can''t be serious!! You will tear the off! It is against the rules, stop it!</font> you desparetly try to avoid whats coming.'
 	'<font color=#<<$mas_font>>>"NO, it''s not against the rules. They won''t tear off, you''ll see!"</font> with those words he starts to pull the rope up, leveling you from the ground just by your tits.'
 	'<font color=#<<$pcs_font>>>"AYYYEEEEEEEEEEEE!</font> you yell more from horror than actual pain, as you slowly realize..'

locations/brother_voyeur.qsrc

@@ -46,7 +46,6 @@ if $ARGS[0] = 'showertalk1':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk1.jpg"></center>'
 	'Through the crack in the door you make eye contact with your brother.'
-	'Through the crack in the door you make eye contact with your brother.'
 	'"Hey Kolka!"'
 	'You see the shock in his eyes as he realizes he''s been caught and moves away, trying to close the door. "Wait! Come in here a sec!" you say, a bright and good-humored smile on your face. "And shut the door behind you! Quick! Before <<$npc_nickname[''A29'']>> or dad see!"'
 

locations/gdksport.qsrc

@@ -208,6 +208,7 @@ if $ARGS[0] = 'dance2':
 		end
 		!place for use in events
 		if rand(0, 1) = 0:'You see something <a href="exec:gt ''danceGev''">interesting</a>.'
+		gs 'stat'
 	else
 		'There is nothing you can learn from this dance class with your current skill, you need to find a new teacher or travel to the city to find better dance classes if you wish to improve further.'
 

locations/gschool_grounds.qsrc

@@ -529,6 +529,7 @@ if $ARGS[0] = 'SchoolRun':
 end
 
 if $ARGS[0] = 'SchoolRun_result':
+	cla
 	if begresult <= 15:
 		grupvalue[2] -= 2
 		'You barely manage to reach the finish line at all. There''s no point in checking where you finished, you already know you were last by uite a large margin.'

locations/kseniyaQW.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'event1':
 	'<center><b><font color="maroon">Woman</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/park/kseniya/flash.jpg"></center>'
 	if ARGS[1] = 1:
-		'As you wonder through the park you see someone in a field, who waves you over. As you get closer you realise it is a topless women, she gives you an enigmatic smile while cupping a breast then runs off.'
+		'As you wonder through the park you see someone in a field, who waves you over. As you get closer you realise it is a topless woman, she gives you an enigmatic smile while cupping a breast then runs off.'
 	else
 		'As you look for somewhere to expose yourself you see someone in a field, who waves you over. As you get closer you realise it is a topless women, she gives you an enigmatic smile while cupping a breast then runs off.'
 	end

locations/postdeliveries.qsrc

@@ -1122,40 +1122,40 @@ if $ARGS[0] = 'bandsex':
 		'There''s an icy silence in the air for a few seconds, and he adds: "Let''s start simple. Show us your tits."'
 		'You give him a hesitant look, and the other guy pitches in: "Come on, girl. Just show us your tits, and you can go. Unless you want to lose your job..."'
 		'He pulls a lighter out of his pocket, lights it and moves it dangerously close to a fistful of envelopes. If you don''t do something now, he''ll torch them.'
-		act 'Agree to show your boobs':
-			cls
-			postbandQW = 2
-			postexhibi += 1
-			inhib_exp += rand(0,3)
-			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/events/postboobs1.jpg"></center>'
-			'"No, wait!" you blurt out, quickly stopping him. "I''ll do it..."'
-			'"I knew you would!" he grins, putting out his lighter but keeping it in his hand. He adds: "Go on, then... we don''t have all day!"'
-			'You quickly look around you to make sure no one else can see you, and pull your clothes aside. When you proceed to correct your clothes, the first guy slaps your hands away and says: "Not so fast! You''re done when we say you are."'
-			'After another ten seconds of awkward silence, the quiet one nods approvingly and says: "Very nice."'
-			gs 'arousal', 5,'flash'
-			gs 'stat'
-			'While you quickly cover up, his friend smiles benevolently and offers you your bag: "See, what wasn''t so bad!"'
-			'You quickly take it out of his hands and leave, assuming they''re done with you. From the greedy looks in their eyes, you figure they will probably expect more from you if they catch you again.'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
-		end
-		gs 'willpower', 'exhib', 'resist'
+		gs 'willpower', 'exhib', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
-			act 'Say nothing (<<will_cost>> Willpower)':
+			act 'Agree to show your boobs (<<will_cost>> Willpower)':
 				cls
-				gs 'willpower', 'pay', 'resist'
-				postburn = 1
-				minut += 5
+				gs 'willpower', 'pay', 'self'
+				postbandQW = 2
+				postexhibi += 1
+				inhib_exp += rand(0,3)
+				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/events/postboobs1.jpg"></center>'
+				'"No, wait!" you blurt out, quickly stopping him. "I''ll do it..."'
+				'"I knew you would!" he grins, putting out his lighter but keeping it in his hand. He adds: "Go on, then... we don''t have all day!"'
+				'You quickly look around you to make sure no one else can see you, and pull your clothes aside. When you proceed to correct your clothes, the first guy slaps your hands away and says: "Not so fast! You''re done when we say you are."'
+				'After another ten seconds of awkward silence, the quiet one nods approvingly and says: "Very nice."'
+				gs 'arousal', 5,'flash'
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postburn.jpg"></center>'
-				'When you don''t speak up, he theatrically moves the envelopes into the flame. Within seconds, the contents of your bag are consumed by the flames.'
-				'"You could''ve easily prevented this! If only you weren''t such a prude..." he grins cruelly.'
-				'His friend mockingly pretends to be warming his hands over the smouldering remains of the letters and laughs: "Good luck finding a new job. Now get lost!"'
-				'When you pick up the empty bag and return to the street dejectedly, you realize he''s right. You''re going to get fired, for sure!'
-				act 'Return to the post office':gt 'postdeliveries', 'finishround'
+				'While you quickly cover up, his friend smiles benevolently and offers you your bag: "See, what wasn''t so bad!"'
+				'You quickly take it out of his hands and leave, assuming they''re done with you. From the greedy looks in their eyes, you figure they will probably expect more from you if they catch you again.'
+				act 'Continue your round':gt 'postdeliveries', 'resume'
 			end
 		else
-			act 'Say nothing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+			act 'Agree to show your boobs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		act 'Say nothing ':
+			cls
+			postburn = 1
+			minut += 5
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postburn.jpg"></center>'
+			'When you don''t speak up, he theatrically moves the envelopes into the flame. Within seconds, the contents of your bag are consumed by the flames.'
+			'"You could''ve easily prevented this! If only you weren''t such a prude..." he grins cruelly.'
+			'His friend mockingly pretends to be warming his hands over the smouldering remains of the letters and laughs: "Good luck finding a new job. Now get lost!"'
+			'When you pick up the empty bag and return to the street dejectedly, you realize he''s right. You''re going to get fired, for sure!'
+			act 'Return to the post office':gt 'postdeliveries', 'finishround'
+		end
 	elseif postbandQW = 2:
 		'You follow the two men to behind the building again, while one of them digs through your bag.'
 		'The first one claps his hands and grins: "Alright, girl. You know what we want."'

locations/sister_party.qsrc

@@ -256,7 +256,7 @@ if $ARGS[0] = 'cum':
 	'<center><b><font color = maroon>Anya</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_sister_9_' + rand(1,2) + '.mp4"></video></center>'
 	'Your bodies convulse and spasm at the same time as a pure wave of pleasure overwhelms you both. In time both of you will claim the other came first, but for now you are lost in the Ecstasy of the moment.'
-	'"Oh, <<$pcs_nickname>>, if you wasn''t my sister I would marry you." Mumbles your sister.'
+	'"Oh, <<$pcs_nickname>>, if you weren''t my sister I would marry you." Mumbles your sister.'
 	'Your warm wet, limp bodies lay entangled in a moment of pure bliss, you fall asleep in each other arms.'    
 
 	$orgasm_or = 'yes'

locations/trFatherMisha.qsrc

@@ -524,17 +524,18 @@ if $ARGS[0] = '':
 					'"We should be safe now that you''ve cum. I demand that you fuck me, otherwise I''ll go and tell <<$npc_nickname[''A29'']>> that you forced me to suck your cock."'
 					act 'Drag him out':
 						cls
-						gs'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/mikhail/sex/trfatherqw_43.jpg"></center>'
 						'Before he''s able to answer, you start pushing him out of the truck. Mikhail barely manages to get out of the truck, as you push him down on the grass and jump on top of him.'
 						if pcs_vag = 0:'"I''ve always fantasized about this moment. You''ll be my first, daddy." with these words, you grab his cock leading it towards your wet clit, eagerly awaiting for your father to deflower you.'
-						$orgasm_or = 'yes'
+						'As you insert his cock into your wet slit, you take a minute to adjust yourself to your fathers cock. Slowly you begin rhythmically bouncing up and down his cock, as you bend over kissing him.'
+						'Overcome by arousal, your father grabs your ass adjusting the speed of how quickly you bounce up and down. He makes you go faster and faster as he penetrates you deeper. By now you''re loudly moaning your father is a great lover and he knows exactly how to fuck you to give you outmost pleasure.'
+						'Not holding back you furiously and wildly begin bouncing on top of his cock. The two of you sound like two animals in heat as you''re moaning loudly so that everyone in the near vicinity can hear you.'
+						$orgasm_or = 'custom'
+						$orgasm_txt = 'You''re no longer able to hold back your screams of pleasure as your body begins to twitch. It''s a violent orgasm and you''re certain you''ve never felt anything like this before. It''s exactly as you fantasized about, when you met him for the first time.'
 						gs 'arousal', 'vaginal', 5, 'incest'
 						gs 'cum_call', '', 'A35', 1, 0, 12500, rand(20,40)
-						'As you insert his cock into your wet clit, you take a minute to adjust yourself to your fathers cock. Slowly you begin rhythmically bouncing up and down his cock, as you bend over kissing him.'
-						'Overcome by arousal, your father grabs your ass adjusting the speed of how quickly you bounce up and down. He makes you go faster and faster as he penetrates you deeper. By now you''re loudly moaning your father is a great lover and he knows exactly how to fuck you to give you outmost pleasure.'
-						'Not holding back you furiously and wildly begin bouncing on top of his cock. The two of you sound like two animals in heat as you''re moaning loudly so that everyone in the near vicinity can hear you. Not able to hold back anymore you scream out and your body begins to twitch, it''s a violent orgasm and you''re certain you''ve felt anything like this before.'
-						'It''s exactly as you fantasized about it when you met him for the first time. You''re quickly taken aback as Mikhail begins to groan loudly, his cock is growing inside you and shortly thereafter you feel his warm cum shoot inside of you. As he finishes you fall over him as you''re completely exhausted. You embrace him and lay still for a while...'
+						gs 'stat'
+						'Moments later Mikhail begins to groan loudly, his cock starts growing inside you and shortly thereafter you feel his warm cum shoot inside of you. As he finishes you fall over him as you''re completely exhausted. You embrace him and lay still for a while...'
 						!{trfatherMishaQW = 7}
 						gs 'trFatherMisha', 'end'
 					end

locations/train_incidental.qsrc

@@ -165,7 +165,7 @@ end
 
 if $ARGS[0] = '26':
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/sex/dblgmas.jpg" ></center>'
-	'There are a few people in the car, a couple young girls sit across you and a couple of business men at the far end of the train. You hear the girls giggling as they whisper back and forth. Blushing slightly they look around, noticing only you nearby, the start goading each other. You are about to ask what they are up to, when both of them pull up their skirts, spreading their legs and begin to masturbate. The don''t pay any attention to you at all as they masturbate, some time later one of them cries out in pleasure, quickly followed by her flipping off her friend. Apparently they was racing to see who could get off first.'
+	'There are a few people in the car, a couple young girls sit across you and a couple of business men at the far end of the train. You hear the girls giggling as they whisper back and forth. Blushing slightly they look around, noticing only you nearby, the start goading each other. You are about to ask what they are up to, when both of them pull up their skirts, spreading their legs and begin to masturbate. The don''t pay any attention to you at all as they masturbate, some time later one of them cries out in pleasure, quickly followed by her flipping off her friend. Apparently they were racing to see who could get off first.'
 	act 'Complete your journey': gt $loc, $metka
 end
 
@@ -319,7 +319,7 @@ if $ARGS[0] = 'breastfeedthebaby':
 				'You unlatch the baby and hand it to the father, then you cover yourself up. The man thanks you for the help.'
 				act 'Finish':gt $loc, $metka
 			elseif temp_var < 12:
-				'You think about it and nod your head while answering: Uhm ... I think I got pretty much milk.'
+				'You think about it and nod your head while answering: "Uhm ... I think I produce a fair amount."'
 				if lactation['breastmm'] >= 500000:
 					'Adding to that: I could fill up a beer glass, when my breasts feel engorged, I think, haha.'
 					'You smile cutely and giggle a bit. You notice how the mans eyes widen from your answer and how he blush.'