Merge remote-tracking branch 'Lusticon/master'

locations/Cheatmenu_din.qsrc

@@ -2218,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']
@@ -2237,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'] = {
@@ -2325,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/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/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/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/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/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/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/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/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/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/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/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/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/spell.qsrc

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

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/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/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