Merge remote-tracking branch 'Lusticon/master'

glife-notepad++

@@ -1253,7 +1253,6 @@
 				<File name="locations\univer_din.qsrc" />
 				<File name="locations\univer.qsrc" />
 				<File name="locations\trashplace.qsrc" />
-				<File name="locations\torgpred.qsrc" />
 				<File name="locations\TimofeiMetro.qsrc" />
 				<File name="locations\Timofei.qsrc" />
 				<File name="locations\tanvanr.qsrc" />

locations/DNA.qsrc

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

locations/LOCA.qsrc

@@ -7,6 +7,7 @@ if debug['trace_loc_change'] = 1:
 end
 
 if settingmode = 0: killvar 'cheatmenu'
+gs 'music_actions', 'clear_restrictions'
 
 !{
 msg "Changed Location 

locations/albina_wine_event.qsrc

@@ -255,14 +255,15 @@ if $ARGS[0] = 'shave_talk':
 		!! clean shaven
 		'"I can''t believe how many girls at school don''t shave their pussy," Albina says with a disgusted look on her face. "How can they stand having all that hair down there?"'
 		gs 'albina_wine_event','shave_answer1'
-	elseif pcs_pubes <= 10:
+!!	elseif pcs_pubes <= 10:
+	elseif pcs_pubes <= 15:
 		!! stubbly
 		'"You need a shave," Albina says with a disgusted look on her face as she moves her head uncomfortably on your lap. "I can practically feel your stubble velcroing to my hair right now!"'
 		gs 'albina_wine_event','shave_answer2'
-	elseif pcs_pubes <= 15:
-		!! small patch
-		'"Ugh, how can you stand having hair down there?" Albina rants. "Why don''t you just shave it off? It''s not like you have much down there anyway."'
-		gs 'albina_wine_event','shave_answer3'
+!!	elseif pcs_pubes <= 15:
+!!		!! small patch
+!!		'"Ugh, how can you stand having hair down there?" Albina rants. "Why don''t you just shave it off? It''s not like you have much down there anyway."'
+!!		gs 'albina_wine_event','shave_answer3'
 	elseif pcs_pubes <= 25:
 		!! trimmed/styled bush
 		if (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:

locations/bedrPar.qsrc

@@ -290,8 +290,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 				access['nocamshow'] = 1
 				$access['noporn'] = 'You shouldn''t watch porn with your sister in the room. She would notice for sure!'
 				$access['nocamshow'] = 'You can''t do any webcam activities with your sister in the room!'
-			else
-				gs 'music_actions', 'clear_restrictions'
 			end
 
 			if locat['Anya_inroom'] = 0 and mc_inventory['breast_pump'] = 1 and bp_unbox <= 0:

locations/blackmailer.qsrc

@@ -387,9 +387,9 @@ if $ARGS[0] = 'Add_SMS_failure':
 		gs 'SMStext_builder', 'end'
 
 		if blackmailQW['stage'] < 9:
-			if blackmailQW['init_flashregion'] = 'city':
+			if $blackmailQW['init_flashregion'] = 'city':
 				fame['city_sex'] += 2 * blackmailQW['total_material']
-			elseif blackmailQW['init_flashregion'] = 'gad':
+			elseif $blackmailQW['init_flashregion'] = 'gad':
 				fame['gad_sex'] += 10 * blackmailQW['total_material']
 			else
 				fame['pav_sex'] += 5 * blackmailQW['total_material']
@@ -497,7 +497,7 @@ if $ARGS[0] = 'police1':
 	if $region = 'pav':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavrec.jpg" ></center>'
 		'You walk up to a bored looking cop shuffling about some paperwork.'
-	else:
+	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityrec.jpg"></center>'
 		'You walk up to a window, you pick up the phone and hear a buzzer sound on the other side. One of the officers picks it up without hesitation and looks at you.'
 	end
@@ -568,7 +568,7 @@ if $ARGS[0] = 'police1':
 
 			if $region = 'pav':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavext.jpg" ></center>'
-			else:
+			else
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityext.jpg"></center>'
 			end
 			'Sitting in the interrogation room with the police officer, the situation suddenly comes crashing into you. You''re going to have to show some proof. That you were flashing your <<$blackmailQW[''init_flashaction'']>> <<$blackmailQW[''init_flashloc_desc'']>>. They will see the texts, the photos. They will see you for who you must be on the inside. You can already feel their eyes judging you.'
@@ -589,7 +589,7 @@ if $ARGS[0] = 'police_deleted':
 
 	if $region = 'pav':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/police/pavext.jpg" ></center>'
-	else:
+	else
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityext.jpg"></center>'
 	end
 	'"Uhhmm" you stammer. "I, uhh, I deleted them."'

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

locations/clothing.qsrc

@@ -1511,7 +1511,7 @@ if $ARGS[0] = 'view_clothing_item':
 			if $ARGS[1] = 'coat' and ARGS[2] = 5:
 				price = ARGS[3]
 			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
 			end
 			'Price: <<price>> <b>₽</b>'

locations/din_bad.qsrc

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

locations/emp_functions.qsrc

@@ -64,12 +64,11 @@ if $ARGS[0] = 'gen_schedule':
 		elseif header_switch=2: 
 			header_switch = 1
 			$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
 	if i_hour <=  mod_max_hour: jump 'jmp_header_create'
 	! Reset i_hour for next loop	
 	killvar 'display_hour'
-	killvar 'header_switch'
 	i_hour = ARGS[1]
 	header_switch = 1
 	!! Close out table header
@@ -97,11 +96,11 @@ if $ARGS[0] = 'gen_schedule':
 					dynamic $schedule_tracker 
 				elseif function_sw = 2:
                     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
-                        $transient_tb  = 'Free'
+                        $transient_tb = 'Free'
                     end
 				elseif function_sw = 3:
 				else
@@ -113,8 +112,8 @@ if $ARGS[0] = 'gen_schedule':
 				else
 					$tablebody +=  '<td style="padding: 10px;">' + $transient_tb +'</td>'
 					flag_active = 0
-					killvar '$transient_tb'
 				end	
+				killvar '$transient_tb'
 			else
 				 i_day += 1
 				 jump 'jmp_day_create'
@@ -142,6 +141,10 @@ if $ARGS[0] = 'gen_schedule':
     !! Start the table constuction    
     '<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
     '<<$msg_back>> | <<$msg_forward>>'
+	killvar '$tablebody'
+	killvar '$tableheader'
+	killvar '$msg_back'
+	killvar '$msg_forward'
     *nl
     if  function_sw = 1:
 	'<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':
 		killvar 'flag_schedule'
 		killvar 'school_group'
-		killvar 'j_id'
 		gt $loc, $loc_arg
 	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 '<<$msg_body>>'
+	killvar '$msg_body'
 end
 
 !! --------------------- Event Generator
@@ -538,7 +541,7 @@ if $ARGS[0] = 'emp_booking':
 		:jmp_daily_book
 			j_idx = emp_job_start[j_id]
 			:jmp_hour_book
-				emp_rota_week[d_idx + '_' + j_idx]  = j_id
+				emp_rota_week['<<d_idx>>_<<j_idx>>'] = j_id
 				j_idx += 1
 			if j_idx <= j_finish: jump 'jmp_hour_book'	
 			d_idx += 1
@@ -563,7 +566,7 @@ if $ARGS[0] = 'emp_chk_clk':
 	:jmp_daily_chk
 		j_idx = emp_job_start[j_id]
 		:jmp_job_chk
-			if emp_rota_week[d_idx + '_' + j_idx]  >  0:
+			if emp_rota_week['<<d_idx>>_<<j_idx>>'] > 0:
 				!! booking failed					
 				emp_rota_fail = 1
 			else
@@ -583,7 +586,7 @@ if $ARGS[0] = 'emp_terminate':
 		:jmp_daily_book
 			j_idx = emp_job_start[j_id]
 			:jmp_hour_book
-				emp_rota_week[d_idx + '_' + j_idx] = 0
+				emp_rota_week['<<d_idx>>_<<j_idx>>'] = 0
 				j_idx += 1
 			if j_idx <= j_finish: jump 'jmp_hour_book'	
 			d_idx += 1
@@ -594,10 +597,6 @@ if $ARGS[0] = 'emp_terminate':
 	else
 		msg 'Job termination failed. Please ensure you set to  4 - Terminated or 5 - Fired'
 	end
-	killvar 'j_idx'
-	killvar 'j_finish'
-	killvar 'd_idx'
-	killvar 'd_end'	
 end
 
 if $ARGS[0] = 'loop_configure':	
@@ -612,4 +611,19 @@ if $ARGS[0] = 'loop_configure':
 		d_end= 7
 	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 ---------------------------------

locations/emp_job_array.qsrc

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

locations/father.qsrc

@@ -174,7 +174,7 @@ act 'Chat':
     gs 'stat'
     '<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>'
-	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.'
 	else
 		'Your stepfather is sitting by the dinner table eating and reading the newspaper.'

locations/flash.qsrc

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

locations/gadukino_event.qsrc

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

locations/initg.qsrc

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

locations/internet_mobile.qsrc

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

locations/journal.qsrc

@@ -54,6 +54,7 @@ if $ARGS[0]='journalmenu':
 	!display the table here.
 	
 	'<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 $start_type[1] ! 'nomagic': 

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>'
     elseif ml_streaming['lastday'] = daystart: 
         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>'
     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>'

locations/nichTanya.qsrc

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

locations/npc.qsrc

@@ -25,9 +25,9 @@ if $ARGS[0] = 'cleanarrays':
 end
 
 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
 	if currnpc_month < month:
 		currnpc_age -= 1

locations/npcpreservec.qsrc

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

locations/pav_complex.qsrc

@@ -136,7 +136,7 @@ if $ARGS[0] = 'start':
 	act 'Walk to the Industrial region (0:05)':minut += 5 & gt 'pav_industrial'
 	act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 	act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
-	act 'Walk to Pushkin (0:30)':minut += 30 gt 'pushkin'
+	act 'Walk to Pushkin (0:30)':minut += 30 & gt 'pushkin'
 	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): 
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or pavSharedAptEnabled = 1):

locations/pav_disco_sex.qsrc

@@ -2318,7 +2318,7 @@ if $ARGS[0] = 'End':
 	'<center><video autoplay loop src="images/pc/activities/misc/dress_2.mp4"></video></center>'
 	'After you relax, you smile at <<$npc_firstname[$npclastsaved]>> and say, "That was fun, but I really should get going..."'
 	'<<$npc_firstname[$npclastsaved]>> stretches lazily on the bed, not bothering to get up. "You were great, <<$pcs_nickname>>! I hope I''ll run into you again next time I''m in Pavlovsk!"'
-	if arrpos('sparrloc', 11) ! -1: cumspclnt = 12 & gs 'cum_cleanup' & 'You look around the room and find a packet of wipes. You take one and quickly wipe the sperm off your face to make yourself presentable enough to go outside.'
+	if cumloc[11] > 0: cumspclnt = 12 & gs 'cum_cleanup' & 'You look around the room and find a packet of wipes. You take one and quickly wipe the sperm off your face to make yourself presentable enough to go outside.'
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Leave the hotel': gt 'pav_market'

locations/phone_selfies.qsrc

@@ -1356,7 +1356,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_pic_i = 1
 		:temp_loopev
 			dynamic '$selfie = <<$selfienpc>>photo[<<lr2_pic_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				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_cnum += 1
@@ -1378,7 +1378,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_regself_i = 1
 		:temp_loopselfies
 			dynamic '$selfie = <<$selfienpc>>[<<lr2_regself_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				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_cnum += 1
@@ -1400,7 +1400,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_swm_i = 1
 		:temp_loopselfiessveta
 			dynamic '$selfie = <<$selfienpc>>sveta[<<lr2_swm_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				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_cnum += 1
@@ -1422,7 +1422,7 @@ if $ARGS[0] = 'listretrieve2':
 		lr2_sex_i = 1
 		:temp_loopselfiessex
 			dynamic '$selfie = <<$selfienpc>>sex[<<lr2_sex_i>>]'
-			if $selfie = 1:
+			if val($selfie) = 1:
 				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_cnum += 1

locations/saveupdater.qsrc

@@ -1633,7 +1633,7 @@ if temp_current_save_version < 00080804:
 	!! Setting the internet
 	if internet > 0:
 		old_internet_value = 10*internet
-		if $home['internet_enabled'] = 1:
+		if property['internet_enabled'] = 1:
 			gs 'internet_mobile', 'buy_subscription', $home['current'], 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_name = str(dyneval('$result = $routine<<makeup_routine_update_index>>custname'))
 	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>>_name'] = $temp_makeup_routine_name
 		killvar '$routine<<makeup_routine_update_index>>'

locations/sex_ev_after.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'quit':
 				act'Leave':gt'sex_ev_leave', 'exit'
 			end
 			
-			if sex_ev['type'] ! 'hookup':
+			if $sex_ev['type'] ! 'hookup':
 				act'We''re through':
 					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!"'

locations/sex_ev_condoms.qsrc

@@ -1827,12 +1827,14 @@ if $ARGS[0] = 'father_check':
 	'List of potential fathers:'
 	:potfather_loop
 	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
-		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
-	if $boy = potfather_temp[2]: potfather_counter += 1
+	if $boy = $potfather_temp[2]: potfather_counter += 1
 	if potfather_counter < arrsize('$wombpotfath'): jump 'potfather_loop'
+	killvar 'potfather_counter'
+	killvar 'potfather_temp'
 end
 
 if $ARGS[0] = 'npc_preg_react':

locations/sex_ev_dress_talking.qsrc

@@ -1078,9 +1078,9 @@ if $ARGS[0] = 'break_up2':
 		act'Don''t text me anymore':
 			gs'sex_ev_leave', 'dress_loop'
 			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."'
-			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."'
 			end
 			'"Why not?" he asks.'

locations/sex_ev_pillow_talk.qsrc

@@ -308,7 +308,7 @@ if $ARGS[0] = 'sweaty_sex':
 				end
 			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."'
-				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.'
 				else
 					sex_ev['weather_pillow_talk'] = 1
@@ -365,7 +365,7 @@ if $ARGS[0] = 'sore_pussy':
 								gs'sex_ev_pillow_talk', 'sex_talk'
 							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':
 									npc_know_cheat[$boy] = 1
 									cla & *nl
@@ -1236,7 +1236,7 @@ if $ARGS[0] = 'thank_no_creampie':
 			'"Thanks for remembering to pull out," you say.'
 			if npc_dont_like_creampie[$boy] = 1:
 				!! '"Thanks for remembering to pull out," you say.'
-			elseif npc_cum_pref[$boy] = 'creampie':
+			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."'
 				act'Ew':
 					cla & *nl

locations/sex_ev_reactions.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'condom_reactions':
 end
 
 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':
 			if sex_ev['cock_inserted'] = 1:
 				cla & *clr
@@ -662,12 +662,12 @@ if $ARGS[0] = 'cum_mouth_like_that':
 end
 
 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] = '':
 			'"I love watching you swallow," <<$npc_firstname[$boy]>> says, looking at you with blissful satisfaction. '
 			act'You think it''s hot?':
 				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?"'
 				'"The hottest thing a girl can do. Even better than coming inside."'
 				act'Good to know':
@@ -697,7 +697,7 @@ if $ARGS[0] = 'swallow_react1':
 			end
 			gs 'sex_ev_reactions', 'spit_quit'
 		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.'
 				gs 'sex_ev_reactions', 'swallow_for_you'
 			else
@@ -714,7 +714,7 @@ if $ARGS[0] = 'swallow_react1':
 end
 
 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':
 			cla & *clr
 			'<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
 
 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)':
 			cla & *nl
 			'"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
 
 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':
 			cla & *nl
 			'"Spitting is quitting," you smile, giving him a no-big-deal shrug.'
@@ -745,7 +745,7 @@ if $ARGS[0] = 'spit_quit':
 end
 
 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':
 			cla & *nl
 			'"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
 			$sex_ev['bed_room']
 		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?"'
 			else
 				'"A little warning next time?" you smile, wiping a loose drop of cum from your lip. "I barely had time to swallow."'
 			end
 		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?"'
 			else
 				'"A little warning next time?" you ask, with a cumglazed smile.'
 			end
 		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?"'
 			else
 				'"A little warning next time?" you ask, with a cumglazed smile.'
 			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:
 				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."'
@@ -1522,7 +1522,7 @@ if $ARGS[0] = 'bj_warning_next_time':
 			end
 
 			act'Really?':
-				$pc_cum_pref_know[$boy] = npc_cum_pref[$boy]
+				$pc_cum_pref_know[$boy] = $npc_cum_pref[$boy]
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/smile1.jpg"></center>'
 				'"Really?" you ask. "You like it that much?"'
@@ -1647,7 +1647,7 @@ if $ARGS[0] = 'bj_swallow_gross':
 end
 
 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':
 			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."'
@@ -1703,7 +1703,7 @@ if $ARGS[0] = 'bj_spit_gross':
 end
 
 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':
 			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?"'
@@ -1743,7 +1743,7 @@ if $ARGS[0] = 'cum_mouth_swallow_why':
 		'"Shut up," you roll your eyes.'
 		gs 'sex_ev_sex', 'sex_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':
 			cla & *clr
 			$sex_ev['bed_room']

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."'
 				end
 				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."'
 					'"Must be," you say back, giving him a smile.'		
 				else

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'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'
 				
@@ -413,7 +413,7 @@ if $ARGS[0] = 'fuck_continue':
 				sex_ev['dirty_talk'] = 1
 				gt 'sex_ev_<<$sex_ev[''position'']>>', '<<$sex_ev[''position'']>><<sex_ev[''speed'']>>.2'
 			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'
 				
@@ -1146,7 +1146,7 @@ if $ARGS[0] = 'he_end_break':
 end
 
 if $ARGS[0] = 'keep_going':
-	if sex_ev['type'] ! 'prostitution_cust':
+	if $sex_ev['type'] ! 'prostitution_cust':
 		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:
 				sex_ev['boy_cum'] = 0

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>'
 					'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."'
-					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?"'
 					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."'

locations/shoes.qsrc

@@ -303,7 +303,7 @@ if $ARGS[0] = 'view_shoe_item':
 			'You already own these shoes.'
 			act 'Leave': gt $loc, $loc_arg
 		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>> <b>₽</b>'
 			act 'Leave': gt $loc, $loc_arg

locations/shop.qsrc

@@ -27,7 +27,7 @@ if $shoplocation = 'main':
 
 		if $loc = 'shop':
 			if $loc_bak = 'shop':
-				$loc = torgpred
+				$loc = 'city_trademission'
 			else
 				$loc = $loc_bak
 			end
@@ -572,7 +572,7 @@ if $shoplocation = 'megafon':
 	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>'
 
-	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>'
 
 	elseif subscription[$home['current']] = 1:
@@ -620,7 +620,7 @@ if $shoplocation = 'megafon':
 					end
 
 				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
 			killvar '$property'

locations/shortgs.qsrc

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

locations/show_table.qsrc

@@ -1,6 +1,6 @@
 # show_table
 !{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=''
 		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 $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>"
-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 ---------------------------------
 

locations/sitr.qsrc

@@ -66,8 +66,6 @@ if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'Your <a href="exec:gt ''husb'', ''start''">husband</a> is sitting on the couch, watching television.'
 		gs 'music_actions', 'not_alone'
-	else
-		gs 'music_actions', 'clear_restrictions'
 	end
 end
 

locations/sitr2x.qsrc

@@ -57,8 +57,6 @@ if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'Your <a href="exec: gt''husb'',''start'' ">husband</a> is sitting on the couch watching television.'
 		gs 'music_actions', 'not_alone'
-	else
-		gs 'music_actions', 'clear_restrictions'
 	end
 end
 

locations/spell.qsrc

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

locations/street_event.qsrc

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

locations/telefon.qsrc

@@ -969,9 +969,9 @@ if $ARGS[0] = 'send_sms':
 	$telefon['body'] = '
 	<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>'
-	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'] += '<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
 !! Colour correction for editor ''''
 	

locations/uni_dorm.qsrc

@@ -1016,7 +1016,6 @@ if $ARGS[0] = 'dorm_room':
 	if mc_inventory['mag_porn'] > 0: 'You''ve hidden your porn magazines under the mattress of your bed.'
 	
 	vika_inroom = 0 & vika_sleep = 0
-	gs 'music_actions', 'clear_restrictions'
 	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_inroom = 1
 		vika_sleep = 0