locations/AppearanceSystem.qsrc

@@ -136,22 +136,22 @@ if $ARGS[0] = 'SetBodyShapeBonus':
 			result = 8
 		end
 
+	! Succubus gets maximum appearance bonus
+	elseif succubusflag > 0:
+		result = func('body_structure', 'appearance_bonus', 22, 90)
+
 	!!Setting the pcs_apprnc bonus based on fat and strength
 	else
-		tempBodyShapeBonus = func('body_structure', 'appearance_bonus')
+		result = func('body_structure', 'appearance_bonus')
 
 		!!This modifies bodykoef for high or low pcs_mass['body'] values
 		if pcs_mass['body'] < 8 or pcs_mass['body'] >= 98:
-			tempBodyShapeBonus -= 8
+			result -= 8
 		elseif pcs_mass['body'] < 23 or pcs_mass['body'] >= 83:
-			tempBodyShapeBonus -= 4
+			result -= 4
 		end
 
-		if bodyVars['vofat'] > 0: tempBodyShapeBonus -= bodyVars['vofat']
-
-		result = tempBodyShapeBonus
-
-		killvar 'tempBodyShapeBonus'
+		result -= max(0, bodyVars['vofat'])
 	end
 end
 

locations/Cheatmenu_din.qsrc

@@ -1246,30 +1246,6 @@ $cheatmenu['stats'] = {
 	cla & *clr
 	gs 'obj_din', 'cheattabs'
 
-	!Set a floor and ceiling for all attributes and skills
-	loop_index = 0
-	:attr_trim_loop
-		dynamic "
-			if <<$att_name[loop_index]>>_lvl < 0: <<$att_name[loop_index]>>_lvl = 0
-			if <<$att_name[loop_index]>>_lvlst < 0: <<$att_name[loop_index]>>_lvlst = 0
-			if <<$att_name[loop_index]>>_lvl > 100: <<$att_name[loop_index]>>_lvl = 100
-			if <<$att_name[loop_index]>>_lvlst > 100: <<$att_name[loop_index]>>_lvlst = 100
-		"
-		loop_index += 1
-		if loop_index < arrsize('$att_name'): jump 'attr_trim_loop'
-
-	loop_index = 0
-	:skill_trim_loop
-		dynamic "
-			if <<$skl_name[loop_index]>>_lvl < 0: <<$skl_name[loop_index]>>_lvl = 0
-			if <<$skl_name[loop_index]>>_lvlst < 0: <<$skl_name[loop_index]>>_lvlst = 0
-			if <<$skl_name[loop_index]>>_lvl > 100: <<$skl_name[loop_index]>>_lvl = 100
-			if <<$skl_name[loop_index]>>_lvlst > 100: <<$skl_name[loop_index]>>_lvlst = 100
-		"
-		loop_index += 1
-		if loop_index < arrsize('$skl_name'): jump 'skill_trim_loop'
-	killvar 'loop_index'
-
 	'<center><h1>Cheat Menu - Attributes and Skills</h1></center>'
 	'<center><font color="red"><b>WARNING!</b></font>: Using cheats can cause bugs and break your save, use them with care. When reporting bugs, please mention any cheats you used.</center>'
 	*nl
@@ -2242,7 +2218,7 @@ $cheatmenu['theme_presets_copy'] = {
 	custom_theme['table_bg'] = theme['table_bg']
 	custom_theme['table_bg_alt'] = theme['table_bg_alt']
 
-	$custom_theme['is_dark'] = str(theme['is_dark'])
+	custom_theme['is_dark'] = theme['is_dark']
 
 	gs 'themes', 'set_custom'
 	dynamic $cheatmenu['theme_customize']
@@ -2261,7 +2237,7 @@ $cheatmenu['theme_export'] = {
 	"custom_theme['table_bg'] = <<custom_theme['table_bg']>>"
 	"custom_theme['table_bg_alt'] = <<custom_theme['table_bg_alt']>>"
 	""
-	"$custom_theme['is_dark'] = '<<$custom_theme['is_dark']>>'"
+	"custom_theme['is_dark'] = <<custom_theme['is_dark']>>"
 }
 
 $cheatmenu['theme_presets'] = {
@@ -2349,10 +2325,10 @@ $cheatmenu['theme_customize'] = {
 	!!  --- DARK MODE ---
 	*nl
 	*p 'Dark Mode&nbsp;'
-	if $custom_theme['is_dark'] = '0':
-		*pl '<a href="exec: $custom_theme[''is_dark''] = ''1'' & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/box<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
+	if custom_theme['is_dark'] = 0:
+		*pl '<a href="exec: custom_theme[''is_dark''] = 1 & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/box<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
 	else
-		*pl '<a href="exec: $custom_theme[''is_dark''] = ''0'' & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/check<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
+		*pl '<a href="exec: custom_theme[''is_dark''] = 0 & dynamic $cheatmenu[''theme_customize'']"><img src="images/system/ui/check<<$icon_selector>>.png" height="<<icon_height>>"></img></a>'
 	end
 
 	!!  --- INCREMENT ---

locations/FedorEv2.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = 'Train Tracks':
 		gs 'arousal', 'end'	
 		gs 'stat'			
 
-		act 'Walk home with Fedor': gt 'pav_residential'	
+		act 'Walk home with Fedor': gs 'homes_properties', 'go_straight_home'	
 	end	
 	act 'Offer him your hand':
 		*clr & cla
@@ -120,7 +120,7 @@ if $ARGS[0] = 'Train Tracks':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/nokiss.jpg"></center>'
 		'You think to yourself "This is going too fast." so you offer Fedor your hand. He is a little surprised at first but kisses your hand nonetheless. Fedor lowers your hand as he releases it and after a few moments of silence you notice a Fedor''s posture lowers as he turns away from you "It''s starting to get late, we should probably get going before your parents start to worry about you." He says, with a meek smile as he takes your hand and walks you home.'
 			
-		act 'Walk home with Fedor': gt 'pav_residential'
+		act 'Walk home with Fedor': gs 'homes_properties', 'go_straight_home'
 	end	
 end	
 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'Movie 4':
 		gs 'arousal', 'end'	
 		gs 'stat'			
 
-		act 'Go Home': gt 'korrPar'
+		act 'Go Home': gs 'homes_properties', 'go_straight_home'
 	end
 	
 	act 'Say goodbye and leave':
@@ -322,7 +322,7 @@ if $ARGS[0] = 'Movie 4':
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/endbye.mp4"></video></center>'
 		'You put your index finger on his lips. "Sorry but I just re-applied my lipstick." and then you back up into your apartment as you say, "Bye" Fedor then tilts his head downward and looks noticeably upset as you close the door.'
 
-		act 'Go Home': gt 'korrPar'
+		act 'Go Home': gs 'homes_properties', 'go_straight_home'
 	end
 end	
 	
@@ -364,7 +364,7 @@ if $ARGS[0] = 'Home':
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/endbye.mp4"></video></center>'
 				'You tell Fedor that you need to go and he wraps his arms around you, giving you a warm hug as he replies, "I understand, maybe next time." and he walks you home. Fedor fetches your coat and walks you out the door. When you arrive at your apartment, you give Fedor a soft kiss on the cheek. "Until next time." as you give him a wink and close the door.'
 								
-				act 'Go home': gt 'korrPar'
+				act 'Go home': gs 'homes_properties', 'go_straight_home'
 			end
 			
 			act 'How can I say no to that? <b><h4><font color=#ff00cc>[Go steady]</font></h4></b>':
@@ -609,7 +609,7 @@ if $ARGS[0] = 'Wash Up':
 			gs 'arousal', 'end'	
 			gs 'stat'
 				
-			act 'Go home': gt 'korrPar'
+			act 'Go home': gs 'homes_properties', 'go_straight_home'
 		end	
 	end	
 end
@@ -700,7 +700,7 @@ if $ARGS[0] = 'Skate Kiss':
 	gs 'arousal', 'end'	
 	gs 'stat'		
 	
-	act 'Walk home with Fedor': gt 'korrPar'
+	act 'Walk home with Fedor': gs 'homes_properties', 'go_straight_home'
 	
 	act 'I''ll be fine on my own': gt 'pav_residential'
 end
@@ -714,7 +714,7 @@ if $ARGS[0] = 'Skate End':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/Skate/skate5.jpg"></center>'
 	'You and Fedor decide that you''ve had enough skating for today, so you both sit down on a nearby bench and discuss your favorite subjects in school, along with past experiences. After a few minutes of chatting Fedor says, "I had a great time with you <<$pcs_firstname>>. Would you like me to walk you home or will you be fine on your own?"'
 	
-	act 'Walk home with Fedor': gt 'korrPar'
+	act 'Walk home with Fedor': gs 'homes_properties', 'go_straight_home'
 	
 	act 'I''ll be fine on my own': gt 'pav_residential'
 end
@@ -1031,7 +1031,7 @@ if $ARGS[0] = 'Park End':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/park/walk2.jpg"></center>'
-	'Fedor takes you by the hand then leads you to your apartment while you both chat about various things. When you arrive at your apartment, Fedor spins you around then gives you a passionate kiss as he pushes you against the wall for a more passionate kiss, before pulling off you and giving you a wink as he turns away and walks off.'
+	'Fedor takes you by the hand then leads you home, while you both chat about various things. When you arrive at your place, Fedor spins you around then gives you a passionate kiss as he pushes you against the wall for a more passionate kiss, before pulling off you and giving you a wink as he turns away and walks off.'
 	*nl	
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/endkiss.mp4"></video></center>'
 	gs 'boyStat', 'A5'
@@ -1039,7 +1039,7 @@ if $ARGS[0] = 'Park End':
 	gs 'arousal', 'end'	
 	gs 'stat'		
 	
-	act 'Leave': gt 'korrPar'
+	act 'Leave': gs 'homes_properties', 'go_straight_home'
 end		
 
 if $ARGS[0] = 'Fedor Breakup':

locations/FedorEv4.qsrc

@@ -724,7 +724,7 @@ if $ARGS[0] = 'End Date 2':
 	*nl
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/endkiss.mp4"></video></center>'
 
-	act 'Walk home':gt 'korrPar'
+	act 'Walk home': gs 'homes_properties', 'go_straight_home'
 end
 
 if $ARGS[0] = 'TV':
@@ -1406,7 +1406,7 @@ if $ARGS[0] = 'Dimka Aftermath':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console2.jpg"></center>'
 	'You approach Fedor, he stands up and hugs you. "I''m so sorry about not getting there in time. I can''t believe I was so careless and it was you that paid the price." You give Fedor an innocent smile as you place your hand on his cheek and say, "It''s alright Fyodor. He used to make me do things far worst than that." Fedor clenches his fists as he responds, "That fucking coward will never harm you again. I will make sure that he learns his place from now on."'
 	*nl
-	'You give Fedor a soft kiss. "I know that I will always be safe with you." Fedor looks into your eyes. "I will always love you <<$pcs_firstname>>." You reply, "And I, you, Fyodor" then you both share a long passionate kiss.'
+	'You give Fedor a soft kiss. "I know that I will always be safe with you." Fedor looks into your eyes. "I will always love you <<$pcs_firstname>>." You reply, "And I, you, Fedor" then you both share a long passionate kiss.'
 	*nl
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss2.mp4"></video></center>'
 

locations/KGstart.qsrc

@@ -96,7 +96,7 @@ if KFOnLineReaga > 0:
 			cls
 			$KGOLname = input("Enter your nickname")
 
-			if $KGOLname <= 0:msg 'Not valid nickname' & gt $curloc
+			if $KGOLname = '': msg 'Not valid nickname' & gt $curloc
 
 			'Your nickname <<$KGOLname>>'
 			'You must select the player race'

locations/NPCChanger.qsrc

@@ -61,19 +61,19 @@ end
 if $ARGS[0] = 'npcdisplay':
 	*nl 'NPC[A<<n>>] = '
 
-	if $npc_firstname['A<<n>>'] = 0:
-	*p ''
+	if isnum($npc_firstname['A<<n>>']):
+		*p ''
 	else
-	*p '<<$npc_firstname[''A<<n>>'']>>'
+		*p $npc_firstname['A<<n>>']
 	end
 
-	if $npc_firstname['A<<n>>'] = $npc_nickname['A<<n>>'] or $npc_nickname['A<<n>>'] = 0:
+	if $npc_firstname['A<<n>>'] = $npc_nickname['A<<n>>'] or isnum($npc_nickname['A<<n>>']):
 		*p''
 	else
 		*p ' "<<$npc_nickname[''A<<n>>'']>>"'
 	end
 
-	if $npc_lastname['a<<n>>'] = 0:
+	if isnum($npc_lastname['a<<n>>']):
 		*p ''
 	else
 		*p ' <<$npc_lastname[''A<<n>>'']>>'
@@ -81,10 +81,9 @@ if $ARGS[0] = 'npcdisplay':
 
 end
 if $ARGS[0] = 'selection':
-	s = input("Which NPC do you want to edit? Enter #")
-		!!cla
-		!!*clr
-	if s = '':
+	s = val(input("Which NPC do you want to edit? Enter #"))
+	!!*clr & cla
+	if s = 0:
 		n = (o - 10)
 		gt 'NPCChanger', 'NPCLoop'
 	else

locations/SMS_selfies.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'show_sms':
 	gs 'telefon', 'show_sms', SMSSelfieVars['SMSid']
 	$SMSMessage[SMSSelfieVars['SMSid']] = $temp_curSMS
 	$SMSReplies[SMSSelfieVars['SMSid']] = $temp_curReplies
-	SMSSelfieVars['text'] = ''
+	$SMSSelfieVars['text'] = ''
 	killvar 'temp_curSMS'
 	killvar 'temp_curReplies'
 end

locations/SMStext_builder.qsrc

@@ -274,7 +274,7 @@ if $ARGS[0] = 'add_sms':
 	end
 	gs 'telefon', 'add_sms', $ARGS[1], $SMSBuilderVars['text'], $SMSBuilderVars['replies'], $SMSBuilderImages[0], $SMSBuilderImages[1], $SMSBuilderImages[2], $SMSBuilderImages[3]
 	
-	SMSBuilderVars['replies'] = ''
+	$SMSBuilderVars['replies'] = ''
 
 elseif $ARGS[0] = 'show_sms':
 	if arrsize('SMSBuilderReplies') > 0:

locations/agentned.qsrc

@@ -187,7 +187,7 @@ if $ARGS[0] = 'sell':
 			'<h4>Available offers for your properties</h4>'
 			i = 0
 			:listing_offers_on_owned_properties_loop
-				if $property_code[i] ! 'matryona_mansion' or ($property_code[i] = 'matryona_mansion' and $property_construction_status[i] = 0):
+				if $property_code[i] ! 'matryona_mansion' or ($property_code[i] = 'matryona_mansion' and property_construction_status[i] = 0):
 					!! NOTE: Offer: (last sales price + rand(-10%, +10%)) + (renovation value + rand(0%,+10%)
 					!! 		 No need to check what has been renovated, the only thing that matters is the total value of the renovation
 					!! 		 If Sveta sells, this will be stored as the new sales price of the property

locations/anushapt.qsrc

@@ -278,7 +278,7 @@ if $ARGS[0] = 'home':
 			'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring and ask "Is Anushka home?"'
 			'He hooks his thumb over his shoulder to point down the hall. "She''s in her room, likely getting stoned or masturbating to porn or something."'
-			if maksim_blackmail >= 1:
+			if maksimQW['blackmail'] >= 1 and maksimQW['blackmail_flash'] <= 5:
 				*nl
 				'You ignore his comments and start to step around him, to enter the apartment. But he puts his arm up blocking you from entering.'
 				'You give him a look of annoyance. "Do you mind?"'
@@ -287,7 +287,7 @@ if $ARGS[0] = 'home':
 				'He laughs. "If you want to come in, that''s the price now. So pay up or fuck off." You sigh, you know the little snitch would tell Anushka, so do you just leave or flash him.'
 				act 'Leave': gt 'pav_complex', 'start'
 				act 'Flash Maksim': gt 'anushkamaksim', 'hallway_flash_tits'
-			elseif maksimQW['blackmail_flash'] > 5:
+			elseif maksimQW['blackmail_flash'] > 5 and maksimQW['blackmail_flash'] <= 10:
 				*nl
 				'You ignore his comments and start to step around him, to enter the apartment. But he puts his arm up blocking you from entering.'
 				'You sigh, knowing what he wants. "Fine!" You say as you start to show him your tits again.'

locations/anushaptbr.qsrc

@@ -1,9 +1,9 @@
 # anushaptbr
 !!2024/04/03
-!!maksimQW['QWstage'] = 1 - tracks the stage of his overall questline
-!!maksimQW['blackmail_flash'] += 1 - tracks how many times Sveta has been blackmailed after agreeing to it
-!!maksimQW['blackmail'] = 1 = shows if Sveta has agreed to be blackmailed
-!!maksimQW['nush_games'] += 1 shows how many times Sveta and Nush have played her brothers in video games
+!!maksimQW['QWstage'] - tracks the stage of his overall questline
+!!maksimQW['blackmail_flash']- tracks how many times Sveta has been blackmailed after agreeing to it
+!!maksimQW['blackmail'] shows if Sveta has agreed to be blackmailed
+!!maksimQW['nush_games'] shows how many times Sveta and Nush have played her brothers in video games
 
 if $ARGS[0] = 'brotherroom':
 	$menu_loc = 'anushaptbr'

locations/anushkaev2.qsrc

@@ -455,7 +455,7 @@ if $ARGS[0] = 'watch_nushval':
 			act 'Walk in and join them': gt 'anushkaev2', 'val3some'
 			act 'Keep watching':
 				*clr & cla
-				if rand(1,5) = 1 and maksim_blackmail ! 1:
+				if rand(1,5) = 1 and maksimQW['blackmail'] ! 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/caughtspying.jpg"></center>'
 					'As you''re watching, you''re so caught up in the action that you don''t notice your hand slide down to your crotch, nor hear the footsteps heading your way.'
 					'"What are you doing?" You nearly jump out of your skin and blush when you look back and see Maksim, cursing to yourself for being so foolish as to let yourself be caught spying.'
@@ -816,7 +816,7 @@ if $ARGS[0] = 'watch_nushmar':
 			act 'Leave apartment': gt 'pav_complex','start'
 			act 'Keep watching':
 				*clr & cla
-				if rand(1,5) = 1 and maksim_blackmail ! 1:
+				if rand(1,5) = 1 and maksimQW['blackmail'] ! 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/caughtspying.jpg"></center>'
 					'As you''re watching, you''re so caught up in the action that you don''t notice your hand slide down to your crotch, nor hear the footsteps heading your way.'
 					'"What are you doing?" You nearly jump out of your skin and blush when you look back and see Maksim, cursing to yourself for being so foolish as to let yourself be caught spying.'

locations/anushkamaksim.qsrc

@@ -10,7 +10,8 @@ if $ARGS[0] = 'maksim_blackmail':
 	'He grins at you and looks you over as if he''s giving it some serious thought. "For now, just show me your tits."'
 	act 'Show him your tits':
 		*clr & cla
-		maksimQW['blackmail'] = 1
+		maksimQW['blackmail'] += 1
+		maksimQW['blackmail_flash'] += 1
 		gs 'fame', 'pav', 'sex', 1
 		inhib_exp += rand(1,3)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/hallflashtits.jpg"></center>'
@@ -56,6 +57,7 @@ if $ARGS[0] = 'maksim_blackmail':
 							minut += 5
 							gs 'fame', 'pav', 'sex', 2
 							inhib_exp += rand(1,3)
+							maksimQW['blackmail_flash_friends'] += 1
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/maksim/flashtits1.jpg"></center>'
 							'You sigh as you pull aside your clothes and flash your breasts at them.'
 							'"Holy shit! She really did it!" They all look surprised, but Maksim just looks smug.'
@@ -90,6 +92,7 @@ if $ARGS[0] = 'maksim_blackmail':
 						'You give him a look of surprise and don''t move, but his stern glare tells you what will happen if you don''t.'
 
 						act 'Flash them your tits':
+							maksimQW['blackmail_flash_friends'] += 1
 							*clr & cla
 							minut += 5
 							gs 'fame', 'pav', 'sex', 2

locations/arousal.qsrc

@@ -1056,8 +1056,8 @@ end
 !!-----------------------------------------------
 
 !!workaround over use
-if $ARGS[0] ! 'auto_lube' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2':
-	if arousal_overcall = 0:
+if arousal_overcall = 0:
+	if $ARGS[0] ! 'auto_lube' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2':
 		$arousal_overcall = $ARGS[0]+$ARGS[2]+$ARGS[3]+$ARGS[4]+$ARGS[5]+$ARGS[6]+$ARGS[7]+$ARGS[8]
 		arousal_overcall = 1
 	end

locations/artem_chebotarev_schedule.qsrc

@@ -2,7 +2,7 @@
 !!2023/05/02
 
 
-$locat['A2'] = 0
+$locat['A2'] = ''
 
 if yearstart = 1:
 	!! Schedule for school year not yet done

locations/booty_call.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'sugar_daddy_scheduler2':
 !!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$sugar_daddy[i]] = daystart) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and (npc_big_fight[$sugar_daddy[i]] < daystart - 7 and daystart > 7):
 		if npc_sugar_daddy_timer[$sugar_daddy[i]] - (npc_rel[$sugar_daddy[i]] / 10) > daystart:
 			npc_no_booty_call[$sugar_daddy[i]] = daystart
-			
+
 		elseif (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
 			sugar_daddy_call[$sugar_daddy[i]] = 1
 			gs 'booty_call', 'sugar_daddy_scheduler3'
@@ -79,9 +79,9 @@ if $ARGS[0] = 'sugar_daddy_scheduler3':
 	end
 end
 
-!!	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0 or npc_end_free_time[$FuckBuddy[i]] = 0: 
+!!	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0 or npc_end_free_time[$FuckBuddy[i]] = 0:
 !!		$boy = $FuckBuddy[i]
-		
+
 !!	end
 
 !!		if ((rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and (rand(1,npc_rel[$FuckBuddy[i]]) > 0)) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
@@ -288,7 +288,7 @@ if $ARGS[0] = 'text1':
 		elseif booty_call['text'] = 3:
 			'	<b><font color="blue">fucking you on my bed</font></b>'
 		end
-		gs 'booty_call_start', 'text2'
+		gs 'booty_call', 'text2'
 	end
 
 	act'Me too':
@@ -385,7 +385,7 @@ if $ARGS[0] = 'invite_yourself1':
 			'<b><font color="pink">this is a booty call</font></b>'
 			'	<b><font color="blue">ill probably be free at 19:00</font></b>'
 			'	<b><font color="blue">wanna come then?</font></b>'
-			gs 'booty_call_start', 'invite_yourself2'
+			gs 'booty_call', 'invite_yourself2'
 		end
 
 		act'I wanna fuck':
@@ -394,7 +394,7 @@ if $ARGS[0] = 'invite_yourself1':
 			'<b><font color="pink">when do you get off?</font></b>'
 			'	<b><font color="blue">ill probably be free at 19:00</font></b>'
 			'	<b><font color="blue">wanna come then?</font></b>'
-			gs 'booty_call_start', 'invite_yourself2'
+			gs 'booty_call', 'invite_yourself2'
 		end
 	else
 		'	<b><font color="blue">i was thinking about your naked body in my bed</font></b>'
@@ -492,13 +492,13 @@ if $ARGS[0] = 'fb_npc_stat_update':
 			if rand(1,2) = 1:
 				npc_start_free_time[$npclastgenerated] = 8
 				npc_end_free_time[$npclastgenerated] = 12
-				
+
 				npc_work_start[$npclastgenerated] = 13
 				npc_work_end[$npclastgenerated] = 21
 			else
 				npc_start_free_time[$npclastgenerated] = 18
 				npc_end_free_time[$npclastgenerated] = 22
-				
+
 				npc_work_start[$npclastgenerated] = 9
 				npc_work_end[$npclastgenerated] = 17
 			end
@@ -537,13 +537,13 @@ if $ARGS[0] = 'sd_npc_stat_update':
 			if rand(1,2) = 1:
 				npc_start_free_time[$npclastgenerated] = 8
 				npc_end_free_time[$npclastgenerated] = 12
-				
+
 				npc_work_start[$npclastgenerated] = 13
 				npc_work_end[$npclastgenerated] = 21
 			else
 				npc_start_free_time[$npclastgenerated] = 18
 				npc_end_free_time[$npclastgenerated] = 22
-				
+
 				npc_work_start[$npclastgenerated] = 9
 				npc_work_end[$npclastgenerated] = 17
 			end

locations/boyStat.qsrc

@@ -27,7 +27,7 @@ end
 if mid($npcboytemp,1,1) = 'A' or mid($npcboytemp,1,1) = 'B' or mid($npcboytemp,1,1) = 'C':
 	$npclastcalled = $npcboytemp
 	npclastcalledn = val(mid($npcboytemp, 2))
-	if $npc_usedname[$npclastcalled]=0: $npc_usedname[$npclastcalled] = $npc_firstname[$npclastcalled] & !! this is a workaround which compensate incomplete settings in npc_static files, it can be removed later ...
+	if isnum($npc_usedname[$npclastcalled]) or $npc_usedname[$npclastcalled] = '': $npc_usedname[$npclastcalled] = $npc_firstname[$npclastcalled] & !! this is a workaround which compensate incomplete settings in npc_static files, it can be removed later ...
 	$bstemp[1] = $npc_usedname[$npclastcalled]
 	bstemp[2] = npc_dick[$npclastcalled]
 	$bstemp[3] = $npc_thdick[$npclastcalled]
@@ -103,9 +103,7 @@ elseif $ARGS[1] = 'f':
 	$dick_girth6 = $bstemp[3]
 	silavag6 = bstemp[4]
 else
-	boyStat_i = ARGS[1]
-	!! check if $ARGS[1] is an empty string or not
-	if $ARGS[1] ! 0 and isnum($ARGS[1]) ! 0: boyStat_i = val($ARGS[1])
+	boyStat_i = max(ARGS[1], val($ARGS[1]))
 	$boy[boyStat_i] = $npclastcalled
 	$boydesc[boyStat_i] = $bstemp[1]
 	dick[boyStat_i] = bstemp[2]

locations/brother_voyeur.qsrc

@@ -781,10 +781,8 @@ if $ARGS[0] = 'brother_shower_shave':
 	else
 		'"Yeah, you''re probably right. I should shave," you say looking down at yourself, frowning at the growing body hair.'
 	end
-	
-	if pcs_leghair > 3 and pcs_pubes > 3 and mc_inventory['razor'] < razors_to_use['all']:
-		msg'As you pick up your razor, you realize that it''s probably only sharp enough for one more use. You''ll have to decide between a <<$pc_desc[''pubes'']>> pussy or <<$pc_desc[''legs'']>> legs.'
-	else
+
+	if pcs_leghair <= 3 and pcs_pubes <= 3:
 		*nl
 		'You don''t have enough hair on either your legs of pussy for you to need shave.'
 		'"Sorry bro but I don''t need to shave. Give a couple of days and I can show you." You say to the now a bit disappointed Kolka but there''s not much you can do about that.'
@@ -793,10 +791,15 @@ if $ARGS[0] = 'brother_shower_shave':
 			act'Put his hand on your pussy': gs 'brother_shower_sex', 'sex_menu'
 		end
 		act 'Finish showering together': gt 'brother_voyeur', 'brother_shower_end'
+	else
+		if mc_inventory['razor'] < razors_to_use['all']:
+			msg'As you pick up your razor, you realize that it''s probably only sharp enough for one more use. You''ll have to decide between a <<$pc_desc[''pubes'']>> pussy or <<$pc_desc[''legs'']>> legs.'
+		else
+			gs 'brother_voyeur', 'shave_both'
+		end
+		gs 'brother_voyeur', 'shave_legs'
+		gs 'brother_voyeur', 'shave_pussy'
 	end
-	gs 'brother_voyeur', 'shave_both'
-	gs 'brother_voyeur', 'shave_legs'
-	gs 'brother_voyeur', 'shave_pussy'
 end
 
 if $ARGS[0] = 'shave_both':
@@ -836,7 +839,7 @@ if $ARGS[0] = 'shave_both':
 						end
 					else
 						cla & *clr
-						gs 'stat'						
+						gs 'stat'
 						'Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the feeling.'
 						'You put your hands on either side of your pussy and say, "Well? Satisfied now?"'
 						'"Yeah..." he says, trailing off at the end, obviously hypnotized by your pussy, causing you to roll your eyes.'
@@ -882,12 +885,12 @@ if $ARGS[0] = 'shave_legs':
 								cla & *nl
 								'"That''s not what I said. I said I''d shave just because you asked. I didn''t say what exactly I''d be shaving or that I''d do everything you tell me to."'
 								'"Hrmph." Kolka seems disappointed. Once you''re finished you gently glide your hands over your smooth legs, making sure you didn''t miss a spot.'
-								
+
 								gs 'brother_voyeur', 'shower_end'
 							end
 
 							act'I guess I did': brother_shower['shave_request'] = 1 & gt 'brother_voyeur', 'brother_shower_shave'
-							
+
 							act'Oh alright': brother_shower['shave_request'] = 2 & gt 'brother_voyeur', 'brother_shower_shave'
 						end
 
@@ -905,7 +908,7 @@ if $ARGS[0] = 'shave_legs':
 									cla
 									'"Sorry little brother, you''re not going to change my mind that easily. I said I''d shave just because you asked. I didn''t say that I''d do everything you asked."'
 									'"Hmph. I still think you''d look better if you just kept it smooth..." he mutters while you gently glide your hands over your smooth legs, making sure you didn''t miss a spot.'
-									
+
 									gs 'brother_voyeur', 'shower_end'
 								end
 
@@ -932,7 +935,7 @@ if $ARGS[0] = 'shave_legs':
 									cla & *nl
 									'"Sorry little brother, you''re not going to change my mind that easily. I said I''d shave just because you asked. I didn''t say that I''d shave everything you wanted."'
 									'"Hmph. I still think you''d look better if you just kept it smooth..." he mutters while you gently glide your hands over your smooth legs, making sure you didn''t miss a spot.'
-									
+
 									gs 'brother_voyeur', 'shower_end'
 								end
 
@@ -1011,7 +1014,7 @@ if $ARGS[0] = 'shave_pussy':
 				'"Yeah, I guess I could use a trim."'
 				'You lather up your crotch and then start carefully shaving your pussy.'
 			end
-			
+
 			if pcs_leghair > 3:
 				'Kolka frowns. "You''re not going to shave your legs?"'
 				if mc_inventory['razor'] < razors_to_use['legs']:
@@ -1277,7 +1280,7 @@ if $ARGS[0] = 'shave':
 				'"Hmm..." He seems disappointed.'
 				act 'Dry off': gt 'brother_voyeur', 'dryoff'
 			end
-			
+
 			if pcs_pubes < 21:
 				act'"Nope! I''m thinking of growing it out"':
 					cla
@@ -1300,7 +1303,7 @@ if $ARGS[0] = 'shave':
 					act 'Dry off': gt 'brother_voyeur', 'dryoff'
 				end
 			end
-			
+
 			if pcs_pubes > 10:
 				act'"I like it like this!"':
 					cla
@@ -1598,7 +1601,7 @@ if $ARGS[0] = 'shave_not_done':
 			act 'Dry off': gt 'brother_voyeur', 'dryoff'
 		end
 	end
-	
+
 	act'Indulge him':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'

locations/camera.qsrc

@@ -135,7 +135,7 @@ if $ARGS[0] = 'start':
 		! Assign the variables
 		dynamic $camera_locations[iterator]
 		! Show the player unphotographed locations
-		if camera_found[$camera_event] ! 1: '<<$camera_description>>'
+		if camera_found[$camera_event] ! 1: $camera_description
 		iterator += 1
 		if iterator < location_count: jump 'location_loop'
 	end
@@ -148,7 +148,7 @@ if $ARGS[0] = 'start':
 		! Assign the variables
 		dynamic $camera_people[iterator]
 		! If the subject has not been photographed and requirements are met (-1), show the name
-		if camera_found[$camera_event] ! 1 and camera_requirement = -1: '<<$camera_description>>'
+		if camera_found[$camera_event] ! 1 and camera_requirement = -1: $camera_description
 		iterator += 1
 		if iterator < people_count: jump 'people_loop'
 	end
@@ -158,7 +158,7 @@ end
 
 if $ARGS[0] = 'check_location':
 	! If the player has a camera and this location exists in the array
-	if photographyEv >= 2 and $camera_locations[$loc] ! 0:
+	if photographyEv >= 2 and arrpos('$camera_locations', $loc) >= 0:
 		! Assign the variables
 		dynamic $camera_locations[$loc]
 		! If they have not already photographed the location
@@ -181,7 +181,7 @@ end
 
 if $ARGS[0] = 'check_person':
     ! If the player has a camera and this person exists in the array
-    if photographyEv >= 2 and $camera_people[$ARGS[1]] ! 0:
+    if photographyEv >= 2 and arrpos('$camera_people', $ARGS[1]) >= 0:
         ! Assign the variables
         dynamic $camera_people[$ARGS[1]]
         ! If they have not already photographed the person

locations/cikl.qsrc

@@ -164,13 +164,13 @@ if husbandMark = 1 and husband <= 10:
 end
 
 !! after having surgery you will be in recuperation for a few days
-
-if surgeryday ! '':
+if surgeryday > 0:
 	if daystart - 7 <= surgeryday:
 		dailyhealthimprov = (daystart - surgeryday) * 50
 		pcs_health = dailyhealthimprov
 		recuperation = 1
 	else
+		killvar 'surgeryday'
 		killvar 'recuperation'
 		killvar 'dailyhealthimprov'
 	end

locations/din_bad.qsrc

@@ -595,7 +595,7 @@ if $ARGS[0] = 'set_bc_reminder':
 	birth_control['remind_hour'] = input ("When do you want to set your reminder? (Pick an hour 1 - 22. An icon will appear in the stat display during that hour to remind you to take your pill.)")
 	if birth_control['remind_hour'] < 1 or birth_control['remind_hour'] > 22:
 		msg 'Invalid reminder input. Pick an hour between 1 and 22.'
-		jump 'invalid_bc_reminder'
+		jump 'invalid_bc_reminder_loop'
 	else
 		msg 'You set a reminder on your phone to take your birth control pill at <<birth_control[''remind_hour'']>>.'
 		if tabloc = 0:

locations/emp_functions.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'job_info':
 	$msg_body += '<p>Notes: ' + $emp_job_notes[j_id]+ '</p>'
 	$msg_body += '<p>Wages: ' + func('agentned', 'format_price_string', emp_job_wages[j_id]) + '<b>₽</b></p>'
 
-	msg '<<$msg_body>>'
+	msg $msg_body
 	killvar '$msg_body'
 end
 
@@ -300,17 +300,14 @@ if $ARGS[0] = 'gen_evt':
 	transient_evt_minutes = rand(0, 9)
 
 	!! Set as multiples of 60
-	if transient_evt_duration = '':
-		transient_evt_duration = rand(1,8)
-	end
-	!! logic check for when randomising event duration
+	if transient_evt_duration <= 0: transient_evt_duration = rand(1,8)
 
+	!! logic check for when randomising event duration
 	if transient_evt_duration + transient_evt_hour >= 22:
 		transient_evt_hour = 22 - transient_evt_duration
 	end
 
 	!! find a suitable date
-
 	srch_day_u = rnd_day + 7
 	if srch_day_u >= monthsend[transient_evt_month]:
 		srch_day_u = monthsend[transient_evt_month]
@@ -476,7 +473,7 @@ end
 
 if $ARGS[0] = 'evt_day_suffix':
 
-	if ARGS[1] ! '':
+	if ARGS[1] ! 0:
 		query_day = ARGS[1]
 	else
 		query_day = transient_evt_day
@@ -486,7 +483,7 @@ if $ARGS[0] = 'evt_day_suffix':
 	else
 		test_day = query_day
 	end
-	if transient_evt_day ! '':
+	if transient_evt_day ! 0:
 		if test_day => 4 and test_day <= 10:
 			$evt_suffix = 'th'
 		elseif test_day = 1 or test_day = 31:

locations/gad_gphouse.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'start':
 	$locclass = 'singleroom'
 	display_bb = 1
 	frost = 0
-	
+
 	gs 'homes_properties', 'give_access', 'grandparents_house'
 
 	gs 'gad_gphouse', 'nudity_trouble_limit'
@@ -361,9 +361,9 @@ if $ARGS[0] = 'main':
 		'Your grandparents are asleep. They sleep in separate beds, which is strange since they''re still madly in love.'
 	end
 
-	if locat['A60'] = 21: 
+	if locat['A60'] = 21:
 		if MiraVars['guest'] = 0:
-			MiraVars['follow_time'] = 1
+			if MiraVars['follow_time'] < 1: MiraVars['follow_time'] = 1
 			gt 'gad_gphouse', 'start'
 		else
 			MiraVars['follow_time'] = 0
@@ -472,7 +472,7 @@ if $ARGS[0] = 'main':
 	if mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
 
 	if pcs_sewng >= 80:
-		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+		if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0:
 			act'Start a new tapestry': gt 'sewing', 'tapestry'
 		elseif newgobelen >= 1:
 			'Your tapestry is <<newgobelen/10>> percent finished.'

locations/goplust.qsrc

@@ -108,7 +108,7 @@ $namgop[0] = ''
 $gopnik = ''
 
 if gopV = 1:
-	$gopnik += '<<$gopV>>'
+	$gopnik += $gopV
 	if gopB + gopVi + gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopB + gopVi + gopK + gopU + gopS = 1:
@@ -117,7 +117,7 @@ if gopV = 1:
 end
 
 if $namgop[1] ! '':
-	$namgop[0] += '<<$namgop[1]>>'
+	$namgop[0] += $namgop[1]
 	if namgop[2] + namgop[3] + namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[2] + namgop[3] + namgop[4] + namgop[5] + namgop[6] = 1:
@@ -126,7 +126,7 @@ if $namgop[1] ! '':
 end
 
 if gopB = 1:
-	$gopnik += '<<$gopB>>'
+	$gopnik += $gopB
 	if gopVi + gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopVi + gopK + gopU + gopS = 1:
@@ -135,7 +135,7 @@ if gopB = 1:
 end
 
 if $namgop[2] ! '':
-	$namgop[0] += '<<$namgop[2]>>'
+	$namgop[0] += $namgop[2]
 	if namgop[3] + namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[3] + namgop[4] + namgop[5] + namgop[6] = 1:
@@ -144,7 +144,7 @@ if $namgop[2] ! '':
 end
 
 if gopVi = 1:
-	$gopnik += '<<$gopVi>>'
+	$gopnik += $gopVi
 	if gopK + gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopK + gopU + gopS = 1:
@@ -152,8 +152,8 @@ if gopVi = 1:
 	end
 end
 
-if namgop[3] ! '':
-	$namgop[0] += '<<$namgop[3]>>'
+if $namgop[3] ! '':
+	$namgop[0] += $namgop[3]
 	if namgop[4] + namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[4] + namgop[5] + namgop[6] = 1:
@@ -162,7 +162,7 @@ if namgop[3] ! '':
 end
 
 if gopK = 1:
-	$gopnik += '<<$gopK>>'
+	$gopnik += $gopK
 	if gopU + gopS > 1:
 		$gopnik += ', '
 	elseif gopU + gopS = 1:
@@ -170,8 +170,8 @@ if gopK = 1:
 	end
 end
 
-if namgop[4] ! '':
-	$namgop[0] += '<<$namgop[4]>>'
+if $namgop[4] ! '':
+	$namgop[0] += $namgop[4]
 	if namgop[5] + namgop[6] > 1:
 		$namgop[0] += ', '
 	elseif namgop[5] + namgop[6] = 1:
@@ -180,18 +180,18 @@ if namgop[4] ! '':
 end
 
 if gopU = 1:
-	$gopnik += '<<$gopU>>'
+	$gopnik += $gopU
 	if gopS = 1:$gopnik += ' and '
 end
 
-if namgop[5] ! '':
-	$namgop[0] += '<<$namgop[5]>>'
+if $namgop[5] ! '':
+	$namgop[0] += $namgop[5]
 	if namgop[6] = 1:$gopnik += ' and '
 end
 
-if gopS = 1:$gopnik += '<<$gopS>>'
+if gopS = 1:$gopnik += $gopS
 
-if namgop[6] ! '':$namgop[0] += '<<$namgop[6]>>'
+if $namgop[6] ! '':$namgop[0] += $namgop[6]
 
 $namgop[0] += ' strip off your clothes and get out their members'
 

locations/gschool_chats.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'nerds':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/nerd' + rand(1,3) + '.jpg"></center>'
 		if PCloStyle2 = 4:
-			if PCloInhibit <= 10:
+			if PCloInhibit <= 5:
 				grupvalue[3] += 1
 				if fame['pav_sex'] > 0: gs 'fame', 'pav', 'sex', -1
 				gs 'gschool_socialchg', 'group_rel_change', 'nerds', 1
@@ -51,7 +51,7 @@ if $ARGS[0] = 'nerds':
 					else
 						'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
 					end
-				elseif CloStyle = 2:
+				elseif PCloStyle = 2:
 					grupvalue[3] -= 1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
@@ -73,7 +73,7 @@ if $ARGS[0] = 'nerds':
 				*nl
 				gs 'gschool_groups', 'nerds'
 			elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-				if PCloInhibit >= 35:
+				if PCloInhibit >= 35 or PCloTopCut = 4:
 					grupvalue[3] -= 1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
 					if soniaPS > 0: gs 'npc_relationship', 'modify', 'A25', 'like'
@@ -83,7 +83,7 @@ if $ARGS[0] = 'nerds':
 					else
 						'You go to the classrooms that the nerdy students like to hang out in and find them, as always, all nerding around a table talking and engaging in various personal projects. Several of them look up as you walk closer. Artem and Petka both seem to be struggling to hide their judgmental stares about your choice of uniform and you don''t find the look Julia has in her eyes all that comforting either.'
 					end
-				elseif CloStyle = 2:
+				elseif PCloStyle = 2:
 					grupvalue[3] -= 1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
 					gs 'gschool_socialchg', 'group_rel_change', 'nerds', -1
@@ -293,7 +293,7 @@ if $ARGS[0] = 'cooljocks':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
 		'When the break finally comes, the girls wander through the hallways of the school, gossiping about pretty much everyone they know while the guys are standing around in small groups, some of them sneaking off to have a smoke behind the school building.'
 		if PCloStyle2 = 4:
-			if PCloInhibit <= 10:
+			if PCloInhibit <= 5:
 				if fame['pav_sex'] > 0: gs 'fame', 'pav', 'sex', -1
 				grupvalue[1] -= 5
 				grupvalue[2] -= 3
@@ -341,7 +341,7 @@ if $ARGS[0] = 'cooljocks':
 					'As you approach, everyone is staring at you. Irina speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the others laugh and you can sense the general feeling of agreement from the rest.'
 					'Dimka smirks. "Maybe she messed up the wash and her uniform shrunk, but she was too stupid to notice?"'
 					'Bella steps forward. "Looks like someone is looking for a good time." You hear several murmurs of agreement from the others. It looks like even Igor, Katja, Vicky, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Albina, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
-				elseif CloStyle = 2:
+				elseif PCloStyle = 2:
 					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
 					grupvalue[1] -= 5
 					gs 'gschool_socialchg', 'group_rel_change', 'jocks', -1
@@ -377,7 +377,7 @@ if $ARGS[0] = 'cooljocks':
 				gs 'gschool_groups', 'jocks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-				if PCloInhibit >= 35:
+				if PCloInhibit >= 35 or PCloTopCut = 4:
 					gs 'fame', 'pav', 'sex', 5
 					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
 					grupvalue[1] -= 5
@@ -393,7 +393,7 @@ if $ARGS[0] = 'cooljocks':
 					'As you approach, everyone is staring at you. Irina speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the others laugh and you can sense the general feeling of agreement from the rest.'
 					'Dimka smirks. "Maybe she messed up the wash and her uniform shrunk, but she was too stupid to notice?"'
 					'Bella steps forward. "Looks like someone is looking for a good time." You hear several murmurs of agreement from the others. It looks like even Igor, Katja, Vicky, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Albina, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Christina, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
-				elseif CloStyle = 2:
+				elseif PCloStyle = 2:
 					gs 'gschool_socialchg', 'group_rel_change', 'cool kids', -1
 					grupvalue[1] -= 5
 					gs 'gschool_socialchg', 'group_rel_change', 'jocks', -1

locations/homes_properties.qsrc

@@ -90,7 +90,7 @@ if $ARGS[0] = 'set_access':
 	orig_status_code = accessible_property[$propcode]
 	new_status_code = ARGS[2]
 	if orig_status_code ! new_status_code:
-		if $accessible_property[$propcode] = '' or accessible_property['<<$propcode>>-display'] = '' or accessible_property['<<$propcode>>-name'] = '':
+		if $accessible_property[$propcode] = '' or $accessible_property['<<$propcode>>-display'] = '' or $accessible_property['<<$propcode>>-name'] = '':
 			if $property['code'] ! $propcode: 				
 				gs 'homes_properties_attr', 'get_property_attr', $propcode	
 			else
@@ -538,10 +538,8 @@ if $ARGS[0] = 'get_properties_for_sale':
 			$getforsalespropcode = $homes[i]
 			if $getforsalespropcode ! '' and checked_homes[$getforsalespropcode] = 0 and accessible_property[$getforsalespropcode] < 2:
 				checked_homes[$getforsalespropcode] = 1
-				if accessible_property[$getforsalespropcode] = '': 
-					gs 'homes_properties_attr', 'get_property_attr', $getforsalespropcode
-				end
-				ishome = iif(accessible_property[$getforsalespropcode] = '', INSTR($property['type'], 'residence') > 0, INSTR($accessible_property['<<$getforsalespropcode>>-type'], 'residence') > 0 )
+				if $accessible_property[$getforsalespropcode] = '': gs 'homes_properties_attr', 'get_property_attr', $getforsalespropcode
+				ishome = iif($accessible_property[$getforsalespropcode] = '', INSTR($property['type'], 'residence') > 0, INSTR($accessible_property['<<$getforsalespropcode>>-type'], 'residence') > 0 )
 				hasprice = iif($accessible_property[$getforsalespropcode] = '', property['price'] > 0, accessible_property['<<$getforsalespropcode>>-sales-price'] > 0)
 				if (($ARGS[1] ! 'home' and ishome = 0) or ($ARGS[1] ! 'business' and ishome)) and hasprice:
 					$property_code[j] = $getforsalespropcode
@@ -586,7 +584,7 @@ if $ARGS[0] = 'get_properties_for_rent':
 			$getpropforrentcode = $homes[i]
 			if $getpropforrentcode ! '' and checked_homes[$getpropforrentcode] = 0 and accessible_property[$getpropforrentcode] = 0:
 				checked_homes[$getpropforrentcode] = 1
-				if accessible_property[$getpropforrentcode] = '': gs 'homes_properties_attr', 'get_property_attr', $getpropforrentcode
+				if $accessible_property[$getpropforrentcode] = '': gs 'homes_properties_attr', 'get_property_attr', $getpropforrentcode
 				ishome = iif($accessible_property[$getpropforrentcode] = '', INSTR($property['type'], 'residence') > 1, INSTR($accessible_property['<<$getpropforrentcode>>-type'], 'residence') > 1 )
 				isrental = iif($accessible_property[$getpropforrentcode] = '', property['rental'] = 1, accessible_property['<<$getpropforrentcode>>-rental'] = 1 )
 				if (($ARGS[1] ! 'home' and ishome = 0) or ($ARGS[1] ! 'business' and ishome)) and isrental:			
@@ -838,7 +836,7 @@ end
 !!
 !! $ARGS[1] - property code
 if $ARGS[0] = 'get_property_sales_price':
-	if accessible_property[$ARGS[1]] ! '':
+	if $accessible_property[$ARGS[1]] ! '':
 		result = accessible_property['<<$ARGS[1]>>-sales-price']
 	else
 		gs 'homes_properties_attr', 'get_property_attr', $ARGS[1]

locations/indiktab.qsrc

@@ -23,7 +23,7 @@ if ARGS[3] > 0: indiktab['bar_phantom'] = min(max(ARGS[3] - indiktab['bar_progre
 !{if Enable_Android = 1:
 	$indiktab['bar_bg_color'] = 'gray'
 else}
-$indiktab['bar_bg_color'] = $bcolor
+! $indiktab['bar_bg_color'] = $bcolor
 ! end
 
 if ARGS[0] = 1:
@@ -140,35 +140,42 @@ end
 
 $result = '<TABLE  cellpadding="1" cellspacing="0" width="200"><TR>'
 if indiktab['bar_progress'] >= ARGS[3]:
-	if indiktab['bar_progress'] = 100: $indiktab['bar_bg_color'] = $indiktab['bar_color']
+	! if indiktab['bar_progress'] = 100: $indiktab['bar_bg_color'] = $indiktab['bar_color']
 
 	if indiktab['bar_progress'] > indiktab['label_width']:
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"' & !! bar
 		$result += 'align="right"><font color ="<<$indiktab[''bar_label'']>>"><<ARGS[2]>></font>&nbsp;</TD>' & !! label
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		$result += '<TD width="<<100 - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		! bgcolor="<<$indiktab[''bar_bg_color'']>>"
 	else
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"></TD>' & !! bar
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_progress'']>>%"' & !! background
-		$result += 'align="left">&nbsp;<font color ="<<$fcolor>>"><<ARGS[2]>></font></TD>' & !! label
+		$result += '<TD width="<<100 - indiktab[''bar_progress'']>>%"' & !! background
+		! bgcolor="<<$indiktab[''bar_bg_color'']>>"
+		$result += 'align="left">&nbsp;<<ARGS[2]>></TD>' & !! label
+		! <font color ="<<$fcolor>>"></font>
 	end
 else
-	if indiktab['bar_progress'] + indiktab['bar_phantom'] = 100: $indiktab['bar_bg_color'] = $indiktab['phantom_color']
+	! if indiktab['bar_progress'] + indiktab['bar_phantom'] = 100: $indiktab['bar_bg_color'] = $indiktab['phantom_color']
 
 	if indiktab['bar_progress'] > indiktab['label_width']:
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"' & !! bar
 		$result += 'align="right"><font color ="<<$indiktab[''bar_label'']>>"><<ARGS[2]>></font>&nbsp;</TD>' & !! label
 		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"></TD>' & !! phantom
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		$result += '<TD width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		! bgcolor="<<$indiktab[''bar_bg_color'']>>"
 	elseif indiktab['bar_phantom'] > indiktab['label_width']:
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"></TD>' & !! bar
 		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"' & !! phantom
 		$result += 'align="left">&nbsp;<font color ="<<$indiktab[''phantom_label'']>>"><<ARGS[2]>></font></TD>' & !! label
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		$result += '<TD width="<<100 - indiktab[''bar_phantom''] - indiktab[''bar_progress'']>>%"></TD>' & !! background
+		! bgcolor="<<$indiktab[''bar_bg_color'']>>"
 	else
 		$result += '<TD bgcolor="<<$indiktab[''bar_color'']>>" width="<<indiktab[''bar_progress'']>>%"></TD>' & !! bar
 		$result += '<TD bgcolor="<<$indiktab[''phantom_color'']>>" width="<<indiktab[''bar_phantom'']>>%"></TD>' & !! phantom
-		$result += '<TD bgcolor="<<$indiktab[''bar_bg_color'']>>" width="<<100 - indiktab[''bar_progress'']>>%"' & !! background
-		$result += 'align="left">&nbsp;<font color ="<<$fcolor>>"><<ARGS[2]>></font></TD>' & !! label
+		$result += '<TD width="<<100 - indiktab[''bar_progress'']>>%"' & !! background
+		! bgcolor="<<$indiktab[''bar_bg_color'']>>"
+		$result += 'align="left">&nbsp;<<ARGS[2]>></TD>' & !! label
+		! <font color ="<<$fcolor>>"></font>
 	end
 end
 $result += '</TR></TABLE>'

locations/intro_customization.qsrc

@@ -384,7 +384,7 @@ if $ARGS[0] = 'modpur':
 	act 'I do not want a purse':
 		bag = 0
 		$currentpursetype = ''
-		currentpursenumber = ''
+		currentpursenumber = 0
 		gt 'intro_customization','modpur'
 	end	
 end

locations/katja_uni.qsrc

@@ -910,7 +910,7 @@ if $ARGS[0] = 'studying_ask':
 		end	
 	else
 		iif(npc_rel['A14'] >= 70 or katjaQW['QWstage'] > 0, '"I would love to study with you,"', '"Sounds like a good idea,"')+' she says, making space for you to sit next to her.'
-		act 'Start studying together': gt 'katja_uni', 'studying', '<<$ARGS[1]>>', '<<$ARGS[2]>>'
+		act 'Start studying together': gt 'katja_uni', 'studying', $ARGS[1], $ARGS[2]
 	end
 end
 
@@ -919,7 +919,7 @@ if $ARGS[0] = 'studying':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/studying_together.jpg"></center>'
 	minut += 15
 	modifier = dyneval('RESULT = max(npc_intel[''<<$ARGS[5]>>''], pcs_intel) + (max(10+min(npc_intel[''<<$ARGS[5]>>''] -pcs_intel, pcs_intel -npc_intel[''<<$ARGS[5]>>'']),0)*(100 - max(npc_intel[''<<$ARGS[5]>>''], pcs_intel)))/50')
-	gs 'grades', 'optional_activity_attribute', '<<$ARGS[1]>>', '<<$ARGS[2]>>', 'yes', min(modifier+10,100)
+	gs 'grades', 'optional_activity_attribute', $ARGS[1], $ARGS[2], 'yes', min(modifier+10,100)
 	killvar 'modifier'
 	gs 'npc_relationship', 'modify', 'A14', 'like'
 	gs 'stat'
@@ -982,7 +982,7 @@ if $ARGS[0] = 'studying_exam_ask':
 		end	
 	else
 		iif(npc_rel['A14'] >= 70 or katjaQW['QWstage'] > 0, '"I would love to study with you for the <<$ARGS[2]>> exam"', '"Sounds like a good idea,"')+' she says, making space for you to sit next to her.'
-		act 'Start studying together': gt 'katja_uni', 'studying_exam', '<<$ARGS[1]>>', '<<$ARGS[2]>>'
+		act 'Start studying together': gt 'katja_uni', 'studying_exam', $ARGS[1], $ARGS[2]
 	end
 end
 
@@ -1064,7 +1064,7 @@ if $ARGS[0] = 'studying_exam':
 		else
 			'You study for half an hour and believe that you''re improving a lot.'
 		end		
-		gs 'grades', 'grade_award', '<<$ARGS[1]>>', '<<$ARGS[2]>>', study_mod
+		gs 'grades', 'grade_award', $ARGS[1], $ARGS[2], study_mod
 	end
 	
 	gs 'stat'
@@ -1072,8 +1072,7 @@ if $ARGS[0] = 'studying_exam':
 	killvar 'modifier'
 	killvar 'study_mod'
 	
-	if (week < 6 or hour < 23) and hour > 7 and 'no_study' = 0:
-		killvar 'no_study'
+	if (week < 6 or hour < 23) and hour > 7 and no_study = 0:
 		act 'Say goodbye to Katja and return to the library entrance':
 			killvar 'no_study'
 			minut += 2
@@ -1087,7 +1086,7 @@ if $ARGS[0] = 'studying_exam':
 			'She leaves the library, giving you a wave and a smile on the way out.'
 		end
 	else
-		if 'no_study' = 0:
+		if no_study = 0:
 			'"Well, it looks like the library is closing up," Katja says, reaching to pack up her stuff. "But it was nice studying together. We should do it again sometime!"'
 			'You leave together, parting ways at the entrance with a wave and a smile.'
 		else

locations/lact_bp.qsrc

@@ -72,8 +72,8 @@ if $ARGS[0] = 'build_bp':
 	bpID_arr[bp_i] = bp_i
 	bpType_arr[bp_i] = ARGS[1]
 	bpLocID_arr[bp_i] = ARGS[2]
-	bpbID1_arr[bp_i] = ''
-	bpbID2_arr[bp_i] = ''
+	bpbID1_arr[bp_i] = -1
+	bpbID2_arr[bp_i] = -1
 	result = bp_i
 end
 

locations/mey_home.qsrc

@@ -40,7 +40,7 @@ if $args[0] = 'door':
 			if frost > 0: frost = 0
 			act 'Enter': minut += 1 & gt 'mey_home', 'start'
 		end
-	elseif locat['katja'] = 7:
+	elseif locat['katja'] = 7 and katjaQW['QWstage'] > 1:
 		cla
 		'You walk up to the Meynolds residence and ring the doorbell...'
 		'Katja opens the door and quickly drags you to her room.'

locations/miroslava.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	! MiraVars['QW'] = 11 Guys fuck Mira after she pissed at party
 	! MiraVars['QW'] = 12 PC tells her about it
 	! MiraVars['QW'] += Mira pose as a prostitute
-	
+
 	! daystart < MiraVars['emb_day'] hiding in her house after 3rd wish. Reduces 1 per day, plus 1 more per day if you talk to her
 
 	gs 'miroslava', 'miraclothes'
@@ -506,7 +506,7 @@ if $ARGS[0] = 'cattle_chore_acts':
 				pcs_mood += 5
 				if pcs_inhib < 50: inhib_exp += rand(1, 2)
 				gs 'stat'
-	
+
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_river_mira.jpg"></center>'
 				'You wade in the river, splashing around with Mira is a lot of fun.'
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the water.'
@@ -736,7 +736,6 @@ if $ARGS[0] = 'offer_steam_bath':
 
 			'You offer Mira the opportunity to relax with you in the bath. She pauses for a few moments to think but then agrees slowly. Then, you lead her into your grandparents'' backyard...'
 
-			MiraVars['guest'] = 1
 			act 'Go to your home': gt 'gad_gpbath', 'start'
 		end
 	end
@@ -832,19 +831,18 @@ if $ARGS[0] = 'guest_acts':
 			menu_off = 1
 			minut += 5
 			MiraVars['guest'] = 1
-			if npc_rel['A60'] < 30:npc_rel['A60'] += 1
+			if npc_rel['A60'] < 30: npc_rel['A60'] += 1
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
 
 			'You are tired of hanging around on the street, and you decide to invite Mira to dinner.'
 
-			act'Go home':
+			act 'Go home':
 				if ($clothingworntype ! 'nude' and PCloswimwear = 0):
 					minut += 15 & gt 'gad_gphouse', 'start'
 				else
 					*clr & cla
 					minut += 5
-					MiraVars['guest'] = 1
 					gs 'underwear', 'wear'
 					gs 'clothing', 'wear', $lastwornclothingtype, lastwornclothingnumber
 
@@ -867,7 +865,7 @@ if $ARGS[0] = 'guest_acts':
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_tv'+rand(1, 12)+'.jpg"></center>'
 			'You and Mira watch TV for an hour.'
 
-			act'Continue': gt 'gad_gphouse', 'start'
+			act 'Continue': gt 'gad_gphouse', 'start'
 		end
 
 		if hour >= 18:
@@ -900,6 +898,7 @@ if $ARGS[0] = 'guest_acts':
 			MiraVars['guest'] = 0
 			MiraVars['follow_time'] = 0
 			MiraVars['follower'] = 0
+			if MiraVars['guestday'] <= daystart: MiraVars['guestday'] = daystart + 1
 			act 'Walk back home': gt 'gad_gphouse', 'start'
 		end
 	end

locations/miroslava_schedule.qsrc

@@ -84,7 +84,7 @@ if $ARGS[0] = 'get_locat_from_loc':
 		result = 81
 	elseif $loc = 'furi' and nroad = 10:
 		result = 82
-	
+
 	else
 		result = 10
 	end
@@ -98,15 +98,15 @@ end
 if $ARGS[0] = 'force_change':
 	temp_start_loc = locat['A60']
 	gs 'miroslava_schedule'
-	i = 0
+	mss_i = 0
 	:mira_loop_start
 	if locat['A60'] = temp_start_loc:
 		gs 'miroslava_schedule', 'cikl'
 		gs 'miroslava_schedule'
-		i += 1
-		if i < 10: jump 'mira_loop_start'
+		mss_i += 1
+		if mss_i < 10: jump 'mira_loop_start'
 	end
-	killvar 'i'
+	killvar 'mss_i'
 	killvar 'temp_start_loc'
 end
 
@@ -133,6 +133,7 @@ if $ARGS[0] = 'update_locat':
 	end
 
 	if MiraVars['guest'] = 1:
+		if MiraVars['guestday'] <= daystart: MiraVars['guestday'] = daystart + 1
 		!! check if mira and sveta are in the same location.
 		!! if so: locat['A60'] remains the same
 		!! else: MiraVars['guest'] = 0
@@ -156,17 +157,16 @@ if $ARGS[0] = 'update_locat':
 
 	gs 'miroslava_schedule', 'get_base_schedule'
 
-
 	if sunWeather = 0:
 		if locat['A60'] >= 30 and locat['A60'] ! 42:
-			if MiraVars['guestday'] >= daystart or npc_known['A60'] = 0 or locat['A60'] = 10 or npc_rel['A60'] < 15 or (npc_QW['A63'] >= 11 and MiraVars['QW'] < 11 and MiraVars['had_sex'] <= 1):
+			if MiraVars['invite_day'] >= daystart or npc_known['A60'] = 0 or locat['A60'] = 10 or npc_rel['A60'] < 15 or (npc_QW['A63'] >= 11 and MiraVars['QW'] < 11 and MiraVars['had_sex'] <= 1):
 				locat['A60'] = 10
 			else
 				MiraVars['invite_rand'] = rand(0, 1)
-				MiraVars['guestday'] = daystart
+				MiraVars['invite_day'] = daystart
 				if MiraVars['invite_rand'] = 0:
 					locat['A60'] = 21
-					MiraVars['follow_time'] = 3
+					MiraVars['follow_time'] = 2
 				else
 					locat['A60'] = 10
 				end
@@ -174,12 +174,14 @@ if $ARGS[0] = 'update_locat':
 		end
 	else
 		if npc_known['A60'] = 0 and locat['A60'] ! 10 and locat['A60'] ! 30:				locat['A60'] = 30		& ! Sveta and Mira aren''t friends yet.
-		if MiraVars['QW'] > 15 and MiraVars['prost_today'] and hour >= 16 and hour < 20:	locat['A60'] = 80		& ! Prostitution 
+		if MiraVars['QW'] > 15 and MiraVars['prost_today'] and hour >= 16 and hour < 20:	locat['A60'] = 80		& ! Prostitution
 		if locat['A60'] = 61 and (MiraVars['meadow'] = 2 or MiraVars['meadow'] = 5):		locat['A60'] = 60		& ! If meadow not unlocked -> Forest edge
 		if locat['A60'] = 51 and (sunweather = 0 or temper < 15 or month < 5 or month > 9):	locat['A60'] = 10		& ! Winter = No Beach
 		if locat['A60'] = 42 and (MiraVars['QW'] = 0 or npc_drunk['A60'] > 0):				locat['A60'] = 10		& ! drunk or doesn''t know the guys
 		if (locat['A60'] / 10) = 2 and grandpaQW['chore_herd_cattle'] = 1 and $loc = 'gad_field' and npc_rel['A60'] >= 15 and (npc_QW['A63'] < 13 or MiraVars['QW'] >= 10 or MiraVars['had_sex'] > 1): locat['A60'] = 70		& ! Mira visits in the field if she was planning to visit you either way.
 	end
+
+	if MiraVars['guest'] = 0 and (locat['A60'] / 10 = 2) and MiraVars['guestday'] > daystart: locat['A60'] = 10
 end
 
 

locations/npc_finder.qsrc

@@ -12,53 +12,55 @@ if $looking ! '':
     '<br><br>'
     'Found character:'
     '<br>'
-    '<<$npc_pic[''<<looking>>'']>>'
-    'DNA string: <<$npc_dna[''<<$looking>>'']>>'
-    'Name: <<$npc_firstname[''<<$looking>>'']>> "<<$npc_nickname[''<<$looking>>'']>>" <<$npc_lastname[''<<$looking>>'']>> (<<$npc_usedname[''<<$looking>>'']>>)'
-    if npc_dob['<<$looking>>'] ! '': 'Birthday (YYYY-MM-DD): <<mid(npc_dob[''<<$looking>>''],1,4)>>-<<mid(npc_dob[''<<$looking>>''],5,2)>>-<<mid(npc_dob[''<<$looking>>''],7,2)>>'
-    'Intelligence: <<npc_intel[''<<$looking>>'']>>'
-    if npc_grupTipe['<<$looking>>'] ! '': 'Social group: <<npc_grupTipe[''<<$looking>>'']>>'
-    if npc_sexskill['<<$looking>>'] ! '': 'Sex skill: <<npc_sexskill[''<<$looking>>'']>>'
-    if npc_rep['<<$looking>>'] ! '': ' Reputation in school: <<npc_rep[''<<$looking>>'']>>'
-    if npc_haircol['<<$looking>>'] = 0:
-        'Natural hair color: black (<<npc_haircol[''<<$looking>>'']>>)'
-    elseif npc_haircol['<<$looking>>'] = 1:
-        'Natural hair color: brown (<<npc_haircol[''<<$looking>>'']>>)'
-    elseif npc_haircol['<<$looking>>'] = 2:
-        'Natural hair color: read (<<npc_haircol[''<<$looking>>'']>>)'
+    !$npc_pic[$looking]
+    '<center><img src="images/characters/shared/headshots_main/big<<mid($looking,2)>>.jpg"></center>'
+    'DNA string: <<$npc_dna[$looking]>>'
+    'Name: <<$npc_firstname[$looking]>>'+ iif($npc_nickname[$looking] ! '', ' "<<$npc_nickname[$looking]>>" ',' ') +'<<$npc_lastname[$looking]>> (<<$npc_usedname[$looking]>>)'
+    if npc_dob[$looking] > 0: 'Birthday (YYYY-MM-DD): <<mid(npc_dob[$looking],1,4)>>-<<mid(npc_dob[$looking],5,2)>>-<<mid(npc_dob[$looking],7,2)>>'
+    if npc_intel[$looking] > 0: 'Intelligence: <<npc_intel[$looking]>>'
+    if npc_grupTipe[$looking] >= 0: 'Social group: <<npc_grupTipe[$looking]>>'
+    if npc_sexskill[$looking] >= 0: 'Sex skill: <<npc_sexskill[$looking]>>'
+    if npc_rep[$looking] > 0: ' Reputation in school: <<npc_rep[$looking]>>'
+    if npc_haircol[$looking] = 0:
+        'Natural hair color: black (<<npc_haircol[$looking]>>)'
+    elseif npc_haircol[$looking] = 1:
+        'Natural hair color: brown (<<npc_haircol[$looking]>>)'
+    elseif npc_haircol[$looking] = 2:
+        'Natural hair color: read (<<npc_haircol[$looking]>>)'
     else
-        'Natural hair color: blonde (<<npc_haircol[''<<$looking>>'']>>)'
+        'Natural hair color: blonde (<<npc_haircol[$looking]>>)'
     end
-    if hotcat_rating['<<$looking>>'] ! '': 'Hotness rating: <<hotcat_rating[''<<$looking>>'']>>'
-    'Appearance value: <<npc_apprnc[''<<$looking>>'']>>'
-    'Height: <<npc_height[''<<$looking>>'']>>'
-    if npc_gender['<<$looking>>'] = 0:
+    if hotcat_rating[$looking] > 0: 'Hotness rating: <<hotcat_rating[$looking]>>'
+    if npc_apprnc[$looking] > 0: 'Appearance value: <<npc_apprnc[$looking]>>'
+    if nnpc_heightpc_rep[$looking] > 0: 'Height: <<npc_height[$looking]>>'
+    if npc_gender[$looking] = 0:
         'Gender: male'
-        'Dick thickness: <<$npc_thdick[''<<$looking>>'']>>'
-        'Dick length: <<npc_dick[''<<$looking>>'']>>'
-        'Potential: <<npc_spermpot[''<<$looking>>'']>> (default is 10000)'
+        'Dick thickness: <<$npc_thdick[$looking]>>'
+        'Dick length: <<npc_dick[$looking]>>'
+        'Potential: <<npc_spermpot[$looking]>> (default is 10000)'
     else
         'Gender: female'
-        'Breast size: <<npc_bust[''<<$looking>>'']>>'
+        'Breast size: <<npc_bust[$looking]>>'
     end
-    if npc_herpes['<<$looking>>'] > 0: $npcvendisease += 'herpes; '
-    if npc_syth['<<$looking>>'] > 0: $npcvendisease += 'syphilis; '
-    if npc_gon['<<$looking>>'] > 0: $npcvendisease += 'gonorrhea; '
-    if npc_thrush['<<$looking>>'] > 0: $npcvendisease += 'yeast infection; '
+    if npc_herpes[$looking] > 0: $npcvendisease += 'herpes; '
+    if npc_syth[$looking] > 0: $npcvendisease += 'syphilis; '
+    if npc_gon[$looking] > 0: $npcvendisease += 'gonorrhea; '
+    if npc_thrush[$looking] > 0: $npcvendisease += 'yeast infection; '
     if $npcvendisease = '': $npcvendisease = 'none'
     'Veneral diseases: <<$npcvendisease>>'
-    'Sexual acts with PC: <<npc_sex[''$looking'']>>'
-    'Perversion: <<npc_perv[''$looking'']>>'
-    'Notes: <<$npc_notes[''<<$looking>>'']>>'
+    'Sexual acts with PC: <<npc_sex[$looking]>>'
+    'Perversion: <<npc_perv[$looking]>>'
+    'Notes: <<$npc_notes[$looking]>>'
     ''
     'Found relationships:'
     npctemp = 0
     :relationshipfinder
-        gs 'DNA','relate', $npc_dna['<<$looking>>'], $npc_dna['A<<npctemp>>']
-        if $gen_relationship ! '' and 'A<<npctemp>>' ! '<<$looking>>':
-            '<br>ID: A<<npctemp>>'
+        gs 'DNA','relate', $npc_dna[$looking], $npc_dna['A<<npctemp>>']
+        if $gen_relationship ! '' and 'A<<npctemp>>' ! $looking:
+            '<center><img src="images/characters/shared/headshots_main/big<<npctemp>>.jpg"></center>'
+            '<br><a href="exec:$looking = ''A<<npctemp>>'' & gt ''npc_finder''">ID: A<<npctemp>></a>'
             'DNA string: <<$npc_dna[''A<<npctemp>>'']>>'
-            'Name: <<$npc_firstname[''A<<npctemp>>'']>> "<<$npc_nickname[''A<<npctemp>>'']>>" <<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
+            'Name: <<$npc_firstname[''A<<npctemp>>'']>>'+ iif($npc_nickname['A<<npctemp>>'] ! '', ' "<<$npc_nickname[''A<<npctemp>>'']>>" ',' ') +'<<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
             'Relationship type: <<$gen_relationship>>'
         end
     if npctemp < aarraynumber: npctemp += 1 & jump 'relationshipfinder'

locations/npcpreservec.qsrc

@@ -10,172 +10,173 @@ npcgen_lastrun = 1
 
 if mid($npctemp,1,1) = 'C':
 	:npcsavebsanityloop
-	i = 0
+	npc_scheck = 0
 	$npclastsaved = 'B' + '<<barraynumber>>'
 	$npctemparrb = 'B' + '<<(barraynumber)-(1)>>'
 	if $npc_PersType[$npctemparrb] = '' and barraynumber > 0:
 		barraynumber -= 1
-		i = 1
+		npc_scheck = 1
 	elseif $npc_PersType[$npclastsaved] = '':
-		i = 0
+		npc_scheck = 0
 	else
 		barraynumber += 1
-		i = 1
+		npc_scheck = 1
 	end
-	if i = 1: jump 'npcsavebsanityloop'
+	if npc_scheck = 1: jump 'npcsavebsanityloop'
 	barraynumber += 1
-	
+	killvar 'npc_scheck'
+
 	! {This copies the array from Array C to Array B}
-	$npc_firstname[$npclastsaved]	= $npc_firstname[$npctemp]
-	$npc_nickname[$npclastsaved]	= $npc_nickname[$npctemp]
-	$npc_lastname[$npclastsaved]	= $npc_lastname[$npctemp]
-	$npc_usedname[$npclastsaved]	= $npc_usedname[$npctemp]
-	$npc_notes[$npclastsaved]		= $npc_notes[$npctemp]
-	$npc_pic[$npclastsaved]			= $npc_pic[$npctemp]
-	lover_picrand[$npclastsaved]	= lover_picrand[$npctemp]
-	
-	npc_age[$npclastsaved]			= npc_age[$npctemp]
-	npc_dob[$npclastsaved]			= npc_dob[$npctemp]
-	npc_gender[$npclastsaved]		= npc_gender[$npctemp]
-
-	npc_height[$npclastsaved]		= npc_height[$npctemp]
+	$npc_firstname[$npclastsaved]		= $npc_firstname[$npctemp]
+	$npc_nickname[$npclastsaved]		= $npc_nickname[$npctemp]
+	$npc_lastname[$npclastsaved]		= $npc_lastname[$npctemp]
+	$npc_usedname[$npclastsaved]		= $npc_usedname[$npctemp]
+	$npc_notes[$npclastsaved]			= $npc_notes[$npctemp]
+	$npc_pic[$npclastsaved]				= $npc_pic[$npctemp]
+	lover_picrand[$npclastsaved]		= lover_picrand[$npctemp]
+
+	npc_age[$npclastsaved]				= npc_age[$npctemp]
+	npc_dob[$npclastsaved]				= npc_dob[$npctemp]
+	npc_gender[$npclastsaved]			= npc_gender[$npctemp]
+
+	npc_height[$npclastsaved]			= npc_height[$npctemp]
 ! npc_body
-	npc_haircol[$npclastsaved]		= npc_haircol[$npctemp]
-	npc_apprnc[$npclastsaved]		= npc_apprnc[$npctemp]
-
-	npc_dick[$npclastsaved]			= npc_dick[$npctemp]
-	$npc_thdick[$npclastsaved]		= $npc_thdick[$npctemp]
-	npc_bust[$npclastsaved]			= npc_bust[$npctemp]
-	$npc_dick_desc[$npclastsaved]	= $npc_dick_desc[$npctemp]
-	
-
-	npc_spermpot[$npclastsaved]		= npc_spermpot[$npctemp]
-	npc_sexskill[$npclastsaved]		= npc_sexskill[$npctemp]
-
-	npc_drunk[$npclastsaved]		= npc_drunk[$npctemp]
-	npc_horny[$npclastsaved]		= npc_horny[$npctemp]
-
-	npc_rel[$npclastsaved]			= npc_rel[$npctemp]
-	npc_love[$npclastsaved]			= npc_love[$npctemp]
-	npc_sex[$npclastsaved]			= npc_sex[$npctemp]
-	npc_QW[$npclastsaved]			= npc_QW[$npctemp]
-
-	$npc_perstype[$npclastsaved]	= $npc_perstype[$npctemp]
-	$npc_dna[$npclastsaved]			= $npc_dna[$npctemp]
-
-	npc_herpes[$npclastsaved]		= npc_herpes[$npctemp]
-	npc_syth[$npclastsaved]			= npc_syth[$npctemp]
-	npc_gon[$npclastsaved]			= npc_gon[$npctemp]
-	npc_thrush[$npclastsaved]		= npc_thrush[$npctemp]
-
-	npc_residence[$npclastsaved]	= npc_residence[$npctemp]
-	npc_apt_type[$npclastsaved]		= npc_apt_type[$npctemp]
-	npc_apt_number[$npclastsaved]	= npc_apt_number[$npctemp]
-	
-	$npc_apt_bedroom[$npclastsaved] = $npc_apt_bedroom[$npctemp]
-	$npc_apt_kitchen[$npclastsaved] = $npc_apt_kitchen[$npctemp]
-	$npc_apt_livingroom[$npclastsaved] = $npc_apt_livingroom[$npctemp]
-	$npc_apt_bathroom[$npclastsaved] = $npc_apt_bathroom[$npctemp]
-	$npc_apt_hall[$npclastsaved] = $npc_apt_hall[$npctemp]
-	if $npc_apt_spare[$npclastsaved] ! '':$npc_apt_spare[$npclastsaved] = $npc_apt_spare[$npctemp]
-	
-	npc_perv[$npclastsaved]			= npc_perv[$npctemp]
-	npc_outfit[$npclastsaved]		= npc_outfit[$npctemp]
-	npc_finance[$npclastsaved]		= npc_finance[$npctemp]
-	npc_occupation[$npclastsaved]	= npc_occupation[$npctemp]
-	$npc_occupation[$npclastsaved]	= $npc_occupation[$npctemp]
-	
-	npc_start_free_time[$npclastsaved] = npc_start_free_time[$npctemp]
-	npc_end_free_time[$npclastsaved] = npc_end_free_time[$npctemp]
-	npc_work_start[$npclastsaved] 	= npc_work_start[$npctemp]
-	npc_work_end[$npclastsaved] = npc_work_end[$npctemp]
-	
-	npc_day_off[$npclastsaved]		 = npc_day_off[$npctemp]
-	
-	npc_car[$npclastsaved]  		= npc_car[$npctemp]
-	npc_intel[$npclastsaved]		= npc_intel[$npctemp]
-	npc_humor[$npclastsaved]		= npc_humor[$npctemp]
-
-	npc_style[$npclastsaved]		= npc_style[$npctemp]
-	npc_smoker[$npclastsaved]		= npc_smoker[$npctemp]
-	npc_mj[$npclastsaved]			= npc_mj[$npctemp]
-	npc_addit[$npclastsaved]		= npc_addit[$npctemp]
-	npc_doors[$npclastsaved]		= npc_doors[$npctemp]
-	npc_goal[$npclastsaved]			= npc_goal[$npctemp]
-	$npc_rel_goal[$npclastsaved]			= $npc_rel_goal[$npctemp]
-	
+	npc_haircol[$npclastsaved]			= npc_haircol[$npctemp]
+	npc_apprnc[$npclastsaved]			= npc_apprnc[$npctemp]
+
+	npc_dick[$npclastsaved]				= npc_dick[$npctemp]
+	$npc_thdick[$npclastsaved]			= $npc_thdick[$npctemp]
+	npc_bust[$npclastsaved]				= npc_bust[$npctemp]
+	$npc_dick_desc[$npclastsaved]		= $npc_dick_desc[$npctemp]
+
+
+	npc_spermpot[$npclastsaved]			= npc_spermpot[$npctemp]
+	npc_sexskill[$npclastsaved]			= npc_sexskill[$npctemp]
+
+	npc_drunk[$npclastsaved]			= npc_drunk[$npctemp]
+	npc_horny[$npclastsaved]			= npc_horny[$npctemp]
+
+	npc_rel[$npclastsaved]				= npc_rel[$npctemp]
+	npc_love[$npclastsaved]				= npc_love[$npctemp]
+	npc_sex[$npclastsaved]				= npc_sex[$npctemp]
+	npc_QW[$npclastsaved]				= npc_QW[$npctemp]
+
+	$npc_perstype[$npclastsaved]		= $npc_perstype[$npctemp]
+	$npc_dna[$npclastsaved]				= $npc_dna[$npctemp]
+
+	npc_herpes[$npclastsaved]			= npc_herpes[$npctemp]
+	npc_syth[$npclastsaved]				= npc_syth[$npctemp]
+	npc_gon[$npclastsaved]				= npc_gon[$npctemp]
+	npc_thrush[$npclastsaved]			= npc_thrush[$npctemp]
+
+	npc_residence[$npclastsaved]		= npc_residence[$npctemp]
+	npc_apt_type[$npclastsaved]			= npc_apt_type[$npctemp]
+	npc_apt_number[$npclastsaved]		= npc_apt_number[$npctemp]
+
+	$npc_apt_bedroom[$npclastsaved]		= $npc_apt_bedroom[$npctemp]
+	$npc_apt_kitchen[$npclastsaved]		= $npc_apt_kitchen[$npctemp]
+	$npc_apt_livingroom[$npclastsaved]	= $npc_apt_livingroom[$npctemp]
+	$npc_apt_bathroom[$npclastsaved]	= $npc_apt_bathroom[$npctemp]
+	$npc_apt_hall[$npclastsaved]		= $npc_apt_hall[$npctemp]
+	if $npc_apt_spare[$npclastsaved]	! '':$npc_apt_spare[$npclastsaved] = $npc_apt_spare[$npctemp]
+
+	npc_perv[$npclastsaved]				= npc_perv[$npctemp]
+	npc_outfit[$npclastsaved]			= npc_outfit[$npctemp]
+	npc_finance[$npclastsaved]			= npc_finance[$npctemp]
+	npc_occupation[$npclastsaved]		= npc_occupation[$npctemp]
+	$npc_occupation[$npclastsaved]		= $npc_occupation[$npctemp]
+
+	npc_start_free_time[$npclastsaved]	= npc_start_free_time[$npctemp]
+	npc_end_free_time[$npclastsaved]	= npc_end_free_time[$npctemp]
+	npc_work_start[$npclastsaved]		= npc_work_start[$npctemp]
+	npc_work_end[$npclastsaved]			= npc_work_end[$npctemp]
+
+	npc_day_off[$npclastsaved]			= npc_day_off[$npctemp]
+
+	npc_car[$npclastsaved]  			= npc_car[$npctemp]
+	npc_intel[$npclastsaved]			= npc_intel[$npctemp]
+	npc_humor[$npclastsaved]			= npc_humor[$npctemp]
+
+	npc_style[$npclastsaved]			= npc_style[$npctemp]
+	npc_smoker[$npclastsaved]			= npc_smoker[$npctemp]
+	npc_mj[$npclastsaved]				= npc_mj[$npctemp]
+	npc_addit[$npclastsaved]			= npc_addit[$npctemp]
+	npc_doors[$npclastsaved]			= npc_doors[$npctemp]
+	npc_goal[$npclastsaved]				= npc_goal[$npctemp]
+	$npc_rel_goal[$npclastsaved]		= $npc_rel_goal[$npctemp]
+
 !!	relationship ideals/stats
-	
-	npc_fidelity[$npclastsaved]		= npc_fidelity[$npctemp]
-	$npc_fidelity[$npclastsaved]	= $npc_fidelity[$npctemp]
-	npc_wife[$npclastsaved]			= npc_wife[$npctemp]
-	npc_girlfriend[$npclastsaved]	= npc_girlfriend[$npctemp]
-	npc_lover_days[$npclastsaved]	= npc_lover_days[$npctemp]
-	npc_lover_keys[$npclastsaved]	= npc_lover_keys[$npctemp]
+
+	npc_fidelity[$npclastsaved]			= npc_fidelity[$npctemp]
+	$npc_fidelity[$npclastsaved]		= $npc_fidelity[$npctemp]
+	npc_wife[$npclastsaved]				= npc_wife[$npctemp]
+	npc_girlfriend[$npclastsaved]		= npc_girlfriend[$npctemp]
+	npc_lover_days[$npclastsaved]		= npc_lover_days[$npctemp]
+	npc_lover_keys[$npclastsaved]		= npc_lover_keys[$npctemp]
 
 !!	traits
-	
-	npc_earlyriser[$npclastsaved] 	= npc_earlyriser[$npctemp]
-	npc_latesleeper[$npclastsaved]	= npc_latesleeper[$npctemp]
-	npc_generous[$npclastsaved]		= npc_generous[$npctemp]
-	npc_selfish[$npclastsaved] 		= npc_selfish[$npctemp]
-	npc_gentle[$npclastsaved] 		= npc_gentle[$npctemp]
-	npc_rough[$npclastsaved] 		= npc_rough[$npctemp]
-	npc_risktaker[$npclastsaved] 	= npc_risktaker[$npctemp]
-	npc_diligent[$npclastsaved] 	= npc_diligent[$npctemp]
-	npc_neat[$npclastsaved] 		= npc_neat[$npctemp]
-	npc_messy[$npclastsaved] 		= npc_messy[$npctemp]
-	npc_diligent[$npclastsaved] 	= npc_diligent[$npctemp]
-	
+
+	npc_earlyriser[$npclastsaved]		= npc_earlyriser[$npctemp]
+	npc_latesleeper[$npclastsaved]		= npc_latesleeper[$npctemp]
+	npc_generous[$npclastsaved]			= npc_generous[$npctemp]
+	npc_selfish[$npclastsaved]			= npc_selfish[$npctemp]
+	npc_gentle[$npclastsaved]			= npc_gentle[$npctemp]
+	npc_rough[$npclastsaved]			= npc_rough[$npctemp]
+	npc_risktaker[$npclastsaved]		= npc_risktaker[$npctemp]
+	npc_diligent[$npclastsaved]			= npc_diligent[$npctemp]
+	npc_neat[$npclastsaved]				= npc_neat[$npctemp]
+	npc_messy[$npclastsaved]			= npc_messy[$npctemp]
+	npc_diligent[$npclastsaved]			= npc_diligent[$npctemp]
+
 	npc_manscaped[$npclastsaved]		= npc_manscaped[$npctemp]
 	npc_argumentative[$npclastsaved]	= npc_argumentative[$npctemp]
 	npc_competitive[$npclastsaved]		= npc_competitive[$npctemp]
-	npc_insecure[$npclastsaved] 		= npc_insecure[$npctemp]
+	npc_insecure[$npclastsaved]			= npc_insecure[$npctemp]
 	npc_condom_conscious[$npclastsaved] = npc_condom_conscious[$npctemp]
-	npc_no_condoms[$npclastsaved] 		= npc_no_condoms[$npctemp]
-	npc_latex_allergy[$npclastsaved] 	= npc_latex_allergy[$npctemp]
-	npc_caretaker[$npclastsaved] 		= npc_caretaker[$npctemp]
+	npc_no_condoms[$npclastsaved]		= npc_no_condoms[$npctemp]
+	npc_latex_allergy[$npclastsaved]	= npc_latex_allergy[$npctemp]
+	npc_caretaker[$npclastsaved]		= npc_caretaker[$npctemp]
 	npc_childfree[$npclastsaved]		= npc_childfree[$npctemp]
-	npc_abusive[$npclastsaved] 			= npc_abusive[$npctemp]
+	npc_abusive[$npclastsaved]			= npc_abusive[$npctemp]
 
-	npc_cuddler[$npclastsaved] 			= npc_cuddler[$npctemp]
+	npc_cuddler[$npclastsaved]			= npc_cuddler[$npctemp]
 
 !!	sex traits and stats
-	npc_sexdrive[$npclastsaved] 		= npc_sexdrive[$npctemp]
-	npc_sex_stamina[$npclastsaved] 		= npc_sex_stamina[$npctemp]
-	
-	npc_fav_pos[$npclastsaved]		= npc_fav_pos[$npctemp]
-	$npc_fav_pos[$npclastsaved]		= $npc_fav_pos[$npctemp]
-	npc_sex_speed[$npclastsaved]	= npc_sex_speed[$npctemp]
-	npc_sex_volume[$npclastsaved]	= npc_sex_volume[$npctemp]
-	npc_gentle_lover[$npclastsaved]	= npc_gentle_lover[$npctemp]
-	npc_dirty_lover[$npclastsaved]	= npc_dirty_lover[$npctemp]
-	npc_sensual_lover[$npclastsaved]= npc_sensual_lover[$npctemp]
-	npc_cum_pref[$npclastsaved]		= npc_cum_pref[$npctemp]
-	$npc_cum_pref[$npclastsaved]	= $npc_cum_pref[$npctemp]
+	npc_sexdrive[$npclastsaved]			= npc_sexdrive[$npctemp]
+	npc_sex_stamina[$npclastsaved]		= npc_sex_stamina[$npctemp]
+
+	npc_fav_pos[$npclastsaved]			= npc_fav_pos[$npctemp]
+	$npc_fav_pos[$npclastsaved]			= $npc_fav_pos[$npctemp]
+	npc_sex_speed[$npclastsaved]		= npc_sex_speed[$npctemp]
+	npc_sex_volume[$npclastsaved]		= npc_sex_volume[$npctemp]
+	npc_gentle_lover[$npclastsaved]		= npc_gentle_lover[$npctemp]
+	npc_dirty_lover[$npclastsaved]		= npc_dirty_lover[$npctemp]
+	npc_sensual_lover[$npclastsaved]	= npc_sensual_lover[$npctemp]
+	npc_cum_pref[$npclastsaved]			= npc_cum_pref[$npctemp]
+	$npc_cum_pref[$npclastsaved]		= $npc_cum_pref[$npctemp]
 	npc_bukakke_fetish[$npclastsaved]	= npc_bukakke_fetish[$npctemp]
 	npc_dislikes_facials[$npclastsaved]	= npc_dislikes_facials[$npctemp]
-	npc_tit_pref[$npclastsaved]		= npc_tit_pref[$npctemp]
-	npc_bush_pref[$npclastsaved]	= npc_bush_pref[$npctemp]
-	npc_sex_spanker[$npclastsaved] 	= npc_sex_spanker[$npctemp]
-	npc_pussyeater[$npclastsaved]	= npc_pussyeater[$npctemp]
-	npc_cum_cannon[$npclastsaved]	= npc_cum_cannon[$npctemp]
-	npc_sex_filmer[$npclastsaved]	= npc_sex_filmer[$npctemp]
-	npc_know_bc[$npclastsaved]		= npc_know_bc[$npctemp]
-	npc_know_not_bc[$npclastsaved]	= npc_know_not_bc[$npctemp]
-	npc_thinkage[$npclastsaved]		= npc_thinkage[$npctemp]
-	$npc_know_pubes[$npclastsaved]	= $npc_know_pubes[$npctemp]
-	npc_hj_count[$npclastsaved]		= npc_hj_count[$npctemp]
-	npc_bj_count[$npclastsaved]		= npc_bj_count[$npctemp]
-	npc_fuck_times[$npclastsaved]	= npc_fuck_times[$npctemp]
-	virgin_taker_ID[$npclastsaved]	= virgin_taker_ID[$npctemp]
-	
+	npc_tit_pref[$npclastsaved]			= npc_tit_pref[$npctemp]
+	npc_bush_pref[$npclastsaved]		= npc_bush_pref[$npctemp]
+	npc_sex_spanker[$npclastsaved]		= npc_sex_spanker[$npctemp]
+	npc_pussyeater[$npclastsaved]		= npc_pussyeater[$npctemp]
+	npc_cum_cannon[$npclastsaved]		= npc_cum_cannon[$npctemp]
+	npc_sex_filmer[$npclastsaved]		= npc_sex_filmer[$npctemp]
+	npc_know_bc[$npclastsaved]			= npc_know_bc[$npctemp]
+	npc_know_not_bc[$npclastsaved]		= npc_know_not_bc[$npctemp]
+	npc_thinkage[$npclastsaved]			= npc_thinkage[$npctemp]
+	$npc_know_pubes[$npclastsaved]		= $npc_know_pubes[$npctemp]
+	npc_hj_count[$npclastsaved]			= npc_hj_count[$npctemp]
+	npc_bj_count[$npclastsaved]			= npc_bj_count[$npctemp]
+	npc_fuck_times[$npclastsaved]		= npc_fuck_times[$npctemp]
+	virgin_taker_ID[$npclastsaved]		= virgin_taker_ID[$npctemp]
+
 	!! This checks if you have had sex with this person before or not
-	npc_sex[$npclastsaved] = npc_sex[$npctemp]
+	npc_sex[$npclastsaved]				= npc_sex[$npctemp]
+
+	$npc_index[$npclastsaved]			= $npclastsaved
+
 
-	$npc_index[$npclastsaved] = $npclastsaved
-	
-	
 
 	! {This checks the miscellanious arrays for the Entry and changes it to the new Array B.}
 	:npctempmloop

locations/npcstatic2.qsrc

@@ -634,7 +634,7 @@ gs 'npc_standard_preferences', 'A<<npctemp>>'
 
 npctemp = 85
 $npc_dna['A<<npctemp>>'] = '1938942779 2106314839 1289521515 1217866816 2023591880 1519928587 1939169723'
-$npc_firstname['A<<npctemp>>'] = 0
+$npc_firstname['A<<npctemp>>'] = ''
 $npc_nickname['A<<npctemp>>'] = 'Kas'
 $npc_notes['A<<npctemp>>'] = 'A black handyman from the office.'
 npc_gender['A<<npctemp>>'] = 0
@@ -665,7 +665,7 @@ npc_dick['A<<npctemp>>'] = 20
 npctemp = 87
 $npc_dna['A<<npctemp>>'] = '1847378236 1162293273 1556619643 1329175895 1349109199 1613614049 1534225588'
 $npc_firstname['A<<npctemp>>'] = 'Boris'
-$npc_nickname['A<<npctemp>>'] = 0
+$npc_nickname['A<<npctemp>>'] = ''
 $npc_lastname['A<<npctemp>>'] = 'Ivanovich'
 $npc_notes['A<<npctemp>>'] = 'Cleaning Job Boss'
 npc_gender['A<<npctemp>>'] = 0

locations/obj_din.qsrc

@@ -2331,17 +2331,19 @@ if $ARGS[0] = 'wait':
 	if waiting > 0 and waiting <= 120:
 		minut += waiting
 	else
-		'Invalid time.'
+		msg 'Invalid time.'
 	end
 	gs 'stat'
+	killvar 'waiting'
+	killvar 'waitStr'
 	gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'rest':
 	cla
-	waiting = input ("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)")
+	waiting = val(input("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)"))
 
-	if waiting = '':
+	if waiting = 0:
 		minut += 15
 	elseif waiting > 0 and waiting <= 120:
 		minut += waiting
@@ -2349,10 +2351,11 @@ if $ARGS[0] = 'rest':
 		if pcs_sleep < 90 and waiting >= 60:
 			pcs_sleep += 10
 		end
-	elseif waiting <= 0 or waiting > 120:
+	else
 		msg 'Invalid time.'
 	end
 	gs 'stat'
+	killvar 'waiting'
 	gt $loc, $loc_arg
 end
 

locations/park_walkevents.qsrc

@@ -973,8 +973,12 @@ if $ARGS[0] = 'run':
 										'He blinks in surprise but recovers quickly. "I mean, hell yeah. If you''re offering."'
 										'"You''re the one who offered," you shrug. "Now hurry up and lead the way."'
 										'He quickly heads out of the park and towards an apartment complex, you follow all the way.'
-										gs 'npcpreservec', $npclastgenerated
-										act 'Go to his place':$hookup['pickup'] = 'park_run' & gt 'sex_ev_start', 'hookup_npc_home_start'
+										act 'Go to his place':
+											gs 'npcpreservec', $npclastgenerated
+											$npclastgenerated = $npclastsaved
+											$hookup['pickup'] = 'park_run'
+											gt 'sex_ev_start', 'hookup_npc_home_start'
+										end
 									else
 										'"Uhhh..." he blinks in surprise and begins sputtering. "Well I- You''re uhmm... It''s just-"'
 										'"Ugh," you roll your eyes. "What a waste of fucking time. Limp dick loser." You don''t spare him another thought and break back into a run, leaving him and your disappointment behind.'

locations/pav_aptcourtev.qsrc

@@ -350,10 +350,10 @@ if $ARGS[0] = 'events1':
 		*clr & cla
 		gs 'exp_gain', 'prcptn', rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_friends.jpg"></center>'
-		if maksimQW['QWstage'] = 1:
+		if maksimQW['QWstage'] >= 1:
 			'You notice a Maksim, Anushka''s little brother and a few boys his age, hanging out together smoking cigarettes.'
 			act 'Move away': gt 'pav_complex', 'start'
-			if maksim_blackmail = 1:
+			if maksimQW['blackmail'] = 1:
 				act 'Go over and talk to him':
 					*clr & cla
 					minut += 5
@@ -394,7 +394,7 @@ if $ARGS[0] = 'events1':
 						act 'Tell him no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end	
 				end
-			elseif maksim_blackmail = 2:
+			elseif maksimQW['blackmail'] = 2:
 				'You walk over to the boys and give them a smile. "What are you boys up to." you ask.'
 				'Maksim gives you a once over obviously checking out your body again as he grins. "Well if it isn''t my favorite slut."'		
 				'Several of the boys leer at you. "Maksim''s bitch is back."'
@@ -442,7 +442,7 @@ if $ARGS[0] = 'events1':
 				else
 					act 'Tell him no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-			elseif maksim_blackmail >= 3:
+			elseif maksimQW['blackmail'] >= 3:
 				'You walk over to the boys and give them a smile. "What are you boys up to." you ask.'
 				'Maksim gives you a once over obviously checking out your body again as he grins. "Well if it isn''t our favorite slut."'		
 				'Several of the boys leer at you. "Maksim''s bitch is back. Show us your tits again."'
@@ -525,7 +525,7 @@ if $ARGS[0] = 'maksim_friends_flash':
 	maksimQW['blackmail_flash_friends'] += 1
 	gs 'fame', 'pav', 'sex', 3
 	inhib_exp += rand(1,3)
-	if maksimQW['blackmail_flash_friends'] >= 5:
+	if maksimQW['blackmail_flash_friends'] >= 5 and maksimQW['blackmail_flash_friends'] < 10:
 		if PCLoSkirt > 0:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim_blackmail/friends_pussy2.jpg"></center>'
 			'You sigh, knowing what he wants. "Fine!" You say as you start to show him your tits again.'

locations/placer_sex.qsrc

@@ -1821,11 +1821,11 @@ if $ARGS[0] = 'sitting_park_bench':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/bench_3.jpg"></center>'
 		end
-		waiting = input ("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)")
+		waiting = val(input("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)"))
 
 		if alko >= 4:gt 'placer_sex', 'sleeping_park_bench'
 
-		if waiting = '':
+		if waiting = 0:
 			minut += 15
 		elseif waiting > 0 and waiting <= 120:
 			minut = minut + waiting
@@ -1833,10 +1833,10 @@ if $ARGS[0] = 'sitting_park_bench':
 			if pcs_sleep < 90 and waiting >= 60:
 				pcs_sleep += 10
 			end
-		elseif waiting <= 0 or waiting > 120:
-			'Invalid time.'
+		else
+			msg 'Invalid time.'
 		end
-
+		killvar 'waiting'
 		gt $loc, $loc_arg
 	end
 end

locations/pornstudio.qsrc

@@ -908,7 +908,7 @@ if $ARGS[0] = 'yes':
 									firstkasting = 1
 									$pfname = input ("What will your porn name be? (Leave blank for <<$pcs_nickname>> Starr)")
 
-									if $pfname <= 0:$pfname = '<<$pcs_nickname>> Starr'
+									if $pfname = '': $pfname = '<<$pcs_nickname>> Starr'
 
 									'"There we go, you''re now registered. We shoot about four films a day, so you can choose what you to be in. Anal or gangbang, it''s your choice, just remember to take care of your health. If you get sick or something, just cancel the shoot. You can do this up to the day of the shooting."'
 									'A stern look then appears on his face. "Before shooting starts, you have to pass a mandatory medical examination. If we find any sign of a sexually transmitted disease, you''re out, no exceptions. Understood?"'
@@ -955,7 +955,7 @@ if $ARGS[0] = 'yes':
 									firstkasting = 1
 									$pfname = input ("What will your porn name be? (Leave blank for <<$pcs_nickname>> Starr)")
 
-									if $pfname <= 0:$pfname = '<<$pcs_nickname>> Starr'
+									if $pfname = '': $pfname = '<<$pcs_nickname>> Starr'
 
 									'"There we go, you''re now registered. We shoot about four films a day, so you can choose what you to be in. Anal or gangbang, it''s your choice, just remember to take care of your health. If you get sick or something, just cancel the shoot. You can do this up to the day of the shooting."'
 									'A stern look then appears on his face. "Before shooting starts, you have to pass a mandatory medical examination. If we find any sign of a sexually transmitted disease, you''re out, no exceptions. Understood?"'

locations/radapt.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'home':
 	minut += 1
 	bonusZ = 0
 	gs 'shortgs', 'setloc', 'radapt', $ARGS[0]
-	$location_type = 'private'	
+	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'
 	gs 'radomir_popov_schedule'
@@ -137,7 +137,7 @@ if $ARGS[0] = 'home':
 						'Anushka just gives Radomir a annoyed look and then walks past you towards the exit. "Later babe!" He says to her as she leaves. When you glance back to Rad he is looking all smug.'
 						'He turns and heads back into his room, waving for you to follow. "Come on in."'
 					end
-					act 'Follow him to his room': gt 'rad_bedroom', 'radroom'
+					act 'Follow him to his room': gt 'radapt', 'radroom'
 				end
 			else
 				act 'Enter':
@@ -174,10 +174,10 @@ if $ARGS[0] = 'home':
 						'Anushka just gives Radomir a annoyed look and then walks past you towards the exit. "Later babe!" He says to her as she leaves. When you glance back to Rad he is looking all smug.'
 						'He turns and heads back into his room, waving for you to follow. "Come on in."'
 					end
-					act 'Follow him to his room': gt 'rad_bedroom', 'radroom'
+					act 'Follow him to his room': gt 'radapt', 'radroom'
 				end
 			end
-		
+
 		elseif raddoor = 2 and locat['A154'] = 23:
 			'She nods and stands aside to let you come in. "Yes he''s in his room with one of his little friends."'
 			act 'Leave': gt 'pav_complex', 'start'
@@ -201,7 +201,7 @@ if $ARGS[0] = 'home':
 					'You thank her and enter the apartment, she closes the door and then heads off to the kitchen, while you head down the hallway to Radomir''s room. Just then, Radomir''s door opens up and Lena comes out of his room. By the state of her clothes, messed up hair and smeared makeup, it is not hard to guess she just had sex with Radomir. She pauses a moment when she sees you. "Look at the nerd coming to slum it, or you just looking to finally lose your virginity?" She says while patting you on the cheek in a mocking way.'
 					'A moment later Radomir steps out, when he sees you he just smiles real big. Lena looks at Radomir and says. "Really Rad? A nerd?"'
 					*nl
-					'He shrugs a bit. "What can I say nerds like to learn, who am I deny her higher sex education?" Lena laughs at that, then smirks at you.'					
+					'He shrugs a bit. "What can I say nerds like to learn, who am I deny her higher sex education?" Lena laughs at that, then smirks at you.'
 					'With that Radomir slaps Lena on the ass which makes her giggle a bit."See ya later doll."'
 					'Lena smiles to him all coy. "Bye Rad." Then she walks past you and out the apartment. When you glance back to Rad he is looking all smug and stretches a bit leaving no doubt in your mind they just had sex.'
 					'He turns and heads back into his room, waving for you to follow. "Come on in."'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'home':
 					'Lena smiles to him all coy. "Bye Rad." Then she walks past you and out the apartment. When you glance back to Rad he is looking all smug and stretches a bit leaving no doubt in your mind they just had sex.'
 					'He turns and heads back into his room, waving for you to follow. "Come on in."'
 				end
-				act 'Follow him to his room': gt 'rad_bedroom', 'radroom'
+				act 'Follow him to his room': gt 'radapt', 'radroom'
 			end
 		elseif raddoor <= 5 and locat['A158'] = 23:
 			'She nods and stands aside to let you come in. "Yes he''s in his room with one of his little friends."'
@@ -224,7 +224,7 @@ if $ARGS[0] = 'home':
 				*nl
 				'She smiles back to him all coy. "Bye Rad." Then she walks past you and out the apartment. When you glance back to Rad he is looking all smug and stretches a bit leaving no doubt in your mind they just had sex.'
 				'He turns and heads back into his room, waving for you to follow. "Come on in."'
-				act 'Follow him to his room': gt 'rad_bedroom', 'radroom'
+				act 'Follow him to his room': gt 'radapt', 'radroom'
 			end
 		elseif raddoor <= 8:
 			'She nods and stands aside to let you come in. "Yes he''s in his room with one of his little friends."'
@@ -237,7 +237,7 @@ if $ARGS[0] = 'home':
 				*nl
 				'She smiles back to him all coy. "Bye Rad." Then she walks past you and out the apartment. When you glance back to Rad he is looking all smug and stretches a bit leaving no doubt in your mind they just had sex.'
 				'He turns and heads back into his room, waving for you to follow. "Come on in."'
-				act 'Follow him to his room': gt 'rad_bedroom', 'radroom'
+				act 'Follow him to his room': gt 'radapt', 'radroom'
 			end
 		else
 			'She nods and stands aside to let you come in. "Yes he''s in his room."'
@@ -257,7 +257,7 @@ if $ARGS[0] = 'hallway':
 	killvar '$locclass'
 	if sound = 0:PLAY 'sound/korr.mp3',30
 	gs 'shortgs', 'setloc', 'radapt', $ARGS[0]
-	$location_type = 'indoors'	
+	$location_type = 'indoors'
 	minut += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
@@ -278,7 +278,7 @@ if $ARGS[0] = 'bathroom':
 	minut += 1
 	gs 'shortgs', 'setloc', 'radapt', $ARGS[0]
 	$location_type = 'bathroom'
-	gs 'stat'	
+	gs 'stat'
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/radapt/bathroom.jpg"></center>'
 	'The bathroom is spotless, the porcelain from the sink and tube are so clean you can almost see your reflection in them. There is a nice tub next to the sink, with a toilet across from it.'
@@ -339,7 +339,7 @@ if $ARGS[0] = 'bathroom':
 							end
 						else
 							act 'Resist him removing your towel(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-						end	
+						end
 						act 'Let him pull your towel away':
 							*clr & cla
 							inhib_exp += 1
@@ -361,7 +361,7 @@ if $ARGS[0] = 'bathroom':
 								end
 							else
 								act 'Resist sucking his dick(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end	
+							end
 							act 'Drop to your knees': gt 'radaptev1', 'shower_rostislav1'
 						end
 					end
@@ -690,7 +690,7 @@ if $ARGS[0] = 'computer':
 			'You see that he''s watched videos from all kinds of porn sites. It is almost exclusively boy-girl rough dominate sex, where the guy is rough with the girl and dominates her. A lot of it is hard rough anal sex, there is also a little bit of lesbian sex and that seems to be about it. It would seem Radomir knows what he likes and that''s it.'
 			gs 'arousal', 'porn', 10
 			gs 'arousal', 'end'
-			act 'Turn the computer off': gt 'rapapt', 'radroom'
+			act 'Turn the computer off': gt 'radapt', 'radroom'
 		end
 	else
 		*clr & cla
@@ -808,7 +808,7 @@ if $ARGS[0] = 'firstvisit':
 	elseif hour < 22:
 		locat['154_rand4'] = daystart
 		locat['154_save4'] = locat['154']
-	end	
+	end
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/etaj4.jpg"></center>'
 	'Radomir leads you to his apartment, and the two of you talk a bit as you go. It''s nothing important, just idle small talk to pass the time. Once on the fifth floor of his building, he leads you to apartment 21. It''s one of the corner apartments. You know from your own building these are the bigger three bedroom apartments. He unlocks the door with his keys and leads you inside.'
 	act 'Continue':
@@ -924,7 +924,7 @@ if $ARGS[0] = 'firstvisit':
 							'The dad shakes his head. "Don''t tease your brother like that, he might not be up to your standards, he takes after his mother more after all, but he is better than this and we should encourage it."'
 							'Radislav nods a bit as if agreeing with his father or at least submitting to his fathers words. Radomir walks over and says to you. "Come on lets go." Then he leads you off down to his room, you can hear his brother and father still talking but you can''t make it out, but the tone of voice. You would guess it was about you and what they think of you which likely isn''t anything nice.'
 						end
-						act 'Go to Radomir''s room': gt 'rad_bedroom', 'radroom'
+						act 'Go to Radomir''s room': gt 'radapt', 'radroom'
 					end
 				end
 			end

locations/road.qsrc

@@ -1,6 +1,6 @@
 # road
 $location_type = 'public_outdoors'
-!! TODO:  Scene: As Sveta is walking along she stops for a moment to catch her breath. Depending on her outfit, a driver may stop and ask for her tariff. 
+!! TODO:  Scene: As Sveta is walking along she stops for a moment to catch her breath. Depending on her outfit, a driver may stop and ask for her tariff.
 !!        Playing along, i.e. accepting the offer, she unlocks the road as a place to work.
 if $ARGS[0] = '':
 	CLOSE ALL
@@ -17,7 +17,7 @@ if $ARGS[0] = '':
 	'<center><<nroad>> km</center>'
 	'Calling it a highway would be too much credit, but this road is the main way to get from St. Petersburg to the town of Pavlovsk, 20km away.'
 	'Smaller villages named Gadukino and Pushkin can be found along the way. Cars are driving by you at a high speed.'
-	
+
 	if car > 0 and cardrive = 22 and ncarroad = nroad and nroad ! 10:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a>'+iif(prostitute['road'] = 1, ' in a quieter spot.', ' next to the road.')
 	if nroad = 0: act 'Walk to the City Industrial Region (0:15)': minut += 15 & gt 'city_industrial'
 	if nroad = 1:
@@ -33,21 +33,21 @@ if $ARGS[0] = '':
 		act 'Walk to Pavlovsk Industrial region (0:25)': minut += 25 & gt 'pav_industrial'
 		act 'Walk to Pavlovsk Market (0:15)': minut += 15 & gt 'pav_market'
 	end
-	if nroad < 20: 
-		act 'Walk towards Pavlovsk (0:20)': 
-			if func('road', 'mistake_check'): 
+	if nroad < 20:
+		act 'Walk towards Pavlovsk (0:20)':
+			if func('road', 'mistake_check'):
 				!! TODO: should be gt 'road', 'walking_mistake'
 				gt 'road', 'autostop_mistake', 'Pavlovsk'
 			else
 				minut += 20
 				nroad += 1
 				gt $curloc
-			end		
+			end
 		end
 	end
-	if nroad > 0: 
-		act 'Walk towards St. Petersburg (0:20)': 
-			if func('road', 'mistake_check'):  
+	if nroad > 0:
+		act 'Walk towards St. Petersburg (0:20)':
+			if func('road', 'mistake_check'):
 				!! TODO: should be gt 'road', 'walking_mistake'
 				gt 'road', 'autostop_mistake', 'St. Petersburg'
 			else
@@ -55,7 +55,7 @@ if $ARGS[0] = '':
 				nroad -= 1
 				gt $curloc
 			end
-		end	
+		end
 	end
 	if nroad > 0 and nroad < 20:
 		!!  TODO: Adding a scene here of a driver mistaking Sveta for a whore and solicits her. If she accepts, that will unlock prostitution along the road.
@@ -66,7 +66,7 @@ if $ARGS[0] = '':
 			gorand = rand(1, 100)
 			picrand = RAND(1, 3)
 			!! Check if a misunderstanding is happening here
-			if func('road', 'mistake_check', 2): 
+			if func('road', 'mistake_check', 2):
 				gt 'road', 'autostop_mistake', 'Pavlovsk'
 			elseif gorand <= 60:
 				'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
@@ -94,7 +94,7 @@ if $ARGS[0] = '':
 			gs 'stat'
 			gorand = rand(1, 100)
 			picrand = RAND(1, 3)
-			if func('road', 'mistake_check', 2): 
+			if func('road', 'mistake_check', 2):
 				gt 'road', 'autostop_mistake', 'St. Petersburg'
 			elseif gorand <= 60:
 				'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'
@@ -148,20 +148,20 @@ if $ARGS[0] = '':
 		'You see a <a href="exec:gt ''train'', ''gadukino''">railway platform</a> not far from the road. In the same direction, a dirt road leads to the village of <a href="exec:minut += 15 & gt ''gadukino''">Gadukino</a>.'
 		'A <a href="exec:minut += 5 & gt ''furi''">lorry</a> is parked next to the road. The driver is currently taking a break and is having a cigarette. He could probably bring you to Pavlovsk or St. Petersburg, for a price...'
 		if MiraVars['QW'] > 15: 'Mira <a href="exec:gt ''gad_prostitutes'', ''start''">prostitutes</a> herself around here.'
-		if hour >= 16 and hour <= 23 and prostitute['gadukino'] = 1:
+		if hour >= 16 and hour < 23 and prostitute['gadukino'] = 1:
 			if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> in a quieter spot on the side road to Gadukin.'
-			
+
 			gs 'prostitution_functions', 'work_clothes'
-			if prostitute['work_clothes']: 
+			if prostitute['work_clothes']:
 				act 'You can work as a prostitute here': gt 'gad_prostitutes', 'start'
-				if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
+				if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']:
 					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
 				elseif prostitute['changed_for_work']:
 					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'road_side'
 				end
 			end
-			if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
-				if car > 0 and cardrive = 22 and ncarroad = nroad: 
+			if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']:
+				if car > 0 and cardrive = 22 and ncarroad = nroad:
 					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'car'
 				else
 					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'road_side'
@@ -169,10 +169,10 @@ if $ARGS[0] = '':
 			end
 		elseif prostitute['road'] = 1 and ((prostitute['wl_block'] = 0 and prostitute['full_block'] = 0) or (prostitute['wl_block'] = 1 and prostitute['payment_method'] = 1)):
 			if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> in a quieter spot on the side road to Gadukin.'
-			
+
 			gs 'prostitution_functions', 'work_clothes'
-			if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
-				if car > 0 and cardrive = 22 and ncarroad = nroad: 
+			if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']:
+				if car > 0 and cardrive = 22 and ncarroad = nroad:
 					$loc_desc = 'You change into some more appropriate clothing in your car, then walk down the road a little to catch the attention of passing cars.'
 					act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'car'
 				else
@@ -181,7 +181,7 @@ if $ARGS[0] = '':
 				end
 			elseif prostitute['work_clothes']:
 				act 'Work as a prostitute': gt 'road_prostitution', 'work'
-				if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
+				if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']:
 					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
 				elseif prostitute['changed_for_work']:
 					act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'road_side'
@@ -198,7 +198,7 @@ if $ARGS[0] = '':
 		!	'Mira <a href="exec:gt ''gad_prostitutes'', ''start''">prostitutes</a> herself around here.'
 		!elseif GadBoy['river_gang'] = 2:
 		!	'You can <a href="exec:gt ''gad_prostitutes'', ''start''">prostitute</a> yourself around here.'
-		!end		
+		!end
 	elseif nroad = 11:
 		''
 	elseif nroad = 12:
@@ -229,12 +229,12 @@ if $ARGS[0] = '':
 		end
 		if hour = 22 and NikoEv < 21:
 			'You can see <a href="exec:gt ''NikoSlut'', ''Yurik Out''">' + iif($YurikEv['Name'] = 'Yurik', 'Yurik', 'a big burly man') + '</a>, clearly drunk, stumbling along the highway with a beer bottle in his hand.'
-		end		
+		end
 	end
 	if prostitute['road'] = 1 and nroad ! 10 and nroad ! 20 and ((prostitute['wl_block'] = 0 and prostitute['full_block'] = 0) or (prostitute['wl_block'] = 1 and prostitute['payment_method'] = 1)):
 		gs 'prostitution_functions', 'work_clothes'
-		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']: 
-			if car > 0 and cardrive = 22 and ncarroad = nroad: 
+		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']:
+			if car > 0 and cardrive = 22 and ncarroad = nroad:
 				$loc_desc = 'You change into some more appropriate clothing in your car, then walk down the road a little to catch the attention of passing cars.'
 				act 'Change to work as a prostitute': gt 'prostitution_functions', 'change_to_work', 'car'
 			else
@@ -243,7 +243,7 @@ if $ARGS[0] = '':
 			end
 		elseif prostitute['work_clothes']:
 			act 'Work as a prostitute': gt 'road_prostitution', 'work'
-			if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']: 
+			if car > 0 and cardrive = 22 and ncarroad = nroad and prostitute['changed_for_work']:
 				act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'car'
 			elseif prostitute['changed_for_work']:
 				act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'road_side'
@@ -284,12 +284,12 @@ if $ARGS[0] = 'drive_sex1':
 	'You eagerly bob your head up and down while he drives, totally forgetting about your earlier doubts, and do your best to get him off.'
 	'With success: in no time at all, the man groans, and his cock erupts inside your mouth, shooting gobs of his hot sperm onto your tongue while you keep your lips closed to not make a mess.'
 	'Realizing you can''t spit it out anywhere, you have no option but to swallow his load while he keeps driving.'
-	
+
 	gs 'arousal', 'hj', 15, 'prostitution'
 	gs 'arousal', 'bj', -15, 'prostitution'
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Continue': gt 'road', 'autostop_drive'
 end
 
@@ -322,11 +322,11 @@ if $ARGS[0] = 'drive_sex2':
 	if dick >= 20: $road_text_sex = 'huge'
 	'You gently massage his cock between your fingers while the man gets comfortable. It''s <<$road_text_sex>>, roughly <<dick>> centimeters long and quite girthy. You manage to massage him to a full erection in no time at all, and begin to jerk him off while he drives, rubbing your fingertips over his glans.'
 	'Even though you feel a bit awkward for having to service this man to get where you need to be, you''re serious about what you promised him and jerk him off diligently. In no time at all, your soft touch brings him to an orgasm. Unfortunately, his cock is pointing straight at you when it happens, and most of his sperm ends up on your clothes.'
-	
+
 	gs 'arousal', 'hj', 15, 'prostitution'
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	act 'Continue': gt 'road', 'autostop_drive'
 end
 
@@ -363,7 +363,7 @@ if $ARGS[0] = 'autostop_drive':
 			prostitute['highway_idea'] = 2
 			gs 'prostitution_functions', 'set_highway_prostitute'
 		else
-			if PCloStyle = 4: 
+			if PCloStyle = 4:
 				'You may dress like one, but that doesn''t mean you are one. Nonetheless, now you know to watch out, clearly there are prostitutes working along the highway and not just near Pavlovsk or St. Petersburg.'
 			else
 				'You are still a bit shaken and wonder why did you even ask him to give you a ride, but then shrug it off. He thought you were a hooker. As if...'
@@ -404,7 +404,7 @@ if $ARGS[0] = 'autostop_money':
 		'You take a small step back, "I think, there is a mistake, sir, I''m just trying to get to <<$road_textrand0>>, can you help me?'
 		'The driver gives you another appraising look.'
 	end
-	vnerand = RAND(0,1200) 
+	vnerand = RAND(0,1200)
 	if vnerand <= pcs_apprnc:
 		cla
 		'"I can take you there for free, but only if you do something for me in return," the guy smiles.'
@@ -432,8 +432,8 @@ if $ARGS[0] = 'autostop_money':
 			'"Thank you sir, but I will just wait for someone else, I''m sorry for holding you up." you say and step away from the car. The man shrugs and drives off.'
 			act 'Continue':gt $curloc
 		end
-		exit & !! What does this exit actually do here? 
-	else 
+		exit & !! What does this exit actually do here?
+	else
 		'He ponders for a second and then says, "<<$road_textrand4>>"'
 		if money > autostop_price*100:
 			act 'Agree to pay him': gt 'road', 'autostop_drive'
@@ -473,11 +473,11 @@ if $ARGS[0] = 'autostop_money':
 					'After some hesitation, he responds, "Oh, alright then. Getting a handjob from a cute girl such as yourself sounds like a fair deal. Get in."'
 					act 'Get in the car':gt 'road', 'drive_sex2'
 				end
-			else 
+			else
 				ivrand = RAND(1,2)
 				autostop_price -= ivrand
 				'The man sighs exasperatedly, but yields, "Okay, fine. I''ll make it <<ivrand*100>> <b>₽</b> less, because you seem like a nice girl and I want to help you out. I''ll take you there for <<autostop_price*100>> <b>₽</b>, but I can''t go any lower than that!"'
-				
+
 				if money > autostop_price*100:
 					act 'Agree to pay him':
 						!trip
@@ -584,7 +584,7 @@ if $ARGS[0] = 'autostop_mistake':
 	truck_drive = 0
 	bandit_drive = 0
 	if rand(1,4) = 1: bandit_drive = 1
-	
+
 	textrand = RAND(1,5)
 	if textrand = 1:$road_textrand1 = 'perfectly clean and shiny'
 	if textrand = 2:$road_textrand1 = 'dirty'
@@ -610,7 +610,7 @@ if $ARGS[0] = 'autostop_mistake':
 	if textrand = 3:$road_textrand3 = '"Hey girl, just what I need, <<$act_text>>'
 	if textrand = 4:$road_textrand3 = '"Hey beauty, just what I need, <<$act_text>>'
 	if textrand = 5:$road_textrand3 = '"Darling, where are your girlfriends, being busy?" he glances over you again "Don''t be sad, I''ll make you busy too, <<$act_text>>'
-	
+
 	if prostitute['road'] = 0: prostitute['highway_idea'] = 1
 
 	'<center><B>Main road between St. Petersburg and Pavlovsk</B></center>'

locations/salon.qsrc

@@ -123,7 +123,7 @@ if $ARGS[0] = 'services':
 
 	$epayments['method'] = ''
 	$epayments['item_variable'] = ''
-	epayments['quantity'] = ''
+	epayments['quantity'] = 0
 	$epayments['loc'] = 'salon'
 	$epayments['banner']  = 'locations/city/citycenter/mall/salon/xian.jpg'
 

locations/saveupdater.qsrc

@@ -3052,17 +3052,17 @@ if temp_current_save_version < 00090204:
 	if therapist_weekly_cheat	! 0 or $therapist_weekly_cheat	! '':		cheatVars['therapist_schedule']	= therapist_weekly_cheat	& killvar 'therapist_weekly_cheat'
 
 
-	if addictive_cheat	! 0 or $addictive_cheat		! '' or cheataddictive	! '':
+	if addictive_cheat	! 0 or $addictive_cheat		! '' or $cheataddictive	! '' or cheataddictive ! 0:
 		cheatVars['no_trait_addictive']	= addictive_cheat
 		killvar 'addictive_cheat'
 		killvar 'cheataddictive'
 	end
-	if cumeater_cheat	! 0 or $cumeater_cheat		! '' or cheatcumtrait	! '':
+	if cumeater_cheat	! 0 or $cumeater_cheat		! '' or $cheatcumtrait	! '' or cheatcumtrait	! 0:
 		cheatVars['no_trait_cumeater']	= cumeater_cheat
 		killvar 'cumeater_cheat'
 		killvar 'cheatcumtrait'
 	end
-	if exhib_cheat		! 0 or $exhib_cheat			! '' or cheatexhib		! '':
+	if exhib_cheat		! 0 or $exhib_cheat			! '' or $cheatexhib		! '' or cheatexhib		! 0:
 		cheatVars['no_trait_exhib']		= exhib_cheat
 		killvar 'exhib_cheat'
 		killvar 'cheatexhib'

locations/sex_ev_condoms.qsrc

@@ -1758,6 +1758,22 @@ if $ARGS[0] = 'condom_compromise':
 				'"Probably," you say, your smile twisting into a smirk. His breaks into a grin and pulls you over, preparing to fuck you bareback.'
 				gs 'sex_ev_sex', 'position_choose'
 			end
+		elseif stat['dangerous_day'] = 1:
+			act'Not today':
+				sex_ev['danger_day'] = 1
+				cla & *clr
+				$sex_ev['bed_room']
+				'"Not today, sorry to say." Your smile turns wistful. "I''ll definitely get pregnant if we have an ''accident'' today. So that means condoms."'
+				if sex_ev['condom_count'] > sex_ev['condoms_used']:
+					'<<$npc_firstname[$boy]>> sighs wearily and goes to get some.'
+					gs 'sex_ev_condoms', 'npc_condom_put_on'
+				else
+					'<<$npc_firstname[$boy]>> sighs wearily.'
+					'"Do you have any then? I''m all out.'
+					gs 'sex_ev_condoms', 'pc_use_condoms'
+				end
+				gs 'sex_ev_sex', 'position_choose'
+			end
 		end
 	end
 end

locations/sex_ev_pillow_talk.qsrc

@@ -1259,9 +1259,7 @@ if $ARGS[0] = 'thank_no_creampie':
 			sex_ev['pullout_thank'] = 1
 			cla
 			'"Thanks for remembering to pull out," you say.'
-			if npc_dont_like_creampie[$boy] = 1:
-				!! '"Thanks for remembering to pull out," you say.'
-			elseif $npc_cum_pref[$boy] = 'creampie':
+			if $npc_cum_pref[$boy] = 'creampie':
 				'"Wish I didn''t have to," he sighs. "Coming inside a girl is the best feeling in the world."'
 				act'Ew':
 					cla & *nl
@@ -1279,7 +1277,21 @@ if $ARGS[0] = 'thank_no_creampie':
 						end
 					end
 				end
-
+			elseif npc_dont_like_creampie[$boy] = 1 and npc_caretaker[$boy] = 1:
+				!! '"Thanks for remembering to pull out," you say.'
+				'"I know you don''t like it when I come inside."'
+				act'He remembered!':
+					cla & *nl
+					'"Aww! You remembered!" you coo, touching his arm affectionately.'
+					'"I try," he shrugs.'
+					gs'sex_ev_pillow_talk', 'topic_route'
+				end
+				
+				act'He''s sweet':
+					cla & *nl
+					'"You''re so sweet, you know that?" you smile warmly, touching his arm affectionately.'
+					gs'sex_ev_pillow_talk', 'topic_route'
+				end
 			else
 				!! '"Thanks for remembering to pull out," you say.'
 				if sex_ev['promise_no_creampie'] = 1:

locations/spell.qsrc

@@ -161,9 +161,6 @@ if $ARGS[0] = 'teleport':
 
 	killvar '$randomLoc'
 	killvar '$NewLocation'
-
-	result = ""
-
 end
 
 if $ARGS[0] = 'regenerate':

locations/stat_display.qsrc

@@ -1563,7 +1563,8 @@ if enable_show_status = 0:
 		if cheatVars['thirst'] = 0: $stat_extra_msg += '<BR><b><<$pcs_hydra>></b>'
 		if cheatVars['sleep'] = 0: $stat_extra_msg += '<BR><b><<$pcs_sleep>></b>'
 	elseif Enable_scalepic = 0:
-		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="200">'
+		! <font color="<<$fcolor>>">
+		$stat_extra_msg += '<TABLE cellpadding="1" cellspacing="0" width="200">'
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 2, pcs_horny, pcs_horny)+'</TD><TD>&nbsp;Arousal</TD></TR>'
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 2, pain['total'], pain['total'], pain['damage'])+'</TD><TD>&nbsp;Pain</TD></TR>'
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_health * 100 / healthmax, pcs_health)+'</TD><TD>&nbsp;Health</TD></TR>'
@@ -1574,7 +1575,8 @@ if enable_show_status = 0:
 		if cheatVars['hunger'] = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_energy, pcs_energy)+'</TD><TD>&nbsp;Hunger</TD></TR>'
 		if cheatVars['thirst'] = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_hydra, pcs_hydra)+'</TD><TD>&nbsp;Thirst</TD></TR>'
 		if cheatVars['sleep'] = 0: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_sleep, pcs_sleep)+'</TD><TD>&nbsp;Sleep</TD></TR>'
-		$stat_extra_msg += '</TABLE></font>'
+		$stat_extra_msg += '</TABLE>'
+		! </font>
 	else
 		gs 'indik', '2', pcs_horny, pcs_horny
 		$stat_extra_msg += '<BR><<$ind>> Arousal'
@@ -1626,7 +1628,8 @@ else
 	!skip if this is first message
 	if $stat_extra_msg ! '': $stat_extra_msg += '<br><a href="exec:Enable_showattr = 0 & gs ''$menu_obnovit''">▲Attributes:</a>'
 	if Enable_scalepic = 0:
-		$stat_extra_msg += '<font color="<<$fcolor>>"><TABLE cellpadding="1" cellspacing="0" width="200">'
+		! <font color="<<$fcolor>>">
+		$stat_extra_msg += '<TABLE cellpadding="1" cellspacing="0" width="200">'
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, 100 - pcs_inhib, 100 - pcs_inhib)+'</TD><TD>&nbsp;Inhibition</TD></TR>'
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_stren, pcs_stren)+'</TD><TD>&nbsp;Strength</TD></TR>'
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_agil, pcs_agil)+'</TD><TD>&nbsp;Agility</TD></TR>'
@@ -1639,7 +1642,8 @@ else
 		if $start_type[1] ! 'nomagic': $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_magik, pcs_magik)+'</TD><TD>&nbsp;Magic</TD></TR>'
 		if succubusflag = 1: $stat_extra_msg += '<TR><TD>'+func('indiktab', 1, sucexcess, sucexcess)+'</TD><TD>&nbsp;Succubus Energy</TD></TR>'
 		$stat_extra_msg += '<TR><TD>'+func('indiktab', 1, pcs_apprnc / 2, pcs_apprnc)+'</TD><TD>&nbsp;Attractiveness</TD></TR>'
-		$stat_extra_msg += '</TABLE></font>'
+		$stat_extra_msg += '</TABLE>'
+		! </font>
 	else
 		gs 'indik', '1', 100 - pcs_inhib, 100 - pcs_inhib
 		$stat_extra_msg += '<BR><<$ind>> Inhibition'

locations/street_event.qsrc

@@ -253,7 +253,7 @@ if $ARGS[1] = 'main':
 		gs 'exp_gain', 'prcptn', rand(1,2)
 		streetev_day = daystart
 		temp = rand(1,100) + pcs_observ
-		'<<$streetev_title>>'
+		$streetev_title
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/rapist.jpg"></center>'
 		if temp >= 100:
 			'You notice a hooded man standing in a darkened alleyway up ahead. Feeling he is up to no good you cross the street to the other side before you get to him. You see him look your direction before fading back into the darkness of the alleyway.'
@@ -320,7 +320,7 @@ if $ARGS[1] = 'main':
 			gs 'exp_gain', 'prcptn', rand(1,2)
 			gs 'stat'
 			temp = rand(1,100) + pcs_observ
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/mugger.jpg"></center>'
 			if temp >= 100:
 				'You notice a hooded man standing in a darkened doorway up ahead. Feeling he is up to no good you cross the street to the other side before you get to him. You see him look your direction before fading back into the darkness of the doorway.'
@@ -401,7 +401,7 @@ if $ARGS[1] = 'main':
 			menu_off = 1
 			gs'stat'
 			streetev_day = daystart
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/pursesnatch.jpg"></center>'
 			if rand(0,300) < (pcs_agil + pcs_stren):
 				'As you are walking down the street minding your own business, you are suddenly jerked sideways and nearly pulled off your feet. You quickly regain your balance, and instinctively, your fingers hold your purse tighter as you feel something tugging on it. A man is trying to snatch your purse, but he runs away when you don''t let go of it immediately.'
@@ -411,7 +411,7 @@ if $ARGS[1] = 'main':
 				act 'It''s only money and a bag':
 					dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 0'
 					$currentpursetype = ''
-					currentpursenumber = ''
+					currentpursenumber = 0
 					bag = 0
 					money = 0
 					gt $loc
@@ -421,18 +421,18 @@ if $ARGS[1] = 'main':
 					if (pcs_run + pcs_stam) < rand(120,250):
 						dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 0'
 						$currentpursetype = ''
-						currentpursenumber = ''
+						currentpursenumber = 0
 						bag = 0
 						money = 0
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/purselose.jpg"></center>'
 						'You chase after him, screaming at him to stop or for someone to stop him, but he quickly out paces you, and soon, you lose sight of him. After a couple of blocks of not seeing him anymore, you stop and lean against the wall to catch your breath.'
 						act 'Continue': gt $loc
 					else
 						gs 'npcgeneratec', 0, 'Purse Snatcher', rand(18,45)
 						gs 'boyStat', $npclastgenerated
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/pursechase.jpg"></center>'
 						'You chase after him, screaming at him to stop or for someone to stop him. All that working out is paying off, you are gaining on him. He keeps glancing back as you get closer, he turns and ducks down an alley when you are nearly on top of him. He leaps over an overturned trash can, obviously still hoping to get away from you. You easily leap over it as well, and a few steps later, you tackle him, sending both of you rolling on the ground. You both get back to your feet at the same time. Realising he can''t escape, he lunges at you.'
 						gs 'fight','initFight'
@@ -588,7 +588,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/guitarb'+ rand(1,2) +'.jpg"></center>'
 				'As you walk down the sidewalk, you notice a man playing a guitar. He has his guitar case open, and you can see some money in it already. Several other people have stopped to listen to him play. He isn''t half bad.'
 				act 'Ignore':gt $loc
@@ -623,7 +623,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/guitarg1.jpg"></center>'
 				'As you walk down the sidewalk, you notice a girl playing a guitar. She has her guitar case open, and you can see some money in it already. Several other people have stopped to listen to her play. She isn''t half bad.'
 				act 'Leave':gt $loc
@@ -632,7 +632,7 @@ if $ARGS[1] = 'main':
 					minut += 10
 					pcs_mood += 10
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/guitarg1.jpg"></center>'
 					'You stop and listen to her play several songs. She really is pretty good. You wonder why she is playing on the street. Perhaps the old adage about starving artists applies to musicians as well.'
 					act 'Leave':gt $loc
@@ -643,7 +643,7 @@ if $ARGS[1] = 'main':
 							money -= 50
 							pcs_mood += 10
 							gs 'stat'
-							'<<$streetev_title>>'
+							$streetev_title
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/guitarg1.jpg"></center>'
 							'You reach into your purse and pull out some money. You drop it into her case. She looks up at you and smiles and nods her head, but keeps playing. With your good deed done you go on your way.'
 							act 'Leave':gt $loc
@@ -659,7 +659,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/violinb1.jpg"></center>'
 				'As you walk down the sidewalk, you notice a man playing a violin. He has his violin case open, and you can see some money in it already. Several other people have stopped to listen to him play. He isn''t half bad.'
 				act 'Leave':gt $loc
@@ -668,7 +668,7 @@ if $ARGS[1] = 'main':
 					minut += 10
 					pcs_mood += 10
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/violinb1.jpg"></center>'
 					'You stop and listen to him play several songs. He really is pretty good. You wonder why he is playing on the street. Perhaps the old adage about starving artists applies to musicians as well.'
 					act 'Leave':gt $loc
@@ -679,7 +679,7 @@ if $ARGS[1] = 'main':
 							money -= 50
 							pcs_mood += 10
 							gs 'stat'
-							'<<$streetev_title>>'
+							$streetev_title
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/violinb1.jpg"></center>'
 							'You reach into your purse and pull out some money. You drop it into his case. He looks up at you and smiles and nods his head, but keeps playing. With your good deed done, you go on your way.'
 							act 'Leave':gt $loc
@@ -695,7 +695,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/violing1.jpg"></center>'
 				'As you walk down the sidewalk, you notice a girl playing a violin. She has her violin case open, and you can see some money in it already. Several other people have stopped to listen to her play. She isn''t half bad.'
 				act 'Leave':gt $loc
@@ -704,7 +704,7 @@ if $ARGS[1] = 'main':
 					minut += 10
 					pcs_mood += 10
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/violing1.jpg"></center>'
 					'You stop and listen to her play several songs. She really is pretty good. You wonder why she is playing on the street. Perhaps the old adage about starving artists applies to musicians as well.'
 					act 'Leave':gt $loc
@@ -715,7 +715,7 @@ if $ARGS[1] = 'main':
 							money -= 50
 							pcs_mood += 10
 							gs 'stat'
-							'<<$streetev_title>>'
+							$streetev_title
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/violing1.jpg"></center>'
 							'You reach into your purse and pull out some money. You drop it into her case. She looks up at you and smiles and nods her head, but keeps playing. With your good deed done, you go on your way.'
 							act 'Leave':gt $loc
@@ -731,7 +731,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/artist.jpg"></center>'
 				'As you walk down the street, you see a man sitting in a chair with a sign saying "Will draw portrait for 50 <b>₽</b>".'
 				act 'Leave':gt $loc
@@ -741,7 +741,7 @@ if $ARGS[1] = 'main':
 					money -= 50
 					pcs_mood += 10
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/artist.jpg"></center>'
 					'You stop next to her and smile. "I would like you to draw me please." She gives you a friendly smile in return, pointing towards the other chair. "Please take a seat," she says, following this with a glance to the can sitting next to the chair. You understand and pull out the money and put it in the can. You sit for a while as she draws your portrait. After some time, she is finished and shows it to you. It is really very good and might make a good gift to give someone. You thank her for it and go on your way.'
 					act 'Leave':gt $loc
@@ -754,13 +754,13 @@ if $ARGS[1] = 'main':
 			menu_off = 1
 			minut += 5
 			gs 'stat'
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/assgrab.jpg"></center>'
 			'As you walk down the street, you feel a hand grab your ass and squeeze it hard. You jerk away and look over your shoulder, and you see a guy grinning at you.'
 			act 'Ignore':gt $loc
 			act 'Slap him':
 				*clr & cla
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/slapb.jpg"></center>'
 				'You turn around. and as you do, you swing your hand, palm open, and deliver a hard smack to his face. The pop is loud enough to draw attention, and the guy recoils from it rubbing his face, seemingly surprised you smacked him. "Don''t touch me asshole." With that, you turn and continue on your way.'
 				act 'Leave':gt $loc
@@ -771,7 +771,7 @@ if $ARGS[1] = 'main':
 			minut += 5
 			gs 'exp_gain', 'prcptn', rand(1,2)
 			gs 'stat'
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/beatup.jpg"></center>'
 			'As you walk down the street, you pass a man that is badly beaten lying unconscious on the sidewalk. You stop a moment, unsure what to do, but everyone else just ignores him.'
 			act 'Ignore him':
@@ -785,7 +785,7 @@ if $ARGS[1] = 'main':
 				minut += 20
 				mood += 20
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/police/patrol.jpg"></center>'
 				'You call the police and are told to wait for the officers, it takes some time before the do. When a car finally pulls the officers get out and ask you a few questions then tell you to be on your way. You look back and they call in and start talking to the man, you continue on your way finally.'
 				act 'Continue':gt $loc
@@ -798,7 +798,7 @@ if $ARGS[1] = 'main':
 			!!all the getting partially stripped ones from 09:00 till 24:00
 					*clr & cla
 					minut += 5
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><video autoplay loop src="images/locations/shared/street/bottomed1.mp4"></video></center>'
 					'As you walk down the street, you are suddenly pushed forward hard. You nearly lose your balance and only barely catch yourself. While you are half bent over and trying to recover, you feel someone yank up your dress and yank down your panties, exposing your ass and pussy for everyone to see. You quickly regain your balance. As you do, you pull up your panties and smooth your dress back in place. By that time, whoever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
@@ -820,7 +820,7 @@ if $ARGS[1] = 'main':
 				elseif PCloSkirt > 0 and $pantyworntype = 'none' and PCloOnePiece = 1:
 					*clr & cla
 					minut += 5
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><video autoplay loop src="images/locations/shared/street/sharkdress'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street, someone comes up behind you, grabs the top of your dress and yanks it down around your ankles, which leaves you standing stark naked. You quickly squat down and grab your dress, pulling it back up and into place. By that time, who ever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
@@ -841,7 +841,7 @@ if $ARGS[1] = 'main':
 				elseif PCloSkirt > 0 and $pantyworntype ! 'none':
 					*clr & cla
 					minut += 5
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><video autoplay loop src="images/locations/shared/street/bottomeds'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street, someone comes up behind you and grabs your skirt and panties, yanking them down. Your skirt ends up around your ankles and your panties halfway down your thighs, which leaves your ass and pussy on fully display to everyone around. You quickly pull up your panties and then squat down and grab your skirt, pulling it back up and into place. By that time, whoever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
@@ -863,7 +863,7 @@ if $ARGS[1] = 'main':
 				else
 					*clr & cla
 					minut += 5
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><video autoplay loop src="images/locations/shared/street/topped'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street, someone comes up behind you and grabs your top, yanking it down, which leaves your tits on full display to everyone around. You quickly pull your top back up. By that time, whoever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
@@ -892,7 +892,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><video autoplay loop src="images/locations/shared/street/breeze.mp4"></video></center>'
 				'As you walk down the street, a strong breeze suddenly blows down it, which causes your skirt to blow up, exposing your panty-clad ass to everyone on the street. You quickly push it back down, but as soon as you let go, the breeze blows it right back up. You fight against the breeze for almost a minute before it finally stops.'
 				if exhibitionist_lvl = 1:
@@ -915,7 +915,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><video autoplay loop src="images/locations/shared/street/breeze_rainy.mp4"></video></center>'
 				'A strong windy breeze blows down the street which causes your skirt to blow up entirely, exposing all of your crotch to the people around. You struggle pushing it back down where it belongs, as the breeze continues to expose you.'
 				if exhibitionist_lvl = 1:
@@ -941,7 +941,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/street_groped'+ rand(1,2) +'.jpg"></center>'
 				'As you walk down the street, someone comes up behind you and grabs your ass, sqeezing it tightly. You flinch while quickly turning around angrily but only seeing your perpetrator running away.'
 				if exhibitionist_lvl = 1:
@@ -967,7 +967,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><video autoplay loop src="images/locations/shared/street/couple1.mp4"></video></center>'
 				'As you walk down the street, you see a couple making out passionately. The guy reaches around and starts squeezing the girls ass. You can''t help but watch them as you walk by, feeling your own arousal growing.'
 				gs 'arousal', 'voyeur', 5
@@ -983,7 +983,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra1.mp4"></video></center>'
 				'As you walk down the street you feel your breasts wobbling freely under your outfit, which can probably be seen by people walking by too.'
 				if exhibitionist_lvl = 1:
@@ -1004,7 +1004,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra'+ rand(2,4) +'.mp4"></video></center>'
 				'As you walk down the street you feel your breasts wobbling freely under your thin outfit, stretching it, emphasizing the outline of your tits, which can definitely be seen by people walking by too. As you look closely both men and women are staring at your jiggling tits.'
 				if exhibitionist_lvl = 1:
@@ -1030,7 +1030,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/lesbians.jpg"></center>'
 				'As you walk down the street, you see a couple of girls making out passionately. You can''t help but watch them as you walk by, feeling your own arousal growing.'
 				gs 'arousal', 'voyeur', 5
@@ -1048,7 +1048,7 @@ if $ARGS[1] = 'main':
 				pcs_horny += 5
 				gs 'exp_gain', 'prcptn', rand(1,2)
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/lostkey.jpg"></center>'
 				'As you pass by an alleyway, you glance down and see a woman wearing a very nice dress with nice high heels trying to jimmy a window. A few moments later, she slides the window open and then crawls through, giving a nice view of her ass as she does. Once inside, she quickly shuts the window. As you continue on, you wonder if maybe she lost her keys. Or maybe she was just a very well dressed burglar.'
 				act 'Continue':gt $loc
@@ -1060,7 +1060,7 @@ if $ARGS[1] = 'main':
 			menu_off = 1
 			minut += 5
 			gs 'stat'
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/fightb.jpg"></center>'
 			'As you walk down the street, two guys just ahead of you start pushing each other. Seconds later, they are throwing punches. The fight escalates quickly.'
 			act 'Ignore it':gt $loc
@@ -1068,7 +1068,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/fightb.jpg"></center>'
 				'You love a good fight, so you like many others stop and watch them duke it out. It goes on for a while as they trade blows. One of them finally gets the upper hand and gets the other one down and starts beating him. He doesn''t stop until one of his friends pulls him off. With the fight over, everyone leaves. You can hear police sirens and decide it is time to leave yourself.'
 				act 'Leave':gt $loc
@@ -1078,7 +1078,7 @@ if $ARGS[1] = 'main':
 			menu_off = 1
 			minut += 5
 			gs 'stat'
-			'<<$streetev_title>>'
+			$streetev_title
 			if $loc = 'pav_commercial' or $loc = 'pav_residential':
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/town/fightg1.jpg"></center>'
 			else
@@ -1089,7 +1089,7 @@ if $ARGS[1] = 'main':
 			act 'Stop and watch':
 				*clr & cla
 				minut += 5
-				'<<$streetev_title>>'
+				$streetev_title
 				if $loc = 'pav_commercial' or $loc = 'pav_residential':
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/town/fightg1.jpg"></center>'
 				else
@@ -1110,7 +1110,7 @@ if $ARGS[1] = 'main':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				if month >= 11 or month <= 3:
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/girlflashw'+ rand(1,2) +'.jpg"></center>'
 				else
@@ -1123,7 +1123,7 @@ if $ARGS[1] = 'main':
 					act 'Flash her back':
 						*clr & cla
 						gs 'flash', 'tits', 'outdoors', 1, 1
-						'<<$streetev_title>>'
+						$streetev_title
 						if PCloSkirt > 0:
 							'<center><img <<$set_imgh>> src="images/pc/activities/flashing/dress/outside/tits/' + rand(1,12) + '.jpg"></center>'
 							'You grin at her as she flashes you, and you lift your shirt, flashing your tits back at her, which makes her laugh.'
@@ -1144,7 +1144,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/girls1.jpg"></center>'
 				if hotcat > 6:
 					pcs_mood += 20
@@ -1167,13 +1167,13 @@ if $ARGS[1] = 'main':
 					act 'Ignore them':gt $loc
 					act 'Tell them off':
 						*clr & cla
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girls1.jpg"></center>'
 						'You spin around to face them. "Just what''s your problem bitches?" One of the girls steps up to you. "You best back yourself up bitch before I smack the shit out of you."'
 						act 'Hurry away in shame':gt $loc
 						act 'Bring it Bitch!':
 							*clr & cla
-							'<<$streetev_title>>'
+							$streetev_title
 							$boydesc = 'The group of girls'
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 							'You give her a small shove to force her to step back. "Bring it on then, bitch." The words barely leave your mouth before she jumps you. Soon all of her friends join in, leaving you to fight them all.'
@@ -1195,7 +1195,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/flyerman.jpg"></center>'
 				'As you walk down the street, you run across a man handing out flyers. As you get near him, he waves you over, "Hello there young lady, would you like to earn a little extra money? All you have to do is take some of these flyers and hand them out for half an hour, and I will pay you 75 <b>₽</b>. What do you say?"'
 				act 'No thanks':gt $loc
@@ -1205,7 +1205,7 @@ if $ARGS[1] = 'main':
 					money += 75
 					pcs_mood -= 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					if month >= 11 or month <= 3:
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/flyerw.jpg"></center>'
 					else
@@ -1218,7 +1218,7 @@ if $ARGS[1] = 'main':
 						money += 75
 						pcs_mood -= 5
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						if month >= 11 or month <= 3:
 							'<center><img <<$set_imgh>> src="images/locations/shared/street/flyerw.jpg"></center>'
 						else
@@ -1237,7 +1237,7 @@ if $ARGS[1] = 'main':
 			menu_off = 1
 			minut += 5
 			gs 'stat'
-			'<<$streetev_title>>'
+			$streetev_title
 			'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 			'As you walk down the street, you pass a girl sitting on a barrel just inside of an alleyway, holding up a sign saying that she is homeless, pleading for help.'
 			act 'Ignore her':gt $loc
@@ -1247,7 +1247,7 @@ if $ARGS[1] = 'main':
 					money -= 50
 					pcs_mood += 10
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
 					act 'Leave':gt $loc
@@ -1259,7 +1259,7 @@ if $ARGS[1] = 'main':
 					money -= 100
 					pcs_mood += 20
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
 					act 'Leave':gt $loc
@@ -1271,7 +1271,7 @@ if $ARGS[1] = 'main':
 					money -= 250
 					pcs_mood += 30
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
 					act 'Leave':gt $loc
@@ -1283,7 +1283,7 @@ if $ARGS[1] = 'main':
 					money -= 500
 					pcs_mood += 40
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
 					act 'Leave':gt $loc
@@ -1293,7 +1293,7 @@ if $ARGS[1] = 'main':
 				act 'Give her 1000 <b>₽</b>':
 					*clr & cla
 					money -= 1000
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/homelessg.jpg"></center>'
 					pcs_mood += 50
 					'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heart warming smile.'
@@ -1306,7 +1306,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				if month >= 11 or month <= 3:
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/nakedgw1.jpg"></center>'
 				else
@@ -1326,7 +1326,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/nakedgmbike.jpg"></center>'
 				'As you walk down the street, a motorcycle drives by slowly. Several people are taking pictures. The man driving waves at them, while behind him sits a naked girl only wearing a motorcycle helmet. A few moments later, the traffic clears up a bit and they zoom off.'
 				gs 'arousal', 'erotic_nudity', 5
@@ -1341,7 +1341,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/nopanties.jpg"></center>'
 				'As you walk down the street, you pass a young girl sitting on the sidewalk with some friends next to her. You throw a glance at her and surprisingly see her spread her legs revealing her bare pussy to you, all while smiling.'
 				gs 'arousal', 'erotic_nudity', 5
@@ -1356,7 +1356,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/splitsread.jpg"></center>'
 				'As you walk down the street, you pass a young girl reading a magazine. All of a sudden she lifts her foot, doing a standing split. You look at her in confusement, wondering why she''s behaving oddly. As you''re about to step up to her, it''s like she wakes up from a daze. She blushes and quickly runs away from you.'
 				act 'Leave':gt $loc
@@ -1369,12 +1369,12 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/teens.jpg"></center>'
 				'As you walk down the street, you pass a group of teens. Just as you are about to pass them, one of the boys calls out. "Hey! Want a beer?" he says as he offers you one.'
 				act 'Decline':
 					*clr & cla
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/teens.jpg"></center>'
 					'You shake your head no and mumble thanks but no thanks and continue on your way.'
 					act 'Leave':gt $loc
@@ -1384,7 +1384,7 @@ if $ARGS[1] = 'main':
 					minut += 30
 					gs 'drugs', 'alcohol', 'beer'
 					gs'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/teens.jpg"></center>'
 					'You stop a moment and consider it then walk over and take the offered beer. You sit and talk with them for a while and drink the beer. After a bit, you decide you should be on your way. You thank them for the beer and say goodbye as you head out.'
 					act 'Leave':gt $loc
@@ -1399,7 +1399,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 				'As you walk down the street, you pass a young girl sitting on the sidewalk with some bags next to her, a cat in her lap and a sign saying that she is homeless, pleading for help.'
 				act 'Ignore her':gt $loc
@@ -1409,7 +1409,7 @@ if $ARGS[1] = 'main':
 						money -= 50
 						pcs_mood += 20
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 						'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heartwarming smile as she hugs her cat close to her and whispers to him that they will get to eat tonight.'
 						act 'Leave':gt $loc
@@ -1419,7 +1419,7 @@ if $ARGS[1] = 'main':
 								money -= 5000
 								pcs_mood += 50
 								gs 'stat'
-								'<<$streetev_title>>'
+								$streetev_title
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
@@ -1433,7 +1433,7 @@ if $ARGS[1] = 'main':
 						money -= 100
 						pcs_mood += 30
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 						'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heartwarming smile as she hugs her cat close to her and whispers to him that they will get to eat tonight.'
 						act 'Leave':gt $loc
@@ -1443,7 +1443,7 @@ if $ARGS[1] = 'main':
 								money -= 5000
 								pcs_mood += 50
 								gs 'stat'
-								'<<$streetev_title>>'
+								$streetev_title
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
@@ -1457,14 +1457,14 @@ if $ARGS[1] = 'main':
 						money -= 250
 						pcs_mood += 40
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 						'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heartwarming smile as she hugs her cat close to her and whispers to him that they will get to eat tonight.'
 						act 'Leave':gt $loc
 						if money >= 5000:
 							act 'Give her another 5000 <b>₽</b>':
 								*clr & cla
-								'<<$streetev_title>>'
+								$streetev_title
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 								money -= 5000
 								pcs_mood += 50
@@ -1481,7 +1481,7 @@ if $ARGS[1] = 'main':
 						money -= 500
 						pcs_mood += 50
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 						'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heartwarming smile as she hugs her cat close to her and whispers to him that they will get to eat tonight.'
 						act 'Leave':gt $loc
@@ -1491,7 +1491,7 @@ if $ARGS[1] = 'main':
 								money -= 5000
 								pcs_mood += 50
 								gs 'stat'
-								'<<$streetev_title>>'
+								$streetev_title
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
@@ -1505,7 +1505,7 @@ if $ARGS[1] = 'main':
 						money -= 1000
 						pcs_mood += 50
 						gs 'stat'
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 						'You open your purse up and pull out the money you can spare and hand it to her. She thanks you profusely and gives you a heartwarming smile as she hugs her cat close to her and whispers to him that they will get to eat tonight.'
 						act 'Leave':gt $loc
@@ -1515,7 +1515,7 @@ if $ARGS[1] = 'main':
 								money -= 5000
 								pcs_mood += 50
 								gs 'stat'
-								'<<$streetev_title>>'
+								$streetev_title
 								'<center><img <<$set_imgh>> src="images/locations/shared/street/girlcat.jpg"></center>'
 								'You open your purse up and pull out the money you can spare and hand it to her. She breaks down and cries when she sees how much money you gave her. She gets up and hugs you tightly with one arm while holding her cat with the other, thanking you over and over. She smells like she hasn''t bathed for a while, but you don''t mind. She finally lets go of you, and as you walk away, she hugs her cat, and you hear her tell him that tonight they will sleep indoors and eat.'
 								act 'Leave':gt $loc
@@ -1529,7 +1529,7 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/city/homeless.jpg"></center>'
 					'As you walk down the street, you pass a couple of homeless men lying on a metro gate, using it for warmth in the freezing conditions.'
 					act 'Ignore them':gt $loc
@@ -1542,7 +1542,7 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/city/gay.jpg"></center>'
 					'As you walk down the street, you pass a couple of boys holding hands and occasionally kissing. Soon a few other guys come over and start harassing them, calling them all sorts of names.'
 					act 'Leave':gt $loc
@@ -1555,7 +1555,7 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/city/sell.jpg"></center>'
 					'As you walk down the street, you pass an old couple all bundled up against the cold. They have several jars and other homemade food items, along with a couple of household items and jewelry they are trying to sell.'
 					act 'Leave':gt $loc
@@ -1573,7 +1573,7 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/town/hookers.jpg"></center>'
 					'As you walk down the street, you see a couple of half-naked women standing on a corner. They approach cars that slow down or men that walk by. It is clear they are prostitutes trying to find customers.'
 					act 'Leave':gt $loc
@@ -1586,13 +1586,13 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/town/nakedmarket.jpg"></center>'
 					'As you walk down the street, you pass a young girl standing in front of a table covered in various items in front of a house. Despite the cold, she is completely naked other than her boots and hat. She is calling for people to come over and take a look at the items for sale. You must admit her technique seems to be working. She and her items are getting a lot of attention.'
 					act 'Ignore her':gt $loc
 					act 'Browse her wares':
 						*clr & cla
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/town/nakedmarket.jpg"></center>'
 						'You walk over and look over several of the items she has for sale.'
 
@@ -1655,13 +1655,13 @@ if $ARGS[1] = 'main':
 					menu_off = 1
 					minut += 5
 					gs 'stat'
-					'<<$streetev_title>>'
+					$streetev_title
 					'<center><img <<$set_imgh>> src="images/locations/shared/street/town/yardsale.jpg"></center>'
 					'As you walk down the street, you pass several tables full of various items. It seems several people have got together and set up an impromptu market here.'
 					act 'Ignore it':gt $loc
 					act 'Browse the wares':
 						*clr & cla
-						'<<$streetev_title>>'
+						$streetev_title
 						'<center><img <<$set_imgh>> src="images/locations/shared/street/town/nakedmarket.jpg"></center>'
 						'You walk over and look over several of the items they have for sale.'
 
@@ -1724,7 +1724,7 @@ if $ARGS[1] = 'main':
 				menu_off = 1
 				minut += 5
 				gs 'stat'
-				'<<$streetev_title>>'
+				$streetev_title
 				'<center><img <<$set_imgh>> src="images/locations/shared/street/oldladies.jpg"></center>'
 				'As you walk by a group of old women sitting on a bench next to one of the buildings, you overhear them talking loudly in your direction. "Look at that whore! She is walking around in a short skirt and no panties, everyone can see her ass!" Another one responds to the first. "She should be ashamed of herself, even whores have more decency than her."'
 				if $loc ! 'pav_residential' and $loc ! 'pav_commercial':

locations/succubus.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'init':
 				scpopt = 0
 				xgt 'succubus', 'init'
 			end
-		end	
+		end
 	elseif succubusQW = 4:
 		gt 'succubus', 'firsttime'
 	else
@@ -55,7 +55,7 @@ if $ARGS[0] = 'firsttime':
 	if scfwon = 1:
 		'As the exhilaration from the fight won and the fear of what could have happened fully sets in, time seems to stop.'
 	elseif scfwon = 0:
-		'As the fear of what is about to happen to you fully sets in, time seems to stop.'	
+		'As the fear of what is about to happen to you fully sets in, time seems to stop.'
 	end
 	'You feel, from the same core of power that has been in you since you embraced the fairy''s energy, something start to...'
 	''
@@ -153,22 +153,20 @@ if $ARGS[0] = 'cikl':
 			vidageday -= 360
 			vidage -= 1
 		end
-		if pcs_mass['body'] < 60:
+		temp_ideal_body_mass = func('body', 'CalcOptBodyMass')
+		if pcs_mass['body'] < temp_ideal_body_mass - 1:
 			pcs_mass['body'] += 2
 			sucexcess -= 10
-		elseif pcs_mass['body'] > 60:
+		elseif pcs_mass['body'] > temp_ideal_body_mass + 1:
 			pcs_mass['body'] -= 2
 			sucexcess -= 10
 		end
+		killvar 'temp_ideal_body_mass'
 
 		if sucexcess > sucstorecap: sucexcess = sucstorecap
 	elseif sucexcess < 0 and succhungry < 0:
 		succhungry += 1
-		if (0 - sucexcess) < (10 * succublvl):
-			sucexcess = 0
-		else
-			sucexcess += (10 * succublvl)
-		end
+		sucexcess += max(-sucexcess, 10 * succublvl)
 	end
 	if sucexcess < 0: sucpowzeroed += 1
 	if sucexcess >= 0 and sucpowzeroed > 0: sucpowzeroed -= 1
@@ -516,7 +514,7 @@ if $ARGS[0] = 'training3sex':
 		succubxp += 10
 		tatisucsexday = daystart + rand (5,10)
 		pcs_hairbsh = 0
-		if pcs_makeup > 1: pcs_makeup = 0 
+		if pcs_makeup > 1: pcs_makeup = 0
 		pcs_energy = 100 & pcs_sleep = 40
 		gs 'stat'
 		'As you both put yourselves back together, Tatiana says, "Wow... just wow! That was... indescribable! I have never felt <i>anything</i> like that!" She gives you a gentle kiss before adding, "Thank You!"'
@@ -576,7 +574,7 @@ if $args[0] = 'sucwalkinginit':
 	if succublvl <= 2:
 		if $pantyworntype ! 'none': gs 'underwear', 'remove'
 	else
-		if sleepVars['bedPanty'] = 1: 
+		if sleepVars['bedPanty'] = 1:
 			gs 'underwear', 'wear'
 		elseif sleepVars['bedPanty'] = 2:
 			gs 'underwear', 'remove'
@@ -733,7 +731,7 @@ if $args[0] = 'sucwalkinginit':
 		gs 'clothing_attributes', 'gm_outfits', i
 		if CloStyle ! 5:
 			if gm_outfits[i] = 1 and gm_outfits_s[i] = 0 and gm_outfits_h[i] > 0 and gm_outfits_b[i] >= (pcs_hips - 8) and gm_outfits_b[i] <= (pcs_hips + 8):
-				$succlolistn[x] = 'gm_outfits' & succlolisti[x] = i & x += 1 
+				$succlolistn[x] = 'gm_outfits' & succlolisti[x] = i & x += 1
 			end
 		else
 			if gm_outfits[i] = 1 and gm_outfits_s[i] = 0 and gm_outfits_h[i] > 0: $succlolistn[x] = 'gm_outfits' & succlolisti[x] = i & x += 1
@@ -747,7 +745,7 @@ if $args[0] = 'sucwalkinginit':
 		gs 'clothing_attributes', 'gm_dress', i
 		if CloStyle ! 5:
 			if gm_dress[i] = 1 and gm_dress_s[i] = 0 and gm_dress_h[i] > 0 and gm_dress_b[i] >= (pcs_hips - 8) and gm_dress_b[i] <= (pcs_hips + 8):
-				$succlolistn[x] = 'gm_dress' & succlolisti[x] = i & x += 1 
+				$succlolistn[x] = 'gm_dress' & succlolisti[x] = i & x += 1
 			end
 		else
 			if gm_dress[i] = 1 and gm_dress_s[i] = 0 and gm_dress_h[i] > 0: $succlolistn[x] = 'gm_dress' & succlolisti[x] = i & x += 1
@@ -944,7 +942,7 @@ if $args[0] = 'sucwalkinggo':
 	'You dream that you are arguing with <<$sucselftmp>>.'
 	'You don''t know what it''s about, but you think you <b><i>lost</i></b>...'
 	killvar '$sucselftmp'
-	
+
 !!This is the results, time, and sleep variable clearing section
 	sucencntrand = (1 + succublvl)/2 + rand(0,succublvl)
 	scfeed = (succublvl * sucencntrand) + rand(1,(4 * sucencntrand))
@@ -984,7 +982,7 @@ if $args[0] = 'sucwalkinggo':
 	end
 	killvar 'sctemp'
 	killvar 'scfeed' & killvar 'sucencntrand'
-	
+
 !!This picks the location where you end up and how you got there
 	if succublvl >= 4 and car > 0 and wrek ! 1:
 		if benz <= 4:

locations/themes.qsrc

@@ -242,7 +242,7 @@ elseif $ARGS[0] = 'set_custom':
 	gs 'themes', 'check_custom_vars'
 	$theme['name'] = 'Custom'
 	$theme['type'] = $custom_theme['type']
-	theme['is_dark'] = val($custom_theme['is_dark'])
+	theme['is_dark'] = custom_theme['is_dark']
 
 	theme['bcolor'] = custom_theme['bcolor']
 	theme['fcolor'] = custom_theme['fcolor']
@@ -264,7 +264,7 @@ end
 
 if $ARGS[0] = 'check_custom_vars':
 	if $custom_theme['type'] = '': $custom_theme['type'] = 'static'
-	if $custom_theme['is_dark'] = '': $custom_theme['is_dark'] = str(1)
+	if custom_theme['is_dark'] ! theme['is_dark']: custom_theme['is_dark'] = theme['is_dark']
 
 	if custom_theme['bcolor'] = 0: custom_theme['bcolor'] = rgb(20, 20, 20)
 	if custom_theme['fcolor'] = 0: custom_theme['fcolor'] = rgb(255, 255, 255)
@@ -273,8 +273,8 @@ if $ARGS[0] = 'check_custom_vars':
 	if custom_theme['fsize'] = 0: custom_theme['fsize'] = 12
 	if $custom_theme['fname'] = '': $custom_theme['fname'] = 'Tahoma'
 
-	if custom_theme['table_bg'] = '': custom_theme['table_bg'] = rgb(32, 32, 32)
-	if custom_theme['table_bg_alt'] = '': custom_theme['table_bg_alt'] = rgb(48, 48, 48)
+	if custom_theme['table_bg'] = 0: custom_theme['table_bg'] = rgb(32, 32, 32)
+	if custom_theme['table_bg_alt'] = 0: custom_theme['table_bg_alt'] = rgb(48, 48, 48)
 end
 
 if $ARGS[0] = 'default_palette':

locations/therapist_reminder.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = '':
 	$therapist_reminder_main = $maintxt
 	$therapist_reminder_stat = $stattxt
 
-	cls & cla
+	cls
 	
 	remindedtherapyday = daystart
 	reminderCount += 1
@@ -102,7 +102,7 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'return':
-	cls & cla
+	cls
 	*p $therapist_reminder_main
 	p $therapist_reminder_stat
 	dynamic $therapist_reminder_acts

locations/wardrobe.qsrc

@@ -707,12 +707,12 @@ if $ARGS[0] = 'default_entry_set':
 	$defcoattype[i] = $coatworntype
 	defcoatnumber[i] = coatwornnumber
 
-	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+	$def_clothing_temp = $def_clothing_name[i]
 	$def_clothing_name[i] = input ('<center>Enter a name for this outfit set<br><font color="grey">Leaving blank will reuse current name.</font></center>')
 	if $def_clothing_name[i] = '' and $def_clothing_temp = '':
 		$def_clothing_name[i] = 'Custom <<i>>'
 	elseif $def_clothing_name[i] = '':
-		$def_clothing_name[i] = '<<$def_clothing_temp>>'
+		$def_clothing_name[i] = $def_clothing_temp
 	end
 	gt 'wardrobe', $wloc
 end
@@ -721,12 +721,12 @@ if $ARGS[0] = 'default_entry_rename':
 	gs 'stat'
 	i = ARGS[1]
 
-	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+	$def_clothing_temp = $def_clothing_name[i]
 	$def_clothing_name[i] = input ('<center>Enter a name for this outfit set<br><font color="grey">Leaving blank will reuse current name.</font></center>')
 	if $def_clothing_name[i] = '' and $def_clothing_temp = '':
 		$def_clothing_name[i] = 'Custom <<i>>'
 	elseif $def_clothing_name[i] = '':
-		$def_clothing_name[i] = '<<$def_clothing_temp>>'
+		$def_clothing_name[i] = $def_clothing_temp
 	end
 	gt 'wardrobe', $wloc
 end
@@ -758,7 +758,7 @@ if $ARGS[0] = 'default_entry_up':
 	tempcurrentpursenumber = defpursenumber[i]
 	$tempcurrentcoattype = $defcoattype[i]
 	tempcurrentcoatnumber = defcoatnumber[i]
-	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+	$def_clothing_temp = $def_clothing_name[i]
 
 	$defclothingtype[i] = $defclothingtype[j]
 	defclothingnumber[i] = defclothingnumber[j]
@@ -781,7 +781,7 @@ if $ARGS[0] = 'default_entry_up':
 	defpursenumber[i] = defpursenumber[j]
 	$defcoattype[i] = $defcoattype[j]
 	defcoatnumber[i] = defcoatnumber[j]
-	$def_clothing_name[i] = '<<$def_clothing_name[j]>>'
+	$def_clothing_name[i] = $def_clothing_name[j]
 
 	$defclothingtype[j] = $tempclothingworntype
 	defclothingnumber[j] = tempclothingwornnumber
@@ -800,7 +800,7 @@ if $ARGS[0] = 'default_entry_up':
 	defpursenumber[j] = tempcurrentpursenumber
 	$defcoattype[j] = $tempcurrentcoattype
 	defcoatnumber[j] = tempcurrentcoatnumber
-	$def_clothing_name[j] = '<<$def_clothing_temp>>'
+	$def_clothing_name[j] = $def_clothing_temp
 
 	gt 'wardrobe', $wloc
 end
@@ -827,7 +827,7 @@ if $ARGS[0] = 'default_entry_down':
 	tempcurrentpursenumber = defpursenumber[i]
 	$tempcurrentcoattype = $defcoattype[i]
 	tempcurrentcoatnumber = defcoatnumber[i]
-	$def_clothing_temp = '<<$def_clothing_name[i]>>'
+	$def_clothing_temp = $def_clothing_name[i]
 
 	$defclothingtype[i] = $defclothingtype[j]
 	defclothingnumber[i] = defclothingnumber[j]
@@ -841,7 +841,7 @@ if $ARGS[0] = 'default_entry_down':
 	defpursenumber[i] = defpursenumber[j]
 	$defcoattype[i] = $defcoattype[j]
 	defcoatnumber[i] = defcoatnumber[j]
-	$def_clothing_name[i] = '<<$def_clothing_name[j]>>'
+	$def_clothing_name[i] = $def_clothing_name[j]
 
 	$defclothingtype[j] = $tempclothingworntype
 	defclothingnumber[j] = tempclothingwornnumber
@@ -855,7 +855,7 @@ if $ARGS[0] = 'default_entry_down':
 	defpursenumber[j] = tempcurrentpursenumber
 	$defcoattype[j] = $tempcurrentcoattype
 	defcoatnumber[j] = tempcurrentcoatnumber
-	$def_clothing_name[j] = '<<$def_clothing_temp>>'
+	$def_clothing_name[j] = $def_clothing_temp
 
 	gt 'wardrobe', $wloc
 end
@@ -864,27 +864,23 @@ if $ARGS[0] = 'default_entry_delete':
 	gs 'stat'
 	i = ARGS[1]
 	$defclothingtype[i] = ''
-	defclothingnumber[i] = ''
-	defunderwear[i] = ''
+	defclothingnumber[i] = 0
+	defunderwear[i] = 0
 	$defbodysuittype[i] = ''
-	defbodysuitnumber[i] = ''
+	defbodysuitnumber[i] = 0
 	$defbratype[i] = ''
-	defbranumber[i] = ''
+	defbranumber[i] = 0
 	$defpantytype[i] = ''
-	defpantynumber[i] = ''
+	defpantynumber[i] = 0
 	$defshoetype[i] = ''
-	defshoenumber[i] = ''
+	defshoenumber[i] = 0
 	$defpursetype[i] = ''
-	defpursenumber[i] = ''
+	defpursenumber[i] = 0
 	$defcoattype[i] = ''
-	defcoatnumber[i] = ''
+	defcoatnumber[i] = 0
 	$def_clothing_name[i] = ''
-	if default_sport_number = i:
-		default_sport_number = 0
-	end
-	if default_school_number = i:
-		default_school_number = 0
-	end
+	if default_sport_number  = i: default_sport_number = 0
+	if default_school_number = i: default_school_number = 0
 	gt 'wardrobe', $wloc
 end
 

tools/Parser/integration_npp.txt

@@ -0,0 +1,24 @@
+there is two ways to add qsp_parser to notepad++
+first set your path to qsp_parser.exe ("C:\qsp_parser\qsp_parser.exe")
+
+1 method
+click on Run > Run > paste this input
+cmd /Q /K ""C:\qsp_parser\qsp_parser.exe" "$(FULL_CURRENT_PATH)""
+and click Save... > Set name "QSP validate" (or something)
+also you can set hotkey for it
+done
+
+
+2 method
+open shortcuts.xml in notepad++ folder and add User Defined Command to it
+save file and restart notepad++
+
+    <UserDefinedCommands>
+
+        <Command name="QSP validate" Ctrl="no" Alt="no" Shift="no" Key="0">cmd /Q /K &quot;&quot;C:\qsp_parser\qsp_parser.exe&quot; &quot;$(FULL_CURRENT_PATH)&quot;&quot;</Command>
+
+    </UserDefinedCommands>
+
+
+click Run > QSP validate
+don't forget to save file before call

tools/Parser/integration_vscode.txt

@@ -0,0 +1,30 @@
+open tasks.json and add this task
+
+"tasks": [
+
+        {
+            "label": "QSP validate",
+            "group": "test",
+            "type": "shell",
+            "options": {
+                "shell": {
+                    "executable": "cmd.exe",
+                    "args": [
+                        "/q",
+                        "/c"
+                    ]
+                }
+            },
+            "command": "C:\\qsp_parser\\qsp_parser.exe",
+            "args": [
+                "${file}"
+            ],
+            "problemMatcher": []
+        }
+
+]
+
+
+where "C:\\qsp_parser\\qsp_parser.exe" is your path to qsp_parser.exe
+click Terminal > Run Task... > QSP validate
+don't forget to save file before call