locations/booty_call_sms.qsrc

@@ -491,6 +491,8 @@ if $ARGS[0] = 'new_booty_call':
 							else
 							end
 						end
+					else
+						$SMSTree['b12'] = 'PLACEHOLDER 2'
 					end
 				end
 
@@ -523,17 +525,17 @@ if $ARGS[0] = 'new_booty_call':
 	elseif $npc_rel_type[$ARGS[1]] = 'boyfriend':
 		!! temp
 		$SMSTree['10'] = '$npc_rel_type = boyfriend!!'
-			$SMSTree['11'] = 'PLACEHOLDER2'
+			$SMSTree['11'] = 'PLACEHOLDER3'
 
 	elseif $npc_rel_type[$ARGS[1]] = 'girlfriend':
 		!! temp
 		$SMSTree['10'] = '$npc_rel_type = girlfriend!!'
-			$SMSTree['11'] = 'PLACEHOLDER2'
+			$SMSTree['11'] = 'PLACEHOLDER4'
 
 	else
 		!! temp
 		$SMSTree['10'] = 'PLACEHOLDER3'
-			$SMSTree['11'] = 'PLACEHOLDER4'
+			$SMSTree['11'] = 'PLACEHOLDER5'
 	end
 
 

locations/lover_change.qsrc

@@ -220,35 +220,35 @@ if $ARGS[0] = 'Pier':
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'The artist takes a look at your unpierced ears, and with a quick sharp pain, pierces them.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/c1.jpg"></center>'
-									gs 'piercing_management', 'add', 'ears', '1'
+									gs 'piercing_management', 'add', 'ears', 1
 									gs 'pain', 7, 'ears', 'pierce'
 								end
 							elseif randchan = 1 and pcs_piercings['tongue'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'He asks you to stick out your tongue. You comply and then start to regret it as he pierces your tongue.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/a1.jpg"></center>'
-									gs 'piercing_management', 'add', 'tongue', '1'
+									gs 'piercing_management', 'add', 'tongue', 1
 									gs 'pain', 7, 'tongue', 'pierce'
 								end
 							elseif randchan = 2 and pcs_piercings['lip'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'The artist gently holds your lip as he drives the needle through to pierce it.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/b1.jpg"></center>'
-									gs 'piercing_management', 'add', 'lip', '1'
+									gs 'piercing_management', 'add', 'lip', 1
 									gs 'pain', 7, 'lips', 'pierce'
 								end
 							elseif randchan = 3 and pcs_piercings['nose'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'You feel a sharp pain in your nose as he pierces your nose.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/d1.jpg"></center>'
-									gs 'piercing_management', 'add', 'nose', '1'
+									gs 'piercing_management', 'add', 'nose', 1
 									gs 'pain', 7, 'nose', 'pierce'
 								end
 							elseif randchan = 4 and pcs_piercings['brow'] = 0:
 								if pcs_piercings['total'] < pierPrefTmpMin:
 									'The artist moves to above your eyes and quickly pierces your eyebrow.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/e1.jpg"></center>'
-									gs 'piercing_management', 'add', 'brow', '1'
+									gs 'piercing_management', 'add', 'brow', 1
 									gs 'pain', 7, 'eyebrows', 'pierce'
 								end
 							elseif randchan = 5 and pcs_piercings['navel'] = 0:
@@ -256,7 +256,7 @@ if $ARGS[0] = 'Pier':
 									'He positions himself to pierce your belly button. You feel a sharp pain through your navel as he pierces it.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/n1.jpg"></center>'
 									pcs_horny += 2
-									gs 'piercing_management', 'add', 'navel', '1'
+									gs 'piercing_management', 'add', 'navel', 1
 									gs 'pain', 7, 'tummy', 'pierce'
 								end
 							elseif randchan = 6 and pcs_piercings['nipples'] = 0:
@@ -264,7 +264,7 @@ if $ARGS[0] = 'Pier':
 									'He motions for you to lift up your shirt. After you do the man grabs your breasts rather softly and carefully pierces each nipple.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/f1.jpg"></center>'
 									pcs_horny += 5
-									gs 'piercing_management', 'add', 'nipples', '1'
+									gs 'piercing_management', 'add', 'nipples', 1
 									gs 'pain', 7, 'nipples', 'pierce'
 								end
 							elseif randchan = 7 and pcs_piercings['pussy'] = 0:
@@ -273,7 +273,7 @@ if $ARGS[0] = 'Pier':
 									'You cover your mouth as you let out a quick "Eep!", as you feel a quick pain through your labia, but in a second, it''s over.'
 									'<center><img <<$set_imgh>> src="images/pc/body/piercings/g1.jpg"></center>'
 									pcs_horny += 7
-									gs 'piercing_management', 'add', 'pussy', '1'
+									gs 'piercing_management', 'add', 'pussy', 1
 									gs 'pain', 7, 'pubic', 'pierce'
 								end
 							elseif pcs_piercings['total'] < pierPrefTmpMin:

locations/lover_pref.qsrc

@@ -285,7 +285,7 @@ if $ARGS[0] = 'check_piercings':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -340,7 +340,7 @@ if $ARGS[0] = 'check_tattoos':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -369,7 +369,7 @@ if $ARGS[0] = 'check_makeup':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -404,7 +404,7 @@ if $ARGS[0] = 'check_haircol':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -439,7 +439,7 @@ if $ARGS[0] = 'check_tits':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -480,7 +480,7 @@ if $ARGS[0] = 'check_lips':
 			result = 1
 		end
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end
@@ -519,7 +519,7 @@ if $ARGS[0] = 'check_bmi':
 		lp_temp_check = 0
 		result = 1
 	end
-	if p_temp_check = 1:
+	if lp_temp_check = 1:
 		!! no preferences means happy
 		result = 1
 	end

locations/pav_disco.qsrc

@@ -710,11 +710,7 @@ if $ARGS[0] = 'dance_partner':
 			end
 		elseif DaPaTipeRand >= 90:
 			!!traveling_expenses
-			if rand(0, 1) = 0:
-				$npc_residence[$boy] = 'city_residential'
-			else
-				$npc_residence[$boy] = 'city_center'
-			end
+			$npc_residence[$boy] = 'city_center'
 			npc_finance[$boy] = 2
 			bmtimeTipe = 2
 			DrunkDPTrand = rand(0,100)

locations/pav_lake_nude.qsrc

@@ -52,7 +52,7 @@ if mid($start_type,1,2) = 'sg' and month >= 3 and month <= 8 and week >= 6 and h
 		act 'Run away': ivanfedorseennaked = daystart & gt 'pav_lake_nude'
 		act 'Greet them': ivanfedorseennaked = daystart & gt 'gschool_socialchg1', 'ivan_fedor_naked'
 	else
-		'You''re walking down the secluded beach, enjoying the tranquility when you suddenly hear someone running up behind you. Expecting the worst, you turn around only to see a sweaty <a href="exec:gt ''gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
+		'You''re walking down the secluded beach, enjoying the tranquility when you suddenly hear someone running up behind you. Expecting the worst, you turn around only to see a sweaty <a href="exec:gt ''ivanfedorseennaked = daystart & gschool_socialchg1'', ''tIvan''">Ivan</a>, closely followed by <a href="exec:ivanfedorseennaked = daystart & gt ''gschool_socialchg1'', ''tFedor''">Feodor</a>.'
 	end
 end
 

locations/saveupdater.qsrc

@@ -4132,7 +4132,7 @@ if temp_current_save_version < 00090304:
 		$lover[] = $husID
 
 		npc_rel[$husID]			= husband
-		npc_rel_type[$husID]	= 'husband'
+		$npc_rel_type[$husID]	= 'husband'
 		$npc_usedname[$husID]	= $husname
 		if $husHair = 'black':
 			npc_haircol[$husID] = 0

locations/shortgs.qsrc

@@ -1184,7 +1184,7 @@ if $ARGS[0] = 'color_is_dark':
 	killvar 'shortgs_cid_b'
 end
 
-!! func('shortgs', 'enumerate_list', '$arrname', {start}, {number}, {oxford_comma})
+!! func('shortgs', 'enumerate_list', '$arrname', {start}, {number}, ', ', ' and ', ', and ')
 !! returns a string with the array entries listed:
 !! $arr[0] = 'Sidisi'	-> returns: 'Sidisi'
 !! $arr[1] = 'Eriette'	-> returns: 'Sidisi and Eriette'
@@ -1195,16 +1195,21 @@ end
 !! $ARGS[4] is the small separator (defaults to ', ')
 !! $ARGS[5] is the final separator for 2 items (defaults to ' and ')
 !! $ARGS[6] is the final seperator for more items (defaults to ', and ')
+!!
+!! If you want to list the entries of an array, you can use
+!! func('shortgs', 'enumerate_list', '$arrname', 0, 0, '<br>', '<br>', '<br>')
+
+
 if $ARGS[0] = 'enumerate_list':
 	$temp_sgs_text = ''
 	$sgs_arrname = $ARGS[1]
 
-	if ARGS[2] = 0:
+	if ARGS[2] <= 0:
 		temp_sgs_i = 0
 	else
 		temp_sgs_i = ARGS[2]
 	end
-	if ARGS[3] = 0:
+	if ARGS[3] <= 0:
 		temp_sgs_max_i = arrsize($sgs_arrname)
 	else
 		temp_sgs_max_i = temp_sgs_i + ARGS[3]

locations/stwork.qsrc

@@ -100,7 +100,7 @@ if $ARGS[0] = 'set_perform_acts':
 			!!'You put your clothes back on before heading back onto the stage.'
 			act 'Go on stage':
 				if pcs_leghair <= 3 and pcs_pubes <= 25:
-					gt 'stwork2', 'strip'
+					gt 'stwork2', 'strip_show_start'
 				else
 					*clr & cla
 					!! IMAGE
@@ -302,7 +302,7 @@ if $ARGS[0] = 'stripgirl':
 	elseif temp_rand = 13:
 		'"I caught Ruby snorting shit right here on the make-up table! Can she at least do it in the fucking bathroom?"'
 	elseif temp_rand = 14:
-		'"Diamond needs to get some respect for herself. I saw her flirting with some old man, trying to sweet talk him into being her sugar daddy. Fucking perv was eating it all up."' 
+		'"Diamond needs to get some respect for herself. I saw her flirting with some old man, trying to sweet talk him into being her sugar daddy. Fucking perv was eating it all up."'
 	elseif temp_rand = 15:
 		'"I saw a guy basically salivating at Opal''s huge tits while throwing all his money at her feet. Some girls have it fucking easy..."'
 	else