16 Commits 24d1721b09 ... 0dfb798598

Author SHA1 Message Date
  LinaHirata 0dfb798598 [changed] shrinkened `indiktab` by 10% 4 months ago
  Kevin_Smarts b300836adc [fixed] Prostitute outfit shoes and bags should now change correctly 4 months ago
  Kevin_Smarts 1097272c08 [fixed] sports clothing changes to include handbag 4 months ago
  Kevin_Smarts eff0cfac75 Merge remote-tracking branch 'Creamel/brother_sex_stats_fix' 4 months ago
  Creamel 0b2470e4e6 Fixed counter of number of times you had sex with your brother now includes anal sex too 4 months ago
  Kevin_Smarts af52e7e50d Merge remote-tracking branch 'origin/master' 4 months ago
  Kevin_Smarts a781f41f52 Merge remote-tracking branch 'Felix/master' 4 months ago
  bgkjdgbizgblzdgbr 8e6bbdda5e [fixed] Typo ment that the boys from the band did not show up at the disco. 4 months ago
  Lusticon 58543848d7 [fixed] deadend at city_trashplace "Show him your passport" 4 months ago
  Lusticon 52b48dd6b3 [fixed] breast size change at Tatiana lab 4 months ago
  Lusticon 859e7effed [added] Mum reconciliation_talk to city_center and uni_grounds 4 months ago
  Lusticon 15ab22a744 [fixed] volleyball icon stat display 4 months ago
  Lusticon a9258debd3 [fixed] typos 4 months ago
  Lusticon c50099c5ef [fixed] Radomir encounter 4 months ago
  Lusticon d5c1a5b447 [fixed] "The type Bool is expected but got String" same place, who revert it back? 4 months ago
  Lusticon 66108cac5b [fixed] typos 4 months ago

+ 11 - 4
locations/city_center.qsrc

@@ -49,6 +49,11 @@ end
 
 gs 'street_event','city_center', 'extras'
 
+if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+	gs 'mother_chats', 'reconciliation_talk'
+exit
+end
+
 if nichWork = 2:act '<b>GO HOME</b> (Nicholas'' apartment)':gt 'nichApartment'
 
 if shantpopala > 0:
@@ -175,10 +180,12 @@ elseif hour >= 7 and hour <= 20:
 else
 	$desc_txt1 = '<a href="exec:msg ''Aurora talent agency is closed and will reopen at 07:00''">Aurora talent agency</a>'
 end
-if week < 6 and hour >= 9 and hour <= 18:
-	$desc_txt2 = '<a href="exec:gt ''bank'', ''start''">VTB bank</a>'
-elseif week < 5 and hour > 18:
-	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen tomorrow at 09:00''">VTB bank</a>'
+if week < 6:
+	if hour >= 9 and hour <= 18:
+		$desc_txt2 = '<a href="exec:gt ''bank'', ''start''">VTB bank</a>'
+	else
+		$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen at 09:00''">VTB bank</a>'
+	end
 else
 	$desc_txt2 = '<a href="exec:msg ''VTB bank is closed and will reopen on monday at 09:00''">VTB bank</a>'
 end

+ 20 - 35
locations/city_musicstore.qsrc

@@ -8,13 +8,30 @@ if $ARGS[0] = 'musicshop':
 	elseif ml_didntbuyguitarthefirstvisit = 1:
 		gt 'city_musicstore', 'cameback'
 	else
+		'<center><img src="images/locations/city/citycenter/mall/musicstore/music_store.jpg"></center>'
+		'You enter the store, welcomed by the familiar mix of random notes and bits of songs screaming from the back.'
+		act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
+		!{ act 'Try some guitars':
+			!!TO DO: Better scenes here
+			if pcs_instrmusic < 30 and pcs_perform < 10:
+				'You pick up a guitar you like the look of, but are too shy to play it. After strumming a few chords, you put it back on it''s stand.'
+			else
+				'Some texts here depending on music skill and performing skill'			
+			end
+		end }
+		act 'Leave': 
+			if ml_boughtguitar > 0 or ml_boughtamp > 0:
+				gt 'city_musicstore', 'payandtakestuff'
+			end
+			gt 'torgcentr'
+		end
+
 		musicrand = rand(1,2)
 		if musicrand = 1 and yearstart >= 2 and (week > 5 and hour >= 8 and hour < 17):
-			'<center><img src="images/locations/city/citycenter/mall/musicstore/music_store.jpg"></center>'
-			'You enter the store, welcomed by the familiar mix of random notes and bits of songs screaming from the back.'
 			'As you approach the counter, you see your old classmate Radomir standing behind it.'
 			act 'Approach the counter':
-				*clr & cla
+				*clr
+				delact 'Approach the counter'
 				gs 'npc_relationship', 'modify', 'A154', 'like'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
@@ -41,41 +58,9 @@ if $ARGS[0] = 'musicshop':
 						'He nods and starts telling you about a variety of instruments. He seems to really know his stuff.'
 					end
 				end
-				act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
-				act 'Try some guitars': 
-					!!TO DO: Better scenes here			
-					if pcs_instrmusic < 30 and pcs_perform < 10:
-						'You pick up a guitar you like the look of, but are too shy to play it. After strumming a few chords, you put it back on it''s stand.'
-					else
-						'Some texts here depending on music skill and performing skill'			
-					end
-				end
-				act 'Leave': 
-					if ml_boughtguitar > 0 or ml_boughtamp > 0:
-						gt 'city_musicstore', 'payandtakestuff'
-					end
-				end
-				gt 'torgcentr'
 			end
 		else
-			'<center><img src="images/locations/city/citycenter/mall/musicstore/music_store.jpg"></center>'
-			'You enter the store, welcomed by the familiar mix of random notes and bits of songs screaming from the back.'
 			'Jimmy just nods at you, then returns his attention to the guitar laying on the counter in front of him.'
-			act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
-			act 'Try some guitars': 
-				!!TO DO: Better scenes here			
-				if pcs_instrmusic < 30 and pcs_perform < 10:
-					'You pick up a guitar you like the look of, but are too shy to play it. After strumming a few chords, you put it back on it''s stand.'
-				else
-					'Some texts here depending on music skill and performing skill'			
-				end
-			end
-			act 'Leave': 
-				if ml_boughtguitar > 0 or ml_boughtamp > 0:
-					gt 'city_musicstore', 'payandtakestuff'
-				end
-				gt 'torgcentr'
-			end
 		end
 	end
 end

+ 184 - 186
locations/city_trashplace.qsrc

@@ -1,7 +1,7 @@
 # city_trashplace
 $location_type = 'public_outdoors'
 
-$bomzstartqwestdi = {
+if $ARGS[0] = 'bomzstartqwestdi':
 	menu_off = 1
 	gs 'stat'
 	'"I see you''re a good girl who has some money problems. I have a job for you, but I can''t say much here. You do have a passport, yes?"'
@@ -96,12 +96,12 @@ $bomzstartqwestdi = {
 									if PCloSkirt > 0:
 										'You raise your skirt and show him your pussy.'
 										gs 'arousal', 'flash', 5, 'sub'
-										gs 'stat'
 									else
 										'You lower your pants and show him your pussy.'
 										gs 'arousal', 'flash', 5, 'sub'
-										gs 'stat'
 									end
+									gs 'arousal', 'end'
+									gs 'stat'
 
 									if pcs_pubes <= 3:
 										if PCloSkirt > 0:
@@ -137,9 +137,6 @@ $bomzstartqwestdi = {
 								act 'Leave': bomzQW = 1 & gt 'city_industrial'
 							end
 						end
-						gs 'arousal', 'end'
-						gs 'stat'
-						act 'Leave': bomzQW = 1 & gt 'city_industrial'
 					end
 				else
 					act 'Inquire':
@@ -153,9 +150,9 @@ $bomzstartqwestdi = {
 			end
 		end
 	end
-}
+end
 
-$workbomzdi = {
+if $ARGS[0] = 'workbomzdi':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
@@ -197,228 +194,229 @@ $workbomzdi = {
 			act 'Leave': bomzQW = 2 & minut += 1 & gt $loc, $loc_arg
 		end
 	end
-}
-
-clr
-gs 'stat'
-'<center><img <<$set_imgh>> src="images/locations/city/residential/musorka.jpg"></center>'
-'A long line of trash cans for all the local apartments, shamefully hidden behind a corrugated iron fence.'
-
-if bumtolik = 2 and rand(0,1) = 1:
-	*clr & cla
-	menu_off = 1
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/musorka.jpg"></center>'
-	'You see the homeless person who you gave money to last time. He smiles, waving at you as he walks over to say something.'
-	'"Don''t be afraid, hear me out."'
-	act 'Listen to him': gt 'city_trashplaceevents','pos8'
 end
 
-if bumtolik = 3 and hour >= 6 and hour <= 20 and rand(0,1) = 1:
-	*clr & cla
-	menu_off = 1
+if $ARGS[0] = '':
+	clr
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/bumt2.jpg"></center>'
-	'You see a girl feeding the homeless.'
-	'"Hey, can you take a picture of me as I help this unfortunate soul?"'
-	'You find the situation uncomfortable and refuse to photograph the girl.'
-	act 'Ask what she''s up to': gt 'city_trashplaceevents','pos9'
-end
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/musorka.jpg"></center>'
+	'A long line of trash cans for all the local apartments, shamefully hidden behind a corrugated iron fence.'
 
-if musor > 3:
-	act 'Take out the trash':
+	act 'Leave': minut += 1 & gt $loc, $loc_arg
+	if bumtolik = 2 and rand(0,1) = 1:
 		*clr & cla
-		musor = 0
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/musorka.jpg"></center>'
-		'You throw your trash into one of the bins.'
-		
-		if bomjqw > 0:
-			'"Hey babe, come over here and show an old man some service!"'
-			'It''s s the old bum you saw last time.'
-			act 'Speak to him': gt 'city_trashplaceevents','pos10'
-		end
-	
-		if bumtolik = 0:
-			'"Hey there!" you hear a voice call out from the bins.'
-			act 'See who spoke': gt'city_trashplaceevents','pos2'
-		elseif bumtolik = 1:
-			'"Hey babe, come here and do an old man a favor!"'
-			'It''s the old bum you saw last time.'
-			act 'Listen to him': gt'city_trashplaceevents','pos3'
-		end
-
-		act 'Move away': gt $loc, $loc_arg
+		'You see the homeless person who you gave money to last time. He smiles, waving at you as he walks over to say something.'
+		'"Don''t be afraid, hear me out."'
+		act 'Listen to him': gt 'city_trashplaceevents','pos8'
 	end
-end
 
-if bomzQW = 0 and rand(1,10) >= 8 and hour <= 16 and week ! 4:
-	*clr & cla
-	menu_off = 1
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/bum.jpg"></center>'
-	'As you''re about to leave, a drunk old man stumbles up to you. He looks and smells like he hasn''t washed in weeks.'
-	'"It''s national give 300 <b>₽</b> to a bum day, so come on then!" he drunkenly demands.'
+	if bumtolik = 3 and hour >= 6 and hour <= 20 and rand(0,1) = 1:
+		*clr & cla
+		menu_off = 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/bumt2.jpg"></center>'
+		'You see a girl feeding the homeless.'
+		'"Hey, can you take a picture of me as I help this unfortunate soul?"'
+		'You find the situation uncomfortable and refuse to photograph the girl.'
+		act 'Ask what she''s up to': gt 'city_trashplaceevents','pos9'
+	end
 
-	if money >= 300:
-		act 'Give him money':
+	if musor > 3:
+		act 'Take out the trash':
 			*clr & cla
-			money -= 300
+			musor = 0
+			menu_off = 1
 			gs 'stat'
-			'You give him some money and he thanks you before walking away. You swear you can hear him laughing...'
-			act 'Leave': minut += 1 & gt $loc, $loc_arg
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/musorka.jpg"></center>'
+			'You throw your trash into one of the bins.'
+			
+			if bomjqw > 0:
+				'"Hey babe, come over here and show an old man some service!"'
+				'It''s s the old bum you saw last time.'
+				act 'Speak to him': gt 'city_trashplaceevents','pos10'
+			end
+		
+			if bumtolik = 0:
+				'"Hey there!" you hear a voice call out from the bins.'
+				act 'See who spoke': gt'city_trashplaceevents','pos2'
+			elseif bumtolik = 1:
+				'"Hey babe, come here and do an old man a favor!"'
+				'It''s the old bum you saw last time.'
+				act 'Listen to him': gt'city_trashplaceevents','pos3'
+			end
+
+			act 'Move away': gt $loc, $loc_arg
 		end
 	end
 
-	act 'Refuse':
+	if bomzQW = 0 and rand(1,10) >= 8 and hour <= 16 and week ! 4:
 		*clr & cla
+		menu_off = 1
 		gs 'stat'
-		if $start_type[1] = 'tg':
-			if daystart < 10 or stat['vaginal'] <= 2:
-				'"I''d love to, but I don''t have much money." Hell, you''re not even accustomed to your new body, but you take care not to say anything.'
-				'"Are you alright?" he asks as he looks you up and down.'
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/bum.jpg"></center>'
+		'As you''re about to leave, a drunk old man stumbles up to you. He looks and smells like he hasn''t washed in weeks.'
+		'"It''s national give 300 <b>₽</b> to a bum day, so come on then!" he drunkenly demands.'
 
-				act 'No':
-					*clr & cla
-					gs'stat'
-					podozrenie += 1
-					'"No, you just ogle away."'
-					'The bum looks at you with suspicion.'
-					dynamic $bomzstartqwestdi
+		if money >= 300:
+			act 'Give him money':
+				*clr & cla
+				money -= 300
+				gs 'stat'
+				'You give him some money and he thanks you before walking away. You swear you can hear him laughing...'
+				act 'Leave': minut += 1 & gt $loc, $loc_arg
+			end
+		end
+
+		act 'Refuse':
+			*clr & cla
+			gs 'stat'
+			if $start_type[1] = 'tg':
+				if daystart < 10 or stat['vaginal'] <= 2:
+					'"I''d love to, but I don''t have much money." Hell, you''re not even accustomed to your new body, but you take care not to say anything.'
+					'"Are you alright?" he asks as he looks you up and down.'
+
+					act 'No':
+						*clr & cla
+						gs'stat'
+						podozrenie += 1
+						'"No, you just ogle away."'
+						'The bum looks at you with suspicion.'
+						gt 'city_trashplace', 'bomzstartqwestdi'
+					end
+				else
+					'"I''d love to, but I don''t have that kind of money."'
+					gt 'city_trashplace', 'bomzstartqwestdi'
 				end
 			else
-				'"I''d love to, but I don''t have that kind of money."'
-				dynamic $bomzstartqwestdi
+				'"I''m sorry mister, but I don''t have that kind of money."'
+				gt 'city_trashplace', 'bomzstartqwestdi'
 			end
-		else
-			'"I''m sorry mister, but I don''t have that kind of money."'
-			dynamic $bomzstartqwestdi
 		end
+		act 'Chase him off':
+			*clr & cla
+			bomzQW = -10
+			gs 'stat'
+			'"Get lost, you drunk old freak!" you shout at him.'
+			'"You shouldn''t be so rude to me. I meet a lot of people and know a lot of things. This will come back to haunt you when you least expect it!" he replies before leaving.'
+			act 'Leave': minut += 1 & gt $loc, $loc_arg
+		end
+		exit
 	end
-	act 'Chase him off':
-		*clr & cla
-		bomzQW = -10
-		gs 'stat'
-		'"Get lost, you drunk old freak!" you shout at him.'
-		'"You shouldn''t be so rude to me. I meet a lot of people and know a lot of things. This will come back to haunt you when you least expect it!" he replies before leaving.'
-		act 'Leave': minut += 1 & gt $loc, $loc_arg
-	end
-	exit
-end
 
-!!Hobo gangbang
-if bomzQW = -10 and rand(0,5) = 0:
-	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/street/drinkinghobos.jpg"></center>'
-	'On your way home, you decide to take a walk between the buildings of the residential area, only to find yourself face to face with a group of four hobos drinking beer.'
-	'You decide to ignore them and continue on your way, but suddenly feel a hand firmly gripping your arm.'
-	'"Hey, bitch! Nobody teach you to say hello?" one of them barks as you instinctively struggle to break free from his grip. He angrily frowns at you, clenching his fingers harder around your arm.'
-	'"I think this whore needs to learn some manners!" he says before turning towards his friends, who all drunkenly stand up to circle you.'
-	
-	if pcs_agil >= 50:
-		gs 'willpower', 'humiliation', 'self'
-		if will_cost > pcs_willpwr:
-			act 'Try to slip away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		else
-			act 'Try to slip away (<<will_cost>> Willpower)':
-				gs 'willpower', 'humiliation', 'self'
-				gs 'willpower', 'pay', 'self'
-				*clr & cla
-				minut += 2
-				gs 'stat'
-				'You contort your limber body and manage to slip out of his grasp. Seizing the opportunity, you quickly run all the way to your apartment without looking back.'
-				act 'Continue': gt 'korr'
+	!!Hobo gangbang
+	if bomzQW = -10 and rand(0,5) = 0:
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/street/drinkinghobos.jpg"></center>'
+		'On your way home, you decide to take a walk between the buildings of the residential area, only to find yourself face to face with a group of four hobos drinking beer.'
+		'You decide to ignore them and continue on your way, but suddenly feel a hand firmly gripping your arm.'
+		'"Hey, bitch! Nobody teach you to say hello?" one of them barks as you instinctively struggle to break free from his grip. He angrily frowns at you, clenching his fingers harder around your arm.'
+		'"I think this whore needs to learn some manners!" he says before turning towards his friends, who all drunkenly stand up to circle you.'
+		
+		if pcs_agil >= 50:
+			gs 'willpower', 'humiliation', 'self'
+			if will_cost > pcs_willpwr:
+				act 'Try to slip away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			else
+				act 'Try to slip away (<<will_cost>> Willpower)':
+					gs 'willpower', 'humiliation', 'self'
+					gs 'willpower', 'pay', 'self'
+					*clr & cla
+					minut += 2
+					gs 'stat'
+					'You contort your limber body and manage to slip out of his grasp. Seizing the opportunity, you quickly run all the way to your apartment without looking back.'
+					act 'Continue': gt 'korr'
+				end
 			end
 		end
-	end
-	
-	if pcs_stren >= 60:
-		gs 'willpower', 'rape', 'resist'
-		if will_cost > pcs_willpwr:
-			act 'Elbow him in the face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		else
-			act 'Elbow him in the face (<<will_cost>> Willpower)':
-				gs 'willpower', 'rape', 'resist'
-				gs 'willpower', 'pay', 'self'
-				*clr & cla
-				minut += 2
-				gs 'stat'
-				'Your elbow makes contact with his nose and he reels back in pain, letting you go. You hear him loudly cursing about how you''ve broken his nose as you quickly run away, not stopping until you reach your apartment.'
-				act 'Continue': gt 'korr'
+		
+		if pcs_stren >= 60:
+			gs 'willpower', 'rape', 'resist'
+			if will_cost > pcs_willpwr:
+				act 'Elbow him in the face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			else
+				act 'Elbow him in the face (<<will_cost>> Willpower)':
+					gs 'willpower', 'rape', 'resist'
+					gs 'willpower', 'pay', 'self'
+					*clr & cla
+					minut += 2
+					gs 'stat'
+					'Your elbow makes contact with his nose and he reels back in pain, letting you go. You hear him loudly cursing about how you''ve broken his nose as you quickly run away, not stopping until you reach your apartment.'
+					act 'Continue': gt 'korr'
+				end
 			end
 		end
-	end
-	
-	act 'Beg':
-		*clr & cla
-		gs 'npcgeneratec', 0, 'hobo', rand(35,55)
-		gs 'boyStat', $npclastgenerated
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/hobosdeepthroat.jpg"></center>'
-		'"Please let me go! I''m sorry!" you plead, your heart pounding as the dirty old men look at you with clear lust in their eyes.'
-		'"We have to make sure you understand your lesson, bitch!" the one holding your arm says as the men drag you in a dark back alley.'
-		'"Let''s put this slut''s mouth to proper use," one of them says and they all start laughing and forcefully undressing you.'
-		*nl		
-		'"Let me go!" you protest as you struggle in vain before they force you on your knees.'
-		'One of the men grins devilishly as he steps forwards and brushes his disgusting cock against your lips. "No teeth bitch, or you''ll truly be sorry!" he threatens. You reluctantly part your lips to let him into your mouth, the taste making you nauseous as you look up at him with pleading eyes, which only makes him smirk.'
-		'One of the hobos tightly grabs your hair in one hand and roughly pushes your head forwards, your eyes opening wide in shock as the man''s cock is forced down your throat in one thrust. You do your best to overcome your gag reflex and relax your throat.'
-		'You hear them laughing at you. "This bitch isn''t so snooty anymore!" one of them says as you''re forced to suck the disgusting cock in your mouth. After a few minutes, you see two of the other hobos moving around you and dropping their pants to reveal their cocks. "Don''t forget about the rest of us, bitch!"'
-		gs 'arousal', 'bj', 5, 'rough'
-		gs 'stat'
 		
-		act 'Submit':
+		act 'Beg':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/hobosbj.jpg"></center>'
-			'The hobo who has been fucking your throat pulls out of your mouth and grabs a can of beer before he sits against a wall and watches. The other two hobos move in front of you and insistently press their cocks against your lips, seemingly wanting you to suck them both at once. The man holding your head roughly spanks your bare ass and shoves his index finger in your anus. "Don''t keep these gentlemen waiting, whore!" he crudely commands.'
-			'You groan and wince, but decide fighting back is useless and nod. You open your mouth as wide as you can and stick out your tongue, allowing the two hobos to shove their filthy cocks inside.'
-			'"Looks like this slut can''t handle us two at once," one of them comments.'
-			'"Maybe we''ll have more luck with her other holes?" the other replies with a chuckle.'
-			'"Guys, look what I found!" says the hobo who fucked your throat. You have no idea what it is, but you''re pretty sure you won''t like it...'
-			gs 'arousal', 'bj', 10, 'rough', 'group', 'sub'
+			gs 'npcgeneratec', 0, 'hobo', rand(35,55)
+			gs 'boyStat', $npclastgenerated
+			'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/hobosdeepthroat.jpg"></center>'
+			'"Please let me go! I''m sorry!" you plead, your heart pounding as the dirty old men look at you with clear lust in their eyes.'
+			'"We have to make sure you understand your lesson, bitch!" the one holding your arm says as the men drag you in a dark back alley.'
+			'"Let''s put this slut''s mouth to proper use," one of them says and they all start laughing and forcefully undressing you.'
+			*nl		
+			'"Let me go!" you protest as you struggle in vain before they force you on your knees.'
+			'One of the men grins devilishly as he steps forwards and brushes his disgusting cock against your lips. "No teeth bitch, or you''ll truly be sorry!" he threatens. You reluctantly part your lips to let him into your mouth, the taste making you nauseous as you look up at him with pleading eyes, which only makes him smirk.'
+			'One of the hobos tightly grabs your hair in one hand and roughly pushes your head forwards, your eyes opening wide in shock as the man''s cock is forced down your throat in one thrust. You do your best to overcome your gag reflex and relax your throat.'
+			'You hear them laughing at you. "This bitch isn''t so snooty anymore!" one of them says as you''re forced to suck the disgusting cock in your mouth. After a few minutes, you see two of the other hobos moving around you and dropping their pants to reveal their cocks. "Don''t forget about the rest of us, bitch!"'
+			gs 'arousal', 'bj', 5, 'rough'
 			gs 'stat'
 			
-			act 'Continue':
+			act 'Submit':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/hobosgb.jpg"></center>'
-				'"What a lucky find!" the hobo holding you in place says while the two others pull out of your mouth and you''re suddenly lifted up. You then see what this big discovery is. A rope...'
-				'"I don''t know if this cunt is into bondage, but I''m getting tired of keeping her still," the one holding you says.' 
-				'"Leave it to us. You can have her ass when we''re done!" retorts the hobo holding the rope while his two friends start pawing at your breasts.' 
-				'"You''ll thank us after we''re done with you, bitch!" one of them laughs, but you remain speechless as the three men start tying you up with the rope, locking your arms behind your back and painfully squeezing your breasts.'
-				*nl
-				'Once they''re finished, they all admire your vulnerable form before one of them lays down on his back and the others lift you up, spread your legs and lower you on top of him. He playfully slaps your ass before reaching for his cock and rubs it against your labia before roughly thrusting upwards, hilting his cock balls deep in one go.'
-				'You wince at the sudden penetration as you feel a hand grabbing hold of your bonds. "I''m going in dry, slut..." is the only warning you get before you feel a cock forcefully pushing against your anus and forcing its way into your ass. The pain quickly overwhelms you and you scream as tears form in your eyes.'
-				'"Shut the fuck up, bitch!" one of them shouts as he grabs your hair in one hand and roughly slaps your face with the other. "You''re gonna be a good girl and make me feel good with that mouth." You obediently nod before leaning forward to take his cock into your mouth.'
-				gs 'arousal', 'bj', 20, 'rough', 'group', 'submissive', 'gangbang'
-				gs 'npcgeneratec', 0, 'hobo', rand(35,55)
-				gs 'boyStat', $npclastgenerated
-				gs 'arousal', 'anal', -20, 'rough', 'group', 'submissive', 'gangbang'
-				gs 'npcgeneratec', 0, 'hobo', rand(35,55)
-				gs 'boyStat', $npclastgenerated
-				gs 'arousal', 'vaginal', -20, 'rough', 'group', 'submissive', 'gangbang'
-				gs 'arousal', 'end'
+				'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/hobosbj.jpg"></center>'
+				'The hobo who has been fucking your throat pulls out of your mouth and grabs a can of beer before he sits against a wall and watches. The other two hobos move in front of you and insistently press their cocks against your lips, seemingly wanting you to suck them both at once. The man holding your head roughly spanks your bare ass and shoves his index finger in your anus. "Don''t keep these gentlemen waiting, whore!" he crudely commands.'
+				'You groan and wince, but decide fighting back is useless and nod. You open your mouth as wide as you can and stick out your tongue, allowing the two hobos to shove their filthy cocks inside.'
+				'"Looks like this slut can''t handle us two at once," one of them comments.'
+				'"Maybe we''ll have more luck with her other holes?" the other replies with a chuckle.'
+				'"Guys, look what I found!" says the hobo who fucked your throat. You have no idea what it is, but you''re pretty sure you won''t like it...'
+				gs 'arousal', 'bj', 10, 'rough', 'group', 'sub'
 				gs 'stat'
 				
 				act 'Continue':
 					*clr & cla
-					minut +=5
-					gs 'cum_call', 'face', 'hobo'
-					gs 'cum_call', 'mouth', 'hobo'
-					gs 'cum_call', 'face', 'hobo'
-					rape += 1
+					'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/hobosgb.jpg"></center>'
+					'"What a lucky find!" the hobo holding you in place says while the two others pull out of your mouth and you''re suddenly lifted up. You then see what this big discovery is. A rope...'
+					'"I don''t know if this cunt is into bondage, but I''m getting tired of keeping her still," the one holding you says.' 
+					'"Leave it to us. You can have her ass when we''re done!" retorts the hobo holding the rope while his two friends start pawing at your breasts.' 
+					'"You''ll thank us after we''re done with you, bitch!" one of them laughs, but you remain speechless as the three men start tying you up with the rope, locking your arms behind your back and painfully squeezing your breasts.'
+					*nl
+					'Once they''re finished, they all admire your vulnerable form before one of them lays down on his back and the others lift you up, spread your legs and lower you on top of him. He playfully slaps your ass before reaching for his cock and rubs it against your labia before roughly thrusting upwards, hilting his cock balls deep in one go.'
+					'You wince at the sudden penetration as you feel a hand grabbing hold of your bonds. "I''m going in dry, slut..." is the only warning you get before you feel a cock forcefully pushing against your anus and forcing its way into your ass. The pain quickly overwhelms you and you scream as tears form in your eyes.'
+					'"Shut the fuck up, bitch!" one of them shouts as he grabs your hair in one hand and roughly slaps your face with the other. "You''re gonna be a good girl and make me feel good with that mouth." You obediently nod before leaning forward to take his cock into your mouth.'
+					gs 'arousal', 'bj', 20, 'rough', 'group', 'submissive', 'gangbang'
+					gs 'npcgeneratec', 0, 'hobo', rand(35,55)
+					gs 'boyStat', $npclastgenerated
+					gs 'arousal', 'anal', -20, 'rough', 'group', 'submissive', 'gangbang'
+					gs 'npcgeneratec', 0, 'hobo', rand(35,55)
+					gs 'boyStat', $npclastgenerated
+					gs 'arousal', 'vaginal', -20, 'rough', 'group', 'submissive', 'gangbang'
+					gs 'arousal', 'end'
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/hobosfacial.jpg"></center>'
-					'"I think it''s time to give our little bitch a reward!" one of them pants and they all pull out of your abused holes and force you onto your knees before removing your bonds. They then circle around you and start stroking their cocks.'
-					'Before long, the four hobos are all breathing heavily and you see their cocks twitching in their hands as they all start to cum. One of them aims for your mouth while the others shoot their disgusting loads all over your face.'
-					'"Holy shit, this bitch swallows!" one of them exclaims as you gulp down the disgusting sperm that ended in your mouth. As soon as they''re done, they all return to their cans of beer. "We hope you''ll show us more respect in the future, slut."'
-					'You quickly get dressed and stumble away towards the street without replying.'
-					act 'Leave': minut += 1 & gt $loc, $loc_arg
+					
+					act 'Continue':
+						*clr & cla
+						minut +=5
+						gs 'cum_call', 'face', 'hobo'
+						gs 'cum_call', 'mouth', 'hobo'
+						gs 'cum_call', 'face', 'hobo'
+						rape += 1
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/residential/street/sex/hobosfacial.jpg"></center>'
+						'"I think it''s time to give our little bitch a reward!" one of them pants and they all pull out of your abused holes and force you onto your knees before removing your bonds. They then circle around you and start stroking their cocks.'
+						'Before long, the four hobos are all breathing heavily and you see their cocks twitching in their hands as they all start to cum. One of them aims for your mouth while the others shoot their disgusting loads all over your face.'
+						'"Holy shit, this bitch swallows!" one of them exclaims as you gulp down the disgusting sperm that ended in your mouth. As soon as they''re done, they all return to their cans of beer. "We hope you''ll show us more respect in the future, slut."'
+						'You quickly get dressed and stumble away towards the street without replying.'
+						act 'Leave': minut += 1 & gt $loc, $loc_arg
+					end
 				end
 			end
 		end
 	end
 end
 
-act 'Leave': minut += 1 & gt $loc, $loc_arg
-
 --- city_trashplace ---------------------------------
 

+ 5 - 5
locations/gschool_gopnik_chats.qsrc

@@ -263,7 +263,7 @@ if $ARGS[0] = 'roman':
 		'"Well well well, if it isn''t our little fuck bunny. You looking for a cock to hop on?" Roman asks with a smirk as you approach.'
 		'"I just wanted to say hi and talk is all," you reply.'
 		'"Tell me how much you love cock then." You banter with him for a while, where he rips on you a lot, but at least he talks to you.'
-		func('npc_reactions', 'general', 'A159')
+		func('npc_reactions', 'general', 'A157')
 	elseif fame['pav_slut'] > 250:
 		gs 'npc_relationship', 'modify', 'A157', 'dislike'
 		'As you approach Roman, he snarls at you. "If you so much as open your cum breath mouth at me, I''ll toss you down these stairs." Not wishing to push your luck, you walk away.'
@@ -282,7 +282,7 @@ if $ARGS[0] = 'roman':
 			'"I just wanted to say hi and talk is all," you reply.'
 			'"Yeah, what about?" You banter with him for a while about a variety of things. He''s rude and often insulting, but at least he doesn''t threaten you.'
 		end
-		func('npc_reactions', 'general', 'A159')
+		func('npc_reactions', 'general', 'A157')
 	elseif grupTipe = 3:
 		gs 'npc_relationship', 'modify', 'A157', rand(0,1)
 		if npc_rel['A157'] >= 80:
@@ -298,7 +298,7 @@ if $ARGS[0] = 'roman':
 			'"I just wanted to say hi and talk is all," you reply.'
 			'"Whatever." You banter with him for a while about a variety of things. He spends most of his time making fun of you and you get the feeling that, regardless of what he thinks of you, he''s going to pick on any nerd.'
 		end
-		func('npc_reactions', 'general', 'A159')
+		func('npc_reactions', 'general', 'A157')
 	elseif grupTipe = 4:
 		gs 'npc_relationship', 'modify', 'A157', 'like'
 		if npc_rel['A157'] >= 50:
@@ -313,13 +313,13 @@ if $ARGS[0] = 'roman':
 			'"I just wanted to say hi and talk is all," you reply.'
 			'"Yeah, what about?" You banter with him for a while about a variety of things. He''s rude and often insulting, but at least he doesn''t threaten you.'
 		end
-		func('npc_reactions', 'general', 'A159')
+		func('npc_reactions', 'general', 'A157')
 	else
 		gs 'npc_relationship', 'modify', 'A157', 'dislike'
 		'You take a seat near Roman. "What''s up, Roman?"'
 		'"Get lost, cunt!" he snarls in response.'
 		'"Calm down, I just want to talk." He mostly insults you as you try and talk to him, but at least he doesn''t run you off.'
-		func('npc_reactions', 'general', 'A159')
+		func('npc_reactions', 'general', 'A157')
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end

+ 1 - 1
locations/gschool_lunch.qsrc

@@ -445,7 +445,7 @@ if $ARGS[0] = 'events':
 				'You obediently kneel before him, rubbing your hand over the bulge in Vitek''s sweatpants before pulling out his dick. Clasping your <<$pc_desc[''lips'']>> lips around the head, you run your tongue around it a few times before starting to suck it in a bit deeper. You don''t want him to get angry, so you put some effort into it, sometimes licking his balls and taking his cock down your throat without really straining yourself. He mistakes your obedience for enthusiasm, and laughing, he turns to his friends. "Guys just look at this slut going at it! She''s loving it!"'
 				'A few minutes later, Vitek is about to cum and tells you "Good job, cocksucker. I''m going to drop my load in your mouth now and when I do, you ''re going to swallow it all and lick me clean. If you spill anything, you''re going to lick it up from the floor. Got that?" You nod up at him and as soon as his cum hits your tongue, you diligently swallow his load, making sure not to let a single drop escape. When you''re sure he''s finished, you lick and suck his slowly softening dick clean before tucking it back into his pants for him.'
 				'"That was great, <<$pcs_nickname>>! I see you''ve certainly earned your reputation. We''ll definitely be doing this more often, maybe next time I''ll make sure the other boys can have a turn as well. We''ll come find you when we want you. Understood?"'
-				'You''re not looking forward to the perspective, but not knowing what else to do, you just nod. After the guys leave the bathroom you quickly have a drink, trying to wash the nasty taste of his cum out of your mouth.'
+				'You''re not looking forward to the prospect, but not knowing what else to do, you just nod. After the guys leave the bathroom you quickly have a drink, trying to wash the nasty taste of his cum out of your mouth.'
 				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end
 		end

+ 1 - 1
locations/indiktab.qsrc

@@ -134,7 +134,7 @@ elseif $ARGS[0] = '2':
 	! end
 end
 
-$result = '<TABLE  cellpadding="1" cellspacing="0" width="255"><TR>'
+$result = '<TABLE  cellpadding="1" cellspacing="0" width="225"><TR>'
 if indiktab['bar_progress'] >= ARGS[3]:
 	if indiktab['bar_progress'] = 100: $indiktab['bar_bg_color'] = $indiktab['bar_color']
 

+ 2 - 2
locations/katja_city_sex.qsrc

@@ -496,7 +496,7 @@ if $ARGS[0] = 'first_time':
 											*clr & cla
 											katjaQW['horny'] += rand(5,10)
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/city/sex/man_home_sex9.jpg"></center>'
-											'After a few minutes of pounding, '+iif( katjaQW['horny'] >= 100, 'she lets out a huge moan, seemingly having an orgasm', 'seems to have had enough')+.' "Enough! I need a break."'
+											'After a few minutes of pounding, '+iif( katjaQW['horny'] >= 100, 'she lets out a huge moan, seemingly having an orgasm', 'seems to have had enough')+' "Enough! I need a break."'
 											'<<$npc_nickname[$npclastgenerated]>> pulls out and he too seems exhausted. "Lay down, I''ll take care of you," you tell him.'
 											'He lies down on his back. You climb on top and start riding his still-hard cock.'
 											'After a short moment, Katja seems to have gathered her strength and stands up on the bed. She guides your mouth to her pussy and you start eating her out as you bounce up and down on <<$npc_nickname[$npclastgenerated]>>''s cock.' 
@@ -760,7 +760,7 @@ if $ARGS[0] = 'going_home':
 		'"So? How was your first time having sex with a man?" you ask after you''ve walked in silence for a few minutes.'
 		iif(katjaQW['horny'] = 0, '"It was great, even better than I imagined," she says with a big smile. ', '"It was okay, but I had imagined more," she says. ')+iif(npc_vag['A14'] < dick, '"It did hurt though"', '"I was surprised that it didn''t hurt at all"')+', she continues.'
 		'"Does this mean you want to try again?" you ask.'
-		+iif(katjaQW['horny'] = 0, '"Definitely,"', '"Probably,"')+' she answers. You continue your small talk until you reach the metro station.'
+		iif(katjaQW['horny'] = 0, '"Definitely,"', '"Probably,"')+' she answers. You continue your small talk until you reach the metro station.'
 	else
 		if katjaQW['horny'] = 0:
 			'"It was great. He gave me a really good orgasm in the end," she says as you start walking. "So if we continue to find guys like him, then picking up guys is definitely worth it," she continues.'

+ 3 - 3
locations/katja_party.qsrc

@@ -16,14 +16,14 @@ if $ARGS[0] = 'going_out_talk':
 	'She starts to change before you even have a chance to say anything, rummaging around in her wardrobe.'
 	if katjaQW['party_location'] > 1:
 		'"Where do you want to go partying?" you inquire.'
-		+iif(katjaQW['party_location'] = 2, 'The nightclub, downtown. It is a great place to dance,', '"Just to a party at one of the dorms,')+' but it''s not just me, it''s us. You have to come with me," she says.'
+		iif(katjaQW['party_location'] = 2, 'The nightclub, downtown. It is a great place to dance,', '"Just to a party at one of the dorms,')+' but it''s not just me, it''s us. You have to come with me," she says.'
 	else
 		'"Where do you want to have dinner?" you inquire.'
 		'"There''s this small restaurant I have heard a lot about, but never tried before. Wanna try it with me?" she asks.'
 	end
 	act 'Agree to go with Katja':
 		cla
-		minut +5
+		minut += 5
 		if katjaQW['party_location'] = 1:
 			locat['katja'] = 36
 		elseif katjaQW['party_location'] = 2:
@@ -132,7 +132,7 @@ if $ARGS[0] = 'going_out':
 	end
 	if katjaQW['party_location'] > 1:
 		'"Where''s the party?" you inquire.'
-		+iif(katjaQW['party_location'] = 2, '"At the nightclub, downtown. It''s a great place to dance.', 'At one of the dorms.')+' Wanna join me?" she says.'
+		iif(katjaQW['party_location'] = 2, '"At the nightclub, downtown. It''s a great place to dance.', 'At one of the dorms.')+' Wanna join me?" she says.'
 	else
 		'"Where are you going to have dinner?" you inquire.'
 		'"There''s this small restaurant I have heard a lot about, but never tried before. Wanna try it with me?" she asks.'

+ 3 - 1
locations/obj_din.qsrc

@@ -1094,7 +1094,9 @@ if $ARGS[0] = 'reputation':
 			if brothershave > 0:'<<brothershave>> - Number of times you''ve let your brother watch you shave your pussy'
 			if brotherkiss > 0: '<<brotherkiss>> - Number of times you and your brother have kissed'
 			if brotherbj > 0:'<<brotherbj>> - Number of times you''ve given your brother blowjobs'
-			if brotherfuck > 0:'<<brotherfuck>> - Number of times you''ve had sex with your brother'
+			brothersextotal = brotherfuck + brotheranal
+			if brothersextotal > 0:'<<brothersextotal>> - Number of times you''ve had sex with your brother'
+			killvar 'brothersextotal'
 		end
 	*nl
 	end

+ 3 - 3
locations/pav_disco_classmates.qsrc

@@ -278,11 +278,11 @@ if $ARGS[0] = 'atdisco':
 !!Roman
 	gs 'pav_disco_classmates', 'atdisco4', 157
 !!Radomir
-	if locat['A1154'] = 25: gs 'pav_disco_classmates', 'atdisco4', 154
+	if locat['A154'] = 25: gs 'pav_disco_classmates', 'atdisco4', 154
 !!Valentin
-	if locat['A1158'] = 25: gs 'pav_disco_classmates', 'atdisco4', 158
+	if locat['A158'] = 25: gs 'pav_disco_classmates', 'atdisco4', 158
 !!Arkadi
-	if locat['A1156'] = 25: gs 'pav_disco_classmates', 'atdisco4', 156
+	if locat['A156'] = 25: gs 'pav_disco_classmates', 'atdisco4', 156
 !!Nikolai
 	gs 'pav_disco_classmates', 'atdisco4', 185
 !!Lavrenti

+ 6 - 2
locations/prostitution_functions.qsrc

@@ -463,14 +463,17 @@ if $ARGS[0] = 'change_into_prostitute_outfit':
 	lastwornbranumber['prostitute'] = brawornnumber
 	$lastwornshoetype['prostitute'] = $shoeworntype
 	lastwornshoenumber['prostitute'] = shoewornnumber
+	$lastwornpursetype['prostitute'] = $currentpursetype
+	lastworndefpursenumber['prostitute'] = currentpursenumber
 	!!-- Clothing
 	gs 'clothing', 'wear', $prostitute['clothingworntype'], prostitute['clothingwornnumber']
 	!!-- Underwear
 	gs 'panties', 'wear', $prostitute['pantyworntype'], prostitute['pantywornnumber']
 	gs 'bras', 'wear', $prostitute['braworntype'], prostitute['brawornnumber']
 	!!-- Shoes
-	gs 'shoes', 'strip'
 	gs 'shoes', 'wear', $prostitute['shoeworntype'], prostitute['shoewornnumber']
+	!!-- Bag
+	gs 'purses', 'wear', $prostitute['shoeworntype'], prostitute['shoewornnumber']
 
 !	!! TODO: Check for worn out here?
 
@@ -486,7 +489,8 @@ if $ARGS[0] = 'change_into_regular_clothes':
 	gs 'panties', 'wear', $lastwornpantytype['prostitute'], lastwornpantynumber['prostitute']
 	gs 'bras', 'wear', $lastwornbratype['prostitute'], lastwornbranumber['prostitute']
 	!!-- Shoes
-	gs 'shoes', 'wear', 'last_worn'
+	gs 'shoes', 'wear', '$lastwornshoetype['prostitute']', lastwornshoenumber['prostitute']
+	gs 'purses', 'wear', $lastwornpursetype['prostitute'], lastworndefpursenumber['prostitute']
 	gs 'prostitution_functions', 'work_clothes'
 	if prostitute['changed_for_work']: prostitute['changed_for_work'] = 0
 end

+ 30 - 0
locations/purses.qsrc

@@ -248,6 +248,36 @@ if $ARGS[0] = 'descriptions':
 	end
 end
 
+if $ARGS[0] = 'strip':
+	if $currentpursetype = 'none': exit
+
+	$purselastworntype = $currentpursetype
+	purselastwornnumber = currentpursenumber
+	$currentpursetype = 'none'
+	currentpursenumber = 0
+	bag = 0
+end
+
+if $ARGS[0] = 'wear':
+	!! ARGS 0 - action
+	!! ARGS 1 - shoe type name / last worn
+	!! ARGS 2 - shoe index
+
+	if $ARGS[1] = 'last_worn':
+		$currentpursetype = $purselastworntype
+		currentpursenumber = purselastwornnumber
+	else
+		$currentpursetype = $ARGS[1]
+		currentpursenumber = ARGS[2]
+	end
+
+	if $currentpursetype = 'none':
+		bag = 0
+	exit
+	end
+	bag = 1
+end
+
 if $ARGS[0] = 'remove':
 	killvar '$currentpursetype'
 	killvar 'currentpursenumber'

+ 1 - 1
locations/sex_ev_reactions.qsrc

@@ -786,7 +786,7 @@ if $ARGS[0] = 'facial_happy_reacts':
 			sex_ev['react'] = 1
 			$sex_ev['facial_pic']
 			'"So, how do I look?" you ask, with a cum glazed smile.'
-			if $npc_abusive[$boy] and rand(0,1) = 1:
+			if npc_abusive[$boy] > 0 and rand(0,1) = 1:
 				'"Like a walking cumdumpster," <<$npc_firstname[$boy]>> snickers.'
 				act'Offended':
 					cla & *clr

+ 2 - 2
locations/stat.qsrc

@@ -931,7 +931,7 @@ end
 
 if hotelRoom['pav_hotel'] > 0:
 	if hotelRoomDays['pav_hotel'] - 1 = daystart:
-		$stat_msg += '<BR>You have 1 night left on your pav hotel booking.'
+		$stat_msg += '<BR>You have 1 night left on your Pavlosk hotel booking.'
 	elseif hotelRoomDays['pav_hotel'] = daystart and hour < 11:
 		$stat_msg += '<BR>Your room at the Pavlosk hotel has check out today at 11:00'
 	elseif hotelRoomDays['pav_hotel'] = daystart:
@@ -941,7 +941,7 @@ end
 
 if hotelRoom['city_hotel'] > 0:
 	if hotelRoomDays['city_hotel'] - 1 = daystart:
-		$stat_msg += '<BR>You have 1 night left on your pav hotel booking.'
+		$stat_msg += '<BR>You have 1 night left on your St Petersburg hotel booking.'
 	elseif hotelRoomDays['city_hotel'] = daystart and hour < 11:
 		$stat_msg += '<BR>Your room at the St Petersburg hotel has check out today at 11:00'
 	elseif hotelRoomDays['city_hotel'] = daystart:

+ 3 - 3
locations/stat_display.qsrc

@@ -1365,7 +1365,7 @@ if cheatStatusIcons = 0:
 
 	if volleysostav > 0 and week = 6 and sorevday ! daystart and hour <= 18:
 		$stat_volleyball_msg = 'There is volleyball tournament today at 18:00.'
-		$statusIconBarTab += '<td><a href="exec: msg $stat_volleyball_msg"><img title="<<$stat_volleyball_msg>>" height = <<set_siconht>> src="images/system/icons/status/volleyball'+iif(theme['is_dark'] = 1, '_white', '')+'.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec: msg $stat_volleyball_msg"><img title="<<$stat_volleyball_msg>>" height = <<set_siconht>> src="images/system/icons/status/volleball'+iif(theme['is_dark'] = 1, '_white', '')+'.png"></a></td>'
 	end
 	
 	if pfilmNO ! 1:
@@ -1509,7 +1509,7 @@ if enable_show_status = 0:
 		if cheatNoDrink = 0: $stat_extra_msg += '<BR><b><<$pcs_hydra>></b>'
 		if cheatNoSleep = 0: $stat_extra_msg += '<BR><b><<$pcs_sleep>></b>'
 	elseif Enable_scalepic = 2:
-		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="300">'
+		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="270">'
 		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '2', pcs_horny, pcs_horny)+'</TD><TD>&nbsp;Arousal</TD></TR>'
 		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '2', pain['total'], pain['total'], pain['damage'])+'</TD><TD>&nbsp;Pain</TD></TR>'
 		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_health * 100 / healthmax, pcs_health)+'</TD><TD>&nbsp;Health</TD></TR>'
@@ -1572,7 +1572,7 @@ else
 	!skip if this is first message
 	if $stat_extra_msg ! '': $stat_extra_msg += '<br><a href="exec:Enable_showattr = 0 & gs ''$menu_obnovit''">▲Attributes:</a>'
 	if Enable_scalepic = 2:
-		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="300">'
+		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="270">'
 		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', 100 - pcs_inhib, 100 - pcs_inhib)+'</TD><TD>&nbsp;Inhibition</TD></TR>'
 		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_stren, pcs_stren)+'</TD><TD>&nbsp;Strength</TD></TR>'
 		$stat_extra_msg += '<TR><TD width="85%">'+func('indiktab', '1', pcs_agil, pcs_agil)+'</TD><TD>&nbsp;Agility</TD></TR>'

+ 6 - 6
locations/tatiana_lab.qsrc

@@ -321,12 +321,12 @@ if $ARGS[0] = 'Tatiana':
 		'"It''s possible, but I will have to draw on your magical energy. It will cost some of your mana to perform a spell."'
 		'"Also, this will be painful. The magic will force your flesh into new shapes."'
 
-		$HairColorTab =  func('tatiana_lab', 'ListBuilder', 'Hair Color', 500, 60, '$hairColors','i',		 'pcs_haircol','hair',	'nathcol = bodyModVal')
-		$HairLengthTab = func('tatiana_lab', 'ListBuilder', 'Hair Length',200, 120,'$hairTypes', 'hairTypes', 'pcs_hairlng','hair',	'')
-		$EyeColorTab =   func('tatiana_lab', 'ListBuilder', 'Eye Color',  300, 120,'$eyeColors', 'i',		 'pcs_eyecol',	'eye',	'')
-		$EyeLashTab =	func('tatiana_lab', 'ListBuilder', 'Eye Lashes', 100, 30, '$eyeLashes', 'i',		 'pcs_lashes',	'eye',	'')
-		$LipTab =		func('tatiana_lab', 'ListBuilder', 'Lip Size',   300, 120,'$lipSize',   'i',		 'pcs_lip',	'lip',	'')
-		$BreastTab =	 func('tatiana_lab', 'ListBuilder', 'Breast Size',1000,240,'$breastSize','breastSize','pcs_mass[''bust'']',		'breasts','bodyVars[''bust_magic'']')
+		$HairColorTab =  func('tatiana_lab', 'ListBuilder', 'Hair Color', 500, 60, '$hairColors','i',         'pcs_haircol',        'hair',    'nathcol = bodyModVal')
+		$HairLengthTab = func('tatiana_lab', 'ListBuilder', 'Hair Length',200, 120,'$hairTypes', 'hairTypes', 'pcs_hairlng',        'hair',    '')
+		$EyeColorTab =   func('tatiana_lab', 'ListBuilder', 'Eye Color',  300, 120,'$eyeColors', 'i',         'pcs_eyecol',         'eye',     '')
+		$EyeLashTab =    func('tatiana_lab', 'ListBuilder', 'Eye Lashes', 100, 30, '$eyeLashes', 'i',         'pcs_lashes',         'eye',     '')
+		$LipTab =        func('tatiana_lab', 'ListBuilder', 'Lip Size',   300, 120,'$lipSize',   'i',         'pcs_lip',            'lip',     '')
+		$BreastTab =     func('tatiana_lab', 'ListBuilder', 'Breast Size',1000,240,'$breastSize','breastSize',"pcs_mass[''bust'']", 'breasts', "bodyVars[''bust_magic'']")
 
 		$SkinTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,240,'pcs_skin',1000,'clear','Skin','head',''"">Clear Skin</a>"
 		$VirginTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,120,'pcs_vag',0,'renewed','Virginity','vaginal',''"">Renew Virginity</a>"

+ 5 - 0
locations/uni_grounds.qsrc

@@ -54,6 +54,11 @@ if $ARGS[0] = 'main':
 		end
 	end
 
+	if mother['kickedout_timer'] ! 0 and mother['kickedout_timer'] + 3 <= daystart and hour > 6 and hour <= 15:
+		gs 'mother_chats', 'reconciliation_talk'
+	exit
+	end
+
 	'<center><b>University Campus</b></center>'
 	if month >= 11 or month <= 3:
 		if daystage = 2 or daystage = 3:

+ 1 - 1
locations/wardrobe.qsrc

@@ -981,7 +981,7 @@ if $ARGS[0] = 'default_sport_options':
 						gs 'bras', 'wear', $lastwornbratype['sport'], lastwornbranumber['sport']
 					end
 					gs 'shoes', 'wear', $shoelastworntype['sport'], shoelastwornnumber['sport']
-					gs 'purses', 'wear', $shoelastworntype['sport'], shoelastwornnumber['sport']
+					gs 'purses', 'wear', $lastwornpursetype['sport'], lastworndefpursenumber['sport']
 					gs 'coats', 'wear', $lastworncoattype['sport'], lastworndefcoatnumber['sport']
 					gt $loc, $loc_arg
 				end