Merge remote-tracking branch 'rachels/master'

locations/foto_shoot.qsrc

@@ -370,7 +370,7 @@ if $ARGS[0] = 'nude_shoot':
 	act 'Tasteful nude':
 		$modelfoto['shoot_type'] = 'taste_nude'
 		*clr & cla
-		if modelfoto['tastenude'] >= 5 and modelfoto['topless'] + modelfoto['topless']nude + modelfoto['fullnude'] < 1: gt'foto_events','nude_persuasion'
+		if modelfoto['tastenude'] >= 5 and (modelfoto['topless'] + modelfoto['toplessnude'] + modelfoto['fullnude']) < 1: gt'foto_events','nude_persuasion'
 		if pcs_inhib < 40:
 			if modelfoto['tastenude'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
@@ -402,9 +402,9 @@ if $ARGS[0] = 'nude_shoot':
 	act 'Topless nude':
 		$modelfoto['shoot_type'] = 'top_nude'
 		*clr & cla
-		if modelfoto['topless']nude >= 3 and modelfoto['pussy'] < 1:gt'foto_events','nude_persuasion'
+		if modelfoto['toplessnude'] >= 3 and modelfoto['pussy'] < 1:gt'foto_events','nude_persuasion'
 		if pcs_inhib < 55:
-			if modelfoto['topless']nude > 0:
+			if modelfoto['toplessnude'] > 0:
 				'You think about asking to do this shoot but hesitate. You''ve done it before but still... Are you really comfortable with <i>more</i> of these kinds of pictures of you floating around?'
 			else
 				'You think about asking to do this shoot but then blush and realize you aren''t confident enough to have pictures of yourself like this circling around the internet. Maybe you could practice it later, but you''re not ready to do it for real.'			
@@ -749,7 +749,7 @@ if $ARGS[0] = 'topless_nude':
 	modelpay = (pcs_mdlng/2 * 10) + min(fame['city_modelling'], 700) + pcs_apprnc
 	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
 	modelfoto['nude'] += 1
-	modelfoto['topless']nude += 1
+	modelfoto['toplessnude'] += 1
 	mdlng_exp += rand(9,10)
 	if pcs_inhib < 55: gs 'willpower','pay','self'
 	gs 'fame', 'city', 'modelling', 'medium'

locations/obj_din.qsrc

@@ -581,7 +581,7 @@ if $ARGS[0] = 'stats':
 		'<b>Modelling</b>'
 		*nl
 		'<<modelfoto[''shoots'']>> - Number of times you have worked as a model'
-		'<<<modelfoto[''earnings'']>> - The amount of money you''ve made modelling'
+		'<<modelfoto[''earnings'']>> - The amount of money you''ve made modelling'
 		*nl
 		if modelfoto['catalog']  > 0: '<<modelfoto[''catalog'']>> - Number of catalog shoots you''ve done'
 		if modelfoto['fashion'] > 0: '<<modelfoto[''fashion'']>> - Number of fashion shoots you''ve done'

locations/pav_disco.qsrc

@@ -324,38 +324,29 @@ if $ARGS[0] = '':
 			end
 			if alko > 0:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wallflower.jpg"></center>'
-				elseif alko = 1:
+			elseif alko = 1:
 					'You''re buzzed and stand against the wall, watching the others dance.'
-				elseif alko < 4:
+			elseif alko < 4:
 					'You''re tipsy and stand against the wall, watching the others dance.'
-				elseif alko < 6:
-					if StoryLine = 1 and meynoldQW >= 2 and rand(1,10) = 1: 
-						gt 'pav_disco', 'katja_too_drunk'
-					elseif npc_rel['A25'] >= 50 and rand(1,10) = 1:
-						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif npc_rel['A144'] >= 50 and rand(1,10) = 1: 
-						gt 'pav_disco', 'anushka_too_drunk'
-					else
-						'You''re pretty drunk and stand against the wall, for support, as you watch the others dance.'
-				elseif alko < 10:
-					if StoryLine = 1 and meynoldQW >= 2 and rand(1,5) = 1: 
-						gt 'pav_disco', 'katja_too_drunk'
-					elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
-						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif npc_rel['A144'] >= 50 and rand(1,7) = 1: 
-						gt 'pav_disco', 'anushka_too_drunk'
-					else
-						'You''re too drunk to dance and you lean against the wall for support to stop yourself from falling.'
+			elseif alko < 6:
+				if StoryLine = 1 and meynoldQW >= 2 and rand(1,10) = 1: 
+					gt 'pav_disco', 'katja_too_drunk'
+				elseif npc_rel['A25'] >= 50 and rand(1,10) = 1:
+					gt 'pav_disco', 'sonia_too_drunk' 
+				elseif npc_rel['A144'] >= 50 and rand(1,10) = 1: 
+					gt 'pav_disco', 'anushka_too_drunk'
 				else
-					if StoryLine = 1 and meynoldQW >= 2 and rand(1,3) = 1: 
-						gt 'pav_disco', 'katja_too_drunk'
-					elseif npc_rel['A25'] >= 50 and rand(1,5) = 1:
-						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif npc_rel['A144'] >= 50 and rand(1,5) = 1: 
-						gt 'pav_disco', 'anushka_too_drunk'
-					else
-						'You''re too wasted to dance or stand, you have to lean against the wall for support to stop yourself from falling.'
-					end
+					'You''re pretty drunk and stand against the wall, for support, as you watch the others dance.'
+				end	
+			elseif alko < 10:
+				if StoryLine = 1 and meynoldQW >= 2 and rand(1,5) = 1: 
+					gt 'pav_disco', 'katja_too_drunk'
+				elseif npc_rel['A25'] >= 50 and rand(1,7) = 1:
+					gt 'pav_disco', 'sonia_too_drunk' 
+				elseif npc_rel['A144'] >= 50 and rand(1,7) = 1: 
+					gt 'pav_disco', 'anushka_too_drunk'
+				else
+					'You''re too drunk to dance and you lean against the wall for support to stop yourself from falling.'
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wallflower.jpg"></center>'
@@ -527,6 +518,7 @@ if $ARGS[0] = 'dance_vrp':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance5.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/club_dance6.jpg"></center>'
+		end
 		if alko < 6 or pcs_horny <= 75:
 			act 'Refuse':gt 'pav_disco'
 		else