Browse Source

Merge remote-tracking branch 'julzor/master'

KevinSmarts 4 years ago
parent
commit
7e9f236fe9

+ 11 - 9
locations/anushapt.qsrc

@@ -183,6 +183,7 @@ if $ARGS[0] = 'home':
 					act 'Take a peek (<<will_cost>> Willpower)':
 						*clr & cla
 						gs 'willpower', 'pay', 'self'
+						gs 'stat'
 						'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/peek.jpg"></center>'
 						'Taking a little peek won''t hurt anyone. You glance around to make sure no one can see you, then you crack the door open and just barely peek in. You can just see Anushka pulling down some guys pants that is laying on her bed. You can only see him from about waist down from your vantage point, when his pants come free his hard dick springs up.'
 						act 'Leave them in peace and leave the apartment': gt 'pavComplex','start'
@@ -221,6 +222,7 @@ if $ARGS[0] = 'home':
 					act 'Take a peek (<<will_cost>> Willpower)':
 						*clr & cla
 						gs 'willpower', 'pay', 'self'
+						gs 'stat'
 						AnushkaLoc = 2
 						'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/peek.jpg"></center>'
 						'Taking a little peek won''t hurt anyone. You glance around to make sure no one can see you, then you crack the door open and just barely peek in. You can just see a naked Anushka dropping to her knees in front of a naked black guy who has his back to you.'
@@ -301,7 +303,7 @@ if $ARGS[0] = 'hallway':
 		'Anushka is standing next to, looking at you expectantly. "What''s up, <<$pcs_nickname>>?"'
 		act '<b>Leave Anushka''s apartment</b>': gt 'pavComplex','start'
 		act 'Let''s go to your room':AnushkaLoc=2&gt'anushapt','anushroom'
-		act 'Let''s check on your brother':AnushkaLoc=3&gt'anushaptbr','brotherroom'
+		act 'Let''s check on your brother': AnushkaLoc = 3 & gt 'anushaptbr','brotherroom'
 	end
 end
 
@@ -583,19 +585,19 @@ if $ARGS[0] = 'nushcloset':
 			gs 'stat'
 			'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/maksimspy1.jpg"></center>'
 			if (pcs_hips * 2) - ((pcs_hgt * hratio) / 50) < -10:
-				mood +10
-				minut +10
+				pcs_mood += 10
+				minut += 10
 				'"Wow you have so many outfits. Can I try them on?" You ask her.'
 				'Anushka smiles and nods. "Sure, lets do it." She gets up and joins you at the closet and starts pulling out different outfits, picking the ones she apparently thinks will work best for you. Her clothes don''t fit perfect but they fit good enough and you do look good in them. As you check yourself out in the mirror on the door she says. "Looking nice, <<$pcs_nickname>>.'
 				act 'Try on more clothes':
 					*clr & cla
-					minut +10
+					minut += 10
 					gs 'stat'
 					'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/maksimspy2.jpg"></center>'
 					'The two of you keep taking off your clothes only to put on different clothes, then checking yourselves out in the mirror, giggling and commenting on each other.'
 					act 'These jeans are tight':
 						*clr & cla
-						minut +3
+						minut += 3
 						gs 'stat'
 						'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/maksimspy3.jpg"></center>'
 						if $pantyworntype = 'none':
@@ -608,14 +610,14 @@ if $ARGS[0] = 'nushcloset':
 						
 						act 'Caught':
 							*clr & cla
-							minut +10
+							minut += 10
 							gs 'stat'
 							'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/maksimspy4.jpg"></center>'
 							'You hear Anushka suddenly yell. "Oh my god you little pervert!" She covers herself briefly, you look and see Maksim peeking in through the door which is partially cracked open, you instinctively cover yourself as well. Then she grabs a shoe and throws it at the door, Maksim take off running just before the shoe hits the door.'
 							'Anushka takes off after him and runs out of her room stark naked, you grab the lose dress you had just been wearing and throw it on quickly, before chasing after them.'
 							act 'Chase':
 								*clr & cla
-								minut +10
+								minut += 10
 								gs 'stat'
 								'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/maksimspy5.jpg"></center>'
 								'You can hear Maksim yelling as he runs away. "Help she''s going to kill me!"'
@@ -625,7 +627,7 @@ if $ARGS[0] = 'nushcloset':
 								'Then he turns towards his daughter as he does he starts to say. "Just what the hel..." He never finishes what he was about to say as he turns his head and puts his hand in front of his eyes. "God damnit Anushka, puts some clothes on!" He bellows.'
 								act 'Put on some clothes Nush':
 									*clr & cla
-									minut +10
+									minut += 10
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/eduard.jpg"></center>'
 									'He turns his attention to Maksim and says in a harsh voice. "Boy were you spying on your sister and her friend again?"'
@@ -1935,7 +1937,7 @@ if $ARGS[0] = 'shower_wait':
 	gs 'arousal', 'voyeur', 2
 	gs 'arousal', 'end'
 	act 'Get out of the bed': gt 'anushapt','anushroom'
-	act 'Chat': gt 'anushapt', 'chat'
+	act 'Chat': gt 'anushkachat', 'chat'
 end
 
 if $ARGS[0] = 'nushlivroom':

+ 6 - 4
locations/anushaptbr.qsrc

@@ -30,6 +30,7 @@ if $ARGS[0] = 'brotherroom':
 		act 'Excuse me?':
 			*clr & cla
 			minut += 5
+			gs 'stat'
 			'<center><b><font color = maroon>Anushka''s brother''s room</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
 			'"What do you mean?" you ask.'
@@ -39,6 +40,7 @@ if $ARGS[0] = 'brotherroom':
 			act 'Why''s that?':
 				*clr & cla
 				minut += 5
+				gs 'stat'
 				'<center><b><font color = maroon>Anushka''s brother''s room</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/broroom.jpg"></center>'
 				'"Well, she''s really mean to us. She always beats me up and won''t play games with us." the old brother says while looking at you sadly and the younger one nods in agreement.'
@@ -58,8 +60,8 @@ if $ARGS[0] = 'brotherroom':
 				end
 			end
 		end
-	elseif AnushkaLoc = 3 and maksimQW = 1:
-		maksimQW = 2
+	elseif AnushkaLoc = 3 and (maksimQW = 1 or maksimQW = 2):
+		if maksimQW = 1: maksimQW = 2
 		menu_off = 1
 		minut += 3
 		gs 'stat'
@@ -128,7 +130,7 @@ if $ARGS[0] = 'brotherroom':
 			end
 		end
 	elseif AnushkaLoc ! 3:
-		brotherroom = rand (1,6)
+		brotherroom = rand(1,6)
 		menu_off = 1
 		if brotherroom = 1:
 			minut += 2
@@ -306,7 +308,7 @@ end
 
 if $ARGS[0] = 'rematch':
 	$menu_loc = 'anushaptbr'
-	$menu_arg = 'brotherroom'
+	$menu_arg = 'rematch'
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla

+ 23 - 22
locations/anushkaev1.qsrc

@@ -379,7 +379,7 @@ if $ARGS[0] = 'watch_nushrad':
 								act 'Leave apartment': gt 'pavComplex','start'
 								act 'Wait for him to leave':
 									*clr & cla
-									minut +1
+									minut += 1
 									'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
 									if hotcat >= 6:
 										'You only take a couple of steps from the door when it opens. You turn like you was just heading to the room. He gives you a knowing smirk. "Hey <<$pcs_nickname>>, next time why don''t you join us? I wouldn''t mind giving you the fucking of your life. I''m sure Nush wouldn''t mind, hell her ass could likely use a break, she finds me a bit to big, but what can a guy do." He asks rhetorically, with a laugh.'
@@ -391,7 +391,7 @@ if $ARGS[0] = 'watch_nushrad':
 										end
 										act 'He doesn''t have to be so rough':
 											*clr & cla
-											minut +2
+											minut += 2
 											'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
 											'"Well you could not be so rough with her." You tell him.'
 											'He snorts and shakes his head. "Please she is like all you bitches, she loves every moment of it. I could come back her later tonight, she would just roll over and spread those ass cheeks for me, and let me fuck her ass again. No matter how much she whines and cries about it she is always ready for another good ass fucking."'
@@ -409,7 +409,7 @@ if $ARGS[0] = 'watch_nushrad':
 										end
 										act 'He doesn''t have to be so rough':
 											*clr & cla
-											minut +2
+											minut += 2
 											'<center><img src="images/pc/npc_headshots/big154.jpg"></center>'
 											'"Well you don''t have to be so rough with her." You tell him.'
 											'He snorts and shakes his head. "Please she is like all you bitches, she loves every moment of it. I could come back her later tonight, she would just roll over and spread those ass cheeks for me, and let me fuck her ass again. No matter how much she whines and cries she is always ready for another good ass fucking." Then pauses a moment. "Well you will understand if you ever find a guy willing to fuck you at least." He says as if the mere thought of it disgusts him.'
@@ -488,7 +488,7 @@ if $ARGS[0] = 'rad3some':
 							act 'Push him off (<<will_cost>> Willpower)':
 								*clr & cla
 								npc_rel['A154'] -= 5
-								minut +3
+								minut += 3
 								gs 'willpower', 'pay', 'resist'
 								gs 'stat'
 								'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/join/radnushleave.jpg"></center>'
@@ -501,7 +501,7 @@ if $ARGS[0] = 'rad3some':
 								'Anushka, still kneeling on the bed next to where Radomir is standing, finally interjects. "Chill out, Rad. Stop being an asshole."'
 								act 'Get dressed':
 									*clr & cla
-									minut +5
+									minut += 5
 									gs 'stat'
 									'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad6.jpg"></center>'
 									'You keep getting dressed, while Radomir turns towards Anushka. "Stay out of this, Nush," he says to her, as he grabs her by the hair and forces her face down against the mattress while she is still kneeling. He looks to you as you get dressed. "Yeah, that''s right, bitch. Get the fuck out of here. No one wants you here!" He says to you as he uses his other hand to guide his dick to Anushka''s backside. He struggles a moment as he pushes against her with his dick. "Rad, please use some lube." she says just a moment before he shoves forward, popping the head of his dick into her ass, causing her to cry out and squeeze her eyes shut while he moans in pleasure.'
@@ -576,7 +576,7 @@ if $ARGS[0] = 'radnush_asspound':
 					act 'get dressed':
 					act 'clean up and get dressed':
 						*clr & cla
-						minut +10
+						minut += 10
 						cumspclnt = 12
 						gs 'cum_cleanup'
 						gs 'stat'
@@ -586,7 +586,7 @@ if $ARGS[0] = 'radnush_asspound':
 						act 'Say nothing and join her on the bed.': gt 'anushapt', 'bed'
 						act 'Talk about what just happened.':
 							*clr & cla
-							minut +2
+							minut += 2
 							gs 'stat'
 							'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 							'Now that Radomir is gone and it is just the two of you, you decided to ask her about what all just happened. "So what was up with Rad being so rough? Is that normal for him?"'
@@ -598,7 +598,7 @@ if $ARGS[0] = 'radnush_asspound':
 							act 'Let it drop.': gt 'anushapt', 'bed'
 							act 'Then explain it.':
 								*clr & cla
-								minut +1
+								minut += 1
 								gs 'stat'
 								'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 								'You nod. "Ok I got time, then how about you just tell me."'
@@ -608,7 +608,7 @@ if $ARGS[0] = 'radnush_asspound':
 								act 'Press her for more details.':
 									*clr & cla
 									radnushdate = 1
-									minut +1
+									minut += 1
 									npc_rel['A144'] -= 1
 									gs 'stat'
 									'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
@@ -618,7 +618,7 @@ if $ARGS[0] = 'radnush_asspound':
 									act 'Let it drop.': gt 'anushapt', 'bed'
 									act 'You guys use to date?':
 										*clr & cla
-										minut +2
+										minut += 2
 										gs 'stat'
 										'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 										'"So you guys use to date? I didn''t know that. What happened?" You ask her.'
@@ -626,7 +626,7 @@ if $ARGS[0] = 'radnush_asspound':
 										act 'Let it drop.': gt 'anushapt', 'bed'
 										act 'Why did you break up?':
 											*clr & cla
-											minut +1
+											minut += 1
 											npc_rel['A144'] -= 5
 											gs 'stat'
 											'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
@@ -637,7 +637,7 @@ if $ARGS[0] = 'radnush_asspound':
 											act 'Say your sorry':
 												*clr & cla
 												npc_rel['A144'] += 1
-												minut +1
+												minut += 1
 												gs 'stat'
 												'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 												'You stop at the door. "I''m sorry I didn''t mean to upset you."'
@@ -717,7 +717,8 @@ if $ARGS[0] = 'watch_nushval':
 						act 'Leave apartment': gt 'pavComplex','start'
 						act 'Wait for him to leave':
 							*clr & cla
-							minut +5
+							minut += 5
+							gs 'stat'
 							'<center><img src="images/pc/npc_headshots/big158.jpg"></center>'
 							'You only take a couple of steps from the door when it opens. You turn like you was just heading to the room. He looks a bit surprised to see you but he smiles. "Hey <<$pcs_nickname>>, Anushka is in her room if you are looking for her. I need to get going, got to go get this part for my bike." He explains as he walks past you. "See''ya around" And with that he walks towards the front door and out. You open Anushka''s door and walk in and decided not to say anything about what you just seen.'
 							act 'Go in her room': gt 'anushapt','anushroom'
@@ -845,7 +846,7 @@ if $ARGS[0] = 'val3some':
 														gs 'stat'
 														act 'Get dressed':
 															*clr & cla
-															minut +10
+															minut += 10
 															cumspclnt = 12
 															gs 'cum_cleanup'
 															gs 'stat'
@@ -881,7 +882,7 @@ if $ARGS[0] = 'val3some':
 														gs 'stat'
 														act 'Get dressed':
 															*clr & cla
-															minut +10
+															minut += 10
 															cumspclnt = 12
 															gs 'cum_cleanup'
 															gs 'stat'
@@ -925,7 +926,7 @@ if $ARGS[0] = 'talkaboutval':
 	*clr & cla
 	menu_off = 1
 	AnushkaLoc = 2
-	minut +2
+	minut += 2
 	gs 'stat'
 	'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 	'Now that Valentin is gone and it is just the two of you, you decided to ask her about what all just happened. "So you and Val huh?"'
@@ -995,7 +996,7 @@ if $ARGS[0] = 'watch_nushmar':
 						act 'Leave apartment': gt 'pavComplex','start'
 						act 'Wait for him to leave':
 							*clr & cla
-							minut +5
+							minut += 5
 							'<center><img src="images/pc/npc_headshots/big146.jpg"></center>'
 							'You only take a couple of steps from the door when it opens. You turn like you was just heading to the room. He looks a bit surprised to see you and then blushes, obviously wondering if you heard. "Hey <<$pcs_nickname>>, I was just... I mean we was just..." He trails off obviously trying to think of a reason other than the truth why he is here.'
 							'You can''t help but smile, about him trying to save Anushka''s rep and blushing at the same time. "I know what you guys was doing, hope you two had fun." You say to him with a wink. Which makes him blush even more.'
@@ -1131,7 +1132,7 @@ if $ARGS[0] = 'eat_nush_fucked':
 						gs 'stat'
 						act 'Get dressed':
 							*clr & cla
-							minut +10
+							minut += 10
 							cumspclnt = 12
 							gs 'cum_cleanup'
 							gs 'stat'
@@ -1142,7 +1143,7 @@ if $ARGS[0] = 'eat_nush_fucked':
 							act 'Say nothing and join her on the bed.': gt 'anushapt', 'bed'
 							act 'Talk about what just happened.':
 								*clr & cla
-								minut +1
+								minut += 1
 								gs 'stat'
 								'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 								'Now that Marcus is gone and it is just the two of you, you decided to ask her about what all just happened. "So you and Marcus huh?"'
@@ -1151,7 +1152,7 @@ if $ARGS[0] = 'eat_nush_fucked':
 								act 'Talk about something else.': gt 'anushapt', 'bed'
 								act 'I didn''t even know you guys where friends.':
 									*clr & cla
-									minut +2
+									minut += 2
 									gs 'stat'
 									'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 									'You give her a curious look. "I didn''t even know you guys where friends let alone hooking up."'
@@ -1169,7 +1170,7 @@ if $ARGS[0] = 'eat_nush_fucked':
 									if olusex = 1:
 										act 'Tell her about Olu':
 											*clr & cla
-											minut +1
+											minut += 1
 											gs 'stat'
 											'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 											'You smile as you look at her like you have a big secret. Which perks her interest. "Well I am seeing a black guy too." You tell her.'
@@ -1636,7 +1637,7 @@ if $ARGS[0] = 'bedstrapongive':
 	'You laugh at that and then you start putting on the harness. She helps you get it into place and the two of your pull on the straps until it is nice and snug. "So how should I fuck you? Maybe I should impale your pussy first, or maybe I should just go straight to that cute little ass." You ask her rhetorically. She doesn''t respond and seems to be good with either idea.'
 	gs 'arousal', 'foreplay', 3, 'lesbian'
 	gs 'stat'
-	act 'Straight to the ass': gt 'anushkaev1','bedstraponanal'
+	act 'Straight to the ass': gt 'anushkaev1','bedstrapongiveanal'
 	act 'Impale her pussy.':
 		*clr & cla
 		gs 'boyStat', 'D3'

+ 21 - 21
locations/bbgameout.qsrc

@@ -546,7 +546,7 @@ if $ARGS[0] = 'mixed':
 						act 'Drive in (<<will_cost>> Willpower)':
 							*clr & cla
 							grupvalue[2] += 1
-							[npc_rel 'A27'] = += 1
+							npc_rel['A27'] += 1
 							pcs_mood += 40
 							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
@@ -562,7 +562,7 @@ if $ARGS[0] = 'mixed':
 								act 'End the game': gt 'bbgameout', 'end_game'
 							else
 								grupvalue[2] -= 1
-								[npc_rel 'A27'] = -= 1
+								npc_rel['A27'] -= 1
 								pcs_mood -= 40
 								gs 'sweat', 'add', 40
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/dribblegirl.jpg"></center>'
@@ -580,7 +580,7 @@ if $ARGS[0] = 'mixed':
 						act 'Pass (<<will_cost>> Willpower)':
 							*clr & cla
 							grupvalue[2] += 1
-							[npc_rel 'A27'] = += 1
+							npc_rel['A27'] += 1
 							pcs_mood += 40
 							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
@@ -595,7 +595,7 @@ if $ARGS[0] = 'mixed':
 								act 'End the game': gt 'bbgameout', 'end_game'
 							else
 								grupvalue[2] -= 1
-								[npc_rel 'A27'] = -= 1
+								npc_rel['A27'] -= 1
 								pcs_mood -= 20
 								gs 'sweat', 'add', 20
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidepass.jpg"></center>'
@@ -614,7 +614,7 @@ if $ARGS[0] = 'mixed':
 						act 'Shoot (<<will_cost>> Willpower)':
 							*clr & cla
 							grupvalue[2] += 1
-							[npc_rel 'A27'] = += 1
+							npc_rel['A27'] += 1
 							pcs_mood += 40
 							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 40
@@ -629,7 +629,7 @@ if $ARGS[0] = 'mixed':
 								act 'End the game': gt 'bbgameout', 'end_game'
 							else
 								grupvalue[2] -= 1
-								[npc_rel 'A27'] = -= 1
+								npc_rel['A27'] -= 1
 								pcs_mood -= 40
 								gs 'sweat', 'add', 40
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsideshoot1.jpg"></center>' 
@@ -646,7 +646,7 @@ if $ARGS[0] = 'mixed':
 					act 'Get rid of the ball':
 						*clr & cla
 						grupvalue[2] -= 2
-						[npc_rel 'A27'] = -= 2
+						npc_rel['A27'] -= 2
 						pcs_mood -= 40
 						gs 'sweat', 'add', 40
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/fail2.jpg"></center>'
@@ -682,7 +682,7 @@ if $ARGS[0] = 'mixed':
 						act 'Drive in (<<will_cost>> Willpower)':
 							*clr & cla
 							grupvalue[2] += 1
-							[npc_rel 'A27'] = += 1
+							npc_rel['A27'] += 1
 							pcs_mood += 20
 							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
@@ -698,7 +698,7 @@ if $ARGS[0] = 'mixed':
 								act 'End the game': gt 'bbgameout', 'end_game'
 							else
 								grupvalue[2] -= 1
-								[npc_rel 'A27'] = -= 1
+								npc_rel['A27'] -= 1
 								pcs_mood -= 20
 								gs 'sweat', 'add', 20
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/dribblegirl.jpg"></center>'
@@ -716,7 +716,7 @@ if $ARGS[0] = 'mixed':
 						act 'Pass (<<will_cost>> Willpower)':
 							*clr & cla
 							grupvalue[2] += 1
-							[npc_rel 'A27'] = += 1
+							npc_rel['A27'] += 1
 							pcs_mood += 20
 							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
@@ -731,7 +731,7 @@ if $ARGS[0] = 'mixed':
 								act 'End the game': gt 'bbgameout', 'end_game'
 							else
 								grupvalue[2] -= 1
-								[npc_rel 'A27'] = -= 1
+								npc_rel['A27'] -= 1
 								pcs_mood -= 20
 								gs 'sweat', 'add', 20
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidepass.jpg"></center>'
@@ -750,7 +750,7 @@ if $ARGS[0] = 'mixed':
 						act 'Shoot (<<will_cost>> Willpower)':
 							*clr & cla
 							grupvalue[2] += 1
-							[npc_rel 'A27'] = += 1
+							npc_rel['A27'] += 1
 							pcs_mood += 20
 							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 20
@@ -765,7 +765,7 @@ if $ARGS[0] = 'mixed':
 								act 'End the game': gt 'bbgameout', 'end_game'
 							else
 								grupvalue[2] -= 1
-								[npc_rel 'A27'] = -= 1
+								npc_rel['A27'] -= 1
 								pcs_mood -= 20
 								gs 'sweat', 'add', 20
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsideshoot1.jpg"></center>' 
@@ -782,7 +782,7 @@ if $ARGS[0] = 'mixed':
 					act 'Get rid of the ball':
 						*clr & cla
 						grupvalue[2] -= 2
-						[npc_rel 'A27'] = -= 2
+						npc_rel['A27'] -= 2
 						pcs_mood -= 20
 						gs 'sweat', 'add', 20
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/fail2.jpg"></center>'
@@ -818,7 +818,7 @@ if $ARGS[0] = 'mixed':
 						act 'Drive in (<<will_cost>> Willpower)':
 							*clr & cla
 							grupvalue[2] += 1
-							[npc_rel 'A27'] = += 1
+							npc_rel['A27'] += 1
 							pcs_mood += 30
 							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
@@ -834,7 +834,7 @@ if $ARGS[0] = 'mixed':
 								act 'End the game': gt 'bbgameout', 'end_game'
 							else
 								grupvalue[2] -= 1
-								[npc_rel 'A27'] = -= 1
+								npc_rel['A27'] -= 1
 								pcs_mood -= 30
 								gs 'sweat', 'add', 30
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/dribblegirl.jpg"></center>'
@@ -853,7 +853,7 @@ if $ARGS[0] = 'mixed':
 							*clr & cla
 							temp = rand(0,100)
 							grupvalue[2] += 1
-							[npc_rel 'A27'] = += 1
+							npc_rel['A27'] += 1
 							pcs_mood += 30
 							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
@@ -868,7 +868,7 @@ if $ARGS[0] = 'mixed':
 								act 'End the game': gt 'bbgameout', 'end_game'
 							else
 								grupvalue[2] -= 1
-								[npc_rel 'A27'] = -= 1
+								npc_rel['A27'] -= 1
 								pcs_mood -= 30
 								gs 'sweat', 'add', 30
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsidepass.jpg"></center>'
@@ -887,7 +887,7 @@ if $ARGS[0] = 'mixed':
 						act 'Shoot (<<will_cost>> Willpower)':
 							*clr & cla
 							grupvalue[2] += 1
-							[npc_rel 'A27'] = += 1
+							npc_rel['A27'] += 1
 							pcs_mood += 30
 							bkbll_exp += rand(0,2)
 							gs 'sweat', 'add', 30
@@ -902,7 +902,7 @@ if $ARGS[0] = 'mixed':
 								act 'End the game': gt 'bbgameout', 'end_game'
 							else
 								grupvalue[2] -= 1
-								[npc_rel 'A27'] = -= 1
+								npc_rel['A27'] -= 1
 								pcs_mood -= 30
 								gs 'sweat', 'add', 30
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/outsideshoot1.jpg"></center>' 
@@ -919,7 +919,7 @@ if $ARGS[0] = 'mixed':
 					act 'Get rid of the ball':
 						*clr & cla
 						grupvalue[2] -= 2
-						[npc_rel 'A27'] = -= 2
+						npc_rel['A27'] -= 2
 						pcs_mood -= 30
 						gs 'sweat', 'add', 30
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/pickupgames/bboutside/fail2.jpg"></center>'

+ 8 - 3
locations/body.qsrc

@@ -597,7 +597,7 @@ end
 
 if pcs_hairbsh = 0:
 	if pcs_hairlng > 30:
-		$pcs_hairbsh = '<b>tangled</b>. You should comb it to keep it healthy'
+		$pcs_hairbsh = 'tangled. You should comb it to keep it healthy'
 		rand_hairmess = rand(0,3)
 		if rand_hairmess = 0:
 			$pcdesc_hairmessrandom = 'tangled'
@@ -612,7 +612,7 @@ if pcs_hairbsh = 0:
 		$pcdesc_hairmessinsertive = ', tangled'
 		$pcdesc_hairmesswordy = 'tangled, poorly-kept'
 	else
-		$pcs_hairbsh = '<b>messy</b>. You should style it to keep it looking good'
+		$pcs_hairbsh = 'messy. You should style it to keep it looking good'
 		rand_hairmess = rand(0,1)
 		if rand_hairmess = 0:
 			$pcdesc_hairmessrandom = 'messy'
@@ -1846,6 +1846,7 @@ if pcs_makeup = 0:
 	$pcdesc_makeupwordy = 'clownishly makeup-smeared'
 	mopkoef = -5 
 	$pcs_makeup = '<b><font color="red">Your makeup is smeared all over your face</font></b>'
+	$pcs_makeup_msg = 'Your makeup is smeared all over your face.'
 	$pcs_makeup_tooltip = 'Your makeup is ruined.'
 elseif pcs_makeup = 1: 
 	rand_makeup = rand(0,1)
@@ -1858,6 +1859,7 @@ elseif pcs_makeup = 1:
 	$pcdesc_makeupwordy = 'bare, natural'
 	mopkoef = 0
 	$pcs_makeup = 'You''re not wearing any kind of makeup'
+	$pcs_makeup_msg = 'You''re not wearing any kind of makeup.'
 	$pcs_makeup_tooltip = 'You''re not wearing makeup.'
 elseif pcs_makeup = 2: 
 	rand_makeup = rand(0,1)
@@ -1869,6 +1871,7 @@ elseif pcs_makeup = 2:
 	$pcdesc_makeup = 'subtly-accented'
 	$pcdesc_makeupwordy = 'almost natural, subtly-accented'
 	$pcs_makeup = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty'
+	$pcs_makeup_msg = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty.'
 	$pcs_makeup_tooltip = 'Your makeup is light and subtle.'
 elseif pcs_makeup = 3: 
 	rand_makeup = rand(0,1)
@@ -1880,6 +1883,7 @@ elseif pcs_makeup = 3:
 	$pcdesc_makeup = 'vibrantly done-up'
 	$pcdesc_makeupwordy = 'colourful, tastefully done-up'
 	$pcs_makeup = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features'
+	$pcs_makeup_msg = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features.'
 	$pcs_makeup_tooltip = 'Your makeup has some mildly vibrant tones.'
 elseif pcs_makeup = 4:
 	rand_makeup = rand(0,3)
@@ -1895,6 +1899,7 @@ elseif pcs_makeup = 4:
 	$pcdesc_makeup = 'dolled-up'
 	$pcdesc_makeupwordy = 'heavily dolled-up and painted'
 	$pcs_makeup = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips'
+	$pcs_makeup_msg = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips.'
 	$pcs_makeup_tooltip = 'Your makeup is thick enough to cover most imperfections.'
 elseif pcs_makeup = 5:
 	rand_makeup = rand(0,3)
@@ -2289,7 +2294,7 @@ if pcs_apprnc < 0: pcs_apprnc = 0
 if pcs_apprnc <= 200:
 	hotcat = pcs_apprnc / 20
 else
-	hotcat = 11
+	hotcat = 10
 end
 
 killvar'panty_beautybounus'

+ 1 - 1
locations/fbgameout.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 			'You take a seat on the ground near the field and watch the jocks play football. Most of them are pretty competitive really pushing it to try and win. Occasionally there is some arguments about a foul, but for the most part they get along and have fun. You have to admit it looks pretty fun, maybe you could ask to join them one day.'
 			act 'Leave': gt 'gschool_grounds', 'main' 
 		end
-		act 'Ask to join'
+		act 'Ask to join':
 			*clr & cla
 			minut += 3
 			grupvalue[2] += 1

+ 12 - 6
locations/gschool_break.qsrc

@@ -230,12 +230,18 @@ if $ARGS[0] = 'girls_restroom_events':
 					'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)
-					act 'Make a run for it':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big20.jpg"></center>'
-						'You turn and run for the door. As you make it to the door, you hear Lena call after you. "You better run far, bitch!"'
-						act 'Continue': gt 'gschool_lessons', 'short_break'
+					gs 'willpower', 'cuni', 'resist', 'easy'
+					if will_cost <= pcs_willpwr:
+						act 'Make a run for it (<<will_cost>> Willpower)':
+							*clr & cla
+							gs 'willpower', 'pay', 'resist'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big20.jpg"></center>'
+							'You turn and run for the door. As you make it to the door, you hear Lena call after you. "You better run far, bitch!"'
+							act 'Continue': gt 'gschool_lessons', 'short_break'
+						end
+					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
 				end
 			else

+ 1 - 1
locations/gschool_groups.qsrc

@@ -182,7 +182,7 @@ if $ARGS[0] = 'fuckornot':
 			elseif hotcat ! j or hotcat_rating_set = 1:
 				if hotcat_rating['A<<i>>'] = j:
 					fu_count += 1
-					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + '<<$npc_nickname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10'
+					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10'
 				end
 			end
 			if fu_count < 6 and hotcat_rating['A<<i>>'] = j:

+ 2 - 1
locations/gschool_lessonsev2.qsrc

@@ -973,6 +973,7 @@ if $ARGS[0] = 'shop':
 			end
 		elseif scooltiperand = 6:
 			gs 'gschool_events', 'rand_boy_arg', 1, 1, 0, 1, 1, 0
+			if fedorKozlovQW >= 10 and FedorLuv >= 0 and $rand_boy = 'Fedor': $rand_boy = 'Dan' & r = 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/brasnap.jpg"></center>'
 			'During class, you feel a hand grab and pull your bra strap away from your body and before you can turn or protest they let go, causing it to snap back painfully. You let out a little yelp and turn to glare at <<$rand_boy>> behind you.'
 			'Then you hear Mr. Kuznetsov. "Is there a problem Miss <<$pcs_lastname>>?" You glance around and notice everyone is staring at you for making the noise, <<$rand_boy>> behind you is snickering. The teacher looks at you accusingly.'
@@ -990,7 +991,7 @@ if $ARGS[0] = 'shop':
 					demerit += 10
 					grupvalue[3] -= 1
 					grupvalue[4] += 1
-					npc_rel['A10'] -= 1
+					npc_rel['A<<r>>'] -= 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
 					'You ignore Mr. Kuznetsov and turn around and slap <<$rand_boy>> with all your force. <<$rand_boy>> recoils, his hand going to his cheek. Students start murmuring about what happened, while some laugh.'
 					'Mr. Kuznetsov voice cuts through the noise. "That''s enough of that Miss <<$pcs_lastname>>, go to the principals office."'

+ 39 - 0
locations/journal.qsrc

@@ -48,6 +48,45 @@ if $ARGS[0] = 'records':
 	if film > 0:$tab_text += dyneval($NoteBookLine,'You are working in the city industrial region as pornographic actress under the name <<$pfname>>')
 	if bumtolik = 4:$tab_text += dyneval($NoteBookLine,'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.')
 	if bumtolik >= 5:$tab_text += dyneval($NoteBookLine,'You volunteer at the Mercy Clinic in the city industrial region, working with the homeless. Working hours are from 9 to 17, Saturday and Sunday.')
+	if model > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
+		$tab_text += '<BR><b>You have no more modeling jobs available this week.</b>'
+	elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:
+		$tab_text += '<BR><b>You can get paid for 1 more modeling job this week.</b>'
+	elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week < 1:
+		$tab_text += '<BR><b>You can get paid for 2 modeling jobs this week.</b>'
+	end
+	if pornstack > 0:
+		porndays = 0
+		:pfilmtime
+		if porndays < 200 and pfilmday[porndays] = 0: porndays += 1 & jump 'pfilmtime'
+	end
+	if pornstack > 0 and pfilmday[0] = 0:
+		if pfilmday[1] = 0:
+			$tab_text += '<br><b>You will star in another porno in <<porndays>> days.</b>'
+		else
+			$tab_text += '<br><b>You have a porno shoot scheduled tomorrow.</b>'
+		end
+	end
+	if pfilmday[0] > 0:
+		if pornnow = 1:
+			$tab_text += '<br><b>You are at a porn shooting.</b>'
+		else
+			if hour < 11: $tab_text += '<br><b>You are expected in the porno studio at 10:00.</b>'
+			if hour >= 11 and hour < 13: $tab_text += '<br><b>You should be at the porno studio, shooting!</b>'
+			if hour >= 13: $tab_text += '<br><b>You missed a scheduled porno shoot!</b>'
+		end
+	end
+	if pornmiss = 1: $tab_text += '<br><b>You missed a scheduled porno shoot!</b>'
+	if prodcosttrue > 0: $tab_text += '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
+	if firstkasting > 0 and pfilmNO < 1:
+		if pornstack <= 10:
+			$tab_text += '<br>You are currently unable to book any more porn shoots at the Porn Studio.'
+		elseif pornstack = 11:
+			$tab_text += '<br>You can contract <<10-pornstack>> porn shoot at the Porn Studio.'
+		else
+			$tab_text += '<br>You can contract up to <<10-pornstack>> porn shoots at the Porn Studio.'
+		end
+	end
 	
 	$tab_text += '<center><h2>Information</h2></center>'
 	

+ 23 - 23
locations/lact_lib.qsrc

@@ -447,76 +447,76 @@ if $ARGS[0] = 'breast_stat_icons':
 !! breast status icons
 	if lactation['active'] <= 0 and lactation['growthsoreness_on'] > 0:
 		$stat_lact_msg = 'Your breasts feel sore and swollen.'
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 	elseif lactation['active'] > 0 and lactation['pc_aware'] > 0:
 		if lactation['engorgement'] > 0 and lactation['lactmess'] < 1:
 			$stat_lact_msg = 'Your breasts are so full they hurt.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 3 and $clothingworntype = 'nude':
 			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel milk seeping out, causing you to have a little milk residue around your nipples.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 6 and $clothingworntype = 'nude':
 			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel your milk comming out causing you to have a lot of milk around your nipples.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] >= 6 and $clothingworntype = 'nude':
 			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel your milk spraying out. Your breasts covered with your breast milk.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 3:
 			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel milk seeping out, causing small wet spots on your top.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 6:
 			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel your milk comming out making visible wet circles on your top.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] >= 6:
 			$stat_lact_msg = 'Your breasts are so full they hurt and you can feel your milk spraying out. Your top is drenched with your breast milk.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']*9/10:
 			$stat_lact_msg = 'Your breasts are firm and full from your milk.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']/2:
 			$stat_lact_msg = 'Your breasts are heavy with your milk.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']/4:
 			$stat_lact_msg = 'Your breasts feel slightly heavy from the milk inside.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > 0:
 			$stat_lact_msg = 'Your feel an easy pressure in your breasts from your milk.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		end
 	elseif lactation['active'] > 0 and lactation['pc_aware'] < 1:
 		if lactation['engorgement'] > 0 and lactation['lactmess'] < 1:
 			$stat_lact_msg = 'Your breasts hurt with pressure in them.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 3 and $clothingworntype = 'nude':
 			$stat_lact_msg = 'Your breasts hurt and your nipples are wet.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 6 and $clothingworntype = 'nude':
 			$stat_lact_msg = 'Your breasts hurt and they feel wet, some white liquid around your nipples.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] >= 6 and $clothingworntype = 'nude':
 			$stat_lact_msg = 'Your breasts hurt and a white liquid is spraying out, covering your breasts.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 3:
 			$stat_lact_msg = 'Your breasts hurt and your nipples tingle a little. There are small wet spots on your top.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] < 6:
 			$stat_lact_msg = 'Your breasts hurt and your nipples tingle. There are visible wet circles on your top.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] > 0 and lactation['lactmess'] >= 6:
 			$stat_lact_msg = 'Your breasts hurt and your nipples tingle a lot. Your top is drenched with a warm liquid.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']*9/10:
 			$stat_lact_msg = 'Your breasts feel firm and under pressure.' 
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']/2:
 			$stat_lact_msg = 'Your breasts feel heavy.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > lactation['breastmm']/4:
 			$stat_lact_msg = 'Your breasts feel slightly heavy.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		elseif lactation['engorgement'] < 1 and lactation['breastmv'] > 0:
 			$stat_lact_msg = 'Your feel an easy pressure in your breasts.'
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_lact_msg"><img title="<<$stat_lact_msg>>" height = 54 src="images/system/icon/status_icons/lactating.png"></a></td>'
 		end
 	end
 end

+ 1 - 1
locations/npcstatic1.qsrc

@@ -685,7 +685,7 @@ $npc_dna['A<<npctemp>>'] = '1736016429 1462897715 2010810526 1845581584 12660926
 $npc_firstname['A<<npctemp>>'] = 'Irina'
 $npc_nickname['A<<npctemp>>'] = 'Inna'
 $npc_lastname['A<<npctemp>>'] = 'Devyatova'
-$npc_usedname['A<<npctemp>>'] = 'Inna'
+$npc_usedname['A<<npctemp>>'] = 'Irina'
 if school_year = 2000:
 	npc_dob['A<<npctemp>>'] = 20000329
 else

+ 1 - 1
locations/npcstatic3.qsrc

@@ -1033,7 +1033,7 @@ discoenable['A<<npctemp>>'] = 1
 $npcGo['A<<npctemp>>'] = '<a href="exec:numnpc = 145 & gt ''Snpc''"><<$npc_firstname[''A145'']>> <<$npc_lastname[''A145'']>></a>'
 $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''ekaterina''"><<$npc_usedname[''A145'']>></a>'
 $school_static_num['A<<npctemp>>'] = 'A145'
-hotcat_rating['A<<npctemp>>'] = 5
+hotcat_rating['A<<npctemp>>'] = 4
 
 npctemp = 146
 gs 'npcstaticdefaults', 'defaults'

+ 7 - 1
locations/saveupdater.qsrc

@@ -643,7 +643,11 @@ if fuckornot_update = 0:
 	hotcat_rating['A21'] = 6
 	hotcat_rating['A24'] = 5
 	hotcat_rating['A142'] = 5
-	hotcat_rating['A145'] = 5
+	hotcat_rating['A145'] = 4
+elseif fuckornot_update = 1:
+	fuckornot_update = 2
+	hotcat_rating['A145'] = 4
+	hotcat_movement['A145'] = 0
 end
 
 
@@ -666,5 +670,7 @@ if pregdateupdate = 0:
     pregdateupdate = 1
 end
 
+if $npc_usedname['A<<npctemp>>'] = 'Inna': $npc_usedname['A<<npctemp>>'] = 'Irina'
+
 --- saveupdater ---------------------------------
 

+ 5 - 0
locations/stat.qsrc

@@ -660,16 +660,21 @@ end
 if bimbolevel > 0:
 	if bimbowithdrawal = 0:
 		$bimbostatus = '<font color = #FF1493>You''re, like, super hawt today.</font>'
+		$bimbo_tooltip = 'You''re, like, super hawt today.'
 	elseif bimbowithdrawal = 1:
 		$bimbostatus = '<font color="green">You feel, like, kind of lame today.</font>'
+		$bimbo_tooltip = 'You feel, like, kind of lame today.'
 	elseif bimbowithdrawal < 4:
 		$bimbostatus = '<font color="grey">You feel, like, totally lame today.</font>'
+		$bimbo_tooltip = 'You feel, like, totally lame today.'
 	elseif bimbowithdrawal < 6:
 		if pcs_mood > 50: pcs_mood -= 10
 		$bimbostatus = '<font color="red">You really feel, like, awful today.</font>'
+		$bimbo_tooltip = 'You really feel, like, awful today.'
 	elseif bimbowithdrawal >= 6:
 		if pcs_mood > 10: pcs_mood -= 10
 		$bimbostatus= '<font color="red"><b>You feel that, like, horrible today!</b></font>'
+		$bimbo_tooltip = 'You feel that, like, horrible today!'
 	end
 
 	if bimbowithdrawal > 30:

+ 210 - 180
locations/stat_display.qsrc

@@ -225,21 +225,25 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 
 	!!Row 1: Appearance
 
-	$statusIconBarTab_1 = '<table><tr>'
-	$statusIconBarTab_1 += '<td><a href="exec:msg ''People would rate your appearance as a <<hotcat>> out of 10.''"><img title="You are a <<hotcat>> out of 10." height = 54 src="images/system/icon/status_icons/appearance.png"></a></td>'
-	$statusIconBarTab_1 += '<td><a href="exec:msg ''<<$pcs_makeup>>.''"><img title="<<$pcs_makeup_tooltip>>" height = 54 src="images/system/icon/status_icons/makeup_'+pcs_makeup+'.png"></a></td>'
+	$statusIconBarTab = '<table><tr>'
+	
+	$stat_hotcat_msg = 'People would rate your appearance as a <<hotcat>> out of 10.<br><img src="<<FUNC(''$face_image'')>>">'
+	$statusIconBarTab += '<td><a href="exec:msg $stat_hotcat_msg"><img title="You are a <<hotcat>> out of 10." height = 54 src="images/system/icon/status_icons/appearance.png"></a></td>'
+	
+	$statusIconBarTab += '<td><a href="exec:msg $pcs_makeup_msg"><img title="<<$pcs_makeup_tooltip>>" height = 54 src="images/system/icon/status_icons/makeup_'+pcs_makeup+'.png"></a></td>'
+	
 	if greben = 0 or pcs_hairbsh = 1:
 		$stat_brush_msg = 'Your hair is <<$pcs_hairbsh>>.'
-		$statusIconBarTab_1 += '<td><a href="exec:msg $stat_brush_msg"><img title="<<$stat_brush_msg>>" height = 54 src="images/system/icon/status_icons/hair_'+pcs_hairbsh+'.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_brush_msg"><img title="<<$stat_brush_msg>>" height = 54 src="images/system/icon/status_icons/hair_'+pcs_hairbsh+'.png"></a></td>'
 	else
-		$statusIconBarTab_1 += '<td><a href="exec: minut += 2 & pcs_hairbsh = 1 & gs ''stat''"><img title="Click to brush your hair." height = 54 src="images/system/icon/status_icons/hair_0.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec: minut += 2 & pcs_hairbsh = 1 & gs ''stat''"><img title="Click to brush your hair." height = 54 src="images/system/icon/status_icons/hair_0.png"></a></td>'
 	end
 
-	if pcs_lipbalm > 0: $statusIconBarTab_1 += '<td><a href="exec: ''Your lips are covered in moisturizing balm.''"><img title="You have applied lip balm." height = 54 src="images/system/icon/status_icons/lipstick.png"></a></td>'
+	if pcs_lipbalm > 0: $statusIconBarTab += '<td><a href="exec: ''Your lips are covered in moisturizing balm.''"><img title="You have applied lip balm." height = 54 src="images/system/icon/status_icons/lipstick.png"></a></td>'
 
 	if false_lashes >= 1:
 		$stat_lashes_msg = 'You''re wearing false'+iif(pcs_lashes = 4, ' mink ', ' ')+'lashes.'
-		$statusIconBarTab_1 +='<td><a href="exec: $stat_lashes_msg"><img title="<<$stat_lashes_msg>>" height = 54 src="images/system/icon/status_icons/lashes.png"></a></td>'
+		$statusIconBarTab +='<td><a href="exec: $stat_lashes_msg"><img title="<<$stat_lashes_msg>>" height = 54 src="images/system/icon/status_icons/lashes.png"></a></td>'
 	end
 
 	if cheatNoSweat = 0:
@@ -261,7 +265,7 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 			else
 				$stat_sweat_msg = 'You''re sweating.'
 			end
-			$statusIconBarTab_1 += '<td><a href="exec:msg $stat_sweat_msg"><img title="<<$stat_sweat_msg>>" height = 54 src="images/system/icon/status_icons/need_shower.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_sweat_msg"><img title="<<$stat_sweat_msg>>" height = 54 src="images/system/icon/status_icons/need_shower.png"></a></td>'
 		end
 	end
 
@@ -271,66 +275,62 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 		elseif pcs_leghair > 3:
 			$stat_shave_msg = 'You need to shave your legs.'
 		end
-		$statusIconBarTab_1 += '<td><a href="exec:msg $stat_shave_msg"><img title="<<$stat_shave_msg>>" height = 54 src="images/system/icon/status_icons/need_shave.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_shave_msg"><img title="<<$stat_shave_msg>>" height = 54 src="images/system/icon/status_icons/need_shave.png"></a></td>'
 	end
 
-	$statusIconBarTab_1 += '</tr></table>'
-	$stat_msg += func('cleanHTML',$statusIconBarTab_1)
-	killvar '$statusIconBarTab_1'
-
+	$statusIconBarTab += '</tr><tr>'
+	
 	!!Row 2: Mood, Arousal, Hunger, Thirst, Health without STDs...
 
-	$statusIconBarTab_2 = '<table><tr>'
-
 !!{	this is commented out until the images have been added
 	willpower_percent = (100 * pcs_willpwr)/willpowermax
 	if willpower_percent > 60:
 		$stat_willpower_msg = 'You feel confident and in control. You still have <<willpower_percent>>% of your willpower left.'
 		$stat_willpower_tooltip = 'You have <<willpower_percent>>% of your willpower.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_willpower_msg"><img title="<<$stat_willpower_tooltip>>" height = 54 src="images/system/icon/status_icons/willpower_high.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_willpower_msg"><img title="<<$stat_willpower_tooltip>>" height = 54 src="images/system/icon/status_icons/willpower_high.png"></a></td>'
 	elseif willpower_percent > 30:
 		$stat_willpower_msg = 'You feel like you have less control over yourself than usual. You have <<willpower_percent>>% of your willpower left.'
 		$stat_willpower_tooltip = 'You have <<willpower_percent>>% of your willpower.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_willpower_msg"><img title="<<$stat_willpower_tooltip>>" height = 54 src="images/system/icon/status_icons/willpower_med.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_willpower_msg"><img title="<<$stat_willpower_tooltip>>" height = 54 src="images/system/icon/status_icons/willpower_med.png"></a></td>'
 	else
 		$stat_willpower_msg = 'In your current state, you could easily be pressured into doing things against your will. You have <<willpower_percent>>% of your willpower left.'
 		$stat_willpower_tooltip = 'You only have <<willpower_percent>>% of your willpower.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_willpower_msg"><img title="<<$stat_willpower_tooltip>>" height = 54 src="images/system/icon/status_icons/willpower_low.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_willpower_msg"><img title="<<$stat_willpower_tooltip>>" height = 54 src="images/system/icon/status_icons/willpower_low.png"></a></td>'
 	end
 }	
 	if pcs_mood >= 80:
 		$stat_mood_msg = 'You are in a great mood.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_msg>>" height = 54 src="images/system/icon/status_icons/mood_1.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_msg>>" height = 54 src="images/system/icon/status_icons/mood_1.png"></a></td>'
 	elseif pcs_mood >= 60:
 		$stat_mood_msg = 'You are in an OK mood.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_msg>>" height = 54 src="images/system/icon/status_icons/mood_2.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_msg>>" height = 54 src="images/system/icon/status_icons/mood_2.png"></a></td>'
 	elseif pcs_mood >= 40:
 		$stat_mood_msg = 'You are in a good mood.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_msg>>" height = 54 src="images/system/icon/status_icons/mood_3.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_msg>>" height = 54 src="images/system/icon/status_icons/mood_3.png"></a></td>'
 	elseif pcs_mood >= 20:
 		$stat_mood_msg = 'You are in a bad mood.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_msg>>" height = 54 src="images/system/icon/status_icons/mood_4.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_msg>>" height = 54 src="images/system/icon/status_icons/mood_4.png"></a></td>'
 	elseif pcs_mood >= 5:
 		$stat_mood_msg = 'You are in a terrible mood.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_msg>>" height = 54 src="images/system/icon/status_icons/mood_5.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_msg>>" height = 54 src="images/system/icon/status_icons/mood_5.png"></a></td>'
 	else
 		$stat_mood_msg = 'You are really depressed and need to improve your mood.'
 		$stat_mood_tooltip = 'You are really depressed.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_tooltip>>" height = 54 src="images/system/icon/status_icons/mood_6.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_mood_msg"><img title="<<$stat_mood_tooltip>>" height = 54 src="images/system/icon/status_icons/mood_6.png"></a></td>'
 	end
 
 	if pcs_horny > 90:
 		$stat_arousal_msg = 'You can''t stop thinking about sex, you''re soaked between your legs from your juices.'
 		$stat_arousal_tooltip = 'You can''t stop thinking about sex'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_arousal_msg"><img title="<<$stat_arousal_tooltip>>" height = 54 src="images/system/icon/status_icons/arousal_high.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_arousal_msg"><img title="<<$stat_arousal_tooltip>>" height = 54 src="images/system/icon/status_icons/arousal_high.png"></a></td>'
 	elseif pcs_horny > 60:
 		$stat_arousal_msg = 'You''re a little nervous, feeling itchy between your legs from arousal.'
 		$stat_arousal_tooltip = 'You''re feeling aroused.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_arousal_msg"><img title="<<$stat_arousal_tooltip>>" height = 54 src="images/system/icon/status_icons/arousal_med.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_arousal_msg"><img title="<<$stat_arousal_tooltip>>" height = 54 src="images/system/icon/status_icons/arousal_med.png"></a></td>'
 	elseif pcs_horny > 30:
 		$stat_arousal_msg = 'You''re feeling a tingling sensation between your legs.'
 		$stat_arousal_tooltip = 'You''re feeling a bit aroused.'
-		$statusIconBarTab_2 += '<td><a href="exec:msg $stat_arousal_msg"><img title="<<$stat_arousal_tooltip>>" height = 54 src="images/system/icon/status_icons/arousal_low.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_arousal_msg"><img title="<<$stat_arousal_tooltip>>" height = 54 src="images/system/icon/status_icons/arousal_low.png"></a></td>'
 	end
 
 	if cheatNoEat = 0:
@@ -347,7 +347,7 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 			$stat_hunger_msg = 'You feel peckish and your thoughts sometimes drift towards food.'
 			$stat_hunger_tooltip = 'You feel peckish.'
 		end
-		if pcs_energy < 30: $statusIconBarTab_2 += '<td><a href="exec:msg $stat_hunger_msg"><img title="<<$stat_hunger_tooltip>>" height = 54 src="images/system/icon/status_icons/need_food.png"></a></td>'
+		if pcs_energy < 30: $statusIconBarTab += '<td><a href="exec:msg $stat_hunger_msg"><img title="<<$stat_hunger_tooltip>>" height = 54 src="images/system/icon/status_icons/need_food.png"></a></td>'
 	end
 
 	if cheatNoDrink = 0:
@@ -364,7 +364,7 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 			$stat_thirst_msg = 'You feel a little thirsty and your mouth is a little dry.'
 			$stat_thirst_tooltip = 'You feel a little thirsty.'
 		end
-		if pcs_hydra < 30: $statusIconBarTab_2 += '<td><a href="exec:msg $stat_thirst_msg"><img title="<<$stat_thirst_tooltip>>" height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
+		if pcs_hydra < 30: $statusIconBarTab += '<td><a href="exec:msg $stat_thirst_msg"><img title="<<$stat_thirst_tooltip>>" height = 54 src="images/system/icon/status_icons/need_drink.png"></a></td>'
 	end
 
 	if cheatNoSleep= 0:
@@ -381,34 +381,30 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 			$stat_sleep_msg = 'You feel a little tired.'
 			$stat_sleep_tooltip = 'You feel a little tired.'
 		end
-		if pcs_sleep < 30: $statusIconBarTab_2 += '<td><a href="exec:msg $stat_sleep_msg"><img title="<<$stat_sleep_tooltip>>" height = 54 src="images/system/icon/status_icons/need_sleep.png"></a></td>'
+		if pcs_sleep < 30: $statusIconBarTab += '<td><a href="exec:msg $stat_sleep_msg"><img title="<<$stat_sleep_tooltip>>" height = 54 src="images/system/icon/status_icons/need_sleep.png"></a></td>'
 	end
 	
-	$statusIconBarTab_2 += '</tr></table>'
-	$stat_msg += func('cleanHTML',$statusIconBarTab_2)
-	killvar '$statusIconBarTab_2'
+	$statusIconBarTab += '</tr><tr>'
 	
 	!!Row 3: Pregnancy, cum, lactation, STD...
 
-	$statusIconBarTab_3 = '<table><tr>'
-
 	if menu_off = 0:
-		$statusIconBarTab_3 += '<td><a href="exec:dynamic $d_cycreport_choice"><img title="Click to open the cycle menu." height = 54 src="images/system/icon/status_icons/vagina.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:dynamic $d_cycreport_choice"><img title="Click to open the cycle menu." height = 54 src="images/system/icon/status_icons/vagina.png"></a></td>'
 	elseif menu_off = 1:
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = 54 src="images/system/icon/status_icons/vagina.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = 54 src="images/system/icon/status_icons/vagina.png"></a></td>'
 	end
 	if mesec > 0 and isprok = 0 and isprokp = 0:
 		$stat_bleed_msg = 'You need to use your feminine hygiene products'+iif($pantyworntype = 'none', ' and you need to also wear panties if you want to use a sanitary pad.', '.')
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vperiod_bleeding.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vperiod_bleeding.png"></a></td>'
 	elseif mesec > 0 and (isprok > 0 or isprokp > 0):
 		$stat_bleed_msg = 'You''re using feminine hygiene products.'
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vperiod_sanitaries.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vperiod_sanitaries.png"></a></td>'
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
 		$stat_bleed_msg = 'Your period is due to start soon.'
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vunknown.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vunknown.png"></a></td>'
 	elseif implant_day > 0 and ((daystart - implant_day) * 24 + hour - implant_hour) < 5:
 		$stat_bleed_msg = 'You feel a slight twinge in your abdomen.'
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vunknown.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vunknown.png"></a></td>'
 	elseif thinkpreg = 0 and knowpreg = 0 and cycle ! 6 and pillcon2 <= 30000 and succubusflag ! 1 and cheatSlut = 0 and mesec = 0:
 		if abortionbirthdate = 0 and daystart - lastmens > 28:
 			if (daystart - lastmens > 28) and (daystart - lastmens <= 35):
@@ -422,7 +418,7 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 			elseif daystart - lastmens > 84:
 				$stat_bleed_msg = 'You should consider the possibility of a pregnancy, since apparently you no longer have periods.'
 			end
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vunknown.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vunknown.png"></a></td>'
 		elseif abortionbirthdate ! 0 and daystart - abortionbirthdate <= 26:
 			if daystart - abortionbirthdate <= 13:
 				$stat_bleed_msg = 'You are still in your recovery period. Nothing to worry about.'
@@ -433,7 +429,7 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 			elseif daystart - abortionbirthdate > 21 and daystart - abortionbirthdate <= 26:
 				$stat_bleed_msg = 'You should have definitely recovered from your abortion by now.'
 			end
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vunknown.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vunknown.png"></a></td>'
 		elseif pregbirthdate ! 0 and daystart - pregbirthdate <= 80:
 			if daystart - pregbirthdate <= 41:
 				$stat_bleed_msg = 'You are still in your recovery period. Nothing to worry about.'
@@ -446,7 +442,7 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 			elseif daystart - pregbirthdate > 70 and daystart - pregbirthdate <= 80:
 				$stat_bleed_msg = 'You should have definitely recovered from giving birth by now.'
 			end
-			$statusIconBarTab_3 += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vunknown.png"></a></td>'
+			$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = 54 src="images/system/icon/status_icons/vunknown.png"></a></td>'
 		end
 	elseif preg = 1:
 		if thinkpreg = 1 and knowpreg = 0:
@@ -456,29 +452,29 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 			$stat_preg_tooltip = 'I''m pregnant.'
 			$stat_preg_msg = 'You are pregnant. Your due date is around <<$pregduedate>>.'
 		end
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_preg_msg"><img title="<<$stat_preg_tooltip>>" height = 54 src="images/system/icon/status_icons/vpregnant.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_preg_msg"><img title="<<$stat_preg_tooltip>>" height = 54 src="images/system/icon/status_icons/vpregnant.png"></a></td>'
 	elseif preg = 2:
 		$stat_preg_msg = 'Broken water and contractions, it''s pretty clear what is going on. You need to get to a hospital ASAP.' 
 		$stat_preg_tooltip = 'Go to the hospital, ASAP! You''re in labour!'
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_preg_msg"><img title="<<$stat_preg_tooltip>>" height = 54 src="images/system/icon/status_icons/labour.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_preg_msg"><img title="<<$stat_preg_tooltip>>" height = 54 src="images/system/icon/status_icons/labour.png"></a></td>'
 	end
 
 	gs 'lact_lib','breast_stat_icons'
 	
-	if $stat_cum_msg ! '': $statusIconBarTab_3 += '<td><a href="exec:msg $stat_cum_msg"><img title="You have cum in and/or on your body. Click to find out more." height = 54 src="images/system/icon/status_icons/cum_covered.png"></a></td>'
+	if $stat_cum_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_cum_msg"><img title="You have cum in and/or on your body. Click to find out more." height = 54 src="images/system/icon/status_icons/cum_covered.png"></a></td>'
 
-	if $stat_visible_cum_msg ! '': $statusIconBarTab_3 += '<td><a href="exec:msg $stat_visible_cum_msg"><img title="People can see the cum on your body!" height = 54 src="images/system/icon/status_icons/visible_cum.png"></a></td>'
+	if $stat_visible_cum_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_visible_cum_msg"><img title="People can see the cum on your body!" height = 54 src="images/system/icon/status_icons/visible_cum.png"></a></td>'
 	
 	if stat_cumloc_check = 1 and trt_cumeater = 1 and cumeater_cheat = 0 and menu_off = 0:
-		$statusIconBarTab_3 += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = 54 src="images/system/icon/status_icons/cum_eater.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec: gs ''cum_manage'', ''cumeater_icon'' & gs ''stat''"><img title="Click to lick up all that delicious cum." height = 54 src="images/system/icon/status_icons/cum_eater.png"></a></td>'
 	elseif stat_cumloc_check = 1 and trt_cumeater = 1 and cumeater_cheat = 0 and menu_off = 1:
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = 54 src="images/system/icon/status_icons/cum_eater.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = 54 src="images/system/icon/status_icons/cum_eater.png"></a></td>'
 	end
 
 	if stat_cumloc_check = 1 and salfetka > 0 and menu_off = 0:
-		$statusIconBarTab_3 += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = 54 src="images/system/icon/status_icons/wipes.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:dynamic $d_salf"><img title="Click to use your wipes." height = 54 src="images/system/icon/status_icons/wipes.png"></a></td>'
 	elseif stat_cumloc_check = 1 and salfetka > 0 and menu_off = 1:
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = 54 src="images/system/icon/status_icons/wipes.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = 54 src="images/system/icon/status_icons/wipes.png"></a></td>'
 	end
 
 	stat_STD_count = 0
@@ -521,66 +517,64 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 
 	if stat_STD_count > 0:
 		$stat_STD_tooltip = 'You have '+iif(stat_STD_count = 1, 'a', '<<stat_STD_count>>')+' STD'+iif(stat_STD_count = 1, '.', 's.')+' Click to find out more.'
-		$statusIconBarTab_3 += '<td><a href="exec:msg $stat_STD_msg"><img title="<<$stat_STD_tooltip>>" height = 54 src="images/system/icon/status_icons/std.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_STD_msg"><img title="<<$stat_STD_tooltip>>" height = 54 src="images/system/icon/status_icons/std.png"></a></td>'
 	end
 
-	$statusIconBarTab_3 += '</tr></table>'
-	$stat_msg += func('cleanHTML',$statusIconBarTab_3)
-	killvar '$statusIconBarTab_3'
+	$statusIconBarTab += '</tr><tr>'
 	
 	!!Row 4: Status, Jobs, School, Clothes,...
 	
-	$statusIconBarTab_4 = '<table><tr>'
-	
-	if bimbolevel > 0: $statusIconBarTab_4 += '<td><a href="exec:msg $bimbostatus"><img title="<<$bimbostatus>>" height = 54 src="images/system/icon/status_icons/bimbo.png"></a></td>'
+	if bimbolevel > 0: $statusIconBarTab += '<td><a href="exec:msg $bimbostatus"><img title="<<$bimbo_tooltip>>" height = 54 src="images/system/icon/status_icons/bimbo.png"></a></td>'
 
-	if hypnoAddict > 0 and $stat_hypno_msg ! '': $statusIconBarTab_4 += '<td><a href="exec:msg $stat_hypno_msg"><img title="<<$stat_hypno_tooltip>>" height = 54 src="images/system/icon/status_icons/hypno_addict.png"></a></td>'
+	if hypnoAddict > 0 and $stat_hypno_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_hypno_msg"><img title="<<$stat_hypno_tooltip>>" height = 54 src="images/system/icon/status_icons/hypno_addict.png"></a></td>'
 	
-	if $stat_court_msg ! '': $statusIconBarTab_4 += '<td><a href="exec:msg $stat_court_msg"><img title="<<$stat_court_tooltip>>" height = 54 src="images/system/icon/status_icons/court.png"></a></td>'
+	if $stat_court_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_court_msg"><img title="<<$stat_court_tooltip>>" height = 54 src="images/system/icon/status_icons/court.png"></a></td>'
 
-	if $stat_school_msg ! '': $statusIconBarTab_4 += '<td><a href="exec:msg $stat_school_msg"><img title="<<$stat_school_tooltip>>" height = 54 src="images/system/icon/status_icons/school.png"></a></td>'
+	if $stat_school_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_school_msg"><img title="<<$stat_school_tooltip>>" height = 54 src="images/system/icon/status_icons/school.png"></a></td>'
 
-	if work > 0: $statusIconBarTab_4 += '<td><a href="exec: gt ''journal'', ''records''"><img title="You have a job. Click to find out more." height = 54 src="images/system/icon/status_icons/work.png"></a></td>'
+	if work > 0 or model > 0 or pornstack > 0: $statusIconBarTab += '<td><a href="exec: gt ''journal'', ''records''"><img title="You have a job. Click to find out more." height = 54 src="images/system/icon/status_icons/work.png"></a></td>'
 	
-	if $stat_clothes_msg ! '': $statusIconBarTab_4 += '<td><a href="exec:msg $stat_clothes_msg"><img title="<<$stat_clothes_tooltip>>" height = 54 src="images/system/icon/status_icons/<<$stat_clothes_style>>.png"></a></td>'
+!!Deactivated until the images are added	if $stat_bfgf_msg_0 ! '': $statusIconBarTab += '<td><a href="exec: $stat_bfgf_msg_0"><img title="<<$stat_bfgf_tooltip_0>>" height = 54 src="images/system/icon/status_icons/date.png"></a></td>'
+	
+!!Deactivated until the images are added	if $stat_bfgf_msg_1 ! '': $statusIconBarTab += '<td><a href="exec: $stat_bfgf_msg_1"><img title="<<$stat_bfgf_tooltip_1>>" height = 54 src="images/system/icon/status_icons/date.png"></a></td>'
+
+!!Deactivated until the images are added	if $stat_bfgf_msg_2 ! '': $statusIconBarTab += '<td><a href="exec: $stat_bfgf_msg_2"><img title="<<$stat_bfgf_tooltip_2>>" height = 54 src="images/system/icon/status_icons/date.png"></a></td>'
+	
+	if $stat_clothes_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_clothes_msg"><img title="<<$stat_clothes_tooltip>>" height = 54 src="images/system/icon/status_icons/<<$stat_clothes_style>>.png"></a></td>'
 
-	if $stat_bra_msg ! '': $statusIconBarTab_4 += '<td><a href="exec:msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = 54 src="images/system/icon/status_icons/bra.png"></a></td>'
+	if $stat_bra_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_bra_msg"><img title="<<$stat_bra_msg>>" height = 54 src="images/system/icon/status_icons/bra.png"></a></td>'
 
-	if $stat_panty_msg ! '': $statusIconBarTab_4 += '<td><a href="exec:msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = 54 src="images/system/icon/status_icons/panties.png"></a></td>'
+	if $stat_panty_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_panty_msg"><img title="<<$stat_panty_msg>>" height = 54 src="images/system/icon/status_icons/panties.png"></a></td>'
 
 	if analplugIN = 1 and vibratorin = 0:
 		$stat_toy_msg = 'A butt plug is inside your ass.'
-		$statusIconBarTab_4 += '<td><a href="exec:msg $stat_toy_msg"><img title="<<$stat_toy_msg>>" height = 54 src="images/system/icon/status_icons/tbutt_plug.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_toy_msg"><img title="<<$stat_toy_msg>>" height = 54 src="images/system/icon/status_icons/tbutt_plug.png"></a></td>'
 	elseif analplugIN = 0 and vibratorin = 1:
 		$stat_toy_msg = 'A vibrator is inside your vagina.'
-		$statusIconBarTab_4 += '<td><a href="exec:msg $stat_toy_msg"><img title="<<$stat_toy_msg>>" height = 54 src="images/system/icon/status_icons/tvibrator.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_toy_msg"><img title="<<$stat_toy_msg>>" height = 54 src="images/system/icon/status_icons/tvibrator.png"></a></td>'
 	elseif analplugIN = 1 and vibratorin = 1:
 		$stat_toy_msg = 'You''re wearing a plug and a vibrator.'
-		$statusIconBarTab_4 += '<td><a href="exec:msg $stat_toy_msg"><img title="<<$stat_toy_msg>>" height = 54 src="images/system/icon/status_icons/tdouble_stuffed.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_toy_msg"><img title="<<$stat_toy_msg>>" height = 54 src="images/system/icon/status_icons/tdouble_stuffed.png"></a></td>'
 	end
 	
-	$statusIconBarTab_4 += '</tr></table>'
-	$stat_msg += func('cleanHTML',$statusIconBarTab_4)
-	killvar '$statusIconBarTab_4'	
+	$statusIconBarTab += '</tr><tr>'
 	
-	!!Row 5: School, Work, Court, Drugs and other short term stuff
-
-	$statusIconBarTab_5 = '<table><tr>'
+	!!Row 5: Drugs and other short term stuff
 
 	if siga > 0:
 		$stat_smoker_msg = 'You have <<siga>> cigarette'+iif(siga = 1, '', 's')+iif(smokerNeed > 0 and NarkImmune = 0, ' and you want to smoke.' , '.')
-		$statusIconBarTab_5 += '<td><a href="exec:msg $stat_smoker_msg"><img title="<<$stat_smoker_msg>>" height = 54 src="images/system/icon/status_icons/cigarettes.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_smoker_msg"><img title="<<$stat_smoker_msg>>" height = 54 src="images/system/icon/status_icons/cigarettes.png"></a></td>'
 	end
 
 	if smoker >= 20 and NarkImmune = 0 and smokerNeed > 0 and siga > 0:
 		$stat_smoke_msg = 'You really need to smoke, click to smoke a cigarette.'
-		$statusIconBarTab_5 += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="<<$stat_smoke_msg>>" height = 54 src="images/system/icon/status_icons/craving_nicotine.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="<<$stat_smoke_msg>>" height = 54 src="images/system/icon/status_icons/craving_nicotine.png"></a></td>'
 	elseif smoker >= 20 and NarkImmune = 0 and smokerNeed > 0 and siga <= 0:
 		$stat_smoke_msg = 'You really need to smoke, but you have no cigarettes.'
-		$statusIconBarTab_5 += '<td><a href="exec:msg $stat_smoke_msg"><img title="<<$stat_smoke_msg>>" height = 54 src="images/system/icon/status_icons/craving_nicotine.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_smoke_msg"><img title="<<$stat_smoke_msg>>" height = 54 src="images/system/icon/status_icons/craving_nicotine.png"></a></td>'
 	elseif siga > 0:
 		$stat_smoke_msg = 'Click to smoke a cigarette.'
-		$statusIconBarTab_5 += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="<<$stat_smoke_msg>>" height = 54 src="images/system/icon/status_icons/smoke_cigarette.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec: gs ''drugs'',''smoke'' & ''You are smoking a cigarette.''"><img title="<<$stat_smoke_msg>>" height = 54 src="images/system/icon/status_icons/smoke_cigarette.png"></a></td>'
 	end
 
 	$stat_drug_msg = ''
@@ -593,41 +587,41 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 		$stat_drug_msg += 'You need heroin.'
 	end
 
-	if $stat_drug_msg ! '': $statusIconBarTab_5 += '<td><a href="exec:msg $stat_drug_msg"><img title="<<$stat_drug_msg>>" height = 54 src="images/system/icon/status_icons/craving_drugs.png"></a></td>'
+	if $stat_drug_msg ! '': $statusIconBarTab += '<td><a href="exec:msg $stat_drug_msg"><img title="<<$stat_drug_msg>>" height = 54 src="images/system/icon/status_icons/craving_drugs.png"></a></td>'
 
 	if alko > 9:
 		$stat_alko_msg = 'You''re '+iif(alko < 10, 'very drunk.', 'wasted.')
-		$statusIconBarTab_5 += '<td><a href="exec:msg $stat_alko_msg"><img title="<<$stat_alko_msg>>" height = 54 src="images/system/icon/status_icons/alko_4.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_alko_msg"><img title="<<$stat_alko_msg>>" height = 54 src="images/system/icon/status_icons/alko_4.png"></a></td>'
 	elseif alko > 5:
 		$stat_alko_msg = 'You''re drunk.'
-		$statusIconBarTab_5 += '<td><a href="exec:msg $stat_alko_msg"><img title="<<$stat_alko_msg>>" height = 54 src="images/system/icon/status_icons/alko_3.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_alko_msg"><img title="<<$stat_alko_msg>>" height = 54 src="images/system/icon/status_icons/alko_3.png"></a></td>'
 	elseif alko > 3:
 		$stat_alko_msg = 'You''re feeling a bit tipsy.'
-		$statusIconBarTab_5 += '<td><a href="exec:msg $stat_alko_msg"><img title="<<$stat_alko_msg>>" height = 54 src="images/system/icon/status_icons/alko_2.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_alko_msg"><img title="<<$stat_alko_msg>>" height = 54 src="images/system/icon/status_icons/alko_2.png"></a></td>'
 	elseif alko = 1:
 		$stat_alko_msg = 'You feel a little buzz from drinking.'
-		$statusIconBarTab_5 += '<td><a href="exec:msg $stat_alko_msg"><img title="<<$stat_alko_msg>>" height = 54 src="images/system/icon/status_icons/alko_1.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_alko_msg"><img title="<<$stat_alko_msg>>" height = 54 src="images/system/icon/status_icons/alko_1.png"></a></td>'
 	end
 
-	if mentats_dose >= 1: $statusIconBarTab_5 += '<td><a href="exec:msg ''You feel sharp and focused.''"><img title="You feel sharp and focused." height = 54 src="images/system/icon/status_icons/drugs.png"></a></td>'
+	if mentats_dose >= 1: $statusIconBarTab += '<td><a href="exec:msg ''You feel sharp and focused.''"><img title="You feel sharp and focused." height = 54 src="images/system/icon/status_icons/drugs.png"></a></td>'
 
-	if aphrodisiac_timer > 0: $statusIconBarTab_5 +='<td><a href="exec:msg ''You are feeling hot and every move causes your groin to tingle.''"><img title="You are feeling hot." height = 54 src="images/system/icon/status_icons/aphro_gum.png"></a></td>'
+	if aphrodisiac_timer > 0: $statusIconBarTab +='<td><a href="exec:msg ''You are feeling hot and every move causes your groin to tingle.''"><img title="You are feeling hot." height = 54 src="images/system/icon/status_icons/aphro_gum.png"></a></td>'
 
-	if frost > 0: $statusIconBarTab_5 += '<td><a href="exec:msg $stat_frost_msg"><img title="<<$stat_frost_msg>>" height = 54 src="images/system/icon/status_icons/hypothermia.png"></a></td>'
+	if frost > 0: $statusIconBarTab += '<td><a href="exec:msg $stat_frost_msg"><img title="<<$stat_frost_msg>>" height = 54 src="images/system/icon/status_icons/hypothermia.png"></a></td>'
 
-	if sick > 0: $statusIconBarTab_5 += '<td><a href="exec:msg $stat_sick_msg"><img title="<<$stat_sick_tooltip>>" height = 54 src="images/system/icon/status_icons/health.png"></a></td>'
+	if sick > 0: $statusIconBarTab += '<td><a href="exec:msg $stat_sick_msg"><img title="<<$stat_sick_tooltip>>" height = 54 src="images/system/icon/status_icons/health.png"></a></td>'
 
 	if recuperation = 1:
 		$stat_health_msg = 'You are still recovering from major surgery.'
-		$statusIconBarTab_5 += '<td><a href="exec:msg $stat_health_msg"><img title="<<$stat_health_msg>>" height = 54 src="images/system/icon/status_icons/health.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_health_msg"><img title="<<$stat_health_msg>>" height = 54 src="images/system/icon/status_icons/health.png"></a></td>'
 	end
 
 	if bcream_used = 1:
 		$stat_cream_msg = 'Your breasts are feeling hot and tingly.'
-		$statusIconBarTab_5 += '<td><a href="exec:msg $stat_cream_msg"><img title="<<$stat_cream_msg>>" height = 54 src="images/system/icon/status_icons/breast_cream.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_cream_msg"><img title="<<$stat_cream_msg>>" height = 54 src="images/system/icon/status_icons/breast_cream.png"></a></td>'
 	end
 
-	if cumcondslip > 0: $statusIconBarTab_5 += '<td><a href="exec:msg ''You don''t feel so great and you''re still wondering about the used condom you never found. Maybe those two things are related?''"><img title="You feel sick. Click to find out more." height = 54 src="images/system/icon/status_icons/stuck_condom.png"></a></td>'
+	if cumcondslip > 0: $statusIconBarTab += '<td><a href="exec:msg ''You don''t feel so great and you''re still wondering about the used condom you never found. Maybe those two things are related?''"><img title="You feel sick. Click to find out more." height = 54 src="images/system/icon/status_icons/stuck_condom.png"></a></td>'
 	
 	if body_write > 0 or face_write > 0:
 		if body_write > 1 and face_write = 0:
@@ -641,12 +635,12 @@ if cheatStatusIcons = 0 or disable_show_icons = 0:
 		else
 			$stat_wirting_msg = 'Your body and face painted with obscene graffiti.'
 		end
-		$statusIconBarTab_5 += '<td><a href="exec:msg $stat_wirting_msg"><img title="<<$stat_wirting_msg>>" height = 54 src="images/system/icon/status_icons/body_writing.png"></a></td>'
+		$statusIconBarTab += '<td><a href="exec:msg $stat_wirting_msg"><img title="<<$stat_wirting_msg>>" height = 54 src="images/system/icon/status_icons/body_writing.png"></a></td>'
 	end
 	
-	$statusIconBarTab_5 += '</tr></table>'
-	$stat_msg += func('cleanHTML',$statusIconBarTab_5)
-	killvar '$statusIconBarTab_5'
+	$statusIconBarTab += '</tr></table>'
+	$stat_msg += func('cleanHTML',$statusIconBarTab)
+	killvar '$statusIconBarTab'
 else
 	$stat_msg += '<br>'
 end
@@ -1570,6 +1564,7 @@ $stat_clothes_tooltip = ''
 $stat_clothes_style = ''
 $stat_bra_msg = ''
 $stat_panty_msg = ''
+$stat_img_temp = FUNC('$body_image','clothes')
 
 if $clothingworntype ! 'nude':
 	if CloThinness = 6:
@@ -1886,6 +1881,8 @@ else
 	end
 end
 
+$stat_clothes_msg += '<br><img src="<<$stat_img_temp>>">'
+
 if frost > 0:
 	if frost <= 5:
 		if enable_extra_msg = 1: $stat_msg += '<BR><b><font>You are a little chilly.</font></b>'
@@ -1962,18 +1959,6 @@ else
 	$streetev_home = 'the train station'
 end
 
-if hour < meethour[0] and svidanie[0] = 1:$stat_msg += '<BR><<$loverdesc[0]>> will be waiting for you near <<$streetev_home>> at <<meethour[0]>>:00.'
-if hour = meethour[0] and svidanie[0] = 1:$stat_msg += '<BR><b><font color="red"><<$loverdesc[0]>> is waiting for you by <<$streetev_home>>.</font></b>'
-if meetday[0] < daystart and svidanie[0] = 1:pcs_lovers_rel[0] -= 10 & svidanie[0] = 0
-
-if hour < meethour[1] and svidanie[1] = 1:$stat_msg += '<BR><<$loverdesc[1]>> will be waiting for you near <<$streetev_home>> at <<meethour[1]>>:00.'
-if hour = meethour[1] and svidanie[1] = 1:$stat_msg += '<BR><b><font color="red"><<$loverdesc[1]>> is waiting for you by <<$streetev_home>>.</font></b>'
-if meetday[1] < daystart and svidanie[1] = 1:pcs_lovers_rel[1] -= 10 & svidanie[1] = 0
-
-if hour < meethour[2] and svidanie[2] = 1:$stat_msg += '<BR><<$loverdesc[2]>> will be waiting for you near <<$streetev_home>> at <<meethour[2]>>:00.'
-if hour = meethour[2] and svidanie[2] = 1:$stat_msg += '<BR><b><font color="red"><<$loverdesc[2]>> is waiting for you by <<$streetev_home>>.</font></b>'
-if meetday[2] < daystart and svidanie[2] = 1:pcs_lovers_rel[2] -= 10 & svidanie[2] = 0
-
 if StrongNarkota > 20 or jointhigh > 0:$stat_msg += '<BR><b><font color="red">You are stoned.</font></b>'
 if amphHigh > 0: $stat_msg += '<BR><b><font color="red">You feel a little wired.</font></b>'
 
@@ -1990,7 +1975,7 @@ end
 if StoryLine = 1 and gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Meet Lena and Lera at the apartment garages at eight</b>'
 if StoryLine = 1 and nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight</b>'
 
-!!--------------- Storyline = 1 Events (Start) ------------------------
+!!--------------- Storyline = 1 Events (End) ------------------------
 
 if home_owned[1] = 1 and home_owned[4] > 0:
 	$stat_msg += '<BR>You have rented an apartment in the city residential area, which is paid up for <b><<ArendHouseSL>></b> days, and you also have an apartment in Pushkin, which is paid up for <b><<ArendHouseSL4>></b> days. Utilities are due on the 25th of <<$month>>.'
@@ -2022,6 +2007,49 @@ end
 
 !!------------------ Things without an icon (End) -------------------
 
+$stat_bfgf_msg_0 = ''
+$stat_bfgf_tooltip_0 = ''
+$stat_bfgf_msg_1 = ''
+$stat_bfgf_tooltip_1 = ''
+$stat_bfgf_msg_2 = ''
+$stat_bfgf_tooltip_2 = ''
+
+if hour < meethour[0] and svidanie[0] = 1:
+	if enable_extra_msg = 1: $stat_msg += '<BR><<$loverdesc[0]>> will be waiting for you near <<$streetev_home>> at <<meethour[0]>>:00.'
+	$stat_bfgf_msg_0 = '<<$loverdesc[0]>> will be waiting for you near <<$streetev_home>> at <<meethour[0]>>:00.'
+	$stat_bfgf_tooltip_0 = 'Your date with <<$loverdesc[0]>> starts at <<meethour[0]>>:00 near <<$streetev_home>>.'
+elseif hour = meethour[0] and svidanie[0] = 1:
+	if enable_extra_msg = 1: $stat_msg += '<BR><b><font color="red"><<$loverdesc[0]>> is waiting for you by <<$streetev_home>>.</font></b>'
+	$stat_bfgf_msg_0 = '<<$loverdesc[0]>> is waiting for you by <<$streetev_home>>.'
+	$stat_bfgf_tooltip_0 = '<<$loverdesc[0]>> is waiting near <<$streetev_home>>.'
+elseif meetday[0] < daystart and svidanie[0] = 1:
+	pcs_lovers_rel[0] -= 10 & svidanie[0] = 0
+end
+
+if hour < meethour[1] and svidanie[1] = 1:
+	if enable_extra_msg = 1: $stat_msg += '<BR><<$loverdesc[1]>> will be waiting for you near <<$streetev_home>> at <<meethour[1]>>:00.'
+	$stat_bfgf_msg_1 = '<<$loverdesc[1]>> will be waiting for you near <<$streetev_home>> at <<meethour[1]>>:00.'
+	$stat_bfgf_tooltip_1 = 'Your date with <<$loverdesc[1]>> starts at <<meethour[1]>>:00 near <<$streetev_home>>.'
+elseif hour = meethour[1] and svidanie[1] = 1:
+	if enable_extra_msg = 1: $stat_msg += '<BR><b><font color="red"><<$loverdesc[1]>> is waiting for you by <<$streetev_home>>.</font></b>'
+	$stat_bfgf_msg_1 = '<<$loverdesc[1]>> is waiting for you by <<$streetev_home>>.'
+	$stat_bfgf_tooltip_1 = '<<$loverdesc[1]>> is waiting near <<$streetev_home>>.'
+elseif meetday[1] < daystart and svidanie[1] = 1:
+	pcs_lovers_rel[1] -= 10 & svidanie[1] = 0
+end
+
+if hour < meethour[2] and svidanie[2] = 1:
+	if enable_extra_msg = 1: $stat_msg += '<BR><<$loverdesc[2]>> will be waiting for you near <<$streetev_home>> at <<meethour[2]>>:00.'
+	$stat_bfgf_msg_2 = '<<$loverdesc[2]>> will be waiting for you near <<$streetev_home>> at <<meethour[2]>>:00.'
+	$stat_bfgf_tooltip_2 = 'Your date starts at <<meethour[2]>>:00 near <<$streetev_home>>.'
+elseif hour = meethour[2] and svidanie[2] = 1:
+	if enable_extra_msg = 1: $stat_msg += '<BR><b><font color="red"><<$loverdesc[2]>> is waiting for you by <<$streetev_home>>.</font></b>'
+	$stat_bfgf_msg_2 = '<<$loverdesc[2]>> is waiting for you by <<$streetev_home>>.'
+	$stat_bfgf_tooltip_2 = '<<$loverdesc[2]>> is waiting near <<$streetev_home>>.'
+elseif meetday[2] < daystart and svidanie[2] = 1:
+	pcs_lovers_rel[2] -= 10 & svidanie[2] = 0
+end
+
 if young_shop_work = 1:
 	if hour = 16 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
 		'You are late for work at Pussy-Cats.'
@@ -2045,35 +2073,85 @@ elseif courthearing_date = daystart and hour < 11:
 	$stat_court_tooltip = 'Court hearing today (07:00 - 11:00).'
 end
 
-if young_shop_work1 = 1:
-	if hour = 9 and minut <= 5 and week >= 6 and inWorkYoungShop = 0:
-		$stat_msg += 'You are late for work at Pussy-Cats.'
-	elseif hour = 9 and week >= 6 and inWorkYoungShop = 0 and misscheck ! daystart:
-		misscheck = daystart
-		young_shop_miss += 1
-		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
-	elseif (hour = 7 or hour = 8) and week >= 6:
-		$stat_msg += '<BR><b><font color="red">By 9:00 you have to be at Pussy-Cats to start work.</font></b>'
+if enable_extra_msg = 1:
+	if young_shop_work1 = 1:
+		if hour = 9 and minut <= 5 and week >= 6 and inWorkYoungShop = 0:
+			$stat_msg += 'You are late for work at Pussy-Cats.'
+		elseif hour = 9 and week >= 6 and inWorkYoungShop = 0 and misscheck ! daystart:
+			misscheck = daystart
+			young_shop_miss += 1
+			$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
+		elseif (hour = 7 or hour = 8) and week >= 6:
+			$stat_msg += '<BR><b><font color="red">By 9:00 you have to be at Pussy-Cats to start work.</font></b>'
+		end
 	end
-end
 
-if young_shop_work2 = 1:
-	if hour = 9 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
-		'You are late for work at Pussy-Cats.'
-	elseif hour = 9 and week < 6 and inWorkYoungShop = 0 and misscheck ! daystart:
-		misscheck = daystart
-		young_shop_miss += 1
-		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
-	elseif (hour = 7 or hour = 8) and week < 6:
-		$stat_msg += '<BR><b><font color="red">By 9:00 you have to be at Pussy-Cats to start work.</font></b>'
+	if young_shop_work2 = 1:
+		if hour = 9 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
+			'You are late for work at Pussy-Cats.'
+		elseif hour = 9 and week < 6 and inWorkYoungShop = 0 and misscheck ! daystart:
+			misscheck = daystart
+			young_shop_miss += 1
+			$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
+		elseif (hour = 7 or hour = 8) and week < 6:
+			$stat_msg += '<BR><b><font color="red">By 9:00 you have to be at Pussy-Cats to start work.</font></b>'
+		end
+	end
+
+	if workrin = 1:
+		if week = 2 or week = 4 or week = 6:
+			if hour = 7:$stat_msg += '<BR><b><font color="red">At 8 o''clock you start work on the market.</font></b>'
+			if hour = 8:$stat_msg += '<BR><b><font color="red">You need to work on the market now.</font></b>'
+		end
 	end
-end
 
-if workrin = 1:
-	if week = 2 or week = 4 or week = 6:
-		if hour = 7:$stat_msg += '<BR><b><font color="red">At 8 o''clock you start work on the market.</font></b>'
-		if hour = 8:$stat_msg += '<BR><b><font color="red">You need to work on the market now.</font></b>'
+	if model > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
+		$stat_msg += '<BR><b>You have no more modeling jobs available this week.</b>'
+	elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:
+		$stat_msg += '<BR><b>You can get paid for 1 more modeling job this week.</b>'
+	elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week < 1:
+		$stat_msg += '<BR><b>You can get paid for 2 modeling jobs this week.</b>'
+	end
+	if pornstack > 0:
+		porndays = 0
+		:pfilmtime
+		if porndays < 200 and pfilmday[porndays] = 0: porndays += 1 & jump 'pfilmtime'
+	end
+	if pornstack > 0 and pfilmday[0] = 0:
+		if pfilmday[1] = 0:
+			$stat_msg += '<br><b>You will star in another porno in <<porndays>> days.</b>'
+		else
+			$stat_msg += '<br><b>You have a porno shoot scheduled tomorrow.</b>'
+		end
+	end
+	if pfilmday[0] > 0:
+		if pornnow = 1:
+			$stat_msg += '<br><b>You are at a porn shooting.</b>'
+		else
+			if hour < 11: $stat_msg += '<br><b>You are expected in the porno studio at 10:00.</b>'
+			if hour >= 11 and hour < 13: $stat_msg += '<br><b>You should be at the porno studio, shooting!</b>'
+			if hour >= 13: $stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
+		end
 	end
+	if pornmiss = 1: $stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
+	if prodcosttrue > 0: $stat_msg += '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
+	if firstkasting > 0 and pfilmNO < 1:
+		if pornstack <= 10:
+			$stat_msg += '<br>You are currently unable to book any more porn shoots at the Porn Studio.'
+		elseif pornstack = 11:
+			$stat_msg += '<br>You can contract <<10-pornstack>> porn shoot at the Porn Studio.'
+		else
+			$stat_msg += '<br>You can contract up to <<10-pornstack>> porn shoots at the Porn Studio.'
+		end
+	end
+	if hour < 22 and week >= 2 and week <= 4 and workKafe = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift at The Roadhouse cafe starting at 11:00.</font></b>'
+	if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and workSec = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Titran-Express from 9:00 to 17:00</font></b>'
+	if hour < 17 and week < 5 and PersSecWork = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'
+	if hour < 20 and week => 1 and week <= 5 and age < 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 16:00.</font></b>'
+	if hour < 16 and week => 1 and week <= 5 and age >= 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 8:00.</font></b>'
+	if hour < 16 and week > 1 and week <= 5 and workhosp = 1:$stat_msg += '<BR><b><font color="red">You work as a nurse in the city residential area clinic. Your shift starts at 8:00.</font></b>'
+	if hour < 10 and worksalon = 1 and (week = 1 or week = 3 or week = 5):$stat_msg += '<BR><b><font color = red>Today you have work as masseuse in beauty salon. Shift starts at 9:00.</font></b>'
+	if leonidVisit = 1 and hour < 21 and hour > 6: $stat_msg += '<br><b>You have to serve Leonid at 20:00 in his Pavlovsk office!</b>'
 end
 
 $stat_hypno_msg = ''
@@ -2107,54 +2185,6 @@ if hypnoAddict > 0:
 	end
 end
 
-if model > 0 and model_week = (daystart - week) / 7 and model_job_week >= 2:
-	$stat_msg += '<BR><b>You have no more modeling jobs available this week.</b>'
-elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week = 1:
-	$stat_msg += '<BR><b>You can get paid for 1 more modeling job this week.</b>'
-elseif model > 0 and model_week < (daystart - week) / 7 and model_job_week < 1:
-	$stat_msg += '<BR><b>You can get paid for 2 modeling jobs this week.</b>'
-end
-if pornstack > 0:
-	porndays = 0
-	:pfilmtime
-	if porndays < 200 and pfilmday[porndays] = 0: porndays += 1 & jump 'pfilmtime'
-end
-if pornstack > 0 and pfilmday[0] = 0:
-	if pfilmday[1] = 0:
-		$stat_msg += '<br><b>You will star in another porno in <<porndays>> days.</b>'
-	else
-		$stat_msg += '<br><b>You have a porno shoot scheduled tomorrow.</b>'
-	end
-end
-if pfilmday[0] > 0:
-	if pornnow = 1:
-		$stat_msg += '<br><b>You are at a porn shooting.</b>'
-	else
-		if hour < 11: $stat_msg += '<br><b>You are expected in the porno studio at 10:00.</b>'
-		if hour >= 11 and hour < 13: $stat_msg += '<br><b>You should be at the porno studio, shooting!</b>'
-		if hour >= 13: $stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
-	end
-end
-if pornmiss = 1: $stat_msg += '<br><b>You missed a scheduled porno shoot!</b>'
-if prodcosttrue > 0: $stat_msg += '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
-if firstkasting > 0 and pfilmNO < 1:
-	if pornstack <= 10:
-		$stat_msg += '<br>You are currently unable to book any more porn shoots at the Porn Studio.'
-	elseif pornstack = 11:
-		$stat_msg += '<br>You can contract <<10-pornstack>> porn shoot at the Porn Studio.'
-	else
-		$stat_msg += '<br>You can contract up to <<10-pornstack>> porn shoots at the Porn Studio.'
-	end
-end
-if hour < 22 and week >= 2 and week <= 4 and workKafe = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift at The Roadhouse cafe starting at 11:00.</font></b>'
-if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and workSec = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Titran-Express from 9:00 to 17:00</font></b>'
-if hour < 17 and week < 5 and PersSecWork = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'
-if hour < 20 and week => 1 and week <= 5 and age < 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 16:00.</font></b>'
-if hour < 16 and week => 1 and week <= 5 and age >= 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 8:00.</font></b>'
-if hour < 16 and week > 1 and week <= 5 and workhosp = 1:$stat_msg += '<BR><b><font color="red">You work as a nurse in the city residential area clinic. Your shift starts at 8:00.</font></b>'
-if hour < 10 and worksalon = 1 and (week = 1 or week = 3 or week = 5):$stat_msg += '<BR><b><font color = red>Today you have work as masseuse in beauty salon. Shift starts at 9:00.</font></b>'
-if leonidVisit = 1 and hour < 21 and hour > 6: $stat_msg += '<br><b>You have to serve Leonid at 20:00 in his Pavlovsk office!</b>'
-
 gs 'brother', 'brotherSexCount'
 
 !! List Current Active Spells