glife.qproj

@@ -205,6 +205,7 @@
 		<Location name="$attributes_lusso_bodysuit"/>
 		<Location name="$attributes_lusso_bra"/>
 		<Location name="$attributes_lusso_panties"/>
+		<Location name="$attributes_moncheri_bodysuit"/>
 		<Location name="$attributes_salacious_panties"/>
 		<Location name="$attributes_salacious_bra"/>
 		<Location name="$attributes_salacious_bodysuit"/>

locations/booty_call_after.qsrc

@@ -2206,59 +2206,41 @@ if $ARGS[0] = 'dress_image':
 end
 
 if $ARGS[0] = 'dress_loop':
-	:dress_loop_start
-	if $lastwornpantytype['booty_call'] ! 'none' and $lastwornbratype['booty_call'] ! 'none' and $pantyworntype = 'none'and booty_call['panty_wear'] ! 1 and booty_call['bra_wear'] ! 1:
-		booty_call['panty_wear'] = 1
-		booty_call['bra_wear'] = 1
-		killvar 'lastwornpantytype'
-		killvar 'lastwornpantynumber'
-		killvar 'lastwornbratype'
-		killvar 'lastwornbranumber'
-		$booty_call['dress_describe'] = 'pulling your panties up your legs and fastening your bra around your chest'
-	elseif $lastwornpantytype['booty_call'] ! 'none' and $pantyworntype = 'none' and booty_call['panty_wear'] ! 1:
+	$booty_call['dress_describe'] = ''
+	if $clothingworntype = 'nude':
+		if $lastwornpantytype['booty_call'] ! 'none':
+			$booty_call['dress_describe'] += 'pulling your panties up your legs'
+			if $lastwornbratype['booty_call'] ! 'none' or $clothingworntype = 'nude': $booty_call['dress_describe'] += ' and '
+		end
 		gs 'panties', 'wear', $lastwornpantytype['booty_call'], lastwornpantynumber['booty_call']
 		killvar 'lastwornpantytype'
 		killvar 'lastwornpantynumber'
-		booty_call['panty_wear'] = 1
-		$booty_call['dress_describe'] = 'pulling your panties up'
-	elseif $lastwornbratype['booty_call'] ! 'none' and $lastwornbratype['booty_call'] ! '' and $braworntype = 'none' and booty_call['bra_wear'] ! 1:
+		
+		if $lastwornbratype['booty_call'] ! 'none':
+			$booty_call['dress_describe'] += 'fastening your bra around your chest'
+			if $clothingworntype = 'nude': $booty_call['dress_describe'] += ' then '
+		end
 		gs 'bras', 'wear', $lastwornbratype['booty_call'], lastwornbranumber['booty_call']
 		killvar 'lastwornbratype'
 		killvar 'lastwornbranumber'
-		booty_call['bra_wear'] = 1
-		$booty_call['dress_describe'] = 'fastening your bra around your chest'
-	elseif $clothingworntype = 'nude':
-		gs'clothing', 'wear_last_worn'
-		jump 'dress_loop_start'
-	elseif $clothingworntype ! 'nude' and booty_call['dress_end'] ! 1:
-		if CloDress = 1 and (booty_call['dress_top_wear'] ! 1 or booty_call['dress_skirt_wear'] ! 1):
-			if booty_call['dress_top_wear'] ! 1:
-				booty_call['dress_top_wear'] = 1
-				$booty_call['dress_describe'] = 'pulling your dress over your shoulders'
-			elseif booty_call['dress_skirt_wear'] ! 1:
-				booty_call['dress_skirt_wear'] = 1
-				booty_call['dress_end'] = 1
-				$booty_call['dress_describe'] = 'smoothing your skirt out'
-			end
+
+		gs'clothing', 'wear', $lastwornclothingtype['booty_call'], lastwornclothingnumber['booty_call']
+		if CloDress = 1:
+			$booty_call['dress_describe'] += 'pulling your dress over your shoulders'
+		elseif CloSkirtShortness > 0:
+			$booty_call['dress_describe'] = 'slipping your skirt up your legs'
+			$booty_call['dress_describe'] += ' and pulling your top over your breasts'
 		else
-			if CloSkirtShortness > 0 and booty_call['skirt_wear'] ! 1 and booty_call['dress_end'] ! 1:
-				booty_call['skirt_wear'] = 1
-				$booty_call['dress_describe'] = 'slipping your skirt up your legs'
-			elseif CloSkirtShortness = 0 and booty_call['dress_end'] ! 1 and booty_call['pants_wear'] ! 1:
-				booty_call['pants_wear'] = 1
-				$booty_call['dress_describe'] = 'tugging your pants over your hips'
-			else
-				booty_call['dress_end'] = 1
-				$booty_call['dress_describe'] = 'pulling your top over your breasts'
-			end
+			$booty_call['dress_describe'] += 'tugging your pants over your hips'
+			$booty_call['dress_describe'] += ' and pulling your top over your breasts'
 		end
-	elseif booty_call['dress_end'] = 1:
+	else
 		if CloDress = 1:
-			$booty_call['dress_describe'] = 'checking your dress'
+			$booty_call['dress_describe'] += 'checking your dress'
 		elseif CloSkirtShortness > 0:
-			$booty_call['dress_describe'] = 'smoothing your skirt'
+			$booty_call['dress_describe'] += 'smoothing your skirt'
 		else
-			$booty_call['dress_describe'] = 'checking your clothes'
+			$booty_call['dress_describe'] += 'checking your clothes'
 		end
 	end
 	gs'stat'

locations/booty_call_stats.qsrc

@@ -10,6 +10,8 @@ if $ARGS[0] = 'starting_stats':
 	lastwornpantynumber['booty_call'] = pantywornnumber
 	$lastwornbratype['booty_call'] = $braworntype
 	lastwornbranumber['booty_call'] = brawornnumber
+	$lastwornclothingtype['booty_call'] = $clothingworntype
+	lastwornclothingnumber['booty_call'] = clothingwornnumber
 	booty_call['starting_makeup'] = pcs_makeup
 	booty_call['cum_vagina'] = cum_loc['vagina']
 	booty_call['cum_labia'] = cum_loc['labia']

locations/exhibitionistshop.qsrc

@@ -286,7 +286,7 @@ if $ARGS[0] = 'bodysuit':
 	i = 1
 
 	:loopsalacious_bodysuit
-		if salacious_bodysuit[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bodysuit2''"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		if salacious_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''exhibitionistshop'', ''bodysuit2''"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 40:jump 'loopsalacious_bodysuit'
 end
@@ -294,11 +294,6 @@ end
 if $ARGS[0] = 'bodysuit2':
 	cla
 	menu_off = 1
-	if salacious_bodysuit[i] ! 0:
-		msg 'You already own this bodysuit.'
-		gt 'exhibitionistshop', 'bodysuit'
-	end
-
 	gt 'underwear_bodysuits', 'view_bodysuit_item', 'shop', 'salacious',i, 1000
 end
 

locations/hookup.qsrc

@@ -16,6 +16,8 @@ if $ARGS[0] = 'start':
 	lastwornpantynumber['hookup'] = pantywornnumber
 	$lastwornbratype['hookup'] = $braworntype
 	lastwornbranumber['hookup'] = brawornnumber
+	$lastwornclothingtype['hookup'] = $clothingworntype
+	lastwornclothingnumber['hookup'] = clothingwornnumber
 	gs 'clothing', 'strip'
 	gs 'underwear', 'remove'
 	gs 'stat'

locations/hookup_after.qsrc

@@ -48,9 +48,9 @@ if $ARGS[0] = 'exit':
 end
 
 if $ARGS[0] = 'dress':
-	gs 'clothing', 'wear_last_worn'
-	if $lastwornpantytype['hookup'] ! '' and $lastwornpantytype['hookup'] ! 'none': gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
-	if $lastwornbratype['hookup'] ! '' and $lastwornbratype['hookup'] ! 'none': gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
+	gs'clothing', 'wear', $lastwornclothingtype['hookup'], lastwornclothingnumber['hookup']
+	gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
+	gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
 	gs 'stat'
 end
 
@@ -1978,45 +1978,41 @@ if $ARGS[0] = 'dress_image':
 end
 
 if $ARGS[0] = 'dress_loop':
-	:dress_loop_start
-	if $lastwornpantytype['hookup'] ! 'none' and $pantyworntype = 'none' and hookup['panty_wear'] ! 1:
+	$hookup['dress_describe'] = ''
+	if $clothingworntype = 'nude':
+		if $lastwornpantytype['hookup'] ! 'none':
+			$hookup['dress_describe'] += 'pulling your panties up your legs'
+			if $lastwornbratype['hookup'] ! 'none' or $clothingworntype = 'nude': $hookup['dress_describe'] += ' and '
+		end
 		gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
-		hookup['panty_wear'] = 1
-		$hookup['dress_describe'] = 'pulling your panties up your legs'
-	elseif $lastwornbratype['hookup'] ! 'none' and $braworntype = 'none' and hookup['bra_wear'] ! 1:
+		killvar 'lastwornpantytype'
+		killvar 'lastwornpantynumber'
+		
+		if $lastwornbratype['hookup'] ! 'none':
+			$hookup['dress_describe'] += 'fastening your bra around your chest'
+			if $clothingworntype = 'nude': $hookup['dress_describe'] += ' then '
+		end
 		gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
-		hookup['bra_wear'] = 1
-		$hookup['dress_describe'] = 'throwing your arms through the straps of your bra and clasping it behind your back'
-	elseif $clothingworntype = 'nude':
-		gs 'clothing', 'wear_last_worn'
-		jump 'dress_loop_start'
-	elseif $clothingworntype ! 'nude' and hookup['dress_end'] ! 1:
-		if CloDress = 1 and $hookup['dress_top_wear'] ! 1 and $hookup['dress_skirt_wear'] ! 1:
-			if $hookup['dress_top_wear'] ! 1:
-				hookup['dress_top_wear'] = 1
-				$hookup['dress_describe'] = 'pulling your dress over your shoulders'
-			elseif $hookup['dress_skirt_wear'] ! 1:
-				hookup['dress_skirt_wear'] = 1
-				hookup['dress_end'] = 1
-				$hookup['dress_describe'] = 'smoothing your skirt out'
-			end
+		killvar 'lastwornbratype'
+		killvar 'lastwornbranumber'
+
+		gs'clothing', 'wear', $lastwornclothingtype['hookup'], lastwornclothingnumber['hookup']
+		if CloDress = 1:
+			$hookup['dress_describe'] += 'pulling your dress over your shoulders'
+		elseif CloSkirtShortness > 0:
+			$hookup['dress_describe'] = 'slipping your skirt up your legs'
+			$hookup['dress_describe'] += ' and pulling your top over your breasts'
 		else
-			if CloSkirtShortness > 0 and hookup['skirt_wear'] = 0 and hookup['dress_end'] ! 1:
-				hookup['skirt_wear'] = 1
-				$hookup['dress_describe'] = 'zipping your skirt up over your hips'
-			elseif hookup['pants_wear'] = 0 and hookup['dress_end'] ! 1:
-				hookup['pants_wear'] = 1
-				$hookup['dress_describe'] = 'tugging your pants over your hips'
-			else
-				hookup['dress_end'] = 1
-				$hookup['dress_describe'] = 'pulling your top over your breasts'
-			end
+			$hookup['dress_describe'] += 'tugging your pants over your hips'
+			$hookup['dress_describe'] += ' and pulling your top over your breasts'
 		end
-	elseif hookup['dress_end'] = 1:
-		if CloSkirtShortness > 0:
-			'smoothing out your skirt'
+	else
+		if CloDress = 1:
+			$hookup['dress_describe'] += 'checking your dress'
+		elseif CloSkirtShortness > 0:
+			$hookup['dress_describe'] += 'smoothing your skirt'
 		else
-			'straightening out your clothes'
+			$hookup['dress_describe'] += 'checking your clothes'
 		end
 	end
 	gs 'stat'

locations/journal.qsrc

@@ -624,7 +624,8 @@ end
 
 if $ARGS[0] = 'relindex':
 
-    *pl & gs 'indik', '1', npc_rel['<<$ARGS[1]>>'], npc_rel['<<$ARGS[1]>>'], 100 & '<<$ind>>'
+    gs 'indik', '1', npc_rel['<<$ARGS[1]>>'], npc_rel['<<$ARGS[1]>>'], 100 & '<<$ind>>'
+	*nl
 end
 
 if $ARGS[0] = 'leaveactions':

locations/lusso.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 
 	act 'View bras': minut += 5 & gt 'lusso', 'bras'
 	
-!!	act 'View bodysuits': minut += 5 & gt 'lusso', 'bodysuit'
+	act 'View bodysuits': minut += 5 & gt 'lusso', 'bodysuit'
 end
 
 if $ARGS[0] = 'panties':
@@ -102,7 +102,7 @@ if $ARGS[0] = 'bodysuit':
 	i = 1
 
 	:looplusso_bodysuit
-		if lusso_bodysuit[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bodysuit2''"><img src="images/pc/items/lusso/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		if lusso_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''lusso'', ''bodysuit2''"><img src="images/pc/items/lusso/bodysuits/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 90:jump 'looplusso_bodysuit'
 end
@@ -110,13 +110,7 @@ end
 if $ARGS[0] = 'bodysuit2':
 	cla
 	menu_off = 1
-	if lusso_bodysuit[i] ! 0:
-		msg 'You already own this bodysuit.'
-		gt 'lusso', 'bodysuit'
-	end
-
 	gt 'underwear_bodysuits', 'view_bodysuit_item', 'shop', 'lusso',i, 1000
-
 end
 
 

locations/moncheri.qsrc

@@ -221,7 +221,7 @@ if $ARGS[0] = 'bodysuit':
 	i = 1
 
 	:loopmoncheri_bodysuit
-		if boutique_bodysuit[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''bodysuit2''"><img src="images/pc/items/moncheri/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		if moncheri_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''bodysuit2''"><img src="images/pc/items/moncheri/bodysuits/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 50:jump 'loopmoncheri_bodysuit'
 end
@@ -229,10 +229,6 @@ end
 if $ARGS[0] = 'bodysuit2':
 	cla
 	menu_off = 1
-	if boutique_bodysuit[i] ! 0:
-		msg 'You already own this bodysuit.'
-		gt 'moncheri', 'bodysuit'
-	end
 
 	gt 'underwear_bodysuits', 'view_bodysuit_item', 'shop', 'moncheri',i, 2000
 

locations/shop_scandalicious.qsrc

@@ -301,7 +301,7 @@ if $ARGS[0] = 'bodysuit':
 	i = 1
 
 	:loopscandalicious_bodysuit
-		if scandalicious_bodysuit[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''bodysuit2''"><img src="images/pc/items/scandalicious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
+		if scandalicious_bodysuits[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_scandalicious'', ''bodysuit2''"><img src="images/pc/items/scandalicious/bodysuits/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 100:jump 'loopscandalicious_bodysuit'
 end
@@ -309,13 +309,7 @@ end
 if $ARGS[0] = 'bodysuit2':
 	cla
 	menu_off = 1
-	if scandalicious_bodysuit[i] ! 0:
-		msg 'You already own this bodysuit.'
-		gt 'shop_scandalicious', 'bodysuit'
-	end
-
 	gt 'underwear_bodysuits', 'view_bodysuit_item', 'shop', 'scandalicious',i, 1000
-
 end
 
 --- shop_scandalicious ---------------------------------

locations/underwear_attributes.qsrc

@@ -93,7 +93,9 @@ BraCover = 0
 underwear['pair'] = 0
 
 
-if $ARGS[0] = 'lusso_bodysuits':
+if $ARGS[0] = 'moncheri_bodysuits':
+	*P FUNC('$attributes_moncheri_bodysuit', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'lusso_bodysuits':
 	*P FUNC('$attributes_lusso_bodysuit', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'lusso_panties':
 	*P FUNC('$attributes_lusso_panties', $ARGS[0], ARGS[1])

locations/underwear_bodysuits.qsrc

@@ -47,25 +47,61 @@ if $ARGS[0] = 'view_bodysuit_list':
 		cloc = 1
 	end
 
-	'<center><img src="images/locations/city/citycenter/mall/Lusso.png"></center>'
+	!! Check for no bodysuits
+	j = 0
+
+	if ARRSIZE('moncheri_bodysuits') > 0:
+		j += 1
+		'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
+	end
+
+	i = 1
+	:loopmoncheribodysuits 
+	if moncheri_bodysuits_s[i] = metka_bodysuits and moncheri_bodysuits[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''moncheri'', <<i>>"><img src="images/pc/items/moncheri/bodysuits/<<i>>.jpg" 	height="150" /></a>'
+	i += 1
+	if i <= ARRSIZE('moncheri_bodysuits'):jump 'loopmoncheribodysuits'
+
+	if ARRSIZE('lusso_bodysuits') > 0:
+		j += 1
+		'<center><img src="images/locations/city/citycenter/mall/Lusso.png"></center>'
+	end
 
 	i = 1
 	:looplussobodysuits 
 	if lusso_bodysuits_s[i] = metka_bodysuits and lusso_bodysuits[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''lusso'', <<i>>"><img src="images/pc/items/lusso/bodysuits/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
 	if i <= ARRSIZE('lusso_bodysuits'):jump 'looplussobodysuits'
-	
+
+	if ARRSIZE('salacious_bodysuits') > 0:
+		j += 1
+		'<center><img src="images/locations/pushkin/exhibitshop/shop_name.png"></center>'
+	end
+
 	i = 1
 	:loopsalaciousbodysuits 
-	if salacious_bodysuits_s[i] = metka_bodysuits and salacious_bodysuit[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''salacious'', <<i>>"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="150" /></a>'
+	if salacious_bodysuits_s[i] = metka_bodysuits and salacious_bodysuits[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''salacious'', <<i>>"><img src="images/pc/items/salacious/bodysuits/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
 	if i <= ARRSIZE('salacious_bodysuits'):jump 'loopsalaciousbodysuits'
-	
+
+	if ARRSIZE('scandalicious_bodysuits') > 0:
+		j += 1
+		'<center><img src="images/locations/city/citycenter/mall/scandalicious.png"></center>'
+	end
+
 	i = 1
 	:loopscandaliciousbodysuits 
 	if scandalicious_bodysuits_s[i] = metka_bodysuits and scandalicious_bodysuits[i] = 1:*p '<a href="exec:gt ''underwear_bodysuits'', ''view_bodysuit_item'', ''<<$ARGS[1]>>'', ''scandalicious'', <<i>>"><img src="images/pc/items/scandalicious/bodysuits/<<i>>.jpg" 	height="150" /></a>'
 	i += 1
 	if i <= ARRSIZE('scandalicious_bodysuits'):jump 'loopscandaliciousbodysuits'
+
+	if j = 0:
+		*nl
+		*nl
+		*nl
+		*nl
+		*nl
+		'<center><b><font color = red>You do not own any bodysuits</font></b></center>'
+	end
 end
 
 if $ARGS[0] = 'view_bodysuit_item':