Explorar el Código

[fixed] String vs Integer

Lusticon hace 1 mes
padre
commit
6a2e7b5693

+ 14 - 14
locations/DNA.qsrc

@@ -12,34 +12,34 @@ if $ARGS[0] = 'relate':
 !!Comparing two DNA string to determine genetic relation
 !!Comparing two DNA string to determine genetic relation
 	!!First sample
 	!!First sample
 	!!own ID
 	!!own ID
-	temp1[0] = $mid ($ARGS[1], 1, 10)
+	temp1[0] = val($mid($ARGS[1], 1, 10))
 	!!mother ID
 	!!mother ID
-	temp1[1] = $mid ($ARGS[1], 12, 10)
+	temp1[1] = val($mid($ARGS[1], 12, 10))
 	!!father ID
 	!!father ID
-	temp1[2] = $mid ($ARGS[1], 23, 10)
+	temp1[2] = val($mid($ARGS[1], 23, 10))
 	!!maternal grandmother ID
 	!!maternal grandmother ID
-	temp1[3] = $mid ($ARGS[1], 34, 10)
+	temp1[3] = val($mid($ARGS[1], 34, 10))
 	!!maternal grandfather ID
 	!!maternal grandfather ID
-	temp1[4] = $mid ($ARGS[1], 45, 10)
+	temp1[4] = val($mid($ARGS[1], 45, 10))
 	!!paternal grandmother ID
 	!!paternal grandmother ID
-	temp1[5] = $mid ($ARGS[1], 56, 10)
+	temp1[5] = val($mid($ARGS[1], 56, 10))
 	!!paternal grandfather ID
 	!!paternal grandfather ID
-	temp1[6] = $mid ($ARGS[1], 67, 10)
+	temp1[6] = val($mid($ARGS[1], 67, 10))
 	!!Second sample
 	!!Second sample
 	!!own ID
 	!!own ID
-	temp2[0] = $mid ($ARGS[2], 1, 10)
+	temp2[0] = val($mid($ARGS[2], 1, 10))
 	!!mother ID
 	!!mother ID
-	temp2[1] = $mid ($ARGS[2], 12, 10)
+	temp2[1] = val($mid($ARGS[2], 12, 10))
 	!!father ID
 	!!father ID
-	temp2[2] = $mid ($ARGS[2], 23, 10)
+	temp2[2] = val($mid($ARGS[2], 23, 10))
 	!!maternal grandmother ID
 	!!maternal grandmother ID
-	temp2[3] = $mid ($ARGS[2], 34, 10)
+	temp2[3] = val($mid($ARGS[2], 34, 10))
 	!!maternal grandfather ID
 	!!maternal grandfather ID
-	temp2[4] = $mid ($ARGS[2], 45, 10)
+	temp2[4] = val($mid($ARGS[2], 45, 10))
 	!!paternal grandmother ID
 	!!paternal grandmother ID
-	temp2[5] = $mid ($ARGS[2], 56, 10)
+	temp2[5] = val($mid($ARGS[2], 56, 10))
 	!!paternal grandfather ID
 	!!paternal grandfather ID
-	temp2[6] = $mid ($ARGS[2], 67, 10)
+	temp2[6] = val($mid($ARGS[2], 67, 10))
 	
 	
 	killvar 'gen_relationship'
 	killvar 'gen_relationship'
 	
 	

+ 2 - 2
locations/blackmailer.qsrc

@@ -387,9 +387,9 @@ if $ARGS[0] = 'Add_SMS_failure':
 		gs 'SMStext_builder', 'end'
 		gs 'SMStext_builder', 'end'
 
 
 		if blackmailQW['stage'] < 9:
 		if blackmailQW['stage'] < 9:
-			if blackmailQW['init_flashregion'] = 'city':
+			if $blackmailQW['init_flashregion'] = 'city':
 				fame['city_sex'] += 2 * blackmailQW['total_material']
 				fame['city_sex'] += 2 * blackmailQW['total_material']
-			elseif blackmailQW['init_flashregion'] = 'gad':
+			elseif $blackmailQW['init_flashregion'] = 'gad':
 				fame['gad_sex'] += 10 * blackmailQW['total_material']
 				fame['gad_sex'] += 10 * blackmailQW['total_material']
 			else
 			else
 				fame['pav_sex'] += 5 * blackmailQW['total_material']
 				fame['pav_sex'] += 5 * blackmailQW['total_material']

+ 11 - 9
locations/boyStat.qsrc

@@ -12,7 +12,7 @@ if ($ARGS[0] = '' and ARGS[0] > 0) or mid($ARGS[0],1,1) < 10:
 	if ARGS[0] > 0:
 	if ARGS[0] > 0:
 		npclastcalledn = ARGS[0]
 		npclastcalledn = ARGS[0]
 	else
 	else
-		npclastcalledn = $ARGS[0]
+		npclastcalledn = val($ARGS[0])
 	end
 	end
 	$npcboytemp = 'A' + npclastcalledn
 	$npcboytemp = 'A' + npclastcalledn
 else
 else
@@ -26,7 +26,7 @@ end
 
 
 if mid($npcboytemp,1,1) = 'A' or mid($npcboytemp,1,1) = 'B' or mid($npcboytemp,1,1) = 'C':
 if mid($npcboytemp,1,1) = 'A' or mid($npcboytemp,1,1) = 'B' or mid($npcboytemp,1,1) = 'C':
 	$npclastcalled = $npcboytemp
 	$npclastcalled = $npcboytemp
-	npclastcalledn = mid($npcboytemp, 2)
+	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 $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 ...
 	$bstemp[1] = $npc_usedname[$npclastcalled]
 	$bstemp[1] = $npc_usedname[$npclastcalled]
 	bstemp[2] = npc_dick[$npclastcalled]
 	bstemp[2] = npc_dick[$npclastcalled]
@@ -34,27 +34,28 @@ if mid($npcboytemp,1,1) = 'A' or mid($npcboytemp,1,1) = 'B' or mid($npcboytemp,1
 	bstemp[4] = npc_sexskill[$npclastcalled]
 	bstemp[4] = npc_sexskill[$npclastcalled]
 	gs 'pronouns', npc_gender[$npclastcalled], $ARGS[1]
 	gs 'pronouns', npc_gender[$npclastcalled], $ARGS[1]
 elseif mid($npcboytemp,1,1) = 'D':
 elseif mid($npcboytemp,1,1) = 'D':
-	if mid($npcboytemp, 2) = 1:
+	npclastcalledn = val(mid($npcboytemp, 2))
+	if npclastcalledn = 1:
 		$bstemp[1] = 'small sized'
 		$bstemp[1] = 'small sized'
 		bstemp[2] = 10
 		bstemp[2] = 10
 		$bstemp[3] = 'slim'
 		$bstemp[3] = 'slim'
-	elseif mid($npcboytemp, 2) = 2:
+	elseif npclastcalledn = 2:
 		$bstemp[1] = 'medium sized'
 		$bstemp[1] = 'medium sized'
 		bstemp[2] = 15
 		bstemp[2] = 15
 		$bstemp[3] = 'well proportioned'
 		$bstemp[3] = 'well proportioned'
-	elseif mid($npcboytemp, 2) = 3:
+	elseif npclastcalledn = 3:
 		$bstemp[1] = 'large sized'
 		$bstemp[1] = 'large sized'
 		bstemp[2] = 20
 		bstemp[2] = 20
 		$bstemp[3] = 'thicker than average'
 		$bstemp[3] = 'thicker than average'
-	elseif mid($npcboytemp, 2) = 4:
+	elseif npclastcalledn = 4:
 		$bstemp[1] = 'huge sized'
 		$bstemp[1] = 'huge sized'
 		bstemp[2] = 25
 		bstemp[2] = 25
 		$bstemp[3] = 'thick'
 		$bstemp[3] = 'thick'
-	elseif mid($npcboytemp, 2) = 5:
+	elseif npclastcalledn = 5:
 		$bstemp[1] = 'giant sized'
 		$bstemp[1] = 'giant sized'
 		bstemp[2] = 30
 		bstemp[2] = 30
 		$bstemp[3] = 'massive'
 		$bstemp[3] = 'massive'
-	elseif mid($npcboytemp, 2) = 6:
+	elseif npclastcalledn = 6:
 		$bstemp[1] = 'humongous sized'
 		$bstemp[1] = 'humongous sized'
 		bstemp[2] = 35
 		bstemp[2] = 35
 		$bstemp[3] = 'monstrous'
 		$bstemp[3] = 'monstrous'
@@ -113,8 +114,9 @@ else
 end
 end
 
 
 killvar 'bstemp'
 killvar 'bstemp'
-killvar '$bstemp'
 killvar 'boyStat_i'
 killvar 'boyStat_i'
+killvar 'npclastcalledn'
+killvar 'npcboytemp'
 
 
 
 
 
 

+ 1 - 1
locations/clothing.qsrc

@@ -1511,7 +1511,7 @@ if $ARGS[0] = 'view_clothing_item':
 			if $ARGS[1] = 'coat' and ARGS[2] = 5:
 			if $ARGS[1] = 'coat' and ARGS[2] = 5:
 				price = ARGS[3]
 				price = ARGS[3]
 			else
 			else
-				price = ('<<ARGS[3]>>' * ((5 * CloQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[2]]) * 3 / 2
+				price = (ARGS[3] * ((5 * CloQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[2]]) * 3 / 2
 				price = price / 50 * 50
 				price = price / 50 * 50
 			end
 			end
 			'Price: <<price>> <b>₽</b>'
 			'Price: <<price>> <b>₽</b>'

+ 1 - 0
locations/din_bad.qsrc

@@ -744,6 +744,7 @@ $d_cycreport_actor = {
 		end
 		end
 		
 		
 		killvar 'potfather_counter'
 		killvar 'potfather_counter'
+		killvar 'potfather_temp'
 		
 		
 		'<br>  <a href="exec:dynamic $d_cycreport_choice & gs ''stat''">Accept</a>'
 		'<br>  <a href="exec:dynamic $d_cycreport_choice & gs ''stat''">Accept</a>'
 		'</td></tr></table></center>'
 		'</td></tr></table></center>'

+ 29 - 15
locations/emp_functions.qsrc

@@ -64,12 +64,11 @@ if $ARGS[0] = 'gen_schedule':
 		elseif header_switch=2: 
 		elseif header_switch=2: 
 			header_switch = 1
 			header_switch = 1
 			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<< display_hour>>', display_hour) + ':30</font></th>'
 			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<< display_hour>>', display_hour) + ':30</font></th>'
-		end		
+		end
 		i_hour += 1
 		i_hour += 1
 	if i_hour <=  mod_max_hour: jump 'jmp_header_create'
 	if i_hour <=  mod_max_hour: jump 'jmp_header_create'
 	! Reset i_hour for next loop	
 	! Reset i_hour for next loop	
 	killvar 'display_hour'
 	killvar 'display_hour'
-	killvar 'header_switch'
 	i_hour = ARGS[1]
 	i_hour = ARGS[1]
 	header_switch = 1
 	header_switch = 1
 	!! Close out table header
 	!! Close out table header
@@ -97,11 +96,11 @@ if $ARGS[0] = 'gen_schedule':
 					dynamic $schedule_tracker 
 					dynamic $schedule_tracker 
 				elseif function_sw = 2:
 				elseif function_sw = 2:
                     flag_active  = 1
                     flag_active  = 1
-                    j_id = emp_rota_week[i_day +  '_' + i_hour]
-                    if emp_rota_week[i_day +  '_' + i_hour] ! 0:							
-                        $transient_tb =  '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
+                    j_id = emp_rota_week['<<i_day>>_<<i_hour>>']
+                    if emp_rota_week['<<i_day>>_<<i_hour>>'] ! 0:							
+                        $transient_tb = '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
                     else
                     else
-                        $transient_tb  = 'Free'
+                        $transient_tb = 'Free'
                     end
                     end
 				elseif function_sw = 3:
 				elseif function_sw = 3:
 				else
 				else
@@ -113,8 +112,8 @@ if $ARGS[0] = 'gen_schedule':
 				else
 				else
 					$tablebody +=  '<td style="padding: 10px;">' + $transient_tb +'</td>'
 					$tablebody +=  '<td style="padding: 10px;">' + $transient_tb +'</td>'
 					flag_active = 0
 					flag_active = 0
-					killvar '$transient_tb'
 				end	
 				end	
+				killvar '$transient_tb'
 			else
 			else
 				 i_day += 1
 				 i_day += 1
 				 jump 'jmp_day_create'
 				 jump 'jmp_day_create'
@@ -142,6 +141,10 @@ if $ARGS[0] = 'gen_schedule':
     !! Start the table constuction    
     !! Start the table constuction    
     '<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
     '<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
     '<<$msg_back>> | <<$msg_forward>>'
     '<<$msg_back>> | <<$msg_forward>>'
+	killvar '$tablebody'
+	killvar '$tableheader'
+	killvar '$msg_back'
+	killvar '$msg_forward'
     *nl
     *nl
     if  function_sw = 1:
     if  function_sw = 1:
 	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>' 
 	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>' 
@@ -152,7 +155,6 @@ if $ARGS[0] = 'gen_schedule':
     act 'Back':
     act 'Back':
 		killvar 'flag_schedule'
 		killvar 'flag_schedule'
 		killvar 'school_group'
 		killvar 'school_group'
-		killvar 'j_id'
 		gt $loc, $loc_arg
 		gt $loc, $loc_arg
 	end
 	end
 end
 end
@@ -167,6 +169,7 @@ if $ARGS[0] = 'job_info':
 	$msg_body += '<p>Wages: ' + func('agentned', 'format_price_string', emp_job_wages[j_id]) + '<b>₽</b></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
 end
 
 
 !! --------------------- Event Generator
 !! --------------------- Event Generator
@@ -538,7 +541,7 @@ if $ARGS[0] = 'emp_booking':
 		:jmp_daily_book
 		:jmp_daily_book
 			j_idx = emp_job_start[j_id]
 			j_idx = emp_job_start[j_id]
 			:jmp_hour_book
 			:jmp_hour_book
-				emp_rota_week[d_idx + '_' + j_idx]  = j_id
+				emp_rota_week['<<d_idx>>_<<j_idx>>'] = j_id
 				j_idx += 1
 				j_idx += 1
 			if j_idx <= j_finish: jump 'jmp_hour_book'	
 			if j_idx <= j_finish: jump 'jmp_hour_book'	
 			d_idx += 1
 			d_idx += 1
@@ -563,7 +566,7 @@ if $ARGS[0] = 'emp_chk_clk':
 	:jmp_daily_chk
 	:jmp_daily_chk
 		j_idx = emp_job_start[j_id]
 		j_idx = emp_job_start[j_id]
 		:jmp_job_chk
 		:jmp_job_chk
-			if emp_rota_week[d_idx + '_' + j_idx]  >  0:
+			if emp_rota_week['<<d_idx>>_<<j_idx>>'] > 0:
 				!! booking failed					
 				!! booking failed					
 				emp_rota_fail = 1
 				emp_rota_fail = 1
 			else
 			else
@@ -583,7 +586,7 @@ if $ARGS[0] = 'emp_terminate':
 		:jmp_daily_book
 		:jmp_daily_book
 			j_idx = emp_job_start[j_id]
 			j_idx = emp_job_start[j_id]
 			:jmp_hour_book
 			:jmp_hour_book
-				emp_rota_week[d_idx + '_' + j_idx] = 0
+				emp_rota_week['<<d_idx>>_<<j_idx>>'] = 0
 				j_idx += 1
 				j_idx += 1
 			if j_idx <= j_finish: jump 'jmp_hour_book'	
 			if j_idx <= j_finish: jump 'jmp_hour_book'	
 			d_idx += 1
 			d_idx += 1
@@ -594,10 +597,6 @@ if $ARGS[0] = 'emp_terminate':
 	else
 	else
 		msg 'Job termination failed. Please ensure you set to  4 - Terminated or 5 - Fired'
 		msg 'Job termination failed. Please ensure you set to  4 - Terminated or 5 - Fired'
 	end
 	end
-	killvar 'j_idx'
-	killvar 'j_finish'
-	killvar 'd_idx'
-	killvar 'd_end'	
 end
 end
 
 
 if $ARGS[0] = 'loop_configure':	
 if $ARGS[0] = 'loop_configure':	
@@ -612,4 +611,19 @@ if $ARGS[0] = 'loop_configure':
 		d_end= 7
 		d_end= 7
 	end	
 	end	
 end
 end
+
+killvar 'i_day'
+killvar 'i_hour'
+killvar 'j_id'
+killvar 'j_idx'
+killvar 'j_day'
+killvar 'j_finish'
+killvar 'd_idx'
+killvar 'd_end'
+killvar 'evt_idx'
+killvar 'set_hour'
+killvar 'mod_max_day'
+killvar 'mod_max_hour'
+killvar 'header_switch'
+
 --- emp_functions ---------------------------------
 --- emp_functions ---------------------------------

+ 3 - 0
locations/emp_job_array.qsrc

@@ -121,4 +121,7 @@ if $ARGS[0] = 'emp_titran':
 	end
 	end
 end
 end
 
 
+killvar 'j_id'
+killvar 'j_day'
+
 --- emp_job_array ---------------------------------
 --- emp_job_array ---------------------------------

+ 1 - 1
locations/father.qsrc

@@ -174,7 +174,7 @@ act 'Chat':
     gs 'stat'
     gs 'stat'
     '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
     '<center><B><font color=maroon>Your stepfather, Vladimir Mikhailovich Scriabin</font></B></center>'
     '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
     '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-	if $loc = sitrPar:
+	if $loc = 'sitrPar':
 		'Your stepfather is sitting on the couch in the living room, he is watching TV. You decide to join him for a while and sit down next to him.'
 		'Your stepfather is sitting on the couch in the living room, he is watching TV. You decide to join him for a while and sit down next to him.'
 	else
 	else
 		'Your stepfather is sitting by the dinner table eating and reading the newspaper.'
 		'Your stepfather is sitting by the dinner table eating and reading the newspaper.'

+ 1 - 1
locations/flash.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'get_image' and $flash_image = '':
 	end
 	end
 
 
 	flashVars['rand'] = rand(1, flashVars[$temp_id_text])
 	flashVars['rand'] = rand(1, flashVars[$temp_id_text])
-	$flash_image += flashVars['rand']
+	$flash_image += str(flashVars['rand'])
 	$flashVars['image'] = $flash_image
 	$flashVars['image'] = $flash_image
 
 
 	killvar 'temp_id_text'
 	killvar 'temp_id_text'

+ 3 - 3
locations/gadukino_event.qsrc

@@ -836,13 +836,13 @@ if $ARGS[0] = 'gadukino_2boys':
 	if will_cost <= pcs_willpwr:
 	if will_cost <= pcs_willpwr:
 		act 'Refuse (<<will_cost>> Willpower)':
 		act 'Refuse (<<will_cost>> Willpower)':
 			cla
 			cla
-			if $ARGS[1] = 1:
+			if max(val($ARGS[1]),ARGS[1]) = 1:
 				npc_rel['A63'] -= 3
 				npc_rel['A63'] -= 3
 				npc_rel['A61'] -= 3
 				npc_rel['A61'] -= 3
-			elseif $ARGS[1] = '2':
+			elseif max(val($ARGS[1]),ARGS[1]) = 2:
 				npc_rel['A63'] -= 3
 				npc_rel['A63'] -= 3
 				npc_rel['A62'] -= 3
 				npc_rel['A62'] -= 3
-			elseif $ARGS[1] = '3':
+			elseif max(val($ARGS[1]),ARGS[1]) = 3:
 				npc_rel['A61'] -= 3
 				npc_rel['A61'] -= 3
 				npc_rel['A62'] -= 3
 				npc_rel['A62'] -= 3
 			end
 			end

+ 1 - 1
locations/initg.qsrc

@@ -1,7 +1,7 @@
 # initg
 # initg
 
 
 if $ARGS[0] = '':
 if $ARGS[0] = '':
-	$initext = $USER_TEXT
+	$initext = STR($usrtxt)
 	CMDCLEAR
 	CMDCLEAR
 	SHOWINPUT 0
 	SHOWINPUT 0
 	*clr
 	*clr

+ 1 - 1
locations/internet_mobile.qsrc

@@ -255,7 +255,7 @@ end
 !! Sets the date when the subscription will be cancelled if not paid.
 !! Sets the date when the subscription will be cancelled if not paid.
 !!
 !!
 !! $ARGS[1] - the subscription name
 !! $ARGS[1] - the subscription name
-if ARGS[0] = 'set_suspension_date':
+if $ARGS[0] = 'set_suspension_date':
     temp_month = month
     temp_month = month
     if month = 2:
     if month = 2:
         if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0):
         if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0):

+ 1 - 0
locations/journal.qsrc

@@ -54,6 +54,7 @@ if $ARGS[0]='journalmenu':
 	!display the table here.
 	!display the table here.
 	
 	
 	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr><<$tablebody>></tr></table></center>'
 	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr><<$tablebody>></tr></table></center>'
+	killvar '$tablebody'
 	
 	
 	if $jumploc = '' or jclose = 1: 
 	if $jumploc = '' or jclose = 1: 
 		if $start_type[1] ! 'nomagic': 
 		if $start_type[1] ! 'nomagic': 

+ 1 - 1
locations/music_actions.qsrc

@@ -196,7 +196,7 @@ if $ARGS[0] = 'stream_music':
         act 'Live stream (<font color="red">No internet access</font>)':  '<br><font color="red">You have no internet access.</font>'
         act 'Live stream (<font color="red">No internet access</font>)':  '<br><font color="red">You have no internet access.</font>'
     elseif ml_streaming['lastday'] = daystart: 
     elseif ml_streaming['lastday'] = daystart: 
         act 'Live stream (<font color="red">Already streamed today</font>)': '<br><font color="red">You already streamed today.</font>'
         act 'Live stream (<font color="red">Already streamed today</font>)': '<br><font color="red">You already streamed today.</font>'
-    elseif ml_not_alone = 1 and location_type = 'private' :
+    elseif ml_not_alone = 1 and $location_type = 'private' :
         act 'Live stream (<font color="red">You are not alone, can''t stream right now</font>)': '<br><font color="red">You are not alone in the room, which makes starting a stream impossible until they leave.</font>'
         act 'Live stream (<font color="red">You are not alone, can''t stream right now</font>)': '<br><font color="red">You are not alone in the room, which makes starting a stream impossible until they leave.</font>'
     elseif ml_performance['max_perform_minutes'] < 60:
     elseif ml_performance['max_perform_minutes'] < 60:
         act 'Live stream (<font color="red">You are not able to play for an hour yet.</font>)': '<br><font color="red">You don''t have the endurance yet to play for an hour.</font>'
         act 'Live stream (<font color="red">You are not able to play for an hour yet.</font>)': '<br><font color="red">You don''t have the endurance yet to play for an hour.</font>'

+ 3 - 3
locations/nichTanya.qsrc

@@ -1356,11 +1356,11 @@ if $ARGS[0] = 'desc':
 	if month > nichTanyaBdM or (month = nichTanyaBdM and day > nichTanyaBdD):
 	if month > nichTanyaBdM or (month = nichTanyaBdM and day > nichTanyaBdD):
 		'She is ' + (year - nichTanyaBdY) + ' years old.'
 		'She is ' + (year - nichTanyaBdY) + ' years old.'
 	elseif month = nichTanyaBdM and day = nichTanyaBdD:
 	elseif month = nichTanyaBdM and day = nichTanyaBdD:
-		if mid(year - nichTanyaBdY,4,1) = 1:
+		if val(mid(year - nichTanyaBdY,4,1)) = 1:
 			'Today is her ' + (year - nichTanyaBdY) + 'st birthday.'
 			'Today is her ' + (year - nichTanyaBdY) + 'st birthday.'
-		elseif mid(year - nichTanyaBdY,4,1) = 2:
+		elseif val(mid(year - nichTanyaBdY,4,1)) = 2:
 			'Today is her ' + (year - nichTanyaBdY) + 'nd birthday.'
 			'Today is her ' + (year - nichTanyaBdY) + 'nd birthday.'
-		elseif mid(year - nichTanyaBdY,4,1) = 3:
+		elseif val(mid(year - nichTanyaBdY,4,1)) = 3:
 			'Today is her ' + (year - nichTanyaBdY) + 'rd birthday.'
 			'Today is her ' + (year - nichTanyaBdY) + 'rd birthday.'
 		else
 		else
 			'Today is her ' + (year - nichTanyaBdY) + 'th birthday.'
 			'Today is her ' + (year - nichTanyaBdY) + 'th birthday.'

+ 3 - 3
locations/npc.qsrc

@@ -25,9 +25,9 @@ if $ARGS[0] = 'cleanarrays':
 end
 end
 
 
 if $ARGS[0] = 'age':
 if $ARGS[0] = 'age':
-	currnpc_year = mid(npc_dob[$ARGS[1]], 1, 4)
-	currnpc_month = mid(npc_dob[$ARGS[1]], 5, 2)
-	currnpc_day = mid(npc_dob[$ARGS[1]], 7, 2)
+	currnpc_year = val(mid(npc_dob[$ARGS[1]], 1, 4))
+	currnpc_month = val(mid(npc_dob[$ARGS[1]], 5, 2))
+	currnpc_day = val(mid(npc_dob[$ARGS[1]], 7, 2))
 	currnpc_age = year - currnpc_year
 	currnpc_age = year - currnpc_year
 	if currnpc_month < month:
 	if currnpc_month < month:
 		currnpc_age -= 1
 		currnpc_age -= 1

+ 1 - 1
locations/npcpreservec.qsrc

@@ -190,7 +190,7 @@ if mid($npctemp,1,1) = 'C':
 	gs 'npccleanc', $npctemp
 	gs 'npccleanc', $npctemp
 end
 end
 !! Preserves npclastsavedn. Giving the last numerical B array saved.
 !! Preserves npclastsavedn. Giving the last numerical B array saved.
-npclastsavedn = mid($npclastsaved, 2)
+npclastsavedn = val(mid($npclastsaved, 2))
 
 
 killvar 'npctemp2'
 killvar 'npctemp2'
 killvar '$npctemp2'
 killvar '$npctemp2'

+ 4 - 4
locations/phone_selfies.qsrc

@@ -1356,7 +1356,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_pic_i = 1
 		lr2_pic_i = 1
 		:temp_loopev
 		:temp_loopev
 			dynamic '$selfie = <<$selfienpc>>photo[<<lr2_pic_i>>]'
 			dynamic '$selfie = <<$selfienpc>>photo[<<lr2_pic_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', $photoloc, lr2_pic_i) + '</td>'
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', $photoloc, lr2_pic_i) + '</td>'
 				temp_cnum += 1
 				temp_cnum += 1
@@ -1378,7 +1378,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_regself_i = 1
 		lr2_regself_i = 1
 		:temp_loopselfies
 		:temp_loopselfies
 			dynamic '$selfie = <<$selfienpc>>[<<lr2_regself_i>>]'
 			dynamic '$selfie = <<$selfienpc>>[<<lr2_regself_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', $imgloc, lr2_regself_i) + '</td>'
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', $imgloc, lr2_regself_i) + '</td>'
 				temp_cnum += 1
 				temp_cnum += 1
@@ -1400,7 +1400,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_swm_i = 1
 		lr2_swm_i = 1
 		:temp_loopselfiessveta
 		:temp_loopselfiessveta
 			dynamic '$selfie = <<$selfienpc>>sveta[<<lr2_swm_i>>]'
 			dynamic '$selfie = <<$selfienpc>>sveta[<<lr2_swm_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', '<<$imgloc>>sveta/', lr2_swm_i) + '</td>'
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', '<<$imgloc>>sveta/', lr2_swm_i) + '</td>'
 				temp_cnum += 1
 				temp_cnum += 1
@@ -1422,7 +1422,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_sex_i = 1
 		lr2_sex_i = 1
 		:temp_loopselfiessex
 		:temp_loopselfiessex
 			dynamic '$selfie = <<$selfienpc>>sex[<<lr2_sex_i>>]'
 			dynamic '$selfie = <<$selfienpc>>sex[<<lr2_sex_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				if temp_cnum = 5: $result += '</tr><tr>' & temp_cnum = 0
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', '<<$imgloc>>sex/', lr2_sex_i) + '</td>'
 				$temp_table += '<td width="20%">' + func('phone_selfies_popup', 'set_selfie2', '<<$imgloc>>sex/', lr2_sex_i) + '</td>'
 				temp_cnum += 1
 				temp_cnum += 1

+ 4 - 4
locations/saveupdater.qsrc

@@ -1633,7 +1633,7 @@ if temp_current_save_version < 00080804:
 	!! Setting the internet
 	!! Setting the internet
 	if internet > 0:
 	if internet > 0:
 		old_internet_value = 10*internet
 		old_internet_value = 10*internet
-		if $home['internet_enabled'] = 1:
+		if property['internet_enabled'] = 1:
 			gs 'internet_mobile', 'buy_subscription', $home['current'], 900
 			gs 'internet_mobile', 'buy_subscription', $home['current'], 900
 
 
 			if (old_internet_value - 900) >= 0: money += (old_internet_value - 900)
 			if (old_internet_value - 900) >= 0: money += (old_internet_value - 900)
@@ -1991,9 +1991,9 @@ if temp_current_save_version < 00090003:
 	$temp_makeup_routine = str(dyneval('$result = $routine<<makeup_routine_update_index>>'))
 	$temp_makeup_routine = str(dyneval('$result = $routine<<makeup_routine_update_index>>'))
 	$temp_makeup_routine_name = str(dyneval('$result = $routine<<makeup_routine_update_index>>custname'))
 	$temp_makeup_routine_name = str(dyneval('$result = $routine<<makeup_routine_update_index>>custname'))
 	if $temp_makeup_routine ! '':
 	if $temp_makeup_routine ! '':
-		makeup['routine_<<makeup_routine_update_index>>_makeup'] = mid($temp_makeup_routine,1,1)
-		makeup['routine_<<makeup_routine_update_index>>_lipbalm'] = mid($temp_makeup_routine,2,1)
-		makeup['routine_<<makeup_routine_update_index>>_lashes'] = mid($temp_makeup_routine,3,1)
+		makeup['routine_<<makeup_routine_update_index>>_makeup']  = val(mid($temp_makeup_routine,1,1))
+		makeup['routine_<<makeup_routine_update_index>>_lipbalm'] = val(mid($temp_makeup_routine,2,1))
+		makeup['routine_<<makeup_routine_update_index>>_lashes']  = val(mid($temp_makeup_routine,3,1))
 		$makeup['routine_<<makeup_routine_update_index>>'] = $temp_makeup_routine
 		$makeup['routine_<<makeup_routine_update_index>>'] = $temp_makeup_routine
 		$makeup['routine_<<makeup_routine_update_index>>_name'] = $temp_makeup_routine_name
 		$makeup['routine_<<makeup_routine_update_index>>_name'] = $temp_makeup_routine_name
 		killvar '$routine<<makeup_routine_update_index>>'
 		killvar '$routine<<makeup_routine_update_index>>'

+ 1 - 1
locations/sex_ev_after.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'quit':
 				act'Leave':gt'sex_ev_leave', 'exit'
 				act'Leave':gt'sex_ev_leave', 'exit'
 			end
 			end
 			
 			
-			if sex_ev['type'] ! 'hookup':
+			if $sex_ev['type'] ! 'hookup':
 				act'We''re through':
 				act'We''re through':
 					cla & *nl
 					cla & *nl
 					'"We''re through," you sneer. The moment you''re fully dressed, you stalk out the door, shouting over your shoulder, "Don''t fucking call me again!"'
 					'"We''re through," you sneer. The moment you''re fully dressed, you stalk out the door, shouting over your shoulder, "Don''t fucking call me again!"'

+ 5 - 3
locations/sex_ev_condoms.qsrc

@@ -1827,12 +1827,14 @@ if $ARGS[0] = 'father_check':
 	'List of potential fathers:'
 	'List of potential fathers:'
 	:potfather_loop
 	:potfather_loop
 	if $wombpotfath[potfather_counter] ! 'unknown':
 	if $wombpotfath[potfather_counter] ! 'unknown':
-		potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_counter]]>> (<<$wombpotfath[potfather_counter]>>)</a>'
+		$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''"><<$npc_usedname[$wombpotfath[potfather_counter]]>> (<<$wombpotfath[potfather_counter]>>)</a>'
 	else
 	else
-		potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
+		$potfather_temp[2] = '<a href="exec: $wombthfath = ''<<$npc_usedname[$wombpotfath[potfather_counter]]>>'' & $wombthfathID = ''<<$wombpotfath[potfather_counter]>>'' & dynamic $d_cycreport_actor, 7 & gs ''stat''">Unknown (-)</a>'
 	end
 	end
-	if $boy = potfather_temp[2]: potfather_counter += 1
+	if $boy = $potfather_temp[2]: potfather_counter += 1
 	if potfather_counter < arrsize('$wombpotfath'): jump 'potfather_loop'
 	if potfather_counter < arrsize('$wombpotfath'): jump 'potfather_loop'
+	killvar 'potfather_counter'
+	killvar 'potfather_temp'
 end
 end
 
 
 if $ARGS[0] = 'npc_preg_react':
 if $ARGS[0] = 'npc_preg_react':

+ 2 - 2
locations/sex_ev_dress_talking.qsrc

@@ -1078,9 +1078,9 @@ if $ARGS[0] = 'break_up2':
 		act'Don''t text me anymore':
 		act'Don''t text me anymore':
 			gs'sex_ev_leave', 'dress_loop'
 			gs'sex_ev_leave', 'dress_loop'
 			gs'sex_ev_dress_talking', 'break_up3'
 			gs'sex_ev_dress_talking', 'break_up3'
-			if npc_rel_type[$boy] = 'fuckbuddy':
+			if $npc_rel_type[$boy] = 'fuckbuddy':
 				'"Don''t text me to come over," you say, <<$sex_ev[''dress_describe'']>>. "We can''t be fuckbuddies anymore."'
 				'"Don''t text me to come over," you say, <<$sex_ev[''dress_describe'']>>. "We can''t be fuckbuddies anymore."'
-			elseif npc_rel_type[$boy] = 'sugar_daddy':
+			elseif $npc_rel_type[$boy] = 'sugar_daddy':
 				'"Don''t text me to come over," you say, <<$sex_ev[''dress_describe'']>>. "I can''t be your sugar baby anymore."'
 				'"Don''t text me to come over," you say, <<$sex_ev[''dress_describe'']>>. "I can''t be your sugar baby anymore."'
 			end
 			end
 			'"Why not?" he asks.'
 			'"Why not?" he asks.'

+ 3 - 3
locations/sex_ev_pillow_talk.qsrc

@@ -308,7 +308,7 @@ if $ARGS[0] = 'sweaty_sex':
 				end
 				end
 			else
 			else
 				'"Whew, I''m so sweaty after that," you pant, looking at the moisture running down your skin. "I didn''t realize we fucked that hard."'
 				'"Whew, I''m so sweaty after that," you pant, looking at the moisture running down your skin. "I didn''t realize we fucked that hard."'
-				if npc_gymrat[$boy] = 1 or npc_apt_spare[$boy] = 'gym':
+				if npc_gymrat[$boy] = 1 or $npc_apt_spare[$boy] = 'gym':
 					'"Sex is better cardio than most people think," <<$npc_firstname[$boy]>> grins back.'
 					'"Sex is better cardio than most people think," <<$npc_firstname[$boy]>> grins back.'
 				else
 				else
 					sex_ev['weather_pillow_talk'] = 1
 					sex_ev['weather_pillow_talk'] = 1
@@ -365,7 +365,7 @@ if $ARGS[0] = 'sore_pussy':
 								gs'sex_ev_pillow_talk', 'sex_talk'
 								gs'sex_ev_pillow_talk', 'sex_talk'
 							end
 							end
 							
 							
-							if npc_rel_type[$boy] ! 'boyfriend' and pcs_lover - pcs_girlfriends > 0:
+							if $npc_rel_type[$boy] ! 'boyfriend' and pcs_lover - pcs_girlfriends > 0:
 								act'Wish my boyfriend was that big':
 								act'Wish my boyfriend was that big':
 									npc_know_cheat[$boy] = 1
 									npc_know_cheat[$boy] = 1
 									cla & *nl
 									cla & *nl
@@ -1236,7 +1236,7 @@ if $ARGS[0] = 'thank_no_creampie':
 			'"Thanks for remembering to pull out," you say.'
 			'"Thanks for remembering to pull out," you say.'
 			if npc_dont_like_creampie[$boy] = 1:
 			if npc_dont_like_creampie[$boy] = 1:
 				!! '"Thanks for remembering to pull out," you say.'
 				!! '"Thanks for remembering to pull out," you say.'
-			elseif npc_cum_pref[$boy] = 'creampie':
+			elseif $npc_cum_pref[$boy] = 'creampie':
 				'"Wish I didn''t have to," he sighs. "Coming inside a girl is the best feeling in the world."'
 				'"Wish I didn''t have to," he sighs. "Coming inside a girl is the best feeling in the world."'
 				act'Ew':
 				act'Ew':
 					cla & *nl
 					cla & *nl

+ 16 - 16
locations/sex_ev_reactions.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'condom_reactions':
 end
 end
 
 
 if $ARGS[0] = 'good_thing_condom':
 if $ARGS[0] = 'good_thing_condom':
-	if sex_ev['last_cum'] = 'creampie_surprise':
+	if $sex_ev['last_cum'] = 'creampie_surprise':
 		act'Good thing we used a condom':
 		act'Good thing we used a condom':
 			if sex_ev['cock_inserted'] = 1:
 			if sex_ev['cock_inserted'] = 1:
 				cla & *clr
 				cla & *clr
@@ -662,12 +662,12 @@ if $ARGS[0] = 'cum_mouth_like_that':
 end
 end
 
 
 if $ARGS[0] = 'swallow_react1':
 if $ARGS[0] = 'swallow_react1':
-	if sex_ev['swallow'] = 1 or sex_ev['last_cum'] = 'swallow':
+	if sex_ev['swallow'] = 1 or $sex_ev['last_cum'] = 'swallow':
 		if $npc_cum_pref[$boy] = 'mouth' and $pc_cum_pref_know[$boy] = '':
 		if $npc_cum_pref[$boy] = 'mouth' and $pc_cum_pref_know[$boy] = '':
 			'"I love watching you swallow," <<$npc_firstname[$boy]>> says, looking at you with blissful satisfaction. '
 			'"I love watching you swallow," <<$npc_firstname[$boy]>> says, looking at you with blissful satisfaction. '
 			act'You think it''s hot?':
 			act'You think it''s hot?':
 				cla & *nl
 				cla & *nl
-				$pc_cum_pref_know[$boy]= npc_cum_pref[$boy]
+				$pc_cum_pref_know[$boy]= $npc_cum_pref[$boy]
 				'"Yeah?" you ask, licking your lips. "You think it''s hot?"'
 				'"Yeah?" you ask, licking your lips. "You think it''s hot?"'
 				'"The hottest thing a girl can do. Even better than coming inside."'
 				'"The hottest thing a girl can do. Even better than coming inside."'
 				act'Good to know':
 				act'Good to know':
@@ -697,7 +697,7 @@ if $ARGS[0] = 'swallow_react1':
 			end
 			end
 			gs 'sex_ev_reactions', 'spit_quit'
 			gs 'sex_ev_reactions', 'spit_quit'
 		else
 		else
-			if $npc_cum_pref[$boy] = 'mouth' and $pc_cum_pref_know[$boy] = npc_cum_pref[$boy]:
+			if $npc_cum_pref[$boy] = 'mouth' and $pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
 				'"You''re so hot when you swallow my load like that," <<$npc_firstname[$boy]>> smiles at you.'
 				'"You''re so hot when you swallow my load like that," <<$npc_firstname[$boy]>> smiles at you.'
 				gs 'sex_ev_reactions', 'swallow_for_you'
 				gs 'sex_ev_reactions', 'swallow_for_you'
 			else
 			else
@@ -714,7 +714,7 @@ if $ARGS[0] = 'swallow_react1':
 end
 end
 
 
 if $ARGS[0] = 'swallow_for_you':
 if $ARGS[0] = 'swallow_for_you':
-	if sex_ev['swallow'] = 1 or sex_ev['last_cum'] = 'swallow':
+	if sex_ev['swallow'] = 1 or $sex_ev['last_cum'] = 'swallow':
 		act'I do it for you':
 		act'I do it for you':
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/kiss_cock.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/sex/cum/kiss_cock.mp4"></video></center>'
@@ -725,7 +725,7 @@ if $ARGS[0] = 'swallow_for_you':
 end
 end
 
 
 if $ARGS[0] = 'swallow_not_for_you':
 if $ARGS[0] = 'swallow_not_for_you':
-	if sex_ev['swallow'] = 1 or sex_ev['last_cum'] = 'swallow':
+	if sex_ev['swallow'] = 1 or $sex_ev['last_cum'] = 'swallow':
 		act'I''m not doing it for you (I like it)':
 		act'I''m not doing it for you (I like it)':
 			cla & *nl
 			cla & *nl
 			'"It''s not like I''m doing it for you," you smirk. "I like it."'
 			'"It''s not like I''m doing it for you," you smirk. "I like it."'
@@ -735,7 +735,7 @@ if $ARGS[0] = 'swallow_not_for_you':
 end
 end
 
 
 if $ARGS[0] = 'spit_quit':
 if $ARGS[0] = 'spit_quit':
-	if sex_ev['swallow'] = 1 or sex_ev['last_cum'] = 'swallow':
+	if sex_ev['swallow'] = 1 or $sex_ev['last_cum'] = 'swallow':
 		act'Spitting is quitting':
 		act'Spitting is quitting':
 			cla & *nl
 			cla & *nl
 			'"Spitting is quitting," you smile, giving him a no-big-deal shrug.'
 			'"Spitting is quitting," you smile, giving him a no-big-deal shrug.'
@@ -745,7 +745,7 @@ if $ARGS[0] = 'spit_quit':
 end
 end
 
 
 if $ARGS[0] = 'cum_bad_taste':
 if $ARGS[0] = 'cum_bad_taste':
-	if sex_ev['swallow'] = 1 and sex_ev['last_cum'] = 'swallow':
+	if sex_ev['swallow'] = 1 and $sex_ev['last_cum'] = 'swallow':
 		act'You taste good':
 		act'You taste good':
 			cla & *nl
 			cla & *nl
 			'"Spitting is quitting," you smile, giving him a no-big-deal shrug.'
 			'"Spitting is quitting," you smile, giving him a no-big-deal shrug.'
@@ -1480,25 +1480,25 @@ if $ARGS[0] = 'bj_warning_next_time':
 		cla & *clr
 		cla & *clr
 			$sex_ev['bed_room']
 			$sex_ev['bed_room']
 		if sex_ev['bj_cum'] = 1:
 		if sex_ev['bj_cum'] = 1:
-			if $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+			if $pc_cum_pref_know[$boy]= $npc_cum_pref[$boy]:
 				'"I don''t mind if you come in my mouth," you say, licking your lips with a smile. "I know how much you love it. But could you at least warn me before you do it?"'
 				'"I don''t mind if you come in my mouth," you say, licking your lips with a smile. "I know how much you love it. But could you at least warn me before you do it?"'
 			else
 			else
 				'"A little warning next time?" you smile, wiping a loose drop of cum from your lip. "I barely had time to swallow."'
 				'"A little warning next time?" you smile, wiping a loose drop of cum from your lip. "I barely had time to swallow."'
 			end
 			end
 		elseif sex_ev['bj_cum'] = 2:
 		elseif sex_ev['bj_cum'] = 2:
-			if $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+			if $pc_cum_pref_know[$boy]= $npc_cum_pref[$boy]:
 				'"I don''t mind if you come in my mouth," you smile, wiping your lips. "I know how much you love it. But could you at least warn me before you do it?"'
 				'"I don''t mind if you come in my mouth," you smile, wiping your lips. "I know how much you love it. But could you at least warn me before you do it?"'
 			else
 			else
 				'"A little warning next time?" you ask, with a cumglazed smile.'
 				'"A little warning next time?" you ask, with a cumglazed smile.'
 			end
 			end
 		elseif sex_ev['bj_cum'] = 3:
 		elseif sex_ev['bj_cum'] = 3:
-			if $pc_cum_pref_know[$boy] = npc_cum_pref[$boy]:
+			if $pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
 				'"I don''t mind if you come in my mouth," you smile, wiping your lips. "I know how much you love it. But could you at least warn me before you do it?"'
 				'"I don''t mind if you come in my mouth," you smile, wiping your lips. "I know how much you love it. But could you at least warn me before you do it?"'
 			else
 			else
 				'"A little warning next time?" you ask, with a cumglazed smile.'
 				'"A little warning next time?" you ask, with a cumglazed smile.'
 			end
 			end
 		end
 		end
-		if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = 0:
+		if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = '':
 			if npc_generous[$boy] = 1:
 			if npc_generous[$boy] = 1:
 				npc_bj_cum_warn[$boy] = 1
 				npc_bj_cum_warn[$boy] = 1
 				'"Sorry," he smiles back apologetically. "I''ll try to remember next time. You''re just so good at this, it''s hard to hold back."'
 				'"Sorry," he smiles back apologetically. "I''ll try to remember next time. You''re just so good at this, it''s hard to hold back."'
@@ -1522,7 +1522,7 @@ if $ARGS[0] = 'bj_warning_next_time':
 			end
 			end
 
 
 			act'Really?':
 			act'Really?':
-				$pc_cum_pref_know[$boy] = npc_cum_pref[$boy]
+				$pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]
 				cla & *clr
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/smile1.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/smile1.jpg"></center>'
 				'"Really?" you ask. "You like it that much?"'
 				'"Really?" you ask. "You like it that much?"'
@@ -1647,7 +1647,7 @@ if $ARGS[0] = 'bj_swallow_gross':
 end
 end
 
 
 if $ARGS[0] = 'bj_swallow_gross2':
 if $ARGS[0] = 'bj_swallow_gross2':
-	if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+	if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
 		act'Because I know you like it':
 		act'Because I know you like it':
 			cla & *nl
 			cla & *nl
 			'"Yeah, cause I know you''re a pervert who likes watching me drink your nasty cum," you say with a glare. "I''m generous like that."'
 			'"Yeah, cause I know you''re a pervert who likes watching me drink your nasty cum," you say with a glare. "I''m generous like that."'
@@ -1703,7 +1703,7 @@ if $ARGS[0] = 'bj_spit_gross':
 end
 end
 
 
 if $ARGS[0] = 'bj_spit_gross2':
 if $ARGS[0] = 'bj_spit_gross2':
-	if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy]= npc_cum_pref[$boy]:
+	if npc_cum_pref[$boy] = 2 and $pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]:
 		act'Compromise':
 		act'Compromise':
 			cla & *nl
 			cla & *nl
 			'"Just because I don''t want to swallow doesn''t mean I don''t want you to feel good," you say with a raised eyebrow. "Good sex is all about good compromise, isn''t it?"'
 			'"Just because I don''t want to swallow doesn''t mean I don''t want you to feel good," you say with a raised eyebrow. "Good sex is all about good compromise, isn''t it?"'
@@ -1743,7 +1743,7 @@ if $ARGS[0] = 'cum_mouth_swallow_why':
 		'"Shut up," you roll your eyes.'
 		'"Shut up," you roll your eyes.'
 		gs 'sex_ev_sex', 'sex_end'
 		gs 'sex_ev_sex', 'sex_end'
 	end
 	end
-	if $sex_ev['cum_choice'] = 'facial' and sex_ev['last_cum'] ! 'face_mouth':
+	if $sex_ev['cum_choice'] = 'facial' and $sex_ev['last_cum'] ! 'face_mouth':
 		act'Too much mess':
 		act'Too much mess':
 			cla & *clr
 			cla & *clr
 			$sex_ev['bed_room']
 			$sex_ev['bed_room']

+ 1 - 1
locations/sex_ev_reactions_creampie.qsrc

@@ -1462,7 +1462,7 @@ if $ARGS[0] = 'love_creampies':
 					'"I love it when guys come inside me," you sigh contently. "Something about it just turns me on so much."'
 					'"I love it when guys come inside me," you sigh contently. "Something about it just turns me on so much."'
 				end
 				end
 				if $npc_cum_pref[$boy] = 'creampie':
 				if $npc_cum_pref[$boy] = 'creampie':
-					 $pc_cum_pref_know[$boy] = npc_cum_pref[$boy]
+					 $pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]
 					'"Coming inside is always the best," he says, looking at you. "We must be made to match."'
 					'"Coming inside is always the best," he says, looking at you. "We must be made to match."'
 					'"Must be," you say back, giving him a smile.'		
 					'"Must be," you say back, giving him a smile.'		
 				else
 				else

+ 3 - 3
locations/sex_ev_sex.qsrc

@@ -389,7 +389,7 @@ if $ARGS[0] = 'fuck_continue':
 			act'Fake some moans':sex_ev['moan'] = 2 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			act'Fake some moans':sex_ev['moan'] = 2 & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			act'Starting to feel good':sex_ev['fuck_pain'] = -1 & $orgasm_or = '' & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			act'Starting to feel good':sex_ev['fuck_pain'] = -1 & $orgasm_or = '' & gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			
 			
-			if $sex_ev['speed'] ! 3 and sex_ev['unique_npc'] = 1:
+			if sex_ev['speed'] ! 3 and sex_ev['unique_npc'] = 1:
 
 
 !!				gs 'sex_ev_sex_talk_<<$boy>>', 'completion_checker'
 !!				gs 'sex_ev_sex_talk_<<$boy>>', 'completion_checker'
 				
 				
@@ -413,7 +413,7 @@ if $ARGS[0] = 'fuck_continue':
 				sex_ev['dirty_talk'] = 1
 				sex_ev['dirty_talk'] = 1
 				gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 				gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			end}
 			end}
-			if $sex_ev['speed'] ! 3 and sex_ev['unique_npc'] = 1:
+			if sex_ev['speed'] ! 3 and sex_ev['unique_npc'] = 1:
 
 
 !!				gs 'sex_ev_sex_talk_<<$boy>>', 'completion_checker'
 !!				gs 'sex_ev_sex_talk_<<$boy>>', 'completion_checker'
 				
 				
@@ -1146,7 +1146,7 @@ if $ARGS[0] = 'he_end_break':
 end
 end
 
 
 if $ARGS[0] = 'keep_going':
 if $ARGS[0] = 'keep_going':
-	if sex_ev['type'] ! 'prostitution_cust':
+	if $sex_ev['type'] ! 'prostitution_cust':
 		act'Keep going?':
 		act'Keep going?':
 			if (rand(1,10) >= npc_sexdrive[$boy] or sex_ev['cum_count'] >= 5 + sex_ev['extra_cum']) and sex_ev['boy_cum'] = 1:
 			if (rand(1,10) >= npc_sexdrive[$boy] or sex_ev['cum_count'] >= 5 + sex_ev['extra_cum']) and sex_ev['boy_cum'] = 1:
 				sex_ev['boy_cum'] = 0
 				sex_ev['boy_cum'] = 0

+ 1 - 1
locations/sex_ev_talk.qsrc

@@ -1138,7 +1138,7 @@ if $ARGS[0] = 'bareback_pill_expense':
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 					'You blink as he offers the cash to you.'
 					'You blink as he offers the cash to you.'
 					'"No, I couldn''t possibly," you say, pushing it back towards him. "I''d feel bad taking your money."'
 					'"No, I couldn''t possibly," you say, pushing it back towards him. "I''d feel bad taking your money."'
-					if npc_rel_type[$boy] = 'boyfriend':
+					if $npc_rel_type[$boy] = 'boyfriend':
 						'"Why? I''m your boyfriend," he grins extending the money again. "You feel bad that the guy you''re dating wants to pay for something?"'
 						'"Why? I''m your boyfriend," he grins extending the money again. "You feel bad that the guy you''re dating wants to pay for something?"'
 					else
 					else
 						'"Why? I''m getting something out of it too," he grins extending the money again. "Just take it and let''s start going bareback."'
 						'"Why? I''m getting something out of it too," he grins extending the money again. "Just take it and let''s start going bareback."'

+ 1 - 1
locations/shoes.qsrc

@@ -303,7 +303,7 @@ if $ARGS[0] = 'view_shoe_item':
 			'You already own these shoes.'
 			'You already own these shoes.'
 			act 'Leave': gt $loc, $loc_arg
 			act 'Leave': gt $loc, $loc_arg
 		else
 		else
-			price = ('<<ARGS[4]>>' * ((5 * ShoQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[3]]) * 3 / 2
+			price = (ARGS[4] * ((5 * ShoQuality) + 100) / 100) * 1000 / (1250 - Clothingstock[ARGS[3]]) * 3 / 2
 			price = price / 50 * 50
 			price = price / 50 * 50
 			'Price: <<price>> <b>₽</b>'
 			'Price: <<price>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg
 			act 'Leave': gt $loc, $loc_arg

+ 2 - 2
locations/shop.qsrc

@@ -572,7 +572,7 @@ if $shoplocation = 'megafon':
 	if $home['current'] = 'parents_home':
 	if $home['current'] = 'parents_home':
 		$line = '<tr><td align="center">Your parents are paying for the internet at home, and you can''t take out a second internet subscriptions for the same address</td></tr>'
 		$line = '<tr><td align="center">Your parents are paying for the internet at home, and you can''t take out a second internet subscriptions for the same address</td></tr>'
 
 
-	elseif home['internet_enabled'] = 0:
+	elseif property['internet_enabled'] = 0:
 		$line = '<tr><td align="center">You can''t buy an internet subscription for <<$home[''display'']>></td></tr>'
 		$line = '<tr><td align="center">You can''t buy an internet subscription for <<$home[''display'']>></td></tr>'
 
 
 	elseif subscription[$home['current']] = 1:
 	elseif subscription[$home['current']] = 1:
@@ -620,7 +620,7 @@ if $shoplocation = 'megafon':
 					end
 					end
 
 
 				elseif subscription[$property_code[i]] > 0:
 				elseif subscription[$property_code[i]] > 0:
-					line += '<tr><td align="center">You have an active internet subscription for the <<LCASE($property_name[i])>> that will renew next month on day <<subscription[''<<$property_code[i]>>-date'']>> for <<price>> <b>₽</b></td></tr>'
+					$line += '<tr><td align="center">You have an active internet subscription for the <<LCASE($property_name[i])>> that will renew next month on day <<subscription[''<<$property_code[i]>>-date'']>> for <<price>> <b>₽</b></td></tr>'
 				end
 				end
 			end
 			end
 			killvar '$property'
 			killvar '$property'

+ 3 - 3
locations/shortgs.qsrc

@@ -728,7 +728,7 @@ if $ARGS[0] = 'parse_string':
 					$ParserTmpArr[] = mid($ParserTmpStr, 1, ParserTmpIdx-1)
 					$ParserTmpArr[] = mid($ParserTmpStr, 1, ParserTmpIdx-1)
 					$ParserTmpStr = mid($ParserTmpStr, ParserTmpIdx+1)
 					$ParserTmpStr = mid($ParserTmpStr, ParserTmpIdx+1)
 				else
 				else
-					ParserTmpArr[] = mid($ParserTmpStr, 1, ParserTmpIdx-1)
+					ParserTmpArr[] = val(mid($ParserTmpStr, 1, ParserTmpIdx-1))
 					$ParserTmpStr = mid($ParserTmpStr, ParserTmpIdx+1)
 					$ParserTmpStr = mid($ParserTmpStr, ParserTmpIdx+1)
 				end
 				end
 				jump 'StringParser01'
 				jump 'StringParser01'
@@ -737,13 +737,13 @@ if $ARGS[0] = 'parse_string':
 				$ParserTmpArr[] = $ParserTmpStr
 				$ParserTmpArr[] = $ParserTmpStr
 				copyarr $ARGS[1], '$ParserTmpArr'
 				copyarr $ARGS[1], '$ParserTmpArr'
 			else
 			else
-				ParserTmpArr[] = $ParserTmpStr
+				ParserTmpArr[] = val($ParserTmpStr)
 				copyarr $ARGS[1], 'ParserTmpArr'
 				copyarr $ARGS[1], 'ParserTmpArr'
 			end
 			end
 			killvar '$ParserTmpDelim'
 			killvar '$ParserTmpDelim'
 			killvar '$ParserTmpStr'
 			killvar '$ParserTmpStr'
 			killvar 'ParserTmpIdx'
 			killvar 'ParserTmpIdx'
-			killvar 'ParserTmpArr' & killvar '$ParserTmpArr'
+			killvar 'ParserTmpArr'
 		else
 		else
 			msg '<b>Error: No delimited string found!</b>'
 			msg '<b>Error: No delimited string found!</b>'
 		end
 		end

+ 7 - 5
locations/show_table.qsrc

@@ -1,6 +1,6 @@
 # show_table
 # show_table
 !{show table v2, by illume
 !{show table v2, by illume
-	this function will push $args[0] into $show_table with $args[1] column, min=1, and  count by st_count
+	this function will push $args[0] into $show_table with args[1] column, min=1, and  count by st_count
 
 
 	st_count=0 & $show_table=''
 	st_count=0 & $show_table=''
 		if kat > 0:gs'show_table','Kate <<kat>>','2'
 		if kat > 0:gs'show_table','Kate <<kat>>','2'
@@ -8,11 +8,13 @@
 		......
 		......
 	if st_count > 0 :pl 'Relations:<BR><TABLE BORDER=1><<$show_table>></TR></TABLE>'
 	if st_count > 0 :pl 'Relations:<BR><TABLE BORDER=1><<$show_table>></TR></TABLE>'
 }
 }
-if $ARGS[1] < 1 : $ARGS[1] = 1
-if st_count-st_count/$ARGS[1]*$ARGS[1]=0:$show_table += "<TR>"
+tab_tmp = max(1, val($ARGS[1]), ARGS[1])
+
+if st_count - st_count/tab_tmp*tab_tmp = 0: $show_table += "<TR>"
 $show_table += "<TD><<$ARGS[0]>></TD>"
 $show_table += "<TD><<$ARGS[0]>></TD>"
-if st_count-st_count/$ARGS[1]*$ARGS[1]+1=$ARGS[1]:$show_table += "</TR>"
-st_count+=1
+if st_count - st_count/tab_tmp*tab_tmp + 1 = tab_tmp: $show_table += "</TR>"
+st_count += 1
+killvar 'tab_tmp'
 
 
 --- show_table ---------------------------------
 --- show_table ---------------------------------
 
 

+ 1 - 1
locations/spell.qsrc

@@ -15,7 +15,7 @@
 !	 ARGS[3] = Target party member number
 !	 ARGS[3] = Target party member number
 !	 ARGS[4] = Caster party member number
 !	 ARGS[4] = Caster party member number
 
 
-SuccessValue = $ARGS[1]
+SuccessValue = max(val($ARGS[1]), ARGS[1])
 $SplTxtColGood = 'green'
 $SplTxtColGood = 'green'
 $SplTxtColBad = 'red'
 $SplTxtColBad = 'red'
 
 

+ 1 - 1
locations/street_event.qsrc

@@ -43,7 +43,7 @@ elseif $ARGS[0] = 'city_center':
 	streetev_hijack = 2
 	streetev_hijack = 2
 	streetev_bf = 90
 	streetev_bf = 90
 	streetev_mistmeet = 20
 	streetev_mistmeet = 20
-	if $home['current'] = 7:
+	if $home['current'] = 'maid_bedroom':
 		streetev_home = 1
 		streetev_home = 1
 		$streetev_home = 'near the entrance to Nicholas'' Apartment'
 		$streetev_home = 'near the entrance to Nicholas'' Apartment'
 	elseif $home['current'] = '':
 	elseif $home['current'] = '':

+ 2 - 2
locations/telefon.qsrc

@@ -969,9 +969,9 @@ if $ARGS[0] = 'send_sms':
 	$telefon['body'] = '
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
 	<font size=6>Send SMS</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
-	if $subscription['metered_calls'] = 1 and $subscription['sms_limit'] > 0: 
+	if subscription['metered_calls'] = 1 and subscription['sms_limit'] > 0: 
 		$telefon['body'] += '<br/>'
 		$telefon['body'] += '<br/>'
-		$telefon['body'] += '<b>You still can send <<$subscription[''sms_limit'']>> text messages on your contract</b>'
+		$telefon['body'] += '<b>You still can send <<subscription[''sms_limit'']>> text messages on your contract</b>'
 	end
 	end
 !! Colour correction for editor ''''
 !! Colour correction for editor ''''