Browse Source

Merge remote-tracking branch 'hornguy6/master'

KevinSmarts 4 years ago
parent
commit
ae0b47be58
41 changed files with 2699 additions and 1541 deletions
  1. 1 1
      glife.qproj
  2. 2 2
      locations/NewCloShop.qsrc
  3. 0 129
      locations/_attributes_alternative.qsrc
  4. 75 9
      locations/_attributes_average.qsrc
  5. 0 22
      locations/_attributes_burlesque.qsrc
  6. 72 8
      locations/_attributes_cheap.qsrc
  7. 0 113
      locations/_attributes_exercise.qsrc
  8. 29 57
      locations/_attributes_exhibit.qsrc
  9. 141 5
      locations/_attributes_expensive.qsrc
  10. 2 96
      locations/_attributes_fetish.qsrc
  11. 168 168
      locations/_attributes_formal.qsrc
  12. 6 101
      locations/_attributes_office.qsrc
  13. 3 65
      locations/_attributes_school.qsrc
  14. 29 49
      locations/_attributes_uniform.qsrc
  15. 16 3
      locations/_body_image.qsrc
  16. 1 0
      locations/arousal.qsrc
  17. 10 4
      locations/bed2.qsrc
  18. 13 3
      locations/body.qsrc
  19. 9 5
      locations/bras.qsrc
  20. 6 0
      locations/budilnik.qsrc
  21. 1 0
      locations/clothing.qsrc
  22. 97 38
      locations/din_van.qsrc
  23. 2 2
      locations/down.qsrc
  24. 2 2
      locations/exercise.qsrc
  25. 77 525
      locations/foto.qsrc
  26. 645 48
      locations/foto_events.qsrc
  27. 366 54
      locations/foto_models.qsrc
  28. 818 0
      locations/foto_shoot.qsrc
  29. 1 1
      locations/furi.qsrc
  30. 26 2
      locations/gevent.qsrc
  31. 1 0
      locations/gschool_lessonsev1.qsrc
  32. 9 1
      locations/gschool_lessonsev3.qsrc
  33. 1 1
      locations/gschool_sex.qsrc
  34. 4 4
      locations/npcstatic5.qsrc
  35. 9 2
      locations/obj_din.qsrc
  36. 3 0
      locations/panties.qsrc
  37. 6 6
      locations/pornstudio.qsrc
  38. 1 1
      locations/sell_young_clothes.qsrc
  39. 3 4
      locations/shoplifting.qsrc
  40. 42 10
      locations/stat_display.qsrc
  41. 2 0
      locations/wardrobe.qsrc

+ 1 - 1
glife.qproj

@@ -795,10 +795,10 @@
 	</Folder>
 	<Folder name="Photo studio">
 		<Location name="foto"/>
+		<Location name="foto_shoot"/>
 		<Location name="foto_events"/>
 		<Location name="foto_albums"/>
 		<Location name="foto_models"/>
-		<Location name="anastasia_escort"/>
 	</Folder>
 	<Folder name="Crime and Punishment">
 		<Location name="police_station"/>

+ 2 - 2
locations/NewCloShop.qsrc

@@ -309,7 +309,7 @@ if $ARGS[0] = 'panties':
 	:loopfashionista_panties
 		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 75:jump 'loopfashionista_panties'
+	if i <= 79:jump 'loopfashionista_panties'
 end
 
 if $ARGS[0] = 'panties2':
@@ -342,7 +342,7 @@ if $ARGS[0] = 'bras':
 	:loopfashionista_bras
 		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 38:jump 'loopfashionista_bras'
+	if i <= 42:jump 'loopfashionista_bras'
 end
 
 if $ARGS[0] = 'bras2':

+ 0 - 129
locations/_attributes_alternative.qsrc

@@ -5,828 +5,699 @@ if ARGS[1] = 1:
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 10
 elseif ARGS[1] = 2:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloStyle = 2
-	CloExhibit = 15
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 15
 elseif ARGS[1] = 4:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	CloExhibit = 20
 elseif ARGS[1] = 5:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 4
 	CloStyle = 2
-	CloExhibit = 20
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 2
-	CloExhibit = 30
 elseif ARGS[1] = 7:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 4
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 8:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
-	CloExhibit = 15
 elseif ARGS[1] = 9:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 5
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 10
 elseif ARGS[1] = 11:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 12:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 15:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle = 2
-	CloExhibit = 5
 elseif ARGS[1] = 16:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 18:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	CloExhibit = 20
 elseif ARGS[1] = 19:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	CloExhibit = 20
 elseif ARGS[1] = 20:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 0
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 23:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloExhibit = 25
 elseif ARGS[1] = 24:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 25:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle = 2
-	CloExhibit = 30
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 27:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloExhibit = 10
 elseif ARGS[1] = 28:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 29:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
-	CloExhibit = 30
 elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 33:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	CloExhibit = 20
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 5
 	CloStyle = 2
-	CloExhibit = 30
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	CloExhibit = 25
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 25
 elseif ARGS[1] = 39:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 5
 elseif ARGS[1] = 40:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	CloExhibit = 20
 elseif ARGS[1] = 41:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 42:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 1
-	CloExhibit = 25
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 4
-	CloExhibit = 20
 elseif ARGS[1] = 45:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 3
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloStyle = 2
-	CloExhibit = 20
 elseif ARGS[1] = 47:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 5
 elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 50:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 2
-	CloExhibit = 20
 elseif ARGS[1] = 51:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 53:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 54:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle = 2
-	CloExhibit = 30
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 25
 elseif ARGS[1] = 57:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 1
-	CloExhibit = 25
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 59:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 60:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 61:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 62:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 63:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 4
 	CloStyle = 2
-	CloExhibit = 15
 elseif ARGS[1] = 64:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 4
 	CloSkirtShortness = 3
-	CloExhibit = 25
 elseif ARGS[1] = 65:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 66:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 67:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 68:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 4
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 69:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 15
 elseif ARGS[1] = 70:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 71:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle = 4
-	CloExhibit = 30
 elseif ARGS[1] = 72:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 73:
 	CloQuality = 3
 	CloThinness = 5
 	CloBra = 1
 	CloSkirtShortness = 4
 	CloStyle = 4
-	CloExhibit = 25
 elseif ARGS[1] = 74:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 75:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 76:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 77:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 78:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 79:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 80:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 81:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 1
-	CloExhibit = 25
 elseif ARGS[1] = 82:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 10
 elseif ARGS[1] = 83:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 25
 elseif ARGS[1] = 84:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 3
-	CloExhibit = 25
 elseif ARGS[1] = 85:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 86:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 4
-	CloExhibit = 25
 elseif ARGS[1] = 87:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 88:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 5
 elseif ARGS[1] = 89:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 90:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 5
 elseif ARGS[1] = 91:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 25
 elseif ARGS[1] = 92:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 93:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 94:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 4
 	CloSkirtShortness = 3
-	CloExhibit = 25
 elseif ARGS[1] = 95:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 96:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 97:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 5
 elseif ARGS[1] = 98:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 4
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 99:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 100:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 101:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 102:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 103:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 10
 elseif ARGS[1] = 104:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 25
 elseif ARGS[1] = 105:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 106:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 3
-	CloExhibit = 25
 elseif ARGS[1] = 107:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
-	CloExhibit = 15
 elseif ARGS[1] = 108:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 109:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 25
 elseif ARGS[1] = 110:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 111:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 1
 	CloSkirtShortness = 1
-	CloExhibit = 35
 elseif ARGS[1] = 112:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle = 2
-	CloExhibit = 30
 elseif ARGS[1] = 113:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 2
 	CloStyle = 2
-	CloExhibit = 5
 elseif ARGS[1] = 114:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 115:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 1
-	CloExhibit = 25
 elseif ARGS[1] = 116:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 117:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 118:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 119:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 120:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 10
 elseif ARGS[1] = 121:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	CloExhibit = 20
 elseif ARGS[1] = 122:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 5
 elseif ARGS[1] = 123:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 3
-	CloExhibit = 25
 elseif ARGS[1] = 124:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloStyle = 4
-	CloExhibit = 25
 elseif ARGS[1] = 125:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 126:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 10
 elseif ARGS[1] = 127:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 5
 elseif ARGS[1] = 128:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloStyle = 2
-	CloExhibit = 25
 elseif ARGS[1] = 129:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 end
 
 --- $attributes_alternative ---------------------------------

+ 75 - 9
locations/_attributes_average.qsrc

@@ -37,12 +37,14 @@ elseif ARGS[1] = 6:
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 7:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 8:
 	CloQuality = 4
@@ -78,13 +80,15 @@ elseif ARGS[1] = 13:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
-	CloPantsShortness = 4
+	CloBra = 1
+	CloPantsShortness = 5
 	CloExhibit = 25
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 15:
 	CloQuality = 3
@@ -136,19 +140,22 @@ elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
-	CloPantsShortness = 4
+	CloBra = 1
+	CloPantsShortness = 5
 	CloExhibit = 10
 elseif ARGS[1] = 23:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 24:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 25:
 	CloQuality = 4
@@ -161,7 +168,7 @@ elseif ARGS[1] = 26:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloPantsShortness = 4
+	CloPantsShortness = 5
 	CloBimbo = 1
 	CloExhibit = 25
 elseif ARGS[1] = 27:
@@ -193,6 +200,7 @@ elseif ARGS[1] = 31:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 32:
 	CloQuality = 4
@@ -228,7 +236,7 @@ elseif ARGS[1] = 36:
 	CloPantsShortness = 5
 	CloExhibit = 25
 elseif ARGS[1] = 37:
-	CloQuality = 4
+	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
@@ -245,6 +253,7 @@ elseif ARGS[1] = 39:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 40:
 	CloQuality = 4
@@ -370,6 +379,7 @@ elseif ARGS[1] = 59:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle = 5
 	CloExhibit = 5
 elseif ARGS[1] = 60:
@@ -377,6 +387,7 @@ elseif ARGS[1] = 60:
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle = 5
 	CloExhibit = 20
 elseif ARGS[1] = 61:
@@ -384,6 +395,7 @@ elseif ARGS[1] = 61:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle = 5
 	CloExhibit = 20
 elseif ARGS[1] = 62:
@@ -467,18 +479,21 @@ elseif ARGS[1] = 74:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 75:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 4
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 76:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 25
 elseif ARGS[1] = 77:
 	CloQuality = 4
@@ -517,12 +532,14 @@ elseif ARGS[1] = 82:
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 83:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 84:
 	CloQuality = 3
@@ -548,12 +565,14 @@ elseif ARGS[1] = 87:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 88:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 89:
 	CloQuality = 3
@@ -566,6 +585,7 @@ elseif ARGS[1] = 90:
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle = 2
 	CloExhibit = 10
 elseif ARGS[1] = 91:
@@ -636,6 +656,7 @@ elseif ARGS[1] = 101:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle = 2
 	CloExhibit = 20
 elseif ARGS[1] = 102:
@@ -663,6 +684,7 @@ elseif ARGS[1] = 105:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloStyle = 5
 	CloExhibit = 10
 elseif ARGS[1] = 106:
@@ -672,7 +694,7 @@ elseif ARGS[1] = 106:
 	CloSkirtShortness = 4
 	CloExhibit = 20
 elseif ARGS[1] = 107:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 4
@@ -748,7 +770,7 @@ elseif ARGS[1] = 118:
 	CloPantsShortness = 1
 	CloExhibit = 15
 elseif ARGS[1] = 119:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
@@ -783,12 +805,14 @@ elseif ARGS[1] = 124:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 125:
 	CloQuality = 4
 	CloThinness = 4 
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 126:
 	CloQuality = 4
@@ -801,6 +825,7 @@ elseif ARGS[1] = 127:
 	CloThinness = 4 
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 128:
 	CloQuality = 4
@@ -882,6 +907,7 @@ elseif ARGS[1] = 140:
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 141:
 	CloStyle = 4
@@ -890,6 +916,7 @@ elseif ARGS[1] = 141:
 	CloTopCut = 4
 	CloBra = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 25
 elseif ARGS[1] = 142:
@@ -939,6 +966,7 @@ elseif ARGS[1] = 149:
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 150:
 	CloQuality = 4
@@ -988,6 +1016,7 @@ elseif ARGS[1] = 157:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 158:
 	CloQuality = 3
@@ -1052,7 +1081,7 @@ elseif ARGS[1] = 167:
 	CloPantsShortness = 1
 	CloExhibit = 5
 elseif ARGS[1] = 168:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 4
@@ -1092,12 +1121,14 @@ elseif ARGS[1] = 174:
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 175:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 176:
 	CloQuality = 4
@@ -1290,6 +1321,7 @@ elseif ARGS[1] = 206:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 207:
 	CloQuality = 3
@@ -1302,6 +1334,7 @@ elseif ARGS[1] = 208:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 209:
 	CloQuality = 3
@@ -1362,6 +1395,7 @@ elseif ARGS[1] = 218:
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 15
 elseif ARGS[1] = 219:
@@ -1377,6 +1411,7 @@ elseif ARGS[1] = 220:
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 221:
 	CloQuality = 4
@@ -1404,7 +1439,7 @@ elseif ARGS[1] = 224:
 	CloSkirtShortness = 4
 	CloExhibit = 10
 elseif ARGS[1] = 225:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
@@ -1518,6 +1553,7 @@ elseif ARGS[1] = 243:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 244:
 	CloQuality = 3
@@ -1537,6 +1573,7 @@ elseif ARGS[1] = 246:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 20
 elseif ARGS[1] = 247:
@@ -1544,6 +1581,7 @@ elseif ARGS[1] = 247:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 	CloStyle = 4
 elseif ARGS[1] = 248:
@@ -1551,12 +1589,14 @@ elseif ARGS[1] = 248:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 249:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 250:
 	CloQuality = 4
@@ -1575,6 +1615,7 @@ elseif ARGS[1] = 252:
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 253:
 	CloQuality = 3
@@ -1587,6 +1628,7 @@ elseif ARGS[1] = 254:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 1
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 255:
 	CloQuality = 4
@@ -1623,18 +1665,21 @@ elseif ARGS[1] = 260:
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 261:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 262:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 25
 elseif ARGS[1] = 263:
@@ -1642,6 +1687,7 @@ elseif ARGS[1] = 263:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 264:
 	CloQuality = 3
@@ -2153,6 +2199,7 @@ elseif ARGS[1] = 344:
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 1
+	CloDress = 1
 	CloExhibit = 5
 elseif ARGS[1] = 345:
 	CloQuality = 3
@@ -2283,6 +2330,7 @@ elseif ARGS[1] = 365:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 15
 	CloStyle = 4
 elseif ARGS[1] = 366:
@@ -2290,6 +2338,7 @@ elseif ARGS[1] = 366:
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 367:
 	CloQuality = 4
@@ -2302,6 +2351,7 @@ elseif ARGS[1] = 368:
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 369:
 	CloQuality = 4
@@ -2435,6 +2485,7 @@ elseif ARGS[1] = 389:
 	CloTopCut = 3
 	CloBra = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 20
 elseif ARGS[1] = 390:
@@ -2449,6 +2500,7 @@ elseif ARGS[1] = 391:
 	CloTopCut = 3
 	CloBra = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 20
 elseif ARGS[1] = 392:
@@ -2510,6 +2562,7 @@ elseif ARGS[1] = 401:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 15
 elseif ARGS[1] = 402:
@@ -2724,6 +2777,7 @@ elseif ARGS[1] = 436:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 437:
 	CloQuality = 3
@@ -2761,6 +2815,7 @@ elseif ARGS[1] = 442:
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 443:
 	CloQuality = 3
@@ -2821,6 +2876,7 @@ elseif ARGS[1] = 452:
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 453:
 	CloQuality = 3
@@ -2884,7 +2940,7 @@ elseif ARGS[1] = 462:
 	CloPantsShortness = 1
 	CloExhibit = 5
 elseif ARGS[1] = 463:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
@@ -2951,12 +3007,14 @@ elseif ARGS[1] = 473:
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 474:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 475:
 	CloQuality = 3
@@ -2982,6 +3040,7 @@ elseif ARGS[1] = 478:
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 20
 elseif ARGS[1] = 479:
@@ -3013,6 +3072,7 @@ elseif ARGS[1] = 483:
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 484:
 	CloQuality = 4
@@ -3055,6 +3115,7 @@ elseif ARGS[1] = 490:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 491:
 	CloQuality = 3
@@ -3167,6 +3228,7 @@ elseif ARGS[1] = 508:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloExhibit = 20
 	CloStyle = 4
 elseif ARGS[1] = 509:
@@ -3180,6 +3242,7 @@ elseif ARGS[1] = 510:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 511:
 	CloQuality = 3
@@ -3193,18 +3256,21 @@ elseif ARGS[1] = 512:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 513:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 1
+	CloDress = 1
 	CloExhibit = 0
 elseif ARGS[1] = 514:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 15
 elseif ARGS[1] = 515:

+ 0 - 22
locations/_attributes_burlesque.qsrc

@@ -6,133 +6,111 @@ if ARGS[1] = 1:
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloExhibit = 25
 elseif ARGS[1] = 2:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 3:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 25
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	CloExhibit = 30
 elseif ARGS[1] = 5:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 6:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 7:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 1
-	CloExhibit = 15
 elseif ARGS[1] = 8:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 9:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 1
-	CloExhibit = 5
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 11:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloExhibit = 25
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloExhibit = 25
 elseif ARGS[1] = 13:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 14:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 25
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
-	CloExhibit = 35
 elseif ARGS[1] = 16:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 18:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 19:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 21:
 	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
-	CloExhibit = 25
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPanties = 1
-	CloExhibit = 25
 end
 
 --- $attributes_burlesque ---------------------------------

+ 72 - 8
locations/_attributes_cheap.qsrc

@@ -10,6 +10,7 @@ elseif ARGS[1] = 2:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 3:
 	CloQuality = 2
 	CloThinness = 4
@@ -42,21 +43,25 @@ elseif ARGS[1] = 8:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 9:
 	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 5
+	CloDress = 1
 elseif ARGS[1] = 10:
 	CloQuality = 1
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 11:
 	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 12:
 	CloQuality = 1
 	CloThinness = 5
@@ -64,12 +69,14 @@ elseif ARGS[1] = 12:
 	CloSkirtShortness = 6
 	CloBimbo = 1
 	CloStyle = 4
+	CloDress = 1
 elseif ARGS[1] = 13:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 6
 	CloBimbo = 1
+	CloDress = 1
 elseif ARGS[1] = 14:
 	CloQuality = 1
 	CloThinness = 4
@@ -93,6 +100,7 @@ elseif ARGS[1] = 17:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 18:
 	CloQuality = 1
 	CloThinness = 3
@@ -145,6 +153,7 @@ elseif ARGS[1] = 26:
 	CloSkirtShortness = 5
 	CloBimbo = 1
 	CloStyle = 4
+	CloDress = 1
 elseif ARGS[1] = 27:
 	CloQuality = 1
 	CloThinness = 4
@@ -197,6 +206,7 @@ elseif ARGS[1] = 36:
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 5
+	CloOnePiece = 1
 elseif ARGS[1] = 37:
 	CloQuality = 1
 	CloThinness = 3
@@ -274,11 +284,13 @@ elseif ARGS[1] = 51:
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle = 4
+	CloDress = 1
 elseif ARGS[1] = 52:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 53:
 	CloQuality = 1
 	CloThinness = 5
@@ -305,17 +317,20 @@ elseif ARGS[1] = 57:
 	CloTopCut = 2
 	CloSkirtShortness = 6
 	CloStyle = 4
+	CloDress = 1
 elseif ARGS[1] = 58:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle = 4
 elseif ARGS[1] = 59:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloStyle = 4
 elseif ARGS[1] = 60:
 	CloQuality = 2
@@ -334,6 +349,7 @@ elseif ARGS[1] = 62:
 	CloThinness = 3
 	CloTopCut = 3
 	CloPantsShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 63:
 	CloQuality = 1
 	CloThinness = 4
@@ -371,15 +387,17 @@ elseif ARGS[1] = 69:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle = 5
 elseif ARGS[1] = 70:
 	CloQuality = 1
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 71:
 	CloQuality = 1
-	CloThinness = 4
+	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 5
 elseif ARGS[1] = 72:
@@ -387,6 +405,7 @@ elseif ARGS[1] = 72:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 73:
 	CloQuality = 1
 	CloThinness = 5
@@ -447,6 +466,7 @@ elseif ARGS[1] = 83:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle = 5
 elseif ARGS[1] = 84:
 	CloQuality = 2
@@ -603,7 +623,7 @@ elseif ARGS[1] = 112:
 	CloExhibit = 5
 elseif ARGS[1] = 113:
 	CloQuality = 2
-	CloThinness = 4
+	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 5
 	CloExhibit = 20
@@ -619,6 +639,7 @@ elseif ARGS[1] = 115:
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 30
 	CloStyle = 4
 elseif ARGS[1] = 116:
@@ -632,6 +653,7 @@ elseif ARGS[1] = 117:
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 25
 elseif ARGS[1] = 118:
 	CloQuality = 2
@@ -643,7 +665,7 @@ elseif ARGS[1] = 118:
 	CloExhibit = 35
 elseif ARGS[1] = 119:
 	CloQuality = 1
-	CloThinness = 3
+	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloExhibit = 20
@@ -652,6 +674,7 @@ elseif ARGS[1] = 120:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 121:
 	CloQuality = 2
@@ -661,7 +684,7 @@ elseif ARGS[1] = 121:
 	CloExhibit = 0
 elseif ARGS[1] = 122:
 	CloQuality = 2
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloExhibit = 0
@@ -733,6 +756,7 @@ elseif ARGS[1] = 133:
 	CloThinness = 2
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 134:
 	CloStyle = 4
@@ -838,7 +862,7 @@ elseif ARGS[1] = 148:
 	CloExhibit = 25
 elseif ARGS[1] = 149:
 	CloQuality = 2
-	CloThinness = 4
+	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloExhibit = 25
@@ -877,6 +901,7 @@ elseif ARGS[1] = 155:
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 156:
 	CloQuality = 1
@@ -910,6 +935,7 @@ elseif ARGS[1] = 160:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 	CloStyle = 5
 elseif ARGS[1] = 161:
@@ -917,12 +943,14 @@ elseif ARGS[1] = 161:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 162:
 	CloQuality = 2
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 163:
 	CloQuality = 2
@@ -953,24 +981,28 @@ elseif ARGS[1] = 167:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 168:
 	CloQuality = 2
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 169:
 	CloQuality = 1
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 170:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 171:
 	CloQuality = 2
@@ -983,18 +1015,21 @@ elseif ARGS[1] = 172:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 173:
 	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloExhibit = 25
 elseif ARGS[1] = 174:
 	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 25
 elseif ARGS[1] = 175:
@@ -1021,6 +1056,7 @@ elseif ARGS[1] = 178:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 179:
 	CloQuality = 2
@@ -1039,12 +1075,14 @@ elseif ARGS[1] = 181:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 182:
 	CloQuality = 2
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 183:
 	CloStyle = 4
@@ -1052,6 +1090,7 @@ elseif ARGS[1] = 183:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 20
 elseif ARGS[1] = 184:
@@ -1085,12 +1124,14 @@ elseif ARGS[1] = 188:
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 189:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 20
 elseif ARGS[1] = 190:
@@ -1110,6 +1151,7 @@ elseif ARGS[1] = 192:
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 193:
 	CloQuality = 1
@@ -1122,12 +1164,14 @@ elseif ARGS[1] = 194:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 195:
 	CloQuality = 2
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 196:
 	CloQuality = 2
@@ -1214,6 +1258,7 @@ elseif ARGS[1] = 209:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 210:
 	CloQuality = 2
@@ -1226,6 +1271,7 @@ elseif ARGS[1] = 211:
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 15
 	CloStyle = 5
 elseif ARGS[1] = 212:
@@ -1253,6 +1299,7 @@ elseif ARGS[1] = 215:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 216:
 	CloQuality = 2
@@ -1284,6 +1331,7 @@ elseif ARGS[1] = 220:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 221:
 	CloQuality = 2
@@ -1307,7 +1355,7 @@ elseif ARGS[1] = 223:
 	CloExhibit = 25
 elseif ARGS[1] = 224:
 	CloQuality = 2
-	CloThinness = 3
+	CloThinness = 4
 	CloTopCut = 4
 	CloBra = 1
 	CloPantsShortness = 5
@@ -1397,12 +1445,14 @@ elseif ARGS[1] = 238:
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 239:
 	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 240:
 	CloStyle = 5
@@ -1473,6 +1523,7 @@ elseif ARGS[1] = 250:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 251:
 	CloQuality = 2
@@ -1495,7 +1546,7 @@ elseif ARGS[1] = 253:
 	CloExhibit = 15
 elseif ARGS[1] = 254:
 	CloQuality = 1
-	CloThinness = 2
+	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloExhibit = 15
@@ -1510,6 +1561,7 @@ elseif ARGS[1] = 256:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 257:
 	CloQuality = 2
@@ -1548,6 +1600,7 @@ elseif ARGS[1] = 262:
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 263:
 	CloQuality = 2
@@ -1592,6 +1645,7 @@ elseif ARGS[1] = 269:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloStyle = 4
 	CloExhibit = 30
 elseif ARGS[1] = 270:
@@ -1625,6 +1679,7 @@ elseif ARGS[1] = 274:
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 25
 elseif ARGS[1] = 275:
@@ -1657,6 +1712,7 @@ elseif ARGS[1] = 279:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 280:
 	CloQuality = 1
@@ -1688,6 +1744,7 @@ elseif ARGS[1] = 284:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloExhibit = 15
 elseif ARGS[1] = 285:
 	CloQuality = 1
@@ -1721,6 +1778,7 @@ elseif ARGS[1] = 289:
 	CloTopCut = 3
 	CloBra = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloBimbo = 1
 	CloExhibit = 25
 elseif ARGS[1] = 290:
@@ -1728,6 +1786,7 @@ elseif ARGS[1] = 290:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloExhibit = 10
 elseif ARGS[1] = 291:
 	CloQuality = 1
@@ -1741,12 +1800,14 @@ elseif ARGS[1] = 292:
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 25
 elseif ARGS[1] = 293:
 	CloQuality = 1
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 294:
 	CloQuality = 1
@@ -1772,6 +1833,7 @@ elseif ARGS[1] = 297:
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 	CloStyle = 4
 elseif ARGS[1] = 298:
@@ -1811,6 +1873,7 @@ elseif ARGS[1] = 303:
 	CloThinness = 2
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloExhibit = 25
 	CloStyle = 4
 elseif ARGS[1] = 304:
@@ -1825,6 +1888,7 @@ elseif ARGS[1] = 305:
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloExhibit = 20
 elseif ARGS[1] = 306:
 	CloQuality = 1
@@ -1895,7 +1959,7 @@ elseif ARGS[1] = 315:
 	CloExhibit = 30
 elseif ARGS[1] = 316:
 	CloQuality = 1
-	CloThinness = 3
+	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloExhibit = 15

+ 0 - 113
locations/_attributes_exercise.qsrc

@@ -6,244 +6,204 @@ if ARGS[1] = 1:
 	CloThinness = 5
 	CloBra = 1
 	CloPantsShortness = 1
-	CloInhibit = 10
 elseif ARGS[1] = 2:
 	CloQuality = 3
 	CloThinness = 5
 	CloBra = 1
 	CloPantsShortness = 1
-	CloInhibit = 10
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloInhibit = 0
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 4
 	CloPantsShortness = 4
-	CloInhibit = 0
 elseif ARGS[1] = 5:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloInhibit = 0
 elseif ARGS[1] = 6:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
-	CloInhibit = 10
 elseif ARGS[1] = 7:
 	CloQuality = 5
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 4
-	CloInhibit = 15
 elseif ARGS[1] = 8:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloInhibit = 10
 elseif ARGS[1] = 9:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 2
-	CloInhibit = 10
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
-	CloInhibit = 5
 elseif ARGS[1] = 11:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 4
-	CloInhibit = 20
 elseif ARGS[1] = 12:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
-	CloInhibit = 15
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloInhibit = 10
 elseif ARGS[1] = 14:
 	CloQuality = 5
 	CloThinness = 5
 	CloBra = 1
 	CloPantsShortness = 1
-	CloInhibit = 5
 elseif ARGS[1] = 15:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 5
-	CloInhibit = 15
 elseif ARGS[1] = 16:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloInhibit = 10
 elseif ARGS[1] = 17:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 5
-	CloInhibit = 10
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 2
-	CloInhibit = 10
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
-	CloInhibit = 10
 elseif ARGS[1] = 20:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloInhibit = 5
 elseif ARGS[1] = 21:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	CloInhibit = 10
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloInhibit = 5
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloInhibit = 5
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloInhibit = 10
 elseif ARGS[1] = 25:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
-	CloInhibit = 10
 elseif ARGS[1] = 26:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 6
-	CloInhibit = 10
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPanties = 1
 	CloOnePiece = 1
-	CloInhibit = 15
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPanties = 1
 	CloOnePiece = 1
-	CloInhibit = 15
 elseif ARGS[1] = 29:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloInhibit = 0
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
 	CloOnePiece = 1
-	CloInhibit = 30
 elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 5
-	CloInhibit = 25
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloInhibit = 0
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloPanties = 1
 	CloOnePiece = 1
-	CloInhibit = 15
 elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloInhibit = 15
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
 	CloPantsShortness = 1
-	CloInhibit = 10
 elseif ARGS[1] = 36:
 	CloQuality = 5
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 1
-	CloInhibit = 15
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	CloInhibit = 10
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 40:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 4
 	CloBimbo = 1
 	CloBra = 1
@@ -251,256 +211,214 @@ elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 5
 	CloBimbo = 1
 elseif ARGS[1] = 42:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 44:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 45:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
-	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 46:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 47:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 5
 	CloPantsShortness = 4
 elseif ARGS[1] = 48:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 49:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
-	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 51:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 53:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 54:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 55:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 57:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 58:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 20
 	CloPantsShortness = 5
 elseif ARGS[1] = 59:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 2
 elseif ARGS[1] = 61:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 20
 	CloPantsShortness = 5
 	CloBimbo = 1
 elseif ARGS[1] = 62:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 5
 	CloPantsShortness = 2
 elseif ARGS[1] = 63:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 64:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
-	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 65:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
-	CloInhibit = 5
 	CloPantsShortness = 2
 elseif ARGS[1] = 66:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
-	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 67:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloInhibit = 20
 	CloPantsShortness = 5
 elseif ARGS[1] = 68:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
-	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 69:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloInhibit = 10
 	CloPantsShortness = 5
 elseif ARGS[1] = 70:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 20
 	CloPantsShortness = 5
 elseif ARGS[1] = 71:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 15
 	CloPantsShortness = 6
 	CloOnePiece = 1
 elseif ARGS[1] = 72:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 2
 elseif ARGS[1] = 73:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 2
 elseif ARGS[1] = 74:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 75:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 76:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 77:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 78:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 79:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 80:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 81:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 82:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 25
 	CloPantsShortness = 5
 	CloBimbo = 1
 	CloBra = 1
@@ -508,187 +426,156 @@ elseif ARGS[1] = 83:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 84:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
-	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 85:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 1
 elseif ARGS[1] = 86:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
-	CloInhibit = 0
 	CloPantsShortness = 1
 elseif ARGS[1] = 87:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 88:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
-	CloInhibit = 5
 	CloPantsShortness = 1
 elseif ARGS[1] = 89:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 90:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
-	CloInhibit = 5
 	CloPantsShortness = 4
 elseif ARGS[1] = 91:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 92:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 93:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 5
 elseif ARGS[1] = 94:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 5
 elseif ARGS[1] = 95:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 5
 elseif ARGS[1] = 96:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 97:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 98:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 3
 elseif ARGS[1] = 99:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 100:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 101:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 5
 elseif ARGS[1] = 102:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 103:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 104:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 15
 	CloPantsShortness = 4
 elseif ARGS[1] = 105:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 106:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 107:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
-	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 108:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 109:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 110:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 4
 elseif ARGS[1] = 111:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 112:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
-	CloInhibit = 10
 	CloPantsShortness = 1
 elseif ARGS[1] = 113:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
-	CloInhibit = 10
 	CloPantsShortness = 1
 
 end

+ 29 - 57
locations/_attributes_exhibit.qsrc

@@ -6,340 +6,314 @@ if ARGS[1] = 1:
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 6
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 2:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 3:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 5
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 5:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 6
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 5
-	CloExhibit = 40
 elseif ARGS[1] = 8:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 5
-	CloExhibit = 40
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloExhibit = 40
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 1
-	CloExhibit = 40
 elseif ARGS[1] = 13:
 	CloQuality = 6
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 14:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 16:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloExhibit = 40
 elseif ARGS[1] = 17:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	CloExhibit = 40
 elseif ARGS[1] = 18:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 6
-	CloExhibit = 40
+	ClosDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 19:
 	CloQuality = 2
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 24:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 3
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 25:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 26:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 6
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 28:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 29:
 	CloQuality = 6
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 1
-	CloExhibit = 40
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 5
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 34:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 36:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
 	CloPanties = 1
-	CloExhibit = 40
 elseif ARGS[1] = 37:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 5
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	ClosDress = 1
 	CloBimbo = 1
-	CloExhibit = 40
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	CloExhibit = 40
+	ClosDress = 1
 elseif ARGS[1] = 40:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloPanties = 1
-	CloExhibit = 40
 	CloOnePiece = 1
 elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 5
-	CloExhibit = 40
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
 	CloSkirtShortness = 4
-	CloExhibit = 40
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 3
-	CloExhibit = 40
 	CloSkirtShortness = 4
+	ClosDress = 1
 elseif ARGS[1] = 44:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 2
-	CloExhibit = 40
 	CloPantsShortness = 5
 elseif ARGS[1] = 45:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 40
 	CloSkirtShortness = 4
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 40
 	CloSkirtShortness = 5
 	CloBimbo = 1
 elseif ARGS[1] = 47:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 40
 	CloPantsShortness = 1
 elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 40
 	CloSkirtShortness = 5
 elseif ARGS[1] = 49:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 40
 	CloPantsShortness = 5
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 40
 	CloPantsShortness = 4
 elseif ARGS[1] = 51:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 40
 	CloSkirtShortness = 6
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 40
 	CloPantsShortness = 4
 elseif ARGS[1] = 53:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 40
 	CloSkirtShortness = 5
+	ClosDress = 1
 	CloBimbo = 1
 	CloBra = 2
 	CloPanties = 1
@@ -347,27 +321,25 @@ elseif ARGS[1] = 54:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 40
 	CloPantsShortness = 1
 elseif ARGS[1] = 55:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 40
 	CloSkirtShortness = 2
+	ClosDress = 1
 elseif ARGS[1] = 56:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 40
 	CloSkirtShortness = 4
+	ClosDress = 1
 	CloBimbo = 1
 	CloBra = 1
 elseif ARGS[1] = 57:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 40
 	CloPantsShortness = 3
 end
 

File diff suppressed because it is too large
+ 141 - 5
locations/_attributes_expensive.qsrc


+ 2 - 96
locations/_attributes_fetish.qsrc

@@ -6,383 +6,322 @@ if ARGS[1] = 1:
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 15
 elseif ARGS[1] = 2:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	ClopantsShortness = 1
-	CloExhibit = 15
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 20
 elseif ARGS[1] = 4:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 1
-	CloExhibit = 20
 elseif ARGS[1] = 5:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 25
 elseif ARGS[1] = 6:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	ClopantsShortness = 2
-	CloExhibit = 20
 elseif ARGS[1] = 7:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 3
-	CloExhibit = 20
 elseif ARGS[1] = 8:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	ClopantsShortness = 6
-	CloExhibit = 25
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 3
 	CloSkirtShortness = 5
-	CloExhibit = 30
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 15
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 25
 elseif ARGS[1] = 12:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 20
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
-	CloExhibit = 20
 elseif ARGS[1] = 14:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 25
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 5
 	CloBra = 1
 	CloPanties = 1
-	CloExhibit = 30
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 6
 	CloBra = 1
 	CloPanties = 1
-	CloOnePiece = 1
-	CloExhibit = 50
+	CloOnePiece = 10
 elseif ARGS[1] = 17:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 25
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloOnePiece = 1
-	CloExhibit = 15
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 4	
-	CloExhibit = 25
 elseif ARGS[1] = 20:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
-	CloExhibit = 30
 elseif ARGS[1] = 21:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 25
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 5
-	CloExhibit = 20
 elseif ARGS[1] = 23:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 20
 elseif ARGS[1] = 24:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	CloExhibit = 25
 elseif ARGS[1] = 25:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 2
-	CloExhibit = 20
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPanties = 1
-	CloExhibit = 30
 elseif ARGS[1] = 27:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
-	CloExhibit = 30
 elseif ARGS[1] = 28:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPanties = 1
-	CloExhibit = 30
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	CloExhibit = 25
 elseif ARGS[1] = 30:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 25
 elseif ARGS[1] = 31:
 	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 25
 elseif ARGS[1] = 32:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloOnePiece = 1
-	CloExhibit = 25
 elseif ARGS[1] = 33:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloOnePiece = 1
-	CloExhibit = 20
 elseif ARGS[1] = 34:
 	CloQuality = 5
 	CloThinness = 4
 	CloBra = 1
 	CloSkirtShortness = 4
-	CloExhibit = 25
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
-	CloExhibit = 25
 elseif ARGS[1] = 36:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
-	CloExhibit = 30
 elseif ARGS[1] = 37:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
-	CloExhibit = 20
 elseif ARGS[1] = 38:
 	CloQuality = 3
 	CloThinness = 5
 	CloBra = 1
 	CloPanties = 1	
-	CloExhibit = 30
 elseif ARGS[1] = 39:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4	
-	CloExhibit = 25
 elseif ARGS[1] = 40:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
-	CloExhibit = 25
 elseif ARGS[1] = 41:
 	CloQuality = 2
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
 	CloOnePiece = 1
-	CloExhibit = 25
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 4
-	CloExhibit = 30
 elseif ARGS[1] = 43:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloOnePiece = 1
-	CloExhibit = 20
 elseif ARGS[1] = 44:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
-	CloExhibit = 30
 elseif ARGS[1] = 45:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloOnePiece = 1
-	CloExhibit = 20
 elseif ARGS[1] = 46:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloOnePiece = 1
-	CloExhibit = 15
 elseif ARGS[1] = 47:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 20
 elseif ARGS[1] = 48:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloOnePiece = 1	
-	CloExhibit = 20
 elseif ARGS[1] = 49:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
-	CloExhibit = 35
 elseif ARGS[1] = 50:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	CloExhibit = 15
 elseif ARGS[1] = 51:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 20
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloOnePiece = 1
-	CloExhibit = 20
 elseif ARGS[1] = 53:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	CloExhibit = 15
 elseif ARGS[1] = 54:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloExhibit = 15
 elseif ARGS[1] = 55:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 20
 	CloPantsShortness = 1
 elseif ARGS[1] = 56:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 25
 	CloSkirtShortness = 2
 elseif ARGS[1] = 57:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 15
 	CloPantsShortness = 1
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 35
 	CloPanties = 1
 elseif ARGS[1] = 59:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 3
-	CloExhibit = 25
 	CloPantsShortness = 1
 elseif ARGS[1] = 60:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 2
 elseif ARGS[1] = 61:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 45
 	CloBimbo = 1
 	CloBra = 1
 	CloPanties = 1
@@ -390,44 +329,37 @@ elseif ARGS[1] = 62:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 15
 	CloPantsShortness = 1
 elseif ARGS[1] = 63:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 64:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 3
 elseif ARGS[1] = 65:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 25
 	CloPantsShortness = 4
 elseif ARGS[1] = 66:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 30
 	CloPanties = 1
 	CloOnePiece = 1
 elseif ARGS[1] = 67:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 30
 	CloBra = 1
 	CloPanties = 1
 elseif ARGS[1] = 68:
 	CloQuality = 4
 	CloThinness = 5
-	CloExhibit = 40
 	CloBimbo = 1
 	CloBra = 1
 	CloPanties = 1
@@ -436,34 +368,29 @@ elseif ARGS[1] = 69:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 30
 	CloBra = 1
 	CloPanties = 1
 elseif ARGS[1] = 70:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 40
 	CloPantsShortness = 6
 	CloBra = 1
 	CloPanties = 1
 elseif ARGS[1] = 71:
 	CloQuality = 4
 	CloThinness = 5
-	CloExhibit = 40
 	CloBra = 1
 	CloPanties = 1
 elseif ARGS[1] = 72:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 30
 	CloPanties = 1
 	CloOnePiece = 1
 elseif ARGS[1] = 73:
 	CloQuality = 4
-	CloThinness = 6
-	CloExhibit = 50
+	CloThinness = 60
 	CloBimbo = 1
 	CloBra = 2
 	CloPanties = 1
@@ -472,14 +399,12 @@ elseif ARGS[1] = 74:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 25
 	CloPanties = 1
 	CloOnePiece = 1
 elseif ARGS[1] = 75:
 	CloQuality = 6
 	CloThinness = 6
 	CloTopCut = 1
-	CloExhibit = 30
 	CloPantsShortness = 1
 	CloBimbo = 1
 	CloBra = 1
@@ -489,7 +414,6 @@ elseif ARGS[1] = 76:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 3
-	CloExhibit = 30
 	CloPanties = 1
 	CloBra = 1
 	CloOnePiece = 1
@@ -497,7 +421,6 @@ elseif ARGS[1] = 77:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 25
 	CloSkirtShortness = 4
 	CloBimbo = 1
 	CloBra = 1
@@ -505,13 +428,11 @@ elseif ARGS[1] = 78:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 79:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 45
 	CloPanties = 1
 	CloBimbo = 1
 	CloBra = 1
@@ -520,12 +441,10 @@ elseif ARGS[1] = 80:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 81:
 	CloQuality = 3
 	CloThinness = 6
-	CloExhibit = 45
 	CloBimbo = 1
 	CloBra = 2
 	CloPanties = 1
@@ -534,13 +453,11 @@ elseif ARGS[1] = 82:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 1
-	CloExhibit = 30
 	CloSkirtShortness = 4
 	CloBimbo = 1
 elseif ARGS[1] = 83:
 	CloQuality = 5
 	CloThinness = 6
-	CloExhibit = 40
 	CloBimbo = 1
 	CloBra = 1
 	CloPanties = 1
@@ -548,7 +465,6 @@ elseif ARGS[1] = 84:
 	CloQuality = 6
 	CloThinness = 6
 	CloTopCut = 1
-	CloExhibit = 35
 	CloPanties = 1
 	CloBimbo = 1
 	CloOnePiece = 1
@@ -556,52 +472,44 @@ elseif ARGS[1] = 85:
 	CloQuality = 6
 	CloThinness = 6
 	CloTopCut = 1
-	CloExhibit = 35
 	CloPantsShortness = 1
 	CloBimbo = 1
 elseif ARGS[1] = 86:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 25
 	CloPantsShortness = 1
 elseif ARGS[1] = 87:
 	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
-	CloExhibit = 40
 	CloPanties = 1
 	CloOnePiece = 1
 elseif ARGS[1] = 88:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 25
 	CloSkirtShortness = 4
 elseif ARGS[1] = 89:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 30
 	CloPantsShortness = 1
 	CloBimbo = 1
 elseif ARGS[1] = 90:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 30
 	CloPantsShortness = 1
 	CloOnePiece = 1
 elseif ARGS[1] = 91:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 40
 	CloPanties = 1
 elseif ARGS[1] = 92:
 	CloQuality = 6
 	CloThinness = 6
-	CloExhibit = 40
 	CloBimbo = 1
 	CloBra = 1
 	CloPanties = 1
@@ -609,13 +517,11 @@ elseif ARGS[1] = 93:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 30
 	CloPanties = 1
 	CloOnePiece = 1
 elseif ARGS[1] = 94:
 	CloQuality = 4
 	CloThinness = 5
-	CloExhibit = 40
 	CloBimbo = 1
 	CloBra = 1
 	CloPanties = 1

+ 168 - 168
locations/_attributes_formal.qsrc

@@ -6,1042 +6,1042 @@ if ARGS[1] = 1:
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
+	CloDress = 1
 elseif ARGS[1] = 2:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
-	CloExhibit = 15
+	CloDress = 1
 elseif ARGS[1] = 3:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
+	CloDress = 1
 elseif ARGS[1] = 4:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 1
-	CloExhibit = 10
+	CloDress = 1
 elseif ARGS[1] = 5:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 25
+	CloDress = 1
 elseif ARGS[1] = 6:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 25
+	CloDress = 1
 elseif ARGS[1] = 7:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 15
+	CloDress = 1
 elseif ARGS[1] = 8:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
-	CloExhibit = 30
+	CloDress = 1
 elseif ARGS[1] = 9:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 5
-	CloExhibit = 30
+	CloDress = 1
 elseif ARGS[1] = 10:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 1
-	CloExhibit = 15
+	CloDress = 1
 elseif ARGS[1] = 11:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 1
-	CloExhibit = 15
+	CloDress = 1
 elseif ARGS[1] = 12:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 1
-	CloExhibit = 5
+	CloDress = 1
 elseif ARGS[1] = 13:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 1
-	CloExhibit = 5
+	CloDress = 1
 elseif ARGS[1] = 14:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 1
-	CloExhibit = 25
+	CloDress = 1
 elseif ARGS[1] = 15:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 4
-	CloExhibit = 25
+	CloDress = 1
 elseif ARGS[1] = 16:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 1
-	CloExhibit = 15
+	CloDress = 1
 elseif ARGS[1] = 17:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 20
+	CloDress = 1
 elseif ARGS[1] = 18:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 20
+	CloDress = 1
 elseif ARGS[1] = 19:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
+	CloDress = 1
 elseif ARGS[1] = 20:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	CloExhibit = 20
+	CloDress = 1
 elseif ARGS[1] = 21:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 1
-	CloExhibit = 5
+	CloDress = 1
 elseif ARGS[1] = 22:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 1
-	CloExhibit = 25
+	CloDress = 1
 elseif ARGS[1] = 23:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 1
-	CloExhibit = 5
+	CloDress = 1
 elseif ARGS[1] = 24:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 15
+	CloDress = 1
 elseif ARGS[1] = 25:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
+	CloDress = 1
 elseif ARGS[1] = 26:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
+	CloDress = 1
 elseif ARGS[1] = 27:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 1
-	CloExhibit = 10
+	CloDress = 1
 elseif ARGS[1] = 28:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 1
-	CloExhibit = 10
+	CloDress = 1
 elseif ARGS[1] = 29:
 	CloQuality = 6
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 1
-	CloExhibit = 25
+	CloDress = 1
 elseif ARGS[1] = 30:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 1
-	CloExhibit = 10
+	CloDress = 1
 elseif ARGS[1] = 31:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
+	CloDress = 1
 elseif ARGS[1] = 32:
 	CloQuality = 6
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 15
+	CloDress = 1
 elseif ARGS[1] = 33:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 1
-	CloExhibit = 10	
+	CloDress = 1	
 elseif ARGS[1] = 34:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 35:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 36:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 37:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 38:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 39:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 20
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 40:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 10
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 41:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloBimbo = 1
 	CloBra = 1
 elseif ARGS[1] = 42:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 20
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 43:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 44:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 45:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 46:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloBimbo = 1
 	CloBra = 1
 elseif ARGS[1] = 47:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 15
 	CloPantsShortness = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 48:
 	CloQuality = 7
 	CloThinness = 2
 	CloTopCut = 2
-	CloExhibit = 10
 	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 49:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 50:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 51:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 52:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 53:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 54:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 55:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 2
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 56:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 57:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 58:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloPantsShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 59:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 60:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 61:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 62:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 63:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 64:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 65:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloBimbo = 1
 	CloBra = 1
 elseif ARGS[1] = 66:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 67:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 68:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 69:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 70:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 71:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloPantsShortness = 1
+	CloDress = 1
 	CloBra = 1
 elseif ARGS[1] = 72:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 73:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 74:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 75:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 76:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 77:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 3
-	CloExhibit = 10
 	CloPantsShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 78:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 79:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 20
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloBimbo = 1
 	CloBra = 1
 elseif ARGS[1] = 80:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 81:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 82:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 83:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 84:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 85:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 86:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 87:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
 	CloPantsShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 88:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 89:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 90:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 91:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 92:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 93:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 94:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 95:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 96:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 97:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 98:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 99:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 100:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 101:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 102:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 103:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 104:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 105:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 106:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 107:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 108:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 109:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 110:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 111:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 112:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloPantsShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 113:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloPantsShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 114:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 115:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 116:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 4
+	CloDress = 1
 elseif ARGS[1] = 117:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 118:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 119:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 120:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 121:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 122:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 123:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 124:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 125:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 126:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 127:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 	CloBra = 1
 elseif ARGS[1] = 128:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 	CloBra = 1
 elseif ARGS[1] = 129:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
 	CloPantsShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 130:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 131:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 132:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 133:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 134:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 135:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 136:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 137:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 138:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloPantsShortness = 5
+	CloDress = 1
 	CloBimbo = 1
 	CloBra = 1
 elseif ARGS[1] = 139:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 140:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 141:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 3
-	CloExhibit = 20
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloBimbo = 1
 	CloBra = 1
 elseif ARGS[1] = 142:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloPantsShortness = 5
+	CloDress = 1
 	CloOnePiece = 1
 elseif ARGS[1] = 143:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 144:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 145:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 146:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 147:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 1
-	CloExhibit = 20
 	CloSkirtShortness = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 148:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 149:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 150:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 3
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 151:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 152:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 153:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 154:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 3
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 155:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 156:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 157:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 1
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 158:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 159:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 3
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 160:
 	CloQuality = 7
 	CloThinness = 5
 	CloTopCut = 4
-	CloExhibit = 20
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloBimbo = 1
 elseif ARGS[1] = 161:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 elseif ARGS[1] = 162:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 163:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 164:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 1
-	CloExhibit = 15
 	CloSkirtShortness = 2
+	CloDress = 1
 elseif ARGS[1] = 165:
 	CloQuality = 7
 	CloThinness = 4
 	CloTopCut = 2
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 elseif ARGS[1] = 166:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 3
-	CloExhibit = 10
 	CloSkirtShortness = 1
+	CloDress = 1
 	CloBra = 1
 elseif ARGS[1] = 167:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloBra = 1
 elseif ARGS[1] = 168:
 	CloQuality = 7
 	CloThinness = 3
 	CloTopCut = 3
-	CloExhibit = 15
 	CloSkirtShortness = 1
+	CloDress = 1
 end
 
 --- $attributes_formal ---------------------------------

+ 6 - 101
locations/_attributes_office.qsrc

@@ -6,7 +6,6 @@ if ARGS[1] = 1:
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 15
 elseif ARGS[1] = 2:
 	CloQuality = 4
 	CloThinness = 4
@@ -14,168 +13,144 @@ elseif ARGS[1] = 2:
 	CloSkirtShortness = 3
 	CloBimbo = 1
 	CloStyle = 4
-	CloExhibit = 15
 elseif ARGS[1] = 3:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 10
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 2
 	CloBimbo = 1
-	CloExhibit = 25
 elseif ARGS[1] = 5:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 6:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
-	CloExhibit = 30
 elseif ARGS[1] = 7:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 8:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloExhibit = 15
 elseif ARGS[1] = 9:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 10:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 20
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 15
+	CloDress = 1
 elseif ARGS[1] = 13:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
+	CloDress = 1
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
 	CloBimbo = 1
-	CloExhibit = 30
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloBimbo = 1
-	CloExhibit = 30
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 17:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 5
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	CloExhibit = 25
 elseif ARGS[1] = 20:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
-	CloExhibit = 15
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 23:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 25:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 26:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 10
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloExhibit = 30
 elseif ARGS[1] = 29:
 	CloQuality = 3
 	CloThinness = 4
@@ -183,450 +158,380 @@ elseif ARGS[1] = 29:
 	CloSkirtShortness = 6
 	CloBimbo = 1
 	CloStyle = 4
-	CloExhibit = 35
 elseif ARGS[1] = 30:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 31:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 10
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
+	CloDress = 1
 elseif ARGS[1] = 36:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 10
 elseif ARGS[1] = 37:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
 	CloStyle = 4
-	CloExhibit = 10
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	CloExhibit = 20
 elseif ARGS[1] = 39:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 5
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 25
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
 	CloPantsShortness = 1
-	CloExhibit = 30
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloExhibit = 25
 elseif ARGS[1] = 45:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 47:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 15
 elseif ARGS[1] = 48:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloBimbo = 1
-	CloExhibit = 10
 elseif ARGS[1] = 50:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 0
 elseif ARGS[1] = 51:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 52:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 53:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 2
 	CloBimbo = 1
-	CloExhibit = 15
 elseif ARGS[1] = 54:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 55:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 56:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 57:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 58:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 0
 elseif ARGS[1] = 59:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 62:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 63:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 64:
 	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 65:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloExhibit = 15
 elseif ARGS[1] = 66:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
+	CloDress = 1
 elseif ARGS[1] = 67:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 2
 	CloBimbo = 1
-	CloExhibit = 25
 elseif ARGS[1] = 68:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloExhibit = 20
 elseif ARGS[1] = 69:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 70:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 0
 elseif ARGS[1] = 71:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 72:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 73:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 74:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 75:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 76:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 77:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 2
 	CloBimbo = 1
-	CloExhibit = 15
 elseif ARGS[1] = 78:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 79:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	CloExhibit = 20
 elseif ARGS[1] = 80:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 81:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 82:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 10
 elseif ARGS[1] = 83:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 84:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloExhibit = 0
 elseif ARGS[1] = 85:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	CloExhibit = 20
 elseif ARGS[1] = 86:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 87:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloBimbo = 1
-	CloExhibit = 15
 elseif ARGS[1] = 88:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloExhibit = 5
 elseif ARGS[1] = 89:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 90:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 91:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 92:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 93:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloExhibit = 5
+	CloDress = 1
 elseif ARGS[1] = 94:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 95:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 96:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 97:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 elseif ARGS[1] = 98:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloExhibit = 5
 elseif ARGS[1] = 99:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 2
 	CloBimbo = 1
-	CloExhibit = 25
 elseif ARGS[1] = 100:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	CloExhibit = 20
 elseif ARGS[1] = 101:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloExhibit = 10
 end
 
 --- $attributes_office ---------------------------------

+ 3 - 65
locations/_attributes_school.qsrc

@@ -7,14 +7,12 @@ if ARGS[1] = 1:
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 2:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	CloExhibit = 15
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 4
@@ -22,7 +20,6 @@ elseif ARGS[1] = 3:
 	CloSkirtShortness = 5
 	CloBimbo = 1
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 4:
 	CloQuality = 3
 	CloThinness = 4
@@ -30,7 +27,6 @@ elseif ARGS[1] = 4:
 	CloSkirtShortness = 5
 	CloBimbo = 1
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 5:
 	CloQuality = 4
 	CloThinness = 5
@@ -39,14 +35,12 @@ elseif ARGS[1] = 5:
 	CloBimbo = 1
 	CloStyle = 4
 	CloStyle2 = 4
-	CloExhibit = 35
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloStyle2 = 4
-	CloExhibit = 0	
+	CloStyle2 = 4	
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 4
@@ -54,14 +48,12 @@ elseif ARGS[1] = 7:
 	CloSkirtShortness = 5
 	CloBimbo = 1
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 8:
 	CloQuality = 3
 	CloThinness = 5
 	CloBra = 1
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloExhibit = 35
 	CloStyle2 = 4
 	CloStyle = 4
 elseif ARGS[1] = 9:
@@ -70,7 +62,6 @@ elseif ARGS[1] = 9:
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloBimbo = 1
-	CloExhibit = 30
 	CloStyle2 = 4
 	CloStyle = 4
 elseif ARGS[1] = 10:
@@ -79,7 +70,6 @@ elseif ARGS[1] = 10:
 	CloTopCut = 4
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	CloExhibit = 35
 	CloStyle = 4
 	CloStyle2 = 4
 elseif ARGS[1] = 11:
@@ -88,21 +78,18 @@ elseif ARGS[1] = 11:
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 12:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 13:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 14:
 	CloQuality = 3
 	CloThinness = 5
@@ -110,14 +97,12 @@ elseif ARGS[1] = 14:
 	CloSkirtShortness = 4
 	CloBimbo = 1
 	CloStyle2 = 4
-	CloExhibit = 25
 elseif ARGS[1] = 15:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloStyle2 = 4
 	CloSkirtShortness = 5
-	CloExhibit = 30
 elseif ARGS[1] = 16:
 	CloQuality = 3
 	CloThinness = 4
@@ -125,63 +110,54 @@ elseif ARGS[1] = 16:
 	CloSkirtShortness = 4
 	CloBimbo = 1
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 21:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 24:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 25:
 	CloQuality = 3
 	CloThinness = 4
@@ -189,118 +165,101 @@ elseif ARGS[1] = 25:
 	CloSkirtShortness = 4
 	CloBimbo = 1
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	CloExhibit = 10
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloExhibit = 20
 elseif ARGS[1] = 35:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	CloExhibit = 10
 elseif ARGS[1] = 36:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	CloExhibit = 10
 elseif ARGS[1] = 37:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	CloExhibit = 10
 elseif ARGS[1] = 38:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	CloExhibit = 10
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloStyle2 = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloStyle2 = 4
-	CloExhibit = 30
 	CloSkirtShortness = 5
 	CloBimbo = 1
 elseif ARGS[1] = 42:
@@ -308,21 +267,18 @@ elseif ARGS[1] = 42:
 	CloThinness = 5
 	CloTopCut = 3
 	CloStyle2 = 4
-	CloExhibit = 25
 	CloSkirtShortness = 4
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloStyle2 = 4
-	CloExhibit = 30
 	CloSkirtShortness = 5
 	CloBimbo = 1
 elseif ARGS[1] = 45:
@@ -330,7 +286,6 @@ elseif ARGS[1] = 45:
 	CloThinness = 3
 	CloTopCut = 3
 	CloStyle2 = 4
-	CloExhibit = 30
 	CloSkirtShortness = 5
 	CloBimbo = 1
 elseif ARGS[1] = 46:
@@ -338,7 +293,6 @@ elseif ARGS[1] = 46:
 	CloThinness = 3
 	CloTopCut = 2
 	CloStyle2 = 4
-	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 47:
 	CloQuality = 4
@@ -346,33 +300,28 @@ elseif ARGS[1] = 47:
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloExhibit = 30
 elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloStyle2 = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 51:
 	CloQuality = 4
 	CloThinness = 4
 	CloStyle2 = 4
-	CloExhibit = 35
 	CloSkirtShortness = 4
 	CloBimbo = 1
 	CloBra = 1
@@ -381,71 +330,61 @@ elseif ARGS[1] = 52:
 	CloThinness = 2
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 53:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 54:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloStyle2 = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 55:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 56:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloStyle2 = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
 	CloBimbo = 1
 elseif ARGS[1] = 57:
 	CloQuality = 4
-	CloThinness = 3
+	CloThinness = 5
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 59:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 10
 	CloSkirtShortness = 3
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloStyle2 = 4
-	CloExhibit = 20
 	CloSkirtShortness = 4
 	CloBimbo = 1
 elseif ARGS[1] = 62:
@@ -453,7 +392,6 @@ elseif ARGS[1] = 62:
 	CloThinness = 1
 	CloTopCut = 1
 	CloStyle2 = 4
-	CloExhibit = 10
 	CloSkirtShortness = 3
 end
 

+ 29 - 49
locations/_attributes_uniform.qsrc

@@ -6,15 +6,15 @@ if ARGS[1] = 1:
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 20
 elseif ARGS[1] = 2:
 	CloQuality = 5
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
+	CloDress = 1
 	CloBimbo = 1
-	CloExhibit = 35
 	CloStyle2 = 1
 elseif ARGS[1] = 3:
 	CloQuality = 4
@@ -22,22 +22,21 @@ elseif ARGS[1] = 3:
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloExhibit = 35
 	CloStyle2 = 1
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloSkirtShortness = 6
+	CloDress = 1
 	CloBimbo = 1
-	CloExhibit = 35
 	CloStyle2 = 1
 elseif ARGS[1] = 5:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	CloExhibit = 30
+	CloDress = 1
 	CloStyle2 = 1
 elseif ARGS[1] = 6:
 	CloQuality = 5
@@ -45,7 +44,6 @@ elseif ARGS[1] = 6:
 	CloTopCut = 3
 	CloSkirtShortness = 6
 	CloBimbo = 1
-	CloExhibit = 35
 	CloStyle2 = 1
 elseif ARGS[1] = 7:
 	CloQuality = 4
@@ -54,219 +52,203 @@ elseif ARGS[1] = 7:
 	CloSkirtShortness = 4
 	CloBimbo = 1
 	CloStyle2 = 2
-	CloExhibit = 20
 elseif ARGS[1] = 8:
 	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle2 = 2
-	CloExhibit = 5
 elseif ARGS[1] = 9:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle2 = 2
-	CloExhibit = 20
 elseif ARGS[1] = 10:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle2 = 2
-	CloExhibit = 0
 elseif ARGS[1] = 11:
 	CloQuality = 2
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 0
 elseif ARGS[1] = 12:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 5
 elseif ARGS[1] = 13:
 	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle2 = 2
-	CloExhibit = 5
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle2 = 2
-	CloExhibit = 20
 elseif ARGS[1] = 15:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle2 = 2
-	CloExhibit = 5
 elseif ARGS[1] = 16:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle2 = 2
-	CloExhibit = 5
 elseif ARGS[1] = 17:
 	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle2 = 2
-	CloExhibit = 5
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloBimbo = 1
 	CloStyle2 = 1
-	CloExhibit = 30
 elseif ARGS[1] = 19:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloBimbo = 1
 	CloStyle2 = 1
-	CloExhibit = 30
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 5
 elseif ARGS[1] = 21:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 5
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 0
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 5
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 5
 elseif ARGS[1] = 25:
 	CloQuality = 5
 	CloThinness = 2
 	CloBra = 1
 	CloPantsShortness = 5
 	CloStyle2 = 3
-	CloExhibit = 30
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 2
 	CloBra = 1
 	CloPanties = 1
 	CloStyle2 = 3
-	CloExhibit = 30
 elseif ARGS[1] = 27:
 	CloQuality = 3
 	CloThinness = 2
 	CloBra = 1
 	CloPanties = 1
 	CloStyle2 = 3
-	CloExhibit = 30
 elseif ARGS[1] = 28:
 	CloQuality = 2
 	CloThinness = 2
 	CloBra = 1
 	CloSkirtShortness = 6
 	CloStyle2 = 3
-	CloExhibit = 30
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 2
 	CloBra = 1
 	CloSkirtShortness = 6
 	CloStyle2 = 3
-	CloExhibit = 35
 elseif ARGS[1] = 30:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle2 = 3
-	CloExhibit = 25
 elseif ARGS[1] = 31:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloPanties = 1
 	CloStyle2 = 3
-	CloExhibit = 30
 elseif ARGS[1] = 32:
 	CloQuality = 2
 	CloThinness = 4
 	CloBra = 1
 	CloPantsShortness = 5
 	CloStyle2 = 3
-	CloExhibit = 30
 elseif ARGS[1] = 33:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 10
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 20
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 20
 elseif ARGS[1] = 36:
 	CloQuality = 3
 	CloThinness = 5
 	CloBra = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 1
-	CloExhibit = 30
 elseif ARGS[1] = 37:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 25
 elseif ARGS[1] = 38:
 	CloQuality = 3
 	CloThinness = 5
@@ -274,86 +256,84 @@ elseif ARGS[1] = 38:
 	CloBra = 1
 	CloPanties = 1
 	CloStyle2 = 1
-	CloExhibit = 35
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloStyle2 = 3
-	CloExhibit = 30
 elseif ARGS[1] = 40:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
+	CloDress = 1
 	CloStyle2 = 2
-	CloExhibit = 10
 elseif ARGS[1] = 41:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 2
 	CloSkirtShortness = 6
+	CloDress = 1
 	CloBimbo = 1
 	CloStyle2 = 1
-	CloExhibit = 35
 elseif ARGS[1] = 42:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 20
 elseif ARGS[1] = 43:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 6
+	CloDress = 1
 	CloBimbo = 1
 	CloStyle2 = 1
-	CloExhibit = 35
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 30
 elseif ARGS[1] = 45:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 5
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 30
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 2
-	CloExhibit = 10
 elseif ARGS[1] = 47:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle2 = 2
-	CloExhibit = 20
 elseif ARGS[1] = 48:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle2 = 1
-	CloExhibit = 20
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloDress = 1
 	CloStyle2 = 2
-	CloExhibit = 20
 end
 
 --- $attributes_uniform ---------------------------------

+ 16 - 3
locations/_body_image.qsrc

@@ -60,6 +60,9 @@ if $ARGS[0] = 'clothes':
 	if $clothingworntype = 'nude' and towel = 1 and $pantyworntype = 'none':
 		$RESULT = 'images/pc/clothing/towel.jpg'
 		$body_image_msg += 'You are only wearing a towel'
+	elseif $clothingworntype = 'nude' and robe = 1:
+		$RESULT = 'images/pc/clothing/robe.jpg'
+		$body_image_msg += 'You are only wearing a robe'
 	elseif $clothingworntype = 'nude' and $pantyworntype ! 'none':
 		$RESULT = 'images/pc/clothing/nude.jpg'
 		$body_image_msg += 'You are only wearing panties'
@@ -110,10 +113,20 @@ if $ARGS[0] = 'panties':
 			if pubestyle = 8: $RESULT = $pubeimage
 			if pubestyle ! 8: $RESULT = 'images/pc/body/pussy/spussy.jpg'
 		elseif pcs_pubes > 20 and pcs_pubes <= 25:
-			$RESULT = 'images/pc/body/pussy/shave/s_bush1.jpg'
-		elseif pcs_pubes > 25 and pcs_pubes <= 30:
+			if pubestyle = 9: 
+				$RESULT = 'images/pc/body/pussy/spussy.jpg'
+			elseif pubestyle = 13:
+				$RESULT = 'images/pc/body/pussy/shave/mb.jpg'
+			elseif pubestyle = 13:
+				$RESULT = 'images/pc/body/pussy/shave/bstrip.jpg'
+			elseif pubestyle = 14:
+				$RESULT = 'images/pc/body/pussy/shave/rectangle.jpg'
+			else
+				$RESULT = 'images/pc/body/pussy/shave/s_bush1.jpg'
+			end
+		elseif pcs_pubes > 25 and pcs_pubes <= 40:
 			$RESULT = 'images/pc/body/pussy/hpussy.jpg'
-		elseif pcs_pubes >= 31:
+		elseif pcs_pubes >= 40:
 			$RESULT = 'images/pc/body/pussy/hrypussy.jpg'
 		end
 		$body_image_msg += 'You are not wearing any panties.'

+ 1 - 0
locations/arousal.qsrc

@@ -590,6 +590,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 				stim['kink'] += rape['exp']
 				stim['pref'] += rape['pref']
 				stim['kinkno'] += 1
+				rapeday = daystart
 				if temp_unaware = 1:
 					stim['hidden_rape'] = 1
 				else

+ 10 - 4
locations/bed2.qsrc

@@ -135,8 +135,12 @@ if $ARGS[0] = 'sleep':
 	*nl
 	if budilnikOn = 1 and ((hour => timer and week + 1 < 6) or (hour < timer and week < 6)):
 		'You run through your regular nightly routine, setting your alarm for <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b>, you undress, and prepare for sleep:'
-	elseif budilnikOn = 1:
+	elseif budilnikOn = 1 and alarm_holiday = 1 and (week > 5 or kanikuli > 0):
+		'You run through your regular nightly routine, setting your alarm for <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b>, you undress, and prepare for sleep:'
+	elseif budilnikOn = 1 and (week > 5):
 		'You run through your regular nightly routine, setting your alarm for <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b>, you undress, and prepare for sleep:'
+	elseif budilnikOn = 1:
+		'You run through your regular nightly routine, setting your alarm for <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b>, you undress, and prepare for sleep:'
 	else
 		'You run through your regular nightly routine, not bothering to setting your alarm, you undress, and prepare for sleep:'
 	end
@@ -302,10 +306,12 @@ if $ARGS[0] = 'dream':
 	end
 
 	alarm_now = hour * 60 + minut
-	if week < 6:
-		alarm_time = timer * 60 + timerM
-	else
+	if alarm_holiday = 1 and (kanikuli > 0 or week > 5):
+		alarm_time = timerEnd * 60 + timerEndM
+	elseif week > 5:
 		alarm_time = timerEnd * 60 + timerEndM
+	else
+		alarm_time = timer * 60 + timerM
 	end
 	alarm_set = alarm_time - rand(1,5)
 	if alarm_set <0:

+ 13 - 3
locations/body.qsrc

@@ -2104,7 +2104,17 @@ if lashair = 0:
 		$pcdesc_pubeswordy = 'trimmed, well-kept'
 	elseif pcs_pubes <= 25:
 		lobkoef = 0
-		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/hpussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+		if pubestyle = 9:
+			$pcs_pubes = 'You have neatly trimmed section of hair around your '+iif(pubestyle = 9,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/s_bush1.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
+		elseif pubestyle = 12:
+			$pcs_pubes = 'You have cute little patch of bush at the top of your '+iif(pubestyle = 9,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/shave/mb.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
+		elseif pubestyle = 13:
+			$pcs_pubes = 'You have tidy strip of bush covering your '+iif(pubestyle = 9,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/shave/bstrip.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
+		elseif pubestyle = 14:
+			$pcs_pubes = 'You have neatly trimmed rectangle of hair just above your '+iif(pubestyle = 9,'<a href="exec:view''<<$pubeimage>>''">pussy</a>','<a href="exec:view''images/pc/body/pussy/shave/rectangle.jpg''">pussy</a>')+'. <<$pirspiz>><br><<$clitsize>>'
+		else
+			$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/hpussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+		end
 		rand_pubes = rand(0,2)
 		if rand_pubes = 0:
 			$pcdesc_pubesrandom = 'mildly-furred'
@@ -2117,7 +2127,7 @@ if lashair = 0:
 		$pcdesc_pubeswordy = 'bushy, thick'
 	elseif pcs_pubes <= 30:
 		lobkoef = 0
-		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/shave/s_bush1.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+		$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''images/pc/body/pussy/hpussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)
 		if rand_pubes = 0:
 			$pcdesc_pubesrandom = 'furred'
@@ -2128,7 +2138,7 @@ if lashair = 0:
 		end
 		$pcdesc_pubes = 'bushy'
 		$pcdesc_pubeswordy = 'bushy, thick'
-	elseif pcs_pubes >= 31:
+	elseif pcs_pubes >= 40:
 		lobkoef = 0
 		$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''images/pc/body/pussy/hrypussy.jpg''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
 		rand_pubes = rand(0,2)

+ 9 - 5
locations/bras.qsrc

@@ -184,12 +184,16 @@ if $ARGS[0] = 'view_bra_item':
 			else
 				if metka_bras = 0:
 					act 'Wear':
-						gs 'bras', 'wear', $ARGS[2], ARGS[3]
-
-						if $ARGS[1] = 'wardrobe':
-							gt 'wardrobe', 'start'
+						if CloBra = 1:
+							msg'You cannot wear a bra with this top'
 						else
-							gt $loc, $metka
+							gs 'bras', 'wear', $ARGS[2], ARGS[3]
+
+							if $ARGS[1] = 'wardrobe':
+								gt 'wardrobe', 'start'
+							else
+								gt $loc, $metka
+							end
 						end
 					end
 				end

+ 6 - 0
locations/budilnik.qsrc

@@ -22,6 +22,12 @@ if $ARGS[0] = 'start':
 	'<center><b><a href="exec:gt ''budilnik'', ''0''">0</a></b></center>'
 	'<center><b><a href="exec: bud_weekend = 0 & gt ''budilnik'', ''Reset''">Reset (week)</a> <a href="exec: bud_weekend = 0 & gt ''budilnik'', ''Time''">Set this time for the week</a></b></center>' 
 	'<center><b><a href="exec:  bud_weekend = 1 & gt ''budilnik'', ''Reset''">Reset (weekend)</a> <a href="exec: bud_weekend = 1 & gt ''budilnik'', ''Time''">Set this time for the weekend</a></b></center>'
+	if Storyline > 0 and alarm_holiday = 0:
+		'<center><b><a href="exec:  alarm_holiday = 1 & gt ''budilnik'', ''start''">Use weekend alarm for holidays</a></b></center>'
+	elseif Storyline > 0 and alarm_holiday = 1:
+		'<center><b><a href="exec:  alarm_holiday = 0 & gt ''budilnik'', ''start''">Stop using weekend alarm for holidays</a></b></center>'
+	end
+
 	
 	*nl
 	if budilnikOn = 0:

+ 1 - 0
locations/clothing.qsrc

@@ -865,6 +865,7 @@ if $ARGS[0] = 'wear':
 
 	if PCloBra = 1:
 		PXCloTopCut = 400
+		$braworntype = 'none'
 	elseif PCloBra = 2:
 		PXCloTopCut = 500
 	end

+ 97 - 38
locations/din_van.qsrc

@@ -259,32 +259,64 @@ $bath = {
 
 $brit = {
 	if shave_menu = 1  and stanok > 1:
-		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (pubestyle >= 2 and pubestyle <=7 and pcs_pubes > 11) or (pubestyle = 8 and pcs_pubes > 11) or (pubestyle = 9 and pcs_pubes > 20) or (pubestyle = 10 and pcs_pubes > 26):
-			if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or ((pubestyle >= 2 and pubestyle <= 7) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or (pubestyle = 9 and pcs_pubes >= 25) or (pubestyle = 10 and pcs_pubes >= 30):
-				act 'Shave yourself (0:15)':
+		if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or ((pubestyle = 9 or pubestyle >= 13) and pcs_pubes > 25) or (pubestyle = 10 and pcs_pubes >= 40) or (pubestyle = 11 and pcs_pubes > 10):
+			act 'Shave yourself (0:15)':
+				menu_off = 1
+				*clr & cla
+				minut += 15
+				pcs_leghair = 0
+				if pubestyle = 1:
+					pcs_pubes = 0
+				elseif (pubestyle >= 2 and pubestyle <=7) or pubestyle = 12:
+					pcs_pubes = 11
+				elseif pubestyle = 8:
+					pcs_pubes = 16
+				elseif pubestyle = 9 or pubestyle >= 13:
+					pcs_pubes = 21
+				elseif pubestyle = 10 and pcs_pubes >= 40:
+					pcs_pubes = 26
+				elseif pubestyle = 11 and pcs_pubes > 10:
+					pcs_pubes = 0
+				end
+				pcs_horny += 5
+				stanok -= 2
+				if obdysh = 1 and rand(0, 5) = 0:gt 'vann', 'brit1'
+				if $loc ='gadbana':
+					'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
+				else
+					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
+				end
+				*nl
+				if daystart < 10 and StoryLine = 0 and ntstart = 0:
+					'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
+					'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. So in the end you get a pretty decent job done.'
+				elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
+					pcs_mood += 10
+					'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
+				elseif pubestyle = 1:
+					'You lather up your legs and crotch and carefully shave them. Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the smooth feeling and getting slightly more aroused by the touch.'
+				elseif pubestyle >= 2 and pubestyle <=7:
+					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time cleaning up the area around your neatly trimmed and styled patch of pussy hair as well.'
+				elseif pubestyle = 8:
+					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time shaving off the stubble around your small patch of hair tidy as well.'
+				elseif pubestyle >= 9:
+					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your small neat bush as well.'
+				elseif pubestyle >= 10:
+					'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your	 bush as well.'
+				end
+				dynamic $dryOff
+			end
+			
+			if pcs_leghair > 3:
+				act'Shave your legs (0:05)':
 					menu_off = 1
 					*clr & cla
-					minut += 15
+					minut += 5
 					pcs_leghair = 0
-					if pubestyle = 1:
-						pcs_pubes = 0
-					elseif pubestyle >= 2 and pubestyle <=7:
-						pcs_pubes = 11
-					elseif pubestyle = 8:
-						pcs_pubes = 16
-					elseif pubestyle = 9:
-						pcs_pubes = 21
-					elseif pubestyle = 10:
-						pcs_pubes = 26
-					end
 					pcs_horny += 5
-					stanok -= 2
-					if obdysh = 1 and rand(0, 5) = 0:gt 'vann', 'brit1'
-					if $loc ='gadbana':
-						'<center><video autoplay loop src="images/shared/home/bathroom/shave.mp4"></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave3.jpg"></center>'
-					end
+					stanok -= 1
+					if obdysh = 1 and rand(0, 5) = 5:gt 'vann', 'brit1'
+					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
 					*nl
 					if daystart < 10 and StoryLine = 0 and ntstart = 0:
 						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
@@ -292,22 +324,14 @@ $brit = {
 					elseif daystart < 30 and StoryLine = 0 and ntstart = 0:
 						pcs_mood += 10
 						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
-					elseif pubestyle = 1:
-						'You lather up your legs and crotch and carefully shave them. Once you''re finished you gently glide your hands over your smooth pussy and legs, enjoying the smooth feeling and getting slightly more aroused by the touch.'
-					elseif pubestyle >= 2 and pubestyle <=7:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time cleaning up the area around your neatly trimmed and styled patch of pussy hair as well.'
-					elseif pubestyle = 8:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time shaving off the stubble around your small patch of hair tidy as well.'
-					elseif pubestyle >= 9:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your small neat bush as well.'
-					elseif pubestyle >= 10:
-						'You lather up your legs and carefully shave them. Once you''re finished gliding your hands over your smooth legs, ensuring you didn''t miss a spot, you spend some time trimming back your	 bush as well.'
+					else
+						'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
 					end
 					dynamic $dryOff
 				end
-			else
-				'<br>You don''t need to shave.'
 			end
+		else
+			'<br>You don''t need to shave.'
 		end
 	elseif shave_menu = 2 and stanok > 0:
 		if pcs_pubes > 3:
@@ -325,7 +349,7 @@ $brit = {
 					'You lather your crotch with some soapy water and carefully shave your pubic hair. After shaving you can''t help but run your fingers over your pussy, enjoying the smooth feeling and getting slightly more aroused by the touch.'
 					dynamic $dryOff
 				end
-			elseif (pubestyle >= 2 and pubestyle <= 7) and pcs_pubes >= 15:
+			elseif ((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12) and pcs_pubes >= 15:
 				act 'Trim your pussy (0:10)':
 					menu_off = 1
 					*clr & cla
@@ -357,7 +381,7 @@ $brit = {
 					'You spend some time trimming back your pubic hair, not shaving it away completely but careful to make it neat and tidy.'
 					dynamic $dryOff
 				end
-			elseif pubestyle = 9 and pcs_pubes >= 25:
+			elseif (pubestyle = 9 or pubestyle >= 13) and pcs_pubes >= 26:
 				act 'Trim your bush (0:10)':
 					menu_off = 1
 					*clr & cla
@@ -371,7 +395,7 @@ $brit = {
 					'You spend some time trimming back your light bush of pubic hair, tidying it up and keeping your bikini line nice and clean.'
 					dynamic $dryOff
 				end
-			elseif pubestyle = 10 and pcs_pubes >= 30:
+			elseif pubestyle = 10 and pcs_pubes >= 40:
 				act 'Trim back your bush (0:10)':
 					menu_off = 1
 					*clr & cla
@@ -1532,9 +1556,12 @@ if $ARGS[0] = 'shave_options':
 	if pubestyle = 8: $pubeimage = 'images/pc/body/pussy/shave/s_bush1.jpg'
 	!if pubestyle = 9: $pubeimage = 'images/pc/body/pussy/spussy.jpg'  (uses $pcs_pubes)
 	!if pubestyle = 10: $pubeimage = 'images/pc/body/pussy/hpussy.jpg' (uses $pcs_pubes)
+	if pubestyle = 12: $pubeimage = 'images/pc/body/pussy/shave/mb.jpg'
+	if pubestyle = 13: $pubeimage = 'images/pc/body/pussy/shave/bstrip.jpg'
+	if pubestyle = 14: $pubeimage = 'images/pc/body/pussy/shave/rectangle.jpg'
 	'<h3><center><b><font color="maroon">Shaving optons</b></h3><br><center><font color="maroon">Here you can choose your style for pubic hair and which body parts you wish to shave.</font></center>'
 	'<br><center><table border=0 cellspacing=<<shave_img_hgt/25>> cellpadding=5>'
-	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/v1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/v1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/triangle1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/triangle1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/landing1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/landing1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/heart1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/heart1.jpg"></a></center></TD>'
+	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/pussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/mb.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/mb.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/triangle1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/triangle1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/landing1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/landing1.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/heart1.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/heart1.jpg"></a></center></TD>'
 	'<TR><TD><center>'
 	if pubestyle ! 1:
 		'<a href="exec:pubestyle = 1 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Clean Shave</a>'
@@ -1597,6 +1624,38 @@ if $ARGS[0] = 'shave_options':
 	else
 		'Full Bush'
 	end
+	*P '<TR><TD><center><a href="exec:view''images/pc/body/pussy/stpussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/stpussy.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/bstrip.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/bstrip.jpg"></a></center></TD><TD><center><a href="exec:view''images/pc/body/pussy/shave/rectangle.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/shave/rectangle.jpg"></a></center></TD>'
+	*nl
+	'<TR><TD><center>'
+	if pubestyle ! 11 and pcs_pubes > 10:
+		'<a href="exec:pubestyle = 11 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Lazy</a>'
+		'(don''t immediately shave stubble)'
+	else
+		'Lazy'
+		'(don''t immediately shave stubble)'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 12 and pcs_pubes > 15:
+		'<a href="exec:pubestyle = 2 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Mini Bush</a>'
+	else
+		'Mini Bush'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 13 and pcs_pubes > 20:
+		'<a href="exec:pubestyle = 12 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Bushy Strip</a>'
+	else
+		'Bushy Strip'
+	end
+	'</center></TD><TD><center>'
+	if pubestyle ! 14 and pcs_pubes > 20:
+		'<a href="exec:pubestyle = 13 & '+iif(shave_menu = 3,'shave_menu = 1', 'shave_menu = 2')+' & gt ''din_van'', ''shave_options''">Rectangle</a>'
+	else
+		'Rectangle'
+	end
+	
+	
+	
+	
 	'</center></TD><TR><center>'
 	'Your razor will last for <b><<stanok>></b> more shaves.'
 	*nl

+ 2 - 2
locations/down.qsrc

@@ -133,10 +133,10 @@ else
 	$desc_txt2 = '<a href="exec:msg ''The Havana Fitness Center is closed and will reopen at 9:00''">Havana Fitness Center</a>'
 end
 '<<$desc_txt1>> is front and center in the commercial area. Nearby is a <<$desc_txt2>> which has a swimming pool that can be used for a small fee.'
-if hour >= 9 and hour <= 23:
+if hour >= 6 and hour <= 23:
 	$desc_txt1 = '<a href="exec: minut += 1 & gt ''foto'', ''start''">Aphrodite Photography</a>'
 else
-	$desc_txt1 = '<a href="exec:msg ''Aphrodite Photography is closed and will reopen at 9:00''">Aphrodite Photography</a>'
+	$desc_txt1 = '<a href="exec:msg ''Aphrodite Photography is closed and will reopen at 6:00''">Aphrodite Photography</a>'
 end
 if hour >= 6 and hour <= 23:
 	$desc_txt2 = '<a href="exec: minut += 1 & gt ''burger'', ''start''">Diner Bystroeshka</a>'

+ 2 - 2
locations/exercise.qsrc

@@ -385,10 +385,10 @@ if $ARGS[0] = 'yoga':
 	elseif $pantyworntype ! 'none':
 		'<center><video autoplay loop src="images/pc/activities/yoga_underwear.mp4"></video></center>'
 	else
-		'<center><video autoplay loop src="images/pc/activities/yoga_naked.mp4"></video></center>'
+		'<center><img <<$set_imgh>> src="images/pc/activities/yoga_naked<<rand(1,2)>>.jpg"></center>'
 	end
 
-	'You meditate for <<$timestring>> minutes, improving your will.'
+	'You spend <<$timestring>> minutes stretching and straining your muscles in various poses, improving your will and flexibility.'
 	gs 'stat'
 	if exer_auto = 1:
 		act 'Continue': gt 'exercise', 'auto4'

+ 77 - 525
locations/foto.qsrc

@@ -145,8 +145,8 @@ if $ARGS[0] = 'studio':
 	*clr & cla
 	killvar '$modelopt'
 
-	if special_model < city_modelling and modelfoto_pussy > 0 and hour < 15 and fame_model_event < daystart:gt 'foto_events','fame'
-	if special_skill_model < pcs_mdlng and modelfoto_pussy > 0 and hour < 15 and skill_model_event < daystart:gt 'foto_events','skill'
+	if special_model < city_modelling and modelfoto_nip > 0 and hour < 15 and fame_model_event < daystart:gt 'foto_events','fame'
+	if special_skill_model < pcs_mdlng and modelfoto_nip > 0 and hour < 15 and skill_model_event < daystart:gt 'foto_events','skill'
 
 	minut += 5
 	gs 'stat'
@@ -286,9 +286,6 @@ if $ARGS[0] = 'studio':
 			elseif pcs_skin < 40:
 				'"Girl, your face is covered in acne unless you improve your appearance there is no chance of working here."'
 				act 'Leave':minut += 1 & gt 'down'
-			elseif hotcat < 6:
-				'"Girl, your face is fine, but unless you improve your overall appearance there is no chance of working here."'
-				act 'Leave':minut += 1 & gt 'down'
 			elseif bmi_calc >= foto_weight and foto_weight > 0:
 				'You walk up to the front desk and find the same man who interviewed you previously. He looks up at you from his computer as you approach and frowns.'
 				'Before you can say anything, he sternly says, "Girl, I told you to lose weight, not put it on! Now get out of here until you slim down some!"'
@@ -364,27 +361,28 @@ if $ARGS[0] = 'studio':
 				gt'foto','interview'
 			end
 		end
-	elseif pcs_apprnc < 80:
+	elseif venera < 3:
 		act 'Ask for work':
-			*clr & cla
 			menu_off = 1
-			'<center><b><font color="maroon">Photographer</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-			if pcs_sweat >= 20:
-				'"You''re all sweaty. Go take a shower before asking for work. And don''t forget to do your makeup after."'
-				act'Go to the showers':gt'foto','showers'
-			else
+			if pcs_apprnc < 80:
+				*clr & cla
+				menu_off = 1
+				'<center><b><font color="maroon">Photographer</font></b></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'"I''m sorry but you are going to have to work on your appearance if you want to do a shoot."'
 				act 'Leave':gt'foto','studio'
-			end
-		end
-	elseif venera < 3:
-		act 'Ask for work':
-			menu_off = 1
-			if model_week = (daystart - week) / 7 and model_job_week >= 2:
-				gt 'foto', 'practicemodel'
+			elseif pcs_sweat >= 20:
+				'"You''re all sweaty. Go take a shower before asking for work. And don''t forget to do your makeup after."'
+				act'Go to the showers':gt'foto','showers'
+			elseif pcs_leghair > 3:
+				'"Go shave your legs, we''re not running a nature special on gorillas."'
+				act'Go to the showers':gt'foto','showers'
 			else
-				gt 'foto', 'model'
+				if model_week = (daystart - week) / 7 and model_job_week >= 2:
+					gt 'foto', 'practicemodel'
+				else
+					gt 'foto_shoot','model'
+				end
 			end
 		end
 		if first_fame_event = 2:
@@ -444,6 +442,13 @@ end
 if $ARGS[0] = 'interview2':
 	cla & *clr
 	menu_off = 1
+	if pcs_inhib > 40:
+		gs 'willpower', 'skill', 'pcs_inhib', 'easy'
+	elseif pcs_inhib > 20:
+		gs 'willpower', 'skill', 'pcs_inhib', 'medium'
+	else
+		gs 'willpower', 'skill', 'pcs_inhib', 'hard'
+	end
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	if bmi_calc < foto_weight:
 		'You walk up to the front desk and find the same man who interviewed you previously. He looks up at you from his computer as you approach.'
@@ -459,6 +464,14 @@ if $ARGS[0] = 'interview2':
 		'"I''m <<age>>."'
 		'"I see. Alright, undress. Let me take a look at you."'
 	end
+	
+	act'I can''t do it':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+		'Even if it''s just this one time, you can''t do it after all. It''s simply too embarrassing to get naked in front of a total stranger. You blush, apologize, and leave the studio.'
+		act 'Leave': minut += 1 & gt 'down'
+	end
+	
 	if undress_ask = 0:
 		act'What? Why?':
 			undress_ask = 1
@@ -508,7 +521,7 @@ if $ARGS[0] = 'interview2':
 					'You nod in understanding.'
 				end
 				act'Continue':
-					if bmi_calc < 25:
+					if bmi_calc < 25 or hotcat >= 6:
 						gt'foto','job_offer'
 					else
 						gt'foto','job_decline'
@@ -523,7 +536,7 @@ if $ARGS[0] = 'interview2':
 				'He circles you slowly, occasionally asking you to adjust your pose slightly, carefully inspecting every aspect of your nude body. Your <<$pcs_eyecol>> eyes framed by your <<$pcs_haircol>> hair, your <<$liptalk3>>, your <<$titsize>> breasts, your <<$skin1>> <<$pcs_tan>> skin, your thighs, even your <<$pcdesc_pubes>> pussy...'
 				'He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
 				act'Continue':
-					if bmi_calc < 25:
+					if bmi_calc < 25 or hotcat >= 6:
 						gt'foto','job_offer'
 					else
 						gt'foto','job_decline'
@@ -531,8 +544,8 @@ if $ARGS[0] = 'interview2':
 				end
 			end
 		end
-	elseif pcs_inhib >= 15:
-		act'Reluctantly undress':
+	elseif will_cost <= pcs_willpwr:
+		act'Reluctantly undress (<<will_cost>> Willpower)':
 			reluctant_undress = 1
 			*clr & cla
 			gs 'clothing', 'strip'
@@ -545,7 +558,7 @@ if $ARGS[0] = 'interview2':
 			'He spends several minutes doing this without saying anything. Several people walk by while he does, including several beautiful and nude women who glance at you, whispering to each other before moving on.'
 			'You blush furiously at the attention, both his and the other models.'
 			act'Continue':
-				if bmi_calc < 25:
+				if bmi_calc < 25 or hotcat >= 6:
 					gt'foto','job_offer'
 				else
 					gt'foto','job_decline'
@@ -553,12 +566,6 @@ if $ARGS[0] = 'interview2':
 			end
 		end
 	end
-	act'I can''t do it':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-		'Even if it''s just this one time, you can''t do it after all. It''s simply too embarrassing to get naked in front of a total stranger. You blush, apologize, and leave the studio.'
-		act 'Leave': minut += 1 & gt 'down'
-	end
 end
 
 if $ARGS[0] = 'job_decline':
@@ -632,7 +639,7 @@ if $ARGS[0] = 'job_offer':
 			'He hands you back your passport, smiling.'
 			*nl
 			'"Welcome to Aphrodite."'
-			act 'Find a photographer':gt 'foto', 'model'
+			act 'Find a photographer':gt 'foto_shoot','model'
 		end
 	elseif fakepassport = 1:
 		act'Show him your fake passport':
@@ -643,7 +650,7 @@ if $ARGS[0] = 'job_offer':
 			'He hands you back your fake passport, smiling.'
 			*nl
 			'"Welcome to Aphrodite."'
-			act 'Find a photographer':gt 'foto', 'model'
+			act 'Find a photographer':gt 'foto_shoot','model'
 		end
 	elseif age_lie = 1:
 		act '"Uhh..."':
@@ -671,8 +678,12 @@ if $ARGS[0] = 'job_offer':
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				fakepassport = 2
 				fotofakepassport = 2
-				'You take a deep breath and step closer to him to say, "Okay, the truth is that I''m not really 18. I''m <<age>> okay? But I really need this job! Can''t we work something out?"'
-				'He studies you for a moment, still completely naked before him, not a scrap of clothing to hide your naked body. You realize it suddenly, almost as if you had forgotten and you feel your face flush with embarrassment.'
+				'You take a deep breath and step closer to him to say, "Okay, the truth is that I''m not really 18. I''m <<age>> okay? But I really need the money! Can''t we work something out?"'
+				if pcs_inhib < 40:
+					'He studies you for a moment, still completely naked before him, not a scrap of clothing to hide your naked body. You realize it suddenly, almost as if you had forgotten and you feel your face flush with embarrassment.'
+				else
+					'He studies you for a few more moments, looking up and down your naked body and you find yourself growing impatient with all the waiting around.'
+				end
 				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -1137,8 +1148,8 @@ if $ARGS[0] = 'practicemodel':
 					mdlng_exp += rand(3,5)
 					fashionshoot = rand(1,4)
 					gs 'stat'
-					if fashionshoot <= 2:'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion<<rand(1,2)>>.mp4"></video></center>'
-					if fashionshoot >= 3 and fashionshoot < 5:'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion<<rand(1,3)>>.jpg"></center>'
+					if fashionshoot <= 2:'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion/<<rand(1,5)>>.mp4"></video></center>'
+					if fashionshoot >= 3 and fashionshoot < 5:'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion/<<rand(1,14)>>.jpg"></center>'
 					if fashionshoot < 5:'You dress up in the latest in fashion wear and spend the next two hours sexily posing for the photographer.'
 					if fashionshoot = 5:
 						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion4.mp4"></video></center>'
@@ -1184,7 +1195,7 @@ if $ARGS[0] = 'practicemodel':
 						inhib_exp += rand(1,3)
 
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/model1.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,12)>>.jpg"></center>'
 						'You''re still not confident to do a shoot like this for real, but you are determined to build up your courage so you can become a better model.'
 						'You dress up in sexy clothes and spend the next two hours posing for the photographer.'
 						if pcs_mdlng < 20:
@@ -1219,7 +1230,7 @@ if $ARGS[0] = 'practicemodel':
 						inhib_exp += 1
 
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/model1.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,12)>>.jpg"></center>'
 						'You dress up in sexy clothes and spend the next two hours posing for the photographer.'
 						if pcs_mdlng < 20:
 							act'Continue':
@@ -1260,7 +1271,7 @@ if $ARGS[0] = 'practicemodel':
 						mdlng_exp += 1
 						if pcs_inhib < 50:inhib_exp += rand(1,3)
 						gs 'stat'
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(1,5)>>.mp4"></video></center>'
 						'Bikini modelling isn''t too bad, but you''d still be pretty embarrassed if you ever saw someone reading a magazine with pictures of you like this on the cover. Still, you''re determined to work your way up to it and gain more confidence in your body and your modelling skills.'
 						if pcs_mdlng < 20:
 							act'Continue':
@@ -1283,7 +1294,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1298,7 +1309,7 @@ if $ARGS[0] = 'practicemodel':
 						mdlng_exp += rand(6,10)
 						if pcs_inhib < 50:inhib_exp += 1
 						gs 'stat'
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(1,5)>>.mp4"></video></center>'
 						'You go ahead and put on the bikini that the photographer wants to use and get to posing for him.'
 						if pcs_mdlng < 20:
 							act'Continue':
@@ -1320,7 +1331,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1342,7 +1353,7 @@ if $ARGS[0] = 'practicemodel':
 						mdlng_exp += 1
 						if pcs_inhib < 50:inhib_exp += rand (1,3)
 						gs 'stat'
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie/<<rand(1,2)>>.mp4"></video></center>'
 						'You''re too embarrassed to do a shoot like this that would be released to the public, but you''re determined to work your way up to it so put on some sexy lingerie and spend the next two hours striking various poses for a photographer.'
 						if pcs_mdlng < 20:
 							act'Continue':
@@ -1365,7 +1376,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1380,7 +1391,7 @@ if $ARGS[0] = 'practicemodel':
 						mdlng_exp += rand(6,10)
 						if pcs_inhib < 50:inhib_exp += 2
 						gs 'stat'
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie/<<rand(1,2)>>.mp4"></video></center>'
 						'You put on some sexy lingerie and spend the next two hours striking various poses for a photographer.'
 						if pcs_mdlng < 20:
 							act'Continue':
@@ -1402,7 +1413,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1418,7 +1429,7 @@ if $ARGS[0] = 'practicemodel':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Alright, we can do that. What would you like to do?"'
 
-			act 'Erotic clothing with breast nudity':
+			act 'Sexy clothing':
 				cla
 				act 'Maybe not today':gt 'foto','studio'
 
@@ -1430,7 +1441,7 @@ if $ARGS[0] = 'practicemodel':
 						mdlng_exp += 1
 						inhib_exp += rand(1,4)
 						gs 'stat'
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/model5.mp4"></video></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,12)>>.jpg"></center>'
 						'Exposing your breasts for the world to see is a step up from just modelling lingerie and it still isn''t something you''re willing to do. But this is practice so it isn''t going to be published anywhere and the photographers are recommending it to you so you can feel more comfortable on set.'
 						'You put on some loose clothing and give it a go. The next two hours are filled with instructions from the photographer and clicks from the camera with your nipples occasionally slipping out.'
 						if pcs_mdlng < 20:
@@ -1453,7 +1464,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1468,7 +1479,7 @@ if $ARGS[0] = 'practicemodel':
 						mdlng_exp += rand(5,8)
 						inhib_exp += 2
 						gs 'stat'
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/model5.mp4"></video></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,12)>>.jpg"></center>'
 						'You dressed up in loose clothes and spend the next two hours striking various poses for a photographer, your nipples occasionally slipping out.'
 						if pcs_mdlng < 20:
 							act'Continue':
@@ -1490,7 +1501,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1515,7 +1526,7 @@ if $ARGS[0] = 'practicemodel':
 						mdlng_exp += 1
 						inhib_exp += rand(1,4)
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru1.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru/<<rand(1,9)>>.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru2.jpg"></center>'
 						'In one way, this is better than actually showing your bare nipples. In another way, it''s worse because even though the fabric covers them, the thinness of it completely exposes your breasts. Every flash from the camera feels like it pierces through you, highlighting not your body but specifically your breasts, as if you were truly naked.'
 						act'Continue':
 							*clr & cla
@@ -1523,7 +1534,7 @@ if $ARGS[0] = 'practicemodel':
 							'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 							'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 							if pcs_mdlng >= 40 and commercial = 0:
-								act 'Leave':gt'foto','commercial'
+								act 'Leave':gt'foto_events','commercial'
 							else
 								act 'Leave':gt 'foto', 'end'
 							end
@@ -1539,7 +1550,7 @@ if $ARGS[0] = 'practicemodel':
 						mdlng_exp += 1
 						inhib_exp += rand(1,4)
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru1.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru/<<rand(1,9)>>.jpg"><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru2.jpg"></center>'
 						'You feel like practicing something risqué today without being completely nude. You pick out a transparent top and go to the practice set.'
 						*nl
 						'You spend two hours posing for the photographer, learning the best ways to make a see-through top work for you and make you look even sexier.'
@@ -1549,7 +1560,7 @@ if $ARGS[0] = 'practicemodel':
 							'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 							'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 							if pcs_mdlng >= 40 and commercial = 0:
-								act 'Leave':gt'foto','commercial'
+								act 'Leave':gt'foto_events','commercial'
 							else
 								act 'Leave':gt 'foto', 'end'
 							end
@@ -1595,7 +1606,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1632,7 +1643,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1653,7 +1664,7 @@ if $ARGS[0] = 'practicemodel':
 						mdlng_exp += 1
 						inhib_exp += rand(1,2)
 						gs 'stat'
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie_trans<<rand(1,3)>>.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/ling_trans/<<rand(1,3)>>.mp4"></video></center>'
 						'It''s okay... It''s just like a normal lingerie shoot... Except that your nipples will be clearly visible. That makes it just like a topless so it''s fine right? Even though the transparent lace feels more exposing than being topless...'
 						'You slip into the lacy underwear and spend the next two hours practicing poses with the photographer.'
 						if pcs_mdlng < 20:
@@ -1680,7 +1691,7 @@ if $ARGS[0] = 'practicemodel':
 								*nl
 								'You have the discipline to not turn or shy your body away from the camera to hide yourself, but your expressions are very rigid and sometimes awkward. Maybe you need to work more on your confidence in your body before you''ll be able to progress here.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1695,7 +1706,7 @@ if $ARGS[0] = 'practicemodel':
 						mdlng_exp += rand(8,10)
 						inhib_exp += 4
 						gs 'stat'
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie_trans<<rand(1,3)>>.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/ling_trans/<<rand(1,3)>>.mp4"></video></center>'
 						'You put on some lacy underwear and spend the next two hours practicing poses with the photographer.'
 						if pcs_mdlng < 20:
 							act'Continue':
@@ -1717,7 +1728,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1824,7 +1835,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1868,7 +1879,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1905,7 +1916,7 @@ if $ARGS[0] = 'practicemodel':
 								'<center><video autoplay loop src="images/locations/city/citycenter/photo/modelbts2.mp4"></video></center>'
 								'The practice shoot ends and he calls you over to his computer to show you what you need to work on.'
 								if pcs_mdlng >= 40 and commercial = 0:
-									act 'Leave':gt'foto','commercial'
+									act 'Leave':gt'foto_events','commercial'
 								else
 									act 'Leave':gt 'foto', 'end'
 								end
@@ -1931,465 +1942,6 @@ if $ARGS[0] = 'end':
 	gt 'foto','studio'
 end
 
-if $ARGS[0] = 'model':
-	menu_off = 1
-	if model = 0:model = 1
-	*clr & cla
-	minut += 5
-	modelpay = (pcs_mdlng/2 * 10) + ((city_modelling + pcs_apprnc)/2)
-	modelpayfin = 900 + (15*rand(0,5))
-	gs 'stat'
-	'<center><b><font color="maroon">Photographer</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-	'"Hello <<$pcs_firstname>>. Are you here to work? What kind of shoot would you like to do today?"'
-	*nl
-!!	'<a href="exec:gs ''shortgs'',''msg'',''There are three types of shoots: Catalog, Fashion, and Glamour. A catalog shoot is any shoot that is meant to appear in a shopping magazine or online catalog. They don''t do much for your fame but the base pay is steady. A fashion shoot is more stylized and though the base pay is not as high, there will be a bonus tip based on your modelling skill and fame. A glamour shoot will always involve nudity or risqué clothing and will typically be erotic in nature. This type of modelling will have good pay with good bonuses based on skill and fame, but also will spread your fame beyond the city far more quickly. If you grew up in a small town outside St. Petersburg, the pictures may reach its populace sooner rather than later.''">Modelling Shoot Guide</a>'
-	
-	act'Never mind':
-		cla
-		'"Sorry, I just realized that I have something to do right now. Can I come back later?"'
-		'"Sure, no problem <<$pcs_lastname>>, just let us know when you''re ready to work.'
-		act'Leave':gt 'foto','studio'
-	end
-	
-	act'Actually I''d like to practice':gt'foto','practicemodel'
-		
-	act'"I''d like to do a catalog shoot"':
-		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-		'"Alright, what kind of shoot? Clothing or swimsuits?"'
-		
-		act'Clothing':
-			modelfoto_catalog += 1
-			cla & *clr
-			'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion3.mp4"></video></center>'
-			'You spend two hours modelling for the online catalogs of retail clothing stores, wearing various different dresses but the same expression. It''s boring but it still gets you paid.'
-			*nl
-			'You recieve <<modelpayfin>> <b>₽</b> for the job.'
-			act 'Leave':gt 'foto', 'end'
-		end
-		act'Swimsuits':
-			modelfoto_catalog += 1
-			cla & *clr
-			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini<<rand(3,5)>>.mp4"></video></center>'
-			bikinicatalog += 1
-			'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
-			*nl
-			'You recieve <<modelpayfin>> <b>₽</b> for the job.'
-			act 'Leave':gt 'foto', 'end'
-		end
-	end
-	
-	act'"I''d like to do a fashion shoot"':
-		if pcs_mdlng < 20:
-			msg'"Sorry, but you aren''t a skilled enough model to do this kind of publication yet. Maybe get some practice in on your off days."'
-		else
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-			'"Alright, what kind of shoot would you like to do? Fashion, bikini, or lingerie?"'
-			act 'Fashion':
-				cla
-				act 'Maybe not today':gt 'foto','studio'
-
-				act 'Agree (2:00)':
-					*clr & cla
-					minut += 120
-					modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
-					modelfoto_fashion += 1
-					mdlng_exp += rand(5,8)
-					gs 'fame', 'city', 'modelling', rand(7,12)
-					fashionshoot = rand(1,2)
-					gs 'stat'
-					if fashionshoot = 1:
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion<<rand(1,4)>>.mp4"></video></center>'
-					else
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion<<rand(1,5)>>.jpg"></center>'
-					end
-					'You dress up in the latest in fashion wear and spend the next two hours posing for the photographer.'
-					*nl
-					'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-					act 'Leave':gt 'foto', 'end'
-				end
-			end
-
-			act 'Bikini':
-				if pcs_inhib < 20:
-					msg'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.'
-				else
-					cla
-					act 'Maybe not today':gt 'foto','studio'
-
-					act 'Agree (2:00)':
-						*clr & cla
-						minut += 120
-						modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
-						modelfoto_bikini += 1
-						gs 'fame', 'city', 'modelling', rand(7,12)
-						mdlng_exp += rand(6,10)
-						if pcs_inhib < 50:inhib_exp += 1
-						bikinishoot = rand(1,5)
-						gs 'stat'
-						if bikinishoot = 1:
-							'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini.mp4"></video></center>'
-						else
-							'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini<<bikinishoot>>.mp4"></video></center>'
-						end
-						*nl
-						'You spend the shoot in designer bikinis, modelling them to appear in various higher end magazines.'
-						*nl
-						'Two hours later, you''re all done. The photographer thanks you for your time and pays you <<modelpayfin>> <b>₽</b> for the job.'
-						if pcs_mdlng >= 40 and commercial = 0:
-							act 'Leave':gt'foto','commercial'
-						else
-							act 'Leave':gt 'foto', 'end'
-						end
-					end
-				end
-			end
-
-
-			act 'Lingerie modelling':
-				if pcs_inhib < 25:
-					msg'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.'
-				else
-					cla
-					act 'Maybe not today':gt 'foto','studio'
-
-					act 'Agree (2:00)':
-						*clr & cla
-						minut += 120
-						modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
-						modelfoto_lingerie += 1
-						mdlng_exp += rand(6,10)
-						gs 'fame', 'city', 'modelling', rand(7,13)
-						inhib_exp += 2
-						shoot_type = rand(1,2)
-						gs 'stat'
-						if shoot_type = 1:
-							'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie<<rand(1,3)>>.mp4"></video></center>'
-						else
-							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/lingerie<<rand(1,2)>>.jpg"></center>'
-						end
-						'You put on some high end lingerie and spend the next two hours striking various poses for a photographer for use in fashion magazines.'
-						*nl
-						'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-						if pcs_mdlng >= 40 and commercial = 0:
-							act 'Leave':gt'foto','commercial'
-						else
-							act 'Leave':gt 'foto', 'end'
-						end
-					end
-				end
-			end
-		end
-	end
-
-	act'"I''d like to do a glamour shoot"':
-		if pcs_inhib < 30:
-			msg'You toy with the idea of exposing yourself on camera 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.'
-		else
-			gt 'foto', 'nude_shoot'
-		end
-	end
-end
-
-if $ARGS[0] = 'nude_shoot':
-	cla & *clr
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-	'"Alright, we can do that. What kind of nude shoot?"'
-	
-!!	'Info guides:'
-!!	'<a href="exec:gs ''shortgs'',''msg'',''This type of shoot is not particularly more explicit, but the clothes being modelled are inherently more sensual and will require some confidence to be able to wear them.''">Erotic clothed</a>'
-!!	'<a href="exec:gs ''shortgs'',''msg'',''A topless shoot is any shoot that has you baring your breasts and shoulders while still wearing bottoms of some kind, whether that be trousers, skirt, or underwear.''">Topless</a>'
-!!	'<a href="exec:gs ''shortgs'',''msg'',''A tastefully nude shoot is one that does not show genitals of any kind, neither vagina or nipple. Your pay will be based more on your fame and appearance than your skill.''">Tasteful nude</a>'
-!!	'<a href="exec:gs ''shortgs'',''msg'',''A topless nude shoot is one step further in eroticism while still maintaining class. Your nipples will be exposed but your vagina will remain hidden. It is considered erotic without being slutty, like a character nude scene in a film. Skill plays a larger role in this type of shoot.''">Topless nude</a>'
-!!	'<a href="exec:gs ''shortgs'',''msg'',''A fully nude shoot bares all. Your breasts, nipples, and vagina will be visible. It is the most erotic, gives the highest bonus from appearance and fame, but will also spread your fame further and faster. If you are an aspiring star, this may be good for your publicity. But if there are people you want to hide your work from, this might reach them sooner than expected.''">Fully nude</a>'
-
-!!	act 'Erotic clothing with breast nudity':
-		!!already matched the exhibitionism value above
-!!		cla
-!!		act 'Maybe not today':gt 'foto','studio'
-
-!!		act 'Agree (2:00)':
-!!			*clr & cla
-
-!!			minut += 120
-!!			modelpayfin = 700 + (modelpay) + (15*rand(0,5))
-!!			modelfoto_nip += 1
-!!			mdlng_exp += rand(6,10)
-!!			city_modelling += rand(7,13)
-!!			inhib_exp += 2
-!!			gs 'stat'
-!!			'<center><video autoplay loop src="images/locations/city/citycenter/photo/model5.mp4"></video></center>'
-!!			'You dressed up in sexy clothes and spend the next two hours striking various poses for a photographer, your nipples occasionally slipping out from behind the clothing.'
-!!			*nl
-!!			'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-!!			if pcs_mdlng >= 40 and commercial = 0:
-!!				act 'Leave':gt'foto','commercial'
-!!			else
-!!				act 'Leave':gt 'foto', 'end'
-!!			end
-!!		end
-!!	end
-	act 'Erotic clothed':
-		if pcs_inhib < 30:
-			msg'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.'
-			gt 'foto', 'model'
-		else
-			cla
-			act 'Maybe not today':gt 'foto','studio'
-
-			act 'Agree (2:00)':
-				*clr & cla
-				minut += 120
-				modelpayfin = 400 + (modelpay) + (15*rand(0,5))
-				modelfoto_glamour += 1
-				modelfoto_ero_clo += 1
-				mdlng_exp += rand(5,10)
-				gs 'fame', 'city', 'modelling', rand(7,12)
-				inhib_exp += 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/ero<<rand(2,4)>>.jpg"></center>'
-				'You dress up in sexy clothes and spend the next two hours posing for the photographer.'
-				*nl
-				'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-				act 'Leave':gt 'foto','end'
-			end
-		end
-	end
-
-	act 'Transparent clothing':
-		!!already matched the exhibitionism value above
-		cla
-		act 'Maybe not today':gt 'foto','studio'
-
-		act 'Agree (2:00)':
-			*clr & cla
-			minut += 120
-			modelpayfin = 500 + (modelpay) + (15*rand(0,5))
-			modelfoto_glamour += 1
-			modelfoto_nip += 1
-			mdlng_exp += rand(6,10)
-			gs 'fame', 'city', 'modelling', rand(7,13)
-			inhib_exp += rand(1,3)
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru<<rand(1,6)>>.jpg"></center>'
-			'You put on a transparent top and spend the next two hours in various poses for the photographer, a flash highlighting your breasts with every click of the camera.'
-			*nl
-			'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-			if pcs_mdlng >= 40 and commercial = 0:
-				act 'Leave':gt'foto','commercial'
-			else
-				act 'Leave':gt 'foto', 'end'
-			end
-		end
-	end
-	
-	act 'Transparent Lingerie':
-		if pcs_inhib < 55:
-			msg'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.'
-		else
-			cla
-			act 'Not for me':gt 'foto','studio'
-
-			act 'Agree (2:00)':
-				*clr & cla
-				minut += 120
-				modelpayfin = 525 + (modelpay * 2) + (15*rand(0,7))
-				modelfoto_glamour += 1
-				modelfoto_nip += 1
-				modelfoto_lingerie += 1
-				mdlng_exp += rand(8,10)
-				gs 'fame', 'city', 'modelling', rand(9,14)
-				inhib_exp += 4
-				gs 'stat'
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie_trans<<rand(1,3)>>.mp4"></video></center>'
-				'You put on some very lacy, very transparent underwear and get to posing, your nipples often showing through the thin fabric.'
-				*nl
-				'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-				*nl
-				if pornstudio = 0:pornstudio = 2 & 'At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
-				if pcs_mdlng >= 40 and commercial = 0:
-					act 'Leave':gt'foto','commercial'
-				else
-					act 'Leave':gt 'foto', 'end'
-				end
-			end
-		end
-	end
-
-	act 'Topless':
-		if pcs_inhib < 50:
-			msg'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.'
-			gt 'foto', 'nude_shoot'
-		else
-			cla
-			act 'Maybe not today':gt 'foto','studio'
-			
-			act 'Agree (2:00)':
-				*clr & cla
-				minut += 120
-				modelpayfin = 550 + (modelpay) + (15*rand(0,5))
-				modelfoto_nip += 1
-				modelfoto_topless += 1
-				mdlng_exp += rand(6,10)
-				gs 'fame', 'city', 'modelling', rand(8,14)
-				inhib_exp += 3
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless<<rand(1,22)>>.jpg"></center>'
-				'You spend two hours striking various posing with topless breasts, listening to instruction while the photographer takes pictures of you.'
-				*nl
-				'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-				if pcs_mdlng >= 40 and commercial = 0:
-					act 'Leave':gt'foto','commercial'
-				else
-					act 'Leave':gt 'foto', 'end'
-				end
-			end
-		end
-	end
-
-	act 'Tasteful nude':
-		if pcs_inhib < 55:
-			msg'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.'
-		else
-			cla
-			act 'Maybe not today':gt 'foto','studio'
-			
-			act 'Agree (2:00)':
-				*clr & cla
-				minut += 120
-				modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
-				modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-				modelfoto_glamour += 1
-				modelfoto_nude += 1
-				mdlng_exp += rand(9,10)
-				gs 'fame', 'city', 'modelling', rand(10,20)
-				inhib_exp += 5
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(1,5)>>.jpg"></center>'
-				'Already naked, you step onto the set and begin the shoot immediately.'
-				*nl
-				'You spend two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully hides your pussy and nipples. These images, though incredibly provocative, are still somehow considered to be conservative enough to be allowed on the front cover of fashion, sports, and other tabloid magazines. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
-				if pcs_mdlng >= 40 and commercial = 0:
-					act 'Leave':gt'foto','commercial'
-				else
-					act 'Leave':gt 'foto', 'end'
-				end
-			end
-		end
-	end
-	
-	act 'Topless nude':
-		if pcs_inhib < 60:
-			msg'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.'
-		else
-			cla
-			act 'Maybe not today':gt 'foto','studio'
-			
-			act 'Agree (2:00)':
-				*clr & cla
-				modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
-				minut += 120
-				modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-				modelfoto_glamour += 1
-				modelfoto_nude += 1
-				mdlng_exp += rand(9,10)
-				gs 'fame', 'city', 'modelling', rand(10,20)
-				inhib_exp += 5
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(6,26)>>.jpg"></center>'
-				'Already naked, you step onto the set and begin the shoot immediately.'
-				*nl
-				'You spend two hours posing confidently for a photographer taking pictures of you, often using props, hands, legs, or shadow to shield your pussy while simultaneously teasing the would-be readers of what they cannot see. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
-				if pornstudio = 0:pornstudio = 2 & 'At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
-						
-				if pcs_mdlng >= 40 and commercial = 0:
-					act 'Leave':gt'foto','commercial'
-				else
-					act 'Leave':gt 'foto', 'end'
-				end
-			end
-		end
-	end
-	
-	act 'Full nude':
-		if pcs_inhib < 60:
-			msg'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.'
-		else
-			cla
-			act 'Maybe not today':gt 'foto','studio'
-
-			act 'Agree (2:00)':
-				*clr & cla
-				minut += 120
-				modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
-				modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
-				modelfoto_glamour += 1
-				modelfoto_nude += 1
-				modelfoto_nip += 1
-				modelfoto_pussy += 1
-				mdlng_exp += rand(9,10)
-				gs 'fame', 'city', 'modelling', rand(10,20)
-				inhib_exp += 5
-				if pcs_pubes <= 20:
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(27,35)>>.jpg"></center>'
-					'Already naked, you step onto the set and begin the shoot immediately.'
-					*nl
-					'You spend two hours posing confidently for a photographer taking pictures of you that fully expose your breasts and pussy. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
-				else
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude<<rand(36,41)>>.jpg"></center>'
-					'Already naked, you step onto the set and begin the shoot immediately.'
-					*nl
-					'You spend two hours posing confidently for a photographer taking pictures of you, your thick bush being used as a simple censor of your pussy and make it more "acceptable" as art while still maintaining the feeling of eroticism. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
-				end
-				if pornstudio = 0:pornstudio = 2 & 'At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
-
-				if pcs_mdlng >= 40 and commercial = 0:
-					act 'Leave':gt'foto','commercial'
-				else
-					act 'Leave':gt 'foto', 'end'
-				end
-			end
-		end
-	end
-end
-
-!!	act 'Variety shoot':
-!!		if pcs_inhib < 60:
-!!			msg'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.'
-!!			gt 'foto', 'nude_shoot'
-!!		else
-!!			cla
-!!			act 'Maybe not today':gt 'foto','studio'
-!!
-!!			act 'Agree (2:00)':
-!!				*clr & cla
-!!				minut += 120
-!!				modelpayfin = 825 + (modelpay * 2) + (15*rand(0,7))
-!!				mdlng_exp += 10
-!!				city_modelling += rand(10,20)
-!!				inhib_exp += 3
-!!				modelfoto_glamour += 1
-!!				modelfoto_nip += 1
-!!				modelfoto_fashion += 1
-!!				modelfoto_lingerie += 1
-!!				modelfoto_topless += 1
-!!				modelfoto_pussy += 1
-!!				gs 'stat'
-!!				'<center><video autoplay loop src="images/locations/city/citycenter/photo/vmodel.mp4"></video></center>'
-!!				'You spend two hours posing for the photographer, changing in and out of various underwear, sexy clothings, and lingeries until you end the shoot fully striped down and dancing naked.'
-!!				*nl
-!!				'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
-!!				if pcs_mdlng >= 40 and commercial = 0:
-!!					act 'Leave':gt'foto','commercial'
-!!				else
-!!					act 'Leave':gt 'foto', 'end'
-!!				end
-!!			end
-!!		end
-!!	end
-!!end
-
 if $ARGS[0] = 'commercial':
 	!!Payment for the foto shoot
 	if practice_session = 0:

+ 645 - 48
locations/foto_events.qsrc

@@ -108,17 +108,17 @@ if $ARGS[0] = 'studio_strip_talk2':
 				studio_underwear = daystart + 7
 				cla & *clr
 				if $braworntype ! 'none':
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-					'"No! Please!"  you cry. "I''m still not ready! I need more time! What if I just keep my panties for a little longer? Just go topless instead of full nude?"'
-					'The manager looks at your already breasts with obvious confusion and resist the urge to cover them up with your hands with great difficulty.'
-					'"But you''re already topless."'
-					'"Exactly!" you say, trying to cover yourself with excuses. "I, uhh, purposely didn''t wear a bra today. I''m still not ready but I took the initiative to help myself get more used to it. That has to count for something right?"'
-				else
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip1.mp4"><center>'
 					'"No! Please!"  you cry. "I''m still not ready! I need more time! What if I just keep my panties for a little longer? Just go topless instead of full nude?"'
 					gs'bras','remove'
 					gs'stat'
 					'In your desperation, you throw off your bra as fast as you can. You don''t feel confident enough to be doing this but even this is better than having to take off your panties and show your pussy too. Once your bra is on the floor, the manager glances up and down, back and forth between your breasts and your increasingly red face.'
+				else
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
+					'"No! Please!"  you cry. "I''m still not ready! I need more time! What if I just keep my panties for a little longer? Just go topless instead of full nude?"'
+					'The manager looks at your already breasts with obvious confusion and resist the urge to cover them up with your hands with great difficulty.'
+					'"But you''re already topless."'
+					'"Exactly!" you say, trying to cover yourself with excuses. "I, uhh, purposely didn''t wear a bra today. I''m still not ready but I took the initiative to help myself get more used to it. That has to count for something right?"'
 				end
 				'"Fine, fine," he grumbles. "I''ll give you one more week. But that''s it! At the end of this week I expect those panties to come off! Now get to work!"'
 				'The manager turns around and walks away and you heave a sigh of relief at his departure. It''s not exactly what you want, but you still have one more week now...'
@@ -246,6 +246,584 @@ if $ARGS[0] = 're-dress':
 	studio_underwear_steal = 0
 	act'Leave':gt 'down'
 end
+
+if $ARGS[0] = 'commercial':
+	!!Payment for the foto shoot
+	if practice_session = 0:
+		model_job_week += 1
+		model_week = (daystart - week) / 7
+		modelfoto += 1
+		money += modelpayfin
+		modelfotomoney += modelpayfin
+		gt 'foto','studio'
+	else
+		practice_session = 0
+	end
+
+	*clr & cla
+	menu_off = 1
+	commercial = 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'As you wrap the shoot, a staffer at the studio walks up to you and grabs your attention.'
+	'"Hey, <<$pcs_firstname>>, I''m glad I caught you. Listen, we have a special opportunity for you if you''d like to hear about it."'
+	act '"Special opportunity?"':
+		cla
+		'"Yeah. See, you''ve been doing good work here. There are people who are really impressed with your ability to take direction and with the boldness and confidence you have in your body. With that in mind, word has been going around that they want one of our models to be the actress in their commercial. So, I thought I''d ask you."'
+		act '"A commercial? You mean I could become an actress?"':
+			cla
+			*nl
+			'"Yes, that''s exactly what we''re saying. This is an opportunity for you to start branching out your career from just modelling and into acting. Would you like to hear more about the job?"'
+			act '"Sure, tell me about it"':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+				'"The job is for a big time network. The idea for the commercial is they need a pretty girl walking down the street with their logos CGI''d over your breasts and between your thighs and passers-by having their attention drawn to you as you walk."'
+				act '"That doesn''t sound too difficult"':
+					cla
+					*nl
+					'"But there''s a catch. See, the marketing team has determined that in order to get the right reactions from people going by, you can''t just wear a strapless bikini. You''re going to have to walk down the street completely naked. That being said, the studio is willing to pay you triple our usual nude modelling rate. Are you still willing to do the shoot?"'
+					act '"Sure! I''ve always wanted to be an actress!"':
+						cla
+						*nl
+						'"Sure!" you say. "I''ve always wanted to be an actress, I just never thought I''d get a chance like this. When do we shoot?"'
+						casting = 3
+						if week >= 6:
+							SMTV_commercial = daystart - week + 13
+							'He hands you a business card for a talent agency in the city center. "Be here next Saturday at 10:00, this is where they said they were going to set up the shoot."'
+							act 'Thank him and go':gt 'foto','studio'
+						else
+							SMTV_commercial = daystart - week + 6
+							if week = 5:
+								'He hands you a business card for a talent agency in the city center. "Be here tomorrow at 10:00, this is where they said they were going to set up the shoot."'
+								act 'Thank him and go':gt 'foto','studio'
+							else
+								'He hands you a business card for a talent agency in the city center. "Be here on Saturday at 10:00, this is where they said they were going to set up the shoot."'
+								act 'Thank him and go':gt 'foto','studio'
+							end
+						end
+					end
+
+					act '"Triple rate?! Hell yeah!"':
+					casting = 3
+						cla
+						'"Triple rate?! Hell yeah! Who cares about being naked in public when I''m getting paid that much! I''d let them gangbang me for that kind of money!"'
+						*nl
+						'"I''m sure they''d be happy to arrange that with you some other time," he says with a shit eating grin.'
+						'You punch him playfully on the arm.'
+						act '"So when do we shoot?"':
+						cla
+							casting = 3
+							if week >= 6:
+								SMTV_commercial = daystart - week + 13
+								'He hands you a business card for a talent agency in the city center. "Be here next Saturday at 10:00, this is where they said they were going to set up the shoot."'
+								act 'Thank him and go':gt 'foto','studio'
+							else
+								SMTV_commercial = daystart - week + 6
+								if week = 5:
+									'He hands you a business card for a talent agency in the city center. "Be here tomorrow at 10:00, this is where they said they were going to set up the shoot."'
+									act 'Thank him and go':gt 'foto','studio'
+								else
+									'He hands you a business card for a talent agency in the city center. "Be here on Saturday at 10:00, this is where they said they were going to set up the shoot."'
+									act 'Thank him and go':gt 'foto','studio'
+								end
+							end
+						end
+					end
+
+					act '"I have to be naked in public...?"':
+						cla
+						*nl
+						'You blush imagining being on the set in public on a busy street and embarrassedly ask,'
+						'"I''m going to have to walk down the street completely naked in broad daylight...?"'
+						'"Yes, I''m afraid so. The producers won''t budge on this. I''ve been promised that they aren''t going to be broadcasting your uncensored body all over television though. So if you accept, you''ll be guaranteed that at least. So, will you do it?"'
+						act '"I guess so..."':
+							cla
+							*nl
+							'"I guess so," you say. "Since they''re paying so much, it''s hard to turn down. Besides, it might be worth it to break into acting, right?"'
+							casting = 3
+							if week >= 6:
+								SMTV_commercial = daystart - week + 13
+								'"If it means anything to you, I think you''re making the right choice for your career." He hands you a business card for a talent agency in the city center. "Be here next Saturday at 10:00, this is where they said they were going to set up the shoot."'
+								act 'Thank him and go':gt 'foto','studio'
+							else
+								SMTV_commercial = daystart - week + 6
+								if week = 5:
+									'"If it means anything to you, I think you''re making the right choice for your career." He hands you a business card for a talent agency in the city center. "Be here tomorrow at 10:00, this is where they said they were going to set up the shoot."'
+									act 'Thank him and go':gt 'foto','studio'
+								else
+									'"If it means anything to you, I think you''re making the right choice for your career." He hands you a business card for a talent agency in the city center. "Be here on Saturday at 10:00, this is where they said they were going to set up the shoot."'
+									act 'Thank him and go':gt 'foto','studio'
+								end
+							end
+						end
+
+						act '"No, it''s too much for me"':
+							cla
+							*nl
+							'"No," you say with some regret. "Even with all that money, that''s not the kind of model or actress I want to be known for."'
+							'"Ahh, well that''s a shame. Anyways, I''ll let you go now. See you later <<$pcs_firstname>>"'
+							act 'Go back to modelling':gt 'foto', 'studio'
+						end
+					end
+				end
+			end
+
+			act '"No thanks, I''m happy just being a model"':
+				cla
+				commercial = 2
+				casting = 1
+				*nl
+				'"Ahh, well that''s a shame. Anyways, you''re here today. Is there something you''d like to work on?"'
+				act 'Go back to modelling':gt 'foto', 'studio'
+			end
+		end
+	end
+end
+
+!!------------------------------------------------------------------- Persuasion Events ------------------------------------------------------------------
+
+if $ARGS[0] = 'fashion_persuasion':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"I''d like to do a catalogue shoot," you say.'
+	if foto_persuade = 0:
+		'The manager twists his mouth as he considers.'
+		'"Listen, <<$pcs_firstname>>, you''ve been here a while, you''ve done quite a few catalogue jobs for us and your skills have really improved since you first started."'
+		'"Oh. Uhh, thanks."'
+		'"Some of the staff around here have been talking and we really think that you''re ready to up your game. How about we do a full fashion shoot instead of cataloguing swimsuits or dresses? You can make a bit more money doing a fashion shoot instead of a catalogue one."'
+	elseif foto_persuade = 1:
+		'"You know, that offer to do a fashion shoot is still open you know. We really think you have what it takes! Want to give it a try?"'
+	end
+	
+	act'No thanks':
+		cla & *clr
+		foto_persuade = 1
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"Thanks for the offer, but I think I''d be more comfortable just sticking to the catalogues for now."'
+		'"Oh. Okay..."'
+		'The manager seems disappointed by your answer.'
+		'"So clothing or swimsuits today?"'
+		act'Clothing':
+			modelfoto_catalog += 1
+			cla & *clr
+			mdlng_exp += rand(2,5)
+			minut += 120
+			money += 450
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion3.mp4"></video></center>'
+			'You spend two hours modelling for the online catalogs of retail clothing stores, wearing various different dresses but the same expression. It''s boring but it still gets you paid.'
+			*nl
+			'You recieve 450 <b>₽</b> for the job.'
+			act 'Leave':gt 'foto', 'end'
+		end
+		act'Swimsuits':
+			modelfoto_catalog += 1
+			cla & *clr
+			mdlng_exp += rand(2,5)
+			minut += 120
+			money += 450
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini<<rand(3,5)>>.mp4"></video></center>'
+			bikinicatalog += 1
+			'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
+			*nl
+			'You recieve 450 <b>₽</b> for the job.'
+			act 'Leave':gt 'foto', 'end'
+		end
+	end
+	
+	act'Yes':
+		cla & *clr
+		foto_persuade = 2
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"That sounds really good actually! I''ll do it!"'
+		'The manager smiles wide at you.'
+		'"Great! Then go to this set here and the photographer will be ready for you."'
+		act'Do the fashion shoot':gt'foto_shoot','fashion'
+	end
+end
+
+if $ARGS[0] = 'lingerie_persuasion':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"I''d like to do a fashion shoot," you say.'
+	if foto_persuade = 0:
+		'By the way <<$pcs_firstname>>, you''ve been here a while, you''ve done quite a few fashion jobs for us and your work for us has been great!"'
+		'"Oh! Thanks!"'
+		'"But we also think that you could take it a step farther, show off more of your beautiful body. How would you feel about doing a lingerie shoot? The exposure is about the same but the pay is a little bit better. What do you say?"'
+	elseif foto_persuade = 2:
+		'"By the way <<$pcs_firstname>>, the staff have been talking again. You remember how we originally had to ask you to give fashion shoots a try? We were thinking that it might be time for you to take another step and try out a lingerie shoot? The exposure is about the same but lingerie shoots pay a little bit more than fashion. What do you say? Give it a try?"'
+	elseif foto_persuade = 1:
+		'"We can do a fashion shoot today if you like, but the studio would still really love to see you do that lingerie shoot. What do you say?"'
+	end
+	
+	gs 'willpower', 'skill', 'pcs_inhib', 'resist'
+	if will_cost <= pcs_willpwr:
+		act'No thanks (<<will_cost>> Willpower)':
+			cla & *clr
+			foto_persuade = 1
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Thanks for the offer, but I think I''ll keep on doing regular fashion shoots for now."'
+			'"Oh. Okay..."'
+			act'Do the fashion shoot':gt'foto_shoot','fashion'
+		end
+	else
+		act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	
+	if foto_persuade = 2 and pcs_inhib < 20:
+		act'I guess so':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Well... I guess it turned out well last time..."'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and the photographer will be ready for you."'
+			act'Do the lingerie shoot':gt'foto_shoot','lingerie'
+		end
+	else
+		act'Yes':
+			cla & *clr
+			foto_persuade = 2
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"That sounds really good actually! I''ll do it!"'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and the photographer will be ready for you."'
+			act'Do the lingerie shoot':gt'foto_shoot','lingerie'
+		end
+	end
+end
+
+if $ARGS[0] = 'glamour_persuasion':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	if foto_persuade = 0:
+		'The manager twists his mouth as he considers.'
+		'"Listen, <<$pcs_firstname>>, you''ve been here a while, you''ve done really great fashion work for us while modelling here."'
+		'"Oh! Thanks!"'
+		'"But we also think that you could take it a step farther, show off more of your beautiful body. You''ve never done a glamour shoot yet, what do you say to giving that a try?"'
+	elseif foto_persuade = 1:
+		'"We can do a lingerie shoot today if you like, but the studio would still really love to see you do that glamour shoot. What do you say?"'
+	elseif foto_persuade = 2:
+		'"Hey <<$pcs_firstname>>, the staff have been talking again. You want to try upgrading shoots again? We were wondering if you''d consider trying a glamour shoot today?"'
+	elseif foto_persuade = 3:
+		'"Hey I''m sorry to bother you like this again, but we would still really love to see you do that glamour shoot. What do you say? Willing to give it a try today?"'
+	end
+	
+	if foto_persuade = 3:
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist',
+		if will_cost <= pcs_willpwr:
+			act'No thanks (<<will_cost>> Willpower)':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+				'"Thanks for the offer, but I think I''ll stick to the lingerie shoot today."'
+				'"Oh. Okay."'
+				act'Do the lingerie shoot':gt'foto_shoot','lingerie'
+			end
+		else
+			act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		if pcs_inhib < 45:
+			act'I guess I could try it...':
+				cla & *clr
+				foto_persuade = 2
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+				'"I guess I could try it..."'
+				'"Great! Thank you so much <<$pcs_firstname>>! Just go to this set and we''ll set somebody up for you."'
+				act'Do the transparent clothing shoot':gt'foto_shoot','transparent'
+			end
+		else
+			act'Yes, I''m ready':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+				'"You know what? Yeah, I think I''ll give it a try today. I think I''m ready."'
+				'The manager smiles wide at you.'
+				'"Great! Then go to this set here and a photographer will be ready for you."'
+				act'Do the lingerie shoot':gt'foto_shoot','fashion'
+			end
+		end
+	else
+		gs 'willpower', 'skill', 'pcs_inhib', 'resist'
+		if will_cost <= pcs_willpwr:
+			act'No thanks (<<will_cost>> Willpower)':
+				cla & *clr
+				foto_persuade = 1
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+				'"Thanks for the offer, but I think I''ll stick to the lingerie shoot today."'
+				'"Oh. Okay..."'
+				act'Do the lingerie shoot':gt'foto_shoot','lingerie'
+			end
+		else
+			act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+		
+		act'What kind of glamour shoot?':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Well... maybe..." you say slowly. "What kind of shoot were you thinking?"'
+			'"Well how about a fashion shoot with transparent clothing? You''ve never shown your breasts before yet, have you?"'
+			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
+			
+			if will_cost <= pcs_willpwr:
+				act'No way! (<<will_cost>> Willpower)':
+					cla
+					*nl
+					'"What?! No way! I''m not showing my breasts on camera!"'
+					'"Oh, well, maybe that is actually a step too far right now. Well, what about just some sexy clothing? Something a little skimpy but not totally revealing? How does that sound?"'
+					gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+					if will_cost <= pcs_willpwr:
+						act'No (<<will_cost>> Willpower)':
+							cla & *clr
+							foto_persuade = 3
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+							'"No, I''m not doing anything like that. I''m just going to stick to my lingerie shoot today."'
+							'"Oh, okay. That''s fine <<$pcs_firstname>>. Maybe another time."'
+							act'Do the lingerie shoot':gt'foto_shoot','lingerie'
+						end
+					else
+						act'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act'That''s not so bad...':
+						cla & *clr
+						foto_persuade = 4
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+						'"That''s not so bad I guess... I''m already doing lingerie so that''s not much of a difference."'
+						'"Yes, exactly! Think of it just like that. Thanks for this <<$pcs_firstname>>. Just go to this set and we''ll set somebody up for you."'
+						act'Do the glamour shoot':gt'foto_shoot','skimpy_clo'
+					end
+				end
+			else
+				act'No way! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+
+			if foto_persuade = 2 and pcs_inhib < 45:
+				act'I guess so':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+					'"Well... I guess it turned out well last time... I could give it a try..."'
+					'The manager smiles wide at you.'
+					'"Great! Then go to this set here and the photographer will be ready for you."'
+					act'Do the lingerie shoot':gt'foto_shoot','fashion'
+				end
+			elseif pcs_inhib < 45 or foto_persuade = 3:
+				act'I guess I could try it...':
+					cla & *clr
+					foto_persuade = 2
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+					'"I guess I could try it..."'
+					'"Great! Thank you so much <<$pcs_firstname>>! Just go to this set and we''ll set somebody up for you."'
+					act'Do the transparent clothing shoot':gt'foto_shoot','transparent'
+				end
+			else
+				act'Yes':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+					'"That sounds really good actually! I''ll do it!"'
+					'The manager smiles wide at you.'
+					'"Great! Then go to this set here and the photographer will be ready for you."'
+					act'Do the lingerie shoot':gt'foto_shoot','fashion'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'trans_persuasion':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	if foto_persuade = 0:
+		'"Hey, <<$pcs_firstname>>, I just wanted to say, the studio has really been loving your work lately."'
+		'"Oh! Thanks!"'
+		'"But we also think that you could take it a step farther, be a bit bolder. You''ve never done a transparent top shoot yet, what do you say to giving that a try?"'
+	elseif foto_persuade = 1:
+		'"Hey, I know I asked before and we can do another basic glamour shoot today if you like, but the studio would still really love to see you do a transparent shoot. Do you think you might be up for it today?"'
+	elseif foto_persuade = 2:
+		'"Hey <<$pcs_firstname>>, the staff have been talking again. You remember how we got you to upgrade from catalogue shoots to fashion shoots? We were thinking that it might be time for you to take another step and try doing some lingerie shoots? The exposure is about the same but lingerie shoots pay a little bit more than fashion. What do you say? Give it a try?"'
+	elseif foto_persuade = 3:
+		'"Hey I''m sorry to bother you like this again, but we would still really love to see you do a basic glamour shoot. What do you say? Willing to give it a try today?"'
+	elseif foto_persuade = 4:
+		'"Hey <<$pcs_firstname>>, the staff have been talking again. I know I asked before, but I was wondering if you might be more comfortable now. Is it possible that you might consider doing a transparent clothing shoot today instead of a basic glamour one? No pressure if not, but I just wanted to check and see if you''re ready."'
+	end
+	
+	gs 'willpower', 'skill', 'pcs_inhib', 'resist'
+	if will_cost <= pcs_willpwr:
+		act'No thanks (<<will_cost>> Willpower)':
+			cla & *clr
+			foto_persuade = 1
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Thanks for the offer, but I think I''ll stick to the basic glamour shoot today."'
+			'"Oh. Okay..."'
+			act'Do the glamour shoot':gt'foto_shoot','skimpy_clo'
+		end
+	else
+		act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	
+	if foto_persuade > 1 and foto_persuade < 4 and pcs_inhib < 45:
+		act'I guess so':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Well... I guess it turned out well last time..."'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and the photographer will be ready for you."'
+			foto_persuade = 2
+			act'Do the transparent shoot':gt'foto_shoot','transparent'
+		end
+	elseif foto_persuade = 1 or foto_persuade = 4:
+		act'Yes, I''m ready':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"You know what? I think I <i>am</i> ready. I''ll give it a try."'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and a photographer will be ready for you."'
+			foto_persuade = 2
+			act'Do the transparent shoot':gt'foto_shoot','transparent'
+		end
+	else
+		act'Yes':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"That sounds really good actually! I''ll do it!"'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and the photographer will be ready for you."'
+			foto_persuade = 2
+			act'Do the transparent shoot':gt'foto_shoot','transparent'
+		end
+	end
+end
+
+if $ARGS[0] = 'topless_persuasion':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	if foto_persuade = 0:
+		'"Hey <<$pcs_firstname>>, I just wanted to say, the studio has really been loving your work lately."'
+		'"Oh! Thanks!"'
+		'"But we also think that with your looks and your talent, you could take it a step farther, be a bit bolder. You''ve never done a topless shoot before, have you? You''ve already been doing the transparent stuff, what do you say to taking the whole thing off today?"'
+	elseif foto_persuade = 1:
+		'"We can do another transparent shoot today if you like, but the studio would still really love to see you do a topless shoot. What do you say?"'
+	elseif foto_persuade = 2:
+		'"Hey <<$pcs_firstname>>, you seem to be doing really well with the transparent shoots, just like we thought. I know that initially took some convincing, but we got here didn''t we? Now, I was wondering if you''d like to try go a step further just like before and take the whole top off? You''ve never done a topless shoot and it isn''t much different from what we''re doing now. Our rates for topless shoots are better and you''ll get a lot more exposure than what you''re doing now. Want to try it?"'
+	end
+	
+	gs 'willpower', 'skill', 'pcs_inhib', 'resist'
+	if will_cost <= pcs_willpwr:
+		act'No thanks (<<will_cost>> Willpower)':
+			cla & *clr
+			foto_persuade = 1
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Thanks for the offer, but I think I''ll stick to what I''m doing for now."'
+			'"Oh. Okay..."'
+			if shoot_type = trans_ling:
+				act'Do the lingerie shoot':gt'foto_shoot','trans_ling'
+			else
+				act'Do the transparent shoot':gt'foto_shoot','transparent'
+			end
+		end
+	else
+		act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	
+	if foto_persuade = 2 and pcs_inhib < 50:
+		act'I guess so':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Well... I guess you''re right, it isn''t that much different. I suppose I can give it a shot..."'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and the photographer will be ready for you."'
+			foto_persuade = 2
+			act'Do the topless shoot':gt'foto_shoot','topless'
+		end
+	elseif foto_persuade = 1:
+		act'Yes, I''m ready':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"You know what? Yeah, I think I''ll give it a try today. I think I <i>am</i> ready!"'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and a photographer will be ready for you."'
+			foto_persuade = 2
+			act'Do the topless shoot':gt'foto_shoot','topless'
+		end
+	else
+		act'Yes':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"That sounds really good actually! Let''s do it!"'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and the photographer will be ready for you."'
+			foto_persuade = 2
+			act'Do the topless shoot':gt'foto_shoot','topless'
+		end
+	end
+end
+
+if $ARGS[0] = 'nude_persuasion':
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	if foto_persuade = 0:
+		'"Hey, <<$pcs_firstname>>, I just wanted to say, your work has been stunning lately! Really fantastic!"'
+		'"Oh! Uhh, thanks!"'
+		'"Your work is so great, we would love to show everything you''ve got to offer. Now, feel free to say no, but what do you say to a full frontal nude shoot? I know it might be a little explicit, but the studio and our readers would love it. We''re even willing to throw in a bonus and double your pay for your full nude debut. What do you say?"'
+	elseif foto_persuade = 1:
+		'"Hey, that''s cool <<$pcs_firstname>>. But I just want you to know that the studio''s nude offer with bonus pay is still on the table if you want to do that instead."'
+	elseif foto_persuade = 2:
+		'"Hey <<$pcs_firstname>>, I''ve got a new offer from the studio for you. They''ve really loved your willingness to try new things like with the past shoots and all and they wanted to know if you would like to step it up to the final level. Would you be willing to do a full frontal nude shoot with us? As a special bonus, the studio said they''re willing to double your pay for your full debut. I have to say, this is a great offer. What do you think of it?"'
+	end
+	
+	gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
+	if will_cost <= pcs_willpwr:
+		act'No thanks (<<will_cost>> Willpower)':
+			cla & *clr
+			foto_persuade = 1
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Thanks for the offer, that''s really kind, but I think I''ll stick to what I''m doing for now."'
+			'"Oh. Okay..."'
+			if shoot_type = topless:
+				act'Do the topless shoot':gt'foto_shoot','topless'
+			elseif shoot_type = taste_nude:
+				act'Do the tasteful nude shoot':gt'foto_shoot','tasteful'
+			elseif shoot_type = top_nude:
+				act'Do the topless nude shoot':gt'foto_shoot','topless_nude'
+			end
+		end
+	else
+		act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	
+	if foto_persuade = 2 and pcs_inhib < 60:
+		act'Wow! I... I guess I''ll take it':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Wow! That''s a really amazing offer! I mean... well to be honest, I''m not sure if I''m ready for that but... I guess, I''ll do it if the studio really believes in me so much."'
+			'The manager smiles wide at you.'
+			'"The special bonus doesn''t hurt either," you smile back shyly.'
+			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
+			foto_persuade = 5
+			act'Do the nude shoot':gt'foto_shoot','nude'
+		end
+	elseif foto_persuade = 1 and pcs_inhib < 60:
+		act'Well... I guess':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Well..." You mull it over a little bit more, still unsure of yourself. "I mean, I... I guess I can give it a try."'
+			'The manager smiles wide at you. "Thank you so much for your courage <<$pcs_firstname>>."'
+			'"The special bonus doesn''t hurt either," you smile back shyly.'
+			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
+			foto_persuade = 5
+			act'Do the nude shoot':gt'foto_shoot','nude'
+		end
+	elseif foto_persuade = 1:
+		act'Yes, I''m ready':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"You know what? I think I''m ready to do it today! I''ll do the nude shoot," you say, smiling. "And I''ll take the bonus."'
+			'The manager laughs showing you his clipboard. "Go to this set here and everything is already set up for you."'
+			foto_persuade = 5
+			act'Do the nude shoot':gt'foto_shoot','nude'
+		end
+	else
+		act'Wow! Yes!':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Wow! That''s a really amazing offer! That''s so generous! Yes! I''ll absolutely do it!"'
+			'The manager smiles wide at you.'
+			'"Great! Then go to this set here and the photographer will be ready for you."'
+			foto_persuade = 5
+			act'Do the nude shoot':gt'foto_shoot','nude'
+		end
+	end
+end
+
 !!------------------------------------------------------------------- Special Modelling Jobs ------------------------------------------------------------------
 
 if $ARGS[0] = 'special':
@@ -257,7 +835,7 @@ if $ARGS[0] = 'special':
 		specialjob3 = rand(1,100)
 		specialjob4 = rand(1,100)
 		specialjob5 = rand(1,100)
-!!		specialjob6 = rand(1,100)
+		specialjob6 = rand(1,100)
 !!		specialjob7 = rand(1,100)
 !!		specialjob8 = rand(1,100)
 !!		specialjob9 = rand(1,100)
@@ -293,10 +871,11 @@ if $ARGS[0] = 'list':
 	if specialjob3 >= 95:'<a href="exec:gt ''foto_events'',''modern_art''">	Modern Art Project(69)</a>'
 	if specialjob4 >= 95:'<a href="exec:gt ''foto_events'',''aphrodite_advert''">	Aphrodite Advert</a>'
 	if specialjob5 >= 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
-!!	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''documentary''">	Documentary</a>'
-!!	if specialjob7 >= 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
+	!!if specialjob5 >= 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
+	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
 !!		if specialjob8 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
 !!		if specialjob9 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
+!!	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''documentary''">	Documentary</a>'
 end
 
 if $ARGS[0] = 'high_fasion':
@@ -314,7 +893,7 @@ if $ARGS[0] = 'high_fasion':
 		'"Great! Go to set 14 and tell the photographer that you''ve got the job. They''ll dress you up there."'
 		act'Do the shoot':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/art3.jpg"></center>'
 			minut += 120
 			modelpayfin = 1800 + (modelpay * 2) + (50*rand(0,7))
 			modelfoto_pussy += 1
@@ -443,7 +1022,7 @@ if $ARGS[0] = 'fine_art':
 									act'Resign yourself to your fate':
 										fine_art_deal = 2
 										cla & *clr
-										'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/art1.jpg"></center>'
+										'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/art1.jpg"></center>'
 										'You look on in horror with the realization that there is nothing you can do to convince this woman to change her mind. Her obsession with art is too great.'
 										'She excitedly shouts instructions at you and her assistant.'
 										'"Do not hide your feelingz! Let them bubble to ze top! Let your emotions be vizible and zelf-evident! But maintain ze posture and hold still, or ze 3D scanner vill not capture you accurately. Are ve ready? Good! Do it! Do it now Alexhandar!"'
@@ -494,7 +1073,7 @@ if $ARGS[0] = 'fine_art2':
 	if fine_art_deal = 1 or fine_art_deal = 2:
 		gs 'arousal', 'vaginal', 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/art1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/art1.jpg"></center>'
 		'"AHH!!!"'
 		'You shriek in pain as Alexander thrusts his enormous 34 cm cock inside you. Far too big for your virgin pussy, only about half of his length fits inside you. The woman shakes her head. '
 		'"No, no, Alexhandar. It iz no good like zat. All ze way inside." He immediately does as instructed, gripping your shoulder and he pulling you back while simultaneously pushing his hips forward. You gasp for breath, eyes watering, as he slowly drives the entire length of his cock inside your pussy centimeter by centimeter, stretching you to a breaking point. When his cock is fully enveloped and balls are brushing up against your clit, you hear the woman again.'
@@ -510,7 +1089,7 @@ if $ARGS[0] = 'fine_art2':
 			pcs_mood -= 5
 			gs 'arousal', 'end'
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/art1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/art1.jpg"></center>'
 			'You spend the next ninety minutes holding the position for the artist woman. The scan finishes in the first 15 minutes but the client insists on her models continuing to stand stock still until her drawing is completed.'
 			'"You cannot zubstitute a perzon for pictures once you have already begun with a living creature. Art iz about <i>life</i>. Without ze proper reference, you cannot truly capture life''s essence." Alexander, the perfect model, literally allows you no wiggle room. His grip is like iron, holding you tight against him, maintaining his pose with perfect posture. Even his cock is unflinching, neither throbbing nor softening even for a single second. For all 90 minutes it maintains peak hardness, like a sword stabbing into you, threatening to tear you in half at any moment.'
 			'Finally, she calls for a stop and allows you to be released from your position. You lean forward, easing yourself off of Alexander''s enormous cock. Your pussy releases it with a pop and you feel hollow, an enormous aching void between your legs. You feel something leaking out and looking back, you see the red drops of your virgin blood, running down your thighs, staining the sheet beneath you. Alexander''s cock is coated in it as well, glistening crimson. Looking to the side, you see the woman studying her drawing and looking back to a computer screen, comparing the two.'
@@ -533,7 +1112,7 @@ if $ARGS[0] = 'fine_art2':
 		money += modelpayfin
 		modelfotomoney += modelpayfin
 		minut += 90
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/art1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/art1.jpg"></center>'
 		'You hold the position with Alexander, feeling his thick cock extending out under you, brushing against your thighs and stomach. The woman clicks a button and cameras flash all around you and the red line of scanners begin to slowly ascend your body from bottom to top. As the scanner moves, you see her sit down in front of an easel from the corner of your eye and begin to draw.'
 		*nl
 		'90 minutes pass before she is finished sketching. When she is finished, she compares her sketch to a nearby computer screen, still trying to decide which form she wants her art to take. Shaking her head, she calls an end to the shoot and you are allowed to break from your position, stretching your stiff muscles.'
@@ -552,7 +1131,7 @@ if $ARGS[0] = 'fine_art2':
 		money += modelpayfin + 2000
 		modelfotomoney += modelpayfin + 2000
 		minut += 90
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/art1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/art1.jpg"></center>'
 		if pcs_vag <= 10:
 			'Alexander pushes himself inside you. You can''t help but release a small grunt of discomfort as his 34 cm cock stretches your <<$pcdesc_pussy>> pussy. It takes a few tries to get his exceptional length and girth all the way inside before settling back into the exact posture you were instructed to hold. The woman clicks a button and cameras flash all around you and the red line of scanners begin to slowly ascend your body from bottom to top. As the scanner moves, you see her sit down in front of an easel from the corner of your eye and begin to draw.'
 			*nl
@@ -605,7 +1184,7 @@ if $ARGS[0] = 'modern_art':
 			'"Cool! Guess we''ll get started then. Now, if the two of you could just get up on this platform together..."'
 			act'Do the shoot':
 				cla & *clr
-				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/art2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/art2.jpg"></center>'
 				minut += 90
 				modelpayfin = 2000 + (50+rand(1,9)*rand(0,7))
 				money += modelpayfin
@@ -655,7 +1234,7 @@ if $ARGS[0] = 'aphrodite_advert':
 			city_modelling += rand(40,60)
 			pav_modelling += rand(0,city_modelling)/4
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/group.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/group.jpg"></center>'
 			'You go to the designated set and find the other girls waiting there, idling chatting to each other and gossiping. You join them and when the head photographer shows up, he begins to give you all instructions.'
 			*nl
 			'The next two hours are spent being posed, positioned, and re-positioned into various arrangements and groupings, ensuring that the advertising department has a diverse set of options to work with.'
@@ -683,7 +1262,6 @@ if $ARGS[0] = 'independent_art':
 		act'Do the shoot':
 			hpingripw = 1
 			minut += 120
-			modelpayfin = 1000
 			minut += 120
 			gs'stat'
 			modelpayfin = 1600 + (modelpay) + (35*rand(0,5))
@@ -693,7 +1271,7 @@ if $ARGS[0] = 'independent_art':
 			mdlng_exp += rand(2,8)
 			city_modelling += rand(12,16)
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/art3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/art3.jpg"></center>'
 			'You go to the designated set where you find several other girls dressed in graceful and sophisticated clothing that is also completely sheer. At your approach, you are directed to put on one of these outfits yourself and get your hair done by the team of the makeup artists present.'
 			*nl
 			'The next two hours after that are spent being posed quite elegantly, as promised by the request. The shoot ends and you go back to the manager who pays you <<modelpayfin>> <b>₽</b> for the job.'
@@ -702,6 +1280,36 @@ if $ARGS[0] = 'independent_art':
 	end
 end
 
+if $ARGS[0] = 'designer_wedding':
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"Designer wedding dress?" you ask. "We do this kind of work?"'
+	'"When it''s this kind of designer we do. It''s another one of those high fashion type things, taking a look at the bridal fashion, looking to make it more dramatic, more exciting, more sexual. Anyways, bottom line, I wouldn''t call this a ''dress.'' I''d barely call it clothing actually. It''s pretty much just gloves, stockings, and lingerie. I guess it''s a little bit like a wedding dress in that it has a veil. Anyways, that''s the request. Wear the stuff, show some skin, including pussy and tits (I don''t know why), we take the pictures to send to her so she can share them with her designer friends. So, what do you say?"'
+	act'Back to the list':gt'foto_events','list'
+	act'I''d like to do this one':
+		cla
+		*nl
+		specialjob6 = 0
+		'"Great! Go to set 12. The client will be waiting for you there with some other girls. Just do as he says and come see me for the payment after."'
+		act'':
+			minut += 60
+			gs'stat'
+			modelpayfin = 1200 + (modelpay) + (35*rand(0,5))
+			money += modelpayfin
+			modelfotomoney += modelpayfin
+			modelfoto_nip += 1
+			modelfoto_pussy += 1
+			mdlng_exp += rand(2,4)
+			city_modelling += rand(8,16)
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/special/wedding.jpg"></center>'
+			'You go to set 12 where you put on the "dress" which really <i>is</i> just stockings, gloves, and a veil. You and the photographer spend about an hour in a few poses, including a few that have pulled back the bra and panties before wrapping up.'
+			*nl
+			'The shoot ends and you go back to the manager who pays you <<modelpayfin>> <b>₽</b> for the job.'
+			act'Go back to the main floor':gt'foto','studio'
+		end
+	end
+end
 
 !!if $ARGS[0] = 'documentary':
 !!	cla & *clr
@@ -713,23 +1321,12 @@ end
 !!	act'I''d like to do this one':
 !!		cla
 !!		*nl
-!!		specialjob6 = 0
-!!
-!!end
-
-!!if $ARGS[0] = 'designer_wedding':
-!!	cla & *clr
-!!	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-!!	'"Designer wedding dress?" you ask. "We do this kind of work?"'
-!!	'"When it''s this kind of designer we do. It''s another one of those high fashion type things, taking a look at the bridal fashion, looking to make it more dramatic, more exciting, more sexual. Anyways, bottom line, I wouldn''t call this a ''dress.'' I''d barely call it clothing actually. It''s pretty much just a veil, stockings, and lingerie. I guess it''s a little bit like a wedding dress in that it has lacy gloves. Anyways, that''s the request. Wear the stuff, show some skin, we take the pictures to send to her so she can share them with her designer friends. So, what do you say?"'
-!!	act'Back to the list':gt'foto_events','list'
-!!	act'I''d like to do this one':
-!!		cla
-!!		*nl
 !!		specialjob7 = 0
 !!
 !!end
 
+
+
 !!--------------------------------------- Fame events ----------------------------------------------
 if $ARGS[0] = 'topless1':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
@@ -747,7 +1344,7 @@ if $ARGS[0] = 'topless1':
 			'"You''re starting to make a name for yourself around here <<$pcs_firstname>>. I''m here to talk to you about a special offer."'
 			if casting > 0 and first_fame_event = 0:
 				'"Special offer? Like another commercial?"'
-				'"No, no. Not quite like that. We''ve been getting a lot of positive feedback about your work. One of the higher ups in the company asked us to put out a special issue that features exclusively you if you''re up for it. We wanted to do something special so the plan is to do it outside the studio in a place with more natural light. It''ll just be a topless shoot and will take a bit longer than usual to get there and set up, but we''ll pay you for it in addition to your normal once a week contract. What do you say? Are you in?"'
+				'"No, no. Not quite like that. We''ve been getting a lot of positive feedback about your work. One of the higher ups in the studio asked us to put out a special issue that features exclusively you if you''re up for it. We wanted to do something special so the plan is to do it outside the studio in a place with more natural light. It''ll just be a topless shoot and will take a bit longer than usual to get there and set up, but we''ll pay you for it in addition to your normal once a week contract. What do you say? Are you in?"'
 				if first_fame_event = 0:first_fame_event = 1
 				gs 'willpower', 'exhib', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:
@@ -825,23 +1422,23 @@ if $ARGS[0] = 'topless1.1':
 			gs 'clothing', 'strip'
 			gs 'underwear', 'remove'
 			gs 'stat'
-			'<center><video autoplay loop src="images/locations/city/citycenter/photo/fametopless1.mp4"></video></center>'
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame/fametopless1.mp4"></video></center>'
 			'They have you start in an oversized hoodie, teasing the camera with your breasts until you finally pull it all the way off and bare your shoulders.'
 			act'Continue':
 				*clr & cla
-				'<center><video autoplay loop src="images/locations/city/citycenter/photo/fametopless2.mp4"></video></center>'
+				'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame/fametopless2.mp4"></video></center>'
 				'The photographer has you play with some of the pillows on the furniture and then in a moment of spontaneous glee you drop kick it across the room.'
 				act'Continue':
 					*clr & cla
-					'<center><video autoplay loop src="images/locations/city/citycenter/photo/fametopless3.mp4"></video></center>'
+					'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame/fametopless3.mp4"></video></center>'
 					'Afterwards, you drop back down on the sofa, basking in the warmth of the sun.'
 					act'Continue':
 						*clr & cla
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fametopless4.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame/fametopless4.mp4"></video></center>'
 						'To end the shoot, you wiggle around on your back, letting gravity do the work as your breasts jiggle enticingly.'
 						act'Continue':
 							*clr & cla
-							'<center><video autoplay loop src="images/locations/city/citycenter/photo/fametopless5.mp4"></video></center>'
+							'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame/fametopless5.mp4"></video></center>'
 							minut += 120
 							'"Okay we''re all done here," the photographer says. "Did you have fun?"'
 							'You laugh hysterically for a moment and smile at him. You <i>did</i> have a lot of fun. "Even though I''ve been a model for a little while, I''m not sure I''ve ever done anything like this."'
@@ -945,7 +1542,7 @@ if $ARGS[0] = 'pool1':
 					act'Continue':
 						*clr & cla
 						minut += 180
-						modelpayfin = 3000 + (modelpay * 2) + (50*rand(0,7))
+						modelpayfin = 3000 + modelpay + (50*rand(0,7))
 						modelfoto_nip += 1
 						modelfoto_topless += 1
 						modelfoto_nude += 1
@@ -953,7 +1550,7 @@ if $ARGS[0] = 'pool1':
 						city_modelling += 35
 						pav_modelling += rand(0,city_modelling)/4
 						pcs_mood += 5
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame_pool.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame/pool.mp4"></video></center>'
 						'You spend various portions of the next few hours in and around the pool. Sometimes by yourself, sometimes with the other girls in the background. Eventually your portion of the shoot is over and you spend the rest of the time lazing on a chaise lounge while the other girls finish up. It''s so comfortable, you couldn''t care less when the photographers decide to snap a few more pictures of you and your invitingly exposed ass.'
 						act'Continue':
 							*clr & cla
@@ -1043,7 +1640,7 @@ if $ARGS[0] = 'tennis':
 					'You do some practice swings while they''re setting up a high speed camera to capture you in slow motion. Soon enough, they''re ready to begin.'
 					act'Continue':
 						*clr & cla
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame_tennis.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/fame/tennis.mp4"></video></center>'
 						'You give it your all and put in some vicious swings while one camera records and the other rapidly clicks.'
 						'As you make your strokes, you feel your fluid and free-moving breasts follow through with them, reminding you why you usually wear a sports bra for this kind of thing.'
 						'<i>And why they didn''t give me one for this shoot...</i> you think to yourself.'
@@ -1120,7 +1717,7 @@ if $ARGS[0] = 'topless2':
 					act'Do your job':
 						*clr & cla
 						 minut += 120
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill_topless.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill/skill_topless.mp4"></video></center>'
 						'You spend two hours walking around, posing, and generally looking sexy for the camera on the sunny penthouse pool balcony.'
 						act'Continue':
 							*clr & cla
@@ -1203,7 +1800,7 @@ if $ARGS[0] = 'beach2':
 						act'Start the shoot':
 							*clr & cla
 							minut += 180
-							'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill_beach.mp4"></video></center>'
+							'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill/skill_beach.mp4"></video></center>'
 							'You have a great time spending the next three hours posing and playing in the water with your breasts exposed. There''s one moment when a particularly big wave almost knocks your bottoms off and you end up mooning the crew for a couple seconds.'
 							'As the sun is setting, the shoot is finally finished and you all get ready to pack up and leave.'
 							act'Continue':
@@ -1275,7 +1872,7 @@ if $ARGS[0] = 'pool2':
 				act'Do the shoot':
 					minut += 120
 					*clr & cla
-					'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill_pool.mp4"></video></center>'
+					'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill/skill_pool.mp4"></video></center>'
 					'You spend two hours in and around the pool, dealing with and laughing about the struggles of water physics.'
 					act'Continue':
 						*clr & cla
@@ -1314,7 +1911,7 @@ if $ARGS[0] = 'runway2':
 		act'"What''s up?"':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
-			'Hey <<$pcs_firstname>>, listen. We have an emergency situation and we''re looking for whoever is available. A clothing company we sometimes shoot for is having a fashion show tonight but for some reason something''s gone wrong and they''re missing models."'
+			'Hey <<$pcs_firstname>>, listen. We have an emergency situation and we''re looking for whoever is available. A clothing studio we sometimes shoot for is having a fashion show tonight but for some reason something''s gone wrong and they''re missing models."'
 			'"Missing models?" you gasp. "You mean like they''ve disappeared or something?"'
 			'He looks confused for a second and says, "What? No! Just for whatever reason, they don''t have enough models for tonight. I don''t know if it''s because some of them got sick or had an accident or if they just planned poorly and were supposed to have more than they hired. In any case, we need people to jump in tonight. It''s going to be an all day thing though. We can''t have anymore hiccups so if you agree you''ll have to stay here until the show starts and then the show itself runs until 22:00 tonight. We know it''s a big commitment so if you do we''re willing to shell out a ton of money to make this work. We''re talking a three grand bonus on top of your normal variety shoot rate. Can we count on you for tonight?"'
 
@@ -1361,7 +1958,7 @@ if $ARGS[0] = 'runway2':
 				act'Continue':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/citycenter/photo/runway_waiting.mp4"></video></center>'
-					'Eventually the photographer succeeds in rounding up as many models including one really new girl who looks like it might have been her first day here when the photographer found her. You''re all sat down on a line of chairs and told to wait for the company to do your makeup and wardrobe.'
+					'Eventually the photographer succeeds in rounding up as many models including one really new girl who looks like it might have been her first day here when the photographer found her. You''re all sat down on a line of chairs and told to wait for the studio to do your makeup and wardrobe.'
 					act'Continue':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
@@ -1379,7 +1976,7 @@ if $ARGS[0] = 'runway2':
 							mdlng_exp += rand(8,10)
 							modelfoto_nip += 1
 							*clr & cla
-							'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill_runway.mp4"></video></center>'
+							'<center><video autoplay loop src="images/locations/city/citycenter/photo/skill/skill_runway.mp4"></video></center>'
 							'As soon as they send you down the runway you realize something''s gone wrong. The loose cleavage of the dress you''re wearing is too loose. With the kind of purposeful steps you''re taking and your breasts jiggling underneath, the fabric falls to the sides and your breasts are left completely exposed. You try your best to recover but the dress is just too loose and skimpy and no matter what you do your breasts end up coming loose.'
 							'With nothing left to it and not wanting to make a big deal out of it and ruin the show, you put on your best model smile and just get through the rest of your walk.'
 							act'Continue':
@@ -1451,7 +2048,7 @@ if $ARGS[0] = 'wet':
 						pcs_hairbsh = 1
 						pcs_makeup = 2
 						pcs_lipbalm += 8
-						'<center><video autoplay loop src="images/locations/city/citycenter/photo/wet.mp4"></video></center>'
+						'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/wet.mp4"></video></center>'
 						'You put on your makeup and follow him over to the water proof set in the studio and spend the next two hours shrieking and giggling as you get blasted with water while photographed nude.'
 						'He wasn''t kidding! That water is cold!'
 						act'Continue':

+ 366 - 54
locations/foto_models.qsrc

@@ -1261,7 +1261,7 @@ if $ARGS[0] = 'anastasiasextalk':
 		'You decide asking her for advice on giving blowjobs.'
 		'"You want advice on blowjobs? Of course dear. A couple tricks to remember:'
 		'First of all, watch your teeth. A penis is very sensitive so even slight grazing can be painful. To prevent that from happening, you have to curl your lips over your top teeth and stick your tongue out wide and flat to cover the bottom ones. Drool as much as you can, it''ll keep your lips from splitting if they''re dry and it really helps keep his cock nice and slick for reduced friction. It will also subconsciously cause you to open your mouth wider which can be helpful for especially girthy boys. Use lubricant if you can''t drool enough.'
-		'Second of all, if you''re trying to go for depth, the most important thing is to keep your throat relaxed. If your throat is tense, your gag reflex will kick in and you''ll choke. Nothing kills the mood like vomitting all over someone''s cock does it?" she says with a rueful smile. "Also, don''t give head for too long. That''s how you get lockjaw.'
+		'Second of all, if you''re trying to go for depth, the most important thing is to keep your throat relaxed. If your throat is tense, your gag reflex will kick in and you''ll choke. Nothing kills the mood like vomitting all over someone''s cock does it?" she says with a rueful smile. "Also, don''t give head for too long. That''s how you get lockjaw."'
 		*nl
 		'"Is there anything else you wanted to ask about?"'
 	end
@@ -1273,7 +1273,11 @@ if $ARGS[0] = 'anastasiasextalk':
 		'You decide asking her about regular sex.'
 		'"You want advice on vanilla sex? Of course dear." She leads you over to some nearby set furniture and bends over.'
 		'"If you''re doing it from behind, try it standing up. Get on your toes and stick your bum out like this. Being on the tips of your toes will make your leg muscles tense up and natural cause your vagina clench. Your vaginal walls will clamp down on his cock and will not only make it more enjoyable for the both of you but your orgasm will also be much more intense, so make sure you''re against a sturdy surface or that he''s ready to catch you when you cum or you might fall over!" she says with a laugh. Getting serious again she continues, "Watch out for cramps though! I wouldn''t recommend this with a boy who has a lot of stamina. Although I bet you don''t know many of those do you?" she says with a sly grin.'
-		'You blush at the inquiry.'
+		if guy < 5:
+			'You blush at the inquiry.'
+		elseif guy > 20:
+			'You grin back.'
+		end
 		*nl
 		'"Is there anything else you wanted to ask about?"'
 
@@ -1416,7 +1420,7 @@ if $ARGS[0] = 'krystal2':
 		'"And how are things with you Krystal?"'
 		'"Me? I''m good. I''m great in fact!"'
 		'Her good mood intrigues you. "Oh! Did something good happen?"'
-		'She smiles and says, "Yeah! I got fucked <i>really</i> good before I came to work today."'
+		'She smiles and says, "Yeah! I got absolutely fucking <i>railed</i> about an hour ago."'
 		act '"Excuse me, what?"':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/2.jpg"></center>'
@@ -1448,6 +1452,93 @@ if $ARGS[0] = 'krystal2':
 						act 'Move on':gt 'foto','studio'
 					end
 				end
+				
+				act '"Cool!"':
+					*clr & cla
+					'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/4.jpg"></center>'
+					'"Oh yeah. That good fucking I was talking about? It was at the porn studio in the industrial area. My favorite kind of scene because I don''t have to choose one way to get fucked. Gangbangs are <i>soooooo good...</i>" she closes her eyes and starts to zone out a bit.'
+					act'Continue':
+						*clr & cla
+						'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/5.jpg"></center>'
+						'"Sorry about that," she says, snapping back to the moment. "Was just lost in the memory. I just love being stuffed airtight like that. Anyways, we can get you a recommendation there if you like, they always need more girls. If you do a nude shoot here, they''ll get you a business card."'
+						'"Thanks for the advice! I''ll keep it in mind."'
+						'A photographer comes on set interrupts your conversation, saying, "Alright Katherine, it''s time to start shooting. Your friend is going to have to clear out."'
+						'You excuse yourself while everyone begins to set up.'
+						*nl
+						'As you walk away, you hear Krystal say, "Hey, do you have a tissue or something? I got kind of carried away and I need to clean up. I''d ask you to lick me clean, but I think that might just make it worse."'
+						krystal = 3
+						act 'Move on':gt 'foto','studio'
+					end
+				end
+			end
+		end
+		
+		act'"Elaborate please"':
+			*clr & cla
+			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/2.jpg"></center>'
+			'"Oh? That good huh?"'
+			'She smiles even wider, excited to share her carnal encounter with you. "Oh yeah. You know when someone fills your holes <i>just</i> right and hits all those perfect spots? No better feeling than that in the world! Well... maybe except feeling the tip of a cock touch the back of your throat... Or maybe getting creampied... Or maybe swallowing... Or maybe it''s hot cum landing on your face..."'
+			'She starts to ramble on before you interrupt her.'
+			'"You get around a lot huh?"'
+			'"Well, yeah! Is there any reason I wouldn''t? Sex is my favorite hobby! I love everything about it!"'
+			act '"Maybe you should try porn?"':
+				*clr & cla
+				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/3.jpg"></center>'
+				'You jokingly mention that maybe she should consider doing porn if she enjoys sex that much. Might as well mix business with pleasure.'
+				'"Hmm? Oh, I''m already a porn star."'
+				act '"What?!"':
+					*clr & cla
+					'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/4.jpg"></center>'
+					'"Oh yeah. That good fucking I was talking about? I just came from the porn studio. It was gangbang! My favorite kind of scene because I don''t have to choose one way to get fucked. Gangbangs are <i>soooooo good...</i>" she closes her eyes and starts to zone out a bit.'
+					'You stand there awkwardly, unsure of what to say.'
+					'"That''s... good for you...? I guess...?" you finally manage.'
+					act 'Continue':
+						*clr & cla
+						'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/5.jpg"></center>'
+						'"It really is! My boyfriend does a lot of scenes with me. He''s a porn star too. I love the idea that all over the world, people are watching us make love. Cumming on and in each other, fucking each other like animals, swallowing him whole... oh shit- I''m getting wet..."'
+						'A photographer comes on set and says, "Alright Katherine, it''s time to start shooting. Your friend is going to have to clear out."'
+						'You excuse yourself while everyone begins to set up.'
+						*nl
+						'As you walk away, you hear Krystal say, "Hey, do you have a tissue or something? I got kind of carried away and I need to clean up. I''d ask you to lick me clean, but I think that might just make it worse."'
+						krystal = 3
+						act 'Move on':gt 'foto','studio'
+					end
+				end
+				
+				act '"Cool!"':
+					*clr & cla
+					'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/4.jpg"></center>'
+					
+					'"Oh yeah. That good fucking I was talking about? It was at the porn studio in the industrial area. My favorite kind of scene because I don''t have to choose one way to get fucked. Gangbangs are <i>soooooo good...</i>" she closes her eyes and starts to zone out a bit.'
+					act'Continue':
+						*clr & cla
+						'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/5.jpg"></center>'
+						'"Sorry about that," she says, snapping back to the moment. "Was just lost in the memory. I just love being stuffed airtight like that. Anyways, we can get you a recommendation there if you like, they always need more girls. If you do a nude shoot here, they''ll get you a business card."'
+						'"Thanks for the advice! I''ll keep it in mind."'
+						'A photographer comes on set interrupts your conversation, saying, "Alright Katherine, it''s time to start shooting. Your friend is going to have to clear out."'
+						'You excuse yourself while everyone begins to set up.'
+						*nl
+						'As you walk away, you hear Krystal say, "Hey, do you have a tissue or something? I got kind of carried away and I need to clean up. I''d ask you to lick me clean, but I think that might just make it worse."'
+						krystal = 3
+						act 'Move on':gt 'foto','studio'
+					end
+				end
+			end
+			if stat['porn'] > 0:
+				act'"Hey, aren''t you a porn star?"':
+					*clr & cla
+					'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting2/5.jpg"></center>'
+					'"Hey! Wait a minute," you say. "I thought I recognized you from somewhere! Aren''t you Angie? The porn star?"'
+					'"That''s me!" she says cheerfully. In fact, I just shot some porn about an hour ago! That good fucking I was talking about? It was at the porn studio in the industrial area. My favorite kind of scene because I don''t have to choose one way to get fucked. Just get stuffed airtight! A cock in each hole, a dick in your mouth, and let the orgasms <i>rolllllll</i>. Gangbangs are <i>soooooo good...</i>" she closes her eyes and starts to zone out a bit.'
+					'"Sorry about that," she says, snapping back to the moment. "Was just lost in the memory. I just love being stuffed airtight like that. Anyways, we can get you a recommendation there if you like, they always need more girls. If you do a nude shoot here, they''ll get you a business card."'
+					'"Thanks for the advice! I''ll keep it in mind."'
+					'A photographer comes on set interrupts your conversation, saying, "Alright Katherine, it''s time to start shooting. Your friend is going to have to clear out."'
+					'You excuse yourself while everyone begins to set up.'
+					*nl
+					'As you walk away, you hear Krystal say, "Hey, do you have a tissue or something? I got kind of carried away and I need to clean up. I''d ask you to lick me clean, but I think that might just make it worse."'
+					krystal = 3
+					act 'Move on':gt 'foto','studio'
+				end
 			end
 		end
 	end
@@ -1484,6 +1575,16 @@ if $ARGS[0] = 'krystal3':
 				krystal = 4
 				act 'Leave':gt 'foto','studio'
 			end
+			act '"Maybe another time"':
+				*clr & cla
+				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/meeting3/4.jpg"></center>'
+				'"Maybe another time," you smirk. "I got some work I need to do today."'
+				'"Alrighty, catch you later then," she says with a wink as her dress starts to get pulled off.'
+				*nl
+				'As you walk away, you hear her moaning more and more. Just before you get out of earshot you hear her say, "We have to be careful this time Ben. Someone was angry when they found cum on the last set we used. I don''t want to get in trouble if they catch us this time!"'
+				krystal = 4
+				act 'Leave':gt 'foto','studio'
+			end
 		end
 	end
 end
@@ -1510,7 +1611,7 @@ end
 if $ARGS[0] = 'krystal5':
 	*clr & cla
 	krystal = rand(4,5)
-	'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/12.jpg"></center>'
+	'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/busy.jpg"></center>'
 	'You''re looking for Krystal when you find her on set. She''s holding her legs open and you are being treated with a very explicit view of her pussy and asshole.'
 	'"Is this wide enough for you?" she calls over to the photographer who is changing settings on his camera.'
 	'He looks up at her, judging the open angles of her legs briefly before saying, "That''s perfect! Just hold that position right there!"'
@@ -1570,12 +1671,31 @@ if $ARGS[0] = 'krystal_chat':
 			*clr & cla
 			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
 			'"Krystal, what was your first time like?"'
-			'"My first time? Oh, it was quite special. It was in the boys bathroom back when I was still in school. I was giving someone a blowjob and some other guys walked in on us and wanted in on the action. I was trying to finish up with the boy I was with but they got impatient so one of them pulled my hips up and literally ripped my panties off and put himself inside! I was already masturbating with a dildo every day at this point in my life but I had never felt what it was like to have a real cock inside me. It was <i>soooooooo good...</i> I couldn''t get enough of it! When he came he didn''t pull out and the next guy just took his place. And they all just kept cumming inside me! Just before the last guy finished, a few more boys walked in and saw what was happening so they joined in too. And more boys would keep coming in and I just kept getting pushed against the wall feeling orgasm after orgasm. By the time I left the bathroom my legs were wobbly and I must have felt every cock in my class creampie me at least once. There was so much cum! It was streaming down my legs and dripping out of my pussy for the rest of the day! Sometimes I wish I could go back and get that first experience of cock inside me again. Anyways, pretty good story right?"'
-			'She''s been going on for some time now at this point and you''ve been embarrassedly listening about how she lost her virginity to her classmates running train on her.'
-			'"Uhm... yeah... great story..."'
-			act'Keep chatting':gt'foto_models','krystal_chat'
+			'"My first time? Oh it was fucking great! My first time was a double digit gangbang!"'
+			act'That''s crazy!':
+				cla & *clr
+				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
+				'"Well, I say gangbang but it''s really just more that I got ran train on. I was blowing this guy who used to do my homework for me in the boys room and some other guys walked in on us and some of the action. I was trying to finish up with the one I was with but they got impatient so one of them pushed me against the wall and just shoved inside! I was already masturbating with a dildo every day for a couple years now but I had never felt what it was like to have a real cock inside me. It was <i>soooooooo good...</i> I couldn''t get enough of it! He came inside me and before I could turn around someone else put their cock in me! And then another and another and another and then I started to lose count.'
+				'"Lost count?"'
+				'"Yeah, there were so many of them! More boys just keep coming in! Pun intended," she adds with a smirk, "I''m pretty sure more than a few took a second turn too. By the time I left the bathroom I could hardly stand and I think I must''ve had half the cocks in school. Oh, my, god, and there was <i>so much cum.</i> It was streaming down my legs and dripping out of my pussy for the rest of the day. I''ve always wondered if the teachers noticed or if they just chose to ignore it."'
+				'She''s been going on for some time now at this point and you''ve been embarrassedly listening about how she lost her virginity to her classmates running train on her.'
+				'"Uhm... yeah... I wonder too I guess...'
+				act'Keep chatting':gt'foto_models','krystal_chat'
+			end
+			
+			act'Sounds hot!':
+				cla & *clr
+				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
+				'"That sounds so hot!"'
+				'"I know, right?! Well, I say gangbang but it''s really just more that I got ran train on. I was blowing this guy who used to do my homework for me in the boys room and some other guys walked in on us and some of the action. I was trying to finish up with the one I was with but they got impatient so one of them pushed me against the wall and just shoved inside! I was already masturbating with a dildo every day for a couple years now but I had never felt what it was like to have a real cock inside me. It was <i>soooooooo good...</i> I couldn''t get enough of it! He came inside me and before I could turn around someone else put their cock in me! And then another and another and another and then I started to lose count.'
+				'"Lost count?"'
+				'"Yeah, there were so many of them! More boys just keep coming in! Pun intended," she adds with a smirk, "I''m pretty sure more than a few took a second turn too. By the time I left the bathroom I could hardly stand and I think I must''ve had half the cocks in school. Oh, my, god, and there was <i>so much cum.</i> It was streaming down my legs and dripping out of my pussy for the rest of the day. I''ve always wondered if the teachers noticed or if they just chose to ignore it."'
+				'She''s been going on for some time now at this point and you''ve been eagerly listening about how she lost her virginity to her classmates running train on her.'
+				'"That was a pretty wild story Krystal."'
+				'"Easily one of my best," she says, grinning at you. "Oh, but I <i>have</i> to tell you later about the time I started an orgy at somebody''s house party! I think I made about a dozen people lose their virginity''s that night!"'
+				act'Keep chatting':gt'foto_models','krystal_chat'
+			end
 		end
-
 	end
 
 	if krystal_model_exp ! daystart:
@@ -1585,9 +1705,20 @@ if $ARGS[0] = 'krystal_chat':
 			mdlng_exp += 2
 			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/10.jpg"></center>'
 			'"You''ve really got to emphasize your assets." She puts her hands up on her head, pulling some of her hair with them. "Right now, what do you notice most about me?"'
-			'As soon as she asks, your eyes begin to drift down towards her breasts before immediately flicking back towards her eyes in embarrassment, though not before her noticing.'
-			'She smirks and says, "Exactly. No point in being a nude model if you''re not gonna show off the goods right? No matter what position, it''s all about your breasts, your pussy, or your ass. That''s what you want to be showing off!"'
-			act'Keep chatting':gt'foto_models','krystal_chat'
+			act'Embarrassed':
+				cla
+				*nl
+				'As soon as she asks, your eyes begin to drift down towards her breasts before immediately flicking back towards her eyes in embarrassment, though not before her noticing.'
+				'She smirks and says, "Exactly. No point in being a nude model if you''re not gonna show off the goods right? No matter what position, it''s all about tits, pussy, or ass. That''s what you want to be showing off!"'
+				act'Keep chatting':gt'foto_models','krystal_chat'
+			end
+			act'Your tits':
+				cla
+				*nl
+				'"Your tits," you say immediately. "You''re practically shoving them in my face!"'
+				'She smirks and says, "Exactly. No point in being a nude model if you''re not gonna show off the goods right? No matter what position, it''s all about tits, pussy, or ass. You''ve got it, they want it, give them what they want!"'
+				act'Keep chatting':gt'foto_models','krystal_chat'
+			end
 		end
 	end
 
@@ -1617,12 +1748,13 @@ if $ARGS[0] = 'krystal_chat':
 						'Suddenly you realize Krystal is giving you a weird look.'
 						'"W-What...?" you stammer. "Is there something on my face?"'
 						'"No..." she says while eyeing you up. "I just wanted you to know that if you ever want to do some uhh... ''fat burning exercises'' with me and Ben... you''re more than welcome to join us." She gives you another smirk as she bites her lip.'
-						if pcs_inhib < 50:
+						act'Blush':
 							'You break eye contact with her and look away, blushing furiously and try to mumble some kind of response. "I... uhh... ummm... yeah..."'
 							'<i>What the hell am I even supposed to say to that?</i> you think to yourself.'
 							act'Keep chatting':gt'foto_models','krystal_chat'
-						else
-							'You stare right back at her and give her a small smile. "I''ll think about it..." you say.'
+						end
+						act'I''ll think about it':
+							'"I''ll think about it..." you smile.'
 							'<i>Especially before bed tonight...</i> you think to yourself.'
 							act'Keep chatting':gt'foto_models','krystal_chat'
 						end
@@ -1632,48 +1764,105 @@ if $ARGS[0] = 'krystal_chat':
 		end
 	end
 
-	act 'Ask about movies':
-			*clr & cla
-			*nl
-			krys_movie = rand(1,4)
+	act 'Talk about movies':
+		*clr & cla
+		*nl
+		krys_movie = rand(1,4)
 
-			if krys_movie = 1:
-				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
-				'"See any good movies lately Krystal?"'
-				'"Oh yeah! I love going to the movies! I just went to see that new superhero one with my boyfriend last week!"'
-				'"Oh! Was it good?"'
-				'"Yeah! Er... Not really...? Uhmm... Honestly, I don''t remember. I got distracted sucking Ben''s cock..."'
-				act'Keep chatting':gt'foto_models','krystal_chat'
-			end
+		if krys_movie = 1:
+			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
+			'"See any good movies lately Krystal?"'
+			'"Oh yeah! I love going to the movies! I just went to see that new superhero one with my boyfriend last week!"'
+			'"Oh! Was it good?"'
+			'"Yeah! Er... Not really...? Uhmm... Honestly, I don''t remember. I got distracted sucking Ben''s cock..."'
+			act'Keep chatting':gt'foto_models','krystal_chat'
+		end
 
-			if krys_movie = 2:
-				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
-				'"See any good movies lately Krystal?"'
-				'"Oh yeah! I love going to the movies! I just went to see that new horror movie with my boyfriend last week!"'
-				'"Do you like horror movies?"'
-				'"I love going to see horror movies! With all the screaming going on, Ben can get rough and I can cum as loud as I like and people just think it''s part of the movie!"'
-				act'Keep chatting':gt'foto_models','krystal_chat'
-			end
+		if krys_movie = 2:
+			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
+			'"See any good movies lately Krystal?"'
+			'"Oh yeah! I love going to the movies! I just went to see that new horror movie with my boyfriend last week!"'
+			'"Do you like horror movies?"'
+			'"I love going to see horror movies! With all the screaming going on, Ben can get rough and I love trying to see if I can make people think my screams are part of the movie. Besides, horror movies have all the best sex scenes."'
+			act'Keep chatting':gt'foto_models','krystal_chat'
+		end
 
-			if krys_movie = 3:
-				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/11.jpg"></center>'
-				'"See any good movies lately Krystal?"'
-				'"Oh yeah! I love going to the movies! I just went to see that new romcom with my boyfriend last week!"'
-				'"Did you think it was funny? Worth watching?"'
-				'"Not really. But it was hard to concentrate on any of the jokes with Ben''s cock up my ass and my nipples being pulled through my shirt."'
-				act'Keep chatting':gt'foto_models','krystal_chat'
-			end
+		if krys_movie = 3:
+			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/11.jpg"></center>'
+			'"See any good movies lately Krystal?"'
+			'"Oh yeah! I love going to the movies! I just went to see that new romcom with my boyfriend last week!"'
+			'"Did you think it was funny? Worth watching?"'
+			'"Not really. But it was hard to concentrate on any of the jokes with Ben''s cock up my ass and my nipples being pulled through my shirt."'
+			act'Keep chatting':gt'foto_models','krystal_chat'
+		end
 
-			if krys_movie = 4:
-				'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/8.jpg"></center>'
-				'"See any good movies lately Krystal?"'
-				'"Oh yeah! I love going to the movies! I just went to see that new drama with my boyfriend last week!"'
-				'"I''ve heard good things about that! Was it as good as they say?"'
-				'"I thought it was just okay but I''m probably not a good judge," she says with a guilty but shameless grin. "Ben had me bent over like this into the aisle so I couldn''t see the screen that well."'
-				act'Keep chatting':gt'foto_models','krystal_chat'
-			end
+		if krys_movie = 4:
+			'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/8.jpg"></center>'
+			'"See any good movies lately Krystal?"'
+			'"Oh yeah! I love going to the movies! I just went to see that new drama with my boyfriend last week!"'
+			'"I''ve heard good things about that! Was it as good as they say?"'
+			'"I thought it was just okay but I''m probably not a good judge," she says with a shameless grin. "Ben had me bent over like this into the aisle so I couldn''t see the screen that well."'
+			act'Keep chatting':gt'foto_models','krystal_chat'
 		end
+	end
+	
+	act 'Talk about sex':gt'foto_models','krystal_sextalk'
+	
+end
 
+if $ARGS[0] = 'krystal_sextalk':
+	*clr & cla
+	*nl
+	'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/face.jpg"></center>'
+	'"My fav subject. What about it babe?"'
+	act 'Leave':
+		*clr & cla
+		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/1.jpg"></center>'
+		'"Alright. It was fun chatting with you Krystal. I gotta get going though."'
+		'"Okay. See you later babe!"'
+		act 'Leave':gt 'foto','studio'
+	end
+	
+	
+	act'"What''s your favorite position?"':
+		*clr
+		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/6.jpg"></center>'
+		'"Favorite position? I know I mentioned this before but I absolutely <i>love</i> being gangbanged. A cock in each hand, one in each hole, and someone to throat fuck me is the best. It makes me feel like a fucking goddess! But it''s so hard to get enough people for that. I pretty much only get to do it when I''m shooting porn. Even then, most times I just have to settle for a regular DP scene."'
+	end
+	
+	act'"What''s been your best sexual experience?"':
+		*clr
+		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/8.jpg"></center>'
+		'"Best fuck ever? Oh, let me tell you! There''s this shoot that we occassionally do at the porn studio where they get 50 fans to all gangbang one girl. We don''t get to do it very often because the producers don''t want to oversaturate the market and you need a pretty famous porn star to do it but I got to do one after my first year. It was a cock carnival! Every hole, endless cum, hours and hours, and you never have to choose what you want, you can just do it all! Facials, creampies, titjobs, you name it, I got to do it for six hours. There was so much cum that I was still leaking by the time Ben got his cock in me at home. I only get to do it once every year, but that first time was really magical."'
+	end
+	
+	act'"What''s your sex life at home like?"':
+		*clr
+		if krys_sexlife = 0:krys_sexlife = 1
+		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/12.jpg"></center>'
+		'"Pretty good I''d say. Ben and I probably do it at least, what, four or five times a day? In the morning Ben usually wakes me up with a good pounding. No joke, I''l wake up and he''ll already be balls deep in me. Really gets you out of bed in the morning. My own personal alarm cock. If we have a porn shoot then we''ll fuck on camera. If not, sometimes he drops by the studio for a quickie. Then after work we''ll fuck before dinner. After dinner we usually relax by watching a movie while I give him head. And then one more good night fuck in bed? Sometimes he wakes me up in the night to do it again but I wouldn''t say we do that <i>too</i> often. Maybe twice a week. Oh wait. That''s not five, that''s six."'
+	end
+	
+	act'"How do you feel about blowjobs?"':
+		*clr
+		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/11.jpg"></center>'
+		'"Blowjobs? Fucking love em''. There''s something I just can''t describe about having a thick cock in my mouth. The taste, the smell, the feeling of my tongue running over it. Everything about blowjobs are great. Though the best is definitely making eye contact with a guy when he cums in your mouth. Ever try it? If you haven''t, you need to!"'
+	end
+	
+	act'"Do you have a type?"':
+		*clr
+		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/1.jpg"></center>'
+		'"Oh sure. I prefer the type that are cut, ones who have girth and a real hardness to them, you know? The kind that won''t bend over just because you put them in an awkward position. But contrary to other girls, I don''t like them to be too long. A sizeable length is good, but I want to be able to take them to the hilt, get their full length inside of me, not just most of it, you know? And if they can cum lots that''s always a bonus but- Oh. You''re talking about guys. Well, in that case, any guy with a dick like that is my type."'
+	end
+	
+	act'"Are you into exhibitionism?"':
+		*clr
+		'<center><img src="images/locations/city/citycenter/photo/portraits/krystal_b/talking/10.jpg"></center>'
+		'"Are you asking me just because I do porn? Nah, I''m just in it for the fucking, I don''t really care if people see me or not. Sometimes if Ben and I are out on a date and we can''t wait, I''ll fuck him in the bathroom or in an alley on the way home or something, but it''s not like I''m thrill seeking. I''m just not shy. And I''m really impatient."'
+	end
+	
+	
+	act'"Let''s talk about something else"':gt'foto_models','krystal_chat'
 end
 
 
@@ -1727,6 +1916,7 @@ end
 !!
 if $ARGS[0] = 'jeff_2':
 '<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/4.jpg"></center>'
+jeff = 3
 'As you walk past a set, you hear someone yell out from an armchair, "Hey there cutie!"'
 'Looking over you see Jeff smiling at you, sitting with her legs up and her neat little pussy on peeking out from between them. She must''ve just finished a shoot.'
 	act 'Hey!':
@@ -1745,9 +1935,29 @@ if $ARGS[0] = 'jeff_2':
 			act'"An... escort service...?"':
 				*clr & cla
 				'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/7.jpg"></center>'
+				'"An... escort service...?" you ask tentatively.'
 				'"Mhmmm! I needed some money to pay for my university tuition so I did some part time escorting."'
 				'"So you would..."'
-				'"Let boys use my innocent, nubile, teen body to fulfill their sexual fantasies for money? Sure! Sometimes they there weren''t very nice though," she says putting on a pouty face. "It could be hard sometimes because of that, but I was a big girl so I powered through! Anyways, that''s why I switched to modelling after a little while. They''re much nicer here!"'
+				'"Let old men use my innocent, nubile, teen body to fulfill their sexual fantasies for money? Sure! Sometimes they there weren''t very nice though," she says putting on a pouty face. "It could be hard sometimes because of that, but I was a big girl so I powered through! Anyways, that''s why I switched to modelling after a little while. They''re much nicer here!"'
+				act 'That''s... good?':
+					*clr & cla
+					'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/8.jpg"></center>'
+					'"Yup! Being a model is a lot more fun."'
+					'"What is it you said you were studying in university?"'
+					'"Economy and management!" she says proudly.'
+					'<i>This airhead? Economy and management?!</i>'
+					'"Well, I guess I should go now. Gotta get paid! Bye <<$pcs_nickname>>!" she says and then runs off.'
+					act 'Leave':gt 'foto','studio'
+				end
+			end
+			
+			act'"An escort service?"':
+				*clr & cla
+				'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/7.jpg"></center>'
+				'"An escort service??" you ask in surprise.'
+				'"Mhmmm! I needed some money to pay for my university tuition so I did some part time escorting."'
+				'"So you would have sex with people for money?"'
+				'"Yup! I''d let them fulfill their every sexual fantasy! For some reason a lot of them liked this position," she says, putting her legs up in the air and flashing her pussy at you. "It paid the bills really well and even let me get a nice apartment in the residential area after I paid off my tuition for that year. Sometimes they there weren''t very nice though," she says putting on a pouty face. "It could be hard sometimes because of that, but I was a big girl so I powered through! Anyways, that''s why I switched to modelling after a little while. They''re much nicer here!"'
 				act 'That''s... good?':
 					*clr & cla
 					'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/8.jpg"></center>'
@@ -1756,10 +1966,64 @@ if $ARGS[0] = 'jeff_2':
 					'"Economy and management!" she says proudly.'
 					'<i>This airhead? Economy and management?!</i>'
 					'"Well, I guess I should go now. Gotta get paid! Bye <<$pcs_nickname>>!" she says and then runs off.'
-					jeff = 3
 					act 'Leave':gt 'foto','studio'
 				end
 			end
+			
+			if anastasiasex = 0:
+				act'"Think you could hook me up as an escort?"':
+					*clr & cla
+					'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/5.jpg"></center>'
+					'"An escort service?" you ask in surprise. "They still in business? I''d love it if you gave me a recommendation there."'
+					'"Hmmmmmmmm... Probably not, I don''t work there anymore and they''re kind of annoyed that I left. Especially because they keep seeing me in magazines. They know they really could have jacked up the price with me!"'
+					'"Oh." You twist your mouth in disappoitment.'
+					'"Buuuut..."'
+					act '???':
+						*clr & cla
+						'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/1.jpg"></center>'
+						'Jeff leans in conspiratorily to whisper to you.'
+						'"If you really want to give escorting a go... well... you know how you''ve seen Anastasia doing <i>mmhmm-mmm-mmm-mhmmmm?</i>" She hums, wiggling her eyebrows at you in some kind of knowing look.'
+						if anastasia < 1:
+							'"Who?" you ask in utter confusion of who she''s talking about.'
+							'"Oh you haven''t met her yet? Go-lly, you need to spend more time slacking off and talking to other chicks like me. Oh well, once you meet her, just go talk to her and you''ll figure it out after a while."'
+							act'"I-,"':
+								*clr & cla
+								'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/8.jpg"></center>'
+								'"I-," you try to respond before Jeff suddenly jumps up.'
+								'"Anyways, gotta run! Got dirty pics to take and money to get paid! Bye <<$pcs_nickname>>!" she says and then runs off.'
+								act 'Leave':gt 'foto','studio'
+							end
+						elseif anastasia < 4:
+							'"No...?" You feel very confused and don''t really know what she''s trying to get at.'
+							'"Oh!" Jeff squeaks in surprise. "You haven''t caught her yet? You must not be looking very hard! Oh well, you''ll catch her eventually. Anyways, just try to talk to her and you''ll understand."'
+							act'"I-,"':
+								*clr & cla
+								'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/8.jpg"></center>'
+								'"I-," you try to respond before Jeff suddenly jumps up.'
+								'"Anyways, gotta run! Got dirty pics to take and money to get paid! Bye <<$pcs_nickname>>!" she says and then runs off.'
+								act 'Leave':gt 'foto','studio'
+							end
+						else
+							'"... you mean how she''s sometimes fucking guys in the studio?" you whisper back.'
+							'"Yup! Exactly! If you want to give escorting a go, try talk to her. I''m sure you''ll figure it out eventually."'
+							act'"Anastasia is a hooker??"':
+								*clr & cla
+								'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/5.jpg"></center>'
+								'"Oh yeah, hardcore. But you didn''t hear it from me!"'
+								'Jeff winks at you.'
+								act'Thanks Jeff!':
+									*clr & cla
+									'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/8.jpg"></center>'
+									'"Thanks for the advice Jeff!"'
+									'"Nooooo problem!" she says before jumping out of her seat.'
+									'"Anyways, gotta run! Got dirty pics to take and money to get for it! Bye <<$pcs_nickname>>!" she says and then runs off.'
+									act 'Leave':gt 'foto','studio'
+								end
+							end
+						end
+					end
+				end
+			end
 		end
 	end
 end
@@ -1886,6 +2150,8 @@ if $ARGS[0] = 'jeff_chat':
 			end
 		end
 	end
+	
+	act'Talk about sex':gt'foto_models','jeff_sex_talk'
 
 	if jeff_grope > 3:
 		act 'Ask her to stop groping you':
@@ -1905,6 +2171,52 @@ if $ARGS[0] = 'jeff_chat':
 	end
 end
 
+if $ARGS[0] = 'jeff_sex_talk':
+	cla & *clr
+	'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/1.jpg"></center>'
+	'"Oooooh! A bit of girl talk? Sure thing! Whatcha wanna talk about?"'
+	act 'Leave':
+		cla
+		'"Hey Jeff, I gotta get going I''ll see you later okay?"'
+		'"Okay! Okay! See you later hot stuff!" she says, giving you a big hug so your breasts mush together before skipping off on her own.'
+		act 'Leave':gt 'foto','studio'
+	end
+	
+	act'"What''s your favorite position?"':
+		*clr
+		'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/13.jpg"></center>'
+		'"Favorite position? Hmmm... Not sure I have one. I don''t really mind whatever way he wants to do it. I like having my boobies grabbed but you can do that from pretty much any position. Doggy, starfish, cowgirl, sandwich, Eiffel Tower, reverse cowgirl-"'
+		*nl
+		'She goes on continuing to name positions for a while.'
+	end
+	
+	act'"What''s your favorite sexual experience?"':
+		*clr
+		'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/22.jpg"></center>'
+		'"Definitely the time I fucked my bio professor."'
+		'"You fucked your professor?"'
+		'"Oh yeah, I fuck any professor I think I can get away with. Really easy way to bump up your grades. Older guys always have their specific fetishes and my bio professor has a bit of an oral fixation with boobs. The first time we hooked up, I came three times before he even put it in me! That man has a mouth that was made to suck on titties."'
+	end
+	
+	act'"What''s your sex life at home like?"':
+		*clr
+		'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/11.jpg"></center>'
+		'"Well, I''m still at uni so there''s definitely a lot of boys around campus but I never bring anybody home cause I don''t want them to know where I live. I try to hook up with strangers at the nightclub instead! It''s always really fun trying to sneak out the morning after. I wonder if when they wake up and can''t find a trace of me that they think they might have fucked a ghost!"'
+	end
+	
+	act'How do you feel about blowjobs?':
+		*clr
+		'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/21.jpg"></center>'
+		'"I don''t mind giving head. Blowjobs are fine. I prefer getting eaten out though. That''s why any time a boy asks for a blowjob I ask him if he wants to 69 instead. Even better are 69''s with girls though. Ever tried it before?" She asks her question innocently but her eyes twinkle mischeviously at you.'
+	end
+	act'Talk about something else':gt'foto_models','jeff_chat'
+end
+
+if $ARGS[0] = 'jeff_sex_advice':
+
+
+end
+
 if $ARGS[0] = 'jeff_model':
 	*clr & cla
 	'<center><img src="images/locations/city/citycenter/photo/foto.jpg"></center>'
@@ -1912,7 +2224,7 @@ if $ARGS[0] = 'jeff_model':
 	jeff = rand(3,4)
 	act'Continue':
 		*clr & cla
-		'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/19.jpg"></center>'
+		'<center><img src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy.jpg"></center>'
 		'"Whooo! Yipee!"'
 		'You find her in the middle of a photoshoot and she''s jumping up and down on the bed kicking her legs and striking poses mid air.'
 		'The photographer seems really excited saying, "Yes! I love that Jeff! Do you think you can do that again but get your leg higher so we can get a better look at your pussy?"'

+ 818 - 0
locations/foto_shoot.qsrc

@@ -0,0 +1,818 @@
+# foto_shoot
+
+if $ARGS[0] = 'model':
+	menu_off = 1
+	if model = 0:model = 1
+	*clr & cla
+	minut += 5
+	modelpay = (pcs_mdlng/2 * 10) + ((city_modelling + pcs_apprnc)/2)
+	modelpayfin = 900 + (15*rand(0,5))
+	gs 'stat'
+	'<center><b><font color="maroon">Manager</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"Hello <<$pcs_firstname>>. Are you here to work? What kind of shoot would you like to do today?"'
+	*nl
+!!	'<a href="exec:gs ''shortgs'',''msg'',''There are three types of shoots: Catalog, Fashion, and Glamour. A catalog shoot is any shoot that is meant to appear in a shopping magazine or online catalog. They don''t do much for your fame but the base pay is steady. A fashion shoot is more stylized and though the base pay is not as high, there will be a bonus tip based on your modelling skill and fame. A glamour shoot will always involve nudity or risqué clothing and will typically be erotic in nature. This type of modelling will have good pay with good bonuses based on skill and fame, but also will spread your fame beyond the city far more quickly. If you grew up in a small town outside St. Petersburg, the pictures may reach its populace sooner rather than later.''">Modelling Shoot Guide</a>'
+	'<center><b><font color="blue">Modelling guide</font></b></center>'
+	*pl '<center><table align="center" width=80%>'
+	'<b>Catalog</b> - A catalog shoot is any shoot that is meant to appear in a basic paper or online catalog. They don''t do much for your fame but the base pay is steady.'
+	'<b>Fashion</b> - A fashion shoot is more stylized and though the base pay is not as high, there will be a higher bonus based on your modelling skill and fame.'
+	'<b>Glamour</b> - A glamour shoot will always involve nudity or risqué clothing, though will always be artistic in nature. This type of modelling will have good pay with good bonuses based on skill and fame, but also will spread your fame beyond the city far more quickly. If you grew up in a small town outside St. Petersburg, the pictures may reach its populace sooner rather than later.'
+	'<b>Erotic</b> - An erotic shoot makes no excuses about its purpose. The intent is to capture sexual images of female bodies to sell to pornography sites and erotic magazines. This type of modelling will have the highest bonuses based on your appearance but will also increase your fame in the porn industry as well.'
+	*p '</table></center>'
+	act'Never mind':
+		cla
+		'"Sorry, I just realized that I have something to do right now. Can I come back later?"'
+		'"Sure, no problem <<$pcs_lastname>>, just let us know when you''re ready to work.'
+		act'Leave':gt 'foto','studio'
+	end
+	
+	act'Actually I''d like to practice':gt'foto','practicemodel'
+		
+	act'"I''d like to do a catalog shoot"':
+		cla & *clr
+		if modelfoto >= 10 and pcs_mdlng > 20 and modelfoto_fashion < 1:gt'foto_events','fashion_persuasion'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+		'"Alright, what kind of shoot? Clothing or swimsuits?"'
+		
+		act'Clothing':
+			shoot_type = catalog
+			modelfoto_catalog += 1
+			cla & *clr
+			mdlng_exp += rand(2,5)
+			minut += 120
+			money += 450
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion3.mp4"></video></center>'
+			'You spend two hours modelling for the online catalogs of retail clothing stores, wearing various different dresses but the same expression. It''s boring but it still gets you paid.'
+			*nl
+			'You recieve 450 <b>₽</b> for the job.'
+			act 'Leave':gt 'foto', 'end'
+		end
+		act'Swimsuits':
+			shoot_type = swim_catalog
+			modelfoto_catalog += 1
+			cla & *clr
+			mdlng_exp += rand(2,5)
+			minut += 120
+			money += 450
+			'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini<<rand(3,5)>>.mp4"></video></center>'
+			bikinicatalog += 1
+			'You change in and out of various different bikinis, modelling them with the same pose and expression for use in online and department store catalogs.'
+			*nl
+			'You recieve 450 <b>₽</b> for the job.'
+			act 'Leave':gt 'foto', 'end'
+		end
+	end
+	
+	act'"I''d like to do a fashion shoot"':
+		if pcs_mdlng < 20:
+			msg'"Sorry, but you aren''t a skilled enough model to do this kind of publication yet. Maybe get some practice in on your off days."'
+		else
+			cla & *clr
+			
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+			'"Alright, what kind of shoot would you like to do? Fashion, bikini, or lingerie?"'
+			act 'Fashion':
+				shoot_type = fashion
+				if modelfoto_fashion >= 10 and modelfoto_bikini + modelfoto_lingerie < 1 and modelfoto_glamour < 1 and modelfoto_nude < 1: gt'foto_events','lingerie_persuasion'
+				cla
+				act 'Maybe not today':gt 'foto','studio'
+
+				act 'Agree (2:00)':gt 'foto_shoot','fashion'
+			end
+
+			act 'Bikini':
+				shoot_type = bikini
+				*clr & cla
+				if modelfoto_bikini + modelfoto_lingerie >= 10 and pcs_mdlng > 20 and modelfoto_glamour < 1 and modelfoto_nude < 1:gt'foto_events','glamour_persuasion'
+				if pcs_inhib < 20:
+					'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.'
+					act 'Maybe not today':gt 'foto','studio'
+					act 'Look at other options':gt'foto_shoot','model'
+					
+					if pcs_mdlng > 20:
+						gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+					else
+						gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+					end
+					if will_cost <= pcs_willpwr:
+						*nl
+						'Or you could just force yourself do it anyways...'
+						act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','bikini'
+					end
+				else
+					cla
+					act 'Maybe not today':gt 'foto','studio'
+
+					act 'Agree (2:00)':gt'foto_shoot','bikini'
+				end
+			end
+
+
+			act 'Lingerie modelling':
+				shoot_type = lingerie
+				*clr & cla
+				if modelfoto_bikini + modelfoto_lingerie >= 10 and modelfoto_glamour < 1 and modelfoto_nude < 1:gt'foto_events','glamour_persuasion'
+				if pcs_inhib < 25:
+					'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.'
+					act 'Maybe not today':gt 'foto','studio'
+					act 'Look at other options':gt'foto_shoot','model'
+					
+					if pcs_mdlng > 20:
+						gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+					else
+						gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+					end
+					if will_cost <= pcs_willpwr:
+						*nl
+						'Or you could just force yourself do it anyways...'
+						act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','lingerie'
+					end	
+				else
+					cla
+					act 'Maybe not today':gt 'foto','studio'
+
+					act 'Agree (2:00)':gt'foto_shoot','lingerie'
+				end
+			end
+		end
+	end
+
+	act'"I''d like to do a glamour shoot"':
+		if pcs_inhib < 30:
+			msg'You toy with the idea of exposing yourself on camera 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.'
+		else
+			gt'foto_shoot', 'glamour_shoot'
+		end
+	end
+	
+	act'"I''d like to do a nude shoot"':
+		if pcs_inhib < 30:
+			msg'You toy with the idea of exposing yourself on camera 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.'
+		else
+			gt'foto_shoot', 'nude_shoot'
+		end
+	end
+end
+
+if $ARGS[0] = 'glamour_shoot':
+	cla & *clr
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"Alright, we can do that. What kind of glamour shoot?"'
+	
+!!	'Info guides:'
+!!	'<a href="exec:gs ''shortgs'',''msg'',''This type of shoot is not particularly more explicit, but the clothes being modelled are inherently more sensual and will require some confidence to be able to wear them.''">Erotic clothed</a>'
+!!	'<a href="exec:gs ''shortgs'',''msg'',''A topless shoot is any shoot that has you baring your breasts and shoulders while still wearing bottoms of some kind, whether that be trousers, skirt, or underwear.''">Topless</a>'
+!!	'<a href="exec:gs ''shortgs'',''msg'',''A tastefully nude shoot is one that does not show genitals of any kind, neither vagina or nipple. Your pay will be based more on your fame and appearance than your skill.''">Tasteful nude</a>'
+!!	'<a href="exec:gs ''shortgs'',''msg'',''A topless nude shoot is one step further in eroticism while still maintaining class. Your nipples will be exposed but your vagina will remain hidden. It is considered erotic without being slutty, like a character nude scene in a film. Skill plays a larger role in this type of shoot.''">Topless nude</a>'
+!!	'<a href="exec:gs ''shortgs'',''msg'',''A fully nude shoot bares all. Your breasts, nipples, and vagina will be visible. It is the most erotic, gives the highest bonus from appearance and fame, but will also spread your fame further and faster. If you are an aspiring star, this may be good for your publicity. But if there are people you want to hide your work from, this might reach them sooner than expected.''">Fully nude</a>'
+
+!!	act 'Erotic clothing with breast nudity':
+		!!already matched the exhibitionism value above
+!!		cla
+!!		act 'Maybe not today':gt 'foto','studio'
+
+!!		act 'Agree (2:00)':
+!!			*clr & cla
+
+!!			minut += 120
+!!			modelpayfin = 700 + (modelpay) + (15*rand(0,5))
+!!			modelfoto_nip += 1
+!!			mdlng_exp += rand(6,10)
+!!			city_modelling += rand(7,13)
+!!			pav_modelling += rand(1,city_modelling)/10
+!!			inhib_exp += 2
+!!			gs 'stat'
+!!			'<center><video autoplay loop src="images/locations/city/citycenter/photo/model5.mp4"></video></center>'
+!!			'You dressed up in sexy clothes and spend the next two hours striking various poses for a photographer, your nipples occasionally slipping out from behind the clothing.'
+!!			*nl
+!!			'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+!!			if pcs_mdlng >= 40 and commercial = 0:
+!!				act 'Leave':gt'foto_events','commercial'
+!!			else
+!!				act 'Leave':gt 'foto', 'end'
+!!			end
+!!		end
+!!	end
+	act 'Sexy clothing':
+		*clr & cla
+		shoot_type = sexy_clo
+		if modelfoto_ero_clo >= 10 and modelfoto_trans_ling + modelfoto_trans_ling < 1 and modelfoto_nip < 1 and modelfoto_nude < 1: gt'foto_events','trans_persuasion'
+		if pcs_inhib < 30:
+			if modelfoto_ero_clo > 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.'			
+			end
+			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at other options':gt'foto_shoot','model'
+			
+			if pcs_inhib > 20:
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+			else
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				*nl
+				'Or you could just force yourself do it anyways...'
+				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','sexy'
+			end	
+		else
+			cla
+			act 'Maybe not today':gt 'foto','studio'
+
+			act 'Agree (2:00)':gt'foto_shoot','sexy'
+		end
+	end
+
+	act 'Transparent clothing':
+		*clr & cla
+		shoot_type = trans_clo
+		if modelfoto_trans_ling + modelfoto_transparent >= 5 and modelfoto_topless < 1 and modelfoto_nude < 1: gt'foto_events','topless_persuasion'
+		if pcs_inhib < 45:
+			if modelfoto_transparent > 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.'			
+			end
+			
+			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at other options':gt'foto_shoot','model'
+			
+			if pcs_inhib > 40:
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+			else
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				*nl
+				'Or you could just force yourself do it anyways...'
+				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','transparent'
+			end	
+		else
+			cla
+			act 'Not for me':gt 'foto','studio'
+
+			act 'Agree (2:00)':gt'foto_shoot','transparent'
+		end
+	end
+	
+	act 'Transparent Lingerie':
+		shoot_type = trans_ling
+		*clr & cla
+		if modelfoto_trans_ling + modelfoto_transparent >= 5 and modelfoto_topless < 1 and modelfoto_nude < 1: shoot_type = trans_ling & gt'foto_events','topless_persuasion'
+		if pcs_inhib < 45:
+			if modelfoto_trans_ling > 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.'			
+			end
+			
+			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at other options':gt'foto_shoot','model'
+			
+			if pcs_inhib > 40:
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+			else
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				*nl
+				'Or you could just force yourself do it anyways...'
+				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','trans_ling'
+			end	
+		else
+			cla
+			act 'Not for me':gt 'foto','studio'
+
+			act 'Agree (2:00)':gt'foto_shoot','trans_ling'
+		end
+	end
+
+	act 'Topless':
+		shoot_type = topless
+		*clr & cla
+		if modelfoto_topless >= 5 and modelfoto_nude < 1: gt'foto_events','nude_persuasion'
+		if pcs_inhib < 50:
+			if modelfoto_topless > 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.'			
+			end
+			
+			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at other options':gt'foto_shoot','model'
+			
+			if pcs_inhib > 45:
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+			else
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				*nl
+				'Or you could just force yourself do it anyways...'
+				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','topless'
+			end
+		else
+			cla
+			act 'Maybe not today':gt 'foto','studio'
+			
+			act 'Agree (2:00)':gt'foto_shoot','topless'
+		end
+	end
+end
+
+if $ARGS[0] = 'nude_shoot':
+	cla & *clr
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
+	'"Alright, we can do that. What kind of nude shoot?"'
+	
+	act 'Tasteful nude':
+		shoot_type = taste_nude
+		*clr & cla
+		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?'
+			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.'			
+			end		
+			
+			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at other options':gt'foto_shoot','model'
+			
+			if pcs_inhib > 35:
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+			else
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				*nl
+				'Or you could just force yourself do it anyways...'
+				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','tasteful'
+			end
+		else
+			cla
+			act 'Maybe not today':gt 'foto','studio'
+			
+			act 'Agree (2:00)':gt'foto_shoot','tasteful'
+		end
+	end
+	
+	act 'Topless nude':
+		shoot_type = top_nude
+		*clr & cla
+		if modelfoto_toplessnude >= 3 and modelfoto_pussy < 1:gt'foto_events','nude_persuasion'
+		if pcs_inhib < 55:
+			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.'			
+			end
+			
+			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at other options':gt'foto_shoot','model'
+			
+			if pcs_inhib > 50:
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+			else
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				*nl
+				'Or you could just force yourself do it anyways...'
+				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','topless_nude'
+			end
+		else
+			cla
+			act 'Maybe not today':gt 'foto','studio'
+			
+			act 'Agree (2:00)':gt'foto_shoot','topless_nude'
+		end
+	end
+	
+	act 'Full nude':
+		shoot_type = full_nude
+		*clr & cla
+		if pcs_inhib < 60:
+			if modelfoto_fullnude > 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 of these kinds of pictures of you floating around?'
+			elseif modelfoto_pussy < 1:
+				'You think about asking to do this shoot but hesitate, not sure if you''re ready to put pictures of your pussy all over the internet.'
+			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.'
+			end
+		
+			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at other options':gt'foto_shoot','model'
+			
+			if pcs_inhib > 55:
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+			else
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				*nl
+				'Or you could just force yourself do it anyways...'
+				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','nude'
+			end
+		else
+			cla
+			act 'Maybe not today':gt 'foto','studio'
+
+			act 'Agree (2:00)':gt'foto_shoot','nude'
+		end
+	end
+	
+	act 'Erotic':
+		shoot_type = erotic
+		*clr & cla
+		if pcs_inhib < 65:
+			if modelfoto_pussy < 1:
+				'You think about asking to do this shoot but hesitate, not sure if you''re ready to put pictures of your pussy and asshole all over the internet, especially ones that focus on them!'
+			elseif modelfoto_erotic >= 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.'			
+			end
+			
+			act 'Maybe not today':gt 'foto','studio'
+			act 'Look at other options':gt'foto_shoot','model'
+			
+			if pcs_inhib > 60:
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
+			else
+				gs 'willpower', 'skill', 'pcs_inhib', 'force', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				*nl
+				'Or you could just force yourself do it anyways...'
+				act 'Agree (2:00) (<<will_cost>> Willpower)':gt'foto_shoot','erotic'
+			end
+		else
+			cla
+			act 'Maybe not today':gt 'foto','studio'
+
+			act 'Agree (2:00)':gt'foto_shoot','erotic'
+		end
+	end
+end
+
+if $ARGS[0] = 'fashion':
+	*clr & cla
+	minut += 120
+	modelpayfin = 300 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelfoto_fashion += 1
+	mdlng_exp += rand(5,8)
+	gs 'fame', 'city', 'modelling', rand(7,12)
+	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
+	if city_modelling > 200: 
+		gs 'fame', 'city', 'modelling', rand(3,6)
+	end
+	fashionshoot = rand(1,2)
+	gs 'stat'
+	if fashionshoot = 1:
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/fashion/<<rand(1,5)>>.mp4"></video></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fashion/<<rand(1,14)>>.jpg"></center>'
+	end
+	'You dress up in the latest in fashion wear and spend the next two hours posing for the photographer.'
+	*nl
+	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+end
+
+if $ARGS[0] = 'bikini':
+	*clr & cla
+	minut += 120
+	modelpayfin = 325 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelfoto_bikini += 1
+	gs 'fame', 'city', 'modelling', rand(7,12)
+	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
+	if city_modelling > 200: 
+		gs 'fame', 'city', 'modelling', rand(3,6)
+	end
+	minut += 120
+	mdlng_exp += rand(6,10)
+	if pcs_inhib < 50:inhib_exp += rand(0,1)
+	gs 'stat'
+	'<center><video autoplay loop src="images/locations/city/citycenter/photo/bikini/<<rand(1,3)>>.mp4"></video></center>'
+	*nl
+	'You spend the shoot in designer bikinis, modelling them to appear in various higher end magazines.'
+	*nl
+	'Two hours later, you''re all done. The photographer thanks you for your time and pays you <<modelpayfin>> <b>₽</b> for the job.'
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+end
+
+if $ARGS[0] = 'lingerie':
+	*clr & cla
+	minut += 120
+	modelpayfin = 350 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelfoto_lingerie += 1
+	mdlng_exp += rand(6,10)
+	gs 'fame', 'city', 'modelling', rand(7,13)
+	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
+	if city_modelling > 200: 
+		gs 'fame', 'city', 'modelling', rand(3,6)
+	end
+	inhib_exp += rand(0,2)
+	shoot = rand(1,2)
+	gs 'stat'
+	if shoot = 1:
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/lingerie/<<rand(1,5)>>.mp4"></video></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/lingerie/<<rand(1,11)>>.jpg"></center>'
+	end
+	'You put on some high end lingerie and spend the next two hours striking various poses for a photographer for use in fashion magazines.'
+	*nl
+	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+end
+if $ARGS[0] = 'sexy':
+	*clr & cla
+	minut += 120
+	modelpayfin = 500 + (modelpay) + (15*rand(0,5)) + (pcs_apprnc) + (city_modelling/2) + (pcs_mdlng/2 * 10)
+	modelfoto_glamour += 1
+	modelfoto_ero_clo += 1
+	mdlng_exp += rand(5,10)
+	gs 'fame', 'city', 'modelling', rand(7,12)
+	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
+	if city_modelling > 200: 
+		gs 'fame', 'city', 'modelling', rand(1,6)
+	end
+	inhib_exp += rand(0,1)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/sexy/<<rand(1,20)>>.jpg"></center>'
+	'You dress up in sexy clothes and spend the next two hours posing for the photographer.'
+	*nl
+	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+	act 'Leave':gt 'foto','end'
+end
+
+if $ARGS[0] = 'transparent':
+	*clr & cla
+	minut += 120
+	modelpayfin = 600 + (modelpay) + (pcs_apprnc) + (15*rand(0,5))
+	modelfoto_glamour += 1
+	modelfoto_transparent += 1
+	modelfoto_nip += 1
+	mdlng_exp += rand(6,10)
+	gs 'fame', 'city', 'modelling', rand(7,13)
+	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
+	if city_modelling > 200: 
+		gs 'fame', 'city', 'modelling', rand(3,8)
+	end
+	inhib_exp += rand(0,2)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/seethru/<<rand(1,10)>>.jpg"></center>'
+	'You put on a transparent top and spend the next two hours in various poses for the photographer, a flash highlighting your breasts with every click of the camera.'
+	*nl
+	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+end
+
+if $ARGS[0] = 'trans_ling':
+	*clr & cla
+	minut += 120
+	modelpayfin = 650 + (modelpay * 2) + (pcs_apprnc) + (15*rand(0,7))
+	modelfoto_glamour += 1
+	modelfoto_trans_ling += 1
+	modelfoto_nip += 1
+	modelfoto_lingerie += 1
+	mdlng_exp += rand(8,10)
+	gs 'fame', 'city', 'modelling', rand(9,14)
+	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/10
+	if city_modelling > 200: 
+		gs 'fame', 'city', 'modelling', rand(3,8)
+	end
+	inhib_exp += rand(0,2)
+	gs 'stat'
+	if rand(0,1) = 1:
+		'<center><video autoplay loop src="images/locations/city/citycenter/photo/ling_trans/<<rand(1,3)>>.mp4"></video></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/ling_trans/<<rand(1,12)>>.jpg"></center>'
+	end
+	'You put on some very lacy, very transparent underwear and get to posing, your nipples often showing through the thin fabric.'
+	*nl
+	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+	*nl
+	if pornstudio = 0:pornstudio = 2 & 'At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+end
+
+
+if $ARGS[0] = 'topless':
+	*clr & cla
+	minut += 120
+	modelpayfin = 700 + (modelpay) + (pcs_apprnc) + (15*rand(0,5))
+	modelfoto_nip += 1
+	modelfoto_topless += 1
+	mdlng_exp += rand(6,10)
+	gs 'fame', 'city', 'modelling', rand(8,14)
+	gs 'fame', 'pav', 'modelling', rand(1,city_modelling)/10
+	if city_modelling > 200: 
+		gs 'fame', 'city', 'modelling', rand(3,8)
+	end
+	inhib_exp += rand(0,2)
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topless/<<rand(1,27)>>.jpg"></center>'
+	'You spend two hours striking various posing with topless breasts, listening to instruction while the photographer takes pictures of you.'
+	*nl
+	'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+end
+
+if $ARGS[0] = 'tasteful':
+	*clr & cla
+	minut += 120
+	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
+	modelfoto_tastenude += 1
+	mdlng_exp += rand(9,10)
+	gs 'fame', 'city', 'modelling', rand(10,20)
+	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
+	if city_modelling > 200: 
+		gs 'fame', 'city', 'modelling', rand(3,10)
+	end
+	inhib_exp += rand(0,2)
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/tastenude/<<rand(1,14)>>.jpg"></center>'
+	'Already naked, you step onto the set and begin the shoot immediately.'
+	*nl
+	'You spend two hours posing confidently for a photographer taking pictures of you, often being asked to carefully position your hands or legs in ways that tastefully hides your pussy and nipples. These images, though incredibly provocative, are still somehow considered to be conservative enough to be allowed on the front cover of fashion, sports, and other tabloid magazines. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+end
+
+if $ARGS[0] = 'topless_nude':
+	*clr & cla
+	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+	minut += 120
+	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
+	modelfoto_nude += 1
+	modelfoto_toplessnude += 1
+	mdlng_exp += rand(9,10)
+	gs 'fame', 'city', 'modelling', rand(10,20)
+	gs 'fame', 'pav', 'modelling', rand(0,city_modelling)/4
+	if city_modelling > 200: 
+		gs 'fame', 'city', 'modelling', rand(3,10)
+	end
+	inhib_exp += rand(1,3)
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/topnude/<<rand(1,40)>>.jpg"></center>'
+	'Already naked, you step onto the set and begin the shoot immediately.'
+	*nl
+	'You spend two hours posing confidently for a photographer taking pictures of you, often using props, hands, legs, or shadow to shield your pussy while simultaneously teasing the would-be readers of what they cannot see. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+	if pornstudio = 0:pornstudio = 2 & 'At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
+			
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+end
+
+if $ARGS[0] = 'nude':
+	*clr & cla
+	minut += 120
+	modelpay = (pcs_mdlng/2 * 10) + city_modelling + pcs_apprnc
+	modelpayfin = 600 + (modelpay * 2) + (15*rand(0,5))
+	if modelfoto_nude = 0: modelpayfin * 2 & foto_persuade = 0
+	modelfoto_nude += 1
+	modelfoto_fullnude += 1
+	modelfoto_nip += 1
+	modelfoto_pussy += 1
+	mdlng_exp += rand(9,10)
+	gs 'fame', 'city', 'modelling', rand(10,20)
+	gs 'fame', 'pav', 'modelling', rand(10,15)
+	if city_modelling > 200: 
+		gs 'fame', 'city', 'modelling', rand(5,10)
+	end
+	inhib_exp += rand(1,3)
+	if pcs_pubes <= 20:
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude/<<rand(1,17)>>.jpg"></center>'
+		'Already naked, you step onto the set and begin the shoot immediately.'
+		*nl
+		'You spend two hours posing confidently for a photographer taking pictures of you that fully expose your breasts and pussy. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/bnude/<<rand(1,12)>>.jpg"></center>'
+		'Already naked, you step onto the set and begin the shoot immediately.'
+		*nl
+		'You spend two hours posing confidently for a photographer taking pictures of you, your <<$pcdesc_pubes>> pussy providing a nice contrast to the rest of your smooth body. When the shoot ends, both you and the photographers are very proud of the results and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+	end
+	if modelfoto_nude = 1 and foto_persuade ! 5:
+		'You blink at the amount but the person who gave it to you reassures you it''s normal. The studio has a policy of doubling the pay for a model''s nude debut.'
+	elseif modelfoto_nude = 1 and foto_persuade = 5:
+		'It even includes the bonus the manager said they''d give you for your debut!'
+	end
+	if pornstudio = 0:pornstudio = 2 & *nl & 'At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You''re shocked to see that it''s for a porn production company in St. Petersburg. "Since you''ve shown that you''re willing to go full nude, we figure we might as well let you know this opportunity exists. We share a couple of models with them and from what we can tell, it increases sales for both of us. If you feel like you''re up to it, use this card and tell them we sent you. That will get you a special audition. But we understand if you don''t go. We know it''s not for everyone and that some of you want more legitimate fame."'
+
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+end
+
+if $ARGS[0] = 'erotic':
+	*clr & cla
+	minut += 120
+	modelpay = (pcs_mdlng/2 * 10) + (pcs_apprnc * 3)
+	modelpayfin = 1000 + (modelpay * 2) + (15*rand(0,5))
+	modelfoto_erotic += 1
+	modelfoto_nude += 1
+	modelfoto_nip += 1
+	modelfoto_pussy += 1
+	modelfoto_asshole += 1
+	mdlng_exp += rand(1,4)
+	gs 'fame', 'city', 'modelling', rand(5,10)
+	gs 'fame', 'city', 'porn', rand(5,15)
+	gs 'fame', 'pav', 'porn', rand(0,15)
+	if pcs_inhib < 60:inhib_exp += rand(1,3)
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/erotic/<<rand(1,10)>>.jpg"></center>'
+	if $pantyworntype ! 'none':
+		
+	else
+	
+		'Already naked, you step onto the set and begin the shoot immediately.'
+	end
+	*nl
+	'You spend two hours posing while the photographer takes many photos of your nude body, but especially your breasts, pussy, and asshole. You can see the rock-hard outline of his cock the whole time and you are paid <<modelpayfin>> <b>₽</b> for your work.'
+	
+	if pornstudio = 0:pornstudio = 2 & 'At the end of the shoot a staff member comes up to you. "By the way, you should take this," he says, handing you a business card. You read it and see that it''s for a porn production company in St. Petersburg. "You''re basically already shooting softcore nudes, so we thought we''d offer you the chance to go hardcore."'
+
+	if pcs_mdlng >= 40 and commercial = 0:
+		act 'Leave':gt'foto_events','commercial'
+	else
+		act 'Leave':gt 'foto', 'end'
+	end
+
+end
+
+!!	act 'Variety shoot':
+!!		if pcs_inhib < 60:
+!!			msg'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.'
+!!			gt 'foto', 'nude_shoot'
+!!		else
+!!			cla
+!!			act 'Maybe not today':gt 'foto','studio'
+!!
+!!			act 'Agree (2:00)':
+!!				*clr & cla
+!!				minut += 120
+!!				modelpayfin = 825 + (modelpay * 2) + (15*rand(0,7))
+!!				mdlng_exp += 10
+!!				city_modelling += rand(10,20)
+!!				pav_modelling += rand(0,city_modelling)/10
+!!				inhib_exp += 3
+!!				modelfoto_glamour += 1
+!!				modelfoto_nip += 1
+!!				modelfoto_fashion += 1
+!!				modelfoto_lingerie += 1
+!!				modelfoto_topless += 1
+!!				modelfoto_pussy += 1
+!!				gs 'stat'
+!!				'<center><video autoplay loop src="images/locations/city/citycenter/photo/vmodel.mp4"></video></center>'
+!!				'You spend two hours posing for the photographer, changing in and out of various underwear, sexy clothings, and lingeries until you end the shoot fully striped down and dancing naked.'
+!!				*nl
+!!				'After having taken all his pictures, the photographer thanks you for your time and concludes the shoot, counting out your <<modelpayfin>> <b>₽</b> to hand to you.'
+!!				if pcs_mdlng >= 40 and commercial = 0:
+!!					act 'Leave':gt'foto_events','commercial'
+!!				else
+!!					act 'Leave':gt 'foto', 'end'
+!!				end
+!!			end
+!!		end
+!!	end
+!!end
+
+
+--- foto_shoot ---------------------------------
+

+ 1 - 1
locations/furi.qsrc

@@ -89,7 +89,7 @@ act 'Try to get a lift':
 			if furibj >= 100:
 				act'Grin back':
 					cla & *clr
-!!Image needed					'<center><video autoplay loop src="images/locations/highway/hj_motion.mp4"></video></center>'
+				'<center><video autoplay loop src="images/pc/hj_motion.mp4"></video></center>'
 					'"Yeah I do," you grin. "Is there anything I can do to make it up to you? Anything I can... help with?" you ask, miming an inappropriate motion.'
 					'"There sure is. But with your mouth, not your hand," he says, climbing into the driver''s seat.'
 					'"Of course!" you smile, pulling yourself into the passenger''s seat beside him. "Why would I use anything else?"'

+ 26 - 2
locations/gevent.qsrc

@@ -204,8 +204,32 @@ if $ARGS[0] = '5':
 	gs 'fame', 'pav', 'prostitute', rand(2,4)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/5.jpg"></center>'
-	'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. Not even bothering to undress you, he simply pulls your clothes to the side and thrusts his dick inside you. Within minutes, his breathing grows heavier and he growls as he shoots his load onto your ass cheeks. He pants: "Nice, babe... you''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'
-
+	if CloSkirtShortness > 0:
+		if CloDress = 1:
+			if $pantyworntype ! 'none':
+				'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. Not even bothering to undress you, he simply pulls up your dress, yanks down your panties, and thrusts his dick inside you. Within minutes, his breathing grows heavier and he pulls out, jerking his load onto your ass cheeks. "Nice, babe..." he pants. "You''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'
+			else
+				'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. Not even bothering to undress you, he simply pulls up your dress and thrusts his dick inside you. "No panties, nice," he grunts as he starts to fuck you. Within minutes, his breathing grows heavier and he pulls out, jerking his load onto your ass cheeks. "Nice, babe..." he pants. "You''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'
+		else
+			if $pantyworntype ! 'none':
+				'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. Not even bothering to undress you, he simply flips your skirt up, yanks down your panties, and thrusts his dick inside you. Within minutes, his breathing grows heavier and he pulls out, jerking his load onto your ass cheeks. "Nice, babe..." he pants. "You''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'
+			else
+				'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. Not even bothering to undress you, he simply flips up your skirt up and thrusts his dick inside you. "No panties, nice," he grunts as he starts to fuck you. Within minutes, his breathing grows heavier and he pulls out, jerking his load onto your ass cheeks. "Nice, babe..." he pants. "You''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'
+			end
+		end
+	elseif CloPantsShortness = 6:
+		if $pantyworntype ! 'none':
+			'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. He doesn''t bother to undress you, just pushes your shorts and panties to the side and thrusts his dick inside you. Within minutes, his breathing grows heavier and he pulls out, jerking his load onto your ass cheeks. "Nice, babe..." he pants. "You''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'
+		else
+			'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. He pushes your shorts to the side and thrusts his dick inside you. "No panties, nice," he grunts as he fucks you. Within minutes, his breathing grows heavier and he pulls out, jerking his load onto your ass cheeks. "Nice, babe..." he pants. "You''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'
+		end
+	else
+		if $pantyworntype ! 'none':
+			'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. He yanks your pants down to your knees and thrusts his dick inside you. Within minutes, his breathing grows heavier and he pulls out, jerking his load onto your ass cheeks. "Nice, babe..." he pants. "You''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'
+		else
+			'The guy quickly pulls you into the bushes, separated enough from the main roads to get a quick fuck in without being noticed. He yanks your pants down to your knees and thrusts his dick inside you. "No panties, nice," he grunts as he starts to fuck you. Within minutes, his breathing grows heavier and he pulls out, jerking his load onto your ass cheeks. "Nice, babe..." he pants. "You''re definitely worth the money", as he hands you 100 <b>₽</b> and leaves.'
+		end
+	end
 	gs 'arousal', 'vaginal', 15, 'prostitution'
 	gs 'arousal', 'end'
 	gs 'stat'

+ 1 - 0
locations/gschool_lessonsev1.qsrc

@@ -366,6 +366,7 @@ if $ARGS[0] = 'biology':
 		elseif scooltiperand = 15:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/natsit.jpg"></center>'
 			'Near the end of class Miss Orlov tells the class to study quietly as she gets up and leaves the class. Of course once she is gone everyone starts talking and only a few of the nerds actually study. Most of the students get up and walk around, even Natasha puts her books away and gets up and sits on the back of her chair, giving you a smile when you look her way.'
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 16:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/biology/natskirt.jpg"></center>'
 			'Near the end of class Miss Orlov calls Natasha up to the blackboard to write out the assignment. Once done Natasha returns to her seat and sits down, unaware the back of her skirt catches on the seat, which shows off her panty clad ass as she sits through the last of class. Several others students notice as well.'

+ 9 - 1
locations/gschool_lessonsev3.qsrc

@@ -253,6 +253,14 @@ if $ARGS[0] = 'reading':
 			'Unable to respond, you turn around without confronting him. You hear him chuckle and mutter something incoherent under his breath, but he doesn''t say anything else for the remaining class period. Replaying the encounter in your head, a part of you wonders if saying nothing was the right thing to do.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
+		act 'Blush':
+			cla & *nl			
+			'Your cheeks flush with heat at his words and you meekly look away, feeling his leering gaze burn into your neck. A few boys nearby snigger at his remark and a couple girls huff in disgust.'
+			*nl
+			'As class continues and everyone''s attention moves on, you wonder maybe if your reaction might''ve given the wrong impression...'
+			gs 'fame', 'pav', 'sex', rand(0,1)
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+		end
 		gs 'willpower', 'bj', 'self', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Tell him he''s right (<<will_cost>> Willpower)':
@@ -581,7 +589,7 @@ if $ARGS[0] = 'english':
 					gs 'stat'
 					npc_rel['A141'] +=1
 					grupvalue[2] += 1
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/events/eavesdrop.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
 					'"You''re all just jealous that Veronika has more talent in her big toe than all of you combined," you say with a smirk. "It must really scare you knowing that she''s going to do something with her life while the rest of you will end up pregnant before your 21st birthday, by a deadbeat who will see you as nothing more than a warm hole he can stick his dick in."'
 					*nl
 					'The girls are staring at you in silence, and Veronika is looking at you in disbelief. Did you go too far? You start to worry you did something wrong, but then you notice the smallest hint of a smile on Veronika''s face.'

+ 1 - 1
locations/gschool_sex.qsrc

@@ -875,7 +875,7 @@ end
 
 if $ARGS[0] = 'lazar_lockerroom_cum':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/shower/lazar7.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/shower/lazar8.jpg"></center>'
 	'You climb off him once you are sure he is close and get on your knees and start to sucking his cock again, tasting your own juices and stroking it with your hand. When you feel his dick start to twitch you stop sucking his dick and barely pull your mouth off his dick when his cum spurts out hitting the side of your face. You stroke him several more times milking every last drop of cum out of him. He moans loudly as he says. "Fuck I needed that, that was amazing <<$pcs_nickname>>." Then he stands up and pulls his pants back up.'
 	*nl
 	if grupTipe = 2:

+ 4 - 4
locations/npcstatic5.qsrc

@@ -155,11 +155,11 @@ npc_sexskill['A<<npctemp>>'] = 2
 
 npctemp = 209
 $npc_dna['A<<npctemp>>'] = '1740246374 1919208009 1680455685 1053484462 1109927912 1261930787 1696559936'
-$npc_firstname['A<<npctemp>>'] = 'Jeff'
-$npc_nickname['A<<npctemp>>'] = 'Jeff'
-$npc_lastname['A<<npctemp>>'] = 'Milodarov'
+$npc_firstname['A<<npctemp>>'] = 'Alexandra'
+$npc_nickname['A<<npctemp>>'] = 'Alex'
+$npc_lastname['A<<npctemp>>'] = 'Solokov'
 $npc_usedname['A<<npctemp>>'] = 'Jeff'
-$npc_notes['A<<npctemp>>'] = 'Nice, cuddly girl who''s like a teddy bear. Huge airhead but is strangely very good at her schoolwork and very knowledgeable about sex.'
+$npc_notes['A<<npctemp>>'] = 'Cuddly girl who''s like a teddy bear. Huge airhead but is strangely very good at her schoolwork and very knowledgeable about sex from history working as an escort.'
 npc_dob['A<<npctemp>>'] = 19950314
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'

+ 9 - 2
locations/obj_din.qsrc

@@ -583,10 +583,13 @@ if $ARGS[0] = 'stats':
 		if modelfoto_ero_clo > 0: '<<modelfoto_ero_clo>> - Number of erotic clothing shoots you have participated in'
 		if modelfoto_bikini > 0: '<<modelfoto_bikini>> - Number of swimsuit shoots you have modelled in'
 		if modelfoto_lingerie > 0: '<<modelfoto_lingerie>> - Number of lingerie shoots you have participated in'
+		if modelfoto_glamour > 0: '<<modelfoto_glamour>> - Number of glamour shoots you have participated in'
+		if modelfoto_nude > 0: '<<modelfoto_nude>> - Number of nude modelling shoots you have participated in'
+		if modelfoto_erotic > 0: '<<modelfoto_erotic>> - Number of softcore porn shoots you have participated in'
 		if modelfoto_nip > 0: '<<modelfoto_nip>> - Number of times your nipples have been visible as a model'
 		if modelfoto_topless > 0: '<<modelfoto_topless>> - Number of shoots where you have been topless'
-		if modelfoto_nude > 0: '<<modelfoto_nude>> - Number of nude modelling shoots you have participated in'
-		if modelfoto_pussy > 0: '<<modelfoto_pussy>> - Number of shoots your vagina has been visible'
+		if modelfoto_pussy > 0: '<<modelfoto_pussy>> - Number of shoots you have shown your pussy'
+		if modelfoto_asshole > 0: '<<modelfoto_asshole>> - Number of shoots you have shown your asshole'
 		*nl
 	end
 
@@ -1193,6 +1196,10 @@ if $ARGS[0] = 'stats_sex':
 	if stat['anal_dildo_give'] > 0: 'Dildoed someone else''s ass: <<stat[''anal_dildo_give'']>>'
 	if stat['anal_vibe_give'] > 0: 'Used a vibrator on someone else''s ass: <<stat[''anal_vibe_give'']>>'
 	if stat['anal_strap_give'] > 0 or stat['anal_strap_give'] > 0: 'Fucked someone else''s ass with a strap-on: <<stat[''anal_strap_give'']>>'
+	
+	*nl
+	
+	if furibj > 0: 'You have traded blowjobs for rides with the truckers <<furibj>> times'
 
 	'</td></tr></table></center>'
 end

+ 3 - 0
locations/panties.qsrc

@@ -187,6 +187,9 @@ if $ARGS[0] = 'view_panty_item':
 			else
 				if metka_panties = 0:
 					act 'Wear':
+						if CloPanties = 1:
+							msg'Your outfit is already replacing your panties'
+						end
 						gs 'panties', 'wear', $ARGS[2], ARGS[3]
 
 						if $ARGS[1] = 'wardrobe':

+ 6 - 6
locations/pornstudio.qsrc

@@ -817,7 +817,7 @@ if $ARGS[0] = 'yes':
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Undress (<<will_cost>> Willpower)':
-				cla
+				cla & *clr
 				gs 'willpower', 'pay', 'self'
 				minut += 5
 				gs 'stat'
@@ -827,28 +827,28 @@ if $ARGS[0] = 'yes':
 				act 'Grab your clothes and run out': gt 'pornstudio', 'start'
 
 				act 'Lie down on the sofa and spread your legs':
-					cla
+					cla & *clr
 					minut += 5
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/casting/casting2.jpg"></center>'
 					'You lie down on the sofa and spread your legs. The boss takes a few pictures on his phone, explaining that it is for the portfolio. After that, he asks you to kneel.'
 
 					act 'Kneel':
-						cla
+						cla & *clr
 						minut += 5
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/casting/casting3.jpg"></center>'
 						'You get up from the sofa and kneel in front of the boss as he pulls out his sizeable cock. You admire his member for a few seconds before slowly sucking on his tip. He takes more pictures as he says "Now suck."'
 
 						act 'Suck his dick':
-							cla
+							cla & *clr
 							minut += 5
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/casting/casting4.jpg"></center>'
 							'You take his shaft into your mouth and begin to suck as he takes a few more pictures.'
 
 							act 'Finish him':
-								cla
+								cla & *clr
 								minut += 5
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/studio/casting/casting5.jpg"></center>'
@@ -857,7 +857,7 @@ if $ARGS[0] = 'yes':
 								'"You can call me Peter. You are going to need a pornstar name.'
 
 								act 'Choose your pornstar name':
-									cla
+									cla & *clr
 									firstkasting = 1
 									$pfname = input ("What will your pornstar name be?")
 

+ 1 - 1
locations/sell_young_clothes.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'start':
 			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sell_young_clothes'', ''yshopclo''"><img <<$set_imgh>> src="images/pc/clothing/2average/<<i>>.jpg" 	height="250" /></a>'
 		end
 		i += 12
-	if i <= 522:jump 'loopaverage'
+	if i <= 529:jump 'loopaverage'
 end
 
 if $ARGS[0] = 'yshopclo': gt 'clothing', 'view_clothing_item', 'shop', 'average',i, 3000

+ 3 - 4
locations/shoplifting.qsrc

@@ -24,13 +24,12 @@ if $ARGS[0] = 'city':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/shoplift/leave.jpg"></center>'
 			'"Okay <<$pcs_nickname>>, just act normal..." you sigh quietly as you step towards the exit, trying to not draw any attention towards you.'
-			wait 500
 			'Don''t panic.....'
-			wait 500
 			'Walk casually...'
-			wait 500
 			'Almost there..'
-			wait 500
+			'Don''t panic.....'
+			'Walk casually...'
+			'Almost there..'
 			'The exit of the supermarket comes closer and closer with every step, and you try to do whatever you can to control your nerves.'
 
 			if ((pcs_observ+pcs_persuas > 50) and (hour = 12 or hour = 17)) or pcs_observ+pcs_persuas > 150 or rand(0,4) > 0:

+ 42 - 10
locations/stat_display.qsrc

@@ -321,7 +321,7 @@ $stat_bra_text = ''
 if $clothingworntype ! 'nude':
 	if CloThinness = 6:
 		if $clothingworntype = 'swimwear':
-			$stat_bra_msg = 'Your nipples are clearly showing through your transparent swimsuit.'
+			$stat_bra_msg = 'Your breasts are clearly showing through your transparent swimsuit.'
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
 			$stat_bra_msg = 'Your breasts are fully on display through your transparent bra and top.'
@@ -330,31 +330,63 @@ if $clothingworntype ! 'nude':
 			$stat_bra_msg = 'Your bra is clearly showing through your transparent top.'
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		else
-			$stat_bra_msg = 'You are not wearing a bra and your breasts are fully on display through your transparent top.'
+			$stat_bra_msg = 'Your breasts are fully on display through your transparent top.'
 			$stat_bra_text = '<BR><font color = #FF00FF><<$stat_bra_msg>></font>'
 		end
 	elseif CloThinness = 5:
 		if $clothingworntype = 'swimwear':
-			$stat_bra_msg = 'Your nipples are noticeably poking through your swimsuit.'
+			$stat_bra_msg = 'Your nipples are fully outlined through your swimsuit.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
-			$stat_bra_msg = 'You are wearing such a thin bra that your nipples are noticeably poking through the thin fabric of your top.'
+			$stat_bra_msg = 'Your nipples are being fully outlined through the thin fabric of your top and bra.'
+			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+		elseif $braworntype ! 'none':
+			$stat_bra_msg = 'Your bra is being outlined through your top.'
+			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+		elseif $braworntype = 'none' and pcs_horny >= 50:
+			$stat_bra_msg = 'Your aroused nipples are hard and showing through your top.'
+			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+		elseif $braworntype = 'none' and temper < 14:
+			$stat_bra_msg = 'Your nipples are freezing cold and visibly hard through your top.'
+			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+		elseif CloBra = 1:
+			$stat_bra_msg = 'Your top is replacing a bra.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'none':
-			$stat_bra_msg = 'You are not wearing a bra and your nipples are noticeably poking through the thin fabric of your top.'
+			$stat_bra_msg = 'Your nipples are being completely outlined through your thin top.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		end
 	elseif CloThinness = 4:
 		if $clothingworntype = 'swimwear':
-			$stat_bra_msg = 'Your nipples are very slightly poking through your swimsuit.'
+			$stat_bra_msg = 'Your nipples are slightly poking through your swimsuit.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'exhibitionist':
-			$stat_bra_msg = 'You are wearing such a thin bra that your nipples are subtly outlined through your top.'
+			$stat_bra_msg = 'You are wearing such a thin bra that your nipples are still being fainly outlined through your top.'
+			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+		elseif $braworntype ! 'none':
+			$stat_bra_msg = 'Your bra is being outlined through your top.'
+		elseif $braworntype = 'none' and pcs_horny >= 50:
+			$stat_bra_msg = 'Your aroused nipples are visibly hard.'
+			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+		elseif $braworntype = 'none' and temper < 14:
+			$stat_bra_msg = 'Your nipples are freezing cold and visibly hard through your top.'
+			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+		elseif CloBra = 1:
+			$stat_bra_msg = 'Your top is replacing a bra.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		elseif $braworntype = 'none':
-			$stat_bra_msg = 'You are not wearing a bra and your nipples are being subtly outlined through your top.'
+			$stat_bra_msg = 'Your nipples are being faintly outlined through your top.'
 			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 		end
+	elseif CloBra = 1:
+			$stat_bra_msg = 'Your top is replacing a bra.'
+			$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+	elseif $braworntype = 'none' and pcs_horny >= 50:
+		$stat_bra_msg = 'You are not wearing a bra and your aroused nipples are rock hard.'
+		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
+	elseif $braworntype = 'none' and temper < 14:
+		$stat_bra_msg = 'You are not wearing a bra and your nipples are freezing cold.'
+		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
 	elseif $braworntype = 'none':
 		$stat_bra_msg = 'You are not wearing a bra.'
 		$stat_bra_text = '<BR><font color = #AB052A><<$stat_bra_msg>></font>'
@@ -1086,8 +1118,8 @@ if cheatStatusIcons = 0:
 
 	if pcs_sweat > 19: $statusIconBarTab += '<td><a href="exec:msg $stat_sweat_msg"><img title="<<$stat_sweat_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/need_shower.png"></a></td>'
 	
-	if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or ((pubestyle >= 2 and pubestyle <= 7) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or (pubestyle = 9 and pcs_pubes >= 25) or (pubestyle = 10 and pcs_pubes >= 30):
-		if (pubestyle = 1 and pcs_pubes > 3) or ((pubestyle >= 2 and pubestyle <= 7) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or (pubestyle = 9 and pcs_pubes >= 25) or (pubestyle = 10 and pcs_pubes >= 30):
+	if pcs_leghair > 3 or (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12)  and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or (pubestyle = 9 and pcs_pubes >= 25) or (pubestyle = 10 and pcs_pubes >= 40):
+		if (pubestyle = 1 and pcs_pubes > 3) or (((pubestyle >= 2 and pubestyle <= 7) or pubestyle = 12) and pcs_pubes >= 15) or (pubestyle = 8 and pcs_pubes >= 20) or ((pubestyle = 9 or pubestyle >= 13) and pcs_pubes >= 26) or (pubestyle = 10 and pcs_pubes >= 40):
 			$stat_shave_msg = 'You need to shave your'+iif(pcs_leghair > 3, ' legs and ', ' ')+'pussy.'
 		elseif pcs_leghair > 3:
 			$stat_shave_msg = 'You need to shave your legs.'

+ 2 - 0
locations/wardrobe.qsrc

@@ -8,6 +8,8 @@ if $ARGS[0] = 'start':
 	$wloc = 'wardrobe'
 	menu_off = 1
 	gs 'stat'
+	if CloBra = 1: gs 'bras', 'remove'
+	if CloPanties = 1: gs 'panties','remove'
 	if $sports_clothing_name = '':$sports_clothing_name = 'default sports outfit'
 	if $clothingworntype = 'cheap' and clothingwornnumber = '414':
 		gs 'clothing', 'swamp_clothes', 0

Some files were not shown because too many files changed in this diff