locations/ender.qsrc

@@ -110,7 +110,11 @@ if $ARGS[0] = 'loss':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Crawl out of the pool':gt'street'
+		act 'Dress and escape from the gym':
+			gs 'underwear', 'wear'
+			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+			gt'street'
+		end
 		exit
 	elseif fightEnding = 8:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -320,9 +324,13 @@ if $ARGS[0] = 'win':
 		if rikudo > 10:rikudo = rikudo + 3000
 		money = money + 5000
 
-		'You killed Kisame and while disposing his body you found 5000 rubles.'
+		'You killed Kisame and while disposing his body you found 5000 rubles. It''s probably best not to hang around.'
 
-		act 'Further':gt'street'
+		act 'Dress and leave':
+			gs 'underwear', 'wear'
+			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+			gt'street'
+		end
 		exit
 	elseif fightEnding = 8 or fightEnding = 9:
 		if succubusQW >= 4 and scpopt < 2:
@@ -380,6 +388,7 @@ if $ARGS[0] = 'win':
 		lariskaQwestStart = daystart + 7
 		Win += 1
 		fightEnding = 0
+		'<center><img src="images/characters/pavlovsk/school/girl/christina/school/win.jpg"></center>'
 
 		$npc_notes['A13'] = 'Lariska, who is very dependent on other people''s opinions. After you managed to win the fight against Christina Lariska looks more cheerful. She''s a good volleyball player, and could go pro if she keeps it up even though she doesn''t believe it herself. But with the help of Mikhail Nikolayevich, the volleyball coach, she might make it.'
 
@@ -541,7 +550,11 @@ if $ARGS[0] = 'surrender':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		act 'Crawl out of the pool':gt'street'
+		act 'Dress and flee the gym':
+			gs 'underwear', 'wear'
+			gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+			gt'street'
+		end
 		exit
 	elseif fightEnding = 8:
 		if pcs_health < 100: pcs_health = 100

locations/gschool_break.qsrc

@@ -227,7 +227,6 @@ if $ARGS[0] = 'girls_restroom_events':
 					'You shake your head. "What? No I''m not going to eat your pussy."'
 					'She takes a step towards you. "You better, if you know what''s good for you."'
 					'You know these gopnik girls are dangerous, most of them like to fight for fun and many of them carry knives. Not sure how serious she is about this, you know that you are far enough away that you can just dash out of the restroom, but she might come after you later, or you could do what she says and lick her pussy.'
-					act 'Submit': gt 'gschool_break', 'lena_dom'
 !!ToDo: Add in a option to fight once we revamp fighting (nutluck)
 					gs 'willpower', 'cuni', 'resist', 'easy'
 					if will_cost <= pcs_willpwr:
@@ -242,6 +241,7 @@ if $ARGS[0] = 'girls_restroom_events':
 					else
 						act 'Make a run for it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
+					act 'Submit': gt 'gschool_break', 'lena_dom'
 				end
 			else
 				act 'Tell her no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

locations/gschool_events.qsrc

@@ -655,7 +655,7 @@ if $ARGS[0] = 'break_events':
 			grupvalue[2] -= 2
 			grupvalue[3] += 3
 			grupvalue[4] -= 5
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big32.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big149.jpg"></center>'
 			'You look away from Lazar and then keep walking, ignoring what just happened.'
 			gs 'gschool_events', 'leave_break_events'
 		end
@@ -775,7 +775,7 @@ if $ARGS[0] = 'break_events':
 			grupvalue[2] -= 2
 			grupvalue[3] += 3
 			grupvalue[4] -= 5
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big42.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big157.jpg"></center>'
 			'You look away from him and then keep walking, ignoring what just happened.'
 			gs 'gschool_events', 'leave_break_events'
 		end

locations/gschool_grounds.qsrc

@@ -454,6 +454,7 @@ if $ARGS[0] = 'KristinaFight':
 	gs 'stat'
 
 	zverRageQW = 2
+	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/christina/school/fight.mp4"></video></center>'
 	'As you cross the school yard after school, you are surprised by a powerful kick in your back. You fall to your hands and knees and rub your sore back for a second, before you turn around and see Christina Zvereva, her face contorted with rage. She yells at you, "You fucking bitch! How dare you spread shit about me like that? I''ll break your fucking face!"'
 !! Fightcheck
 	act 'fight':

locations/gschool_lessons.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'morning':
 	end
 end
 
-if $ARGS[2] = 'uniform_check':
+if $ARGS[0] = 'uniform_check':
 	if PCloInhibit <= 10:
 		grupvalue[3] += 1
 		grupvalue[5] += 1

locations/kuhrPar.qsrc

@@ -29,18 +29,105 @@ gs 'themes', 'indoors'
 '<center><b><font color="maroon">Kitchen</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/kuhrpar.jpg"></center>'
 if hour = 7 and indorf = 0:
-	*nl '<a href="exec:gt''father''">Your stepfather</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating Breakfast. <a href="exec:gt''mother''">Your mother</a> is hard at work to make sure everybody has enough to eat for the rest of the day.'
-	if week <= 5: *P ' <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is trying to lose some weight so she is only having a very light breakfast.'
+!!tweaking this so there is two versions for when Anya is there during the week and the weekend when she is not there. Needs code for each. Anya sleeps in on the weekends from hanging out drinking with friends.
+	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. You could sit down and join them for breakfast or just grab something and go.'
+elseif 
+!!this is the weekend version of the above.
+	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating breakfast. It seems your sister is sleeping in again. You could sit down and join them for breakfast or just grab something and go.'
+elseif hour = 7 and indorf = 0:
+!!this is for dinner need the hours changed to fit dinner time.
+	'<a href="exec:gt''father''">Your stepfather</a>, <a href="exec:gt''mother''">mother</a>, <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> and <a href="exec:gt ''brother'', ''start''">Kolka</a> are sitting at the table eating dinner. You could sit down and join them for dinner or just grab something and go.'
 else
-	'The kitchen is not very impressive, but it has everything your family needs. Since everyone has the habit of eating at different times, <<$npc_nickname[''A29'']>> usually pre-cooks the meals and stores them in the fridge. Of course, you could also just have a snack if you''re not that hungry.'
+	'The kitchen is not very impressive, but it has everything your family needs. Since everyone can''t always join for family meals, <<$npc_nickname[''A29'']>> usually pre-cooks some meals and stores them in the fridge, to be handy for later. Of course, you could also just have a snack if you''re not that hungry.'
 end
 gs 'family'
 
-act 'Eat a full meal (0:30)':gs 'food', 'm_meal'
-
-act 'Eat a light meal (0:25)':gs 'food', 's_meal'
+if hour = 7 and breakfast_day ! daystart: 
+!!shouldn''t this be all week aka all 7 days?
+	act 'Eat breakfast with your family (0:20)': 
+		*clr & cla
+		frost = 0
+		minut += 20
+		pcs_health += 10
+		pcs_mood += 10
+		fat += 6
+		pcs_energy += 60
+		if pcs_hydra >= 100:
+			pcs_hydra += 30
+		else
+			pcs_hydra += 60
+		end
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		pcs_breath = 0
+		npc_rel['A29'] += 1
+		breakfast_day = daystart
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/shared/food/breakfast_'+rand(0,1)+'.jpg"></center>'
+		'As you sit down and join your family for breakfast, you step father asks. "How are you doing in school <<$pcs_nickname>>?"'
+		if pcs_grades >= 80:
+			'You smile to him. "Really great, actually we was just learning something interesting the other day." You go on to talk about some of the stuff you have learned recently in school. He just nods, while you mother gives you a proud smile, Kolka just rolls his eyes.'
+			'The rest of breakfast is taken up with some small talk about what everyone has been up to of late, You thoroughly enjoy your breakfast with your family.'
+		else
+			'You glance to him. "Um ok, I guess." You notice your mother frowning at you, so you quickly try to change the subject but they won''t let you. You do your best to make them think you are doing better than you are but neither seem to have bought it. Meanwhile Kolka snickers at you getting grilled.'
+			'The rest of breakfast is taken up with talk about how Kolka is doing in school whom seems to be doing better than you and is showered in praise from your mother and step father. The food is good even if the conversation wasn''t the best, you quickly finish your meal.'
+		act 'Get up from the table': gt $loc, $metka
+	end
+else
+	act 'Eat a full meal (0:30)':gs 'food', 'm_meal'
+	act 'Eat a light meal (0:25)':gs 'food', 's_meal'
+	act 'Have a snack (0:15)':gs 'food', 'snack'
+end
 
-act 'Have a snack (0:15)':gs 'food', 'snack'
+if hour = 18 and minut <= 30 and dinner_day ! daystart: 
+!!this is a copy and paste of the breakfast the code needs to be changed to dinner time the whole week.
+	act 'Eat dinner with your family (0:20)': 
+		*clr & cla
+		frost = 0
+		minut += 20
+		pcs_health += 10
+		pcs_mood += 10
+		fat += 6
+		pcs_energy += 60
+		if pcs_hydra >= 100:
+			pcs_hydra += 30
+		else
+			pcs_hydra += 60
+		end
+		cumspclnt = 2
+		gs 'cum_cleanup'
+		pcs_breath = 0
+		npc_rel['A29'] += 1
+		dinner_day = daystart
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/dinnerhome.jpg"></center>'
+		'As you sit down and join your family for dinner, you step father asks. "So <<$pcs_nickname>> do you have a boyfriend yet?"'
+		if pav_slut > 75 and motherKnowSpravka = 0:
+!!and mother doesn''t know Sveta is a slut
+			'You start to respond to him, when your mother interrupts. "Of course not, she is still too young to be thinking about boys."'
+			'Then Kolka adds under his breath. "Like any boy would date her, when she sucks them all off anyways."'
+			'You mother turns towards Kolka. "That''s not funny apologize to your sister right now, right now!" Anya just smirks at that.'
+			'Kolka freezes in place, seeing that she is pissed he decides he doesn''t want to be the one to tell her about your reputation and says. "Sorry."'
+			'Your step father clears his throat and quickly changes the subject talking about how his work went. After that you have a fairly enjoyable dinner.'
+		elseif pav_slut > 75:
+!!and mother knows Sveta is a slut
+			'You start to respond to him, when your mother interrupts. "She is two young to worry about that and ... we talked about it." She gives you a meaningful glance and you shut your mouth.'
+			'Then Kolka adds under his breath. "Like any boy would date her, when she sucks them all off anyways."'
+			'You mother turns towards Kolka. "That''s not funny." Then she glances at you for a moment. "She might have made some mistakes but she is trying to be a better girl now. Now apologize to your sister right now, right now!" Anya just smirks at that.'
+			'Kolka freezes in place. "Sorry."'
+			'Your step father clears his throat and quickly changes the subject talking about how his work went. After that you have a fairly enjoyable dinner.'
+		else
+			'You start to respond to him, when your mother interrupts. "Of course not, she is still to young to be thinking about boys."'
+			'Your step father sighs a little. "She is old enough to start dating dear."'
+			'You mother gives him a hard look. "No she isn''t she needs to focus on school and then going to the University before she can start thinking about boys."'
+			'You step father decides to drop it and start talking about some of the stuff that happened at his work. All and all you have a fairly enjoyable dinner.'
+		act 'Get up from the table': gt $loc, $metka
+	end
+else
+	act 'Eat a full meal (0:30)':gs 'food', 'm_meal'
+	act 'Eat a light meal (0:25)':gs 'food', 's_meal'
+	act 'Have a snack (0:15)':gs 'food', 'snack'
+end
 
 dynamic $sandwich
 dynamic $driwater

locations/nastja.qsrc

@@ -400,7 +400,7 @@ if $ARGS[0] = 'pos17':
 	*clr
 	minut += 60
 	pcs_mood += 50
-	if PCloExhibit + 10 > pcs_inhib: pcs_inhib += 1
+	if PCloInhibit + 10 > pcs_inhib: pcs_inhib += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/anastasia/2bimbos.jpg"></center>'
 	'You have a great time on the beach: You swim and play around in the water, you sunbathe, reading, chatting or snoozing as you do, drink milkshakes that Nastya brought along from home and take a couple of photos with the lake in the background. It is a thoroughly enjoyable, exhausting time and you are starting to wonder if you shouldn''t go home soon when Nastya speaks up.'

locations/npcstatic1.qsrc

@@ -366,6 +366,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 23
 hotcat_rating['A<<npctemp>>'] = 7
+npc_body[n] = 's5'
 
 
 npctemp = 13
@@ -391,6 +392,7 @@ npc_sexskill['A<<npctemp>>'] = 2
 npc_hymen['A<<npctemp>>'] = 4
 npc_bust['A<<npctemp>>'] = 8
 hotcat_rating['A<<npctemp>>'] = 6
+npc_body[n] = 'l2'
 
 
 npctemp = 14
@@ -412,6 +414,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 7
+npc_body[n] = 's3'
 
 
 npctemp = 15
@@ -434,6 +437,7 @@ $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 18
 $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''viktoria''"><<$npc_usedname[''A15'']>></a>'
 hotcat_rating['A<<npctemp>>'] = 7
+npc_body[n] = 's3'
 
 
 npctemp = 16
@@ -455,6 +459,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 26
 hotcat_rating['A<<npctemp>>'] = 6
+npc_body[n] = 'm3'
 
 
 npctemp = 17
@@ -476,6 +481,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 34
 hotcat_rating['A<<npctemp>>'] = 9
+npc_body[n] = 'm3'
 
 
 npctemp = 18
@@ -507,6 +513,7 @@ else
 	gs 'npcstaticdefaults', 'group', 'jock'
 end
 hotcat_rating['A<<npctemp>>'] = 7
+npc_body[n] = 'l3'
 
 
 npctemp = 19
@@ -528,6 +535,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 14
 hotcat_rating['A<<npctemp>>'] = 7
+npc_body[n] = 'l1'
 
 
 npctemp = 20
@@ -549,6 +557,7 @@ npc_sexskill['A<<npctemp>>'] = 2
 npc_hymen['A<<npctemp>>'] = 5
 npc_bust['A<<npctemp>>'] = 22
 hotcat_rating['A<<npctemp>>'] = 6
+npc_body[n] = 'l1'
 
 
 npctemp = 21
@@ -572,6 +581,7 @@ npc_bust['A<<npctemp>>'] = 18
 $npc_dad['A<<npctemp>>'] = 'A26'
 $npc_mom['A<<npctemp>>'] = 'A27'
 hotcat_rating['A<<npctemp>>'] = 6
+npc_body[n] = 'm4'
 
 
 npctemp = 22
@@ -584,11 +594,12 @@ $npc_notes['A<<npctemp>>'] = 'Bella Artamonov is a beautiful girl that is really
 npc_dob['A<<npctemp>>'] = 19990422
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
-gs 'npcstaticdefaults', 'group', 'jock'
+gs 'npcstaticdefaults', 'group', 'coolkid'
 $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 27
 hotcat_rating['A<<npctemp>>'] = 9
+npc_body[n] = 'm4'
 
 
 npctemp = 23
@@ -601,13 +612,14 @@ $npc_notes['A<<npctemp>>'] = 'Albina Barlovskaya comes from a wealthy family. Sh
 npc_dob['A<<npctemp>>'] = 19990502
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
-gs 'npcstaticdefaults', 'group', 'coolkid'
+gs 'npcstaticdefaults', 'group', 'jock'
 $npc_firstpart['A<<npctemp>>'] = 'A118'
 npc_sexskill['A<<npctemp>>'] = 2
 npc_hymen['A<<npctemp>>'] = 6
 npc_bust['A<<npctemp>>'] = 14
 $npc_dad['A<<npctemp>>'] = 'A117'
 hotcat_rating['A<<npctemp>>'] = 8
+npc_body[n] = 'l2'
 
 
 npctemp = 24
@@ -625,6 +637,7 @@ npc_sexskill['A<<npctemp>>'] = 1
 npc_hymen['A<<npctemp>>'] = 4
 npc_bust['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 5
+npc_body[n] = 'l2'
 
 
 npctemp = 25
@@ -651,6 +664,7 @@ else
 	gs 'npcstaticdefaults', 'group', 'coolkid'
 end
 hotcat_rating['A<<npctemp>>'] = 6
+npc_body[n] = 'm2'
 
 
 npctemp = 26

locations/npcstatic3.qsrc

@@ -470,6 +470,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 22
 hotcat_rating['A<<npctemp>>'] = 6
+npc_body[n] = 's3'
 
 
 npctemp = 140
@@ -486,6 +487,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 13
 hotcat_rating['A<<npctemp>>'] = 7
+npc_body[n] = 's2'
 
 
 npctemp = 141
@@ -502,6 +504,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 7
+npc_body[n] = 'm2'
 
 
 npctemp = 142
@@ -518,6 +521,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 13
 hotcat_rating['A<<npctemp>>'] = 5
+npc_body[n] = 's4'
 
 
 npctemp = 143
@@ -532,6 +536,7 @@ gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'gopnik'
 npc_bust['A<<npctemp>>'] = 7
 hotcat_rating['A<<npctemp>>'] = 6
+npc_body[n] = 'm1'
 
 
 npctemp = 144
@@ -548,6 +553,7 @@ $npc_firstpart['A<<npctemp>>'] = 'V'
 $npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 24
 hotcat_rating['A<<npctemp>>'] = 8
+npc_body[n] = 'l3'
 
 
 npctemp = 145
@@ -562,6 +568,7 @@ gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'gopnik'
 npc_bust['A<<npctemp>>'] = 31
 hotcat_rating['A<<npctemp>>'] = 4
+npc_body[n] = 'l4'
 
 
 npctemp = 146

locations/preSYS2.qsrc

@@ -450,7 +450,7 @@ if $ARGS[0] = 'modskl_spo':
 	gs 'preSYS2', 'modrel_setup2', 'pcs_def', 'Defence'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_run', 'Running'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_vball', 'Volleyball'
-	gs 'preSYS2', 'modrel_setup2', 'pcs_ftball', 'Football'
+	gs 'preSYS2', 'modrel_setup2', 'pcs_ftbll', 'Football'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_wrstlng', 'Wrestling'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_shoot', 'Marskmanship'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_bushcraft', 'Bushcraft'
@@ -489,7 +489,7 @@ if $ARGS[0] = 'modskl_art':
 	gs 'preSYS2', 'modrel_setup2', 'pcs_vokal', 'Singing'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_instrmusic', 'Instrumental Music'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_photoskl', 'Photography'
-	gs 'preSYS2', 'modrel_setup2', 'pcs_artskl', 'Artistic Skills'
+	gs 'preSYS2', 'modrel_setup2', 'pcs_artskls', 'Artistic Skills'
 	gs 'preSYS2', 'modrel_setup2', 'pcs_perform', 'Performance'
 	'</table></center>'
 	nl
@@ -541,7 +541,7 @@ if $ARGS[0] = 'none':
 	pcs_def = 0
 	pcs_run = 0
 	pcs_vball = 0
-	pcs_ftball = 0
+	pcs_ftbll = 0
 	pcs_wrstlng = 0
 	pcs_shoot = 0
 	pcs_bushcraft = 0
@@ -560,7 +560,7 @@ if $ARGS[0] = 'none':
 	pcs_vokal = 0
 	pcs_instrmusic = 0
 	pcs_photoskl = 0
-	pcs_artskl = 0
+	pcs_artskls = 0
 	
 	!!Job Skills Reset
 	pcs_compskl = 0

locations/sexshop.qsrc

@@ -140,44 +140,32 @@ if $ARGS[0] = 'start':
 	act 'Look through the bras': minut += 1 & gt 'sexshop', 'bras'
 	act 'Look through the fetish shoes': minut += 1 & gt 'sexshop', 'shoes'
 	
-	if money < 300 and karta + bankDebtLimit < 300:
+	if money < 145 and karta + bankDebtLimit < 145:
 		'You cannot afford lubricant.'
 	else
-		if money >= 300:
-			act 'Buy lubricant 300 <b>₽</b> (cash)':
+		if money >= 145:
+			act 'Buy lubricant 145 <b>₽</b> (cash)':
 				*clr & cla
 				menu_off = 1
-				portion = input ("How much you want to buy?")
-
-				if portion * 300 > money:
-					'You do not have enough money.'
-				else
-					lubri += portion * 5
-					money -= portion * 300
-					minut += 5
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-					'You buy some lubricant and pay the cashier.'
-				end
+				lubri += 20
+				money -= 145
+				minut += 5
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You buy some lubricant and pay the cashier.'
 				gs 'stat'
 
 				act 'Move away from the counter':gt 'sexshop', 'start'
 			end
 		end
-		if karta + bankDebtLimit >= 300:
-			act 'Buy lubricant 300 <b>₽</b> (card)':
+		if karta + bankDebtLimit >= 145:
+			act 'Buy lubricant 145 <b>₽</b> (card)':
 				*clr & cla
 				menu_off = 1
-				portion = input ("How much you want to buy?")
-
-				if portion * 300 > karta + bankDebtLimit:
-					'You do not have enough credit.'
-				else
-					lubri += portion * 5
-					karta -= portion * 300
-					minut += 5
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
-					'You buy some lubricant and pay the cashier.'
-				end
+				lubri += 20
+				karta -= 145
+				minut += 5
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/sexshop/sexshop.jpg"></center>'
+				'You buy some lubricant and pay the cashier.'
 				gs 'stat'
 
 				act 'Move away from the counter':gt 'sexshop', 'start'

locations/sistersleep.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'sister_sleep_2':
 		gs 'stat'
 		act 'Move away': gt 'bedrPar'
 	end
-	if sisterLesb >= 4:
+	if sisterLesb <= 4:
 		gs 'willpower', 'foreplay', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Kiss Anya (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'self' & gt 'sistersleep', 'sister_sleep_2_kiss'
@@ -252,7 +252,7 @@ end
 
 if $ARGS[0] = 'sister_sex':
 	sisterLesb += 1
-	if sisterLesb => 6: 
+	if sisterLesb <= 6: 
 		gt 'sistersleep', 'sister_lesbian'
 	elseif sisterLesb = 9:
 		gt 'sistersleep', 'sister_strapon'

locations/stat_display.qsrc

@@ -499,11 +499,11 @@ elseif $clothingworntype = 'exercise':
 		$stat_clothes_msg = 'You are wearing a gym outfit a bimbo would wear.'
 		$stat_clothes_tooltip = 'Bimbo gym outfit.'
 		$stat_clothes_style = 'exercise_b'
-	elseif CloInhibit >= 30:
+	elseif PCloInhibit >= 30:
 		$stat_clothes_msg = 'You''re wearing a revealing gym outfit.'
 		$stat_clothes_tooltip = 'Revealing gym outfit.'
 		$stat_clothes_style = 'exercise_s'
-	elseif CloInhibit >= 20:
+	elseif PCloInhibit >= 20:
 		$stat_clothes_msg = 'You''re wearing a slightly revealing gym outfit.'
 		$stat_clothes_tooltip = 'Slightly revealing gym outfit.'
 		$stat_clothes_style = 'exercise_s'
@@ -513,12 +513,12 @@ elseif $clothingworntype = 'exercise':
 		$stat_clothes_style = 'exercise'
 	end
 elseif $clothingworntype = 'swimwear':
-	if (CloInhibit >= 50 or CloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
+	if (PCloInhibit >= 50 or PCloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
 		$stat_clothes_msg = 'You''re wearing an exhibitionist swimsuit a bimbo would wear.'
 		$stat_clothes_tooltip = 'Exhibitionist/Bimbo swimsuit.'
 		$stat_clothes_style = 'swimsuit_eb'
-	elseif (CloInhibit >= 50 or CloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
+	elseif (PCloInhibit >= 50 or PCloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
 		$stat_clothes_msg = 'You are wearing an exhibitionist swimsuit.'
 		$stat_clothes_tooltip = 'Exhibitionist swimsuit.'
 		$stat_clothes_style = 'swimsuit_e'
@@ -527,15 +527,15 @@ elseif $clothingworntype = 'swimwear':
 		$stat_clothes_msg = 'You are wearing a swimsuit a bimbo would wear.'
 		$stat_clothes_tooltip = 'Bimbo swimsuit.'
 		$stat_clothes_style = 'swimsuit_b'
-	elseif CloInhibit >= 40:
+	elseif PCloInhibit >= 40:
 		$stat_clothes_msg = 'You''re wearing a very revealing swimsuit.'
 		$stat_clothes_tooltip = 'Very revealing swimsuit.'
 		$stat_clothes_style = 'swimsuit_s'
-	elseif CloInhibit >= 30:
+	elseif PCloInhibit >= 30:
 		$stat_clothes_msg = 'You''re wearing a revealing swimsuit.'
 		$stat_clothes_tooltip = 'Revealing swimsuit.'
 		$stat_clothes_style = 'swimsuit_s'
-	elseif CloInhibit >= 25:
+	elseif PCloInhibit >= 25:
 		$stat_clothes_msg = 'You''re wearing a slightly revealing swimsuit.'
 		$stat_clothes_tooltip = 'Slightly revealing swimsuit.'
 		$stat_clothes_style = 'swimsuit_s'
@@ -554,12 +554,12 @@ elseif $clothingworntype = 'office':
 		$stat_clothes_msg = 'You''re wearing an office dress a prostitute would wear.'
 		$stat_clothes_tooltip = 'Prostitute office dress.'
 		$stat_clothes_style = 'office_p'
-	elseif (CloExhibit >= 40 or CloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
+	elseif (PCloInhibit >= 40 or PCloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
 		$stat_clothes_msg = 'You''re wearing an exhibitionist office dress a bimbo would wear.'
 		$stat_clothes_tooltip = 'Exhibitionist/Bimbo office office dress.'
 		$stat_clothes_style = 'office_eb'
-	elseif (CloExhibit >= 40 or CloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
+	elseif (PCloInhibit >= 40 or PCloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
 		$stat_clothes_msg = 'You are wearing an exhibitionist office dress.'
 		$stat_clothes_tooltip = 'Exhibitionist office dress.'
 		$stat_clothes_style = 'office_e'
@@ -568,15 +568,15 @@ elseif $clothingworntype = 'office':
 		$stat_clothes_msg = 'You are wearing an office dress a bimbo would wear.'
 		$stat_clothes_tooltip = 'Bimbo office dress.'
 		$stat_clothes_style = 'office_b'
-	elseif CloExhibit >= 30:
+	elseif PCloInhibit >= 30:
 		$stat_clothes_msg = 'You''re wearing a very revealing office dress.'
 		$stat_clothes_tooltip = 'Very revealing office dress.'
 		$stat_clothes_style = 'office_s'
-	elseif CloExhibit >= 25:
+	elseif PCloInhibit >= 25:
 		$stat_clothes_msg = 'You''re wearing a revealing office dress.'
 		$stat_clothes_tooltip = 'Revealing office dress.'
 		$stat_clothes_style = 'office_s'
-	elseif CloExhibit >= 20:
+	elseif PCloInhibit >= 20:
 		$stat_clothes_msg = 'You''re wearing a slightly revealing office dress.'
 		$stat_clothes_tooltip = 'Slightly revealing office dress.'
 		$stat_clothes_style = 'office_s'
@@ -600,15 +600,15 @@ elseif PCloStyle2 = 4:
 		$stat_clothes_msg = 'You''re wearing a school uniform a bimbo would wear.'
 		$stat_clothes_tooltip = 'Bimbo school uniform.'
 		$stat_clothes_style = 'uniform_b'
-	elseif CloExhibit >= 30:
+	elseif PCloInhibit >= 30:
 		$stat_clothes_msg = 'You''re wearing a very revealing school uniform.'
 		$stat_clothes_tooltip = 'Very revealing school uniform.'
 		$stat_clothes_style = 'uniform_s'
-	elseif CloExhibit >= 25:
+	elseif PCloInhibit >= 25:
 		$stat_clothes_msg = 'You''re wearing a revealing school uniform.'
 		$stat_clothes_tooltip = 'Revealing school uniform.'
 		$stat_clothes_style = 'uniform_s'
-	elseif CloExhibit >= 20:
+	elseif PCloInhibit >= 20:
 		$stat_clothes_msg = 'You''re wearing a slightly revealing school uniform.'
 		$stat_clothes_tooltip = 'Slightly revealing school uniform.'
 		$stat_clothes_style = 'uniform_s'
@@ -632,12 +632,12 @@ else
 		$stat_clothes_msg = 'You''re wearing an outfit a prostitute would wear.'
 		$stat_clothes_tooltip = 'Prostitute outfit.'
 		$stat_clothes_style = 'clothes_p'
-	elseif (CloExhibit >= 40 or CloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
+	elseif (PCloInhibit >= 40 or PCloThinness = 6) and PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
 		$stat_clothes_msg = 'You''re wearing exhibitionist clothes a bimbo would wear.'
 		$stat_clothes_tooltip = 'Exhibitionist/Bimbo outfit.'
 		$stat_clothes_style = 'clothes_eb'
-	elseif (CloExhibit >= 40 or CloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
+	elseif (PCloInhibit >= 40 or PCloThinness = 6) and (PCloBimbo = 0 or cheatBimbo = 1):
 		$stat_clothes_msg = 'You are wearing exhibitionist clothes.'
 		$stat_clothes_tooltip = 'Exhibitionist outfit.'
 		$stat_clothes_style = 'clothes_e'
@@ -646,15 +646,15 @@ else
 		$stat_clothes_msg = 'You are wearing bimbo clothes.'
 		$stat_clothes_tooltip = 'Bimbo outfit.'
 		$stat_clothes_style = 'clothes_b'
-	elseif CloExhibit >= 30:
+	elseif PCloInhibit >= 30:
 		$stat_clothes_msg = 'You''re wearing very revealing clothes.'
 		$stat_clothes_tooltip = 'Very revealing outfit.'
 		$stat_clothes_style = 'clothes_s'
-	elseif CloExhibit >= 25:
+	elseif PCloInhibit >= 25:
 		$stat_clothes_msg = 'You''re wearing revealing clothes.'
 		$stat_clothes_tooltip = 'Revealing outfit.'
 		$stat_clothes_style = 'clothes_s'
-	elseif CloExhibit >= 20:
+	elseif PCloInhibit >= 20:
 		$stat_clothes_msg = 'You''re wearing slightly revealing clothes.'
 		$stat_clothes_tooltip = 'Slightly revealing outfit.'
 		$stat_clothes_style = 'clothes_s'