Browse Source

Merge remote-tracking branch 'julzor/master'

KevinSmarts 5 years ago
parent
commit
f0e6e88cf7

+ 0 - 1
glife.qproj

@@ -221,7 +221,6 @@
 	</Folder>
 	<Folder name="Furniture">
 		<Location name="bed"/>
-		<Location name="bed1"/>
 		<Location name="bed2"/>
 		<Location name="beverage"/>
 		<Location name="dreams"/>

+ 1 - 1
locations/ParChurch2.qsrc

@@ -807,7 +807,7 @@ if $ARGS[0] = 'secrets':
 		end
 	end
 
-!!	if lesbian ! 0 or sisterLesb ! 0 or brotherSex ! 0 or evgenQW = 4 or sisboytrio ! 0 or trfatherMishaQW = 7 or zoo ! 0 or DogHJ ! 0 or DogBJ ! 0 or DogVag ! 0 or DogAnal ! 0 or FatherMolest ! 0 or npc_sex['A28']!0:
+!!	if lesbian ! 0 or sisterLesb ! 0 or brotherSex ! 0 or evgenQW = 4 or sisboytrio ! 0 or trfatherMishaQW = 7 or DogHJ ! 0 or DogBJ ! 0 or DogVag ! 0 or DogAnal ! 0 or FatherMolest ! 0 or npc_sex['A28']!0:
 	if lesbian ! 0 or sisterLesb ! 0 or seepornofut ! 0:
 		act 'Confess a secret':
 			*clr & cla

+ 0 - 3
locations/bed.qsrc

@@ -11,9 +11,6 @@ if $ARGS[0] = 'start':
 	if hour > 22 and houserabrand < 2 and houserab = 1 and houserabday ! daystart and pcs_sleep < 50 and tanhouse1 = 1:gt 'bed', 'rab'
 	if hour > 22 and housevorrand = 0 and housrA = 1 and husband = 0:gt 'bed', 'vor'
 
-
-	if zoo > 6 and housrA = 1 and dogday ! daystart and houserabrand < 4:gt 'bed1', 'sog1'
-
 	gt 'bed2'
 end
 

+ 0 - 316
locations/bed1.qsrc

@@ -1,316 +0,0 @@
-# bed1
-
-if $ARGS[0] = 'sogn':
-	cla
-	*clr
-	menu_off = 1
-	dogday = daystart
-	'<center><img <<$set_imgh>> src="images/beast/zoo/2.jpg"></center>'
-	'You undress and lie down on the bed <<$namesob>> brazenly jump onto the bed and starts licking your pussy'
-	gs 'arousal', 'cuni', 10, 'beast'
-	gs 'stat'
-	act 'Succumb to the desire':gt 'bed1', 'sog2'
-	act 'Kick the dog out':gt 'bed', 'start'
-end
-
-if $ARGS[0] = 'sog1':
-	menu_off = 1
-	if zoo >= 6 and sobaka ! 0:
-		if husband > 0 and husbandrink ! 10:
-			if hour > 22 or hour < 7:
-				cla
-				*clr
-				gs 'boyStat', $petID
-				'<center><img <<$set_imgh>> src="images/beast/zoo/z1.jpg"></center>'
-				'You undress and lie down on the bed <<$namesob>> brazenly jumps onto your bed and starts licking your pussy.'
-				gs 'arousal', 'cuni', 30, 'sub', 'beast'
-				gs 'stat'
-					
-				if harakHusb = 0:
-					'"What''s he doing dear, stop him." cries your husband'
-					'"I can''t, I''m trying." you reply.'
-					husband -= 1
-					'<<$husName>> trys to shove the dog, but he growls and snarls. "I can''t get it off you, what should I do dear?" he asks.'
-					'"Think of something." you reply, already slightly moaning with pleasure. <<$husName>> starts to rummage through the room.'
-					'Periodically, he tries to shoo the dog, but he''s growled off. With <<$husName>> pacing the room dog begins trying to jump you.'
-					'"Oh my God, what is he going to do?" shrieked <<$husName>>, Seeing the dogs attempts to jump you.'
-					'"Somehow you still haven''t realised that he wants to fuck me" you shout.'
-					'"Dear, pleaase try to stop him" pleads your husband.'
-
-					act 'Try':
-						cla
-						*clr
-						gs 'cum_call', '', $namesob, 1, 0, -1, 60
-						'<center><img <<$set_imgh>> src="images/beast/zoo/z2.jpg"></center>'
-						'You reluctantly start trying to push the dog and off you, but as you push him backwards, <<$namesob>> leans on you with all his weight. You feel his penis rubs against your thighs searching for your hole.'
-
-						if izvratH = 0:
-							'"Oh my God, I can''t watch this," cries your husband slamming the door and running. Meanwhile, the dogs member has found a hole and he starts fucking you.'
-							'You moan as the arousal becomes too much, soon you orgasm. A few seconds later <<$namesob>> cums inside you, pulls away and runs out into the corridor.'
-							dynamic $dogpot
-							spafinloc = 0
-							sexpartkno = 1
-							$orgasm_or = 'yes'
-							gs 'arousal', 'vaginal', 10, 'beast'
-							gs 'arousal', 'end'
-							gs 'stat'
-							gs 'Cum_Manage'
-							'Your husband comes back, you are still on all fours with dog sperm flowing from your pussy.'
-							'"I''ll take him and have him put down," says <<$husName>>'
-						elseif izvratH = 1:
-							'"Get the fuck off of her!" shouts <<$husName>> at the dog, to little effect. Meanwhile, the dogs member has found a hole and he starts fucking you.'
-							'You moan as the arousal becomes too much and your husband deciding that your movement is an attempt to escape, shouts, "Yes <<$pcs_nickname>> wiggle more, I think you''re loosening his grip."'
-							'Soon you orgasm. A few seconds later <<$namesob>> cums inside you, then pulls away and runs out into the corridor.'
-							dynamic $dogpot
-							spafinloc = 0
-							sexpartkno = 1
-							$orgasm_or = 'yes'
-							gs 'arousal', 'vaginal', 10, 'beast'
-							gs 'arousal', 'end'
-							gs 'stat'
-							gs 'Cum_Manage'
-							'Your husband looks at you on all fours, ass in the air, canine semen flowing out of your pussy.'
-							'"I''ll take him and have him put down," says <<$husName>>'
-						end
-
-						act 'Allow':
-							sobaka = 0
-							killvar '$petID'
-							zoo = 0
-							gt 'bedr'
-						end
-
-						act 'Stop him':
-							cla
-							'"No dear, he is not guilty, he has instincts, I''ll take it for mating and he will calm down," you say.'
-							'"Fine dear, whatever you say."'
-							act 'Finish':gt 'bedr'
-						end
-					end
-				elseif harakHusb = 1:
-					'"Your dog is completely out of control, take it out onto the street, bitch, and then kill it." your husband says.'
-					'"I can not do that myself." you reply.'
-
-					if izvratH = 0:
-						'<<$husName>> tries picking the dog up but he growls and bares his teeth. So he goes to the bathroom and comes back with some old sheets.'
-						'Throwing them over the dog and picking up the corners is able to pick up <<$namesob>> in his improvised bag.'
-						'"I''ll have him put down." says <<$husName>>'
-
-						act 'Allow':
-							sobaka = 0
-							killvar '$petID'
-							zoo = 0
-							gt 'sitr'
-						end
-
-						act 'Stop him':
-							cla
-							'"No dear, he is not guilty, he has the instincts, I''ll take it for mating and he will calm down." you said.'
-							'"Okay, whatever, it''s your dog."'
-							act 'Finish':gt 'bedr'
-						end
-					elseif izvratH = 1:
-						'"Can not or don''t want to." says <<$husName>> smiling and continues to sit and watch as the dog licks you.'
-						'"Does not want to, I guess" you reply and deliberately push your legs apart. <<$husName>> looks as you moan while the dog licks you.'
-						'Suddenly he gets up pulls out his dick brings to your mouth.'
-						gs 'arousal', 'cuni', 10, 'beast'
-						gs 'stat'
-						act 'Suck husband':
-							cla
-							*clr
-							gs 'cum_call', 'mouth', $husName
-							gs 'boyStat', $husID
-							'<center><img <<$set_imgh>> src="images/beast/zoo/z3.jpg"></center>'
-							'You grab his cock and take it on your mouth, soon begins your pleasure center lights up and your whole body is racked by your orgasm.'
-							'Seconds later <<$husName>> ends up in your mouth. You swallow sperm and continue to suck his fading dick. Encouraged the dog begins trying to climb onto you, looking for a more.'
-
-							gs 'boyStat', $husID
-							gs 'arousal', 'bj', 3, 'sub'
-							gs 'arousal', 'vaginal', 3, 'beast'
-							minut -= 3
-							gs 'arousal', 'end'
-							'"This is too much" says <<$husName>> and tried to shoo your dog out, but he growls and bares his teeth.'
-							'<<$husName>> goes to the bathroom and comes back with some old sheets.'
-							'Throwing them over the dog and picking up the corners is able to pick up <<$namesob>> in his improvised bag.'
-							'"I''ll have him put down." says <<$husName>>'
-
-							act 'Allow':
-								sobaka = 0
-								killvar '$petID'
-								zoo = 0
-								gt 'sitr'
-							end
-
-							act 'Stop him':
-								cla
-								'"No dear, he is not guilty, he has instincts, besides he tried very hard." you said.'
-								'"Well, if he was trying so hard, maybe you should thank him" your husband suggests.'
-
-								act 'Jerk the dog':
-									cla
-									*clr
-									husband -= 1
-									gs 'cum_call', 'hands', $namesob, 1, 0, -1, 60
-									'<center><img <<$set_imgh>> src="images/beast/zoo/z6.jpg"></center>'
-									'You take the dogs dick in your hand and begin to masturbate, after a few minutes you dog cums in your hand.'
-									gs 'arousal', 'hj', 10, 'beast'
-									gs 'arousal', 'end'
-									gs 'stat'
-									act 'Finish':gt 'bedr'
-								end
-
-								act 'Suck the dog':
-									cla
-									*clr
-									swallow += 1
-									husband -= 40
-									gs 'cum_call', 'mouth', $namesob, 1, 0, -1, 60
-									'<center><img <<$set_imgh>> src="images/beast/zoo/z7.jpg"></center>'
-									'You lay the dog on the floor and take his cock in my mouth, your husband looks at you with disgust as you suck the dogs cock.'
-									'In a couple of minutes the dog cums in your mouth and you swallow his sperm.'
-									'"Well, you''re a pervert, " your husband says with obvious distaste.'
-									gs 'arousal', 'bj', 10, 'beast'
-									gs 'arousal', 'end'
-									gs 'stat'
-									
-									act 'Finish':gt 'bedr'
-								end
-
-								act 'Finish':gt 'bedr'
-							end
-						end
-					end
-				elseif harakHusb = 2:
-					'"Your dog is completely out of control, take it out onto the street, bitch, and then kill it." your husband says.'
-					'"I can not do it myself." you reply.'
-
-					if izvratH = 0:
-						pcs_mood -= 15
-						pcs_willpwr -= 15
-						'<<$husName>> tries shooing your dog away, but it growls and bares his teeth, so he kicks the <<$namesob>> with all his might.'
-						'Your dogs ribs are shattered and screeching he crawls into a corner, your husband follows and kicks it even harder.'
-						'Seeing his condition, you go to your dog and cradle his head and close your eyes. A few minutes later your dog is dead.'
-						'"There''s nothing you can do for your freak dog now." says <<$husName>>. Opening your eyes you see a dead dog in a pool of blood.'
-						'"Well, I don''t know about you, but there''s not much point keep a dead dog. I''ll get rid of him." he takes the dog, wraps it in a sheet and goes out.'
-						'While he is gone you have some time to scour the blood from the floor.'
-
-						act 'Finish':
-							sobaka = 0
-							killvar '$petID'
-							zoo = 0
-							gt 'bedr'
-						end
-					elseif izvratH = 1:
-						'"What do you mean I can not? Do you like the way he licks you?!" shouts <<$husName>>.'
-						'"No, of course not," you begin to make excuses.'
-						'"I can see you dirty whore, your pussy all wet, you think I don''t see? It would be polite to thank him, " he says.'
-						'Seeing your lack of comprehension continues, "Well, go on suck his dick."'
-
-						act 'Suck dogs dick':
-							cla
-							*clr
-							'<center><img <<$set_imgh>> src="images/beast/zoo/z4.jpg"></center>'
-							'<<$husName>> grabs the dog by the collar, pushes you to the floor and guides the dog on top of you.'
-							'With the dogs ersct penis right in front of your mouth, you realise you have no choice and start sucking.'
-							'Your husband, watching you and cheers saying that the dog loves your mouth. Soon he is bored just watching, he dropped his pants says "Spread your legs."'
-							gs 'arousal', 'bj', 10, 'beast', 'sub'
-							gs 'stat'
-
-							act 'Spread your legs':
-								*clr & cla
-								suprdolg += 1
-								gs 'cum_call', '', $HusID
-								'<center><img <<$set_imgh>> src="images/beast/zoo/z5.jpg"></center>'
-								'You obediently spread your legs and your husband enters your pussy, he makes you keep sucking the dog.'
-								'You are not gaining any pleasure from this. Soon your husband cums and says "<<$namesob>> hasn''t finished yet, are you not trying? Fine, Present your ass!."'
-								gs 'arousal', 'bj', 10, 'beast'
-								gs 'boyStat', $HusID
-								gs 'arousal', 'vaginal', 10, 'sub'
-								gs 'stat'
-
-								act 'Offer your ass':
-									*clr & cla
-									analorgasm += 1
-									gs 'cum_call', 'anus', $namesob, 1, 0, -1, 60
-									'<center><img <<$set_imgh>> src="images/beast/zoo/z8.jpg"></center>'
-									'You get on your knees and the dog immediately jumps on you. With one hand you spread your buttocks, and the other guides the dogs cock into your ass.'
-									'Finding your hole the dog quickly enters and fucks your ass. Your husband watches, "Go on you whore."'
-									'The sensation from the dog fucking your ass is driving you to orgasm, as it hits, your legs give out and you''re no longer able to stand.'
-									'The dog twitces and spews his seed in your ass. Spent, <<$namesob>> leaves satisfied.'
-									gs 'arousal', 'anal', 10, 'beast'
-									gs 'arousal', 'end'
-									gs 'stat'
-
-									act 'Finish':gt 'bedr'
-								end
-							end
-						end
-					end
-				end
-			else
-				gt 'bed1', 'sogn'
-			end
-		else
-			gt 'bed1', 'sogn'
-		end
-	end
-end
-
-if $ARGS[0] = 'sog2':
-	*clr & cla
-	menu_off = 1
-	gs 'boyStat', $petID
-	'<center><img <<$set_imgh>> src="images/beast/zoo/sog.jpg"></center>'
-	'You take <<$namesob>>s penis in your hand and start masturbating him.'
-	gs 'arousal', 'hj', 10, 'beast'
-	gs 'stat'
-	act 'Take in your mouth':gt 'bed1', 'sog3'
-	act 'Spread your legs':gt 'bed1', 'sog4'
-end
-
-if $ARGS[0] = 'sog3':
-	*clr & cla
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/beast/zoo/sog1.jpg"></center>'
-	'You greedily swallow <<$namesob>>s dick.'
-	gs 'arousal', 'bj', 10, 'beast'
-	gs 'stat'
-
-	act 'Spread your legs':gt 'bed1', 'sog4'
-end
-
-if $ARGS[0] = 'sog4':
-	*clr & cla
-	menu_off = 1
-	gs 'cum_call', '', $namesob, 1, 0, -1, 60
-	'<center><img <<$set_imgh>> src="images/beast/zoo/sog2.jpg"></center>'
-	'You open your legs and <<$namesob>> fucks your pussy'
-	'Finally the dog ends inside you'
-	gs 'arousal', 'vaginal', 10, 'beast'
-	gs 'arousal', 'end'
-	gs 'stat'
-	
-	act 'Hug the dog and sleep':gt 'bed2'
-end
-
-if $ARGS[0] = 'fin':
-	cla
-	menu_off = 1
-	gt $loc, $metka
-	!!savegame 'avtosave.sav'
-
-	
-	!!if home_owned[1] = 1 and housrA = 1:
-	!!	if $clothingworntype = 'nude':
-	!!		$nude = 'In the corridor'
-	!!	else
-	!!		$nude = 'Get dressed'
-	!!	end
-	!!	housrA = 0
-	!!	gt 'bedr'
-	!!end
-
-end
-
---- bed1 ---------------------------------
-

+ 1 - 1
locations/cikl.qsrc

@@ -204,7 +204,7 @@ if pcs_exhib > 0 or exhibitionist_lvl > 0:
 		exhibitionist_lvl = 1
 	elseif pcs_exhib < 100 or exhibitionQW < 3:
 		exhibitionist_lvl = 2
-	elseif exhibitionQW = 3:
+	elseif exhibitionQW > 2:
 		exhibitionist_lvl = 3
 	end
 end

+ 3 - 3
locations/down.qsrc

@@ -202,11 +202,11 @@ end
 'Next door is the <<$desc_txt1>> followed by a <<$desc_txt2>> and <<$desc_txt3>> and the 5-star <a href="exec: minut += 5 & gt ''hotel'', ''foyer''">Hotel Indigo</a> for your housing needs. Lastly, the local <<$desc_txt4>> and <<$desc_txt5>> can be found at the end of the road.'
 *nl
 if week < 6 and hour >= 7 and hour <= 17:
-	$desc_txt6 = '<a href="exec: minut += 5 & gt ''sentence'',''start''">The Regional Courthouse</a>'
+	$desc_txt6 = '<a href="exec: minut += 5 & gt ''sentence'',''start''">The City Courthouse</a>'
 elseif week < 5 and hour > 17:
-	$desc_txt6 = '<a href="exec:msg ''The Regional Courthouse is closed and will reopen tomorrow at 7:00''">Regional Courthouse</a>'
+	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen tomorrow at 7:00''">City Courthouse</a>'
 else
-	$desc_txt6 = '<a href="exec:msg ''The Regional Courthouse is closed and will reopen on Monday at 7:00''">Regional Courthouse</a>'
+	$desc_txt6 = '<a href="exec:msg ''The City Courthouse is closed and will reopen on Monday at 7:00''">City Courthouse</a>'
 end
 $desc_txt7 = '<a href="exec: minut += 5 & gt ''police_station'',''start''">Main city police station</a>'
 'Away from the shops is both <<$desc_txt6>> and the <<$desc_txt7>>.'

+ 106 - 117
locations/glake.qsrc

@@ -239,148 +239,137 @@ if temper >= 15 and month>=5 and month<=9 and hour>=6 and hour<=20:
 			act 'Go sunbathing (1:00)':
 
 				menu_off = 1
-				if $clothingworntype = 'nude' and zoo > 0 and rand(1,10) = 5:
-					*clr & cla
-					pcs_willpwr -= 5
-					pcs_mood -= 5
-					inhib_exp += rand(1,3)
-					'<center><img <<$set_imgh>> src="images/beast/dogcaine.jpg"></center>'
-					'As you lie down on your towel to catch some rays of sun and hopefully work on your tan a little, a stray dog appears out of nowhere. It keeps sniffing between your legs, which makes you feel very uncomfortable since you''re not wearing anything. You spend most of the hour trying to chase the dog away, but it comes back every time you think you got rid of it. You don''t get much sunbathing done as a result.'
-					act 'Give up on sunbathing':gt'glake'
+				*clr & cla
+				minut += 60
+				if pcs_inhib < 50:inhib_exp += rand(1,2)
+				if pcs_sweat < 35 : pcs_sweat += 5
+				pcs_mood += 5
+				gs'stat'
+				if $clothingworntype = 'swimwear':
+					'<center><img <<$set_imgh>> src="images/locations/shared/lake/zagar.jpg"></center>'
 				else
-					*clr & cla
-					minut += 60
-					if pcs_inhib < 50:inhib_exp += rand(1,2)
-					if pcs_sweat < 35 : pcs_sweat += 5
-					pcs_mood += 5
-					gs'stat'
-					if $clothingworntype = 'swimwear':
-						'<center><img <<$set_imgh>> src="images/locations/shared/lake/zagar.jpg"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/nudezagarat.jpg"></center>'
-					end
+					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/nudezagarat.jpg"></center>'
+				end
 
-					if krem = 0:
-						'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun for an hour.'
-						pcs_tan = pcs_tan + 1
-					else
-						krem = krem - 1
-						'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun for an hour.'
-						pcs_tan = pcs_tan + 3
-					end
+				if krem = 0:
+					'You lie down on your towel for some sunbathing and hopefully a nicer tan, and enjoy the warm rays of the sun for an hour.'
+					pcs_tan = pcs_tan + 1
+				else
+					krem = krem - 1
+					'You smear your body with sunscreen and lie down on your towel for some sunbathing, hoping to work on your tan. You enjoy the warm rays of the sun for an hour.'
+					pcs_tan = pcs_tan + 3
+				end
 
-					if pcs_apprnc >= rand(1,400):
-						tipelakeboyrand = rand(1,100)
-						if tipelakeboyrand <= 5:
-							if npc_QW['A113'] > 0:
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-								'While you are sunbathing, you see Vadim Bely and his brother sitting not far away from you. The brother points at you, and moments later Vadim walks over to you and sits down next to you. He idly scratches his tattoo covered belly as he asks: "Hello <<$pcs_nickname>>, want to go for a ride with me?"'
-								'The greedy look in his eyes tells you that when he says ''ride'', he doesn''t just mean in his car.'
-								if $clothingworntype = 'nude':
-									act 'Get dressed and go with him':
-										gs 'clothing', 'wear_last_worn'
-										if $clothingworntype = 'swimwear':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-										gt 'LakeBoyDy', 'ride'
-									end
-								else
-									act 'Get dressed and go with him':
-										gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
-										gt 'LakeBoyDy', 'ride'
-									end
+				if pcs_apprnc >= rand(1,400):
+					tipelakeboyrand = rand(1,100)
+					if tipelakeboyrand <= 5:
+						if npc_QW['A113'] > 0:
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
+							'While you are sunbathing, you see Vadim Bely and his brother sitting not far away from you. The brother points at you, and moments later Vadim walks over to you and sits down next to you. He idly scratches his tattoo covered belly as he asks: "Hello <<$pcs_nickname>>, want to go for a ride with me?"'
+							'The greedy look in his eyes tells you that when he says ''ride'', he doesn''t just mean in his car.'
+							if $clothingworntype = 'nude':
+								act 'Get dressed and go with him':
+									gs 'clothing', 'wear_last_worn'
+									if $clothingworntype = 'swimwear':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+									gt 'LakeBoyDy', 'ride'
 								end
-								exit
-							elseif $clothingworntype ! 'nude' and npc_QW['A113'] < 1:
+							else
+								act 'Get dressed and go with him':
+									gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+									gt 'LakeBoyDy', 'ride'
+								end
+							end
+							exit
+						elseif $clothingworntype ! 'nude' and npc_QW['A113'] < 1:
+							cls
+							gs'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
+							'While you are sunbathing you can''t help but notice a man walking towards you. He looks truly intimidating, his entire body covered in criminal gang tattoos. A bit further down the beach you see a younger man with similar tattoos, keeping an eye on the man approaching you.'
+							'His head is mostly bald, and a large golden cross dangles on a thick chain from his neck. He sits his fat body down next to you before you can protest, idly scratching his belly as he begins to chat: "Hello! I''m not interrupting anything, am I?"'
+							act'Be outraged':
 								cls
+								minut += 5
 								gs'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-								'While you are sunbathing you can''t help but notice a man walking towards you. He looks truly intimidating, his entire body covered in criminal gang tattoos. A bit further down the beach you see a younger man with similar tattoos, keeping an eye on the man approaching you.'
-								'His head is mostly bald, and a large golden cross dangles on a thick chain from his neck. He sits his fat body down next to you before you can protest, idly scratching his belly as he begins to chat: "Hello! I''m not interrupting anything, am I?"'
-								act'Be outraged':
+								'You were here first! You''re outraged by the way he just plants himself down next to you and exclaim: "Erm, excuse me!? I was here first!"'
+								'The man is not impressed in the slightest, obviously having played this game before. He immediately challenges your claim: "Oh, excuse me princess! Is this your spot? Do you own it?"'
+
+								act'Yes you do!':
 									cls
 									minut += 5
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-									'You were here first! You''re outraged by the way he just plants himself down next to you and exclaim: "Erm, excuse me!? I was here first!"'
-									'The man is not impressed in the slightest, obviously having played this game before. He immediately challenges your claim: "Oh, excuse me princess! Is this your spot? Do you own it?"'
-
-									act'Yes you do!':
-										cls
-										minut += 5
-										gs'stat'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-										'You respond indignantly: "Yes, this is my spot! I was here first, that''s how it works!"'
-										'Suddenly you hear a deep voice behind you: "This beach is only used by prostitutes and bus drivers, and I don''t see a fucking bus."'
-										'Damn, that voice startled you. You look behind you and you see the tattooed younger man behind you. He has tattoos over his whole body as well, most notably several tombs and skulls on his chest. He stares you down with a stone cold look on his face.'
-										'The bald man smiles and puts his hand on your chest as if he owns it, roughly squeezing you tit through your swimsuit.'
-										'"So... how much?"'
-										act 'Resist':gt 'LakeBoyDy', 'slap'
-										act 'Move away':gt 'LakeBoyDy', 'go'
-
-									end
+									'You respond indignantly: "Yes, this is my spot! I was here first, that''s how it works!"'
+									'Suddenly you hear a deep voice behind you: "This beach is only used by prostitutes and bus drivers, and I don''t see a fucking bus."'
+									'Damn, that voice startled you. You look behind you and you see the tattooed younger man behind you. He has tattoos over his whole body as well, most notably several tombs and skulls on his chest. He stares you down with a stone cold look on his face.'
+									'The bald man smiles and puts his hand on your chest as if he owns it, roughly squeezing you tit through your swimsuit.'
+									'"So... how much?"'
+									act 'Resist':gt 'LakeBoyDy', 'slap'
+									act 'Move away':gt 'LakeBoyDy', 'go'
 								end
+							end
 
-								act'Ignore them':
+							act'Ignore them':
+								cls
+								minut+=5
+								gs'stat'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
+								'Those guys look intimidating. You don''t want any trouble and just pretend they''re not there, laying on the beach with your eyes closed. However, a few moments later you feel a strange tickling on your stomach. You open your eyes to see what''s causing it, and you see the fat man running a blade of grass over your stomach with a smug grin on his face. Looks like you can''t ignore them any longer.'
+
+								act'Keep ignoring them':
 									cls
 									minut+=5
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-									'Those guys look intimidating. You don''t want any trouble and just pretend they''re not there, laying on the beach with your eyes closed. However, a few moments later you feel a strange tickling on your stomach. You open your eyes to see what''s causing it, and you see the fat man running a blade of grass over your stomach with a smug grin on his face. Looks like you can''t ignore them any longer.'
-
-									act'Keep ignoring them':
-										cls
-										minut+=5
-										gs'stat'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/vadimbely.jpg"></center>'
-										'You try to ignore them anyway, closing your eyes again. You feel the blade of grass continuously teasing your body, and after a few minutes his sweaty hand is pawing at your breasts through your swimsuit.'
-										'He whispers in your ear: "Come with me baby, I''ll make you feel good. You won''t regret it". His groping becomes more insistent and he''s roughly pinching your nipples now, and the outline of them slowly but surely becomes visible through your swimsuit.'
-										act 'Resist':gt 'LakeBoyDy', 'slap'
-									end
+									'You try to ignore them anyway, closing your eyes again. You feel the blade of grass continuously teasing your body, and after a few minutes his sweaty hand is pawing at your breasts through your swimsuit.'
+									'He whispers in your ear: "Come with me baby, I''ll make you feel good. You won''t regret it". His groping becomes more insistent and he''s roughly pinching your nipples now, and the outline of them slowly but surely becomes visible through your swimsuit.'
+									act 'Resist':gt 'LakeBoyDy', 'slap'
 								end
-
-								act 'Walk away':gt 'glake'
-								exit
-							else
-								cla
-								'While you are sunbathing, three guys sit down near you. While you notice them looking at you and talking about your body, they don''t come over.'
-								act'Stop sunbathing':gt'glake'
 							end
-						elseif tipelakeboyrand <= 30:
-							!! {below is for when this event is fixed. Generates a boy[0], boy[1], and boy[2]}
-							!! killvar '$boy'
-							!! i = rand((age - 5),(age + 5))
-							!! if i < 16: i = 16
-							!! gs 'npcgeneratec', 0, 'Guy', rand((i - 1),(i + 1))
-							!! gs 'boyStat', $npclastgenerated
-							!! gs 'npcgeneratec', 0, 'Guy', rand((i - 1),(i + 1))
-							!! gs 'boyStat', $npclastgenerated, 1
-							!! gs 'npcgeneratec', 0, 'Guy', rand((i - 1),(i + 1))
-							!! gs 'boyStat', $npclastgenerated, 2
-							'While you are sunbathing, three guys sit down near you. While you notice them looking at you and talking about you, they don''t come over.'
-
-							act 'Continue':gt'glake'
-							exit
-						elseif tipelakeboyrand <= 80:
-							i = age - 5
-							if i < 16: i = 16
-							gs 'npcgeneratec', 0, 'Guy', rand((i),(age + 5))
-							gs 'boyStat', $npclastgenerated
-							$boydesc = $npc_firstname[$npclastgenerated]
-							gs'LakeBoyZ'
-							'While you are sunbathing, a guy sits down next to you. He''s kind of cute, actually.'
-							'He tries to chat you up: "Hey there beautiful, I''m <<$boydesc>>. What''s your name?"'
-
-							act 'Get away from him':gt'glake'
-							dynamic $gL_boy_z
+
+							act 'Walk away':gt 'glake'
 							exit
 						else
+							cla
 							'While you are sunbathing, three guys sit down near you. While you notice them looking at you and talking about your body, they don''t come over.'
-							act 'Stop sunbathing':gt'glake'
-							exit
+							act'Stop sunbathing':gt'glake'
 						end
+					elseif tipelakeboyrand <= 30:
+						!! {below is for when this event is fixed. Generates a boy[0], boy[1], and boy[2]}
+						!! killvar '$boy'
+						!! i = rand((age - 5),(age + 5))
+						!! if i < 16: i = 16
+						!! gs 'npcgeneratec', 0, 'Guy', rand((i - 1),(i + 1))
+						!! gs 'boyStat', $npclastgenerated
+						!! gs 'npcgeneratec', 0, 'Guy', rand((i - 1),(i + 1))
+						!! gs 'boyStat', $npclastgenerated, 1
+						!! gs 'npcgeneratec', 0, 'Guy', rand((i - 1),(i + 1))
+						!! gs 'boyStat', $npclastgenerated, 2
+						'While you are sunbathing, three guys sit down near you. While you notice them looking at you and talking about you, they don''t come over.'
+
+						act 'Continue':gt'glake'
+						exit
+					elseif tipelakeboyrand <= 80:
+						i = age - 5
+						if i < 16: i = 16
+						gs 'npcgeneratec', 0, 'Guy', rand((i),(age + 5))
+						gs 'boyStat', $npclastgenerated
+						$boydesc = $npc_firstname[$npclastgenerated]
+						gs'LakeBoyZ'
+						'While you are sunbathing, a guy sits down next to you. He''s kind of cute, actually.'
+						'He tries to chat you up: "Hey there beautiful, I''m <<$boydesc>>. What''s your name?"'
+
+						act 'Get away from him':gt'glake'
+						dynamic $gL_boy_z
+						exit
 					else
-						cla
-						act'Stop sunbathing':gt'glake'
+						'While you are sunbathing, three guys sit down near you. While you notice them looking at you and talking about your body, they don''t come over.'
+						act 'Stop sunbathing':gt'glake'
+						exit
 					end
+				else
+					cla
+					act'Stop sunbathing':gt'glake'
 				end
 			end
 		end

+ 2 - 4
locations/obj_din.qsrc

@@ -681,11 +681,10 @@ if $ARGS[0] = 'stats':
 	if swallow > 0: 'Sperm swallowed <<swallow>> times.'
 	if facial > 0: 'You have taken <<facial>> facials.'
 	if frot > 0 or hump > 0: 'Your clothes have been come on <<frot + hump>> times.'
-	if zoo > 0: 'Had sex with animals <<zoo>> times.'
 	if pee > 0: 'You pissing <<pee>> times.'
 	if swallowpee > 0: 'You swallowed urine <<swallowpee>> times.'
 	!!!WD:FORMATING
-	if (slutty + pfilmSTOP + film + orgasm + analorgasm + swallow + facial + frot + zoo + pee) > 0:*nl
+	if (slutty + pfilmSTOP + film + orgasm + analorgasm + swallow + facial + frot + pee) > 0:*nl
 	!!!
 	gs 'obj_din', 'husb_cheat_count'
 
@@ -1121,11 +1120,10 @@ if $ARGS[0] = 'stats_sex':
 	if swallow > 0: 'Sperm swallowed <<swallow>> times.'
 	if facial > 0: 'You have taken <<facial>> facials.'
 	if frot > 0 or hump > 0: 'Your clothes have been come on <<frot + hump>> times.'
-	if zoo > 0: 'Had sex with animals <<zoo>> times.'
 	if pee > 0: 'You pissing <<pee>> times.'
 	if swallowpee > 0: 'You swallowed urine <<swallowpee>> times.'
 	!!!WD:FORMATING
-	if (slutty + pfilmSTOP + film + orgasm + analorgasm + swallow + facial + frot + zoo + pee) > 0:*nl
+	if (slutty + pfilmSTOP + film + orgasm + analorgasm + swallow + facial + frot + pee) > 0:*nl
 	!!!
 	gs 'obj_din', 'husb_cheat_count'
 

+ 22 - 34
locations/pavtrain_market.qsrc

@@ -1,11 +1,5 @@
 # pavtrain_market
 
-!{change log
-March 31, 2016
-Added rice wine quest
-April 20, 2016
-Fixed Rice wine event
-}
 $location_type = 'public_outdoors'
 if $ARGS[0] = 'start':
 	$metka = 'start'
@@ -34,41 +28,40 @@ if $ARGS[0] = 'start':
 	end
 	*nl
 	'This small open air market is located near the train station.'
-	if arturQW = 1 and (week = 6 or week = 7) and hour < 12:
-		act 'Wait for Aurel to arrive':hour = 12 & gt 'pavtrain_market', 'start'
-	end
+	if arturQW = 1 and (week = 6 or week = 7) and hour < 12: act 'Wait for Arthur to arrive':hour = 12 & gt 'pavtrain_market', 'start'
 	*nl
 	if hour >= 8 and hour <= 18:
 		'The market stalls are buzzing with shoppers. Everyone seems to be in a good mood and you can hear back and forth bargaining as you pass by.'
 		if pav_slut >= 50 and rand(0,9) = 0:
+			menu_off = 1
+			gs 'stat'
 			'An Armenian man comes up to you and in broken Russian says, "You girl who like men, no? Come meet real men have good time."'
-			act 'Go with him':gt 'gevent', '3'
 			act 'Reject him':
-				menu_off = 1
 				*clr & cla
 				'You pretend not to understand what he is saying, smiling and shaking your head as you move away from him.'
 				act 'Return':gt 'pavtrain_market', 'start'
 			end
+			act 'Go with him':gt 'gevent', '3'
 			
 			exit
 		end
 		
-		act 'Wander through the market': gt 'pavtrain_market','events'
 		act 'Go back to the station': minut += 3 & gt 'pavtrain'
-		
-		!expand market events from 1.2.4
+		act 'Wander through the market': gt 'pavtrain_market','events'
+		if pavtrain_book = 1: act 'Go to the book stall': minut += 5 & gt 'pavtrain_hall', 3
+		if pavmarket_porn = 1: act 'Go to the porn stall': minut += 5 & gt 'pavtrain_market', 4
 
 		if arturKnow = 1 and arturQW = 0:
-			act 'Look for Aurel':gt 'arturRinok', 'start'
+			act 'Look for Arthur':gt 'arturRinok', 'start'
 		elseif arturQW = 1 and (week = 6 or week = 7):
 			if hour = 12 or hour = 13:
-				act 'Look for Aurel':gt 'arturRinok', 'work_1'
+				act 'Look for Arthur':gt 'arturRinok', 'work_1'
 			end
 		elseif arturQW = 2:
 			if hour = 16 and minut <= 30:
-				act 'Look for Aurel':gt 'arturRinok', 'work_2'
+				act 'Look for Arthur':gt 'arturRinok', 'work_2'
 			elseif hour < 16:
-				act 'Wait for Aurel to arrive':hour = 16 & minut = 0 & gt 'pavtrain_market', 'start'
+				act 'Wait for Arthur to arrive':hour = 16 & minut = 0 & gt 'pavtrain_market', 'start'
 			end
 		end
 
@@ -83,9 +76,7 @@ if $ARGS[0] = 'start':
 				'Not wanting to get into trouble, you pack your stuff away. The man was already gone, but you saw which direction he went and he should be easy to find.'
 				act 'Leave':gt 'pavtrain_market', 'start'
 			end
-		end
-
-		if gobelen > 0 and gobQW >= 1:
+		elseif gobelen > 0 and gobQW >= 1:
 			act'Sell ​​tapestry':
 				menu_off = 1
 				*clr & cla
@@ -94,12 +85,12 @@ if $ARGS[0] = 'start':
 				'You go to the man who offered to buy your tapestries for 1000 <b>₽</b>. You find him by his stall, smiling.'
 				if gobQW = 2:
 					'Roman welcomes you. He is interested and businesslike as he asks what you have for sale.'
-				end
-				if gobQW = 1:
+				elseif gobQW = 1:
 					gobQW = 2
 					minute + 5
 					'The man greets you and introduces himself as Roman, you tell him that your name is <<$pcs_nickname>>. After a brief chat Roman says that he is interested in seeing what you have for sale.'
 				end
+				act 'Leave':gt 'pavtrain_market', 'start'
 				act'Show your tapestry':
 					*clr & cla
 					gobelen -= 1
@@ -111,16 +102,13 @@ if $ARGS[0] = 'start':
 				if gobelen > 1:
 					act'Sell all of your tapestries':
 						*clr & cla
-						kolgob = gobelen
+						'You show Roman your tapestries and he gives you <<gobelen * 1000>> <b>₽</b> for them. You take the money and give him the tapestries.'
+						money += gobelen * 1000
 						gobelen = 0
-						moneyGob = kolgob*1000
-						money += moneyGob
 						gs'stat'
-						'You show Roman your tapestries and he gives you <<moneyGob>> <b>₽</b> for them. You take the money and give him the tapestries.'
 						act 'Leave':gt 'pavtrain_market', 'start'
 					end
 				end
-				act 'Leave':gt 'pavtrain_market', 'start'
 			end
 		end
 		if ShowerIvan = 5 and porndeal = 0 and rand(1,10) <= 4 and lookwine ! daystart:
@@ -173,12 +161,11 @@ if $ARGS[0] = 'start':
 						'"How about we make a deal." he says, "Go to the porn dealer and buy me a porn magazine and I''ll get you the wine."'
 						if pornmarkonce = 0: pornmarkonce = 1 & '"Where can I find the porn dealer?" you ask and he happily gives you directions.'
 						
-						act 'Agree': porndeal = 1 & gt 'pavtrain_market', 4
-						
 						act 'Refuse':
 							'You decline his offer as he upsettingly walks away.'
 							act 'Leave': gt 'pavtrain_market', 'start'
 						end
+						act 'Agree': porndeal = 1 & gt 'pavtrain_market', 4
 					end
 				end
 			end
@@ -215,8 +202,7 @@ if $ARGS[0] = 'start':
 				'You tell him that you haven''t had time to pick up the magazine yet but you were working on it.'
 				act 'Leave': gt 'pavtrain_market', 'start'
 			end 
-		end
-		if porndeal = 1 and porndealday = daystart and lookboy = 0:
+		elseif porndeal = 1 and porndealday = daystart and lookboy = 0:
 			*clr & cla
 			menu_off = 1
 			gs 'stat'
@@ -226,8 +212,8 @@ if $ARGS[0] = 'start':
 			act 'Leave': gt 'pavtrain_market', 'start'
 		end
 	else
-		act 'Wander through the market': gt 'pavtrain_market','events'
 		act 'Go back to the station': minut += 3 & gt 'pavtrain'
+		act 'Wander through the market': gt 'pavtrain_market','events'
 	end
 end
 
@@ -303,6 +289,7 @@ end
 if ARGS[0] = 3:
 	*clr & cla
 	menu_off = 1
+	pavtrain_book = 1
 	gs 'stat'
 	if month >= 11 or month <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/bookw.jpg"></center>'
@@ -350,6 +337,7 @@ end
 if ARGS[0] = 4:
 	*clr & cla
 	menu_off = 1
+	pavmarket_porn = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/market/pornmag.jpg"></center>'
 	'You find a small stall that has many shelves with a large variety of porn magazines, a pack of brand new porn playing cards, and you can see several sex toys just behind the counter. The salesman watches over his stall with shifty eyes.'
@@ -685,7 +673,7 @@ if ARGS[0] = 11:
 		act 'Look': gt 'arturRinok','start'
 	else
 		'Someone suddenly calls out to you, "Hey <<$pcs_nickname>>, do you want a fresh, juicy tangerine?"'
-		act 'Go and see Aurel': gt 'arturRinok','start'
+		act 'Go and see Arthur': gt 'arturRinok','start'
 	end
 end
 

+ 1 - 1
locations/sentence.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'start':
 	minut += 2
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/court/courthouse.jpg"></center>'
-	'You are standing in the middle of the Greco-Roman inspired main courthouse for the whole St Petersburg region.'
+	'You are standing in the middle of the Greco-Roman inspired main courthouse for the whole city of St. Petersburg.'
 	'There are many statues of political and legal figures in the region going right back to a bust of Catherine the Great.'
 
 	act 'Leave': gt 'down'

+ 3 - 1
locations/traits.qsrc

@@ -58,8 +58,10 @@ if $ARGS[0] = 'menu':
 		'This trait grants you a moderate amount of excitement from exposing yourself.'
 		if pcs_exhib < 100:
 			'You have <<pcs_exhib>> out of 100 points towards level 3.'
-		else
+		elseif pcs_exhib >= 100 and exhibitionQW < 3:
 			'You must trigger an event in the park to gain level 3.'
+		elseif pcs_exhib >= 100 and exhibitionQW > 2:
+			'You will have to wait until the end of the day for the trait level to update.'
 		end
 	else
 		'You have this trait at level 3.'

+ 17 - 5
locations/willpower.qsrc

@@ -4,7 +4,7 @@
 !!type is the nature of the demand and can be any of the following:
 !!
 !!Sex acts, this is for the cost to refuse advances or force another to partake
-!!'hj', 'bj', 'sex', 'anal', 'gangbang', 'prostitution', 'swallow', 'cum_inside'
+!!'hj', 'bj', 'cuni', 'sex', 'anal', 'gangbang', 'prostitution', 'swallow', 'cum_inside'
 !!Bridging a gap in skill, for succeeding when not quite meeting the required skill/attribute, must include skill with _lvl postfix in $ARGS[1]
 !!'skill'
 !!Standing up to unwanted sex
@@ -64,7 +64,6 @@ if $ARGS[0] = 'calc':
 	elseif sick > 1:
 		will_calc += 5
 	end
-
 end
 
 if $ARGS[0] = 'hj':
@@ -87,6 +86,19 @@ if $ARGS[0] = 'bj':
 		will_cost = (100 + will_calc)/10
 	end
 end
+
+if $ARGS[0] = 'cuni':
+	gs 'willpower', 'calc'
+	will_cost = 0
+	if missCum >= timeTresh: will_calc += 100
+	cuni_check = (stat['cuni'] + stat['cuni_give']) / 2
+	if cuni_check <= 90:
+		will_cost = (cuni_check + will_calc)/10
+	else
+		will_cost = (100 + will_calc)/10
+	end
+	killvar 'cuni_check'
+end
 	
 if $ARGS[0] = 'sex':
 	gs 'willpower', 'calc'
@@ -135,10 +147,10 @@ end
 if $ARGS[0] = 'swallow':
 	gs 'willpower', 'calc'
 	will_cost = 0
-	if trt_cumeater = 0:
-		will_cost = (10 + will_calc)/10
-	else
+	if trt_cumeater = 1 or cumloc[12] > 0:
 		will_cost = (100 + will_calc)/10
+	else
+		will_cost = (10 + will_calc)/10
 	end
 end