Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

glife.qproj

@@ -126,6 +126,7 @@
 		<Location name="$attributes_cats_dress"/>
 		<Location name="$attributes_bomba_outfits"/>
 		<Location name="$attributes_bomba_dress"/>
+		<Location name="$attributes_misc_outfit"/>
 		<Location name="lost_clothes_here"/>
 		<Location name="portnoi"/>
 		<Location name="portnoi2"/>

locations/_attributes_misc_oufit.qsrc

@@ -0,0 +1,12 @@
+# $attributes_misc_outfit
+
+if ARGS[1] = 1:
+    CloQuality = 1
+    CloThinness = 1
+    CloTopCut = 1
+    CloSkirtShortness = 3
+    CloExhibit = 0
+end
+
+--- $attributes_misc_outfit ---------------------------------
+

locations/_attributes_moncheri.qsrc

@@ -1,4 +1,4 @@
-# $attributes_formal
+# $attributes_moncheri
 !2020/11/24
 ! Note: All items should have the wealthy style applied. No items outside this category should be quality = 7, although not all items in it must be that quality
 if ARGS[1] = 1:
@@ -1136,5 +1136,5 @@ elseif ARGS[1] = 185:
 	CloDress = 1
 end
 
---- $attributes_formal ---------------------------------
+--- $attributes_moncheri ---------------------------------
 

locations/clothing_attributes.qsrc

@@ -98,13 +98,13 @@ elseif $ARGS[0] = 'misc_outfit':
 elseif $ARGS[0] = 'cats_dress':
 	*P FUNC('$attributes_cats_dress', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'cats_outfit':
-	*P FUNC('$attributes_cats_outfit', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_cats_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'flamingos_outfit':
-	*P FUNC('$attributes_flamingos_outfit', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_flamingos_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'flamingos_dress':
 	*P FUNC('$attributes_flamingos_dress', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'coco_outfit':
-	*P FUNC('$attributes_coco_outfit', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_coco_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'coco_dress':
 	*P FUNC('$attributes_coco_dress', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'fashionista':
@@ -134,11 +134,11 @@ elseif $ARGS[0] = 'fancy_burlesque':
 elseif $ARGS[0] = 'dolls_dress':
 	*P FUNC('$attributes_dolls_dress', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'dolls_outfit':
-	*P FUNC('$attributes_dolls_outfit', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_dolls_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'bomba_dress':
 	*P FUNC('$attributes_bomba_dress', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'bomba_outfit':
-	*P FUNC('$attributes_bomba_outfit', $ARGS[0], ARGS[1])
+	*P FUNC('$attributes_bomba_outfits', $ARGS[0], ARGS[1])
 end
 
 if $ARGS[0] ! 'swimwear' and $ARGS[0] ! 'beach' and $ARGS[0] ! 'coat' and $ARGS[0] ! 'exercise':

locations/mirror.qsrc

@@ -205,7 +205,7 @@ if $ARGS[0] = 'start':
 	if falselashesplain > 0: *nl 'False lashes: <<falselashesplain>>' else *nl 'You have no false lashes left.'
 	if falselashesmink > 0: *pl ' | Mink lashes: <<falselashesmink>>' else *pl ' You have no mink lashes left.'
 	*nl
-
+	'<center><img <<$set_imgh>> src="images/pc/activities/routine/2.jpg"></center>'
 	$makeupLight =   'You subtly apply some neutral tones, with a light application of makeup to bring out your natural beauty.'
 	$makeupNatural = 'You apply some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
 	$makeupHeavy =   'You apply some deeper, richer shades of makeup, thick enough to cover most imperfections, while drawing attention to your eyes and lips.'
@@ -726,17 +726,20 @@ if $ARGS[0] = 'kosmetitka_fix':
 		minut += 3		
 		kosmetitka -= 1
 		pcs_makeup = 2
+		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
 		'<center>You carefully fix your makeup and restore the neutral and light tones that bring out your natural beauty.</center>'
 	elseif makeupSetting = 2:
 		minut += 5
 		kosmetitka -= 2
 		pcs_makeup = 3
+		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
 		'<center>You carefully fix your makeup and restore the mildly vibrant tones and colors that cover your minor imperfections and enhance your best features.</center>'			
 	elseif makeupSetting = 3:
 		minut += 10
 		kosmetitka -= 3
 		vidageday -= 1
 		pcs_makeup = 4
+		'<center><img <<$set_imgh>> src="images/pc/activities/routine/4.jpg"></center>'
 		'<center>You carefully fix your makeup and restore the deeper, richer shades, thick enough to cover most imperfections, while drawing attention to your eyes and lips.</center>'
 	end