[fixed] string vs integer

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