1
0

21 Komitmen 263234fb9e ... c1a8223169

Pembuat SHA1 Pesan Tanggal
  KevinSmarts c1a8223169 [fixes] Wrong variable for cheap outfit 150 as spotted by highland_master18 4 tahun lalu
  KevinSmarts 1a00a49360 Merge remote-tracking branch 'julzor/master' 4 tahun lalu
  KevinSmarts a3d2f5544c [fixes] Wrong image links for Pav train station 4 tahun lalu
  KevinSmarts c594f6e3fb [fixes] Wrong variable as spotted by random2345 4 tahun lalu
  KevinSmarts 32a9e4b9e8 [fixes] Missing Leave action and wrong variable check for dressed as prostitute both reported by random2345 4 tahun lalu
  julzor c154c5ff0c [fixed] $loc and $locstreet don't match the file name 4 tahun lalu
  KevinSmarts 517e36cc1c [fixed] removed cost to go online on Artem's computer 4 tahun lalu
  KevinSmarts ea9816dc74 [fixes] You can shower at Pav gym without shampoo if still in school (ie, can live at home) 4 tahun lalu
  KevinSmarts be16a3ebbc [changed] Requirement for shampoo to take shower at school removed as you'd get that from your folks at home 4 tahun lalu
  KevinSmarts 76be9fcf5a [fixes] Variable not updated when copy/pasting links for the new G+M section 4 tahun lalu
  julzor 04ca0e9143 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 tahun lalu
  julzor 2ac1fb3831 [fixed] not being able to build a version because of a typo in glife.qproj 4 tahun lalu
  KevinSmarts c4c14c69f4 [added] Exercise option for the summer house in the co-op village 4 tahun lalu
  KevinSmarts 1180a182bf [fixes] Skirt length value incorrectly set 4 tahun lalu
  KevinSmarts 95809d8331 [Removed] OldArtem files not used anymore. 4 tahun lalu
  KevinSmarts 802ea31985 [Added] New split of clothing from G+M in wardrobe into each type (cheap,school,office,uniform) 4 tahun lalu
  KevinSmarts 04006c344d Merge remote-tracking branch 'KeyMasterOfGozer/master' 4 tahun lalu
  KevinSmarts 56c51f4a55 [fixes] Broken logic due to what looks like an intended iif use. I changed it about to make it les complicated 4 tahun lalu
  KeyMasterOfGozer 1c7cf2c35c Reduced some mana cost for some spells. 4 tahun lalu
  KevinSmarts a12d697812 [added] Estate agent will ask you if you want to change new property to your home with a pop up to make things muh clearer. 4 tahun lalu
  KevinSmarts 71598160f9 [fixes] Generic lover can now meet you at co-op farm if you own the cottage there 4 tahun lalu

+ 1 - 3
glife.qproj

@@ -412,7 +412,7 @@
 		<Location name="gtelefon"/>
 	</Folder>
 	<Folder name="Family">
-		<Location name="family_schdule"/>
+		<Location name="family_schedule"/>
 		<Location name="seeparentsex"/>
 		<Location name="father"/>
 		<Location name="fathersex"/>
@@ -468,10 +468,8 @@
 	</Folder>
 	<Folder name="Artem Chebotarev">
 		<Location name="artemEv"/>
-		<Location name="artemEv3"/>
 		<Location name="artemhome"/>
 		<Location name="artemdate"/>
-		<Location name="artemev2"/>
 		<Location name="artgar"/>
 	</Folder>
 	<Folder name="Igor Kruglov">

+ 1 - 1
locations/Komp.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 
 	if student > 0 and kursovik < 100:'You should probably do some of your <a href="exec:gt ''Komp'',''kursak''">coursework</a>.'
 
-	if $loc = 'shulga_room' or $loc = 'anushapt':
+	if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'artemhome':
 		internet_store = internet
 		internet = 100000
 		act 'Browse the internet':gt 'Komp', 'brows'

+ 1 - 2
locations/_attributes_cheap.qsrc

@@ -846,8 +846,7 @@ elseif ARGS[1] = 150:
 	CloQuality = 2
 	CloThinness = 2
 	CloTopCut = 1
-	CloPantsShortness = 1
-	CloExhibit = 10
+	CloSkirtShortness = 3
 elseif ARGS[1] = 151:
 	CloQuality = 2
 	CloThinness = 3

+ 2 - 2
locations/_attributes_school.qsrc

@@ -445,8 +445,8 @@ elseif ARGS[1] = 61:
 	CloThinness = 3
 	CloTopCut = 2
 	CloStyle2 = 4
-	CloExhibit = 10
-	CloSkirtShortness = 3
+	CloExhibit = 20
+	CloSkirtShortness = 4
 	CloBimbo = 1
 elseif ARGS[1] = 62:
 	CloQuality = 4

+ 35 - 5
locations/agentned.qsrc

@@ -301,7 +301,13 @@ if $ARGS[0] = 'rent_cityres':
 				karta -= home_rent[1]
 			end
 			home_owned[1] = 1
-			if ARRSIZE('home_owned') = 0: gs 'set_home', 1
+			if ARRSIZE('home_owned') = 0:
+				gs 'set_home', 1
+			else
+				$set_homeyn = input("Whould you like to set this as your new home? (yes/no)")
+				if $set_homeyn = 'yes': gs 'set_home', 1
+				killvar '$set_homeyn'
+			end
 			ArendHouseSL += ArendHouseSL_due
 			gs'stat'
 			'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
@@ -349,7 +355,13 @@ if $ARGS[0] = 'rent_pushkin':
 				karta -= home_rent[4]
 			end
 			home_owned[4] = 1
-			if ARRSIZE('home_owned') = 0: gs 'set_home', 4
+			if ARRSIZE('home_owned') = 0:
+				gs 'set_home', 4
+			else
+				$set_homeyn = input("Whould you like to set this as your new home? (yes/no)")
+				if $set_homeyn = 'yes': gs 'set_home', 4
+				killvar '$set_homeyn'
+			end
 			ArendHouseSL4 += ArendHouseSL_due
 			gs'stat'
 			'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
@@ -385,7 +397,13 @@ if $ARGS[0] = 'buy_cityres':
 	minut += 30
 	karta -= home_value[1]
 	home_owned[1] = 2
-	if ARRSIZE('home_owned') = 0: gs 'set_home', 1
+	if ARRSIZE('home_owned') = 0:
+		gs 'set_home', 1
+	else
+		$set_homeyn = input("Whould you like to set this as your new home? (yes/no)")
+		if $set_homeyn = 'yes': gs 'set_home', 1
+		killvar '$set_homeyn'
+	end
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
@@ -402,7 +420,13 @@ if $ARGS[0] = 'buy_dacha':
 	minut += 30
 	karta -= home_value[3]
 	home_owned[3] = 1
-	if ARRSIZE('home_owned') = 0: gs 'set_home', 3
+	if ARRSIZE('home_owned') = 0:
+		gs 'set_home', 3
+	else
+		$set_homeyn = input("Whould you like to set this as your new home? (yes/no)")
+		if $set_homeyn = 'yes': gs 'set_home', 3
+		killvar '$set_homeyn'
+	end
 	etoexhib = 0
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
@@ -420,7 +444,13 @@ if $ARGS[0] = 'buy_Mansion':
 	minut += 30
 	karta -= home_value[5]
 	home_owned[5] = 1
-	if ARRSIZE('home_owned') = 0: gs 'set_home', 5
+	if ARRSIZE('home_owned') = 0:
+		gs 'set_home', 5
+	else
+		$set_homeyn = input("Whould you like to set this as your new home? (yes/no)")
+		if $set_homeyn = 'yes': gs 'set_home', 5
+		killvar '$set_homeyn'
+	end
 	gs'stat'
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'

+ 0 - 66
locations/artemEv3.qsrc

@@ -1,66 +0,0 @@
-# ArtemEv3
-
-if $ARGS[0] = 'slut_talk':
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk1.jpg"></center>'
-	'You quietly walk past Artem and enter his room. You sit down on the couch, without saying a word.'
-	'Artem looks at you questioningly: "<<$pcs_nickname>>..."'
-	'Tears roll down your cheeks, but you still don''t know what to say and just sit there, crying softly.'
-	'Artem is clueless as to what he should do, and just hugs you. You''re fairly sure he knows about your reputation. Surely he must...'
-	'Eventually, you sniffle: "They all know... Everyone in Pavlovsk knows!"'
-	'Artem keeps hugging you: "<<$pcs_nickname>>, I..."'
-	'You break away from him, and shout hysterically: "What do you mean, <<$pcs_nickname>>?! No one calls me that any more! It''s just <<$gnikname>> now..."'
-	'Artem wipes the tears from your face, and hugs you tightly.'
-	'He whispers: "I still love you..."'
-	'You smirk at him: "Are you sure you want to be seen with a whore? Everyone will look down on you too!"'
-	'Artem tells you: "I don''t care what others call you, or what they think... I just want to be with you."'
-	if soniaPS > 0:
-		'You continue: "You saw what happened to Sonia! She used to get along with everyone... but ever since the incident at the disco they all treat her like dirt! That will happen to me too, I just know it! And you, if people see you near me!"'
-	else
-		'You shake your head sadly: "I know you think that now, but it won''t be the same. People will treat me like dirt, Artem! And they would do the same to you!"'
-	end
-	'You hear his voice crack when he tries to reassure you things will be okay: "<<$pcs_nickname>>, please calm down! We''ll figure something out! Just give it some time..."'
-	'You can tell it has been on his mind as well, and that he''s having a difficult time with it too. Nevertheless, he''s willing to support you.'
-	minut += rand(10,15)
-	gs 'stat'
-
-	act 'Kiss him':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk2.jpg"></center>'
-		'You lean towards Artem and kiss him amorously.'
-		'You mutter: "Thank you, Artem... I don''t know what to say, besides... I love you!"'
-		'Artem replies: "I love you too, <<$pcs_nickname>>."'
-		'You press your lips against his again, and kiss him. He embraces you and kisses you back.'
-		'You just lay silent in each other''s arms for a minute, just thinking about the implications of it all. After that, you realize you need to get on with your day and he probably does too. You give Artem a quick kiss on his cheek and thank him for his support as you get up and gather your things. At least you know you''re not alone in this.'
-		artQW = 22
-		minut += rand(5,10)
-		gs 'stat'
-
-		act 'Leave Artem''s apartment':minut += 5 & gt 'pod_ezd','etaj_1'
-	end
-	act 'Tell him you can''t see him any more':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk3.jpg"></center>'
-		'You quietly get up, and begin to gather your things.'
-		'Artem looks at you questioningly: "<<$pcs_nickname>>, what are you doing?"'
-		'You shake your head as you softly mutter through your tears: "I''m sorry, Artem... I can''t ask this from you. I can''t ask this from anyone. I''m really sorry... but I don''t think we should see each other any more."'
-		'After you gather your things you leave his apartment, ignoring his pleas.'
-		minut += rand(5,10)
-		gs 'stat'
-		act 'Leave Artem''s apartment':minut += 5 & artemblok = 1 & gt 'pod_ezd','etaj_1'
-	end
-end
-
-if $ARGS[0] = 'home_start':
-	menu_off = 1
-	'<center><b><font color="maroon"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></font></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-	*nl
-	'Well, it seems that this part of story is unfinished, I''ve no idea what should be here so I give you a chance to escape'
-	gs 'stat'
-	artQW = 21
-	act 'Try it once more': gt 'artemhome','inside'
-end
-
---- ArtemEv3 ---------------------------------
-

+ 0 - 207
locations/artemev2.qsrc

@@ -1,207 +0,0 @@
-# artemev2
-
-gs 'boyStat','A2'
-if artQW = 1:
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-	'Out of nowhere, Artem suddenly produces a bouquet of flowers and offers it to you.'
-
-	act 'Accept the flowers':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-		'What a nice gesture! You smile at him and mutter: "Awww, they''re beautiful! You shouldn''t have!"'
-		'You move in and give him a kiss. When you reach out for him you accidentally run your hand over his groin, and feel quite the bulge down there.'
-		'Artem blushes when he tells you: "Not as beautiful as you..."'
-		'He returns your kiss, and gently begins to caress your breasts through your clothes.'
-		minut += 5
-		gs 'stat'
-
-		act 'Tell him to stop it':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-			'You push his hands away: "Wait... you''re going too fast, please stop!"'
-			'Artem does as you ask and pulls his hands back as he apologizes: "Sorry..."'
-			minut += 5
-			artQW = 2
-			gs 'stat'
-			act 'Do homework with Artem': gt 'artemEv','learn'
-		end
-
-		act 'Enjoy his touch and jerk him off':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/cum.jpg"></center>'
-			'You keep kissing and remove your top so he has easier access to your <<$titsize>> boobs.'
-			'Meanwhile, you reach down and unbutton his pants, taking his cock in your hand. After a few quick jerks, Artem already cums on your clothes.'
-			'You notice your soiled clothes, and smile at him as you ask: "It''s okay. But that''ll leave a stain if I don''t do something... where''s your bathroom?"'
-			'Artem apologetically points at the door, and you bring your bag to cover up the stain with as you head for the bathroom. Just when you''re almost there, you hear a cheerful voice behind you: "Oh hello! I thought I heard a girl''s voice in Artem''s room!"'
-			'It''s his mother! You quickly mumble a greeting and enter the bathroom, hoping she didn''t see the sperm on your clothes. You rinse it off and return to his bedroom.'
-			'You smile at him: "That was fun... shall we study now?"'
-			gs 'arousal','hj',5
-			gs 'cum_call','clothes_hidden',$boy,1
-			artQW = 3
-			hja += 1
-			npc_sex[$boy] += 1
-			gs 'arousal','end'
-			gs 'stat'
-
-			act 'Do homework with Artem': gt 'artemEv','learn'
-		end
-	end
-
-	act 'Reject the flowers':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-		'You look at Artem compassionately, but don''t take the flowers: "Thank you... they''re very nice, but we''re just friends... I don''t want to give you the wrong idea by accepting them, you know?"'
-		'Artem sighs, and disappointedly throws flowers into the trash.'
-		minut += 5
-		gs 'stat'
-
-		act 'Run and pick them up from the trash':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-			'You try to stop him: "No! What are you doing, they''re so beautiful!"'
-			'You take the flowers from the trash and burst into tears. Artem kneels down next to you and hugs you: "I''m sorry, please don''t cry! I didn''t think you wanted them... I... you''re so..."'
-			'You don''t object when he kisses you. You kiss him back, and a few seconds later you feel his hands on your boobs.'
-			minut += 5
-			gs 'stat'
-
-			act 'Push his hands away':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-				'You push his hands away: "Wait... you''re going too fast, please stop!"'
-				'Artem does as you ask and pulls his hands back while he apologizes: "Sorry..."'
-				minut += 5
-				artQW = 2
-				gs 'stat'
-
-				act 'Do homework with Artem': gt 'artemEv','learn'
-			end
-
-			act 'Enjoy his touch and jerk him off':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/cum.jpg"></center>'
-				'You keep kissing and remove your top so he has easier access to your <<$titsize>> boobs.'
-				'Meanwhile, you reach down and unbutton his pants, taking his cock in your hand. After a few quick jerks, Artem already cums on your clothes.'
-				'You notice your soiled clothes, and smile at him as you ask: "It''s okay. But that''ll leave a stain if I don''t do something... where''s your bathroom?"'
-				'Artem apologetically points at the door, and you bring your bag to cover up the stain with as you head for the bathroom. Just when you''re almost there, you hear a cheerful voice behind you: "Oh hello! I thought I heard a girl''s voice in Artem''s room!"'
-				'It''s his mother! You quickly mumble a greeting and enter the bathroom, hoping she didn''t see the sperm on your clothes. You rinse it off and return to his bedroom.'
-				'You smile at him: "That was fun... shall we study now?"'
-				gs 'arousal','hj',5
-				gs 'cum_call','clothes_hidden',$boy,1
-				artQW = 3
-				hja += 1
-				npc_sex[$boy] += 1
-				gs 'arousal','end'
-				gs 'stat'
-
-				act 'Do homework with Artem': gt 'artemEv','learn'
-			end
-		end
-
-		act 'Leave them in the trash and study':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-			'You quietly walk past him and say: "Come on, let''s study?"'
-			'You can tell he''s unhappy, and he mutters: "Fine..."'
-			'You really hurt his feelings.'
-			minut += 5
-			artQW = 4
-			gs 'stat'
-
-			act 'Do homework with Artem': gt 'artemEv','learn'
-		end
-	end
-elseif artQW = 10:
-	menu_off = 1
-	'When you enter the room, you immediately notice the table: it has several lighted candles on it, and a bottle of wine with two glasses.'
-	'You look at Artem, slightly confused: "What''s the meaning of this, Artem?"'
-	'He smiles at you as he says: "Well, we''ve spent a lot of time studying together, and I think it''s obvious from your school results that it''s paying off. I figured it would be nice to celebrate your achievements!"'
-	'You''re still not sold on the idea, and question him further: "I don''t know... does your mother know about this? And where did you get that wine from?"'
-	'Artem reassures you: "Relax, <<$pcs_nickname>>... my mother went to see her friend, to give us some privacy. And she gave me that wine, to share with you! She''s very happy I met you, and picked this one herself. So please... let''s just sit down and chat?"'
-	'You relax a bit and nod at him: "Okay... I have to admit, that does sound nice."'
-	'You spend the next half hour talking about your plans after you finish school, with your good grades. The bottle of wine is empty before you know it, and you feel a bit tipsy.'
-	'Artem looks at you greedily, and when the conversation hits a break he suddenly moves in and kisses you. You kiss him back, but then Artem''s hands are tugging at your clothes, trying to take them off.'
-	minut += 30
-	if pcs_hydra >= 100:
-		pcs_hydra -= 5
-	else
-		pcs_hydra -= 10
-	end
-	gs 'drugs', 'alcohol', 'wine', 2
-	gs 'stat'
-
-	act 'Tell him to stop it':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
-		'You smile at him as you push his hands away: "Artem, wait! All in good time, okay? We''ll get there, just please... slow down a little."'
-		'Artem does as you ask and pulls his hands back as he apologizes: "Sorry..."'
-		'You finish the bottle of wine with Artem, and thank him for a nice time before you gather your things and leave.'
-		minut += 5
-		if artQW = 2:artQW = 4
-		if artQW = 3:artemtimes = 20
-		gs 'stat'
-
-		act 'Leave Artem''s apartment':gt 'artemhome','leave',5
-	end
-
-	act 'Enjoy his fondling':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/bj42.jpg"></center>'
-		'You keep kissing him, and uncover your breasts to give him better access. He happily plays with your <<$titsize>> boobs, and his touch excites you. Then again, maybe the wine also has something to do with that.'
-		'You smile at him and tell him to take off his pants, which he happily does.'
-		'You rub your hand over his foreskin for a second, before pulling it back and slowly spreading his precum out with your fingers. You then clasp your fingers around the head of his cock and slowly jerk him off. Maybe it''s because of the wine, but you feel giddy. You guide his cock to your mouth and suck him off enthusiastically.'
-		'Artem mutters: "<<$pcs_nickname>>... I want you..."'
-		gs 'arousal','bj',5
-		bja += 1
-		npc_sex[$boy] += 1
-		artQW = 20
-		gs 'stat'
-
-		act 'Let him fuck you':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/sex2.jpg"></center>'
-			'You quickly remove your clothes and lie down on your back, giving him your best ''come hither'' look.'
-			gs 'shortgs','undress'
-
-			gs 'dinsex','boy_puts_his_condom'
-			gs 'dinsex','vaginal_sex',10
-			gs 'dinsex','sexcum'
-			sexa += 1
-
-			if artemsex = 0:
-				artemsex = 1
-				'After he finishes, you run your hand over his chest and smile at him: "So, you''re a man now..."'
-				'Artem is not sure what to say, and mutters: "<<$pcs_nickname>>... I... I love you..."'
-				'You don''t say anything, but just cuddle with him for a while before getting dressed. You can tell it means a lot to him.'
-			else
-				'After he finishes, you don''t say anything, but just cuddle with him for a while before getting dressed.'
-			end
-			gs 'arousal','end'
-			gs 'shortgs','dress'
-			gs 'stat'
-
-			act 'Leave Artem''s apartment':gt 'artemhome','leave',15
-		end
-
-		act 'Continue to suck':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum48.jpg"></center>'
-			'You pick up the pace, redoubling your efforts on getting him to cum with your mouth while pretending you didn''t hear him.'
-			'You fondle yourself with your hand while you suck Artem''s cock, and you orgasm when he does. You do your best to swallow his sperm while you suppress your own spasms, and after a while you regain your senses and look into his eyes.'
-			'You smile at him: "Did you like it?"'
-			'Artem nods: "Oh yes, I liked it a lot! It''s not exactly what I had in mind, but this was even better... I''m so lucky to have met you!"'
-			gs 'arousal', 'bj', 5
-			$orgasm_or = 'yes'
-			gs 'arousal', 'masturbate', -5
-			gs 'cum_call','mouth',$boy,1
-			swallow += 1
-			gs 'arousal','end'
-			gs 'stat'
-
-			act 'Gather your things and leave':gt 'artemhome','leave',10
-		end
-	end
-end
-
---- artemev2 ---------------------------------
-

+ 37 - 7
locations/clothing.qsrc

@@ -119,7 +119,7 @@ if $ARGS[0] = 'view_clothing_list':
 		'<h3><center><b><font color="maroon">Choose an item to sell</font></b></center></h3>'
 	end
 
-	if $ARGS[2] = 'gm':
+	if $ARGS[2] = 'gm' or $ARGS[2] = 'gm_cheap' or $ARGS[2] = 'gm_office' or $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_uniform':
 		!'<center><b><font color="maroon">Viewing clothes from G&M</font></b></center>'
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
 	elseif $ARGS[2] = 'kats':
@@ -210,6 +210,18 @@ if $ARGS[0] = 'view_clothing_list':
 		end
 
 		if $ARGS[2] = 'gm':
+			if ARRSIZE('cheap') > 0:'<center><a href="exec:$ward_list_store = ''gm_cheap'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_cheap''">Regular G&M clothing</a></center>'
+
+			if ARRSIZE('office') > 0:'<center><a href="exec:$ward_list_store = ''gm_office'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_office''">Office wear</a></center>'
+
+			if ARRSIZE('school') > 0:'<center><a href="exec:$ward_list_store = ''gm_school'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_school''">School uniforms</a></center>'
+
+			if ARRSIZE('uniform') > 0:'<center><a href="exec:$ward_list_store = ''gm_uniform'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''gm_uniform''">Work uniforms</a></center>'
+
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+		end
+
+		if $ARGS[2] = 'gm_cheap':
 			$ward_list_store = $ARGS[2]
 
 			if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and schoolS[6] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! 6):*P dyneval($clothing_list_line, $ARGS[1], 'school', 6)
@@ -220,12 +232,24 @@ if $ARGS[0] = 'view_clothing_list':
 				i += 1
 			if i <= ARRSIZE('cheap'):jump 'loopcheap'
 
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+			gs 'clothing', 'clothwidth'
+		end
+
+		if $ARGS[2] = 'gm_office':
+			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopoffice
 				if office[i] = 1 and officeS[i] = cloc and ($clothingworntype ! 'office' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'office', i)
 				i += 1
 			if i <= ARRSIZE('office'):jump 'loopoffice'
 
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+			gs 'clothing', 'clothwidth'
+		end
+
+		if $ARGS[2] = 'gm_school':
+			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopschool
 				if school[i] = 1 and schoolS[i] = cloc and ($clothingworntype ! 'school' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'school', i)
@@ -233,18 +257,18 @@ if $ARGS[0] = 'view_clothing_list':
 				if i = 6: i = 7
 			if i <= ARRSIZE('school'):jump 'loopschool'
 
+			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
+			gs 'clothing', 'clothwidth'
+		end
+
+		if $ARGS[2] = 'gm_uniform':
+			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopuniform
 				if uniform[i] = 1 and uniformS[i] = cloc and ($clothingworntype ! 'uniform' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'uniform', i)
 				i += 1
 			if i <= ARRSIZE('uniform'):jump 'loopuniform'
 
-			i = 1
-			:loopswimwear
-				if swimwear[i] = 1 and swimwearS[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
-				i += 1
-			if i <= ARRSIZE('swimwear'):jump 'loopswimwear'
-
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
 		end
@@ -339,6 +363,12 @@ if $ARGS[0] = 'view_clothing_list':
 				i += 1
 			if i <= ARRSIZE('exercise'):jump 'loopexercise'
 
+			i = 1
+			:loopswimwear
+				if swimwear[i] = 1 and swimwearS[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
+				i += 1
+			if i <= ARRSIZE('swimwear'):jump 'loopswimwear'
+
 			act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 			gs 'clothing', 'clothwidth'
 		end

+ 58 - 0
locations/clothing_QV.qsrc

@@ -42,10 +42,26 @@ if $ARGS[0] = 'list':
 	if ARRSIZE('exercise') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
 	if $ARGS[1] = 'gm':
+		*clr & cla
+		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+		*nl
+
+		if ARRSIZE('cheap') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_cheap''">Regular G&M clothing</a></center>'
+
+		if ARRSIZE('office') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_office''">Office wear</a></center>'
+
+		if ARRSIZE('school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_school''">School uniforms</a></center>'
+
+		if ARRSIZE('uniform') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_uniform''">Work uniforms</a></center>'
+	end
+
+	if $ARGS[1] = 'gm_cheap':
 		$ward_list_store = $ARGS[1]
 		*clr & cla
 		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+		'<center>Regular G&M clothing</center>'
 		*nl
 		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
 		*nl
@@ -69,6 +85,20 @@ if $ARGS[0] = 'list':
 		i += 1
 		if i <= ARRSIZE('cheap'):jump 'loopcheap'
 
+		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
+	end
+
+	if $ARGS[1] = 'gm_office':
+		$ward_list_store = $ARGS[1]
+		*clr & cla
+		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+		'<center>Office wear</center>'
+		*nl
+		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
+		*nl
+		'<center>These are the clothes that are currently available for you to wear.</center><br>'
+		*nl
 		i = 1
 		:loopoffice
 		if office[i] = 1:
@@ -80,6 +110,20 @@ if $ARGS[0] = 'list':
 		i += 1
 		if i <= ARRSIZE('office'):jump 'loopoffice'
 
+		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
+	end
+
+	if $ARGS[1] = 'gm_school':
+		$ward_list_store = $ARGS[1]
+		*clr & cla
+		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+		'<center>School uniforms</center>'
+		*nl
+		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
+		*nl
+		'<center>These are the clothes that are currently available for you to wear.</center><br>'
+		*nl
 		i = 1
 		:loopschool
 		if school[i] = 1:
@@ -92,6 +136,20 @@ if $ARGS[0] = 'list':
 		if i = 6: i = 7
 		if i <= ARRSIZE('school'):jump 'loopschool'
 
+		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
+	end
+
+	if $ARGS[1] = 'gm_uniform':
+		$ward_list_store = $ARGS[1]
+		*clr & cla
+		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
+		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+		'<center>Work uniforms</center>'
+		*nl
+		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
+		*nl
+		'<center>These are the clothes that are currently available for you to wear.</center><br>'
+		*nl
 		i = 1
 		:loopuniform
 		if uniform[i] = 1:

+ 13 - 0
locations/dachamy.qsrc

@@ -19,6 +19,19 @@ act 'Exit the alley':minut += 15 & gt 'dachi'
 
 act 'Go into the house':gt 'dachain'
 
+if sunWeather = 1:
+	if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):
+		if $clothingworntype = 'exercise':
+			*nl
+			'You can do some exercises here.'
+			act 'Exercise': gt 'exercise', 'workout'
+		else
+			*nl
+			'You could do some exercises here if you were wearing exercise clothes.'
+		end
+	end
+end
+
 if hour < 23 and hour >= 7:
 	act 'Inspect garden':
 		cla

+ 5 - 0
locations/dachi.qsrc

@@ -25,6 +25,11 @@ act 'Go to the highway':minut += 15 & nroad = 5 & gt 'road'
 if home_owned[3] > 0:
 	'Enter <a href="exec:gt ''dachamy'', ''start''">your yard</a>.'
 	'Across the street from your cottage is another <a href="exec:gt ''etoexhib'', ''pos8''">cottage</a> almost identical to yours.'
+	if hour = meethour:
+		if svidanie[0] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 0 & gt ''lover_meet'',''start''"><<$loverdesc[0]>></a></b>'
+		if svidanie[1] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 1 & gt ''lover_meet'',''start''"><<$loverdesc[1]>></a></b>'
+		if svidanie[2] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 2 & gt ''lover_meet'',''start''"><<$loverdesc[2]>></a></b>'
+	end
 end
 
 if etoexhib < 13:'You feel a slight presence of magic.'

+ 1 - 0
locations/dimalina.qsrc

@@ -957,6 +957,7 @@ if $ARGS[0] = 'walklina':
 			'She cries and then turns, running with all her strength and leaving you far behind.'
 			if pcs_mood > 10: pcs_mood -= 10
 			gs 'stat'
+			act 'Leave': gt 'pavResidential'
 		elseif npc_rel['A19'] < 50:
 			'Lina begins to walk towards her home. Her parent''s apartment is in the same complex as yours. As you catch up to her, she stops and gives you a questioning gaze.'
 			'"Let''s go home Lina."'

+ 2 - 2
locations/fight_npcdata.qsrc

@@ -332,9 +332,9 @@ if $args[0] = 'ganggirl':
 	dynamic $setNPCFightStats, 'kick', rand(5,15)
 	dynamic $setNPCFightStats, 'punch', rand(5,15)
 	dynamic $setNPCFightStats, 'jab', rand(5,15)
-	dynamic $setNPCFightStats, 'stren', rand(25,35)
+	dynamic $setNPCFightStats, 'stren', rand(15,30)
 	dynamic $setNPCFightStats, 'agil', rand(25,35)
-	dynamic $setNPCFightStats, 'vital', rand(45,55)
+	dynamic $setNPCFightStats, 'vital', rand(25,35)
 	dynamic $setNPCFightStats, 'react', rand(25,35)
 	dynamic $setNPCFightStats, 'willpwr', 50
 	dynamic $setNPCFightStats, 'shoot', rand(25,35)

+ 2 - 1
locations/gdksport.qsrc

@@ -77,7 +77,7 @@ if $ARGS[0] = 'start':
 
 	gs 'wardrobe', 'sports_outfit'
 
-	if shampoo > 0:
+	if shampoo > 0 or (StoryLine = 1 and (SchoolAtestat = 0 or SchoolBlock = 0)):
 		act 'Take a shower': gt 'gdksport', 'shower'
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
@@ -955,6 +955,7 @@ if $ARGS[0] = 'shower':
 	menu_off = 1
 	*clr & cla
 	$location_type = 'bathroom'
+	if StoryLine = 1 and (SchoolAtestat = 0 or SchoolBlock = 0): noShampoo = 1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1

+ 3 - 5
locations/gschool_lessons4.qsrc

@@ -1203,11 +1203,7 @@ if $ARGS[0] = 'postphys2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
 	'You enter the girls locker room and find several other girls already inside, undressing, changing, heading for or returning from the showers, or simply chatting with each other. You ignore the young women in various states of undress around you, find your locker, and start to take off your clothes.'
 	gs 'gschool_gossip', 'gym'
-	if shampoo > 0:
-		act 'Have a shower':gt 'gschool_lessons4', 'shower'
-	else
-		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
-	end
+	act 'Have a shower':gt 'gschool_lessons4', 'shower'
 	act 'Get dressed': gt 'gschool_lessons4', 'dress'
 end
 
@@ -1225,6 +1221,8 @@ end
 if $ARGS[0] = 'shower2':
 	*clr & cla
 	menu_off = 1
+	!!to offset the use of shampoo in $showerdin
+	shampoo += 1
 	dynamic $showerdin
 	gs 'stat'
 	gymshower = rand(1,6)

+ 1 - 1
locations/lug.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'start':
 				cla
 				gs'boyfrend', 'start'
 				stopboy = 0
-				'<<$loverdesc[lover_number]>> thanks you and leaves.'
+				'<<$boydesc>> thanks you and leaves.'
 				act 'Complete outing':gt'lug', 'start'
 			end
 		end

+ 1 - 1
locations/nordtrain.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'outside':
 	*clr & cla
 	gs'stat'
 	'<center><B>Railway station</B></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalg.jpg"></center>'
 
 	if car > 0 and cardrive = 19:
 		cardrive = 19

+ 2 - 2
locations/pavComplex.qsrc

@@ -6,9 +6,9 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	CLOSE ALL
 	$metka = 'start'
-	$loc = 'pavcomplex'
+	$loc = 'pavComplex'
 	$metkaStreet = 'start'
-	$locStreet = 'pavcomplex'
+	$locStreet = 'pavComplex'
 	$location_type = 'public_outdoors'
 
 	if sound = 0:

+ 7 - 7
locations/pavtrain.qsrc

@@ -20,7 +20,7 @@ end
 clr
 gs 'stat'
 '<center><h2>Pavlovsk''s train station</h2></center>'
-'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalg.jpg"></center>'
 *nl
 'Pavlovsk''s modest train station. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pavtrainhall''">train station</a>. Attached to the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(storyline = 1,' where your mother works','') + '. Also nearby is the small <a href="exec:minut += 3 & gt ''pavstation'', ''station_outside''">police station</a> of Pavlovsk. '
 *nl
@@ -39,7 +39,7 @@ if kidaloa = 0:
 		monthKidalo = month
 		gs 'stat'
 		'<center><h4>Pavlovsk''s train station</h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalg.jpg"></center>'
 		'When you arrive at the train station, it''s impossible to not notice a girl holding a microphone and a man following her with a large camera. They''re coming straight towards you. The girl beckons you to come closer and glances over at towards the man holding the camera, who gives her a subtle nod.'
 		'She turns back to you and happily exclaims: "Hello! We''re shooting a pilot for TV. It''s going to be a novel program: it is a show in which we hand out gifts to random strangers, and then film their response. It''s called "Happiness in Russia", we''re hoping it will catch on all over the world. We have chosen you to be part of our pilot, congratulations!"'
 		'She grabs hold of a large box the camera man handed to her. It''s beautifully wrapped, with a nice bow to boot. She whispers to you: "This box contains a brand new laptop! Just act surprised when you open it!"'
@@ -49,7 +49,7 @@ if kidaloa = 0:
 			gs 'stat'
 			kidaloa = 1
 			'<center><h4>Pavlovsk''s train station</h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalg.jpg"></center>'
 			'Even though you definitely wouldn''t mind a new laptop, you simply don''t have time to talk to them right now. You politely decline and walk away before they can protest. A few minutes later you see the two of them hastily running across the square, while some poor guy opens the fancily packed box only to find a brick in it. By the time he realizes he got scammed, they are long gone. Looks like you dodged a bullet there!'
 			
 			act 'Return to the station' :minut += 15 & gt $curloc
@@ -59,7 +59,7 @@ if kidaloa = 0:
 			*clr & cla
 			gs 'stat'
 			'<center><h4>Pavlovsk''s train station</h4></center>'
-			'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalg.jpg"></center>'
 			'You happily take the box from the girl''s hands as the man starts filming. The girl holds the microphone closer to her mouth, and invites you to give some shout-outs to relatives and friends while you''re on TV. Then she points the microphone at you. You gladly accept the invitation and address your friends and family enthusiastically while looking at the camera, sincerely hoping you did not leave anyone out. Then the man turns the camera away for a second.'
 			'The girl tells you: "Unfortunately, the government doesn''t just let us give away items for nothing. We''re legally obligated to have our winners pay VAT over the amount of money their gift is worth. In your case, this comes down to 5000 <b>₽</b>."'
 
@@ -70,7 +70,7 @@ if kidaloa = 0:
 				if pcs_mood > 5: pcs_mood = 5
 				gs 'stat'
 				'<center><h4>Pavlovsk''s train station</h4></center>'
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalg.jpg"></center>'
 				'You quickly give them the money and enthusiastically begin to pull at the bow. When you finally manage to tear the wrapping paper off and open the box, you only find a brick wrapped in newspaper. You look up trying to find the man and girl to get your money back, but they are nowhere to be found. You feel terrible for being scammed out of your money, and angrily stuff the box in a garbage can before you move on.'
 				
 				act 'Return to the train station':minut += 15 & gt $curloc
@@ -79,7 +79,7 @@ if kidaloa = 0:
 				*clr & cla
 				gs 'stat'
 				'<center><h4>Pavlovsk''s train station</h4></center>'
-				'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalg.jpg"></center>'
 				'With some regret in your voice, you apologize to the man and girl and explain that you can''t afford to pay the VAT right now. They try to explain to you that this could very well be a one-time opportunity and that you are missing out on a free laptop, but you have to decline. You simply cannot afford to spend the money you have right now on a frivolous purchase like a laptop, even if it comes really cheap.'
 				'Sympathizing with you, they promise to look for you if they ever come back to Pavlovsk for another episode of the show.'
 				
@@ -99,7 +99,7 @@ if kidalob = 0:
 		minut += 5
 		gs 'stat'
 		'<center><h4>Pavlovsk''s train station</h4></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/shared/trainstation/vokzal.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalg.jpg"></center>'
 		'As you walk across the square towards the station, you notice two well dressed men staring at you. After some brief consideration they come towards you, and you can just about hear what they''re saying: "Wow, she''s just the model we need. She has this... Claudia Schiffer feel to her, don''t you agree?"'
 		'You can see the other man nod just as they get close to you, and one of the men stops you: "Excuse me, miss. We are opening a new fashion store in the city and are looking for a model to feature in our advertisements. We have been looking for just the right girl all day and... I think we just found her!"'
 		'The second man nods enthusiastically as the first man continues: "We would be able to offer you 10.000 <b>₽</b> for an extensive photo shoot, featuring our clothing line."'

+ 1 - 1
locations/pod_ezd.qsrc

@@ -383,7 +383,7 @@ if $ARGS[0] = 'floor2_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/event/mishasmoke.jpg"></center>'
 		'Uncle Misha is currently outside his apartment, smoking a cigarette. His name is Mikhail, though everyone calls him uncle Misha. He lives in the other apartment on the same floor as yours. Your mother always forbade you to talk to him, warning you that he used to be a local crime lord, and that you shouldn''t get involved with him. However, he has always been polite and nice to you.'
-		if (PCloStyle = 4 and pav_slut >= 75) or dyadyamishaevent >= 1 or sh_hooker_count > 0:
+		if (PCloStyle = 4 and pav_slut >= 75) or dyadyamishaevent >= 1 or CloStyle2 = 3:
 			if rand(0,1) = 1:
 				'You have a chat with uncle Misha, as he smokes his cigarette. You can tell he''s undressing you in his mind, but in a way you find it kind of flattering. As he stubs out his cigarette and puffs away the last bits of smoke, he asks:'
 				'"Say, <<$pcs_nickname>>, would you like to make an old man feel good? I could use a quick blowjob... there''ll be 100 <b>₽</b> in it for you, for your troubles."'

+ 26 - 20
locations/pornfilm.qsrc

@@ -1563,27 +1563,13 @@ if $ARGS[0] = '15':
 					gs 'stat'
 
 					if orgasm_buildup => 200 - pcs_inhib:
-						if orgasm_buildup < 300 - pcs_inhib:gs 'willpower', 'exhib', 'self', 'hard'
-						if will_cost <= pcs_willpwr or orgasm_buildup => 300 - pcs_inhib:
-							act if(orgasm_buildup < 300 - pcs_inhib, 'Block out everything but the pleasure and let yourself orgasm (<<will_cost>> Willpower)', 'Orgasm'):
+						gs 'willpower', 'exhib', 'self', 'hard'
+						if orgasm_buildup => 300 - pcs_inhib:
+							act 'Orgasm': gs 'pornfilm', '15b'
+						elseif will_cost <= pcs_willpwr:
+							act 'Block out everything but the pleasure and let yourself orgasm (<<will_cost>> Willpower)':
 								gs 'willpower', 'pay', 'self'
-								*clr & cla
-								sexpartkno = 1
-								orgasmbonus += 10
-								porngasm += 1
-								cumnostd = 1
-								gs 'cum_call', 'anus', $pakterID[1], 1, 0, 10000, 40
-
-								'<center><video autoplay loop src="images/locations/city/citycenter/studio/sex/porncpanal.mp4" width="400"></video></center>'
-								'You are really getting into it and reach your orgasm. Your ass tightens around <<$pakter[1]>>, which sends him over the edge. You feel your bowels being flooded with warm cum.'
-								'<<$pakter[1]>> pulls out of your ass and you show your gaping hole to the camera as it leaks his load.'
-								$orgasm_or = 'yes'
-								gs 'arousal', 'anal', 5, 'exhibitionism'
-								gs 'arousal', 'end'
-								gs 'stat'
-
-								act 'Take a shower': gt 'pornstudio', 'shower'
-								act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
+								gs 'pornfilm', '15b'
 							end
 						else
 							act 'Block out everything but the pleasure and let yourself orgasm (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1617,6 +1603,26 @@ if $ARGS[0] = '15a':
 	end
 end
 
+if $ARGS[0] = '15b':
+	*clr & cla
+	sexpartkno = 1
+	orgasmbonus += 10
+	porngasm += 1
+	cumnostd = 1
+	gs 'cum_call', 'anus', $pakterID[1], 1, 0, 10000, 40
+
+	'<center><video autoplay loop src="images/locations/city/citycenter/studio/sex/porncpanal.mp4" width="400"></video></center>'
+	'You are really getting into it and reach your orgasm. Your ass tightens around <<$pakter[1]>>, which sends him over the edge. You feel your bowels being flooded with warm cum.'
+	'<<$pakter[1]>> pulls out of your ass and you show your gaping hole to the camera as it leaks his load.'
+	$orgasm_or = 'yes'
+	gs 'arousal', 'anal', 5, 'exhibitionism'
+	gs 'arousal', 'end'
+	gs 'stat'
+
+	act 'Take a shower': gt 'pornstudio', 'shower'
+	act 'Don''t bother to clean up': gt 'pornstudio', 'postvideo'
+end
+
 if $ARGS[0] = '16':
 	if rand(0,2)=0:pornhj += 1
 	if rand(0,2)=0:pornbj += 1

+ 4 - 4
locations/spellList.qsrc

@@ -54,21 +54,21 @@ $spellName['regenerate'] = 'Regenerate'
 $spellDesc['regenerate'] = 'Slowly regain health over time.'
 $spellTarget['regenerate'] = 'self'
 !curedisease
-spellMana['curedisease'] = 10000
+spellMana['curedisease'] = 1000
 spellTime['curedisease'] = 30
 spellDiff['curedisease'] = 25
 $spellName['curedisease'] = 'Cure Disease'
 $spellDesc['curedisease'] = 'Your body will burn itself free of any diseases you may have.'
 $spellTarget['teleport'] = 'self'
 !curewounds
-spellMana['curewounds'] = 10000
+spellMana['curewounds'] = 1000
 spellTime['curewounds'] = 30
 spellDiff['curewounds'] = 25
 $spellName['curewounds'] = 'Cure Wounds'
 $spellDesc['curewounds'] = 'You feel your bodys wounds begin to heal.'
 $spellTarget['curewounds'] = 'team'
 !curewounds2
-spellMana['curewounds2'] = 100000
+spellMana['curewounds2'] = 10000
 spellTime['curewounds2'] = 60
 spellDiff['curewounds2'] = 75
 $spellName['curewounds2'] = 'Greater Cure Wounds'
@@ -145,7 +145,7 @@ else
 	killvar 'i'
 end
 !cosmetica
-spellMana['cosmetica'] = 10000
+spellMana['cosmetica'] = 1000
 spellTime['cosmetica'] = 5
 spellDiff['cosmetica'] = 50
 $spellName['cosmetica'] = 'Cosmetica'