Merge remote-tracking branch 'Hornguy6/master'

locations/booty_call_sms.qsrc

@@ -366,7 +366,11 @@ if $ARGS[0] = 'V2ap':
 	$SMSMessage[ARGS[1]] = $trialSMS
 	gs 'telefon', 'show_sms', ARGS[1]
 	booty_call_invite[$SMSContact[ARGS[1]]] = daystart
-	if npc_finance[$ARGS[1]] = 2 and func('homes_properties_attr', 'get_property_attribute', '$town', $home['current']) ! 'city' and npc_residence[$ARGS[1]] >= 3: $booty_call_hotel[$ARGS[1]] = 'pav'
+	if npc_finance[$ARGS[1]] = 2 and func('homes_properties_attr', 'get_property_attribute', '$town', $home['current']) ! 'city' and npc_residence[$ARGS[1]] >= 3:
+		$booty_call_hotel[$ARGS[1]] = 'pav'
+	else
+		$booty_call_hotel[$ARGS[1]] = 'city'
+	end
 end
 
 if $ARGS[0] = 'V2bn':
@@ -405,7 +409,11 @@ if $ARGS[0] = 'V2bp':
 	gs 'telefon', 'show_sms', ARGS[1]
 	booty_call_invite[$SMSContact[ARGS[1]]] = daystart
 !!	if ($home['current'] = 'parents_home' or $home['current'] = 'meynold_household' or $home['current'] = 'shared_apartment') and npc_residence[$SMSContact[ARGS[1]]] >= 3: 
-	if npc_finance[$ARGS[1]] = 2 and func('homes_properties_attr', 'get_property_attribute', '$town', $home['current']) ! 'city' and npc_residence[$ARGS[1]] >= 3: $booty_call_hotel[$ARGS[1]] = 'pav'
+	if npc_finance[$ARGS[1]] = 2 and func('homes_properties_attr', 'get_property_attribute', '$town', $home['current']) ! 'city' and npc_residence[$ARGS[1]] >= 3:
+		$booty_call_hotel[$ARGS[1]] = 'pav'
+	else
+		$booty_call_hotel[$ARGS[1]] = 'city'
+	end
 !!	killvar '$VF'
 !!	killvar '$MF'
 end