116 Commits e453da8a82 ... 6f5fc69215

Author SHA1 Message Date
  KevinSmarts 6f5fc69215 [fixes] Small bugs reported by analyser 4 years ago
  KevinSmarts f29873ea94 [change] Adjusted max value for level 2 neckline when adding boob size to max at a total of 4 4 years ago
  KevinSmarts 2504c3c6e7 Merge remote-tracking branch 'julzor/master' 4 years ago
  KevinSmarts 5f646e66f2 Merge remote-tracking branch 'Sicaa/master' 4 years ago
  KevinSmarts 00df035e8b [Fixed] Varible set too high 4 years ago
  KevinSmarts 45bd76b2ca [fixed] Range for skirt attractivenes calc was wrong 4 years ago
  julzor 66b1e05746 [changed] moved the addictive personality trait to the correct file and balanced the heavy/light weight trait a bit 4 years ago
  Sicaa 0f3001d076 [fixed] forgot to remove unnecessary bits 4 years ago
  Sicaa 36d6d8798e [added] hotcat_rating data to saveupdater 4 years ago
  Sicaa abede3e13f [added] Hotornot boy stuff - by Nutluck 4 years ago
  KevinSmarts 235ca98cdd [changed] Changed the file names and headers/footings that I missed 4 years ago
  KevinSmarts ec0c9ef6e1 [changed] Renamed the Pussy Kats files to match the store name and updated the links 4 years ago
  KevinSmarts ec5323e469 Merge remote-tracking branch 'Sicaa/master' 4 years ago
  KevinSmarts c03807044a Merge remote-tracking branch 'sovietmercader/master' 4 years ago
  Sicaa 0a4673acfb [fixed] audio stop when entering strip club & no npc generated for lapdance sex 4 years ago
  Sicaa 3d0767d38d [added] alternative dynamic for removing underwear and stashing it in your purse + [changed] non-home bathroom dynamics accordingly 4 years ago
  Sicaa 062481c1ca [changed] strapon dildo selection in stol + [fixed] incorrect 'boystat', 'D' calls & some general cleanup 4 years ago
  KevinSmarts d8f4abd991 [added] links for missing images from nutluck 4 years ago
  KevinSmarts dec5f82281 [fixed] Inhibition values reversed in display for custom setup to avoid confusion 4 years ago
  sovietmercader 6d5191018a [fixed] bad swamp gt and wrong variable in gadbana 4 years ago
  KevinSmarts a9b4b2d6c5 [fixes] Hooked in the aunt Luda reactions to the purchases of various products and disabled menu during the reaction text 4 years ago
  KevinSmarts 145b7b1d21 Merge remote-tracking branch 'hornguy6/master' 4 years ago
  hornguy6 e3ee116175 [changed] Attempted fix of the gaptek file to access the luda events but it skips right over it. Someone else will have to fix it properly. 4 years ago
  KevinSmarts b40b18f29e [fixes] typo in text 4 years ago
  hornguy6 9cd9c599a4 [fixed] changed a < to a > 4 years ago
  KevinSmarts 059a71c1eb [fixes] Various fixes to the Pav pharmacy from Hornguy6 4 years ago
  KevinSmarts ae0b47be58 Merge remote-tracking branch 'hornguy6/master' 4 years ago
  hornguy6 c8fc376987 [fixed] proper removal of CloExhibit variable 4 years ago
  hornguy6 415792fb50 Revert "[removed] unnecessary CloExhibit variable from the clothing files" 4 years ago
  KevinSmarts 172df93d10 [fixed] Wrong image location spotted by Adam 4 years ago
  hornguy6 dae7d9465d [changed] new description for yoga and changed the mp4 to pictures which have a more suitable background 4 years ago
  hornguy6 e66d5e609d [removed] unnecessary CloExhibit variable from the clothing files 4 years ago
  hornguy6 9d8bf031ac [changed] random prostitution event in Pav is now more descriptive based on clothing choice 4 years ago
  hornguy6 ac258a1e54 [removed] wait code from shoplifting 4 years ago
  hornguy6 8b366013c0 [added] new outfits to Kats 4 years ago
  hornguy6 3a73ad5069 [added] additional player option during classroom event 4 years ago
  hornguy6 ee032e09bd [fixed] wrong image link 4 years ago
  hornguy6 3163fad1fc Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  KevinSmarts 806e989f04 [Fixed] Check was for worn clothing and not the item for sale (typo). 4 years ago
  KevinSmarts 0cc2fe3178 Merge remote-tracking branch 'Sicaa/master' 4 years ago
  KevinSmarts f656e4f193 [added] New dress variable added to the attributes and descriptions with dresses getting new and better tailored description components 4 years ago
  KevinSmarts a06ef7e4d4 [changed] Moved the school uniforms to their own section and linked new artwork for it 4 years ago
  hornguy6 91e8c156da [fixed] more image links 4 years ago
  hornguy6 56cc6dd842 [fixed] missing folder in image link 4 years ago
  hornguy6 da6e9dc47a Merge branch 'personal' 4 years ago
  richard_butte 513bc357dd Reworked grandparent variables one last time, to make them as clear as possible. 4 years ago
  hornguy6 2801f04980 [added] CloDress variable to all outfits that are a single dress, not a separate top and skirt (have not done alternative outfits yet) 4 years ago
  Sicaa a42ba13c44 [fixed] wrong image in sexm - by Nutluck 4 years ago
  Sicaa 37e33ab082 [fixed] a few more things in the natasha files 4 years ago
  Sicaa 90f12623ee [changed] mom&sergey stuff in shulgahall - by Nutluck 4 years ago
  KevinSmarts 61069b04fe Merge remote-tracking branch 'Sicaa/master' 4 years ago
  KevinSmarts 46e9206300 Merge remote-tracking branch 'KeyMasterOfGozer/master' 4 years ago
  Sicaa b6e82de072 [added] Willpower-like actions for buying sports equipment in sportShop if you don't have enough money + added ice skates to the selection 4 years ago
  Sicaa ddb1072afc [fixed] no exit option alongside willpower check in natbelEv shower spying + blocking bedroom if Sveta decides not to spy on the sister+BF sex 4 years ago
  Sicaa 02964a40b7 [changed] updated some Voltrenersex events to arousal calls + changed defunct sexstart2orgazm5 variable to orgasm_txt where I found it + moved arousal call in dinsex vaginal scene to the end in case it triggers an orgasm + some general cleanup in these files 4 years ago
  Sicaa 476a82b987 [fixed] error I made in the saveupdater 4 years ago
  hornguy6 31acca778c [changed] clothing thinness in certain outfits 4 years ago
  hornguy6 d1c6f396a3 [added] the most important foto file, oops 4 years ago
  hornguy6 f054d05303 [added] display code for if the player is wearing a bathrobe 4 years ago
  hornguy6 667f2107a8 [added] 4 new bras and 4 new panties 4 years ago
  hornguy6 3123c04d1d [added] new status messages based on bra usage and how thick or thin your clothing is 4 years ago
  hornguy6 f43422ee94 [added] additional pubic hair stuff I didn't stage earlier 4 years ago
  hornguy6 98d2c2b6de [changed] reactivated media 4 years ago
  hornguy6 4845cca1cf [changed] can now choose to shave only legs depending on pubic hairtyle 4 years ago
  hornguy6 0b09a9c159 [added] variable to the arousal file that will track the last day you've been raped in relation to daystart 4 years ago
  KevinSmarts c1e056ce53 Merge remote-tracking branch 'Iron_Jack/gadukino_fixes' 4 years ago
  KeyMasterOfGozer f451b7a791 Adjust relationship modify levels to nutluck's suggestions. 4 years ago
  richard_butte 177a09a35d minor re-ordering in mitkabuh_group 4 years ago
  KeyMasterOfGozer 7f678bee5b minor cleanup potential bug. forgot to killvar a temporary variable 4 years ago
  KeyMasterOfGozer 78d7a6191e Optimized code for Initialization, preferring loops instead of variables and cut-n-paste. 4 years ago
  KeyMasterOfGozer 5668020691 Update Comments for new file name; Change Initialization functions to use new functions. 4 years ago
  hornguy6 f5f2320d7a [changed] the flavor text for yoga as it is no longer meditation 4 years ago
  hornguy6 f89f428e88 [added] option to use your weekend alarm as an alarm during the holidays as well 4 years ago
  hornguy6 4e03488eaa [fixed] school event was missing an action to move on 4 years ago
  hornguy6 2b5d484863 [fixed] the porn studio audition was missing a bunch of *clr's so it just cluttered up the screen with images and text 4 years ago
  hornguy6 8dd6610425 [changed] Jeff the model's actual name to something else 4 years ago
  hornguy6 e118902436 [changed] additional bra replacement file I forgot to stage 4 years ago
  hornguy6 2666f39080 [changed] made it so that when you are wearing an outfit that replaces your bra or panties you are actually aren't wearing either and can't put them on 4 years ago
  hornguy6 14f627c5c3 [fixed] wrong number for picture 4 years ago
  hornguy6 b4a07eaaf7 [added] statistic tracking for how many truckers you've given blowjobs 4 years ago
  hornguy6 f987a6d18b [changed] the operation hours of the modelling studio 4 years ago
  hornguy6 e885591b4e [changed] restructured the foto files to be easier to navigate and be more logical 4 years ago
  Sicaa 0039641d92 [changed] 'pav_prostitute += ' to fame call in gevent 4 years ago
  Sicaa 6af923eb2d [changed] npc_relationship filename + moved default relationship setups from preSYS, [added] socialgroup_setting_girls function 4 years ago
  KevinSmarts 094bd70f17 Merge remote-tracking branch 'KeyMasterOfGozer/master' 4 years ago
  KevinSmarts b6951ccca4 Merge remote-tracking branch 'Sicaa/master' 4 years ago
  KeyMasterOfGozer fa3e3c40db Added traps to make relationship value stay in the correct range (1-100) 4 years ago
  KeyMasterOfGozer 84ff0bc5be Added new relationship functions 4 years ago
  KevinSmarts 0ebaa8a6c5 [Fixes] Typos spotted by Bip 4 years ago
  Sicaa c52d7caa6a [fixed] forgot to hit save on the npcstatic1 file 4 years ago
  KevinSmarts 53103709db [Fix] Change boy generation to size 0 breasts 4 years ago
  KevinSmarts fd9f6c37f4 Merge remote-tracking branch 'Sicaa/master' 4 years ago
  Sicaa 22d3f566c4 [changed] bust sizes of some NPCs in the npcstatic files + updated NPC bust generation accordingly 4 years ago
  KevinSmarts a366db5967 Merge remote-tracking branch 'Sicaa/master' 4 years ago
  Sicaa 341da4ca43 [changed] natasha variables into one array, [added] chance to catch Nat&Kolka in the shower + NPC statistics for Nat's mother (ID 191), [fixed] same threshold for natasha's pregnancy visibility + a few typos and bugs found while doing all this 4 years ago
  KevinSmarts ab573a1976 [fixes] Reduced hunger from exercise and added thirst to it 4 years ago
  KevinSmarts 03eeecfd53 Merge remote-tracking branch 'KeyMasterOfGozer/master' 4 years ago
  KeyMasterOfGozer 26eaaa143f Added Glamour spell and stub for AlterSelf spell. Spell learned by studying in the library. 4 years ago
  richard_butte 876af31b06 Reordered choices in mitkabuh (drinking with Mitka and the boys) 4 years ago
  Sicaa ba092eb2d1 [fixed] repeating roma virginity scene in sisterQW [added] end of content message for the hotel BDSM events in HotelWork 4 years ago
  Sicaa c490e721dc [fixed] street prostitution soft-block for virgins & more accurate description for the anal scene also involving vaginal sex 4 years ago
  KevinSmarts da7ab7b8fa [Added] More lube seeding 4 years ago
  KevinSmarts 05f992bad5 Merge remote-tracking branch 'Milky_boobs/master' 4 years ago
  richard_butte d34c6840c7 Livened up the grandparents a little, so they will putter around the house doing little this-n-thats, instead of always just sitting there. 4 years ago
  sandra_schulz 70643c5235 [fixed] Taking away from fat instead of salo in milk production. 4 years ago
  sandra_schulz 72c3ff5da3 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  richard_butte f74ddfba6d Re-ordered more choices in gad files. Some minor spelling/grammar corrections as well, and added a choice as to where Mira's brother drops you off after your "ride". 4 years ago
  KevinSmarts 28fd5e44ea [Fixes] Typo in a goto when Anushka catches you masturbating at her computer 4 years ago
  KevinSmarts 8491828a92 [added] Version number, late so it´s just for the devs and testers 4 years ago
  KevinSmarts f1801a4596 [Fixes] Added new fight win/lose/surrender conditions for Christina on the beach fight to 'ender' and set the fightending variable in the fight setup 4 years ago
  Sicaa 99077cf1ff [fixed] image display code 4 years ago
  KevinSmarts f506dd178b [Fixes] Wrong variable 4 years ago
  Sicaa e64d5fe480 [fixed] small typos in sisterQW 4 years ago
  Sicaa 1577925061 [fixed] arousal counting massages and foreplay, noprotect flag in artemEv sex scene, workaround for accessing the alternative version of sister's parties 4 years ago
  sandra_schulz f9aa0afd89 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  sandra_schulz 16f95f0b9a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
100 changed files with 3888 additions and 2494 deletions
  1. 4 3
      glife.qproj
  2. 2 0
      locations/HotelWork.qsrc
  3. 3 3
      locations/JuliaMilHome.qsrc
  4. 26 0
      locations/Komp.qsrc
  5. 2 2
      locations/NatBelGo.qsrc
  6. 6 6
      locations/NewCloShop.qsrc
  7. 5 4
      locations/Snpc.qsrc
  8. 23 14
      locations/Voltrenersex.qsrc
  9. 0 129
      locations/_attributes_alternative.qsrc
  10. 76 10
      locations/_attributes_average.qsrc
  11. 0 22
      locations/_attributes_burlesque.qsrc
  12. 72 8
      locations/_attributes_cheap.qsrc
  13. 0 113
      locations/_attributes_exercise.qsrc
  14. 29 57
      locations/_attributes_exhibit.qsrc
  15. 141 5
      locations/_attributes_expensive.qsrc
  16. 2 96
      locations/_attributes_fetish.qsrc
  17. 168 168
      locations/_attributes_formal.qsrc
  18. 6 101
      locations/_attributes_office.qsrc
  19. 3 65
      locations/_attributes_school.qsrc
  20. 29 49
      locations/_attributes_uniform.qsrc
  21. 16 3
      locations/_body_image.qsrc
  22. 27 27
      locations/andrey.qsrc
  23. 1 1
      locations/anushapt.qsrc
  24. 0 2
      locations/anushkaev1.qsrc
  25. 7 0
      locations/arousal.qsrc
  26. 2 0
      locations/artemEv.qsrc
  27. 10 4
      locations/bed2.qsrc
  28. 1 1
      locations/bedrPar.qsrc
  29. 13 3
      locations/body.qsrc
  30. 2 2
      locations/boy.qsrc
  31. 15 5
      locations/bras.qsrc
  32. 1 1
      locations/brothel.qsrc
  33. 1 1
      locations/brother.qsrc
  34. 3 3
      locations/brother2.qsrc
  35. 6 0
      locations/budilnik.qsrc
  36. 1 1
      locations/butoilet.qsrc
  37. 3 3
      locations/cikl.qsrc
  38. 14 8
      locations/clothing.qsrc
  39. 19 19
      locations/clothing_QV.qsrc
  40. 2 0
      locations/clothing_attributes.qsrc
  41. 47 15
      locations/clothing_descriptions.qsrc
  42. 1 1
      locations/club.qsrc
  43. 1 1
      locations/dimaHome.qsrc
  44. 1 1
      locations/dinSex.qsrc
  45. 3 1
      locations/din_bad.qsrc
  46. 168 38
      locations/din_van.qsrc
  47. 4 4
      locations/down.qsrc
  48. 1 16
      locations/drugs.qsrc
  49. 53 0
      locations/ender.qsrc
  50. 10 6
      locations/exercise.qsrc
  51. 77 525
      locations/foto.qsrc
  52. 645 48
      locations/foto_events.qsrc
  53. 366 54
      locations/foto_models.qsrc
  54. 818 0
      locations/foto_shoot.qsrc
  55. 1 1
      locations/furi.qsrc
  56. 1 1
      locations/gLakeNude.qsrc
  57. 7 7
      locations/gadbana.qsrc
  58. 9 9
      locations/gaddvor.qsrc
  59. 26 26
      locations/gadfield.qsrc
  60. 4 4
      locations/gadforest.qsrc
  61. 15 15
      locations/gadgarden.qsrc
  62. 140 59
      locations/gadhouse.qsrc
  63. 4 5
      locations/gadprostitutes.qsrc
  64. 8 8
      locations/gadriver.qsrc
  65. 29 29
      locations/gadsarai.qsrc
  66. 4 4
      locations/gadukino_event.qsrc
  67. 192 253
      locations/gaptek.qsrc
  68. 7 2
      locations/gdksex.qsrc
  69. 2 1
      locations/gdktoilet.qsrc
  70. 28 3
      locations/gevent.qsrc
  71. 2 2
      locations/girl.qsrc
  72. 23 23
      locations/grandmahelp.qsrc
  73. 46 46
      locations/grandpahelp.qsrc
  74. 8 3
      locations/gschool_boys_bathroom.qsrc
  75. 2 5
      locations/gschool_break.qsrc
  76. 1 1
      locations/gschool_chats1.qsrc
  77. 5 5
      locations/gschool_chats2.qsrc
  78. 4 2
      locations/gschool_detention.qsrc
  79. 7 2
      locations/gschool_events.qsrc
  80. 33 33
      locations/gschool_grounds.qsrc
  81. 26 2
      locations/gschool_groups.qsrc
  82. 32 0
      locations/gschool_lessons.qsrc
  83. 1 1
      locations/gschool_lessons4.qsrc
  84. 6 0
      locations/gschool_lessonsev1.qsrc
  85. 9 1
      locations/gschool_lessonsev3.qsrc
  86. 4 3
      locations/gschool_office.qsrc
  87. 39 43
      locations/gschool_sex.qsrc
  88. 5 25
      locations/gschool_socialchg1.qsrc
  89. 1 1
      locations/kafe2.qsrc
  90. 4 4
      locations/katjaEvDin.qsrc
  91. 1 1
      locations/koncepod1.qsrc
  92. 1 1
      locations/korrPar.qsrc
  93. 4 2
      locations/lact_lib.qsrc
  94. 1 1
      locations/laketoilet.qsrc
  95. 1 1
      locations/leonid.qsrc
  96. 4 4
      locations/mirafather.qsrc
  97. 1 1
      locations/miroslava.qsrc
  98. 18 17
      locations/miroslavahome.qsrc
  99. 79 79
      locations/mitka.qsrc
  100. 107 109
      locations/mitkabuh.qsrc

+ 4 - 3
glife.qproj

@@ -59,6 +59,7 @@
 		<Location name="virginity_call"/>
 		<Location name="willpower"/>
 		<Location name="drugs"/>
+		<Location name="npc_relationship"/>
 	</Folder>
 	<Folder name="Body">
 		<Location name="body"/>
@@ -794,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"/>
@@ -935,8 +936,8 @@
 		<Location name="FSroom"/>
 	</Folder>
 	<Folder name="Youth Shop">
-		<Location name="young_shop"/>
-		<Location name="sell_young_clothes"/>
+		<Location name="pussykats"/>
+		<Location name="pussykats_clothes"/>
 		<Location name="andrey"/>
 		<Location name="gopnew"/>
 		<Location name="goplust"/>

+ 2 - 0
locations/HotelWork.qsrc

@@ -1255,6 +1255,8 @@ if $ARGS[0] = 'maid':
 										'You quickly nod not wanting to push your luck. "I''m sure we''ll have a lot to discuss. As you may have noticed I need to head back to business. Feel free to visit whenever you want, I''ll be here. Now, if you''ll excuse me..." she closes the door and locks it.'
 										'You are not sure what to make of it, you can visit her whenever you want. But does she have any ulterior motives...'
 									end	
+									!! End of content message
+									'<br><b>This is currently the end of this event chain.</b><br> If you have any ideas about expanding it, we''re always open for contributions!'
 									gs 'stat'
 
 									act'Get back to work':gt'hotelwork','maid'

+ 3 - 3
locations/JuliaMilHome.qsrc

@@ -25,8 +25,8 @@ if lernHome ! 0:
 		else
 			lernHome = 0
 		end
-		lern += rand(3, 6)
-		intel_exp += rand(1, 2) + (mentats_dose - rand(0,mentats_dose))
+		lern += rand(3,6)
+		intel_exp += rand(1,2) + (mentats_dose - rand(0,mentats_dose))
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'
 		'You spend an hour doing your homework with Julia, and thanks to her you manage to learn quite a lot. She''s a very clever girl, and good at explaining things.'
@@ -201,7 +201,7 @@ elseif lernHome = 0:
 			
 			if tiprand = 0:
 				'Julia mentions in passing that she used to be friends with Natasha Belova, but cut the ties after Natasha kept borrowing money despite not being able to pay any of it back. Julia frowns, and you can tell they used to get along quite well.'
-				if SexTalkJulia = 4 and NatashaQW > 8 and JuliaNatSexProposed = 0:
+				if SexTalkJulia = 4 and NatbelQW['QWstage'] > 8 and JuliaNatSexProposed = 0:
 					'"Well, I''ve had the same problem with her. But lately I''ve started making her repay me in other ways." You admit to Julia.'
 					'"What? How could she repay you if she doesn''t have any money?" Julia asks you.'
 					'"Well, she does know how to use that mouth of hers. I''ve been putting it to good use." You answer, blushing.'

+ 26 - 0
locations/Komp.qsrc

@@ -1616,6 +1616,32 @@ if $ARGS[0] = 'fuckornot':
 	end
 end
 
+if $ARGS[0] = 'hotornot':
+	*clr & cla
+	if hotornot = 2: hotornot = 3
+	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	gs 'gschool_groups', 'hotornot'
+	
+	'10: Perfection. - Would let him do whatever he wants to me'
+	'9: Smoking Hot. - Arm Candy'
+	'8: Hot. - Would ride him'
+	'7: Damn man. - Bragging rights for fucking.'
+	'6: Ridable. - Totally fuckable, fuck buddy material'
+	'5: Merely fuckable. - maybe doggy style so I don''t have to look at him.'
+	'4: Almost fuckable. - might sit on his face.'
+	'3: Unattractive. - Not even Zinaida would be seen with him.'
+	'2: Fugly. - Horribly ugly, just being seen with him would lose you social standing.'
+	'1: Hideous. - Wouldn''t touch it with a stick, not even Sonia would take his money.'
+	
+	act 'Leave the site':
+		if $view_location = 'school':
+			gt 'gschool_lessons', 'short_break'
+		else
+			gt 'komp', 'start'
+		end
+	end
+end
+
 if $ARGS[0] = 'fin': gt $loc, $metka
 
 --- Komp ---------------------------------

+ 2 - 2
locations/NatBelGo.qsrc

@@ -10,13 +10,13 @@ gs 'stat'
 act 'Go with Natasha':
 	*clr & cla
 	minut += 15
-	BeInNatBelHome = 1
+	NatbelQW['VisitedHome'] = 1
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A16'']>> <<$npc_lastname[''A16'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'
 	'It takes you 15 minutes to walk to Natasha''s home. You discuss all the small stuff in your lives that amuse you.'
 
-	if NatashaQW < 2:
+	if NatbelQW['QWstage'] < 2:
 		act 'Go into the apartment': gt 'natbelapt', 'study_together'
 	else
 		act 'Study together': gt 'natbelapt', 'study_together'

+ 6 - 6
locations/NewCloShop.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	menu_off = 0
 	!!Variable for buying underwear for Natasha so it only procs once per changingroom event
-	natund = 0
+	NatbelQW['underwearShop'] = 0
 	
 	gs 'stat'
 
@@ -50,7 +50,7 @@ if $ARGS[0] = 'changingroom':
 	if $clothingworntype = 'nude':
 		act 'Try on clothes': gt 'NewCloShop', 'dressingclothes'
 		act 'Try on bra':
-			if natseethrough = 0 and NatashaQW > 5 and natund = 0:
+			if NatbelQW['seethrough'] = 0 and NatbelQW['QWstage'] > 5 and NatbelQW['underwearShop'] = 0:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
 				'As you try on a particularly spicy set of seethrough underwear you notice that it doesn''t quite fit you.'
@@ -60,7 +60,7 @@ if $ARGS[0] = 'changingroom':
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
 					'You put the underwear aside for now so that you can take it to the register with you.'
 					money -= 750
-					natseethrough = 1
+					NatbelQW['seethrough'] = 1
 					act 'Stay in the changingroom': gt 'NewCloShop', 'changingroom'
 					act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
 				end			
@@ -68,7 +68,7 @@ if $ARGS[0] = 'changingroom':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/fashionista/nude.jpg"</center>'
 					'Deciding against it, you look through the rest of the underwear for something that would fit you better.'
-					natund = 1
+					NatbelQW['underwearShop'] = 1
 					act 'Stay in the changingroom': gt 'NewCloShop', 'changingroom'
 					act 'Get dressed and go back to the store': gt 'NewCloShop', 'changingend'
 				end
@@ -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':

+ 5 - 4
locations/Snpc.qsrc

@@ -521,14 +521,14 @@ end
 
 !!Natasha Belova Botha
 if numnpc = 16:
-	if npc_rel['A16'] >= 50 and NatashaQW = 0 and npc_rel['A<<numnpc>>'] >= 80:
+	if npc_rel['A16'] >= 50 and NatbelQW['QWstage'] = 0 and npc_rel['A<<numnpc>>'] >= 80:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 
 			if $loc = 'gdkin':minut += 5
 
 			npc_rel['A<<numnpc>>'] += 5
-			NatashaQW = 1
+			NatbelQW['QWstage'] = 1
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big<<numnpc>>.jpg"></center>'
@@ -542,7 +542,7 @@ if numnpc = 16:
 			end
 		end
 	end
-	if NatashaQW >= 8 and NatDolg > 0:
+	if NatbelQW['QWstage'] >= 8 and NatbelQW['Debt'] > 0:
 		act 'Come to the bathroom with me':
 			*clr & cla
 			minut += 5
@@ -555,8 +555,9 @@ if numnpc = 16:
 			act 'Further':
 				*clr & cla
 				minut += 15
-				NatDolg -= 500
+				NatbelQW['Debt'] -= 500
 				if npc_Sex['A16'] = 0: npc_Sex['A16'] = 1 & girl += 1
+				NatbelQW['lesbian'] += 1
 				lesbian += 1
 				pcs_horny = 0
 				orgasm += 1

+ 23 - 14
locations/Voltrenersex.qsrc

@@ -191,27 +191,35 @@ if $ARGS[0] = 'vag':
 	'Pulling his dick out of your mouth, he lefts you up and lays you back, where he spreads your pussy wide with his fingers. He gently asks "Is this hole ready for some training?", exhausted from the desire you only groaned in response.'
 	act 'Further':
 		cls
-		pcs_horny = 100
-		minut += 15
 		npc_rel['A69'] += 1
 		gs 'boyStat', 'A69'
-		gs 'stat'
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex30.mp4"></video></center>'
 		'With you still laying on your back he slips two fingers easily into your wet pussy, causing you moan softly. He finger bangs you for some time, leaving you withering in pleasure, he pulls the fingers out of your wet snatch and immediately thrusts them into your mouth. You suck them, tasting your own pussy juices.'
+		gs 'arousal', 'vaginal_finger', 5
+		gs 'stat'
 		act 'Further':
 			cls
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex31.mp4"></video></center>'
 			'After you suck his fingers clean of your pussy juices he grabs you and rolls you over, bending you over. You ask him "Will you wear a rubber?"'
 			'He shakes his head and replies: "No I''m old fashioned and don''t use that rubber shit". A second later his <<dick>>cm <<$dick_girth>> cock slides into you. '
+			$orgasm_or = 'no'
+			gs 'arousal', 'vaginal', 5
+			gs 'stat'
 			act 'Further':
 				cls
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex32.mp4"></video></center>'
 				'Fucking you doggy style, his fingers begin massaging your asshole. It was nice. Then he slides his thumb in your ass. Feeling yourself filled in two holes was so nice, you reflexively began to compress the vagina clasping tightly around his cock, this immediately affected Mikhail Nikolaevich, he increased the depth and speed of his motion as he fucked you harder.'
+				gs 'arousal', 'vaginal', 5
+				gs 'arousal', 'anal_finger', -5
+				gs 'stat'
 				act 'Don''t cum in me':
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex33.jpg"></center>'
-					$sexstart2orgazm5 = 'Even through the waves of pleasure you are feeling you understand the coach is about to cum and pump your pussy full of his sperm. With a cry you say "Don''t cum in me!", you jump away from him, causing him to pull out of you. You turn around just in time to catch a face full of cum, it spurts and flies all over you face, into your hair and between your breasts.'
+					$orgasm_or = 'yes'
+					$orgasm_txt = 'Even through the waves of pleasure you are feeling you understand the coach is about to cum and pump your pussy full of his sperm. With a cry you say "Don''t cum in me!", you jump away from him, causing him to pull out of you. You turn around just in time to catch a face full of cum, it spurts and flies all over you face, into your hair and between your breasts.'
 					gs 'dinsex','vaginal_sex',10
+					gs 'arousal', 'end'
+					gs 'stat'
 					act 'Wipe the cum':
 						cls
 						gs 'boyStat', 'A69'
@@ -229,30 +237,31 @@ if $ARGS[0] = 'vag':
 end
 
 if $ARGS[0] = 'Anal':
-*clr & cla
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex24.jpg"></center>'
-'Invitingly you reach back and pull the buns of your ass apart,so your asshole is exposed and gapping slightly from the pressure.'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex24.jpg"></center>'
+	'Invitingly you reach back and pull the buns of your ass apart,so your asshole is exposed and gapping slightly from the pressure.'
 	act 'Further':
 		cls
-		pcs_horny = 100
-		minut += 15
 		npc_rel['A69'] += 1
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex25.jpg"></center>'
 		'Grinning the coach says "Well since you asked nicely", he starts to lick your asshole, after a time his tongue darts inside of your ass, getting it nice and wet and you very aroused. You being rubbing your pussy at the same time, it is already soaking wet from your excitement.'
+		gs 'arousal', 'rimming', 5
+		gs 'stat'
 		act 'Further':
 			cls
-			gs 'boyStat', 'A69'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex26.mp4"></video></center>'
-			'Once he has your ass good and wet, he sits back and pulls you on top of him. With one hand he guides his cock to your asshole, with the other he pulls you down. You feel the head of his cock against you ass, you bit your lip a little at the pain as he pulls you down forcing his <<dick>>cm <<$dick_girth>> cock into your ass. Once he has the head in, he uses both hands to hold your hip and pull you down. He encourages you to set the pace, but lifting yourself up and down to fuck his dick with your ass.'
 			gs 'boyStat', 'A69'
 			sexpartkno = 1
-			gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
+			gs 'dinSex', 'boy_wants_anal', 'lubri'
+			'Once he has your ass good and wet, he sits back and pulls you on top of him. With one hand he guides his cock to your asshole, with the other he pulls you down. You feel the head of his cock against you ass, you bit your lip a little at the pain as he pulls you down forcing his <<dick>>cm <<$dick_girth>> cock into your ass. Once he has the head in, he uses both hands to hold your hip and pull you down. He encourages you to set the pace, but lifting yourself up and down to fuck his dick with your ass.'
+			gs 'dinsex', 'analsex', 10
+			gs 'arousal', 'end'
+			gs 'stat'
 			act 'Recover':
 				cls
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex28.jpg"></center>'
 				'He lets you guide the pace and depth for most of the time, but as he begins to pant, he grabs your hips and firmly pulls you down as he thrusts up with his hips. Jamming himself balls deep into your ass. You cry out a little in pain as he stretch out your ass a bit more. After several such thrusts he finally pulls you down, leaving himself buried balls deep in your not moving. You feel his spurts of sperm filling up your ass. Once he has finished he finally lets go of your hips so you can pull yourself up, freeing his cock from your ass. You can already feel the cum running out of your gapped asshole.'
-				act 'Leave':gt 'gdksport', 'start'
+				act 'Leave': gt 'gdksport', 'start'
 			end
 		end
 	end

+ 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 ---------------------------------

+ 76 - 10
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
@@ -237,7 +245,7 @@ elseif ARGS[1] = 37:
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 3
-	CloTopCut = 5
+	CloTopCut = 4
 	CloSkirtShortness = 4
 	CloExhibit = 30
 elseif ARGS[1] = 39:
@@ -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.'

+ 27 - 27
locations/andrey.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = '':
 		gs 'andrey', 'regular'
 	elseif hour >= 20 or (week > 5 and hour >= 16):
 		msg '<center>Andrew M. Sobulyagin says goodbye and leaves. His workday has ended.</center>'
-		gt 'young_shop', 'start'
+		gt 'pussykats', 'start'
 	end
 
 	if young_shop_miss >= 3:
@@ -35,7 +35,7 @@ if $ARGS[0] = 'apply':
 	*nl
 	'You knock on the door and someone calls you in from the other side, telling you to enter. When you enter, you''re greeted by the sight of a sour-faced older man reading papers at his desk. When he sees you, his expression hardens. "Surprised to see an old man managing a clothing store for teenage girls?" he grunts. You didn''t even say anything yet, but he doesn''t seem to care. "Yeah, I get that a lot..." he adds under his breath before sighing and looking back to his papers. "What do you need?"'
 
-	act 'Leave':gt 'young_shop', 'start'
+	act 'Leave':gt 'pussykats', 'start'
 	act 'Mention the for hire sign':
 		minut += 5
 		cla
@@ -48,7 +48,7 @@ if $ARGS[0] = 'apply':
 		*nl
 		'He seems to have found what he was looking for, which is the employment documents "You''ll need to sign these to start work here." He holds them out to you, "So, are you interested?"'
 
-		act 'Don''t take the job':gt 'young_shop', 'start'
+		act 'Don''t take the job':gt 'pussykats', 'start'
 
 		if ((work = 0 and young_shop_work = 0 and cheatWork = 0) or (young_shop_work = 0 and cheatWork = 1)):
 			*nl
@@ -61,7 +61,7 @@ if $ARGS[0] = 'apply':
 				*nl
 				'You find the conditions suiting, and without batting and eye you sign the documents.'
 				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 15:00.'
-				act 'Continue': gt 'young_shop', 'start'
+				act 'Continue': gt 'pussykats', 'start'
 			end
 			act 'Take the weekend job':
 				cla
@@ -70,7 +70,7 @@ if $ARGS[0] = 'apply':
 				*nl
 				'You find the conditions suiting, and without batting and eye you sign the documents.'
 				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Saturday at 09:00.'
-				act 'Continue': gt 'young_shop', 'start'
+				act 'Continue': gt 'pussykats', 'start'
 			end
 !!			act 'Take the full time job':
 !!				cla
@@ -80,7 +80,7 @@ if $ARGS[0] = 'apply':
 !!				*nl
 !!				'You find the conditions suiting, and without batting and eye you sign the documents.'
 !!				'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 09:00.'
-!!				act 'Continue': gt 'young_shop', 'start'
+!!				act 'Continue': gt 'pussykats', 'start'
 !!			end
 		end
 	end
@@ -116,10 +116,10 @@ if $ARGS[0] = 'regular':
 !! reset money,young_shop_salary,young_shop_bonus to zero for a new week
 			young_shop_salary = 0
 			young_shop_bonus = 0
-			gt 'young_shop', 'start'
+			gt 'pussykats', 'start'
 		end
 	else
-		act 'Leave':gt 'young_shop', 'start'
+		act 'Leave':gt 'pussykats', 'start'
 	end
 
 	act 'Resign':
@@ -136,7 +136,7 @@ if $ARGS[0] = 'regular':
 			*nl
 			'"Actually, I''d like to think about this a bit more..." You say as you''re moving back towards the door. "Sorry for bothering you, Mr. Sobulyagin."'
 			'He shakes his head. "It''s fine, but if there''s nothing else, I''m busy right now."'
-			act 'Leave':gt 'young_shop', 'start'
+			act 'Leave':gt 'pussykats', 'start'
 		end
 		act 'Persist':
 			if young_shop_work = 1:young_shop_work = 3
@@ -158,9 +158,9 @@ if $ARGS[0] = 'regular':
 				! reset money,young_shop_salary,young_shop_bonus to zero for a new week
 				young_shop_salary = 0
 				young_shop_bonus = 0
-				gt 'young_shop', 'start'
+				gt 'pussykats', 'start'
 			end
-			act 'Leave':gt 'young_shop', 'start'
+			act 'Leave':gt 'pussykats', 'start'
 		end
 	end
 end
@@ -200,7 +200,7 @@ if $ARGS[0] = 'punish':
 			end
 			act 'Leave':
 				minut += 2
-				gt 'young_shop', 'start'
+				gt 'pussykats', 'start'
 			end
 		end
 		act 'Beg to keep your job':
@@ -223,7 +223,7 @@ if $ARGS[0] = 'punish':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					
-					gt 'young_shop', 'start'
+					gt 'pussykats', 'start'
 				end
 			else
 				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -265,7 +265,7 @@ if $ARGS[0] = 'punish':
 				end
 				act 'Leave':
 					minut += 2
-					gt 'young_shop', 'start'
+					gt 'pussykats', 'start'
 				end
 			end
 		else
@@ -309,7 +309,7 @@ if $ARGS[0] = 'punish':
 				end
 				act 'Leave':
 					minut += 2
-					gt 'young_shop', 'start'
+					gt 'pussykats', 'start'
 				end
 			end
 		else
@@ -321,20 +321,20 @@ if $ARGS[0] = 'punish':
 	if cheatWork = 1:
 		act 'Reset missed days (Cheat)':
 			young_shop_miss = 0
-			gt 'young_shop', 'start'
+			gt 'pussykats', 'start'
 		end
 
 		if cheatWorkKiskis = 0:
 			act 'Disable missed days (Cheat)':
 				cheatWorkKiskis = 1
 				young_shop_miss = 0
-				gt 'young_shop', 'start'
+				gt 'pussykats', 'start'
 			end
 
 		elseif cheatWorkKiskis = 1:
 			act 'Enable missed days (Cheat)':
 				cheatWorkKiskis = 0
-				gt 'young_shop', 'start'
+				gt 'pussykats', 'start'
 			end
 		end
 	end
@@ -359,14 +359,14 @@ if $ARGS[0] = 'beg':
 				*nl
 				'Your face immediately turns beet-red as you try to comprehend what you''ve just heard. "You want me to give you a blowjob...and then have anal sex?" You don''t understand what the hell he''s thinking. "There''s no way I''ll do that!"'
 				'"Fine, then there''s the door!" Mr. Sobulyagin snaps, clearly upset with your answer.'
-				act 'Leave':gt 'young_shop', 'start'
+				act 'Leave':gt 'pussykats', 'start'
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Agree': gt 'andrey', 'rehired'
 	end
-	act 'Leave':gt 'young_shop', 'start'
+	act 'Leave':gt 'pussykats', 'start'
 end
 
 
@@ -386,17 +386,17 @@ if $ARGS[0] = 'reapply':
 			young_shop_work = 1
 			minut += 5
 			'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Monday at 15:00.'
-			gt 'young_shop', 'start'
+			gt 'pussykats', 'start'
 		end
 		act 'Accept work during the weekend':
 			young_shop_work1 = 1
 			minut += 5
 			'You got a job in the youth clothing store ''Pussy-Cats''. Your first workday is on Saturday at 09:00.'
-			gt 'young_shop', 'start'
+			gt 'pussykats', 'start'
 		end
-		act 'Leave':gt 'young_shop', 'start'
+		act 'Leave':gt 'pussykats', 'start'
 	end
-	act 'Leave':gt 'young_shop', 'start'
+	act 'Leave':gt 'pussykats', 'start'
 end
 
 if $ARGS[0] = 'fired1':
@@ -455,7 +455,7 @@ if $ARGS[0] = 'fired1':
 						'"You did very well, <<$pcs_nickname>>! You''ve shown me how hard of a worker you are, and how badly you want this job, so I''ll give you another chance." As he zips his pants, you look up to see him smiling down at you. "You''ve done enough for today, so you''re free to go home if you want, just make sure to not miss work anymore!" With these words he walks out of the office, leaving you to put yourself in order.'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Leave':gt 'young_shop', 'start'
+						act 'Leave':gt 'pussykats', 'start'
 					end
 				end
 			end
@@ -540,7 +540,7 @@ if $ARGS[0] = 'fired2':
 							'"Thank you very much!" You say, trying your hardest to keep a smile on your face.'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave':gt 'young_shop', 'start'
+							act 'Leave':gt 'pussykats', 'start'
 						end
 					end
 				end
@@ -626,7 +626,7 @@ if $ARGS[0] = 'rehired':
 							'"Thank you very much!" You say, trying your hardest to keep a smile on your face.'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave':gt 'young_shop', 'start'
+							act 'Leave':gt 'pussykats', 'start'
 						end
 					end
 				end

+ 1 - 1
locations/anushapt.qsrc

@@ -845,7 +845,7 @@ if $ARGS[0] = 'computer':
 										'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/caughtmast/les2.jpg"></center>'
 										'Once in bed you waste no time in pulling her clothes off, she returns the favor and starts removing your clothes as well. It would go a lot faster if the two of you were''t also passionately kissing and caressing each others bodies. Regardless before long, you are both naked.'
 										gs 'arousal', 'foreplay', 10, 'lesbian'
-										act 'Get pleasured': gt 'anuskaev1', 'getpleasured'
+										act 'Get pleasured': gt 'anushkaev1', 'getpleasured'
 									end
 								end
 							else

+ 0 - 2
locations/anushkaev1.qsrc

@@ -68,7 +68,6 @@ if $ARGS[0] = 'strapon1':
 									gs 'stat'
 									act 'Get fucked':
 										*clr & cla
-										gs 'boyStat', 'D3' 
 										'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme7.jpg"></center>'
 										'Once she gets bored of watching you suck the dildo she flips you back on your back, spreading your legs she kneels between them. She rubs the tip of her dildo against your wet pussy lips till it is nice and wet as well, then slowly slides the <<dick>>cm <<$dick_girth>> dildo inside of you, causing you to moan with pleasure. She slowly and gently fucks you, as you get wetter and wetter.'
 										gs 'arousal', 'vaginal_strap', 5, 'lesbian'
@@ -102,7 +101,6 @@ if $ARGS[0] = 'strapon1':
 											end
 											act 'Let her':
 												*clr & cla
-												gs 'boyStat', 'D3' 
 												'<center><img src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapme9.jpg"></center>'
 												if analplugin = 1:
 													analplugin = 0

+ 7 - 0
locations/arousal.qsrc

@@ -132,8 +132,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 !!		!! No idea where else to put this. This is used for breast stimulation which will eventually cause lactation in sveta without her knowledge. If anyone knows a better place for this, please let me know. - milky_boobs.
 !!		milkedvolume += func('lact_lib','$get_breastmilk', 8, ARGS[1])
 	elseif $ARGS[0] = 'massage':
+		count['massage'] = 1
 		stim['act'] = 25
 	elseif $ARGS[0] = 'foreplay':
+		count['foreplay'] = 1
 		stim['act'] = 20
 	elseif $ARGS[0] = 'cuni':
 		orgasm_flag = 1
@@ -355,8 +357,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		count['pee'] = 1
 		stim['act'] = 10
 	elseif $ARGS[0] = 'massage_give':
+		count['massage_give'] = 1
 		stim['act'] = 10
 	elseif $ARGS[0] = 'foreplay_give':
+		count['foreplay_give'] = 1
 		stim['act'] = 20
 	elseif $ARGS[0] = 'cuni_give':
 		count['cuni_give'] = 1
@@ -586,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
@@ -763,6 +768,7 @@ if $ARGS[0] = 'end':
 	gs 'arousal', 'count', 'vaginal_vibe'
 	gs 'arousal', 'count', 'BDSM'
 	gs 'arousal', 'count', 'pee'
+	gs 'arousal', 'count', 'massage'
 
 	gs 'arousal', 'count', 'foreplay_give'
 	gs 'arousal', 'count', 'cuni_give'
@@ -787,6 +793,7 @@ if $ARGS[0] = 'end':
 	gs 'arousal', 'count', 'hidden_titjob'
 	gs 'arousal', 'count', 'BDSM_give'
 	gs 'arousal', 'count', 'pee_give'
+	gs 'arousal', 'count', 'massage_give'
 
 	gs 'arousal', 'count2', 'flashlite'
 	gs 'arousal', 'count2', 'flash'

+ 2 - 0
locations/artemEv.qsrc

@@ -739,6 +739,8 @@ if $ARGS[0] = 'sex':
 								'"I... No, I don''t have any... I haven''t exactly had any use for those yet." He says a bit defensively.'
 								'Not wanting to hurt his feelings you tell him it''s ok.'
 							end
+						else
+							noprotect = 1
 						end
 						'You quickly roll over onto your back and spread your legs wide for him, offering yourself to him. He gets up and crawls over to you, crawling between your legs as he kneels before you. He rubs the tip of his dick against your wet slit getting the head of his dick wet, along with your twat. Then he slowly and gently pushes himself inside of you, you feel his <<dick>>cm <<$dick_girth>> cock stretching your pussy and filling it, in that wonderful sensation. After a few minutes of he slowly, making love to your, the whole time looking in your eyes with love and caring, he says. "I want to try doggy style please."'
 						gs 'arousal', 'vaginal', 5

+ 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:

+ 1 - 1
locations/bedrPar.qsrc

@@ -229,7 +229,7 @@ if $ARGS[0] = 'intro':
 	$metka = ''
 	$loc = 'korrPar'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
-	grandmaQW['month_paid'] = month
+	grandmaQW['last_month_paid'] = month
 	menu_off = 1
 	hour = 6
 	gs 'stat'

+ 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)

+ 2 - 2
locations/boy.qsrc

@@ -77,8 +77,8 @@ if $ARGS[0] = 'details':
 	!!requirements of the figure, chest size, hair color.
 	!!0 - ass less 80, 1 back from 80 prior_to 100, 2 ass over 100
 	figurBoy = rand(0, 2)
-	!!0 - chest less 3, 1 breast 3-4, 2 breasts bigger 4
-	npc_bust[$npclastgenerated] = rand(0, 2)
+	!!0 set here as they are boys
+	npc_bust[$npclastgenerated] = 0
 	!!0 - black, 1 - brown, 2 - Redhead, 3 - blonde
 	npc_haircol[$npclastgenerated] = rand(0, 3)
 	!!character 0 - soft, 1 -norm 2 - aggressor

+ 15 - 5
locations/bras.qsrc

@@ -39,6 +39,12 @@ end
 if $ARGS[0] = 'view_bra_list':
 	!! ARGS 0 - view_bra_list
 	!! ARGS 1 - action type (draw, store, unwanted)
+	
+	if $pursepantytype ! '' or $pursebratype ! '':
+		'<center><b>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</b></center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
 
 	if $ARGS[1] ! 'bathroom':
 		act 'Return': gt 'wardrobe', 'start'
@@ -184,12 +190,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

+ 1 - 1
locations/brothel.qsrc

@@ -569,7 +569,7 @@ if $ARGS[0] = 'brothel:section1:girlroom':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	if stanok > 0: dynamic $brit
 	if painkiller > 0 and pain['total'] >0 and pain['killer'] = 0:
 		act 'Take a painkiller':

+ 1 - 1
locations/brother.qsrc

@@ -192,7 +192,7 @@ if $ARGS[0] = 'start':
 				elseif brotherkisstalk = 1 or brotherSex > 4:
 					act'Make out with your brother':gt 'brother2', 'kiss'
 				end
-				if natkolkatease = 1:
+				if NatbelQW['KolkaTease'] = 1:
 					act 'Ask if he liked the show': gt 'brother2', 'nattalk'
 				end
 			end

+ 3 - 3
locations/brother2.qsrc

@@ -98,11 +98,11 @@ if $ARGS[0] = 'nattalk':
 	'"Ofcourse I did, Natasha wasn''t wearing any panties, I could see everything."'
 	'"She was wearing panties." You say with a grin. "I had stuffed them in her tight pussy."'
 	'"You? Wow. That''s hot."'
-	if kolkawantsnat = 0:
+	if NatbelQW['KolkaWantsNat'] = 0:
 		act 'Offer to set something up between them':
 			*clr & cla
-			natkolkatease += 1
-			kolkawantsnat = 1
+			NatbelQW['KolkaTease'] += 1
+			NatbelQW['KolkaWantsNat'] = 1
 			'<center><b><font color="maroon">Kolka</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
 			if brotherSex > 6:	

+ 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 - 1
locations/butoilet.qsrc

@@ -25,7 +25,7 @@ if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 dynamic $tampon
 dynamic $quickwash
 dynamic $basin
-dynamic $removepan
+dynamic $publicpan
 
 --- butoilet ---------------------------------
 

+ 3 - 3
locations/cikl.qsrc

@@ -723,7 +723,7 @@ if pcs_horny < 0:pcs_horny = 0
 !!------------------------------------------------------------------------------------------------------------
 
 !reset Natasha Belova''s clothes
-if natseethroughwearing = 1: natseethroughwearing = 0
+if NatbelQW['seethroughwearing'] = 1: NatbelQW['seethroughwearing'] = 0
 
 !!------------------------------------------------------------------------------------------------------------
 
@@ -1492,8 +1492,8 @@ gs 'body_shape', 'basebeautycalc'
 !! vovan, from 1.2.5
 hunters_check = 0
 mushroom_pickers = 0
-grandpaQW['horse_river'] = 0
-grandpaQW['haying_time'] = 0
+grandpaQW['chore_bathe_horse'] = 0
+grandpaQW['chore_bale_hay'] = 0
 mira_go_river = 0
 forestpicnic = 0
 if Mira_no > 0: Mira_no -= 1

+ 14 - 8
locations/clothing.qsrc

@@ -105,6 +105,13 @@ if $ARGS[0] = 'view_clothing_list':
 	!! ARGS 0 - view_clothing_list
 	!! ARGS 1 - action type (wardrobe, sell, resize, store, unwanted)
 	!! ARGS 2 - Shop name (kats, moncheri, gm, fashionista, sexshop, exhibitshop, dolls, sports)
+	
+	if $pursepantytype ! '' or $pursebratype ! '' and $ARGS[1] ! 'resize' and $ARGS[1] ! 'sell':
+		'<center><b>You put the '+iif($pursepantytype ! '','panties','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','bra','')+' from your purse back in the wardrobe.</b></center><br>'
+		killvar '$pursepantytype' & killvar 'pursepantynumber'
+		killvar '$pursebratype' & killvar 'pursebranumber'
+	end
+	
 	if $ARGS[1] = 'wardrobe':
 		$ward_list_page = $ARGS[1]
 		'<h3><center><b><font color="maroon">Wardrobe list</font></b></center></h3>'
@@ -427,7 +434,7 @@ if $ARGS[0] = 'view_clothing_item':
 		end
 	end
 
-	if PCloStyle2 = 4:
+	if CloStyle2 = 4:
 		if CloExhibit <= 10:
 			'<font color="blue">This uniform is very conservative. Only the nerds would approve of you wearing it.</font>'
 		elseif CloSkirt < 5 and CloThinness < 5 and CloBra = 0:
@@ -821,9 +828,9 @@ if $ARGS[0] = 'wear':
 	end
 
 	if PCloTopCut > 1:
-		if tits = 2 or tits = 3:PCloTopCut += 1
-		if tits = 4 or tits = 5:PCloTopCut += 2
-		if tits >= 6:PCloTopCut += 3
+		if tits = 2 or tits = 3: PCloTopCut += 1
+		if tits >= 4: PCloTopCut += 2
+		if PCloTopCut > 2 and tits >=6: PCloTopCut += 1
 	end
 
 !Calculations for clothing beauty, multiplied by natural beauty
@@ -835,12 +842,10 @@ if $ARGS[0] = 'wear':
 		elseif PCloThinness = 3:
 			PXCloThinness = 100
 		elseif PCloThinness = 4:
-			PXCloThinness = 150
-		elseif PCloThinness = 5:
 			PXCloThinness = 200
-		elseif PCloThinness = 6:
+		elseif PCloThinness = 5:
 			PXCloThinness = 300
-		elseif PCloThinness >= 7:
+		elseif PCloThinness = 6:
 			PXCloThinness = 400
 		end
 	end
@@ -865,6 +870,7 @@ if $ARGS[0] = 'wear':
 
 	if PCloBra = 1:
 		PXCloTopCut = 400
+		$braworntype = 'none'
 	elseif PCloBra = 2:
 		PXCloTopCut = 500
 	end

+ 19 - 19
locations/clothing_QV.qsrc

@@ -27,6 +27,8 @@ if $ARGS[0] = 'list':
 
 	'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
 
+	if ARRSIZE('school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''school''"><img src="images/locations/city/citycenter/mall/schooluniform.png"></a></center>'
+ 
 	if ARRSIZE('average') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''kats''"><img src="images/locations/city/citycenter/mall/pussycat.png"></a></center>'
 
 	if ARRSIZE('expensive') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''fashionista''"><img src="images/locations/city/citycenter/mall/fashionistat.png"></a></center>'
@@ -51,8 +53,6 @@ if $ARGS[0] = 'list':
 
 		if ARRSIZE('office') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_office''">Office wear</a></center>'
 
-		if ARRSIZE('school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_school''">School uniforms</a></center>'
-
 		if ARRSIZE('uniform') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''gm_uniform''">Work uniforms</a></center>'
 	end
 
@@ -113,53 +113,53 @@ if $ARGS[0] = 'list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'gm_school':
+	if $ARGS[1] = 'gm_uniform':
 		$ward_list_store = $ARGS[1]
 		*clr & cla
 		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
-		'<center>School uniforms</center>'
+		'<center>Work uniforms</center>'
 		*nl
 		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
 		*nl
 		'<center>These are the clothes that are currently available for you to wear.</center><br>'
 		*nl
 		i = 1
-		:loopschool
-		if school[i] = 1:
-			gs 'clothing_attributes', 'school', i
+		:loopuniform
+		if uniform[i] = 1:
+			gs 'clothing_attributes', 'uniform', i
 			if CloInhibit <= pcs_inhib:
-				if schoolS[i] = 0 and schoolH[i] > 0 and schoolB[i] >= (pcs_hips - 8) and schoolB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', <<i>>"><img src="images/pc/clothing/6school/<<i>>.jpg" 	height="250" /></a>'
+				if uniformS[i] = 0 and uniformH[i] > 0 and uniformB[i] >= (pcs_hips - 8) and uniformB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''uniform'', <<i>>"><img src="images/pc/clothing/10uniform/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
-		if i = 6: i = 7
-		if i <= ARRSIZE('school'):jump 'loopschool'
+		if i <= ARRSIZE('uniform'):jump 'loopuniform'
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
 
-	if $ARGS[1] = 'gm_uniform':
+	if $ARGS[1] = 'school':
 		$ward_list_store = $ARGS[1]
 		*clr & cla
 		'<h3><center><b><font color="maroon">Wardrobe</font></b></center></h3>'
-		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
-		'<center>Work uniforms</center>'
+		'<center><img src="images/locations/city/citycenter/mall/schooluniform.png"></center>'
+		'<center>School uniforms</center>'
 		*nl
 		'<center><table border=1><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Switch to wardrobe list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''store'', ''<<$ward_list_store>>''">Switch to stored clothing list</a></TH><TH><a href="exec:gt ''clothing'', ''view_clothing_list'', ''unwanted'', ''<<$ward_list_store>>''">Switch to unwanted clothing list</a></TH></table></center>'
 		*nl
-		'<center>These are the clothes that are currently available for you to wear.</center><br>'
+		'<center>These are the school uniforms you own that are currently available for you to wear.</center><br>'
 		*nl
 		i = 1
-		:loopuniform
-		if uniform[i] = 1:
-			gs 'clothing_attributes', 'uniform', i
+		:loopschool
+		if school[i] = 1:
+			gs 'clothing_attributes', 'school', i
 			if CloInhibit <= pcs_inhib:
-				if uniformS[i] = 0 and uniformH[i] > 0 and uniformB[i] >= (pcs_hips - 8) and uniformB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''uniform'', <<i>>"><img src="images/pc/clothing/10uniform/<<i>>.jpg" 	height="250" /></a>'
+				if schoolS[i] = 0 and schoolH[i] > 0 and schoolB[i] >= (pcs_hips - 8) and schoolB[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''school'', <<i>>"><img src="images/pc/clothing/6school/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('uniform'):jump 'loopuniform'
+		if i = 6: i = 7
+		if i <= ARRSIZE('school'):jump 'loopschool'
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end

+ 2 - 0
locations/clothing_attributes.qsrc

@@ -51,6 +51,8 @@
 !!				3 is knee-length shorts
 !!				2 is calf length
 !!				1 is ankle length
+!! CloDress  =  1 for yes
+!!		EX		1 This average quality dress. Unlike a skirt the whole thing must be removed
 !! CloPanties = 1 for yes
 !!		Ex:		1 The bottom of this outfit offers no more coverage than panties and it will replace your panties (if worn)
 !! CloOnePiece = 1

+ 47 - 15
locations/clothing_descriptions.qsrc

@@ -2,20 +2,38 @@
 !Builds a dynamic clothing description based on the clothes attributes
 
 $description = ''
-if CloQuality = 1:
-	$description = 'This crappy quality outfit'
-elseif CloQuality = 2:
-	$description = 'This very low quality outfit'
-elseif CloQuality = 3:
-	$description = 'This low quality outfit'
-elseif CloQuality = 4:
-	$description = 'This average quality outfit'
-elseif CloQuality = 5:
-	$description = 'This reasonable quality outfit'
-elseif CloQuality = 6:
-	$description = 'This good quality outfit'
-elseif CloQuality = 7:
-	$description = 'This is an outstanding quality outfit'
+if CloDress = 1:
+	if CloQuality = 1:
+		$description = 'This crappy quality dress'
+	elseif CloQuality = 2:
+		$description = 'This very low quality dress'
+	elseif CloQuality = 3:
+		$description = 'This low quality dress'
+	elseif CloQuality = 4:
+		$description = 'This average quality dress'
+	elseif CloQuality = 5:
+		$description = 'This reasonable quality dress'
+	elseif CloQuality = 6:
+		$description = 'This good quality dress'
+	elseif CloQuality = 7:
+		$description = 'This is an outstanding quality dress'
+	end
+else
+	if CloQuality = 1:
+		$description = 'This crappy quality outfit'
+	elseif CloQuality = 2:
+		$description = 'This very low quality outfit'
+	elseif CloQuality = 3:
+		$description = 'This low quality outfit'
+	elseif CloQuality = 4:
+		$description = 'This average quality outfit'
+	elseif CloQuality = 5:
+		$description = 'This reasonable quality outfit'
+	elseif CloQuality = 6:
+		$description = 'This good quality outfit'
+	elseif CloQuality = 7:
+		$description = 'This is an outstanding quality outfit'
+	end
 end
 
 if CloThinness = 1:
@@ -57,7 +75,21 @@ elseif CloTopCut > 0:
 	end
 end
 
-if CloPanties = 1:
+if CloDress = 1:
+	if CloSkirtShortness = 1:
+		$description = $description + ' and a floor-length hemline.'
+	elseif CloSkirtShortness = 2:
+		$description = $description + ' and a knee-length hemline.'
+	elseif CloSkirtShortness = 3:
+		$description = $description + ' and a fairly standard hemline.'
+	elseif CloSkirtShortness = 4:
+		$description = $description + ' and a rather short hemline.'
+	elseif CloSkirtShortness = 5:
+		$description = $description + ' and a hemline that barely reaches past your groin.'
+	elseif CloSkirtShortness = 6:
+		$description = $description + ' and a hemline not even long enough to hide your privates.'
+	end
+elseif CloPanties = 1:
 	$description += ' the bottom of which is so skimpy it replaces your panties.'
 elseif CloPantsShortness > 0:
 	if CloPantsShortness = 1:

+ 1 - 1
locations/club.qsrc

@@ -242,7 +242,7 @@ if $ARGS[0] = 'tou':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'dance':

+ 1 - 1
locations/dimaHome.qsrc

@@ -236,7 +236,7 @@ if $ARGS[0] = 'bathroom2':
 	dynamic $bteeth
 	dynamic $tampon
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 	act 'Leave the bathroom': gt 'dimaHome','hallway2'
 end
 

+ 1 - 1
locations/dinSex.qsrc

@@ -152,7 +152,6 @@ if $ARGS[0] = 'vaginal_sex':
 	vaginal_tightness = 5 + vgrdif + vltdif - pcs_horny / 10
 	arousal_modifier = 12 - vaginal_tightness
 	if pcs_vag > 0:
-		gs 'arousal','vaginal',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
 		$temp_mens = iif(cycle <= 0,' and a bit of your period leaks from your vagina','')
 		if vaginal_tightness >= 30: 
 			'You let out a groan when <<$boydesc>> penetrates you. You are too tight to take <<$xyr>> just yet, <<$xe>> is tearing you apart!'
@@ -172,6 +171,7 @@ if $ARGS[0] = 'vaginal_sex':
 		elseif vaginal_tightness < -3: 
 			'You feel <<$boydesc>>''s <<$penis_desc>> sliding through your wet folds<<$temp_mens>>. You savor the intense pleasure from the <<$penis_desc>> inside you, your cunt aching to be filled even more.'
 		end
+		gs 'arousal','vaginal',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
 
 		pcs_horny += arousal_modifier
 		pcs_mood += arousal_modifier

+ 3 - 1
locations/din_bad.qsrc

@@ -221,7 +221,9 @@ if $ARGS[0] = 'd_bag':
 	if foto = 1:'Your purse contains a strange photo'
 	if pattest > 0: 'You have <b><<pattest>></b> unused paternity test'+iif(used_pattest > 1, 's ', ' ')+'in your purse.'
 	if used_pattest > 0: 'You have <b><<used_pattest>></b> <a href="exec:dynamic $test_purse">used</a> paternity test'+iif(used_pattest > 1, 's ', ' ')+'in your purse.'
-
+	*nl
+	if $pursepantytype ! '' or $pursebratype ! '': 'You also have '+iif($pursepantytype ! '','<a href="exec:view''<<func(''$panty_image'', $pursepantytype, pursepantynumber)>>''">a pair of panties</a>','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','<a href="exec:view''<<func(''$bra_image'', $pursebratype, pursebranumber)>>''">a bra</a>','')+' in your purse, which you can put on in the nearest bathroom.'
+	
 	act 'Return':gt 'obj_din', 'menu_exit'
 	'</td></tr></table></center>'
 end

+ 168 - 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
@@ -517,6 +541,77 @@ $removepan = {
 	end
 }
 
+!! Meant for non-home bathrooms. If you have a bag stashes the underwear in there and enables putting it back on later.
+!! purse_____ variables get wiped in 'wardrobe', 'clothing', 'panties' and 'bra' so there isn''t a chance of duplication
+$publicpan = {
+	if $pantyworntype ! 'none' and $braworntype ! 'none':
+		act 'Remove underwear' + iif(bag = 1, ' and put it in your purse','') + ' (0:02)':
+			minut += 2
+			gs 'stat'
+			if bag = 1:
+				$pursepantytype = $pantyworntype
+				pursepantynumber = pantywornnumber
+				$pursebratype = $braworntype
+				pursebranumber = brawornnumber
+			end
+			gs 'underwear', 'remove'
+			gt $loc, $metka
+		end
+	elseif bag = 1 and $pantyworntype = 'none' and $braworntype = 'none' and $pursepantytype ! '' and $pursebratype ! '':
+		act 'Put your underwear back on (0:02)':
+			minut += 2
+			gs 'stat'
+			gs 'panties', 'wear', $pursepantytype, pursepantynumber
+			gs 'bras', 'wear', $pursebratype, pursebranumber
+			killvar '$pursepantytype' & killvar 'pursepantynumber'
+			killvar '$pursebratype' & killvar 'pursebranumber'
+			gt $loc, $metka
+		end
+	end
+
+	if $pantyworntype ! 'none':
+		act 'Remove panties ' + iif(bag = 1, ' and put them in your purse','') + '(0:02)':
+			minut += 2
+			gs 'stat'
+			if bag = 1:
+				$pursepantytype = $pantyworntype
+				pursepantynumber = pantywornnumber
+			end
+			gs 'panties', 'remove'
+			gt $loc, $metka
+		end
+	elseif bag = 1 and $pantyworntype = 'none' and $pursepantytype ! '':
+		act 'Put your panties back on (0:02)':
+			minut += 2
+			gs 'stat'
+			gs 'panties', 'wear', $pursepantytype, pursepantynumber
+			killvar '$pursepantytype' & killvar 'pursepantynumber'
+			gt $loc, $metka
+		end
+	end
+
+	if $braworntype ! 'none':
+		act 'Remove bra ' + iif(bag = 1, ' and put it in your purse','') + '(0:02)':
+			minut += 2
+			gs 'stat'
+			if bag = 1:
+				$pursebratype = $braworntype
+				pursebranumber = brawornnumber
+			end
+			gs 'bras', 'remove'
+			gt $loc, $metka
+		end
+	elseif bag = 1 and $braworntype = 'none' and $pursebratype ! '':
+		act 'Put your bra back on (0:02)':
+			minut += 2
+			gs 'stat'
+			gs 'bras', 'wear', $pursebratype, pursebranumber
+			killvar '$pursebratype' & killvar 'pursebranumber'
+			gt $loc, $metka
+		end
+	end
+}
+
 $basin = {
 	if cumloc[12] = 1:
 		act 'Rinse your mouth (0:05)':
@@ -1532,9 +1627,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 +1695,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

+ 4 - 4
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>'
@@ -241,9 +241,9 @@ end
 if hour >= 20 or hour <= 4:
 	*nl
 	'There are prostitutes working in places near here.'
-	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40:
+	if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 50):
 		act 'Prostitute yourself': gt 'street_walker', 'work'
-	elseif pcs_inhib >= 40:  
+	elseif pcs_inhib >= 40 and (stat['vaginal'] >  0 or pav_slut >= 50):  
 		*nl
 		'You could work as a prostitute, but you need to wear appropriate clothes and more than a little bit of makeup.'
 	else

+ 1 - 16
locations/drugs.qsrc

@@ -239,22 +239,7 @@ else
 	'<br><font color = red>Developer note: The type of drug is wrong or missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 end
 
-!!Addictive Personality Trait
-if addictive_cheat = 0:
-	addictive_exp = smoke_exp + joint_exp + heroin_exp + cocaine_exp + alcohol_exp + amphetamine_exp
-
-	if addictive_exp = 2 and addictive_trait_lvl < 1:
-		addictive_trait_lvl = 1
-		if add_trait_msg_1 = 0: add_trait_msg_1 = 1 & msg 'You have gained the trait ''Addicitive Personality''.'
-	elseif addictive_exp = 3 and addictive_trait_lvl < 2:
-		addictive_trait_lvl = 2
-		if add_trait_msg_2 = 0: add_trait_msg_2 = 1 & msg 'You have increased the level of your ''Addicitive Personality'' trait to 2.'
-	elseif addictive_exp >= 4 or (heroin_exp = 1 and cocaine_exp = 1) and addictive_trait_lvl < 3:
-		addictive_trait_lvl = 3
-		if add_trait_msg_3 = 0: add_trait_msg_3 = 1 & msg 'You have increased the level of your ''Addicitive Personality'' trait to 3.'
-	end
-end
-
+gs 'traits', 'addictive_personality'
 
 --- drugs ---------------------------------
 

+ 53 - 0
locations/ender.qsrc

@@ -223,6 +223,28 @@ if $ARGS[0] = 'loss':
 		*nl
 		'With tears rolling down your face you slowly get up and do your best to pull your clothes into place to cover up. They are just ruined, you gingerly walk away.'
 		act 'Leave':streetrand=-1 & gt $loc
+	elseif fightEnding = 15:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		fightEnding = 0
+		Loss += 1
+		mood -= 20
+		'<center><img <<$set_imgh>> src="images/shared/fight/nakedlose.jpg"></center>'
+		'You do your best, you really thought you could beat Christina, but she is just so fast. She hits harder than most guys and worse, someone has trained her how to fight. In the end you find you are no match for her, a blow finally knocks you down and you land on your back. You know you can''t win at this point so you just lay there. Christina smirks at you as you lay there and she pulls her phone back out and takes more pictures of you. "That''s right bitch, I own your ass now, Now roll over and get on your hands and knees." You reluctantly do as she says.'
+		act 'Do as she says':
+			cla & *clr
+			mood -= 10
+			christinaphotos = 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/onall4s.jpg"></center>'
+			'Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame but do as she says, she takes several more pictures laughing the whole time. "You are going to do anything I want any time I say it from now on or everyone in school will see these and I will kick your ass again, right?" You meekly nod on the verge of tears.'
+			*nl
+			'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
+			*nl
+			'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
+			gs 'pain', 1, 'labia', 'kick'
+			act 'Walk off': gt 'gLake'
+		end
 	end
 end
 
@@ -379,6 +401,13 @@ if $ARGS[0] = 'win':
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/girlgang.jpg"></center>'
 		'Even though it was four against one, you beat their asses triumphantly. They got in some hits of their own, but in the end you are the only one standing while the four of them lay around your feet curled up, bloody and crying. You straighten your clothes the best you can and proudly continue on your way to the claps of several onlookers that watched the fight.'
 		act 'Leave':streetrand=-1 & gt $loc
+	elseif fightEnding = 15:
+		fightEnding = 0
+		Win += 1
+		mood += 10
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/losefight.jpg"></center>'
+		'Christina is a hell of a fighter, she is fast, hits harder than most boys and knows what she is doing. Yet despite all that she just isn''t a match for you. You finally land a few hard blows and she goes down gasping for breath, holding up her hand in a signal of no more, you smirk as she lays beaten at your feet. You reach down and pull her phone out of her pocket and then heave it as far as you can out into the lake where it plops into the water. Lina seems to be stunned that you beat Christina and she looks a little afraid of you. "Now neither you you seen me here naked right? And since I wasn''t here, that means I didn''t beat you ass, but from now on we both know who''s the bitch don''t we?" You say to both of them. Lina nods quickly Christina a little slower but she nods as well. With that you walk away from the two of them as Lina helps Christina back to her feet.'
+		act 'Walk off': gt 'gLake'
 	end
 end
 
@@ -659,6 +688,30 @@ if $ARGS[0] = 'surrender':
 
 		if pcs_health < 100: pcs_health = 100
 		act 'Leave':streetrand=-1 & gt $loc
+	elseif fightEnding = 15:
+		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
+		killvar 'autocombat_surrender'
+		fightEnding = 0
+		Loss += 1
+		mood -= 20
+		'<center><img <<$set_imgh>> src="images/shared/fight/nakedlose.jpg"></center>'
+		'You do your best, you really thought you could beat Christina, but she is just so fast. She hits harder than most guys and worse, someone has trained her how to fight.'
+		'In the end you find you are no match for her, you fall onto your back and hold you hands up to signal your surrender. You know you can''t win at this point so you just lay there.'
+		'Christina smirks at you as you lay there and she pulls her phone back out and takes more pictures of you. "That''s right bitch, I own your ass now, Now roll over and get on your hands and knees." You reluctantly do as she says.'
+		act 'Do as she says':
+			cla & *clr
+			mood -= 10
+			christinaphotos = 3
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/onall4s.jpg"></center>'
+			'Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame but do as she says, she takes several more pictures laughing the whole time. "You are going to do anything I want any time I say it from now on or everyone in school will see these and I will kick your ass again, right?" You meekly nod on the verge of tears.'
+			*nl
+			'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
+			*nl
+			'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
+			gs 'pain', 1, 'labia', 'kick'
+			act 'Walk off': gt 'gLake'
+		end
 	end
 end
 

+ 10 - 6
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'
@@ -500,7 +500,8 @@ if $ARGS[0] = 'tier1':
 
 	gs 'sweat', 'add', 3
 	fat -= 1
-	pcs_energy -= 3
+	pcs_energy -= 1
+	pcs_hydra -= 2
 	pcs_mood += 3
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += 1'
@@ -537,7 +538,8 @@ if $ARGS[0] = 'tier2':
 
 	gs 'sweat', 'add', 10
 	fat -= 2
-	pcs_energy -= 6
+	pcs_energy -= 2
+	pcs_hydra -= 4
 	pcs_mood += 5
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += rand(2,3)'
@@ -573,7 +575,8 @@ if $ARGS[0] = 'tier3':
 
 	gs 'sweat', 'add', 15
 	fat -= 3
-	pcs_energy -= 9
+	pcs_energy -= 3
+	pcs_hydra -= 6
 	pcs_mood += 5
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += rand(3,5)'
@@ -609,7 +612,8 @@ if $ARGS[0] = 'tier4':
 
 	gs 'sweat', 'add', 25
 	fat -= 4
-	pcs_energy -= 12
+	pcs_energy -= 4
+	pcs_hydra -= 12
 	pcs_mood += 5
 	if $ARGS[3] = '':
 		dynamic '<<$ARGS[2]>> += rand(7,10)'

+ 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?"'

+ 1 - 1
locations/gLakeNude.qsrc

@@ -492,7 +492,7 @@ if $ARGS[0] = 'sauna':
 end
 
 if $ARGS[0] = 'ice_plunge':
-	act 'Take a ice plunge':
+	act 'Take an ice plunge':
 		*clr & cla
 		minut += 10
 		pcs_mood += 10

+ 7 - 7
locations/gadbana.qsrc

@@ -26,7 +26,7 @@ end
 'Grandma''s enema bulb is hidden behind some stuff on the shelf.'
 gs 'stat'
 
-if mira = 0:
+if mira_guest = 0:
 	if $clothingworntype = 'nude':
 		act 'Get dressed and leave':
 			minut += 1
@@ -49,7 +49,7 @@ if mira = 0:
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 2
-				grandmaQW['trouble'] += 1
+				grandmaQW['nudity_trouble'] += 1
 			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in potentially getting caught.'
@@ -67,7 +67,7 @@ if mira = 0:
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 1
-				grandmaQW['trouble'] += rand(0,1)
+				grandmaQW['nudity_trouble'] += rand(0,1)
 			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
@@ -271,7 +271,7 @@ else
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 2
-				grandmaQW['trouble'] += 1
+				grandmaQW['nudity_trouble'] += 1
 			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
@@ -288,7 +288,7 @@ else
 			if gadbana_stripping ! daystart:
 				gadbana_stripping = daystart
 				inhib_exp += 1
-				grandmaQW['trouble'] += rand(0,1)
+				grandmaQW['nudity_trouble'] += rand(0,1)
 			end
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 			!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
@@ -360,7 +360,7 @@ else
 						if gadbana_stripping ! daystart:
 							gadbana_stripping = daystart
 							inhib_exp += 2
-							grandmaQW['trouble'] += 1
+							grandmaQW['nudity_trouble'] += 1
 						end
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone but Mira saw you go outside naked, there''s a thrill in potentially getting caught.'
 						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'
@@ -377,7 +377,7 @@ else
 						if gadbana_stripping ! daystart:
 							gadbana_stripping = daystart
 							inhib_exp += 1
-							grandmaQW['trouble'] += rand(0,1)
+							grandmaQW['nudity_trouble'] += rand(0,1)
 						end
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the bathhouse like this, and while it''s unlikely anyone but Mira saw you go outside in your underwear, there''s a thrill in potentially getting caught.'
 						!!gs 'clothing', 'recover_lost_clothes', 'gadbana'

+ 9 - 9
locations/gaddvor.qsrc

@@ -13,10 +13,10 @@ if $ARGS[0]='':
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'
 	if hour >= 6 and hour < 22:
-		if grandmaQW['trouble'] = 10:
+		if grandmaQW['nudity_trouble'] = 10:
 			*clr & cla
 			menu_off = 1
-			grandmaQW['trouble'] = 0
+			grandmaQW['nudity_trouble'] = 0
 			'<center><h4>Your grandparents'' yard</h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma_trouble.jpg"></center>'
 			'Suddenly your grandmother approaches you with disappointed look on her face. "I had higher expectations of you young lady! You should be ashamed of yourself running around outdoors without clothes. You have embarrassed me AND your grandfather! Unlike you, we have to live in this village, and with the people in it. If you keep this up, I''ll be cutting your time here short and sending you back to your mother, and she can deal with your sinful behaviour. Go and get dressed immediately!" She then walks off. You are too ashamed to say anything.'
@@ -55,12 +55,12 @@ if $ARGS[0]='':
 		act 'Enter your grandparents'' house':minut += 1 & gt 'gadhouse', 'start'
 		act 'Enter the banya':minut += 1 & gt 'gadbana'
 	else
-		if grandmaQW['feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are several <a href="exec:gt ''gaddvor'',''chickens''">chickens</a> running around.'
+		if grandmaQW['chore_feed_chickens'] = 1 or (hour >= 6 and hour < 20 and month >= 4 and month <= 10):'In the yard there are several <a href="exec:gt ''gaddvor'',''chickens''">chickens</a> running around.'
 
 		if mira_guest = 1: Miraloc = 7 & 'Your friend <a href="exec: gt ''miroslava'', ''Start''">Mira</a> stands next to you.'
 
 		act '<b>Leave and go into the village</b>':minut += 5 & gt 'gadukino'
-		if 	grandpaQW['clean_yard'] = 1:
+		if 	grandpaQW['chore_clean_yard'] = 1:
 			act 'Clean up the yard for Grandpa (1:00)':
 				*clr & cla
 				if month >= 4 and month <= 10:
@@ -71,8 +71,8 @@ if $ARGS[0]='':
 					'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
 				end
 				minut += 60
-				grandpaQW['clean_yard'] = 0
-				grandmaQW['help'] += 1
+				grandpaQW['chore_clean_yard'] = 0
+				grandmaQW['help_amount'] += 1
 				if month >= 4 and month <= 10:
 					fat -= rand(1,3)
 				else
@@ -134,14 +134,14 @@ if $ARGS[0] = 'chickens':
 	gs 'stat'
 
 	!job Granny
-	if grandmaQW['feed_chickens'] = 1:
+	if grandmaQW['chore_feed_chickens'] = 1:
 		act 'Feed the chickens':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/chickens2.jpg"></center>'
 			'You decide to feed the chickens. You pick up a bucket full of bird''s seed and grain mix and toss it on the ground. They immediately rush over and start to greedily eat. You watch them for a bit before you go about your business.'
 			minut += 30
-			grandmaQW['help'] += 1
-			grandmaQW['feed_chickens'] = 0
+			grandmaQW['help_amount'] += 1
+			grandmaQW['chore_feed_chickens'] = 0
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 26 - 26
locations/gadfield.qsrc

@@ -44,13 +44,13 @@ if $ARGS[0] = 'field':
 	if flowerday ! daystart and grigory_flower = 10: gt 'grigory', 'flower6'
 	if flowerday ! daystart and grigory_flower > 10: gt 'grigory', 'flower8'
 	if hour >= 9 and hour <= 19 and week < 6:'Grandfather''s horse <a href="exec: gt ''gadfield'',''horse''">Desperado</a> is grazing the field.'
-	if hour >= 9 and hour <= 19 and grandpaQW['graze_cow'] = 0:'You see <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a> in the middle of the field.'
-	if hour >= 6 and hour <= 20 and grandpaQW['graze_cow'] = 1:'You notice <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a>.'
-	if hour >= 7 and hour <= 20 and grandpaQW['haying_time'] = 1:'You see a crowd of people working on the field.'
+	if hour >= 9 and hour <= 19 and grandpaQW['chore_herd_cattle'] = 0:'You see <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a> in the middle of the field.'
+	if hour >= 6 and hour <= 20 and grandpaQW['chore_herd_cattle'] = 1:'You notice <a href="exec: gt ''gadfield'',''cow''">a herd of cows</a>.'
+	if hour >= 7 and hour <= 20 and grandpaQW['chore_bale_hay'] = 1:'You see a crowd of people working on the field.'
 
 	act 'Head back to the road':minut += 10 & gt'gadroad'
 	
-	if hour >= 7 and hour <= 20 and grandpaQW['haying_time'] = 1:
+	if hour >= 7 and hour <= 20 and grandpaQW['chore_bale_hay'] = 1:
 		act 'Go to the hayfield':
 			gs 'food', 'm_meal'
 			*clr & cla
@@ -71,8 +71,8 @@ if $ARGS[0] = 'field':
 			end
 
 			minut += 360
-			grandmaQW['help'] += 1
-			grandpaQW['haying_time'] = 0
+			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_bale_hay'] = 0
 			hndiwrk_exp += rand(0,2)
 			gs 'stat'
 
@@ -106,7 +106,7 @@ if $ARGS[0] = 'horse':
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/horse_field.jpg"></center>'
 			'You spot your grandfather''s horse wandering loose in the field and decide to help out by taking Desperado home. Reaching for the bridle, you start leading Desperado towards the village.'
 			minut += 60
-			grandmaQW['help'] += rand(0,1)
+			grandmaQW['help_amount'] += rand(0,1)
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -132,29 +132,29 @@ if $ARGS[0] = 'cow':
 	'The cow herd is standing in the middle of the field.'
 	if mira = 1: MiraLoc = 41 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is standing next to you.'
 
-	if grandpaQW['graze_cow'] = 0:act 'Leave them be':gt'gadfield','field'
-	if hour = 19 and grandpaQW['graze_cow'] = 0:
+	if grandpaQW['chore_herd_cattle'] = 0:act 'Leave them be':gt'gadfield','field'
+	if hour = 19 and grandpaQW['chore_herd_cattle'] = 0:
 		act 'Lead the cows home (1:00)':
 			*clr & cla
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
 			'Seeing the cow herd on the field, you decide to help your grandfather bring the cows home...'
 			minut += 60
-			grandmaQW['help'] += rand(0,1)
+			grandmaQW['help_amount'] += rand(0,1)
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			act 'To your grandparent''s barn':gt'gadsarai'
 		end
 	end
-	if grandpaQW['graze_cow'] = 1:
+	if grandpaQW['chore_herd_cattle'] = 1:
 		if hour < 10:
 			act 'Wait until the herd is gathered':
 				*clr & cla
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/graze_cow_wait.jpg"></center>'
-				if grandpaQW['graze_cow_exp'] = 0:'Some time flies by while waiting for the locals to finish their gathering.'
-				if grandpaQW['graze_cow_exp'] = 1:'Some time flies by while waiting for the locals and their children to finish their gathering.'
+				if grandpaQW['chore_herd_cattle_experience'] = 0:'Some time flies by while waiting for the locals to finish their gathering.'
+				if grandpaQW['chore_herd_cattle_experience'] = 1:'Some time flies by while waiting for the locals and their children to finish their gathering.'
 
 				if hour >= 9:minut += 20
 				if hour < 9:minut += 60
@@ -173,8 +173,8 @@ if $ARGS[0] = 'cow':
 
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandpaQW['graze_cow_exp'] = 1
-				grandmaQW['help'] += 1
+				grandpaQW['chore_herd_cattle_experience'] = 1
+				grandmaQW['help_amount'] += 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -275,7 +275,7 @@ if $ARGS[0] = 'cow':
 			'Looking at his watch, grandpa turns to you and says "The time is around lunchtime so it''s time to take the herd to the watering hole." You begin to gather the cows and lead them to the river.'
 
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-			grandmaQW['help'] += 1
+			grandmaQW['help_amount'] += 1
 			minut += 60
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
@@ -295,7 +295,7 @@ end
 !MiraLoc = 5 (Mira with gop)
 !---------------------------------------------
 
-if grandpaQW['graze_cow'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and sunWeather = 1 and hour >= 10 and temp = 1 and Mira_no = 0 and(npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
+if grandpaQW['chore_herd_cattle'] = 1 and npc_rel['A60'] >= 15 and mira = 0 and sunWeather = 1 and hour >= 10 and temp = 1 and Mira_no = 0 and(npc_QW['A63'] < 13 or npc_QW['A60'] >= 10 or mirasex > 1):
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/village/mira/mira2.jpg"></center>'
@@ -329,7 +329,7 @@ if $ARGS[0] = 'cow2':
 	if mira = 1: MiraLoc = 42 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 	if temper >= 15 and sunWeather = 1:'- "You can go for a swim while there is time, <<$pcs_nickname>>. I''ll keep an eye on the herd," said your grandfather.'
 
-	if grandpaQW['graze_cow'] = 1:
+	if grandpaQW['chore_herd_cattle'] = 1:
 		if hour < 16:
 			act 'Herd cows with your grandfather (1:00)':
 				*clr & cla
@@ -338,8 +338,8 @@ if $ARGS[0] = 'cow2':
 				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandmaQW['help'] += 1
-				grandpaQW['graze_cow_exp'] = 1
+				grandmaQW['help_amount'] += 1
+				grandpaQW['chore_herd_cattle_experience'] = 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -406,7 +406,7 @@ if $ARGS[0] = 'cow2':
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go.jpg"></center>'
 			'Looking at his watch, grandpa says that it''s time to drive the herd back on the field, but now closer to the forest. The two of you begin to gather the scattered herd and head toward the forest.'
-			grandmaQW['help'] += 1
+			grandmaQW['help_amount'] += 1
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 			minut += 60
 			hndiwrk_exp += rand(0,3)
@@ -436,7 +436,7 @@ if $ARGS[0] = 'cow3':
 
 	if mira = 1: MiraLoc = 43 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
-	if grandpaQW['graze_cow'] = 1:
+	if grandpaQW['chore_herd_cattle'] = 1:
 		if hour < 19:
 			act 'Herd cows with your grandfather (1:00)':
 				*clr & cla
@@ -445,8 +445,8 @@ if $ARGS[0] = 'cow3':
 				'You manage to herd all the cows within the hour. Instead of letting your grandfather do all the work, you roll up the sleeves and do most of the work.'
 				minut += 60
 				if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
-				grandmaQW['help'] += 1
-				grandpaQW['graze_cow_exp'] = 1
+				grandmaQW['help_amount'] += 1
+				grandpaQW['chore_herd_cattle_experience'] = 1
 				hndiwrk_exp += rand(0,3)
 				gs 'stat'
 
@@ -547,8 +547,8 @@ if $ARGS[0] = 'cow3':
 			if temper >= 25 and sunWeather = 1:pcs_hydra -= 12
 			minut += 60
 			mira = 0
-			grandpaQW['graze_cow'] = 0
-			grandmaQW['help'] += 1
+			grandpaQW['chore_herd_cattle'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 4 - 4
locations/gadforest.qsrc

@@ -318,7 +318,7 @@ if $ARGS[0] = 'caught':
 	caught_rand = rand(0, 100)
 	if caught_rand > 90:
 		inhib_exp += rand(0,3)
-		grandmaQW['trouble'] += rand(7,10)
+		grandmaQW['nudity_trouble'] += rand(7,10)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -326,7 +326,7 @@ if $ARGS[0] = 'caught':
 		'You''ve been spotted walking home naked by all the women of the village. They are all sitting there scolding you. Your grandparents are definitely going to find out about this.'
 	elseif caught_rand > 70:
 		inhib_exp += rand(0,4)
-		grandmaQW['trouble'] += rand(1,3)
+		grandmaQW['nudity_trouble'] += rand(1,3)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -334,14 +334,14 @@ if $ARGS[0] = 'caught':
 		'You''ve been spotted walking home naked by a woman from the village. You want to hope she doesn''t tell your grandparents.'
 	elseif caught_rand > 50:
 		inhib_exp += rand(0,3)
-		grandmaQW['trouble'] += rand(1,3)
+		grandmaQW['nudity_trouble'] += rand(1,3)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/gadukino_old_man'+rand(1,5)+'.jpg"></center>'
 		'You''ve been spotted walking home naked by a man from the village. You want to hope he doesn''t tell your grandparents.'
 	else
-		grandmaQW['trouble'] += rand(0,1)
+		grandmaQW['nudity_trouble'] += rand(0,1)
 		gs 'arousal', 'flash', 10, 'exhibitionism'
 		gs 'arousal', 'end'
 		gs 'stat'

+ 15 - 15
locations/gadgarden.qsrc

@@ -36,15 +36,15 @@ if $ARGS[0] = 'garden':
 	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
 
 	!job Granny
-	if grandmaQW['work_garden'] = 1:
+	if grandmaQW['chore_work_in_garden'] = 1:
 		act 'Work in the garden (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['work_garden'] = 0
-			grandmaQW['help'] += 3
+			grandmaQW['chore_work_in_garden'] = 0
+			grandmaQW['help_amount'] += 3
 			stren_exp += 1
 			fat -= rand(1,5)
 			hndiwrk_exp += rand(3,9)
@@ -56,15 +56,15 @@ if $ARGS[0] = 'garden':
 		end
 	end
 	!job Granny
-	if grandmaQW['water_garden'] = 1:
+	if grandmaQW['chore_water_garden'] = 1:
 		act 'Water the plants (1:00)':
 			cla
 			*clr
 			menu_off = 1
 			gs 'sweat', 'add', 10
 			minut += 60
-			grandmaQW['water_garden'] = 0
-			grandmaQW['help'] += 1
+			grandmaQW['chore_water_garden'] = 0
+			grandmaQW['help_amount'] += 1
 			vital_exp += 1
 			fat -= rand(1,2)
 			hndiwrk_exp += rand(0,3)
@@ -76,15 +76,15 @@ if $ARGS[0] = 'garden':
 		end
 	end
 	!job Granny
-	if grandmaQW['harvest_garden'] = 1:
+	if grandmaQW['chore_harvest_garden'] = 1:
 		act 'Harvest (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['harvest_garden'] = 0
-			grandmaQW['help'] += 3
+			grandmaQW['chore_harvest_garden'] = 0
+			grandmaQW['help_amount'] += 3
 			stren_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)
@@ -146,15 +146,15 @@ if $ARGS[0] = 'strawberry':
 		end
 	end
 	!job Granny
-	if grandmaQW['collect_strawberries'] = 1:
+	if grandmaQW['chore_collect_strawberries'] = 1:
 		act 'Collect strawberries (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['collect_strawberries'] = 0
-			grandmaQW['help'] += 5
+			grandmaQW['chore_collect_strawberries'] = 0
+			grandmaQW['help_amount'] += 5
 			agil_exp += 1
 			fat -= 1
 			hndiwrk_exp += rand(3,9)
@@ -212,15 +212,15 @@ if $ARGS[0] = 'fruit_garden':
 		end
 	end
 	!job Granny
-	if grandmaQW['fruit_collect'] = 1:
+	if grandmaQW['chore_collect_fruit'] = 1:
 		act 'Collect fruit (3:00)':
 			cla
 			*clr
 			menu_off = 1
 			minut += 180
 			gs 'sweat', 'add', 10
-			grandmaQW['fruit_collect'] = 0
-			grandmaQW['help'] += 5
+			grandmaQW['chore_collect_fruit'] = 0
+			grandmaQW['help_amount'] += 5
 			agil_exp += 1
 			fat -= rand(1,3)
 			hndiwrk_exp += rand(3,9)

+ 140 - 59
locations/gadhouse.qsrc

@@ -1,5 +1,65 @@
 # gadhouse
 
+!! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - START
+!! 
+!! Quest Variables - Grandma
+!! -------------------------
+!! grandmaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
+!!
+!! grandmaQW['chore_clean_floor']				0/1 - is the "clean the floor" quest active?
+!! grandmaQW['chore_collect_fruit']				0/1 - is the "collect fruit" quest active?
+!! grandmaQW['chore_collect_strawberries']		0/1 - is the "collect strawberries" quest active?
+!! grandmaQW['chore_feed_chickens']				0/1 - is the "feed the chickens" quest active?
+!! grandmaQW['chore_harvest_garden']			0/1 - is the "harvest veggies from the garden" quest active?
+!! grandmaQW['chore_milk_cow']					0/1 - is the "milk the cow" quest active?
+!! grandmaQW['chore_wash_clothes']				0/1 - is the "wash Grandpa's clothes" quest active?
+!! grandmaQW['chore_water_garden']				0/1 - is the "water the garden" quest active?
+!! grandmaQW['chore_work_in_garden']			0/1 - is the "work in the garden" quest active?
+!! 
+!! Other Variables - Grandma
+!! -------------------------
+!! grandmaQW['help_amount']						Semi-abstract representation of how helpful Sveta has been. Longer, more arduous tasks get more points.
+!! grandmaQW['last_day_asked_for_story']		The most recent day Sveta asked Grandma to tell her a story. Checked against daystart (i.e. was it today?)
+!! grandmaQW['last_day_helped']					The most recent day Sveta asked Grandma if she could help her with anything.
+!! grandmaQW['last_day_talked']					The most recent day Sveta chatted with Grandma.
+!! grandmaQW['last_hour_talked']				The most recent hour Sveta chatted with Grandma. Checked against hour, allows for several chats through the day.
+!! grandmaQW['last_month_paid']					The most recent month Grandma paid Sveta for her help (i.e. was it the current month?)
+!! grandmaQW['nudity_trouble']					Semi-abstract representation of how annoyed Grandma is by Svetas exhibitionism. At 10 she reprimands Sveta (no effect).
+!! grandmaQW['talked_about_gadukino']			0/1 - has Sveta asked Grandma about Gadukino? Makes the "Ask about Gadukino" option a one-time thing.
+!! 
+!! ------------------------------------------------------------------------ 
+!! 
+!! Quest Variables - Grandpa
+!! -------------------------
+!! grandpaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
+!! 
+!! grandpaQW['chore_bale_hay']					0/1 - is the "bale hay in the field" quest active?
+!! grandpaQW['chore_bathe_horse']				0/1 - is the "bathe the horse in the river" quest active?
+!! grandpaQW['chore_brush_horse']				0/1 - is the "brush the horse" quest active?
+!! grandpaQW['chore_clean_yard']				0/1 - is the "clean the yard" quest active?
+!! grandpaQW['chore_feed_boar']					0/1 - is the "feed the pig" quest active?
+!! grandpaQW['chore_feed_cow']					0/1 - is the "feed the cow" quest active?
+!! grandpaQW['chore_feed_horse']				0/1 - is the "feed the horse" quest active?
+!! grandpaQW['chore_fetch_firewood']			0/1 - is the "fetch firewood from the barn" quest active?
+!! grandpaQW['chore_herd_cattle']				0/1 - is the "herd cows in the field" quest active?
+!! grandpaQW['chore_herd_cattle_experience']	Has Sveta ever done the "herd cows in the field" quest before? (Practically useless, barely changes a couple of action descriptions.)
+!! grandpaQW['chore_lead_cow_to_field']			0/1 - is the "just take the cow to the field and drop it off there" quest active?
+!! grandpaQW['chore_lead_horse_to_field']		0/1 - is the "take the horse to the field" quest active?
+!! 
+!! grandpaQW['chore_gather_from_forest']		Variable storage for the type of "gather mushrooms/berries from the forest" quest. Possible values: '', 'mushroom', 'berry', 'both'
+!! grandpaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandpa want? Used with chore_gather_from_forest.
+!! grandpaQW['chore_berry_quantity']			How many kg of berries does Grandpa want? Used with chore_gather_from_forest.
+!! 
+!! 
+!! Other Variables - Grandpa
+!! -------------------------
+!! grandpaQW['last_day_helped']					The most recent day Sveta asked Grandpa if she could help him with anything.
+!! grandpaQW['last_day_talked']					The most recent day Sveta chatted with Grandpa.
+!! grandpaQW['last_hour_talked']				The most recent hour Sveta chatted with Grandpa. Checked against hour, allows for several chats through the day.
+!! grandpaQW['talked_about_forest']				0/1 - has Sveta asked Grandpa about the forest? Makes the "Ask about forest" option a one-time thing.
+!!
+!! VARIABLE LIST FOR GRANDPARENTS AND THEIR CHORES - END
+
 if $ARGS[0] = 'start':
 	CLOSE ALL
 	$location_type = 'indoors'
@@ -15,10 +75,9 @@ if $ARGS[0] = 'start':
 	frost = 0
 	mira_temp = rand(1,5)
 
-	if grandmaQW['month_paid'] ! month and grandmaQW['month_helped'] ! month and hour >= 6 and hour < 22:
-		grandmaQW['month_paid'] = month
-		grandmaQW['month_helped'] = month
-		if grandmaQW['help'] > 0: money += grandmaQW['help'] * 50
+	if grandmaQW['last_month_paid'] ! month and hour >= 6 and hour < 22:
+		grandmaQW['last_month_paid'] = month
+		if grandmaQW['help_amount'] > 0: money += grandmaQW['help_amount'] * 50
 		money += 2000
 		minut += 10
 
@@ -29,27 +88,27 @@ if $ARGS[0] = 'start':
 			'Upon entering the house, you let out a screech as you catch sight of your grandmother, throwing yourself at her, wrapping your arms around her neck. She embraces you tightly. She starts by saying "Dear <<$pcs_nickname>>, you''re only skin and bones, but don''t worry, a few months here and you''ll be looking your usual self again ."'
 			'"But look at you, you sure have grown up. A young woman." she says proudly. She continues "Grandpa and I keep getting older and older and need some help around the house. What do you say youngling? You will not have to do much. Here''s the deal, you lend us a helping hand on the farm as much as possible, and we will pay you for each chore you do. It will be a great life lesson, you will learn about hard work. What do you say?"'
 			'"Of course I''ll help out, Grandma." you answer.'
-			'"I''m glad to hear that <<$pcs_nickname>>, here is little something upfront so you know we are serious," Grandma says and hands over <<2000 + grandmaQW[''help''] * 50>>  rubels.'
+			'"I''m glad to hear that <<$pcs_nickname>>, here is little something upfront so you know we are serious," Grandma says and hands over <<2000 + grandmaQW[''help_amount''] * 50>>  rubels.'
 			'"Thanks Babushka!" you kiss her on the cheek before you head on out.'
 		else
 			'When you got out of bed, your grandmother called you over to her.'
 			'"I imagine you''ve spent all your allowance on sweets so lets see what we can do to give you some more pocket money, hmmmm?" she says as she opens her purse.'
-			if grandmaQW['help'] > 0:
-				'"You were quite helpful over the last few weeks, so here''s <<2000 + grandmaQW[''help''] * 50>> rubles." She starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
+			if grandmaQW['help_amount'] > 0:
+				'"You were quite helpful over the last few weeks, so here''s <<2000 + grandmaQW[''help_amount''] * 50>> rubles." She starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
 			else
 				'"We really could have used your help last month," she says mournfully as she counts out some bills. "Maybe this month you''ll do more to help us?" She looks at you sternly as she hands you 2000 rubles.'
 			end
 			gs 'stat'
 		end
-		grandmaQW['help'] = 0
+		grandmaQW['help_amount'] = 0
 		act 'Continue': gt 'gadhouse', 'start'
 
-	elseif $grandpaQW['gather_quest'] = 'mushroom' and boletus >= grandpaQW['mushroom_qty'] and hour >= 6 and hour < 22:
+	elseif $grandpaQW['chore_gather_from_forest'] = 'mushroom' and boletus >= grandpaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmaQW['help'] += 1
-		boletus -= grandpaQW['mushroom_qty']
+		grandmaQW['help_amount'] += 1
+		boletus -= grandpaQW['chore_mushroom_quantity']
 		minut += 5
-		$grandpaQW['gather_quest'] = ''
+		$grandpaQW['chore_gather_from_forest'] = ''
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
@@ -60,15 +119,15 @@ if $ARGS[0] = 'start':
 		'"There''s no need <<$pcs_nickname>>." - said your grandpa. "But if I need some help, I''ll be sure to let you know."'
 		'You kiss your grandfather on the cheek and get on with your day.'
 
-		act 'Continue': grandpaQW['mushroom_qty'] = 0 & gt 'gadhouse', 'start'
+		act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & gt 'gadhouse', 'start'
 
-	elseif $grandpaQW['gather_quest'] = 'both' and boletus >= grandpaQW['mushroom_qty'] and bilberry >= grandpaQW['berry_qty'] and hour >= 6 and hour < 22:
+	elseif $grandpaQW['chore_gather_from_forest'] = 'both' and boletus >= grandpaQW['chore_mushroom_quantity'] and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmaQW['help'] += 1
-		boletus -= grandpaQW['mushroom_qty']
-		bilberry -= grandpaQW['berry_qty']
+		grandmaQW['help_amount'] += 1
+		boletus -= grandpaQW['chore_mushroom_quantity']
+		bilberry -= grandpaQW['chore_berry_quantity']
 		minut += 5
-		$grandpaQW['gather_quest'] = ''
+		$grandpaQW['chore_gather_from_forest'] = ''
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
@@ -79,14 +138,14 @@ if $ARGS[0] = 'start':
 		'"You don''t need to do that <<$pcs_nickname>>," your grandpa said. "But I''ll be sure to let you know if something comes up."'
 		'You give your grandpa a smooch on the cheek and go on with your day.'
 
-		act 'Continue': grandpaQW['mushroom_qty'] = 0 & grandpaQW['berry_qty'] = 0 & gt 'gadhouse', 'start'
+		act 'Continue': grandpaQW['chore_mushroom_quantity'] = 0 & grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
 
-	elseif $grandpaQW['gather_quest'] = 'berry' and bilberry >= grandpaQW['berry_qty'] and hour >= 6 and hour < 22:
+	elseif $grandpaQW['chore_gather_from_forest'] = 'berry' and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 22:
 		*clr & cla
-		grandmaQW['help'] += 1
-		bilberry -= grandpaQW['berry_qty']
+		grandmaQW['help_amount'] += 1
+		bilberry -= grandpaQW['chore_berry_quantity']
 		minut += 5
-		$grandpaQW['gather_quest'] = ''
+		$grandpaQW['chore_gather_from_forest'] = ''
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
@@ -97,7 +156,7 @@ if $ARGS[0] = 'start':
 		'"There''s no need <<$pcs_nickname>>," your grandpa said. "But if your grandma need some more berries, I''ll let you know."'
 		'You kiss your grandfather on the cheek, you go on with your business.'
 
-		act 'Continue': grandpaQW['berry_qty'] = 0 & gt 'gadhouse', 'start'
+		act 'Continue': grandpaQW['chore_berry_quantity'] = 0 & gt 'gadhouse', 'start'
 
 	elseif mira_temp = 1 and hour >= 9 and hour <= 19 and npc_rel['A60'] >= 15 and Mira_no = 0 and sunWeather = 0 and mira_guestday ! daystart and (npc_QW['A63'] < 13 or miragopQW >= 10 or mirasex > 1):
 		*clr & cla
@@ -158,13 +217,35 @@ if $ARGS[0] = 'main':
 	end
 
 
-	if hour >= 6 and hour < 22:
-		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is sitting on her bed. She looks a bit confused, as if she''s not sure where to go.'
-		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> slowly shuffles across the room, using his cane for support.'
+	if hour >= 6 and hour < 8:
+		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is puttering around in the kitchen, making breakfast.'
+		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> is sitting at the kitchen table, drinking a black cup of coffee.'
+	elseif hour >= 8 and hour < 10:
+		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is slowly wandering through the house, tidying up as she goes along.'
+		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> is sitting in his recliner, watching the morning news.'
+	elseif hour >= 10 and hour < 11:
+		'Your grandmother is napping on the sofa, curled up under a heavy quilt.'
+		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> is sitting in his recliner, watching the morning news.'
+	elseif hour >= 11 and hour < 12:
+		'Your grandmother is napping on the sofa, curled up under a heavy quilt.'
+		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> is sitting next to her, stroking her hair and faintly smiling.'
+	elseif hour >= 12 and hour < 13:
+		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is in the kitchen, making a sandwich, while your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> waits at the kitchen table.'
+	elseif hour >= 13 and hour < 15:
+		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is sitting by the window, '+iif(sunWeather = 0, 'watching the rain','looking outside')+'.'
+		'Your grandfather is leaned back in his recliner, fast asleep.'
+	elseif hour >= 15 and hour < 17:
+		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> and <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> are watching an old-timey-looking show on the TV.'
+	elseif hour >= 17 and hour < 18:
+		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> is puttering around in the kitchen, making dinner.'
+		'Your <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> is sitting at the kitchen table, waiting for grandma to bring his food.'
+	elseif hour >= 18 and hour < 20:
+		'Your <a href="exec: gt ''gadhouse'',''grandma'' ">grandmother</a> and <a href="exec: gt ''gadhouse'',''grandpa'' ">grandfather</a> are watching the evening news on the TV.'
 	else
-		'Your grandparents sleep in separate beds. It''s quite strange since they''re still madly in love with eachother.'
+		'Your grandparents are asleep. They sleep in separate beds, which is quite strange since they''re still madly in love with each other.'
 	end
 
+
 	if mira_guest = 1: MiraLoc = 6 & '<a href="exec: gt ''miroslava'', ''Start''">Mira</a> is sitting next to you.'
 
 	gs 'stat'
@@ -196,7 +277,7 @@ if $ARGS[0] = 'main':
 			menu_off = 1
 			minut += 1
 			inhib_exp += rand(0,2)
-			grandmaQW['trouble'] += rand(1,3)
+			grandmaQW['nudity_trouble'] += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
 			'It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flash', 10, 'exhibitionism'
@@ -210,7 +291,7 @@ if $ARGS[0] = 'main':
 			menu_off = 1
 			minut += 1
 			inhib_exp += rand(0,2)
-			grandmaQW['trouble'] += rand(1,3)
+			grandmaQW['nudity_trouble'] += rand(1,3)
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s certainly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
 			gs 'arousal', 'flashlite', 10, 'exhibitionism'
 			gs 'arousal', 'end'
@@ -219,12 +300,12 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	if grandmaQW['cleanfloor'] = 1:
+	if grandmaQW['chore_clean_floor'] = 1:
 		act 'Clean the floor for Grandma (1:00)':
 			*clr & cla
 			minut += 60
-			grandmaQW['cleanfloor'] = 0
-			grandmaQW['help'] += 1
+			grandmaQW['chore_clean_floor'] = 0
+			grandmaQW['help_amount'] += 1
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
@@ -234,12 +315,12 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	if grandmaQW['washclothes'] = 1:
+	if grandmaQW['chore_wash_clothes'] = 1:
 		act 'Wash Grandpa''s clothes for Grandma (1:00)':
 			*clr & cla
 			minut += 60
-			grandmaQW['washclothes'] = 0
-			grandmaQW['help'] += 1
+			grandmaQW['chore_wash_clothes'] = 0
+			grandmaQW['help_amount'] += 1
 			gs'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
@@ -323,7 +404,7 @@ if $ARGS[0] = 'grandma':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	if grandmaQW['talk_day'] ! daystart: grandmaQW['talk_hour'] = 0
+	if grandmaQW['last_day_talked'] ! daystart: grandmaQW['last_hour_talked'] = 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
@@ -338,12 +419,12 @@ if $ARGS[0] = 'grandma':
 		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
 
-		if grandmaQW['help_day'] ! daystart: act 'Offer to help out': grandmaQW['help_day'] = daystart & gt'grandmahelp', 'start'
+		if grandmaQW['last_day_helped'] ! daystart: act 'Offer to help out': grandmaQW['last_day_helped'] = daystart & gt'grandmahelp', 'start'
 
-		if grandmaQW['talk_abt_gadukino'] = 0:
+		if grandmaQW['talked_about_gadukino'] = 0:
 			act 'Ask about the village (0:10)':
 				*clr & cla
-				grandmaQW['talk_abt_gadukino'] = 1
+				grandmaQW['talked_about_gadukino'] = 1
 				minut += 10
 				pcs_mood += 5
 				gs 'stat'
@@ -364,11 +445,11 @@ if $ARGS[0] = 'grandma':
 			end
 		end
 		!125e
-		if hour >= grandmaQW['talk_hour'] + 3:
+		if hour >= grandmaQW['last_hour_talked'] + 3:
 			act 'Chat with your grandmother (0:10)':
 				*clr & cla
-				grandmaQW['talk_hour'] = hour
-				grandmaQW['talk_day'] = daystart
+				grandmaQW['last_hour_talked'] = hour
+				grandmaQW['last_day_talked'] = daystart
 				minut += 10
 				pcs_mood += RAND(5,10)
 				gs 'stat'
@@ -380,10 +461,10 @@ if $ARGS[0] = 'grandma':
 			end
 		end
 
-		if grandmaQW['story_day'] ! daystart:
+		if grandmaQW['last_day_asked_for_story'] ! daystart:
 			act 'Ask her to tell you a story (0:20)':
 				*clr & cla
-				grandmaQW['story_day'] = daystart
+				grandmaQW['last_day_asked_for_story'] = daystart
 				minut += 20
 				pcs_mood += rand(10,15)
 				gs 'stat'
@@ -453,7 +534,7 @@ if $ARGS[0]='grandpa':
 	*clr & cla
 	menu_off = 1
 	minut += 2
-	if grandpaQW['talk_day'] ! daystart:grandpaQW['talk_hour'] = 0
+	if grandpaQW['last_day_talked'] ! daystart:grandpaQW['last_hour_talked'] = 0
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
@@ -468,20 +549,20 @@ if $ARGS[0]='grandpa':
 		
 		if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
 
-		if $grandpaQW['gather_quest'] = 'mushroom':
-			'You promise to bring grandpa <<grandpaQW[''mushroom_qty'']>> kg of mushrooms.'
-		elseif $grandpaQW['gather_quest'] = 'berry':
-			'You promise to bring grandpa <<grandpaQW[''berry_qty'']>> kg of berries.'
-		elseif $grandpaQW['gather_quest'] = 'both':
-			'You promise to bring grandpa <<grandpaQW[''mushroom_qty'']>> kg mushrooms and <<grandpaQW[''berry_qty'']>> kg of berries.'
+		if $grandpaQW['chore_gather_from_forest'] = 'mushroom':
+			'You promise to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms.'
+		elseif $grandpaQW['chore_gather_from_forest'] = 'berry':
+			'You promise to bring grandpa <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
+		elseif $grandpaQW['chore_gather_from_forest'] = 'both':
+			'You promise to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
 		end
 
 
-		if grandpaQW['help_day'] ! daystart:act 'Offer to help':grandpaQW['help_day'] = daystart & gt'grandpahelp', 'start'
-		if grandpaQW['talk_abt_forest'] = 0:
+		if grandpaQW['last_day_helped'] ! daystart:act 'Offer to help':grandpaQW['last_day_helped'] = daystart & gt'grandpahelp', 'start'
+		if grandpaQW['talked_about_forest'] = 0:
 			act 'Ask about the forest (0:10)':
 				*clr & cla
-				grandpaQW['talk_abt_forest'] = 1
+				grandpaQW['talked_about_forest'] = 1
 				minut += 10
 				pcs_mood += 5
 				goforest += 1
@@ -497,11 +578,11 @@ if $ARGS[0]='grandpa':
 			end
 		end
 
-		if hour >= grandpaQW['talk_hour'] + 3:
+		if hour >= grandpaQW['last_hour_talked'] + 3:
 			act 'Chat with your grandfather (0:10)':
 				*clr & cla
-				grandpaQW['talk_hour'] = hour
-				grandpaQW['talk_day'] = daystart
+				grandpaQW['last_hour_talked'] = hour
+				grandpaQW['last_day_talked'] = daystart
 				minut += 10
 				pcs_mood += RAND(5,10)
 				gs 'stat'
@@ -575,7 +656,7 @@ if $ARGS[0] = 'intro':
 	$metka = ''
 	$loc = 'gadhouse'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
-	grandmaQW['month_paid'] = month
+	grandmaQW['last_month_paid'] = month
 	display_bb = 1
 	menu_off = 1
 	hour = 6

+ 4 - 5
locations/gadprostitutes.qsrc

@@ -54,8 +54,9 @@ if $ARGS[0] = 'start':
 			'After Mira is done with her preaching, you try to think of something witty to say or raise your hand to slap her back, but you just can''t bring yourself to do it.'
 			'Mira sees the defeated look in your eyes and knows that she has won. She pulls you into an embrace and whispers, "It''s alright <<$pcs_nickname>>. We can just be friends again. And if you want to, maybe you can come work with me instead?"'
 			
-			act 'Finish':gt'gadprostitutes','start'
+			act 'Continue':gt 'gadprostitutes','start'
 		else
+			act 'Walk back to the highway': nroad = 10 & gt 'road'
 			if MiraLoc = 8:
 				'You see Mira standing below a streetlight a little ways down the road.'
 				! event to become miras pimp if not the boys slut, not the village whore
@@ -98,7 +99,6 @@ if $ARGS[0] = 'start':
 			!if gadriver_gang = 2 and PCloStyle = 4 and pcs_sleep > 0:
 			!	act 'Prostitute yourself':gt 'gadprostitutes', 'without_mira'
 			!end
-			act 'Walk back to the highway': nroad = 10 & gt 'road'
 		end
 	else
 		'It is not a good time of day for prostitution. Try coming back later in the evening.'
@@ -110,7 +110,8 @@ end
 if $ARGS[0] = 'just_mira':
 	gs 'miroslava', 'miraclothes'
 	
-	if hour >= 16 and hour <= 23:
+	if hour >= 16 and hour <= 23:		
+		act 'Leave Mira to her work': gt 'gadprostitutes', 'start'
 		act 'Wait for Mira to attract a customer':
 			*clr & cla
 			minut += 30
@@ -214,8 +215,6 @@ if $ARGS[0] = 'just_mira':
 				act 'Continue' :gt 'gadprostitutes', 'just_mira'
 			end
 		end
-		
-		act 'Leave Mira to her work': gt 'gadprostitutes', 'start'
 	else
 		'It is too late for Mira to work as a prostitute now.'
 		act 'Walk back to Gadukino together':MiraLoc = 0 & gt 'gadukino', ''

+ 8 - 8
locations/gadriver.qsrc

@@ -498,7 +498,7 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
-		if grandpaQW['horse_river'] = 2:
+		if grandpaQW['chore_bathe_horse'] = 2:
 			act 'Look at Desperado':
 				*clr & cla
 				
@@ -516,8 +516,8 @@ if $ARGS[0] = 'gadbitch':
 						pcs_mood += 5
 						if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 						hndiwrk_exp += rand(1,3)
-						grandmaQW['help'] += 1
-						grandpaQW['horse_river'] = 3
+						grandmaQW['help_amount'] += 1
+						grandpaQW['chore_bathe_horse'] = 3
 						gs 'stat'
 						
 						if $clothingworntype = 'nude':
@@ -546,8 +546,8 @@ if $ARGS[0] = 'gadbitch':
 							pcs_mood += 5
 							if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
 							hndiwrk_exp += rand(1,3)
-							grandmaQW['help'] += 1
-							grandpaQW['horse_river'] = 3
+							grandmaQW['help_amount'] += 1
+							grandpaQW['chore_bathe_horse'] = 3
 							gs 'stat'
 							
 							if $clothingworntype = 'nude':
@@ -573,7 +573,7 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
-		if grandpaQW['horse_river'] = 3:
+		if grandpaQW['chore_bathe_horse'] = 3:
 			act 'Lead Desperado back home':
 				if $clothingworntype = 'swimwear':
 					cla
@@ -586,8 +586,8 @@ if $ARGS[0] = 'gadbitch':
 				else
 					minut += 30
 					hndiwrk_exp += rand(0,3)
-					grandmaQW['help'] += rand(0,1)
-					grandpaQW['horse_river'] = 0
+					grandmaQW['help_amount'] += rand(0,1)
+					grandpaQW['chore_bathe_horse'] = 0
 					gs 'stat'
 					
 					gt'gadsarai'

+ 29 - 29
locations/gadsarai.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = '':
 		else
 			'On your right is a <a href="exec: gt ''gadsarai'',''cow'' ">cattle</a> barn.'
 		end
-		if hour > 9 and hour < 20 and week < 6 or grandpaQW['horse_river'] = 2:
+		if hour > 9 and hour < 20 and week < 6 or grandpaQW['chore_bathe_horse'] = 2:
 			'On your left is a horse stable.'
 		else
 			'On your left is a <a href="exec: gt ''gadsarai'',''horse'' ">horse</a> stable.'
@@ -48,7 +48,7 @@ if $ARGS[0] = '':
 
 	act 'Go back to the yard':minut += 1 & gt 'gaddvor'
 	
-	if grandpaQW['fetch_firewood'] = 1:
+	if grandpaQW['chore_fetch_firewood'] = 1:
 		act 'Fetch firewood for Grandpa (0:20)':
 			*clr & cla
 			if month >= 4 and month <= 10:
@@ -59,9 +59,9 @@ if $ARGS[0] = '':
 			'You decide to grab the firewood that your grandfather asked for, loading up as much as you can carry and walking back to the house.'
 			'"I''ve brought some firewood grandfather," you said to your grandfather.'
 			'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "There is no more work for today."'
-			grandpaQW['fetch_firewood'] = 0
+			grandpaQW['chore_fetch_firewood'] = 0
 			minut += 20
-			grandmaQW['help'] += 1
+			grandmaQW['help_amount'] += 1
 			gs'stat'
 
 			act 'Continue':gt 'gadhouse', 'start'
@@ -186,13 +186,13 @@ if $ARGS[0] = 'boar':
 
 	act 'Leave':minut += 5 & gt 'gadsarai'
 
-	if grandpaQW['feed_boar'] = 1:
+	if grandpaQW['chore_feed_boar'] = 1:
 		act 'Feed the boar':
 			cla
 			*clr
 			minut += 30
-			grandmaQW['help'] += 1
-			grandpaQW['feed_boar'] = 0
+			grandmaQW['help_amount'] += 1
+			grandpaQW['chore_feed_boar'] = 0
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -215,13 +215,13 @@ if $ARGS[0] = 'cow':
 
 	act 'Leave':minut += 5 & gt 'gadsarai'
 
-	if grandmaQW['milk_cow'] = 1:
+	if grandmaQW['chore_milk_cow'] = 1:
 		act 'Milk the cow':
 			cla
 			*clr
 			minut += 30
-			grandmaQW['milk_cow'] = 0
-			grandmaQW['help'] += 1
+			grandmaQW['chore_milk_cow'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -231,13 +231,13 @@ if $ARGS[0] = 'cow':
 			act 'Finish':gt 'gadsarai','cow'
 		end
 	end
-	if grandpaQW['feed_cow'] = 1:
+	if grandpaQW['chore_feed_cow'] = 1:
 		act 'Feed the cow':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['feed_cow'] = 0
-			grandmaQW['help'] += 1
+			grandpaQW['chore_feed_cow'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -247,21 +247,21 @@ if $ARGS[0] = 'cow':
 			act 'Finish':gt 'gadsarai','cow'
 		end
 	end
-	if grandpaQW['cow_field'] = 1 or grandpaQW['graze_cow'] = 1:
+	if grandpaQW['chore_lead_cow_to_field'] = 1 or grandpaQW['chore_herd_cattle'] = 1:
 		act 'Lead the cow to the field':
 			cla
 			*clr
 			minut += 60
-			grandmaQW['help'] += 1
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_field.jpg"></center>'
-			if grandpaQW['cow_field'] = 1:
+			if grandpaQW['chore_lead_cow_to_field'] = 1:
 				'You lead Dawn to the field, where you let the shepherds take over.'
-				grandpaQW['cow_field'] = 0
+				grandpaQW['chore_lead_cow_to_field'] = 0
 			end
-			if grandpaQW['graze_cow'] = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
+			if grandpaQW['chore_herd_cattle'] = 1:'You lead Dawn to the field, where you grandfather awaits you. It''s his turn to keep an eye on the cows.'
 
 			act 'Continue':gt'gadfield','cow'
 		end
@@ -279,13 +279,13 @@ if $ARGS[0] = 'horse':
 	'Grandfather''s trusted assistant, the horse Desperado.'
 
 
-	if grandpaQW['feed_horse'] = 1:
+	if grandpaQW['chore_feed_horse'] = 1:
 		act 'Feed the horse':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['feed_horse'] = 0
-			grandmaQW['help'] += 1
+			grandpaQW['chore_feed_horse'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -295,13 +295,13 @@ if $ARGS[0] = 'horse':
 			act 'Finish':gt 'gadsarai','horse'
 		end
 	end
-	if grandpaQW['horse_field'] = 1:
+	if grandpaQW['chore_lead_horse_to_field'] = 1:
 		act 'Lead the horse to the field':
 			cla
 			*clr
 			minut += 60
-			grandpaQW['horse_field'] = 0
-			grandmaQW['help'] += 1
+			grandpaQW['chore_lead_horse_to_field'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -311,12 +311,12 @@ if $ARGS[0] = 'horse':
 			act 'Continue':gt'gadfield','field'
 		end
 	end
-	if grandpaQW['horse_river'] = 1 and sunWeather = 1 and temper >= 15:
+	if grandpaQW['chore_bathe_horse'] = 1 and sunWeather = 1 and temper >= 15:
 		act 'Lead the horse to the river':
 			cla
 			*clr
 			minut += 30
-			grandpaQW['horse_river'] = 2
+			grandpaQW['chore_bathe_horse'] = 2
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 
@@ -326,13 +326,13 @@ if $ARGS[0] = 'horse':
 			act 'Continue':gt'gadriver', 'gadbitch'
 		end
 	end
-	if grandpaQW['comb_horse'] = 1:
+	if grandpaQW['chore_brush_horse'] = 1:
 		act 'Groom the horse':
 			cla
 			*clr
 			minut += 60
-			grandpaQW['comb_horse'] = 0
-			grandmaQW['help'] += 1
+			grandpaQW['chore_brush_horse'] = 0
+			grandmaQW['help_amount'] += 1
 			hndiwrk_exp += rand(0,3)
 			gs 'stat'
 

+ 4 - 4
locations/gadukino_event.qsrc

@@ -1023,12 +1023,12 @@ if $ARGS[0] = 'go_home_ender':
 	menu_off = 1
 	*clr & cla
 	minut += rand(15,25)
-	if grandmaQW['help'] > 0:
+	if grandmaQW['help_amount'] > 0:
 		'<center><b><font color="maroon">Your grandmother</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
-		'Before leaving grandma gives you <<grandmaQW[''help'']*50>> rubles.'
-		money += grandmaQW['help'] * 50
-		grandmaQW['help'] = 0
+		'Before leaving grandma gives you <<grandmaQW[''help_amount'']*50>> rubles.'
+		money += grandmaQW['help_amount'] * 50
+		grandmaQW['help_amount'] = 0
 	end
 	gadstay = 0
 	gs 'stat'

+ 192 - 253
locations/gaptek.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start' or $message ! '':
 	if gabotsmlday ! daystart: gap_botsml_count = 0
 	if gabotmedday ! daystart: gap_botmed_count = 0
 
-	if (hour >= 14 and hour <= 20 and week < 6) or (hour >= 8 and hour < 12 and week >= 6):
+	if (hour >= 13 and hour <= 17 and week < 6) or (hour >= 8 and hour < 12 and week >= 6):
 		gaptek_aunt_hours = 1
 	else
 		gaptek_aunt_hours = 0
@@ -34,18 +34,6 @@ if $ARGS[0] = 'start' or $message ! '':
 	end
 	*nl
 	
-	if Olu_pay > 0 and gaptek_aunt_hours = 1:
-		minut += rand(5,10)
-		money += Olu_pay * rand(500,700)
-		Olu_pay = 0
-
-		'You go back to the pharmacy, and wait for a slow moment so you can talk to your aunt undisturbed.'
-		'Your aunt smiles happily as she gives you a small envelope. "Thank you so much <<$pcs_firstname>>, this is the only way I can get some sleep. I really appreciate it. Here, please accept this money, you''ve earned it."'
-
-		act 'Thank her and leave the counter': gt 'gaptek', 'start'
-		exit
-	end
-	
 	act 'Leave the pharmacy':gt 'pavCommercial'
 
 	if $message ! '':
@@ -61,7 +49,8 @@ if $ARGS[0] = 'start' or $message ! '':
 	end
 	*nl
 	*pl '<center><table align="center" width=80%>'
-	if gaptek_aunt_hours = 0 or (home_owned[2] = 0 and StoryLine = 1):
+	!!I want to change this so Sveta can always buy the stuff below regardless who is working. Not sure how to change the code so just leaving this note. The first time Sveta buys condoms, pregnancy test, birth control, or lubricant I want it to go to if $ARGS[0] = 'first_time_buy_luda':
+	if gaptek_aunt_hours = 0 or StoryLine = 0:
 		if preziktype = 0:
 			*P FUNC ('$stock_item', 5, 'Condoms', 500, 'prezik', 'gaptek', 'start')
 		elseif preziktype = 1 or preziktype = 2:
@@ -88,19 +77,19 @@ if $ARGS[0] = 'start' or $message ! '':
 		*P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', 'gaptek', 'start')
 		*P '</table></center>'
 
-	elseif gaptek_aunt_hours = 1:
+	else
 		if preziktype = 0:
-			*P FUNC ('$stock_item', 5, 'Condoms', 500, 'prezik', 'gaptek', 'start', StoryLine, '(you have <<prezik>>)','<a href="exec:gs ''gaptek'', ''oops''">buy 5</a>')
+			*P FUNC ('$stock_item', 5, 'Condoms', 500, 'prezik', 'gaptek', 'buy_condoms')
 		elseif preziktype = 1 or preziktype = 2:
-			*P FUNC ('$stock_item', 5, 'Condoms', 500, 'prezikcount', 'gaptek', 'start', StoryLine, '(you have <<prezikcount>>)','<a href="exec:gs ''gaptek'', ''oops''">buy 5</a>')
+			*P FUNC ('$stock_item', 5, 'Condoms', 500, 'prezikcount', 'gaptek', 'buy_condoms')
 		end
-		*P FUNC ('$stock_item', 1, 'Pregnancy test', 530, 'pregtest', 'gaptek', 'start', StoryLine, '(you have <<pregtest>>)','<a href="exec:gs ''gaptek'', ''oops''">buy 1</a>')
-		*P FUNC ('$stock_item', 1, 'Birth control pills', 1870, 'tabletki', 'gaptek', 'start', StoryLine, '(you have <<tabletki>>)','<a href="exec:gs ''gaptek'', ''oops''">buy 1</a>')
+		*P FUNC ('$stock_item', 1, 'Pregnancy test', 530, 'pregtest', 'gaptek', 'buy_preg_test')
+		*P FUNC ('$stock_item', 1, 'Birth control pills', 1870, 'tabletki', 'gaptek', 'buy_birth_control')
 		*P FUNC ('$stock_item', 10, 'Antibiotics', 580, 'lekarstvo', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 30, 'Vitamins', 130, 'vitamin', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 50, 'Painkillers', 435, 'painkiller', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 10, 'Ointments for chafing', 372, 'mosolmaz', 'gaptek', 'start')
-		*P FUNC ('$stock_item', 20, 'Lubricant', 145, 'lubri', 'gaptek', 'start', StoryLine, '(you have <<lubri>>)','<a href="exec:gs ''gaptek'', ''oops''">buy 1</a>')
+		*P FUNC ('$stock_item', 20, 'Lubricant', 145, 'lubri', 'gaptek', 'buy_lube')
 		*P FUNC ('$stock_item', 30, 'Lip balm', 127, 'lipbalm', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 12, 'Weight loss pill', 248, 'fatdel', 'gaptek', 'start')
 		*P FUNC ('$stock_item', 20, 'Tampons', 200, 'tampon', 'gaptek', 'start')
@@ -108,276 +97,226 @@ if $ARGS[0] = 'start' or $message ! '':
 		if klisma > 0:
 			*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'gaptek', 'start')
 		else
-			*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'gaptek', 'start', StoryLine, '(you have <<klisma>>)','<a href="exec:gs ''gaptek'', ''oops''">buy</a>')
+			*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'gaptek', 'start')
 		end
 		if breastpump > 0:
 			*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'gaptek', 'start')
 		else
-			*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'gaptek', 'start', StoryLine, '(you have <<breastpump>>)','<a href="exec:gs ''gaptek'', ''oops''">buy</a>')
+			*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'gaptek', 'start')
 		end
-		*P FUNC ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', 'gaptek', 'start', StoryLine, '(you have <<bpbottles>>)','<a href="exec:gs ''gaptek'', ''oops''">buy</a>')
-		*P FUNC ('$stock_item', 2, 'Breastmilk bottle M', 930, 'bpbottlem', 'gaptek', 'start', StoryLine, '(you have <<bpbottlem>>)','<a href="exec:gs ''gaptek'', ''oops''">buy</a>')
+		*P FUNC ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', 'gaptek', 'start')
+		*P FUNC ('$stock_item', 2, 'Breastmilk bottle M', 930, 'bpbottlem', 'gaptek', 'start')
 		if pcs_knows_nipplecream = 1:
 			*P FUNC ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', 'gaptek', 'start')
 		end
-		if KandidNapr = 1: *P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', 'gaptek', 'start', StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''gaptek'', ''buy_antifungal''">buy</a>','')+'')
+		if KandidNapr = 1: *P FUNC ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', 'gaptek', 'start')
 		*P '</table></center>'
 	end
-	
-	if npc_QW['A29'] >= 2 and gaptek_aunt_hours = 1: act 'Ask about the "garden"': gt 'gaptek', 'garden'
 end
 
-if $ARGS[0] = 'garden':
-	$loc = 'gaptek'
-	$metka = 'garden'
-	$menu_loc = 'gaptek'
-	$menu_arg = 'garden'
-	menu_off = 0
+if $ARGS[0] = 'buy_condoms':
+	menu_off = 1
 	*clr & cla
 	gs 'stat'
 	'<center><B><font color="maroon">Pharmacy</font></B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
-	*nl
-
-	if npc_QW['A29'] = 2 and gaogorod < 40:
-		if gaptekfirst = 0:
-			gaptekfirst = 1
-			minut += 5
-			'You pretend to look at the goods positioned on the shelves, while you consider how to best approach your aunt. Your aunt notices you staring at the shelves, and comes from behind the counter when she''s done helping her last customer.'
-			'"Hi <<$pcs_nickname>>, are you looking for something?"'
-			'You take a deep breath and say: "Erm... yes aunt. My mother needs some things for her ''garden''?" putting extra emphasis on the word.'
-			'Your aunt pretends to be confused, and teases you: "<<$pcs_nickname>>, are you sure you''re in the right store? This is a pharmacy, not a gardening center!"'
-			'You''re slightly confused now, and try again: "I know, aunt... my <<$npc_nickname[''A29'']>> said I should say ''garden''."'
-			'She just laughs: "Just teasing, <<$pcs_nickname>>. Your mother has such green thumbs, she comes here all the time! Come on, I''ll show you what we have." She takes you by the hand and takes you to the counter holding the contraceptives.'
-			'"Here you go. All of your gardening needs, right here. What can I get you?"'
+	'You pretend to look at the goods positioned on the shelves, while you consider how to best approach your aunt. Your aunt notices you staring at the shelves, and comes from behind the counter when she''s done helping her last customer.'
+	'"Hi <<$pcs_nickname>>, are you looking for something?"'
+	if gaptekfirstcondom = 1:
+		gaptekfirstcondom = 2
+		minut += 5
+		if pav_slut > 75:
+			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word, while looking at the condoms.'
+			'"What you mean is condoms so you can have sex with boys." She says with a smile.'
+			'When she notices your surprised look she adds. "Your reputation precedes you, <<$pcs_nickname>>. Everyone in Pavlovsk knows you''re a <<$gnikname>>."'
+			'You''re not really sure what to say now and your words become a blubbering mess: "Well... but I..." You''re deeply embarrassed that your aunt, and apparently everyone else in town, knows about your promiscuous behavior.'
+			'She chuckles at you stumbling over your words, and gives you a reassuring smile: "Don''t worry <<$pcs_nickname>>, I''m just teasing you. I''m not here to judge. I guess it runs in the family; maybe we all carry a slut gene or something. Come on, I''ll show you what we have." She takes you by the hand and leads you to the counter holding the condoms. "We also have birth control pills if you prefer bareback."'
 		else
-			minut += rand(5, 15)
-			if gaprezikday ! daystart or gatabletkiday ! daystart or gabotmedday ! daystart or gabotsmlday ! daystart or gapregday ! daystart:
-				'You wait until the last customer leaves the pharmacy, and quickly dart over to the counter.'
-				'"Hi Aunt Luda, my <<$npc_nickname[''A29'']>> needs a few more items for her garden."'
-				'"Your <<$npc_nickname[''A29'']>>, huh? Sure, sure... it''s right here, take your pick!" she chuckles, as you try to hide your blush.'
-				'You intently stare at the items, avoiding her gaze as you mutter: "Thank you, Aunt..."'
-				'"No problem, <<$pcs_nickname>>. But seriously, tell Natasha she shouldn''t spend so much time gardening. We keep running low on stock."'
-			else
-				minut += rand(5,15)
-				'You linger around the pharmacy, waiting for your aunt to become available. However, as time passes the pharmacy only becomes more and more crowded, and your aunt has a long line of customers to deal with. You decide you''ve wasted enough time, and to try again later.'
-			end
+			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word.'
+			'Your aunt pretends to be confused, and teases you, "<<$pcs_nickname>>, what kind of stuff? We sell all kinds of things!"'
+			'You blush as you realize she is going to make you say it: "I know, aunt... I need some condoms..."'
+			'She just laughs: "Just teasing, <<$pcs_nickname>>. I''ll show you what we have." She takes you by the hand and leads you to the counter holding the condoms. "We also have birth control pills if you prefer bareback."'
 		end
-	elseif npc_QW['A29'] = 2:
-		gt 'motherQW','motherQW_3'
-	elseif npc_QW['A29'] >= 3 and galubri = 0:
-		if gaprezikday ! daystart or gatabletkiday ! daystart or gabotmedday ! daystart or gabotsmlday ! daystart or gapregday ! daystart:
-			minut += rand(5,15)
-			gs'stat'
-			if rand(0,5) = 0 and oluuosegunday ! daystart:
-				gt 'motherQW','olu'
-			else
-				'You wait for your turn and move to the counter, discretely nodding at the counter with the contraceptives. Your aunt gives you a small smile and asks what she can do for you today.'
-			end
-		elseif gaprezikday = daystart and gatabletkiday = daystart:
-			minut += rand(5,15)
-
-			'You wait for your turn and move up to the counter, discretely nodding at the counter with the contraceptives. She apologizes: "I''m sorry <<$pcs_nickname>>, those are all sold out." With some malice in her voice, she whispers: "Your stud will have to wait until tomorrow, unless you plan on entertaining him in some other way." Giving you a lewd grin, she ushers you away from the counter so she can help the next customer.'
-		end
-	elseif npc_QW['A29'] >= 3 and galubri = 1:
-		if gaprezikday ! daystart or gatabletkiday ! daystart or gabotmedday ! daystart or gabotsmlday ! daystart or gapregday ! daystart:
-			minut += rand(5,15)
-			if rand(0,5) = 0 and oluuosegunday ! daystart and tetyafirst < 3:
-				gt 'motherQW','olu'
-			else
-				'You wait for your turn and move to the counter, discretely nodding at the counter with the contraceptives. Your aunt gives you a small smile and asks what she can do for you today.'
-			end
-		elseif gaprezikday = daystart and gatabletkiday = daystart and galubriday = daystart:
-			minut += rand(5,15)
-
-			'You wait for your turn and move up to the counter, discretely nodding at the counter with the contraceptives. She apologizes: "I''m sorry <<$pcs_nickname>>, those are all sold out." With some malice in her voice, she whispers: "Your stud will have to wait until tomorrow, unless you plan on entertaining him in some other way." Giving you a lewd grin, she ushers you away from the counter so she can help the next customer.'
+		'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
+		if momslut = 1:
+			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
+			'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
+			'Luda nods and hands over the package. "Here you go <<$pcs_nickname>>. Don''t use them all at once!" She adds with a wink, you just take your purchase.'
+		else
+			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret." Reassured she won''t tell your <<$npc_nickname[''A29'']>>, you pick out the things you need, after that she rings up your purchase and hands you the bag. "Here you go <<$pcs_nickname>>. Don''t use them all at once!" She adds with a wink, you just take your purchase.'
 		end
-	end
-
-	if $gardmess ! '':
-		$gardmess
-		killvar '$gardmess'
-		'"Do you need anything else?"'
-	end
-	*nl
-	*pl '<center><table align="center" width=80%>'
-	if preziktype = 0:
-		*P FUNC ('$stock_item', 5, 'Condoms', 500, 'prezik', 'gaptek', 'garden', StoryLine, '(you have <<prezik>>)',''+iif(money >= 500,'<a href="exec:gs ''gaptek'', ''buy_condoms''">buy 5</a>','')+'')
-	elseif preziktype = 1 or preziktype = 2:
-		*P FUNC ('$stock_item', 5, 'Condoms', 500, 'prezikcount', 'gaptek', 'garden', StoryLine, '(you have <<prezikcount>>)',''+iif(money >= 500,'<a href="exec:gs ''gaptek'', ''buy_condoms''">buy 5</a>','')+'')
-	end
-	*P FUNC ('$stock_item', 1, 'Pregnancy test', 530, 'pregtest', 'gaptek', 'garden', StoryLine, '(you have <<pregtest>>)',''+iif(money >= 530,'<a href="exec:gs ''gaptek'', ''buy_preg_test''">buy 1</a>','')+'')
-	*P FUNC ('$stock_item', 1, 'Birth control pills', 1870, 'tabletki', 'gaptek', 'garden', StoryLine, '(you have <<tabletki>>)',''+iif(money >= 1870,'<a href="exec:gs ''gaptek'', ''buy_birth_control''">buy 1</a>','')+'')
-	*P FUNC ('$stock_item', 1, 'Lubricant', 145, 'lubri', 'gaptek', 'garden', StoryLine, '(you have <<lubri>>)',''+iif(money >= 145,'<a href="exec:gs ''gaptek'', ''buy_lube''">buy 1</a>','')+'')
-	if klisma > 0:
-		*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'gaptek', 'garden')
-	else
-		*P FUNC ('$single_stock_item', 1, 'Enema kit', 1250, 'klisma', 'gaptek', 'garden', StoryLine, '(you have <<klisma>>)',''+iif(money >= 1250,'<a href="exec:gs ''gaptek'', ''buy_enema''">buy</a>','')+'')
-	end
-	if breastpump > 0:
-		*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'gaptek', 'garden')
 	else
-		*P FUNC ('$single_stock_item', 1, 'Breast pump', 2500, 'breastpump', 'gaptek', 'garden', StoryLine, '(you have <<breastpump>>)',''+iif(money >= 2500,'<a href="exec:gs ''gaptek'', ''buy_breast_pump''">buy</a>','')+'')
+		minut += rand(5, 15)
+		'You wait until the last customer leaves the pharmacy, and quickly dart over to the counter.'
+		if pcs_inhib < 50:
+			'"Hi Aunt Luda, I need some more condoms." You tell her slightly blushing.'
+			'"You''re going through them quite fast," she chuckles, as you try to hide your blush.'
+			'You intently stare at the items, avoiding her gaze as you mutter: "Thank you, Aunt..."'
+		else
+			'"Hi Aunt Luda, I need some more condoms."'
+			'"You''re going through them quite fast," she chuckles.'
+			'You smile back and shrug non-committally as she holds out the bag for you. "Thank you, Aunt Luda."'
+		end
+		'"No problem <<$pcs_nickname>>, have fun," she says as you take your bag.'
 	end
-	*P FUNC ('$stock_item', 3, 'Breastmilk bottle S', 930, 'bpbottles', 'gaptek', 'garden', StoryLine, '(you have <<bpbottles>>)',''+iif(money >= 930,'<a href="exec:gs ''gaptek'', ''buy_bottle_sml''">buy</a>','')+'')
-	*P FUNC ('$stock_item', 2, 'Breastmilk bottle M', 930, 'bpbottlem', 'gaptek', 'garden', StoryLine, '(you have <<bpbottlem>>)',''+iif(money >= 930,'<a href="exec:gs ''gaptek'', ''buy_bottle_med''">buy</a>','')+'')
-	*P '</table></center>'
-
 	act 'Move away from the counter':gt 'gaptek', 'start'
 end
 
-if $ARGS[0] = 'buy_condoms':
-	if gap_condom_count >= 2 and npc_QW['A29'] < 3 and gaprezikday = daystart:
-		$gardmess = 'You tell yourself: "Two packages should be enough". You shouldn''t buy too many at once, otherwise your aunt might get suspicious.'
-		*nl
-		gt 'gaptek', 'garden'
-	elseif gap_condom_count >= 5 and npc_QW['A29'] >= 3 and gaprezikday = daystart:
-		$gardmess = 'Your aunt laughs and shakes her head. "I''m sorry <<$pcs_nickname>>, I can only give you five. With the amounts you''re buying, the condom factory can barely keep up delivering new stock."'
-		*nl
-		gt 'gaptek', 'garden'
+if $ARGS[0] = 'buy_birth_control':
+	menu_off = 1
+	*clr & cla
+	gs 'stat'
+	'<center><B><font color="maroon">Pharmacy</font></B></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
+	'You pretend to look at the goods positioned on the shelves, while you consider how to best approach your aunt. Your aunt notices you staring at the shelves, and comes from behind the counter when she''s done helping her last customer.'
+	'"Hi <<$pcs_nickname>>, are you looking for something?"'
+	if gaptekfirstbirthcontrol = 1:
+		gaptekfirstbirthcontrol = 2
+		minut += 5
+		if pav_slut > 75:
+			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word, while looking at the birth control pills.'
+			'"What you mean is birth control pills so you can have sex with boys, without using a condom." She says with a smile.'
+			'When she notices your surprised look she adds. "Your reputation precedes you, <<$pcs_nickname>>. Everyone in Pavlovsk knows you''re a <<$gnikname>>."'
+			'You''re not really sure what to say now and your words become a blubbering mess: "Well... but I..." You''re deeply embarrassed that your aunt, and apparently everyone else in town, knows about your promiscuous behavior.'
+			'She chuckles at you stumbling over your words, and gives you a reassuring smile: "Don''t worry <<$pcs_nickname>>, I''m just teasing you. I''m not here to judge. I guess it runs in the family; maybe we all carry a slut gene or something. Come on, I''ll show you what we have." She takes you by the hand and leads you to the counter holding the birth control pills. "You might consider condoms too since you seem to have a lot of partners, to protect you from STD''s of course. You can never tell who''s clean and who isn''t these days."'
+		else
+			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word.'
+			'Your aunt pretends to be confused, and teases you, "<<$pcs_nickname>>, what kind of stuff? We sell all kinds of things!"'
+			'You blush as you realize she is going to make you say it: "I know, aunt... I need some birth control pills..."'
+			'She just laughs: "Just teasing, <<$pcs_nickname>>. I''ll show you what we have." She takes you by the hand and leads you to the counter holding the birth control pills. "We also have condoms if you are worried about STD''s. You can never tell who''s clean and who isn''t these days."'
+		end
+		'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
+		if momslut = 1:
+			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
+			'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
+			'Luda nods and hands over the package. "Here you go <<$pcs_nickname>>. Don''t use it all at once!" She adds with a wink, you just take your purchase.'
+		else
+			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret." Reassured she won''t tell your <<$npc_nickname[''A29'']>>, you pick out the things you need, after that she rings up your purchase and hands you the bag. "Here you go <<$pcs_nickname>>. Don''t use it all at once!" She adds with a wink, you just take your purchase.'
+		end
 	else
-		if preziktype = 0:
-			prezik += 5
-		elseif preziktype = 1 or preziktype = 2:
-			prezikcount += 5
+		minut += rand(5, 15)
+		'You wait until the last customer leaves the pharmacy, and quickly dart over to the counter.'
+		if pcs_inhib < 50:
+			'"Hi Aunt Luda, I need some more birth control pills." You say as your face heats up.'
+			'"Make sure you don''t miss a single day or they might not work." she says, as you try to hide your blush.'
+			'You intently stare at the items, avoiding her gaze as you mutter: "Thank you, Aunt..."'
+		else
+			'"Hi Aunt Luda, I need some more birth control pills."'
+			'"Make sure you don''t miss a single day or they might not work." she says, as you try to hide your blush.'
+			if pilldays >= 18:
+				'"Mhm, I know. I''ve been on the pill for a while now, but thank you anyway Aunt Luda."'
+			else
+				'"Okay, thanks for the advice Aunt Luda."'
+			end
 		end
-		money -= 500
-		gap_condom_count += 1
-		gaprezikday = daystart
-		gs 'stat'
-		if npc_QW['A29'] < 3:gaogorod += 5
-		$gardmess = '<center><font color="green">You bought 5 <b>Condoms</b>.</font></center><br>You pay for the condoms and quickly put them in your pocket, before anyone sees you buy them.'
-		*nl
-		gt 'gaptek', 'garden'
+		'"No problem <<$pcs_nickname>>, have fun," she says as you take your bag.'
 	end
+	act 'Move away from the counter':gt 'gaptek', 'start'
 end
 
 if $ARGS[0] = 'buy_preg_test':
-	if gap_preg_count >= 1 and npc_QW['A29'] < 3 and gapregday = daystart:
-		$gardmess = 'It''s better if I don''t buy too many today, aunt Luda might get suspicious.'
-		*nl
-		gt 'gaptek', 'garden'
+	menu_off = 1
+	*clr & cla
+	gs 'stat'
+	'<center><B><font color="maroon">Pharmacy</font></B></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
+	'You pretend to look at the goods positioned on the shelves, while you consider how to best approach your aunt. Your aunt notices you staring at the shelves, and comes from behind the counter when she''s done helping her last customer.'
+	'"Hi <<$pcs_nickname>>, are you looking for something?"'
+	if gaptekfirstpregtest = 1:
+		gaptekfirstpregtest = 2
+		minut += 5
+		prezikcount += 5
+		if pav_slut > 75:
+			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word, while looking at the pregnancy tests.'
+			'"What you mean is pregnancy test so you can see if one of those boys you have been having sex with has knocked you up. You should be more careful and take birth control or start using condoms" She says in a serious tone.'
+			'When she notices your surprised look she adds. "Your reputation precedes you, <<$pcs_nickname>>. Everyone in Pavlovsk knows you''re a <<$gnikname>>."'
+			'You''re not really sure what to say now and your words become a blubbering mess: "Well... but I..." You''re deeply embarrassed that your aunt, and apparently everyone else in town, knows about your promiscuous behavior.'
+			'She chuckles at you stumbling over your words, and gives you a reassuring smile: "I''m not here to judge. I guess it runs in the family; maybe we all carry a slut gene or something, but you really should take precautions if you are going to have fun. Come on, I''ll show you what we have." She takes you by the hand and takes you to the family planning counter that holds the pregnancy tests as well as birth control pills and condoms. You should really buy some of each for protection against this and STD''s."'
+			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
+		else
+			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word.'
+			'Your aunt pretends to be confused, and teases you, "<<$pcs_nickname>>, what kind of stuff? We sell all kinds of things!"'
+			'You blush as you realize she is going to make you say it: "I know, aunt... I need a pregnancy test..."'
+			'She looks a little shocked. "<<$pcs_nickname>> oh my god." Then she shakes her head. "If you are going to be sexual active you really need to use birth control or carry some condoms with you. But let me show you what we have in the way of tests." She takes you by the hand and takes you to the family planning counter that holds the pregnancy tests as well as birth control pills and condoms. "You should really buy some of each for protection against this and STD''s."'
+			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
+		end
+		if momslut = 1:
+			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
+			'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
+			'Luda nods and hands over the package. "It''s our secret for now, though if that test is positive there''s nothing that will stop her from noticing when your belly starts to round out. Whether it is or it isn''t, I threw in a box of condoms so this doesn''t happen again, okay?"'
+		else
+			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret." Reassured she won''t tell your <<$npc_nickname[''A29'']>>, you pick out the things you need, after that she rings up your purchase and hands you the bag. "It''s our secret for now, though if that test is positive there''s nothing that will stop her from noticing when your belly starts to round out. Whether it is or it isn''t, I threw in a box of condoms so this doesn''t happen again, okay?"'
+		end
+		'You gulp, nodding and taking the bag. "Thank you, Aunt Luda."'
+		'"No problem <<$pcs_nickname>>, but do try to be careful okay?"'
 	else
-		pregtest += 1
-		money -= 530
-		gap_preg_count += 1
-		gapregday = daystart
-		gs 'stat'
-		if npc_QW['A29'] < 3:gaogorod += 5
-		$gardmess = '<center><font color="green">You bought 1 <b>Pregnancy test</b>.</font></center><br>You pay for the pregnancy tests and quickly put them in your pocket, before anyone sees you buy them.'
-		*nl
-		gt 'gaptek', 'garden'
+		minut += rand(5, 15)
+		prezikcount += 5
+		if pcs_inhib < 50:
+			'"Hi Aunt Luda, I need another pregnancy test." You tell her slightly blushing.'
+			'She sighs slightly and shakes her head. "You really need to be more careful <<$pcs_nickname>>. Here, take a box of condoms as well and make sure to use them." she says, as you try to hide your blush, as she rings up your purchase before slipping the condoms into your bag.'
+			'You intently stare at the items, avoiding her gaze as you mutter: "Thank you, Aunt..."'
+		else
+			'"Hi Aunt Luda, I need another pregnancy test."'
+			'She sighs slightly and shakes her head. "You really need to be more careful <<$pcs_nickname>>. Here, take a box of condoms as well and make sure to use them." she says as she rings up your purchase before slipping the condoms into your bag.'
+			'"Thank you, Aunt."'
+		end
+		'"No problem <<$pcs_nickname>>, but seriously! Be careful!" she says as you take your bag.'
 	end
+	act 'Move away from the counter':gt 'gaptek', 'start'
 end
 
 if $ARGS[0] = 'buy_lube':
-	!! you can only buy lube here if your aunt arranged for it and you haven''t bought any today yet
-	if galubri = 1 and gap_lub_count >= 3 and galubriday = daystart:
-		$gardmess = 'Your aunt shakes her head wearily: "Wow <<$pcs_nickname>>, you little vixen! You really love this stuff huh? I''m sorry but I can only sell you three, I need to keep a few in stock for other customers too. We don''t want the whole town to wonder where their supply of lubricant went."'
-		*nl
-		gt 'gaptek', 'garden'
-	else
-		lubri += 20
-		money -= 145
-		gap_lub_count += 1
-		galubriday = daystart
-		gs 'stat'
-		if npc_QW['A29'] < 3:gaogorod += 3
-		$gardmess = '<center><font color="green">You bought 1 <b>Lubricant</b>.</font></center><br>You pay for the lubricant and quickly put the tube in your pocket, before anyone sees you buy them.'
-		*nl
-		gt 'gaptek', 'garden'
-	end
-end
-
-if $ARGS[0] = 'buy_birth_control':
-	if gap_bc_count >= 1 and npc_QW['A29'] < 3 and gatabletkiday = daystart:
-		$gardmess = 'You quietly think to yourself, while you put most of the packages back on the shelf: "Just the one should be enough. It''s probably better if I don''t buy too many at once, otherwise aunt Luda might become suspicious."'
-		*nl
-		gt 'gaptek', 'garden'
-	else
-		tabletki += 1
-		money -= 1870
-		gap_bc_count += 1
-		gatabletkiday = daystart
-		if npc_QW['A29'] < 3:gaogorod += 5
-		gs 'stat'
-		$gardmess = '<center><font color="green">You bought 1 <b>Birth control pills</b>.</font></center><br>You pay for the birth control pills and quickly put the strips in your pocket, before anyone sees you buy them.'
-		*nl
-		gt 'gaptek', 'garden'
-	end
-end
-
-if $ARGS[0] = 'buy_enema':
-	klisma = 1
-	money -= 1250
-	$gardmess = '<center><font color="green">You bought an Enema kit</font></center><br>You pay for the enema kit and quickly ask your aunt to put it in a paper bag, before the other customers see it.'
-	*nl
-	if npc_QW['A29'] < 3:gaogorod += 10
-	gt 'gaptek', 'garden'
-end
-
-if $ARGS[0] = 'buy_breast_pump':
-	breastpump = 1
-	money -= 2500
-	$gardmess = '<center><font color="green">You bought a Breast pump</font></center><br>You quickly ask your aunt to put the breat pump in a paper bag, before anyone notices.'
-	*nl
-	gt 'gaptek', 'garden'
-end
-
-if $ARGS[0] = 'buy_bottle_sml':
-	if gap_botsml_count >= 1 and npc_QW['A29'] < 3 and gabotsmlday = daystart:
-		$gardmess = 'It''s better if I don''t buy too many today, aunt Luda might get suspicious.'
-		*nl
-		gt 'gaptek', 'garden'
-	else
-		bpbottles += 1
-		money -= 930
-		gap_botsml_count += 1
-		gabotsmlday = daystart
-		gs 'stat'
-		$gardmess = '<center><font color="green">You bought 3 <b>Small bottles</b>.</font></center><br>You quickly hide the small bottles before anyone sees them.'
-		*nl
-		gt 'gaptek', 'garden'
-	end
-end
-
-if $ARGS[0] = 'buy_bottle_med':
-	if gap_botmed_count >= 1 and npc_QW['A29'] < 3 and gabotmedday = daystart:
-		$gardmess = 'It''s better if I don''t buy too many today, aunt Luda might get suspicious.'
-		*nl
-		gt 'gaptek', 'garden'
-	else
-		bpbottlem += 1
-		money -= 930
-		gap_botmed_count += 1
-		gabotmedday = daystart
-		gs 'stat'
-		$gardmess = '<center><font color="green">You bought 2 <b>Medium bottles</b>.</font></center><br>You quickly hide the medium bottles before anyone notices.'
-		*nl
-		gt 'gaptek', 'garden'
-	end
-end
-
-if $ARGS[0] = 'buy_antifungal':
-	if Kandidoz >= 30:
-		money -= 1050
-		Kandidoz = 0
-		gs 'stat'
-		$gardmess = '<center><font color="green">You bought 1 <b>Antifungal medication</b>.</font></center><br>You put the money on the counter and immediately open the package and swallow the tablet. A while later, you feel better.'
-		gt 'gaptek', 'start'
-	elseif Kandidoz < 30 and KandidozOnce > 0:
-		'You don''t need the medication right now. Your thrush is currently in remission, taking vitamins will ensure that it stays that way.'
+	menu_off = 1
+	*clr & cla
+	gs 'stat'
+	'<center><B><font color="maroon">Pharmacy</font></B></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pharmacy/apteka_aunt_1.jpg"></center>'
+	'You pretend to look at the goods positioned on the shelves, while you consider how to best approach your aunt. Your aunt notices you staring at the shelves, and comes from behind the counter when she''s done helping her last customer.'
+	'"Hi <<$pcs_nickname>>, are you looking for something?"'
+	if gaptekfirstlube = 1:
+		gaptekfirstlube = 2
+		minut += 5
+		if pav_slut > 75:
+			'You pretend to look at the goods positioned on the shelves, while you consider how to best approach your aunt. Your aunt notices you staring at the shelves, and comes from behind the counter when she''s done helping her last customer.'
+			'"Hi <<$pcs_nickname>>, are you looking for something?"'
+			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word, while looking at the lube.'
+			'"What you mean is lube so you can lets the boys stick their dicks up your ass." She says with a smile.'
+			'When she notices your surprised look she adds. "Your reputation precedes you, <<$pcs_nickname>>. Everyone in Pavlovsk knows you''re a <<$gnikname>>."'
+			'You''re not really sure what to say now and your words become a blubbering mess: "Well... but I..." You''re deeply embarrassed that your aunt, and apparently everyone else in town, knows about your promiscuous behavior.'
+			'She chuckles at you stumbling over your words, and gives you a reassuring smile: "Don''t worry <<$pcs_nickname>>, I''m just teasing you. I''m not here to judge. I guess it runs in the family; maybe we all carry a slut gene or something. Come on, I''ll show you what we have." She takes you by the hand and leads you to the counter holding the lube, "We also have birth control pills and condoms if you want to things other than anal."'
+			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
+		else
+			'You pretend to look at the goods positioned on the shelves, while you consider how to best approach your aunt. Your aunt notices you staring at the shelves, and comes from behind the counter when she''s done helping her last customer.'
+			'"Hi <<$pcs_nickname>>, are you looking for something?"'
+			'You take a deep breath and say: "Erm... yes aunt. I need some ''stuff''," putting extra emphasis on the word, while looking at the lube.'
+			'Your aunt pretends to be confused, and teases you, "<<$pcs_nickname>>, what kind of stuff? We sell all kinds of things!"'
+			'You blush as you realize she is going to make you say it: "I know, aunt... I need some lube..."'
+			'"Trying to get around your mothers tests?" She laughs. "Just teasing, <<$pcs_nickname>>. I''ll show you what we have." She takes you by the hand and leads you to the counter holding the lube, "We also have birth control pills and condoms if you want them to fuck your pussy, instead of your butt."'
+			'You can''t help but blush again. "Please don''t tell my <<$npc_nickname[''A29'']>>. She wouldn''t understand."'
+		end
+		if momslut = 1:
+			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret."'
+			'You sigh a little. "Yes I know all about <<$npc_nickname[''A29'']>>. I just don''t want to hear about it from her is all."'
+			'Luda nods and hands over the package. "Here you go <<$pcs_nickname>>. Don''t use it all at once!" She adds with a wink, you just take your purchase.'
+		else
+			'Your aunt gives you a odd smile. "You might be surprised dear, but anyways I promise this is our little secret." Reassured she won''t tell your <<$npc_nickname[''A29'']>>, you pick out the things you need, after that she rings up your purchase and hands you the bag. "Here you go <<$pcs_nickname>>. Don''t use it all at once!" She adds with a wink, you just take your purchase.'
+		end
 	else
-		msg '<center>You don''t need any antifungal medication right now.</center>'
-		*nl
-		gt 'gaptek', 'start'
+		minut += rand(5, 15)
+		'You wait until the last customer leaves the pharmacy, and quickly dart over to the counter.'
+		if pcs_inhib < 50:
+			'"Hi Aunt Luda, I need some more lube." You tell her slightly blushing.'
+			'"If you''re going through it fast, you might want to tell the boys to give your poor butt a rest once in awhile," she chuckles, as you try to hide your blush.'
+			'You intently stare at the items, avoiding her gaze as you mutter: "Thank you, Aunt..."'
+		else
+			'"Hi Aunt Luda, I need some more lube."'
+			'"If you''re going through it fast, you might want to tell the boys to give your poor butt a rest once in awhile," she chuckles.'
+			'You roll your eyes at her teasing. "As long as I have this my butt will be just fine. Thank you for the lube Aunt Luda."'
+		end
+		'"No problem, <<$pcs_nickname>>, have fun," she says as you take your bag.'
 	end
-end
-
-if $ARGS[0] = 'oops':
-	msg '<center>I better not buy this here, otherwise aunt will tell <<$npc_nickname[''A29'']>>!</center>'
-	*nl
-	gt 'gaptek', 'start'
+	act 'Move away from the counter':gt 'gaptek', 'start'
 end
 
 --- gaptek ---------------------------------

+ 7 - 2
locations/gdksex.qsrc

@@ -1138,7 +1138,9 @@ if $ARGS[0] = 'hotelsex':
 				hotel_sex = 0
 				bmANAL[Tboynum] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/anal1.jpg"></center>'
-				'You pull yourself away from his cock, your lips making a lewd pop as it leaves your mouth. You quickly jump up on the bed, lay yourself down on your back and lift your knees all the way up to your breasts, reaching down with one hand to pull one of your butt cheeks aside. Not one to pass up such a great opportunity, <<$boydesc>> takes the hint and starts pushing the head of his dick against your asshole. Pushing slowly but insistently, the head of his dick pops into your ass - he pauses just a moment to let you adjust - before he slowly starts moving in and out, fucking you carefully and stretching your hole. He slowly but steadily works his dick deeper into your ass, all the while picking up more and more speed.'
+				'You pull yourself away from his cock, your lips making a lewd pop as it leaves your mouth. You quickly jump up on the bed, lay yourself down on your back and lift your knees all the way up to your breasts, reaching down with one hand to pull one of your butt cheeks aside.'
+				gs 'arousal', 'auto_lube', 'anal'
+				'Not one to pass up such a great opportunity, <<$boydesc>> takes the hint and starts pushing the head of his dick against your asshole. Pushing slowly but insistently, the head of his dick pops into your ass - he pauses just a moment to let you adjust - before he slowly starts moving in and out, fucking you carefully and stretching your hole. He slowly but steadily works his dick deeper into your ass, all the while picking up more and more speed.'
 				if $ARGS[1] = 'paid': gs 'arousal', 'anal', 10, 'prostitution'
 				if $ARGS[1] = 'unpaid':  gs 'arousal', 'anal', 10
 				gs 'dinSex', 'std_trigger'
@@ -1385,7 +1387,9 @@ if $ARGS[0] = 'hotelsex':
 						*clr & cla
 						bmANAL[Tboynum] += 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/event/hotel/anal1.jpg"></center>'
-						'You nod your head to him and roll back over on your back, then you pull your knees up to your breasts and reach down with one hand to pull one of your butt cheeks aside. He takes the hint and push the head of his dick against your asshole. After just a few pushes it pops into your ass, he pauses just a moment to let you adjust, before he starts slowly fucking you. He slowly but steadily works his dick deeper in your ass, all the while picking up speed as he does.'
+						'You nod your head to him and roll back over on your back, then you pull your knees up to your breasts and reach down with one hand to pull one of your butt cheeks aside.'
+						gs 'arousal', 'auto_lube', 'anal'
+						'He takes the hint and push the head of his dick against your asshole. After just a few pushes it pops into your ass, he pauses just a moment to let you adjust, before he starts slowly fucking you. He slowly but steadily works his dick deeper in your ass, all the while picking up speed as he does.'
 						if $ARGS[1] = 'paid': gs 'arousal', 'anal', 10, 'prostitution'
 						if $ARGS[1] = 'unpaid': gs 'arousal', 'anal', 10
 						gs 'dinSex', 'std_trigger'
@@ -1534,6 +1538,7 @@ if $ARGS[0] = 'drugs':
 						'Instead you focus on making sure his balls are squeezed, caressed and kissed. After teasing him like this for a while, he makes you stop again and says that you should rather focus on lubing his cock up, as he wants to stick it up your ass.'
 						'Even as buzzed and horny as you are, you''re a bit hesitant at the suggestion but he quickly re-assures you that having anal sex while you''re high is a much better feeling than just having regular sex.'
 						'You nod as you fill your mouth with saliva and take his cock back in your mouth, taking it deep and lubing it up as much as you can for what''s coming.'
+						anal_slip += 4
 						gs 'arousal', 'bj', 5
 						gs 'dinSex', 'std_trigger_oral'
 						gs 'stat'

+ 2 - 1
locations/gdktoilet.qsrc

@@ -405,7 +405,7 @@ if $ARGS[0] = 'mens':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'mensmast':
@@ -1057,6 +1057,7 @@ if $ARGS[0] = 'anal':
 	*clr & cla
 	'<center><video autoplay loop src="images/locations/pavlovsk/community/bathroom/womens/sex/ghintoass.mp4"></video></center>'
 	'You rub your wet pussy and get your fingers nice and wet and then rub it on your asshole, you do the same to his dick, then you guide his <<npc_dick[$npclastgenerated]>>cm <<$npc_thdick[$npclastgenerated]>> cock into your ass. You feel his dick enter your tight ass, feelings of pain and pleasure rush through you.'
+	anal_slip += 4
 	gs 'arousal', 'masturbate', 5, 'unknown', 'sub'
 	gs 'arousal', 'anal', 5, 'unknown', 'sub'
 	minut -= 5

+ 28 - 3
locations/gevent.qsrc

@@ -201,11 +201,36 @@ if $ARGS[0] = '5':
 	gs 'cum_manage'
 	money += 100
 	slutty += 1
-	pav_prostitute += rand(2,4)
+	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.'
+			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. 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'

+ 2 - 2
locations/girl.qsrc

@@ -83,8 +83,8 @@ if $ARGS[0] = 'details':
 	!!requirements of the figure, chest size, hair color.
 	!!0 - ass less 80, 1 back from 80 prior_to 100, 2 ass over 100
 	figurboy = rand(0, 2)
-	!!0 - chest less 3, 1 breast 3-4, 2 breasts bigger 4
-	npc_bust[$npclastgenerated] = rand(0, 2)
+	!!0 - 60  curve around 22,5 (C/D cups)
+	npc_bust[$npclastgenerated] = rand(0,15) + rand(0,15) + rand(0,15) & if rand(1,10) = 1: npc_bust[$npclastgenerated] += rand(0,15)
 	!!0 - black, 1 - brown, 2 - Redhead, 3 - blonde
 	npc_haircol[$npclastgenerated] = rand(0, 3)
 	!!character 0 - soft, 1 -norm 2 - aggressor

+ 23 - 23
locations/grandmahelp.qsrc

@@ -11,26 +11,26 @@ frost = 0
 
 if $ARGS[0] = 'start':
 	if month <= 4 or month >= 10:
-		grandmaQW['help_type'] = rand(0,2)
+		grandmaQW['chore_type'] = rand(0,2)
 	elseif month = 5 or month = 6:
-		grandmaQW['help_type'] = rand(0,5)
+		grandmaQW['chore_type'] = rand(0,5)
 	else
-		grandmaQW['help_type'] = rand(0,6)
+		grandmaQW['chore_type'] = rand(0,6)
 	end
 
-	if grandmaQW['help_type'] = 0: 
+	if grandmaQW['chore_type'] = 0: 
 		gt 'grandmahelp', 'cleanfloor'
-	elseif grandmaQW['help_type'] = 1:
+	elseif grandmaQW['chore_type'] = 1:
 		gt 'grandmahelp', 'washclothes'
-	elseif grandmaQW['help_type'] = 2 and hour < 9 and hour > 20:
+	elseif grandmaQW['chore_type'] = 2 and hour < 9 and hour > 20:
 		gt 'grandmahelp', 'milkcows'
-	elseif grandmaQW['help_type'] = 3:
+	elseif grandmaQW['chore_type'] = 3:
 		gt 'grandmahelp', 'feedchickens'
-	elseif grandmaQW['help_type'] = 4 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 4 and sunWeather = 1:
 		gt 'grandmahelp', 'checkplants'
-	elseif grandmaQW['help_type'] = 5 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 5 and sunWeather = 1:
 		gt 'grandmahelp', 'waterplants'
-	elseif grandmaQW['help_type'] = 6 and sunWeather = 1:
+	elseif grandmaQW['chore_type'] = 6 and sunWeather = 1:
 		gt 'grandmahelp', 'harvest'
 	else
 		'"There is nothing to do today <<$pcs_nickname>>, take the day off.'
@@ -41,13 +41,13 @@ end
 if $ARGS[0] = 'cleanfloor':
 	'"There is always something to do, <<$pcs_nickname>>. I''ve gotten quite old and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
 
-	grandmaQW['cleanfloor'] = 1
+	grandmaQW['chore_clean_floor'] = 1
 	act 'Tell her you will do it soon':gt 'gadhouse', 'grandma'
 	act 'Agree and start cleaning (1:00)':
 		*clr & cla
 		minut += 60
-		grandmaQW['cleanfloor'] = 0
-		grandmaQW['help'] += 1
+		grandmaQW['chore_clean_floor'] = 0
+		grandmaQW['help_amount'] += 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
@@ -60,13 +60,13 @@ end
 if $ARGS[0] = 'washclothes':
 	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfathers dirty clothes?"'
 	
-	grandmaQW['washclothes'] = 1
+	grandmaQW['chore_wash_clothes'] = 1
 	act 'Tell her you will wash them in a little bit':gt 'gadhouse', 'grandma'
 	act 'Agree and start washing (1:00)':
 		*clr & cla
 		minut += 60
-		grandmaQW['washclothes'] = 0
-		grandmaQW['help'] += 1
+		grandmaQW['chore_wash_clothes'] = 0
+		grandmaQW['help_amount'] += 1
 		gs'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
@@ -87,7 +87,7 @@ end
 if $ARGS[0] = 'feedchickens':
 	'"Of course <<$pcs_nickname>>, would you be kind and feed the chickens?"'
 	
-	grandmaQW['feed_chickens'] = 1
+	grandmaQW['chore_feed_chickens'] = 1
 	act 'Tell her you will do it in a little while':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the yard (0:10)':
 		*clr & cla
@@ -104,7 +104,7 @@ end
 if $ARGS[0] = 'milkcows':
 	' "<<$pcs_nickname>>, go to the barn and milk the cows."'
 
-	grandmaQW['milk_cow'] = 1
+	grandmaQW['chore_milk_cow'] = 1
 	act 'Tell her you will do it in a bit':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -121,7 +121,7 @@ end
 if $ARGS[0] = 'checkplants':
 	'"<<$pcs_nickname>>, can you please go work in the garden?"'
 
-	grandmaQW['work_garden'] = 1
+	grandmaQW['chore_work_in_garden'] = 1
 	act 'Tell her you will get to it later':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the garden (0:10)':
 		*clr & cla
@@ -138,7 +138,7 @@ end
 if $ARGS[0] = 'waterplants':
 	'"Dear <<$pcs_nickname>>, could you go and water the plants in the garden?"'
 
-	grandmaQW['water_garden'] = 1
+	grandmaQW['chore_water_garden'] = 1
 	act 'Tell her you will do it after a while':gt 'gadhouse', 'grandma'
 	act 'Agree and go to the garden (0:10)':
 		*clr & cla
@@ -156,7 +156,7 @@ if $ARGS[0] = 'harvest':
 	if month = 7:
 		'"<<$pcs_nickname>> dear, the strawberries are ripe to pick. Could you go over to the plot and pick them today?"'
 		
-		grandmaQW['collect_strawberries'] = 1
+		grandmaQW['chore_collect_strawberries'] = 1
 		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the strawberry plot (0:10)':
 			*clr & cla
@@ -171,7 +171,7 @@ if $ARGS[0] = 'harvest':
 	elseif month = 8:
 		'"<<$pcs_nickname>> dear, the fruits are ripe and it is time to start collecting them, could you go and do it today?"'
 
-		grandmaQW['fruit_collect'] = 1
+		grandmaQW['chore_collect_fruit'] = 1
 		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the orchard (0:10)':
 			*clr & cla
@@ -186,7 +186,7 @@ if $ARGS[0] = 'harvest':
 	elseif month = 9:
 		'"<<$pcs_nickname>> dear, could you go to the garden today? It''s time to collect the harvest."'
 
-		grandmaQW['harvest_garden'] = 1
+		grandmaQW['chore_harvest_garden'] = 1
 		act 'Tell her you will do it in a little bit':gt 'gadhouse', 'grandma'
 		act 'Agree and go to the garden (0:10)':
 			*clr & cla

+ 46 - 46
locations/grandpahelp.qsrc

@@ -9,19 +9,19 @@ gs'stat'
 if $ARGS[0] = 'start':
 
 	if month <= 4 or month >= 10:
-		grandpaQW['help_type'] = rand(0,5)
+		grandpaQW['chore_type'] = rand(0,5)
 	elseif month = 5:
-		grandpaQW['help_type'] = rand(3,8)
+		grandpaQW['chore_type'] = rand(3,8)
 	elseif month = 6 or month = 9:
-		grandpaQW['help_type'] = rand(3,12)
+		grandpaQW['chore_type'] = rand(3,12)
 	else
-		grandpaQW['help_type'] = rand(3,13)
+		grandpaQW['chore_type'] = rand(3,13)
 	end
 
-	if grandpaQW['help_type'] = 0:
+	if grandpaQW['chore_type'] = 0:
 		'"<<$pcs_nickname>>, could you run out to the barn and bring some firewood for the stove?"'
 
-		grandpaQW['fetch_firewood'] = 1
+		grandpaQW['chore_fetch_firewood'] = 1
 		act 'Tell him you will go get some in just a bit':gt 'gadhouse', 'grandpa'
 		act 'Agree and go to fetch firewood (0:20)':
 			*clr & cla
@@ -33,17 +33,17 @@ if $ARGS[0] = 'start':
 			'You put on some warm clothes and run over to the barn to collect some firewood. '
 			'"I''ve brought some firewood grandfather," you said to your grandfather.'
 			'"You are very quick <<$pcs_nickname>>." he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
-			grandpaQW['fetch_firewood'] = 0
+			grandpaQW['chore_fetch_firewood'] = 0
 			minut += 20
-			grandmaQW['help'] += 1
+			grandmaQW['help_amount'] += 1
 			gs'stat'
 
 			act 'Continue':gt 'gadhouse', 'start'
 		end
-	elseif grandpaQW['help_type'] = 1:
+	elseif grandpaQW['chore_type'] = 1:
 		'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
 
-		grandpaQW['feed_horse'] = 1
+		grandpaQW['chore_feed_horse'] = 1
 		act 'Tell him that you will get to it in a little bit':gt 'gadhouse', 'grandpa'
 		act 'Agree and go to the barn (0:10)':
 			*clr & cla
@@ -58,10 +58,10 @@ if $ARGS[0] = 'start':
 
 			act 'Continue':gt'gadsarai','horse'
 		end
-	elseif grandpaQW['help_type'] = 2:
+	elseif grandpaQW['chore_type'] = 2:
 		'"<<$pcs_nickname>>, go to the barn to feed the cows."'
 
-		grandpaQW['feed_cow'] = 1
+		grandpaQW['chore_feed_cow'] = 1
 		act 'Tell him that you will do it in a little while':gt 'gadhouse', 'grandpa'
 		act 'Agree and go to the barn (0:10)':
 			*clr & cla
@@ -76,27 +76,27 @@ if $ARGS[0] = 'start':
 
 			act 'Continue':gt'gadsarai','cow'
 		end
-	elseif grandpaQW['help_type'] = 3:
+	elseif grandpaQW['chore_type'] = 3:
 		gt 'grandpahelp', 'cleanyard'
-	elseif grandpaQW['help_type'] = 4:
+	elseif grandpaQW['chore_type'] = 4:
 		gt 'grandpahelp', 'groomhorse'
-	elseif grandpaQW['help_type'] = 5:
+	elseif grandpaQW['chore_type'] = 5:
 		gt 'grandpahelp', 'feedhogs'
-	elseif grandpaQW['help_type'] = 6 and hour >= 6 and hour < 9:
+	elseif grandpaQW['chore_type'] = 6 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'grazehorse'
-	elseif grandpaQW['help_type'] = 7 and hour >= 6 and hour < 9:
+	elseif grandpaQW['chore_type'] = 7 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'leadcows'
-	elseif grandpaQW['help_type'] = 8 and hour >= 6 and hour < 9:
+	elseif grandpaQW['chore_type'] = 8 and hour >= 6 and hour < 9:
 		gt 'grandpahelp', 'grazecows'
-	elseif grandpaQW['help_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5:
+	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5:
 		gt 'grandpahelp', 'washhorse'
-	elseif grandpaQW['help_type'] >= 10 and grandpaQW['help_type'] < 13 and $grandpaQW['gather_quest'] = '' and ARRSIZE('swimwear') > 0:
+	elseif grandpaQW['chore_type'] >= 10 and grandpaQW['chore_type'] < 13 and $grandpaQW['chore_gather_from_forest'] = '' and ARRSIZE('swimwear') > 0:
 		gt 'grandpahelp', 'pickforest'
-	elseif grandpaQW['help_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
+	elseif grandpaQW['chore_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
 		'"<<$pcs_nickname>>, we need to help out with hay gathering today. We have to go to the field and help out."'
 		'"Okay, grandfather," you replied.'
 
-		grandpaQW['haying_time'] = 1
+		grandpaQW['chore_bale_hay'] = 1
 		act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
 		act 'Grab a rake and head to the field (0:40)':
 			*clr & cla
@@ -138,7 +138,7 @@ end
 if $ARGS[0] = 'cleanyard':
 	'"Of course <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
 
-	grandpaQW['clean_yard'] = 1
+	grandpaQW['chore_clean_yard'] = 1
 	act 'Tell him that you''ll do it in a minute':gt 'gadhouse', 'grandpa'
 	act 'Agree and go clean up the yard (1:00)':
 		*clr & cla
@@ -150,8 +150,8 @@ if $ARGS[0] = 'cleanyard':
 			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
 		end
 		minut += 60
-		grandpaQW['clean_yard'] = 0
-		grandmaQW['help'] += 1
+		grandpaQW['chore_clean_yard'] = 0
+		grandmaQW['help_amount'] += 1
 		if month >= 4 and month <= 10:
 			fat -= rand(1,3)
 		else
@@ -167,7 +167,7 @@ end
 if $ARGS[0] = 'feedhogs':
 	'"<<$pcs_nickname>>, could you go to the barn and feed the hogs."'
 
-	grandpaQW['feed_boar'] = 1
+	grandpaQW['chore_feed_boar'] = 1
 	act 'Tell him you will get to it soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -187,7 +187,7 @@ end
 if $ARGS[0] = 'washhorse':
 	'"It''s good weather today. Take Desperado to the river and give him a bath."'
 
-		grandpaQW['horse_river'] = 1
+		grandpaQW['chore_bathe_horse'] = 1
 	act 'Tell him you will do it in a little while':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -203,7 +203,7 @@ end
 if $ARGS[0] = 'groomhorse':
 	'"Of course <<$pcs_nickname>>, I need your help to groom Desperado."'
 
-	grandpaQW['comb_horse'] = 1
+	grandpaQW['chore_brush_horse'] = 1
 	act 'Tell him you will do it in a bit':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -223,7 +223,7 @@ end
 if $ARGS[0] = 'grazehorse':
 	'"<<$pcs_nickname>>, take Desperado to the field, my legs hurt so I need to rest for a bit. I''ll retrieve the horse up in the evening."'
 
-	grandpaQW['horse_field'] = 1
+	grandpaQW['chore_lead_horse_to_field'] = 1
 	act 'Tell him you will do it soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -237,17 +237,17 @@ if $ARGS[0] = 'grazehorse':
 end
 
 if $ARGS[0] = 'grazecows':
-	if grandpaQW['graze_cow_exp'] = 0: 
+	if grandpaQW['chore_herd_cattle_experience'] = 0: 
 		'"<<$pcs_nickname>>, we need to let the cows graze on the field today. Grab something to eat and lead the herd to the field. I''ll meet you there."'
 	else
 		'"<<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
 	end
 
-	grandpaQW['graze_cow'] = 1
+	grandpaQW['chore_herd_cattle'] = 1
 	act 'Tell him you will meet him there':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the field (0:40)':
 		*clr & cla
-		if grandpaQW['graze_cow_exp'] = 0:
+		if grandpaQW['chore_herd_cattle_experience'] = 0:
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
 			'You take a little nibble of a sandwich and go to the shed where the herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
 		else
@@ -268,7 +268,7 @@ end
 if $ARGS[0] = 'leadcows':
 	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter, could you lead the cows on the field and tell the herders to drive them home at the end of the day."'
 
-	grandpaQW['cow_field'] = 1
+	grandpaQW['chore_lead_cow_to_field'] = 1
 	act 'Tell him you will soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the barn (0:10)':
 		*clr & cla
@@ -282,25 +282,25 @@ if $ARGS[0] = 'leadcows':
 end
 
 if $ARGS[0] = 'pickforest':
-	if grandpaQW['help_type'] = 10:
-		$grandpaQW['gather_quest'] = 'mushroom'
-		grandpaQW['mushroom_qty'] = rand(2,3)
+	if grandpaQW['chore_type'] = 10:
+		$grandpaQW['chore_gather_from_forest'] = 'mushroom'
+		grandpaQW['chore_mushroom_quantity'] = rand(2,3)
 		'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
 		'"How much should I pick, grandpa?", you ask.'
-		'"<<grandpaQW[''mushroom_qty'']>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
-	elseif grandpaQW['help_type'] = 11:
-		$grandpaQW['gather_quest'] = 'berry'
-		grandpaQW['berry_qty'] = rand(3,5)
+		'"<<grandpaQW[''chore_mushroom_quantity'']>> kg will be enough," grandfather replies. "Be careful so you don''t get lost."'
+	elseif grandpaQW['chore_type'] = 11:
+		$grandpaQW['chore_gather_from_forest'] = 'berry'
+		grandpaQW['chore_berry_quantity'] = rand(3,5)
 		'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
 		'"How much should I pick, grandpa?" you ask.'
-		'"<<grandpaQW[''berry_qty'']>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
-	elseif grandpaQW['help_type'] = 12:
-		$grandpaQW['gather_quest'] = 'both'
-		grandpaQW['mushroom_qty'] = rand(1,2)
-		grandpaQW['berry_qty'] = rand(2,3)
+		'"<<grandpaQW[''chore_berry_quantity'']>> kg will be enough," grandfather replies. "Just be careful so you don''t get lost."'
+	elseif grandpaQW['chore_type'] = 12:
+		$grandpaQW['chore_gather_from_forest'] = 'both'
+		grandpaQW['chore_mushroom_quantity'] = rand(1,2)
+		grandpaQW['chore_berry_quantity'] = rand(2,3)
 		'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and has a craving for some fresh berries."'
 		'"How much should I pick, grandpa?"'
-		'"<<grandpaQW[''mushroom_qty'']>> kg mushrooms and <<grandpaQW[''berry_qty'']>> kg of berries will be enough," grandfather replies. "Just don''t get lost."'
+		'"<<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries will be enough," grandfather replies. "Just don''t get lost."'
 	end
 	act 'Tell him you will go get some soon':gt 'gadhouse', 'grandpa'
 	act 'Agree and go to the forest (1:00)':

+ 8 - 3
locations/gschool_boys_bathroom.qsrc

@@ -291,6 +291,7 @@ if $ARGS[0] = 'boy2_sub':
 			'After five or six repeats, he pulls out again but this time, he shoves it up your ass instead, without warning or preparation. You groan in pain and instinctively want to pull away but there''s still that hand at your throat. He doesn''t wait for you to adjust to his <<dick>>cm <<$dick_girth>> cock being shoved up your ass either; he just drives it all the way in, ignoring your pained noises, until his balls are touching your cheeks and then starts hammering your puckered hole with a vengeance.'
 			*nl
 			'You do what you can to relax and you manage it too - it''s getting better, hurts less, even starts feeling good-ish. After a bit of pounding, though, he repeats his earlier movement scheme: He pulls his cock out of your ass and then shoves it all the way in again, in and out, all the way. You have to hold on to the counter for dear life but you groan lustfully again after a while and maybe, if you just had one of your hands at your pussy, you could... But just as you''re thinking this, Radomir starts panting, silent at first but getting louder, and you can tell he is getting close to finishing.'
+			anal_slip += 4
 			gs 'arousal', 'anal', 6, 'sub', 'rough'
 			gs 'stat'
 			act 'Finish':
@@ -401,6 +402,7 @@ if $ARGS[0] = 'boy3_kiss':
 			'You don''t know if it is an accident or if he did it on purpose, but mid stroke, he pulls out of you and when he shoves his cock back in, it goes into your ass instead of your pussy, sliding all the way in one single thrust. You cry out in surprise and pain and grip the sink tightly - you definitely weren''t prepared for this, but at least Lazar reads your reaction right and slows down to a crawl, giving you time to adjust; perhaps he realized only now that he is pounding your butt instead.'
 			*nl
 			'He doesn''t stop his movements, though; with how excited he must be, it''d probably be close to impossible for him to do that. He has adjusted the depth and speed of his penetration but doesn''t say a word. Still, it helps, and after a while, the pain recedes and you can feel pleasure taking the upper hand again. He chooses that moment to pull out of you; Lazar quickly lifts you off your feet and lays you on your back, across the sink. He spreads your legs and steps between them where he slips his <<dick>>cm <<$dick_girth>> cock back into your ass. This time, you can appreciate the feeling of him entering your backdoor and moan in satisfaction. Your lover takes advantage of the new position and occasionally squeezes your boobs; you follow his example and rub your clit, making this steamy encounter even more enjoyable for you. Minutes go by and he keeps speeding up, eventually fucking your little asshole as fast as he can, the shockwaves traveling to your clit and up your spine, adding to the building orgasm. That''s when you notice that his panting changes and he has a look of intense concentration on his face - he is obviously about to shoot his load.'
+			anal_slip += 4
 			gs 'arousal', 'anal', 6
 			gs 'stat'
 			act 'You do your math homework?':
@@ -421,6 +423,7 @@ if $ARGS[0] = 'boy3_kiss':
 				if $pantyworntype ! 'nude':
 					'You use the sinks to clean yourselves up, exchanging remarks on the sex you just had while you''re coming down from that post-coital high. As you get cleaned up in the sink, he gets dressed. After cleaning yourself up, you get dressed as well.'
 				else
+					gs 'panties', 'dispose'
 					'You use the sinks to clean yourselves up, exchanging remarks on the sex you just had while you''re coming down from that post-coital high. As you get cleaned up in the sink, he gets dressed. When you start to get dressed, you see him grab your panties. You expect him to give them to you but instead he sticks them in his pocket instead. "Um, Lazar I think those are mine," you say indicating the pocket he just stuck your panties in.'
 				end
 				*nl
@@ -589,7 +592,7 @@ if $ARGS[0] = 'boy4':
 						'By the time he pulls his fingers out, you are more than ready for anal sex and feeling the head of his cock pushing against your asshole is anything but unexpected. He gently eases the tip into your ass, causing you to gasp a little in pain - you were ready, yes, but that doesn''t change that he is big. He stops moving at once, though, and waits a moment before pushing his <<dick>>cm <<$dick_girth>> dick inside a little more, slowly sinking about halfway into your ass. If you thought you were feeling full before, it is nothing compared to now.'
 						*nl
 						'He starts slowly moving back and forth inside your ass, working his way deeper into your bowels as carefully as possible, slowing down whenever he hears a groan of pain or sees you flinch. Thing is, you are mostly moaning in pleasure now and what little discomfort his size still causes you is easily drowned out by it. Having his big, black cock, ploughing your tight little ass is so incredibly arousing. Marcus may be considerate but the twitching and screaming tells him everything he needs to know.'
-
+						anal_slip += 4
 						$orgasm_txt = 'He picks up the pace, fucking you fast and hard through your orgasm and prolonging it to the point where it almost turns into pain. You can barely see anything, blinded by the sensory overload, but you can hear him pant and grunt louder than before.'
 						$orgasm_or = 'custom'
 						gs 'arousal', 'anal', 5
@@ -696,6 +699,7 @@ if $ARGS[0] = 'boy5':
 					'Once you are settled after their impressive, if strange, display of strength, Ivan kneels behind you and starts rubbing the tip of his wet dick against your anus. It doesn''t take much guesswork to figure out what he has in mind, so you try to relax as he coats your asshole a bit with the saliva you left on him. When he shoves his <<dick>>cm <<$dick_girth>> cock into your ass, your moan is loud, a mixture of pain and pleasure; and while all three of you take a moment to relish the tightness and adjust to it, soon, both boys start fucking you for all they are worth, leaving you feeling completely filled. You moan loudly as they both pound you in tandem, pleasure overtaking pain decisively.'
 					gs 'arousal', 'vaginal', 5, 'group'
 					gs 'boyStat', 'A3'
+					anal_slip += 4
 					gs 'arousal', 'anal', 5, 'group'
 					minut -= 5
 					gs 'stat'
@@ -1591,7 +1595,8 @@ if $ARGS[0] = 'caughtb2':
 					*nl
 					'He quickly works up the speed of his thrusts and is soon pounding your ass balls deep with every stroke, slamming your shoulders against the mirror with each hard thrust. He grunts, clearly taking pleasure from violating your ass like that, and you, too, can''t deny that a part of you loves being pounded like this as you''re rubbing your clit.'
 					$orgasm_txt = 'Despite the rough treatment he is giving you and your ass, you feel an orgasm roll in and when it hits with loud screams, Mr Ivanov has to slow down and hold you down so you don''t fall off the sink.'
-					gs 'arousal', 'vaginal_finger', 5
+					gs 'arousal', 'vaginal_finger', 4
+					gs 'arousal', 'anal_finger', 1,'lube'
 					$orgasm_or = 'custom'
 					gs 'arousal', 'anal', 15, 'rough'
 					gs 'stat'
@@ -1668,7 +1673,7 @@ if $ARGS[0] = 'boy7':
 				act 'Make him take it (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'force'
-					gs 'boyStat', 'd<<dildonumber>>'
+					gs 'boyStat', 'D<<strapnumber>>'
 					gs 'stat'
 					'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/boysroom3.jpg"></center>'

+ 2 - 5
locations/gschool_break.qsrc

@@ -106,7 +106,7 @@ if $ARGS[0] = 'restroom_actions':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end	
 
 if $ARGS[0] = 'girls_restroom_events':
@@ -348,7 +348,6 @@ if $ARGS[0] = 'girls_restroom_events':
 								act 'Continue':
 									*clr & cla
 									gs 'pain', 2, 'vaginal', 'stretch'
-									gs 'boyStat', 'D2' 
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully3.jpg"></center>'
 									'Lera gets frustated at the position, sitting she can''t really pound you. She pulls out and stands up. "Get the slut up so I can pile drive this bitch." The other girls lift your hips in the air, pulling your legs forward so your knees are almost against your shoulders, as they hold your arms and legs in place. Now with a much better vantage point, Lera slides the <<dick>>cm <<$dick_girth>> dildo back inside of your pussy and starts fucking you hard, making comments about how loose you are, while the other girls laugh.'
 									gs 'arousal', 'vaginal_strap', 3, 'humiliation', 'maso', 'gangbang', 'lesbian'
@@ -364,7 +363,6 @@ if $ARGS[0] = 'girls_restroom_events':
 											*clr & cla
 											gs 'pain', 3, 'asshole', 'stretch'
 											gs 'pain', 2, 'asscheeks', 'spank'
-											gs 'boyStat', 'D3'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully5.jpg"></center>'
 											'Lera pulls out. After a brief discussion, another girl, one of the younger ones, puts on the harness and lays down. "Come on slut mount me." Not giving a choice the other girls pull you over on top of you and force you down on the <<dick>>cm <<$dick_girth>> dildo, as it slides all the way up in you. A couple of the other girls slap your ass hard, to encourage you to to do the work.'
 											'Lena kneels down behind you, moments later you feel her spit against your asshole, then the pressure of the head of a dildo in her hand. With only that bit of spit for lubrication she shoves the <<dick>>cm <<$dick_girth>> dildo in your ass. A couple of the other girls add their spit to the shaft of the dildo so it slides a little easier.'
@@ -374,7 +372,6 @@ if $ARGS[0] = 'girls_restroom_events':
 											gs 'stat'
 											act 'Continue':
 												*clr & cla
-												gs 'boyStat', 'D3'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully6.jpg"></center>'
 												'Paulina puts on the other harness and then takes takes the dildo from Lera, making her pull it out of your ass to your relief. "Give me that, if we are going to do this, then we should at least fuck the slut right." Mounting the dildo to the harness, she kneels down behind you and shoves it back up your ass, it feels like the <<dick>>cm <<$dick_girth>> dildo is ripping your ass, as both dildo''s are hammered into both your holes.'
 												gs 'arousal', 'vaginal_strap', 3, 'humiliation', 'maso', 'gangbang', 'lesbian'
@@ -383,7 +380,6 @@ if $ARGS[0] = 'girls_restroom_events':
 												gs 'stat'
 												act 'Continue':
 													*clr & cla
-													gs 'boyStat', 'D3'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully7.jpg"></center>'
 													'The girl on the bottom finally has had enough and pushes you up enough, until the dildo slips out of your pussy. Paulina keeps fucking your ass for a bit, while the other one slides out from under you. Soon the other girls demand a turn, it seems none of them feel like sliding back under you or using your pussy anymore. Instead several more of them, maybe all of them, you can''t tell, take turns wearing a strapon and fucking your ass.'
 													gs 'arousal', 'anal_strap', 10, 'humiliation', 'maso', 'gangbang', 'lesbian'
@@ -759,6 +755,7 @@ if $ARGS[0] = 'boys_restroom_events':
 						else
 							'You get up and turn around, bending over. Once you do, he spits on your anus and rubs the spit into your ass to help lube it up. Then he lines up his dick, you feel the head of his cock press against your puckered asshole. The pressure builds up until the head pops in, he pauses a moment as you tense up and then gentle slides his dick in your ass. He pauses when you tense up to let you get use to his <<dick>>cm <<$dick_girth>> dick, pushing it''s way into your ass. He slowly starts fucking your ass gently, going just a little deeper slowly. It doesn''t hurt too much.'
 						end
+						anal_slip += 4
 						gs 'arousal', 'anal', 5, 'sub'
 						gs 'pain', 1, 'asshole', 'stretch'
 						gs 'stat'

+ 1 - 1
locations/gschool_chats1.qsrc

@@ -298,7 +298,7 @@ if $ARGS[0] = 'igor_peg':
 				gs 'stat'
 				act 'Bend over bitch boy':
 					*clr & cla
-					gs 'boyStat', 'D2' 
+					gs 'boyStat', 'D<<strapnumber>>' 
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/igor/sex/school/break5.jpg"></center>'
 					'Once he has the strapon nice and wet with his saliva you tell him. "Get up and bend over for me my little slut."'
 					'He stands up and bends over one of the desks, you step up behind him and rub the tip of your strapon against his little puckered asshole. You bend over a bit and spit in the crack of his ass to add a little more lubrication. Then you press the head of the strapon against his asshole into it pops in, he moans in a mixture of pain and pleasure as it does.'

+ 5 - 5
locations/gschool_chats2.qsrc

@@ -161,21 +161,20 @@ if $ARGS[0] = 'natasha':
 
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
-	if NatashaQW = 0 and npc_rel['A16'] >= 60 and pav_slut < 100:
+	if NatbelQW['QWstage'] = 0 and npc_rel['A16'] >= 60 and pav_slut < 100:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 			minut += 5
-			NatashaQW = 1
+			NatbelQW['QWstage'] = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'	
 			'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
-	elseif NatashaQW >= 8 and NatDolg > 0:
+	elseif NatbelQW['QWstage'] >= 8 and NatbelQW['Debt'] > 0:
 		act 'Come to the bathroom with me':
 			*clr & cla
 			minut += 5
-			natotrab += 1
 			gs 'stat'
 			'<center><b><font color="maroon">Girls Bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
@@ -185,8 +184,9 @@ if $ARGS[0] = 'natasha':
 			act 'Continue':
 !!ToDo: Expand this content (nutluck)
 				*clr & cla
-				NatDolg -= 500
+				NatbelQW['Debt'] -= 500
 				if npc_Sex['A16'] = 0: npc_Sex['A16'] = 1 & girl += 1
+				NatbelQW['lesbian'] += 1
 				$orgasm_or = 'yes'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/school/natschoolowe.jpg"></center>'
 				'Her tongue starts to lick your clit, you bite your lip to try and keep from moaning too loudly. You lean back and relax, as you let Natasha pleasure you with her tongue. She is getting a lot better at this and if your not mistaken she is starting to like it a lot.'

+ 4 - 2
locations/gschool_detention.qsrc

@@ -575,9 +575,10 @@ if $ARGS[0] = 'ass_fuck':
 	'He pauses and it takes a moment for him to process what you just said but when it dawns on him that he can realize his porn magazine fantasy, he wastes no time, perhaps afraid you might change your mind: He climbs up on the table next to you, spooning you, then starts rubbing the tip of his dick against your anus. He rubs it against your pussy again, gathering more juices from there, and repeats the process; you almost didn''t expect him to be this considerate when you stated your desire. When he has your puckered hole lubed up a little with your own fluids, he gently eases his dick into your ass. Eliciting a moan of pleasure and pain from you, he slowly slides his way deeper into your ass, only stopping when he feels you tense up. Then, he start fucking your ass, gingerly at first, savoring the feeling of being inside your other hole.'
 	*nl
 	'He even reaches over and starts rubbing your clit as he moves in and out, and as your moans get louder, you feel yourself building up towards an orgasm, but his slow pace is driving you mad and you can''t take it anymore. You reach back, grab his ass and pull him closer so his dick slides deeper up your ass. Perceptive as ever, he takes the hint and works his way deeper into you butt until he is balls deep. Once there, he starts fucking you faster too, slowly building up speed until he is hammering your ass, giving you exactly what you wanted, what you needed.'
-	$orgasm_txt = 'Another, even more intense orgasm crashes through your body and to your luck, the hand of his that isn''t rubbing your clit clamps tightly over your mouth, muffling your cries.'
 	$orgasm_or = 'no'
+	anal_slip += 4
 	gs 'arousal', 'vaginal_finger', 10, 'dom'
+	$orgasm_txt = 'Another, even more intense orgasm crashes through your body and to your luck, the hand of his that isn''t rubbing your clit clamps tightly over your mouth, muffling your cries.'
 	$orgasm_or = 'custom'
 	gs 'arousal', 'anal', 10, 'dom'
 	minut -= 10
@@ -727,7 +728,7 @@ if $ARGS[0] = 'company2':
 				'"Reach back and spread your ass cheeks. Don''t worry, I used lots of lube and I''ll be gentle." Again, you follow his command and reach back to spread your cheeks. You feel him rub the head of his dick against your asshole for a moment before easing the tip inside. He stops almost at once, giving you a moment to adjust, but with all the lube his <<dick>>cm <<$dick_girth>> cock slides surprisingly easily into your ass.'
 				*nl
 				'Gently and slowly, Marcus fucks your ass, carefully working his way deeper into you, giving you plenty of time to get used to the size of his cock. Before long, you find yourself moaning in pleasure and that familiar feeling building in your groin. All you feel is the intense stimulation from having your puckered hole fucked.'
-				lubonus = 10
+				anal_slip += 10
 				gs 'arousal', 'anal', 15
 				gs 'stat'
 				act 'Continue':
@@ -844,6 +845,7 @@ if $ARGS[0] = 'Ivanov_suck':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/serafim/sex/school/teacherlick.jpg"></center>'
 		'You turn and bend over the table, silently preparing yourself for whatever he has in mind as he pulls your uniform''s skirt up and your panties down. His hands pull your ass cheeks apart and then you feel his tongue against your asshole, wet and warm, the fact that it is his utterly disgusting you. He keeps licking your rosebud, uses his fingers to work his saliva into your anus, then goes back to licking it some more. He does this several times, preparing you for penetration, no doubt, and all you can do is wait in fearful anticipation. Eventually, you hear him rummaging and then something bigger than a finger rubs against your asshole: He rubs the head of his dick around, lining it up.'
 		gs 'arousal', 'rimming', 5
+		anal_slip += 4
 		gs 'stat'
 		act 'Take his dick up your ass':
 			*clr & cla

+ 7 - 2
locations/gschool_events.qsrc

@@ -1261,6 +1261,7 @@ if $ARGS[0] = 'homework_sex_bribe':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworka1.jpg"></center>'
 					'His dick is rather on the small side, perhaps it would feel better in your ass. "I want you to fuck my ass now."'
+					gs 'arousal', 'auto_lube', 'anal'
 					'He breaths almost in your ear. "Ok." He pulls out and tries to put his dick in your ass failing, until you grab his dick and help lining it up, until he finally slide his cock up your ass. This seems to really excite him, as it doesn''t take long at all until he moans out. "I''m about to cum."'
 					gs 'arousal', 'anal', 5
 					gs 'stat'
@@ -1272,6 +1273,7 @@ if $ARGS[0] = 'homework_sex_bribe':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/homeworka1.jpg"></center>'
 				'Getting tired of his lack luster attempt to eat you out, you push his head away. "Get your cock out and fuck my ass." You tell him.'
 				'He quickly unbuttons his pants so his <<dick>>cm <<$dick_girth>> dick springs free. You take your clothes off before leaning against the side of the stall, partially bending over, you use one hand to spread you cheeks while your other hand helps guides his dick to your little asshole.'
+				gs 'arousal', 'auto_lube', 'anal'
 				'With your help he gets it lined up and slides his <<dick>>cm <<$dick_girth>> cock in your asshole, moaning loudly as he does. He quickly slides himself in balls deep and starts fucking you frantically like you imagine a virgin would.'
 				gs 'arousal', 'anal', 5
 				gs 'stat'
@@ -1964,16 +1966,19 @@ if $ARGS[0] = 'rand_scoolboy':
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom2.jpg"></center>'
 							'You lean forward as <<$rand_boy>> approaches. He greedily puts his hands on your ass, fondling your ass cheeks enthusiastically. His touch invokes shivers throughout your body, you''re so horny you don''t know what you''ll do if you don''t get some soon! Slowly but surely he moves his hands more towards your crack, and after a while two of his fingers are inside your dripping pussy.'
 							gs 'arousal', 'vaginal_finger', 5
+							gs 'stat'
 							act 'Lie down on your back':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom3.jpg"></center>'
 								'As you turn to lie down on your back, his fingers never leave you. The squishing of your wet hole being fingered fills the room, as he kisses you and teasingly runs his thumb over your clit. His fingers give you sweet pleasure, but you become frustrated once you see his evil grin: he has no intentions of actually making you orgasm this way.'
 								gs 'arousal', 'vaginal_finger', 5
+								gs 'stat'
 								act 'Beg him to fuck you':
 									*clr & cla
 									gs 'cum_call', '', $boy, 1
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_secretroom4.jpg"></center>'
-									$sexstart2orgazm5 = 'After a few minutes of being on the edge, you can''t hold back any more. You push his hand away and shift back to your hands and knees, begging for him to fuck you. <<$rand_boy>> has a mischievous grin on his face, thoroughly amused that his constant teasing got you this desperate. Nevertheless, he obliges: he guides the head of his hard cock against your pussy lips and immediately rams it in. Not giving you any chance to recover, he pounds you like his life depends on it.'
+									$orgasm_or = 'yes'
+									$orgasm_txt = 'After a few minutes of being on the edge, you can''t hold back any more. You push his hand away and shift back to your hands and knees, begging for him to fuck you. <<$rand_boy>> has a mischievous grin on his face, thoroughly amused that his constant teasing got you this desperate. Nevertheless, he obliges: he guides the head of his hard cock against your pussy lips and immediately rams it in. Not giving you any chance to recover, he pounds you like his life depends on it.'
 									'You moan loudly perhaps a bit too loudly, because you soon find his hand covering your mouth, stifling your moans as he fucks you hard from behind.'
 									'The squeezing of your tight pussy around his dick sends him over the edge.'
 									gs 'arousal', 'vaginal', 10
@@ -1985,7 +1990,7 @@ if $ARGS[0] = 'rand_scoolboy':
 										'Realizing you have to get to class soon, you quickly scoot over and take his penis in your mouth. As you quickly lick him clean, you taste the mixture of his and your juices; it makes you feel kind of raunchy, and you wouldn''t mind having another go if it wasn''t for class starting any minute now. You quickly straighten your clothes and hand him his pants, and quickly check your hair before you both run to class.'
 										gs 'arousal', 'bj', 2
 										gs 'arousal', 'end'
-										gs'stat'
+										gs 'stat'
 										act 'Continue': gt 'gschool_events', 'leave_break_events2'
 									end
 								end

+ 33 - 33
locations/gschool_grounds.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'main':
 	'Pavlovsk''s only school, all the local children go here for their education. Next to the school is the athletic field, a parking lot for the teachers, just beyond the parking lot is a grove of trees, and past that is the old school building. After the new school was built the old one was supposed to get renovated and used for advance classes but budget cuts meant the project was canceled and now the old school building stands empty. Though many of the kids use it to skip class or as a place to sneak off to drink or have sex.'
 
 	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0:
-		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
+		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
 	if day = nyp_day and month = 12 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
@@ -67,7 +67,7 @@ if $ARGS[0] = 'main':
 
 			if pcs_grades >= 90:
 				'You go up to the podium. As the Principal shakes your hand she announces "As every year I''d like to honor our best student of the year. Miss <<$pcs_lastname>> here performed exceptionally well in her studies and I think that deserves some recognition." She starts applaude and the auditorium quickly joins in the applause.'
-				if home_owned[2] = 1:'As you return to your place you see your mother smiling brightly.'
+				if home_owned[2] = 1: 'As you return to your place you see your mother smiling brightly.'
 			elseif pcs_grades >= 70:
 				'You go up to the podium. The Principal shakes your hand and gives you your diploma. "Well done, Miss <<$pcs_lastname>>!" she says before you return to your place.'
 			else
@@ -225,24 +225,24 @@ if $ARGS[0] = 'main':
 
 		if ivan_afterschool = 1: act 'Meet Ivan after school': gt 'gschool_sex', 'afterschool'
 
-		if LinaSlut > 0 and rand(1,10) < 3:'You see Lina, Dan and Vasily leaving the school together.'
+		if LinaSlut > 0 and rand(1,10) < 3: 'You see Lina, Dan and Vasily leaving the school together.'
 
 		if Enable_tablemap = 0:
-			if anushkaFirstvisit = 0 and meet_after_school = 1:'<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a> is leaning against a tree just in front of the school.'
-			if LariskaHomeIn > 0:'<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
-			if JuliaMilLernQW >= 1:'<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a> is sitting somewhere on the school courtyard, reading a book.'
-			if NatashaQW > 0:'<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a> is standing in a corner.'
-			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1:'<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
-			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5:'<a href="exec:minut += 1 & gt ''AleksandraGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a> is waiting for you at the end of the school courtyard, listening to music.'
-
-			if katjaMeynoldday ! daystart and meynoldQW >= 2:'<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a> is walking across the school courtyard, getting ready to go home.'
+			if anushkaFirstvisit = 0 and meet_after_school = 1: '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a> is leaning against a tree just in front of the school.'
+			if LariskaHomeIn > 0: '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
+			if JuliaMilLernQW >= 1: '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a> is sitting somewhere on the school courtyard, reading a book.'
+			if NatbelQW['QWstage'] > 0: '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a> is standing in a corner.'
+			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: '<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
+			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5: '<a href="exec:minut += 1 & gt ''AleksandraGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a> is waiting for you at the end of the school courtyard, listening to music.'
+
+			if katjaMeynoldday ! daystart and meynoldQW >= 2: '<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a> is walking across the school courtyard, getting ready to go home.'
 			if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
 				'<a href="exec:minut += 15 & gt ''dimaEv'', ''after_school''">Dimka Nosov</a> is deep in thought, as he leans against a lamp post.'
 			elseif DimaRudeQW > 0 and dimarudeday ! daystart and DimaRudeBlock = 0:
 				if rand(0,4) = 0: gt 'dimaEv', 'after_school'
 				'<a href="exec:minut += 15 & gt ''dimaEv'', ''after_school''">Dimka Nosov</a> is deep in thought, as he leans against a lamp post.'
 			end
-			if IgorLoverQW > 0 and igorkruglovday ! daystart and IdorBlock = 0:'<a href="exec:minut += 15 & gt ''igorhome'', ''entrance''">Igor Kruglov</a> is talking to some of his friends on the courtyard.'
+			if IgorLoverQW > 0 and igorkruglovday ! daystart and IdorBlock = 0: '<a href="exec:minut += 15 & gt ''igorhome'', ''entrance''">Igor Kruglov</a> is talking to some of his friends on the courtyard.'
 			if fedorKozlovQW >= 10 and kotovVSkozlov = 1:
 				'You can see <a href="exec: gt ''FedorEv'', ''Strela Chat''">Fedor</a> sitting in the corner of the schoolyard by himself.'
 			elseif fedorKozlovQW >= 10 and fedorkozqw = 2 and FedorLuv < -4:
@@ -253,33 +253,33 @@ if $ARGS[0] = 'main':
 		else
 			!display friends in table if switch is on.
 			st_count=0 & $show_table=''
-			if anushkaFirstvisit = 0 and meet_after_school = 1:gs'show_table','<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a>','5'
-			if LariskaHomeIn > 0:gs'show_table','<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>','5'
-			if JuliaMilLernQW >= 1:gs'show_table','<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milov</a>','5'
-			if NatashaQW > 0:gs'show_table','<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>','5'
-			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0:gs'show_table','<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a>','5'
-			if katjaMeynoldday ! daystart and meynoldQW >= 2:gs'show_table','<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>','5'
+			if anushkaFirstvisit = 0 and meet_after_school = 1: gs 'show_table', '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a>', '5'
+			if LariskaHomeIn > 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>', '5'
+			if JuliaMilLernQW >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milov</a>', '5'
+			if NatbelQW['QWstage'] > 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>', '5'
+			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0: gs 'show_table', '<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a>', '5'
+			if katjaMeynoldday ! daystart and meynoldQW >= 2: gs 'show_table', '<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>', '5'
 			if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
-				gs'show_table','<a href="exec:minut += 15 & gt ''dimaHome'', ''home''">Dimka Nosov</a>','5'
+				gs 'show_table', '<a href="exec:minut += 15 & gt ''dimaHome'', ''home''">Dimka Nosov</a>', '5'
 			elseif DimaRudeQW > 0 and dimarudeday ! daystart and DimaRudeBlock = 0:
 				if rand(0,4) = 0: gt 'dimaEv', 'after_school'
-				gs'show_table','<a href="exec:minut += 15 & gt ''dimaEv'', ''after_school''">Dimka Nosov</a>','5'
+				gs 'show_table', '<a href="exec:minut += 15 & gt ''dimaEv'', ''after_school''">Dimka Nosov</a>', '5'
 			end
-			if IgorLoverQW > 0 and igorkruglovday ! daystart and IdorBlock = 0:gs'show_table','<a href="exec:minut += 15 & gt ''igorhome'', ''entrance''">Igor Kruglov</a>','5'
+			if IgorLoverQW > 0 and igorkruglovday ! daystart and IdorBlock = 0: gs 'show_table', '<a href="exec:minut += 15 & gt ''igorhome'', ''entrance''">Igor Kruglov</a>', '5'
 			if fedorKozlovQW >= 10 and kotovVSkozlov = 1:
-				gs'show_table','<a href="exec: gt ''FedorEv'', ''Strela Chat''">','5'
+				gs 'show_table', '<a href="exec: gt ''FedorEv'', ''Strela Chat''">', '5'
 			elseif fedorKozlovQW >= 10 and fedorkozqw = 2 and FedorLuv < -4:
-				gs'show_table','<a href="exec: gt ''FedorEv2'', ''Fedor Breakup''">','5'
+				gs 'show_table', '<a href="exec: gt ''FedorEv2'', ''Fedor Breakup''">', '5'
 			elseif fedorKozlovQW >= 10:
-				gs'show_table','<a href="exec: gt ''FedorEv'', ''Start''">Fedor</a>','5'
+				gs 'show_table', '<a href="exec: gt ''FedorEv'', ''Start''">Fedor</a>', '5'
 			end
-			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5:gs'show_table','<a href="exec:minut += 1 & gt ''AleksandraGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>','5'
+			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5: gs 'show_table', '<a href="exec:minut += 1 & gt ''AleksandraGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>', '5'
 			if st_count > 0 :
-				'Near school yard, you see:'
+				'Near school yard, you see: '
 				'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 			end
 		end
-		if albinaCarday ! daystart and AlbFrend >= 1 and albrideday ! daystart:'<a href="exec:minut += 15 & gt ''albinaRide''">Albina Barlovskaya</a> is waiting behind the wheel of a large black SUV, parked near the school.'
+		if albinaCarday ! daystart and AlbFrend >= 1 and albrideday ! daystart: '<a href="exec:minut += 15 & gt ''albinaRide''">Albina Barlovskaya</a> is waiting behind the wheel of a large black SUV, parked near the school.'
 
 		! meynold`s events
 		if hour = 14 and vicky_afterschool ! daystart: gs 'mey_vika_events', 'near_school'
@@ -346,7 +346,7 @@ if $ARGS[0] = 'sports':
 		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 
-	if hour >= 9 and hour < 18 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0: 'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'',''change_room''">changing rooms</a> by the gym and change your outfit.'
+	if hour >= 9 and hour < 18 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0: 'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 
 	if week = 6 and schoolSorev = 2 and hour = 10 and SchoolBlock = 0:
 		*nl
@@ -374,10 +374,10 @@ if $ARGS[0] = 'sports':
 	! Giving football preference, since there''s no indoor option for it.
 	if temper => 15 and sunWeather = 1 and hour > 8 and hour < 12 and week = 6 and fbpickupDay + 14 <= daystart and bbpickupDay ! daystart:
 		*nl
-		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec:gt ''fbgameout'', ''start''">football field</a>.'
+		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec: gt ''fbgameout'', ''start''">football field</a>.'
 	elseif temper => 15 and sunWeather = 1 and hour > 8 and hour < 12 and week = 6 and bbpickupDay + 14 <= daystart and fbpickupDay ! daystart:
 		*nl
-		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec:gt ''bbgameout'', ''start''">basketball court</a>.'
+		'As you pass by the sports field you notice that most of the ''jocks'' have gathered around the <a href="exec: gt ''bbgameout'', ''start''">basketball court</a>.'
 	end
 end
 
@@ -457,7 +457,7 @@ if $ARGS[0] = 'KristinaFight':
 	'As you cross the school yard after school, you are surprised by a powerful kick in your back. You fall to your hands and knees and rub your sore back for a second, before you turn around and see Christina Zvereva, her face contorted with rage. She yells at you, "You fucking bitch! How dare you spread shit about me like that? I''ll break your fucking face!"'
 !! Fightcheck
 	act 'fight':
-		gs 'fight','initFight'
+		gs 'fight', 'initFight'
 		gs 'fight_npcdata', 'christina'
 		gt 'fight', 'start'
 	end
@@ -701,7 +701,7 @@ if $ARGS[0] = 'change_room':
 		end
 	end
 	*nl
-	'The locker room is accessed through the school gym, and is left unlocked until 18:30 each day, to be utilised by students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches, and not much else. You can <a href="exec: gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0,', and <a href="exec:dynamic $pirManage">manage your piercings</a>', '.')+''
+	'The locker room is accessed through the school gym, and is left unlocked until 18:30 each day, to be utilised by students using the sports ground for training and events outside school hours. The room is cold, damp and filled with lockers, benches, and not much else. You can <a href="exec: gt ''wardrobe'', ''start''">change your outfit</a> by the lockers here'+iif(pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0, ', and <a href="exec:dynamic $pirManage">manage your piercings</a>', '.')+''
 
 	if (hour = 18 and minut >= 30) or hour > 18:
 		'The school is closing for the night and you have to leave so you don''t get stuck here all night.'
@@ -713,7 +713,7 @@ if $ARGS[0] = 'change_room':
 		cla
 		gt 'wardrobe', 'start'
 	end
-	dynamic $removepan
+	dynamic $publicpan
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
 	dynamic $quickwash

+ 26 - 2
locations/gschool_groups.qsrc

@@ -188,9 +188,9 @@ if $ARGS[0] = 'fuckornot':
 					$fu_text += '' + '<td bgcolor=<<$bcolor2>> align="center"><img  height="100" src="images/pc/npc_headshots/<<i>>.jpg"><br>' + '<<$npc_usedname[''A<<i>>'']>>, <<hotcat_rating[''A<<i>>'']>>/10'
 				end
 			end
-			if fu_count < 6 and hotcat_rating['A<<i>>'] = j:
+			if fu_count < 6 and hotcat_rating['A<<i>>'] = j and npc_gender['A<<i>>'] = 1:
 				$fu_text += '</td>'
-			elseif fu_count = 6 and hotcat_rating['A<<i>>'] = j:
+			elseif fu_count = 6 and hotcat_rating['A<<i>>'] = j and npc_gender['A<<i>>'] = 1:
 				$fu_text +='</td></tr><tr>' & fu_count = 0
 			end
 			if hotcat ! j or hotcat_rating_set = 1: i += 1
@@ -204,5 +204,29 @@ if $ARGS[0] = 'fuckornot':
 	killvar 'j'
 end
 
+if $ARGS[0] = 'hotornot':
+	killvar '$ho_text'
+	killvar '$ho_count'
+	j = 11
+	'<center><table cellspacing="3">'
+	:ho_loop_2
+		j -= 1
+		i = 1
+		:ho_loop
+			if ho_count = 6 : $ho_text += '<tr>'
+			if ho_count < 6 and hotcat_rating['A<<i>>'] = j and npc_gender['A<<i>>'] = 0:
+				$ho_text += '</td>'
+			elseif ho_count = 6 and hotcat_rating['A<<i>>'] = j and npc_gender['A<<i>>'] = 0:
+				$ho_text +='</td></tr><tr>' & ho_count = 0
+			end
+		if i <= aarraynumber:jump 'ho_loop'
+	if j > 1: jump 'ho_loop_2'
+
+	'<<$ho_text>>'
+	'</table></center>'
+	killvar 'i'
+	killvar 'j'
+end
+
 --- gschool_groups ---------------------------------
 

+ 32 - 0
locations/gschool_lessons.qsrc

@@ -69,6 +69,38 @@ if $ARGS[0] = 'morning':
 			act 'Go to first period': school_period = 0 & gt 'gschool_lessons', 'schedule'
 			act 'Skip first period': school_period = 1 & gt 'gschool_lessons', 'skip'
 
+			act 'Use water cooler': $breaktype = 'first' & gt 'gschool_break', 'watercooler'
+			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
+			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'
+		elseif late = 0 and hotornot = 0 and fuckornot_day < daystart - 9:
+			hotornot = 1
+			fuckornot_day = daystart
+			'<center><b><font color="maroon">School Hallway</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
+			'You walk past a group of guys looking at there phone. "Can you believe these ratings?" One of them says.'
+			'Another responds. "Boys are such pigs."'
+			'"We should return the favor and rate <i>them</i>." A third one says, the rest all stop and look at her, then to each other and smile.'
+			*nl			
+			gs 'gschool_lessons', 'uniform_check'
+			gs 'gschool_schedule'
+			act 'Go to first period': school_period = 0 & gt 'gschool_lessons', 'schedule'
+			act 'Skip first period': school_period = 1 & gt 'gschool_lessons', 'skip'
+
+			act 'Use water cooler': $breaktype = 'first' & gt 'gschool_break', 'watercooler'
+			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
+			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'
+		elseif late = 0 and hotornot = 1 and fuckornot_day < daystart - 11:
+			hotornot = 2
+			fuckornot_day = daystart
+			'<center><b><font color="maroon">School Hallway</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall0<<Rand(0,2)>>.jpg"></center>'
+			'You see several of the cool guys talking to Zinaida. At first you think they might be bullying her, but instead it sounds like they are asking her a bunch of questions. What ever it is, they seem to come to an agreement.'
+			*nl			
+			gs 'gschool_lessons', 'uniform_check'
+			gs 'gschool_schedule'
+			act 'Go to first period': school_period = 0 & gt 'gschool_lessons', 'schedule'
+			act 'Skip first period': school_period = 1 & gt 'gschool_lessons', 'skip'
+
 			act 'Use water cooler': $breaktype = 'first' & gt 'gschool_break', 'watercooler'
 			act 'Go to the girls restroom': $breaktype = 'first' & gt 'gschool_break', 'girls_restroom'
 			act 'Go to the boys restroom': $breaktype = 'first' & gt 'gschool_break', 'boys_restroom'

+ 1 - 1
locations/gschool_lessons4.qsrc

@@ -1779,7 +1779,7 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		pcs_mood += 10
 		gs 'stat'
-		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/applegirl.jpg"></video></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/applegirl.jpg"></center>'
 		'You don''t know why but Christina says something to Lina, which causes Lina to lay down on her stomach on one of the benches. Christina then sticks a apple in her mouth and proceeds to then ignore her. A few minutes pass of this, once Christina is fully clothes she walks back over and then uses her belt to smack Lina hard on the ass, making Lina wince. "Now have you learned your lesson?" Chrisina asks Lina, who enthusiastically nods her head yes.'
 		'Lariska just stands a bit away watching, Christina yanks hard on Lina''s hair. "You sure?" Lina nods even more enthusiastically yes.'
 		'Christina gives her a final look and then puts her belt on. "Ok fine, but don''t do it again."'

+ 6 - 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.'
@@ -686,6 +687,11 @@ if $ARGS[0] = 'computer':
 		'While working on your computer assignment you get a message from someone, no name is listed. Just has a school ID, you look around to see who might have sent it but no one seems to be paying attention to you, so you can''t tell. All the message says is "Where do you rate?" With a link to a web page.'
 		act 'Ignore it and focus on your school work.': fuckornot_day = daystart + rand(0,2) & gt 'gschool_lessons', 'short_break'
 		act 'Click on the link': $view_location = 'school' & gt 'komp', 'fuckornot'
+	elseif fuckornot = 2 and hotornot = 2 and fuckornot_day < daystart - 8:
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/computer_class.jpg"></center>'
+		'While working on your computer assignment you get a message from someone, no name is listed. Just has a school ID, you look around to see who might have sent it but no one seems to be paying attention to you, so you can''t tell. All the message says is "Where do you rate?" With a link to a web page.'
+		act 'Ignore it and focus on your school work.': fuckornot_day = daystart + rand(0,2) & gt 'gschool_lessons', 'short_break'
+		act 'Click on the link': $view_location = 'school' & gt 'komp', 'hotornot'
 	elseif rand(0,5) > 0:
 		school_event_hour = 1
 		scooltiperand = rand(1,26)

+ 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.'

+ 4 - 3
locations/gschool_office.qsrc

@@ -570,7 +570,7 @@ if $ARGS[0] = 'whore':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore6.jpg"></center>'
 						'Lifting one of your legs up to place your knee on the desk, you know what is about to come next, and though knowing itself only helps so much, the natural wetness of your pussy and your slobber on the dildo absolutely do. It hurts a little when she shoves the <<dick>>cm <<$dick_girth>> strap-on basically all the way into your twat, and the moan you give is one of both pain and pleasure. "You even moan like a little whore," the Principal says as she hammers the dildo''s full length into you repeatedly.'
-						gs 'arousal', 'vaginal', 5, 'lesbian', 'humiliation', 'sub'
+						gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'humiliation', 'sub'
 						gs 'stat'
 
 						act 'Get your ass fucked': gt 'gschool_office', 'whore2'
@@ -589,7 +589,8 @@ if $ARGS[0] = 'whore2':
 	*nl
 	'Realizing that, she grabs hold of your hips to keep you from pulling away. "I''m not done with you yet, <<$pcs_lastname>>. This is what whores do every day, and they have to like it," she says as she pounds the dildo into your ass. The first few thrusts are the worst, even worse than the initial penetration... but after a while - and maybe also due to the Principal spitting on your puckered hole several times - the pain subsides to tolerable levels and it starts feeling good, <i>really</i> good. Soft moans escape your lips as she pounds your little ass. No longer trying to pull away, you are pushing back against her.' 
 	'"Now you''re acting like a good little whore," she comments, and with your only response being another moan and thrust against her, she is not wrong.'
-	gs 'arousal', 'anal', 5, 'lesbian', 'humiliation', 'sub'
+	anal_slip += 4
+	gs 'arousal', 'anal_strap', 5, 'lesbian', 'humiliation', 'sub'
 	gs 'stat'
 	act 'Take it deep':
 		*clr & cla
@@ -600,7 +601,7 @@ if $ARGS[0] = 'whore2':
 		*nl
 		'Many more minutes pass, and while it did feel extraordinarily good for a while, your butt is now starting to get really sore and hurt; all the lubrication seems to have come off the dildo and the friction is turning every thrust into a bigger (literal) pain in the ass than the last. You grit your teeth and bear it as best you can, but eventually it starts hurting so much that your ass feels like it is on fire and you beg: "Please, Miss Volkov, please stop, it is really starting to hurt!"'
 		$orgasm_txt = 'As she gives your ass a merciless pounding, you can feel that familiar tingling building up inside of your body, and soon an orgasm crashes over you. You start humping back against her as she fucks your ass while the orgasm courses through your body. Barely coherent, you hear her say something along the lines of "that''s right, my little whore, moan and orgasm like the dirty little anal slut you are", and eventually the sensation passes... but she doesn''t stop fucking you.'
-		gs 'arousal', 'anal', 10, 'lesbian', 'humiliation', 'sub'
+		gs 'arousal', 'anal_strap', 10, 'lesbian', 'humiliation', 'sub'
 		gs 'stat'
 		$orgasm_txt = ''
 		*nl

+ 39 - 43
locations/gschool_sex.qsrc

@@ -182,6 +182,7 @@ if $ARGS[0] = 'afterschool':
 					'Looking down at Katja, your eyes lock and you realize now this is what she and Ivan had been talking about when you approached them earlier. You begin to pant, your hand rubbing your own clit.'
 					*nl
 					'Katja slides out from under you and kneels down next to your ass, as she watches Ivan roughly plough your ass. You begin to cry out as your body spasms in an intense orgasm.'
+					anal_slip += 4
 					gs 'arousal', 'anal', 10, 'group'
 					gs 'arousal', 'vaginal', 10, 'group'
 					minut -= 10
@@ -409,7 +410,7 @@ if $ARGS[0] = 'Anush_kiss':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/l4undress.jpg"></center>'
 		'After some time the boys finally come over and stand very close to each of you, Anushka breaks the kiss with you and turns and starts taking off Valentin''s clothes, while you take her lead and start to do the same to Arkadi.'
-		gs 'arousal', 'foreplay', 10, 'group'
+		gs 'arousal', 'foreplay', 5, 'group'
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
@@ -418,16 +419,14 @@ if $ARGS[0] = 'Anush_kiss':
 			gs 'boystat', 'A158'
 			gs 'arousal', 'bj', 10, 'group'
 			gs 'boystat', 'A156'
-			gs 'arousal', 'bj', 10, 'group'
-			minut -= 10
+			gs 'arousal', 'bj', -10, 'group'
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/l4lick.jpg"></center>'
 				'Anushka stops and pulls you up as she stands up. "Ok boys it''s our turn." The boys waste no time in taking off your clothes as you and Anushka start making out again, once your both naked the buys kneel down and start eating you out. The even return the favor of switching, which pussy they are licking.'
-				gs 'arousal', 'kiss', 10, 'lesbian'
+				gs 'arousal', 'kiss', -10, 'lesbian'
 				gs 'arousal', 'cuni', 10, 'group'
-				minut -= 10
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
@@ -439,8 +438,7 @@ if $ARGS[0] = 'Anush_kiss':
 					'Some time passes before you feel Arkadi pull out of you, he gets up and walks around you, while Valentin does the same, the boys give each other a high five as they pass. As you see Arkadi kneel down behind Anushka, you can feel Valentin doing the same. With in second you feel Valentin''s cock thrust deeply into you. He takes a firm hold of your hips and starts pounding you as hard and fast as he can.'
 					gs 'arousal', 'vaginal', 10, 'group'
 					gs 'boystat', 'A158'
-					gs 'arousal', 'vaginal', 10, 'group'
-					minut -= 10
+					gs 'arousal', 'vaginal', -10, 'group'
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
@@ -453,10 +451,10 @@ if $ARGS[0] = 'Anush_kiss':
 						'After she orgasms Akardi stands up "Switch." Is all he says, as Valentin pulls out of your ass and the boys switch positions again. Arkadi kneels down behind you and shoves his cock balls deep in your ass and starts pounding you as hard and fast as he can. Anushka is quickly encouraging Valentin to pound her ass harder, with in a few minutes she has another screaming orgasm.'
 						*nl
 						$orgasm_txt = 'You feel the sensations building up as you get roughly fucked, watching Anushka getting fucked at the same time, somehow makes it even hotter. You feel yourself starting to pant as you become overwhelmed with pleasure, you cry out, maybe even scream, you don''t recall. It is a long slow drop, back to reality, leaving your body trembling.'
+						anal_slip += 4
 						gs 'arousal', 'anal', 10, 'group'
 						gs 'boystat', 'A156'
-						gs 'arousal', 'anal', 10, 'group'
-						minut -= 10
+						gs 'arousal', 'anal', -10, 'group'
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
@@ -479,7 +477,6 @@ end
 if $ARGS[0] = 'rand_bj':
 	*clr & cla
 	menu_off = 1
-	pcs_horny += 50
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet2.jpg"></center>'
 	'You can''t believe you''re doing this! Minutes ago you were just looking to relax in the classroom between lessons, and now you''re about to give this guy the best blowjob he''s ever had, in front of all your classmates that''s so hot!'
@@ -488,7 +485,8 @@ if $ARGS[0] = 'rand_bj':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet3.jpg"></center>'
 		'You begin to lick the head of his penis, ignoring the excited whispers of your classmates. Then you wrap your <<$liptalk3>> around it and begin to suck him off, taking him in deeper and deeper with every thrust. Your hand darts down, fingering your soaking wet pussy eagerly this is not fair! If you keep this up, he will shoot his load in your mouth and you will be left horny as hell!'
-		gs 'arousal', 'bj', 10, 'unknown'
+		gs 'arousal', 'bj', 5
+		gs 'stat'
 		act 'Bend over the toilet':
 			*clr & cla
 			pose = 0
@@ -503,15 +501,16 @@ if $ARGS[0] = 'rand_bj':
 					gs 'dinSex', 'wear_condom'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet4.jpg"></center>'
 					'<<$boydesc>> does not need any more encouragement and rubs his cock against your sopping fuckhole, slamming it in all the way on the first thrust. He then begins to fuck you in short, furious strokes, and soon the room is filled with the sound of his balls slapping against your clit and the sopping of your pussy around his dick.'
-					gs 'arousal', 'vaginal', 10, 'unknown'
+					gs 'arousal', 'vaginal', 5
+					gs 'stat'
 					act 'Mount him':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet6.jpg"></center>'
-						gs 'dinsex','vaginal_sex',10
-						gs 'dinsex','sexcum'
+						gs 'dinsex', 'vaginal_sex',10
+						gs 'dinsex', 'sexcum'
 						gs 'arousal', 'end'
-						gs 'stat'
 						gs 'underwear', 'wear'
+						gs 'stat'
 						act 'Continue': gt 'gschool_lessons', 'short_break'
 					end
 				end
@@ -519,7 +518,8 @@ if $ARGS[0] = 'rand_bj':
 				gs 'dinSex', 'wear_condom'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet4.jpg"></center>'
 				'<<$boydesc>> does not need any more encouragement and rubs his cock against your sopping fuckhole, slamming it in all the way on the first thrust. He then begins to fuck you in short, furious strokes, and soon the room is filled with the sound of his balls slapping against you and the sopping of your pussy around his dick.'
-				gs 'arousal', 'vaginal', 10, 'unknown'
+				gs 'arousal', 'vaginal', 5
+				gs 'stat'
 				act 'Mount him':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_tualet6.jpg"></center>'
@@ -540,24 +540,21 @@ if $ARGS[0] = 'rand_sex':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool1.jpg"></center>'
 	'You know there are some unfinished houses behind the school, that are usually abandoned. You take <<$boydesc>> there, away from the curious eyes of his friends, so you can have some alone time. Your pussy is soaking wet right now and you bend over, inviting him to ram his dick into you and fuck you good.'
 	act 'Spread your legs':
-		pcs_horny += 50
-		gs'stat'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool2.jpg"></center>'
 		'<<$boydesc>>, being the gentleman that he is, isn''t just looking for a quick fuck. He lays you down on your back and puts his face between your legs, rubbing his fingers over your dripping pussy lips. Then he starts to kiss your lips, teasingly running his tongue over them between kisses. After he finds your clitoris a few times, your moans grow louder and you arch your back. He backs down just enough for you to not orgasm. For the next few minutes he keeps edging you with an evil grin on his face, ignoring your begging.'
-		gs 'arousal', 'cuni', 10, 'unknown'
+		gs 'arousal', 'cuni', 10
+		gs 'stat'
 		act 'He fucks your pussy':
 			*clr & cla
 			pcs_mood += 10
-			stat['vaginal'] += 1
-			if pcs_vag < dick: pcs_vag += 1
 			cumprecheck = 1
 			gs 'cum_call', '', $boy, 1
-			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool3.jpg"></center>'
-			$sexstart2orgazm5 = 'Taking you upstairs to a window sill, <<$boydesc>> tells you to lay down on your back on the ledge. Once you oblige he spreads your legs and slowly slides his cock into your dripping pussy, beginning to fuck you in low, long strokes. Every thrust puts him in a little deeper, and when he bottoms out in you he begins to fuck you in earnest. You''ve given into your pleasure a long time ago; by now are nothing but putty in his hands, letting him fuck you however he wants as long as you get to get off. Before too long you reach your orgasm, and you grasp your arms tightly around his neck to keep yourself from falling out of the window. Your spasming pussy is milking his cock for his sperm, and you can tell he''s getting close.'
-			gs 'arousal', 'vaginal', 10, 'unknown'
-			gs 'dinsex','vaginal_sex',10
+			$orgasm_or = 'yes'
+			$orgasm_txt = 'Taking you upstairs to a window sill, <<$boydesc>> tells you to lay down on your back on the ledge. Once you oblige he spreads your legs and slowly slides his cock into your dripping pussy, beginning to fuck you in low, long strokes. Every thrust puts him in a little deeper, and when he bottoms out in you he begins to fuck you in earnest. You''ve given into your pleasure a long time ago; by now are nothing but putty in his hands, letting him fuck you however he wants as long as you get to get off. Before too long you reach your orgasm, and you grasp your arms tightly around his neck to keep yourself from falling out of the window. Your spasming pussy is milking his cock for his sperm, and you can tell he''s getting close.'
+			gs 'dinsex', 'vaginal_sex', 10
+			gs 'stat'
 			act 'Take his load in your mouth':
 				*clr & cla
 				stat['bj'] += 1
@@ -579,19 +576,18 @@ if $ARGS[0] = 'rand_sex':
 				analplugin = 0
 				'<<$boydesc>> plays with your butt plug for a moment before pulling it out. Your anus gapes slightly from being filled for so long. He reassures you, "Don''t worry babe, I''ll be filling that soon enough."'
 			end
-			stat['anal'] += 1
-			if pcs_ass < dick: pcs_ass += 1
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool4.jpg"></center>'
 			'<<$boydesc>> wants something a little different today, and carefully rubs the head of his dick against your anus. The head of his cock is quite large, and it''s quite difficult to get in. You tell yourself, "He licked me so good he deserves this."'
 			'You whinge from pain when his cock enters you, and ask him to take it slow for a moment so you can get used to his size. He''s happy to oblige and rubs your pussy slowly in the meantime, occasionally darting a finger in. It feels so good! With him massaging you like this you feel the pain subsiding quickly. It still hurts a little, but when he begins to move his hips you moan loudly - not from pain, but pleasure!'
-			gs 'arousal', 'anal', 10, 'unknown'
+			gs 'arousal', 'anal', 5
+			gs 'stat'
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/sex/boysex_scool5.jpg"></center>'
 				'After a few minutes of gentle ass fucking he pulls you off the window ledge and gets on his back. You don''t need any invitation and straddle him before he''s even fully on the ground, guiding his cock back to your asshole. With you on top you control the pace now, and you spit in your hand quickly and rub it on his dick before you slowly slide down on it. It''s still not completely pain-free. "No surprise given his size", you think to yourself.'
 				'<<$boydesc>> is definitely encouraged by your eagerness to put his cock back in your asshole. Even though you thought you could control the pace, he proves you wrong and begins to piston his hips against your stretched hole. You squirm, but the pleasant feelings start to take over again when he thrusts a few fingers into your pussy. He can feel his own cock through the thin partition, rubbing it when his cock enters you once more.'
-				gs 'arousal', 'anal', 10, 'unknown'
+				gs 'arousal', 'anal', 10
+				gs 'stat'
 				act 'Continue': 
 					*clr & cla
 					pcs_mood += 10
@@ -603,9 +599,9 @@ if $ARGS[0] = 'rand_sex':
 					'After he admires his handiwork for a second, he notices the time, "Oh crap! <<$pcs_nickname>>, we''re going to be late for class!"'
 					'You both get dressed as quickly as you can, and run as fast as you can to make it to class on time.'
 					gs 'cum_call', 'anus', $boy, 1
-					gs 'arousal', 'anal', 10, 'unknown'
+					gs 'arousal', 'anal', 10
 					gs 'arousal', 'end'
-					gs'stat'
+					gs 'stat'
 					act 'Continue': gt 'gschool_events', 'leave_break_events2'
 				end
 			end
@@ -625,7 +621,7 @@ if $ARGS[0] = 'lunch_bj':
 		gs 'boyStat', $npclastgenerated
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/lunchbrbj.jpg"></center>'
 		'After you make sure the ground is clean, you get down on your knees and pull down his pants, revealing his stiff erection. You humor him for a bit and let him thrust the purple head against your lips, before you flash him a smile and close your <<$liptalk3>> around his <<dick>>cm <<$dick_girth>> cock. You don''t plan on taking long, and quickly use all your tricks to get him to cum as quick as you can: flicking your tongue over the head, licking the pee hole and stimulating the back side of the head with your tongue and lips.'
-		gs 'arousal', 'bj', 10, 'unknown'
+		gs 'arousal', 'bj', 10
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
@@ -646,29 +642,27 @@ if $ARGS[0] = 'lunch_sex':
 	gs 'boyStat', $npclastgenerated
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/roofbj.jpg"></center>'
 	'Once to the spot on the roof you see several blankets stuff in a corner in a safe little spot. You grab one and the boy helps you lay it out on the roof. With it down, both of you take off your clothes, he lays back on his back. Dropping down next to him you close your <<$liptalk3>> around his <<dick>>cm <<$dick_girth>> cock. Flicking your tongue over the head, licking the pee hole and stimulating the back side of the head with your tongue and lips, while one of your hands plays with his balls.'
-	gs 'arousal', 'bj', 5, 'unknown'
+	gs 'arousal', 'bj', 5
 	gs 'stat'
 	act 'Continue':
 		*clr & cla
-		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/roofvag.jpg"></center>'
 		'He doesn''t take long, before he wants more. He gets up on his knees and pulls you up on your knees as well. He turns you around and then pushes you over till you are on your hands and knees. He rubs his fingers over your pussy, making sure it is nice and wet, then he slides a couple of them in and finger bangs you for a few moments.'
 		*nl
 		'With your pussy good and wet, he pulls his fingers out and rubs his dick against your pussy lips. Once the head of his dick and nice and lubed up he gentle slides his <<dick>>cm <<$dick_girth>> cock into your pussy. He slowly starts fucking you, taking it pretty easy with you. The more you moan and buck back against his hips the harder he fucks you.'
 		*nl
 		'Holding your hips tight with his hands as he fucks you, he leans forward. "<<$pcs_nickname>> can I fuck you in the ass?"'
-		gs 'arousal', 'vaginal', 10, 'unknown'
+		gs 'arousal', 'vaginal', 10
 		gs 'stat'
 		gs 'willpower', 'anal', 'resist'
 		if will_cost <= pcs_willpwr:			
 			act 'No (<<will_cost>> Willpower)': 
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/roofvag.jpg"></center>'
 				'You shake your head no. "No, just fuck me."'
 				'"Ok" He sounds a little disappointed you can tell he was really hoping you would let him fuck your ass, but you don''t care. A few minutes later he pulls out of and begins to stand up.'
-				gs 'arousal', 'vaginal', 10, 'unknown'
+				gs 'arousal', 'vaginal', 10
 				gs 'stat'
 
 				act 'Swallow': gt 'gschool_sex', 'lunch_sex2'
@@ -678,13 +672,13 @@ if $ARGS[0] = 'lunch_sex':
 		end
 		act 'Yes':
 			*clr & cla
-			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sex/roofanal.jpg"></center>'
 			'You nod your head. "Sure you can fuck my ass if you want, I like it. Just be slow and gentle till I get use to it, ok?"'
 			'"Sweet! Yeah, yeah, totally I will be gentle till you get use to it, this is so great." You can tell he is super excited about the idea of fucking you in the ass. You wonder if this is the first time any girl has every let him fuck her ass. As you are wondering about such things, you feel him pulls his dick out of your twat and feel the head of it press against your anus. You feel the pressure building up, until the head of his dick painfully pops into your ass.'
+			gs 'arousal', 'auto_lube', 'anal'
 			*nl
 			'You gasp slightly in pain and he stops for a moment before he starts sliding his <<dick>>cm <<$dick_girth>> cock deeper in your ass. True to his word he slowly and gentle fucks your ass, but you can tell form the sounds he is making, even at such a slow pace he isn''t going to last long. Sure enough only a minute or two later, you feel him pulls his dick out of your ass and start to stand up.'
-			gs 'arousal', 'anal', 10, 'unknown'
+			gs 'arousal', 'anal', 10
 			gs 'stat'
 			act 'Swallow': gt 'gschool_sex', 'lunch_sex2'
 		end
@@ -774,6 +768,7 @@ if $ARGS[0] = 'storagesex':
 				'You really don''t want him to fuck your pussy, but surely he won''t mind just fucking your ass instead. You turn around with your back facing him and get down on all fours on the bench instead, wiggling your ass at him you say. "Why don''t you fuck my tight little ass instead?"'
 				'He gives you a look of slight surprise and then smiles. "I don''t mind if I do." He grabs some bottle off stuff off one of the shelves, it is some kind, he uses some of it to rub on his dick and then on your ass. You are not sure what it is, but you can feel it''s slickness, so obviously something he uses for lube.'
 				'With his dick and your asshole lubed up, he moves up behind you. You feel the tip of his dick against your anus and the pressure building up until it suddenly pops into you asshole, it hurts a little at first but he doesn''t move, giving you a moment to relax and adjust to the feeling of his <<dick>>cm <<$dick_girth>> cock in you ass. He starts slowly fucking your ass, not to deep letting you get use to it so it doesn''t hurt as much.'
+				anal_slip += 10
 				gs 'arousal', 'anal', 5, 'sub'
 				gs 'stat'
 				act 'Take it up the ass': gt 'gschool_sex', 'storagesex_anal'
@@ -819,7 +814,7 @@ if $ARGS[0] = 'storagesex_cum':
 	act 'Go take a shower':
 		*clr & cla
 		menu_off = 1
-		minut +10
+		minut += 10
 		pcs_mood += 10
 		shower_shave = 0
 		gs 'stat'
@@ -827,7 +822,7 @@ if $ARGS[0] = 'storagesex_cum':
 		'By the time you arrive in the girls locker room you realize all the other girls have left. You quickly get undressed and head to the showers. You enjoy the sensation of the hot water hitting your body and running down it, with the steam filling the room. Giving it a almost sauna feel, it makes you feel very relaxed.'
 		act 'Go to the locker room':
 			*clr & cla
-			minut +10
+			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic2.jpg"></center>'
 			'You take your clothes out of your locker and start putting them on. With no one else here to distract you it doesn''t take to long to get dressed.'
@@ -880,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:
@@ -1573,6 +1568,7 @@ if $ARGS[0] = 'victor_lockerroom':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker7.jpg"></center>'
 						'He reaches up and across you body to grab your right hip with his left hand, as he starts pounding your wet pussy hard and fast. The locker room echoes with the sounds of moans and slapping flesh. His hand pulls your hips back just as he thrusts forward, you can feel your tits bouncing with each impact of your bodies. Then on one of the out strokes he pulls all the way out of you, but when he goes to put it back in, he aims high and you feel his dick slide in your ass. You don''t know if it was a accident or if he did it on purpose, all you know is he just started fucking your ass.'
 						gs 'arousal', 'vaginal', 5
+						anal_slip += 4
 						gs 'stat'
 						act 'Tell him wrong hole':
 							*clr & cla

+ 5 - 25
locations/gschool_socialchg1.qsrc

@@ -170,6 +170,7 @@ if $ARGS[0] = 'lazar_vaginal':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boys/lazar/sex/school/sportsfield/vaginal2.jpg"></center>'
 			'As your moans and grunts of pleasure get louder and louder he starts fucking your harder and harder. Eventually he starts pulling nearly all the way out of you and then thrusting balls deep back in your. After a bit he even starts to occasionally pull out of you only to thrust it hard back into your twat. You are just about overcome with pleasure when he pulls all the way out of you, but this time when he thrust back in he misses. Instead of sliding back in your pussy, his massive dick slides balls deep in your ass with a single stroke.'
+			anal_slip += 4
 			gs 'arousal', 'anal', 5, 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -204,9 +205,11 @@ if $ARGS[0] = 'lazar_anal':
 	'His grin tells you he doesn''t mind at all that you are only going to let him fuck your ass. "Works for me. Now just turn around and bend over." He says'
 	if lubri = 0:
 		'You turn around till your back is facing him and your facing the tree, then you pulls your clothes out of the way to expose your naked backside to him. Then you bend over, he spits on the crack of your ass a couple of times and works the spit into your asshole to give you some lubricate. Next you feel the tip of his dick pressed up against your wet asshole, the pressure builds into finally the head of his dick pops into your asshole causing your to grasp out in pain. He pauses a moment to let you adjust, you hear him spit again you guess on his dick to add some more lube. Then he starts to slowly fuck your butt.'
+		anal_slip += 4
 	else
 		lubri -= 1
 		'You dig in your purse and pull out your small bottle of lube and hand it to him. Then you turn around till your back is facing him and your facing the tree, then you pulls your clothes out of the way to expose your naked backside to him. Then you bend over, he squirts a little lube between your butt cheeks and works the lube into your asshole to give you some lubricate. Next you feel the tip of his dick pressed up against your wet asshole, the pressure builds into finally the head of his dick pops into your asshole causing your to grasp out in pain. He pauses a moment to let you adjust, then he starts to slowly fuck your butt.'
+		anal_slip += 10
 	end
 	gs 'arousal', 'anal', 3, 'exhibitionism'
 	gs 'stat'
@@ -375,6 +378,7 @@ if $ARGS[0] = 'ivanfedor_threesome':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some4.jpg"></center>'
 				'You moan around Ivan''s cock as you suck it, while Fedor fucks you. Ivan interupts things by saying. "Fedor lay down on your back and then <<$pcs_nickname>> you get on top of him, so I can get at that ass."'
 				'Fedor pulls out of you and lays down on his back and the boys guide you down onto Fedor, Ivan fingers you a little bit until he gets his fingers nice and wet and then he smears your wetness on his dick. You are lowered down onto Fedor and you feel his cock easily sliding back inside of your pussy. Ivan kneels down behind you and spits on your ass and rubs his spit against your asshole, he repeats it a couple of times until your asshole is nice and wet with his spit. You feel the tip of his dick pressing against your butthole, building up into the head of his dick pops in your ass. Ivan starts slowly fucking your ass being as gentle as he can while you get use to his <<dick>>cm <<$dick_girth>> dick filling your butt.'
+				anal_slip += 4
 				gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
 				gs 'arousal', 'anal', 5, 'group', 'exhibitionism'
 				minut -= 5
@@ -703,36 +707,12 @@ if $ARGS[0] = 'christina_fight':
 	gs 'stat'
 	'You step closer to Christina and say. "Give me the fucking phone before I kick you ass."'
 	'She smirks to you and puts her phone in her pocket and gets in fighting stance obviously more than willing to fight you. "Take if you think you can cunt!" Lina moves out of the way to watch, just as you take your first swing. Which Christina was waiting for and easily side steps your first blow, but now the fight is on.'
-!! Fightcheck
 	act 'fight':
 		gs 'fight','initFight'
 		gs 'fight_npcdata', 'christina'
+		fightEnding = 15
 		gt 'fight', 'start'
 	end
-	if win:
-		mood += 10
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/losefight.jpg"></center>'
-		'Christina is a hell of a fighter, she is fast, hits harder than most boys and knows what she is doing. Yet despite all that she just isn''t a match for you. You finally land a few hard blows and she goes down gasping for breath, holding up her hand in a signal of no more, you smirk as she lays beaten at your feet. You reach down and pull her phone out of her pocket and then heave it as far as you can out into the lake where it plops into the water. Lina seems to be stunned that you beat Christina and she looks a little afraid of you. "Now neither you you seen me here naked right? And since I wasn''t here, that means I didn''t beat you ass, but from now on we both know who''s the bitch don''t we?" You say to both of them. Lina nods quickly Christina a little slower but she nods as well. With that you walk away from the two of them as Lina helps Christina back to her feet.'
-		act 'Walk off': gt 'gLake'
-	else
-		mood -= 20
-		'<center><img <<$set_imgh>> src="images/shared/fight/nakedlose.jpg"></center>'
-		'You do your best, you really thought you could beat Christina, but she is just so fast. She hits harder than most guys and worse, someone has trained her how to fight. In the end you find you are no match for her, a blow finally knocks you down and you land on your back. You know you can''t win at this point so you just lay there. Christina smirks at you as you lay there and she pulls her phone back out and takes more pictures of you. "That''s right bitch, I own your ass now, Now roll over and get on your hands and knees." You reluctantly do as she says.'
-		act 'Do as she says':
-			cla & *clr
-			mood -= 10
-			christinaphotos = 3
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girls/christina/beach/onall4s.jpg"></center>'
-			'Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame but do as she says, she takes several more pictures laughing the whole time. "You are going to do anything I want any time I say it from now on or everyone in school will see these and I will kick your ass again, right?" You meekly nod on the verge of tears.'
-			*nl
-			'Then you feel a swift kick from behind, between your open legs, as Christina kicks you in the twat hard. You cry out and tears running down your cheeks as you grab your crotch and roll over onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it." Christina demands as she towers over you.'
-			*nl
-			'You croak out. "I am a little cunt that will do anything you say, anytime you say it." With that Christina laughs with a fairly evil laugh, she seems to be enjoying bullying you a lot, then she and Lina walk off leaving you laying on the beach naked and in pain. Once the walk off you dry your tears as best you can and get up.'
-			gs 'pain', 1, 'labia', 'kick'
-			act 'Walk off': gt 'gLake'
-		end
-	end
 end
 
 if $ARGS[0] = 'tBella':

+ 1 - 1
locations/kafe2.qsrc

@@ -50,7 +50,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0] = 'givi':

+ 4 - 4
locations/katjaEvDin.qsrc

@@ -179,13 +179,13 @@ if $ARGS[0] = 'dildo':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
-	if katjahorny >= 100:katjahorny = 80
+	if katjahorny >= 100: katjahorny = 80
 	'You get your handbag and pull out the toy.'
-	act'Strap it on':
+	act 'Strap it on':
 		*clr & cla
-		minut+=3
+		minut += 3
 		lesbian += 1
-		gs 'boystat', 'D1', 'b'
+		gs 'boystat', 'D<<strapnumber>>', 'b'
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/strapon.jpg"></center>'
 		'You put the strap-on harness on and buckle it in place, Katja bites her lip watching your actions.'

+ 1 - 1
locations/koncepod1.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = 'vnr2x':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 if $ARGS[0]='bdr2x':

+ 1 - 1
locations/korrPar.qsrc

@@ -90,7 +90,7 @@ if nodimkaK >= rand(7,10) and DimkaWarnedToday = 0:
 	if hour >= 9 and hour < 24 and week >=6 and DimkaWarnedToday = 0: gt 'dimaEv', 'Dimka_warning'
 end
 
-if NatashaQW >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
+if NatbelQW['QWstage'] >= 4 and week < 6 and hour = 7 and kanikuli = 0 and SchoolAtestat = 0 and SchoolBlock = 0 and (PCloStyle2 = 4 or Enable_sforma = 1):
 	*nl
 	'Go pick up <a href="exec:gt ''natbelEv'', ''carrybooks''">Natasha</a> before school.'
 end

+ 4 - 2
locations/lact_lib.qsrc

@@ -337,9 +337,11 @@ if $ARGS[0] = 'prod_milk':
 				end
 				result = lactation['prod_milk_req']
 			else
-				!!	If energy is too low, milk will be produced but there is a chance that salo will shrink.
+				!!	If energy is too low, milk will be produced but there is a chance that fat will shrink.
 				pcs_energy = 1
-				if rand(0,100) > 95: salo -= 1
+				if fat > 0:
+					if rand(0,100) > 95: fat -= 1
+				end
 				if pain['breasts'] < 20: pain['breasts'] += 1
 				result = lactation['prod_milk_req']
 			end

+ 1 - 1
locations/laketoilet.qsrc

@@ -39,7 +39,7 @@ if $ARGS[0] = 'main':
 		dynamic $tampon
 		dynamic $quickwash
 		dynamic $basin
-		dynamic $removepan
+		dynamic $publicpan
 	end
 end
 

+ 1 - 1
locations/leonid.qsrc

@@ -859,7 +859,7 @@ if $ARGS[0] = 'toilet':
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
-	dynamic $removepan
+	dynamic $publicpan
 end
 
 --- leonid ---------------------------------

+ 4 - 4
locations/mirafather.qsrc

@@ -20,7 +20,7 @@ if npc_QW['A64'] > 0:'<center><b><font color = maroon>Afanasiy</font></b></cente
 *nl
 'Mira''s father, <<boyage>> years old. After his wife died, he drank heavily and looks much older than he actually is. He is still in good shape for a man his age.'
 
-act 'Leave':gt 'MiroslavaHome', 'start'
+act 'Leave him be':gt 'MiroslavaHome', 'start'
 
 if Mira_no > 0 and mirafathertalk = 0 and miraday ! daystart:
 	*clr & cla
@@ -57,7 +57,7 @@ else
 				'Mira''s father tells you that she''s not home, she left without telling him where she was going.'
 
 				if mirapimp = 1:
-					'Mira is not home but you know exactly where to find her. She has been working as your prostitute on the highway'
+					'Mira is not home but you know exactly where to find her. She has been working as your prostitute on the highway.'
 				elseif miraprost > 1:
 					'Mira is not home but you know exactly where to find her. You have seen her working as a prostitute on the highway.'
 				elseif miraprost = 1:
@@ -65,7 +65,7 @@ else
 				else
 					'Mira is not home and you have no idea where she might be. Maybe you should go look around town.'
 				end
-				act 'Leave':gt 'Gadukino'
+				act 'Go back to the village center':gt 'gadukino'
 				if miraprost > 0: act 'Go to the highway': gt 'gadprostitutes','start'
 			elseif mira_temp > 10 and month >= 4 and month <= 10 and hour <= 18:
 				*clr & cla
@@ -77,7 +77,7 @@ else
 				*nl
 				'Mira''s father tells you that she''s not home, she said she was going to the river.'
 
-				act 'Leave':gt 'Gadukino'
+				act 'Go back to the village center':gt 'gadukino'
 				act 'Go to the river':gt 'gadriver','start'
 			else
 				MiraLoc = 0

+ 1 - 1
locations/miroslava.qsrc

@@ -58,7 +58,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 		'You and Mira are best friends.'
 	end
 
-	if grandpaQW['graze_cow'] = 1:
+	if grandpaQW['chore_herd_cattle'] = 1:
 		act 'Talk to Mira':
 			menu_off = 1
 			*clr & cla

+ 18 - 17
locations/miroslavahome.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 		*nl
 		'Near the house you see '+iif(npc_QW['A64'] = 0, 'Mira''s father','Afanasiy')+' working.'
 
-		act 'Leave': gt 'gadukino'
+		act 'Go back to the village center': gt 'gadukino'
 
 		act 'Talk to '+iif(npc_QW['A64'] = 0, 'Mira''s father','Afanasiy'): gt 'mirafather'
 
@@ -47,7 +47,7 @@ if $ARGS[0] = 'start':
 	else
 		*nl
 		if hour > 22 or hour < 3: 'It''s too late, most of Mira''s family is asleep, no need to wake them up unnecessarily.' else 'It''s too early, most of Mira''s family is still asleep, no need to wake them up unnecessarily.'
-		act 'Leave': gt 'gadukino'
+		act 'Go back to the village center': gt 'gadukino'
 	end
 end
 
@@ -60,6 +60,7 @@ if $ARGS[0] = 'mirabrother':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mirabrother.jpg"></center>'
 
+	act 'Leave him be': gt 'MiroslavaHome', 'start'
 	act 'Ask if you can get a ride on his motorcycle':
 		*clr & cla
 		minut += 2
@@ -77,15 +78,15 @@ if $ARGS[0] = 'mirabrother':
 			act 'Walk away': gt 'MiroslavaHome', 'start'
 		else
 			if $pantyworntype ! 'none':
-				'"No problem", he says to you while looking you up and down with a strange glint in his eyes. "But my bike, well he only allows girls without panties to ride on his back and there''s nothing I can do about it, this bike is a little devil"'
+				'"No problem", he says to you while looking you up and down with a strange glint in his eyes. "But my bike, well, he only allows girls without panties to ride on his back, and there''s nothing I can do about it. This bike is a little devil."'
+				act 'Look at him in disgust and walk away': gt 'MiroslavaHome', 'start'
 				act 'Remove panties':
 					gs 'underwear', 'remove'
 					'You really want a ride on his motorcycle, and quickly slide them down your legs and stuff them in your pocket.'
 					gt 'MiroslavaHome', 'mirabrother'
 				end
-				act 'You look at him in disgust and walk away.': gt 'MiroslavaHome', 'start'
 			else
-				'"No problem", he says to you, and then adds with a mischievous smile. "But first, sit down on him, he''ll check to make sure he likes you. He is fussy son of a bitch."'
+				'"No problem", he says to you, and then adds with a mischievous smile, "but first, sit down on him and he''ll check to make sure he likes you. He is a fussy son of a bitch."'
 				act 'Get on the bike':
 					*clr & cla
 					pcs_horny += 10
@@ -94,8 +95,9 @@ if $ARGS[0] = 'mirabrother':
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto.jpg"></center>'
 					'You quickly swing your leg up and over the motorcycle, plop your ass down on the padded seat and grab the handlebars. Mira''s brother, with a satisfied smile, never takes his eyes off your crotch. You wiggle your ass on the seat a little giving him a great view of your naked pussy.'
-					'"Fine", he say still smiling, "Just fine! You have an awesome pussy, and I''m sure my friend," and he slaps the gas tank,"is looking forward to having you ride on him. You know what I mean, yes?" You give him a wicked grin and nod. "We''ll give you a ride to remember, and then you can give me a ride to remember..." You just continue to nod.'
+					'"Fine", he says, still smiling, "Just fine! You have an awesome pussy, and I''m sure my friend," and he slaps the gas tank, "is looking forward to having you ride on him. You know what I mean, yes?" You give him a wicked grin and nod. "We''ll give you a ride to remember, and then you can give me a ride to remember..." You just continue to nod.'
 
+					act 'Change your mind and leave': gt 'MiroslavaHome', 'start'
 					act 'Hell yes, you agree...':
 						*clr & cla
 						pcs_horny += 10
@@ -105,7 +107,7 @@ if $ARGS[0] = 'mirabrother':
 
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto.jpg"></center>'
 
-						'"Cool, here take this helmet, safety first."'
+						'"Cool. Here, take this helmet - safety first."'
 
 
 						act 'Put on the helmet':
@@ -126,7 +128,7 @@ if $ARGS[0] = 'mirabrother':
 
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto2.jpg"></center>'
 
-								'He guns the engine, which roars and then sets out at furious pace. The rear wheel burns rubber and smokes a little as he rides you down the highway, after a few miles he does a U-turn and heads back towards Gadukino and does not stop in the village.'
+								'He guns the engine, which roars and then sets out at furious pace. The rear wheel burns rubber and smokes a little as he rides down the highway. After a few miles, he does a U-turn and heads back towards Gadukino, but does not stop in the village.'
 
 
 								act 'One ride ends and another begins...':
@@ -145,7 +147,7 @@ if $ARGS[0] = 'mirabrother':
 										gs 'stat'
 
 										'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto4.jpg"></center>'
-										'You, bearing in mind the deal, obediently stand, while his hands knead your breasts and stroke your crotch.'
+										'Remembering the deal, you obediently stand, letting his hands knead your breasts and stroke your crotch.'
 
 										act 'Try to enjoy his touch':
 											*clr & cla
@@ -154,17 +156,17 @@ if $ARGS[0] = 'mirabrother':
 											gs 'stat'
 
 											'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto5.jpg"></center>'
-											'You feel, as his hand rubs your crotch, fingering your labia. A minute later he turns you around and press down on your shoulders...'
+											'You feel his hand rub your crotch, fingering your labia. A minute later he turns you around and presses down on your shoulders...'
 
 
-											act 'Squat':
+											act 'Kneel':
 												*clr & cla
 												pcs_horny += RAND(5,15)
 												minut += 2
 												gs 'stat'
 
 												'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto6.jpg"></center>'
-												'You obediently sit down in front of him on your knees and unzip his pants. His quickly growing member pops out right in front of your face...'
+												'You obediently kneel down in front of him and unzip his pants. His quickly-growing member pops out right in front of your face...'
 
 												act 'Suck':
 													*clr & cla
@@ -173,7 +175,7 @@ if $ARGS[0] = 'mirabrother':
 													gs 'stat'
 
 													'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto7.jpg"></center>'
-													'You stare for a few seconds, transfixed, as he grows larger and larger. You take his dick in your mouth and begin to suck on it and at the same time caressing his balls with your hands.'
+													'You stare for a few seconds, transfixed, as he grows larger and larger. You take his dick in your mouth and begin to suck on it, caressing his balls with your hands.'
 
 													act 'Swallow':
 														*clr & cla
@@ -187,9 +189,10 @@ if $ARGS[0] = 'mirabrother':
 														if mirabrosextime = 0:mirabrosextime = 1 & guy += 1
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto8.jpg"></center>'
-														'After a couple of minutes you feel his warm sticky cum hit the back of your throat and being to swallow it all down. Mira''s brother stands still for a minute, his eyes closed in bliss. Finally he takes his cock out of your mouth, zips up pants, sits on a motorcycle and drives you back to the village...'
+														'After a couple of minutes you feel his warm sticky cum hit the back of your throat and begin to swallow it all down. Mira''s brother stands still for a minute, his eyes closed in bliss. Finally, he takes his cock out of your mouth and zips up his pants. You put your helmets back on, get on the motorcycle once again, and he drives you back to the village...'
 
-														act 'Go back to your grandparents house': gt 'gadhouse', 'start'
+														act 'Ask him to take you back to Mira''s house': gt 'MiroslavaHome', 'start'
+														act 'Ask him to drop you off at your grandparents house': gt 'gaddvor'
 													end
 												end
 											end
@@ -199,8 +202,6 @@ if $ARGS[0] = 'mirabrother':
 							end
 						end
 					end
-
-					act 'Leave': gt 'gadukino'
 				end
 			end
 		end

+ 79 - 79
locations/mitka.qsrc

@@ -163,6 +163,22 @@ if $ARGS[0] = 'sex_chat':
 				end
 			end
 		end
+		gs 'willpower', 'bj', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'No thanks (<<will_cost>> Willpower)':
+				cla
+				npc_rel['A63'] -= 1
+				gs 'willpower', 'bj', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				
+				*nl
+				'You turn around and walk away from Mitka. You know it would be fun, but maybe another time...'
+				act 'Walk away':gt $loc
+			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 'Sounds tempting, but only a blowjob.':
 			*clr & cla
 			
@@ -214,22 +230,6 @@ if $ARGS[0] = 'sex_chat':
 				act 'Leave': gt $loc
 			end
 		end
-		gs 'willpower', 'bj', 'resist'
-		if will_cost <= pcs_willpwr:
-			act 'No thanks (<<will_cost>> Willpower)':
-				cla
-				npc_rel['A63'] -= 1
-				gs 'willpower', 'bj', 'resist'
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				
-				*nl
-				'You turn around and walk away from Mitka. You know it would be fun, but maybe another time...'
-				act 'Walk away':gt $loc
-			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
 	! Sveta is not the boys slut but has had sex with Mitka and she does not know Mira likes Mitka or Mira is the boys slut
 	elseif (npc_QW['A63'] > 0 and npc_QW['A63'] < 10) and (npc_QW['A60'] < 2 or npc_QW['A60'] >= 11):
 		*nl
@@ -237,6 +237,42 @@ if $ARGS[0] = 'sex_chat':
 		mitkarand = rand(1,10)
 		if (mitkarand = 1 or (mitkarand < 5 and pcs_vag > 0)) and mesec = 0:
 			'"How about you let me fuck you today?" Mitka asks.'
+			if pcs_vag = 0: 
+				gs 'willpower', 'sex', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'No, I''m still a virgin. (<<will_cost>> Willpower)':
+						cla
+						npc_rel['A63'] -= 2
+						gs 'willpower', 'sex', 'resist'
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						
+						*nl
+						'You tell Mitka you are not ready to lose your virginity yet. You know it would be fun, but maybe another time...'
+						
+						act 'Leave': gt $loc
+					end
+				else
+					act 'No, I''m still a virgin. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+			end
+			gs 'willpower', 'sex', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'No thanks, not today. (<<will_cost>> Willpower)':
+					cla
+					npc_rel['A63'] -= 2
+					gs 'willpower', 'sex', 'resist'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					
+					*nl
+					'You turn around and walk away from Mitka. You know it would be fun, but maybe another time...'
+					
+					act 'Walk away': gt $loc
+				end
+			else
+				act 'No thanks, not today. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 			act 'Sure, sounds like fun':
 				*clr & cla
 				
@@ -267,31 +303,14 @@ if $ARGS[0] = 'sex_chat':
 				
 				act 'Leave': gt $loc
 			end
-			if pcs_vag = 0: 
-				gs 'willpower', 'sex', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'No, I''m still a virgin. (<<will_cost>> Willpower)':
-						cla
-						npc_rel['A63'] -= 2
-						gs 'willpower', 'sex', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						
-						*nl
-						'You tell Mitka you are not ready to lose your virginity yet. You know it would be fun, but maybe another time...'
-						
-						act 'Leave': gt $loc
-					end
-				else
-					act 'No, I''m still a virgin. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-			end
-			gs 'willpower', 'sex', 'resist'
+		elseif mitkarand < 9:
+			'Can you give me a blowjob today?" Mitka asks.'
+			gs 'willpower', 'bj', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'No thanks, not today. (<<will_cost>> Willpower)':
 					cla
 					npc_rel['A63'] -= 2
-					gs 'willpower', 'sex', 'resist'
+					gs 'willpower', 'bj', 'resist'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					
@@ -303,8 +322,6 @@ if $ARGS[0] = 'sex_chat':
 			else
 				act 'No thanks, not today. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		elseif mitkarand < 9:
-			'Can you give me a blowjob today?" Mitka asks.'
 			act 'Sure, sounds like fun':
 				*clr & cla
 				
@@ -357,12 +374,33 @@ if $ARGS[0] = 'sex_chat':
 					act 'Leave': gt $loc
 				end
 			end
-			gs 'willpower', 'bj', 'resist'
+		else
+			'"I want to do anal today. What do you think?" Mitka asks.'
+			if pcs_ass = 0:
+				gs 'willpower', 'anal', 'resist'
+				if will_cost <= pcs_willpwr:
+					act 'No, I''ve never done anal before (<<will_cost>> Willpower)':
+						cla
+						npc_rel['A63'] -= 2
+						gs 'willpower', 'anal', 'resist'
+						gs 'willpower', 'pay', 'resist'
+						gs 'stat'
+						
+						*nl
+						'You tell Mitka you are not ready to lose your anal virginity yet. You know it would be fun, but maybe another time...'
+						
+						act 'Leave': gt $loc
+					end
+				else
+					act 'No, I''ve never done anal before (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				end
+			end
+			gs 'willpower', 'anal', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'No thanks, not today. (<<will_cost>> Willpower)':
 					cla
 					npc_rel['A63'] -= 2
-					gs 'willpower', 'bj', 'resist'
+					gs 'willpower', 'anal', 'resist'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					
@@ -374,8 +412,6 @@ if $ARGS[0] = 'sex_chat':
 			else
 				act 'No thanks, not today. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else
-			'"I want to do anal today. What do you think?" Mitka asks.'
 			act 'Sure, sounds like fun':
 				*clr & cla
 				
@@ -407,42 +443,6 @@ if $ARGS[0] = 'sex_chat':
 				
 				act 'Leave':gt 'gadukino'
 			end
-			if pcs_ass = 0:
-				gs 'willpower', 'anal', 'resist'
-				if will_cost <= pcs_willpwr:
-					act 'No, I''ve never done anal before (<<will_cost>> Willpower)':
-						cla
-						npc_rel['A63'] -= 2
-						gs 'willpower', 'anal', 'resist'
-						gs 'willpower', 'pay', 'resist'
-						gs 'stat'
-						
-						*nl
-						'You tell Mitka you are not ready to lose your anal virginity yet. You know it would be fun, but maybe another time...'
-						
-						act 'Leave': gt $loc
-					end
-				else
-					act 'No, I''ve never done anal before (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-			end
-			gs 'willpower', 'anal', 'resist'
-			if will_cost <= pcs_willpwr:
-				act 'No thanks, not today. (<<will_cost>> Willpower)':
-					cla
-					npc_rel['A63'] -= 2
-					gs 'willpower', 'anal', 'resist'
-					gs 'willpower', 'pay', 'resist'
-					gs 'stat'
-					
-					*nl
-					'You turn around and walk away from Mitka. You know it would be fun, but maybe another time...'
-					
-					act 'Walk away': gt $loc
-				end
-			else
-				act 'No thanks, not today. (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
 		end
 	! Sveta is not the boys slut and Sveta knows Mira likes Mitka and Mira is not the boys slut yet
 	elseif npc_QW['A63'] > 0 and npc_QW['A63'] < 11 and npc_QW['A60'] >= 2 and npc_QW['A60'] < 11:

+ 107 - 109
locations/mitkabuh.qsrc

@@ -68,6 +68,20 @@ if $ARGS[0] = 'partyalone':
 	
 	! Sveta is not drunk
 	if alko < 10:
+		gs 'willpower', 'drink', 'resist'
+		if will_cost <= pcs_willpwr:
+			act 'Leave (<<will_cost>> Willpower)':
+				mitkabuhday = 0
+				minut += 15
+				gs 'willpower', 'drink', 'resist'
+				gs 'willpower', 'pay', 'resist'
+				gs 'stat'
+				
+				gt 'gadroad'
+			end
+		else
+			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
 		act 'Drink with the boys':
 			*clr & cla
 			menu_off = 1
@@ -92,20 +106,6 @@ if $ARGS[0] = 'partyalone':
 
 			act 'Continue drinking':gt 'mitkabuh', 'partyalone'
 		end
-		gs 'willpower', 'drink', 'resist'
-		if will_cost <= pcs_willpwr:
-			act 'Leave (<<will_cost>> Willpower)':
-				mitkabuhday = 0
-				minut += 15
-				gs 'willpower', 'drink', 'resist'
-				gs 'willpower', 'pay', 'resist'
-				gs 'stat'
-				
-				gt 'gadroad'
-			end
-		else
-			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
 	! Sveta is drunk and already had sex with Mitka or is the village whore
 	elseif npc_QW['A63'] > 0 and gadriver_gang < 3:
 		*clr & cla
@@ -149,7 +149,7 @@ if $ARGS[0] = 'partyalone':
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/mitka.jpg"></center>'
 		*nl
-		'You are way too drunk, and can barely stand. Mitka, noticing your condition, walks over to you and laughs, "It seems, you''ve had enough for tonight. Get out of here."'
+		'You are way too drunk, and can barely stand. Mitka, noticing your condition, walks over to you and laughs, "It seems you''ve had enough for tonight. Get out of here."'
 		
 		act 'Leave': mitkabuhday = 0 & minut += 15 & gt 'gadroad'
 	end
@@ -214,18 +214,6 @@ if $ARGS[0] = 'partywithMira':
 			*nl
 			'You attempt to pass Mira a shot glass full of liquor, but she refuses. She has already had too much tonight and is happy to just chat the rest of the night.'
 			if alko < 10:
-				act 'Drink the shot yourself':
-					cla
-					minut += 30
-					npc_rel['A63'] += rand(0,1)
-					npc_rel['A62'] += rand(0,1)
-					npc_rel['A61'] += rand(0,1)
-					npc_rel['A60'] += rand(0,1)
-					gs 'drugs', 'alcohol', 'moonshine', 1
-					gs 'stat'
-					
-					act 'Continue drinking':gt 'mitkabuh','partywithMira'
-				end
 				gs 'willpower', 'drink', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Leave (<<will_cost>> Willpower)':
@@ -243,6 +231,18 @@ if $ARGS[0] = 'partywithMira':
 				else
 					act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
+				act 'Drink the shot yourself':
+					cla
+					minut += 30
+					npc_rel['A63'] += rand(0,1)
+					npc_rel['A62'] += rand(0,1)
+					npc_rel['A61'] += rand(0,1)
+					npc_rel['A60'] += rand(0,1)
+					gs 'drugs', 'alcohol', 'moonshine', 1
+					gs 'stat'
+					
+					act 'Continue drinking':gt 'mitkabuh','partywithMira'
+				end
 			else
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/girls_go.jpg"></center>'
@@ -278,6 +278,7 @@ if $ARGS[0] = 'partywithMira':
 			*nl
 			'Mira attempts to pass you another shot glass full of liquor, but you refuse. You have already had too much tonight and are happy to just chat the rest of the night.'
 			if npc_drunk['A60'] < 10:
+				act 'Leave': MiraLoc = 0 & npc_drunk['A60'] = 0 & mitkabuhmiraday = 0 & mitkabuhday = 0 & minut += 15 & gt 'gadroad'
 				gs 'willpower', 'drink', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Make Mira drink the shot instead (<<will_cost>> Willpower)':
@@ -298,7 +299,6 @@ if $ARGS[0] = 'partywithMira':
 					act 'Make Mira drink the shot instead (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				
-				act 'Leave': MiraLoc = 0 & npc_drunk['A60'] = 0 & mitkabuhmiraday = 0 & mitkabuhday = 0 & minut += 15 & gt 'gadroad'
 			else
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/village/mira/girls_go.jpg"></center>'
@@ -312,6 +312,23 @@ if $ARGS[0] = 'partywithMira':
 	else
 		! Sveta is not drunk and Mira is not drunk
 		if alko < 10 and npc_drunk['A60'] < 10:
+			gs 'willpower', 'drink', 'resist'
+			if will_cost <= pcs_willpwr:
+				act 'Leave (<<will_cost>> Willpower)':
+					MiraLoc = 0
+					npc_drunk['A60'] = 0
+					mitkabuhmiraday = 0
+					mitkabuhday = 0
+					minut += 15
+					gs 'willpower', 'drink', 'resist'
+					gs 'willpower', 'pay', 'resist'
+					gs 'stat'
+					
+					gt 'gadroad'
+				end
+			else
+				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
 			act 'Drink with Mira and the boys':
 				*clr & cla
 				menu_off = 1
@@ -325,27 +342,6 @@ if $ARGS[0] = 'partywithMira':
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drinking.jpg"></center>'
 				*nl
 				'Mitka pours some of the brew into a clear plastic shot glass and hands it over to you.'
-				act 'Drink the shot yourself':
-					cla
-					minut += 30
-					npc_rel['A63'] += rand(0,1)
-					npc_rel['A62'] += rand(0,1)
-					npc_rel['A61'] += rand(0,1)
-					npc_rel['A60'] += rand(0,1)
-					gs 'drugs', 'alcohol', 'moonshine', 1
-					gs 'stat'
-					
-					'You take the shot glass full of moonshine and quickly gulp it down, you cough and suck in your breath. Mira chats with the boys as they drink as well.'
-					'Mitka looks at you approvingly, "Good shit, right?"'
-					if mitka_first_drink = 1:
-						mitka_first_drink = 2
-						'"That was stronger than I expected!" you reply.'
-					else
-						'"Just as good as the last batch you made!" you reply.'
-					end
-					
-					act 'Continue drinking':gt 'mitkabuh','partywithMira'
-				end
 				gs 'willpower', 'drink', 'force'
 				if will_cost <= pcs_willpwr:
 					act 'Make Mira drink the shot instead (<<will_cost>> Willpower)':
@@ -367,9 +363,30 @@ if $ARGS[0] = 'partywithMira':
 				else
 					act 'Make Mira drink the shot instead (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-
-				act 'Continue drinking':gt 'mitkabuh','partywithMira'
+				act 'Drink the shot yourself':
+					cla
+					minut += 30
+					npc_rel['A63'] += rand(0,1)
+					npc_rel['A62'] += rand(0,1)
+					npc_rel['A61'] += rand(0,1)
+					npc_rel['A60'] += rand(0,1)
+					gs 'drugs', 'alcohol', 'moonshine', 1
+					gs 'stat'
+					
+					'You take the shot glass full of moonshine and quickly gulp it down, you cough and suck in your breath. Mira chats with the boys as they drink as well.'
+					'Mitka looks at you approvingly, "Good shit, right?"'
+					if mitka_first_drink = 1:
+						mitka_first_drink = 2
+						'"That was stronger than I expected!" you reply.'
+					else
+						'"Just as good as the last batch you made!" you reply.'
+					end
+					
+					act 'Continue drinking':gt 'mitkabuh','partywithMira'
+				end
 			end
+		! Sveta is not drunk
+		elseif alko < 10:
 			gs 'willpower', 'drink', 'resist'
 			if will_cost <= pcs_willpwr:
 				act 'Leave (<<will_cost>> Willpower)':
@@ -387,8 +404,6 @@ if $ARGS[0] = 'partywithMira':
 			else
 				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		! Sveta is not drunk
-		elseif alko < 10:
 			act 'Drink with the boys':
 				*clr & cla
 				menu_off = 1
@@ -414,25 +429,9 @@ if $ARGS[0] = 'partywithMira':
 
 				act 'Continue drinking':gt 'mitkabuh', 'partywithMira'
 			end
-			gs 'willpower', 'drink', 'resist'
-			if will_cost <= pcs_willpwr:
-				act 'Leave (<<will_cost>> Willpower)':
-					MiraLoc = 0
-					npc_drunk['A60'] = 0
-					mitkabuhmiraday = 0
-					mitkabuhday = 0
-					minut += 15
-					gs 'willpower', 'drink', 'resist'
-					gs 'willpower', 'pay', 'resist'
-					gs 'stat'
-					
-					gt 'gadroad'
-				end
-			else
-				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
 		! Mira is not drunk
 		elseif npc_drunk['A60'] < 10:
+			act 'Leave': MiraLoc = 0 & npc_drunk['A60'] = 0 & mitkabuhmiraday = 0 & mitkabuhday = 0 & minut += 15 & gt 'gadroad'
 			act 'Watch Mira drink with the boys':
 				*clr & cla
 				menu_off = 1
@@ -451,7 +450,6 @@ if $ARGS[0] = 'partywithMira':
 				
 				act 'Continue watching':gt 'mitkabuh','partywithMira'
 			end
-			act 'Leave': MiraLoc = 0 & npc_drunk['A60'] = 0 & mitkabuhmiraday = 0 & mitkabuhday = 0 & minut += 15 & gt 'gadroad'
 		end
 	end
 end
@@ -635,44 +633,6 @@ if $ARGS[0] = 'solo_10':
 		'He turns to his friends, "Here," pointing to a drunken Kolyamba. "Get yourself over here and have some fun with this cunt," Kolyamba stumbles forward pulling his pants down as he approaches. "We may be drunk, but we can still have fun with this whore''s pussy..."'
 		'"Well, that''s a beautiful sight," Mitka stammers smugly as he exposes you for everyone to see. "Let''s get this party started!"'
 
-		act 'Bend over':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkasexpublic.jpg"></center>'
-			*nl
-			'Kolyamba bends you over a nearby log. He places one hand on your back to steady himself while guiding his dick into your '+iif(mesec=0,'pussy','ass')+'.'
-			'All you can manage are moans as Kolyamba fucks you, but you can''t help but think to yourself that the other guys may start treating you differently after tonight.'
-			'You are both so drunk that any type of rhythm is hard to maintain. Eventually Kolyamba speeds up a little and finishes inside of your '+iif(mesec=0,'pussy','ass')+'.'
-			'He gets up and goes back to drinking with Mitka and Vasyan, leaving you naked outside. After a little while you sober up enough to get dressed and go sit back by the boys.'
-			
-			npc_rel['A63'] += 1
-			npc_rel['A61'] += 5
-			npc_QW['A63'] = 11
-			gs 'boyStat', 'A61'
-			npc_sex['A61'] += 1
-			if mesec = 0:
-				gs 'cum_call','vagina','A61',1
-				gs 'arousal', 'vaginal', 10, 'sub'
-			else
-				gs 'cum_call','anus','A61',1
-				gs 'arousal', 'anal', 10, 'sub'
-			end
-			gs 'arousal', 'end'
-			gs 'stat'
-
-			if sunWeather = 1:
-				if MiraLoc ! 5:
-					act 'Sit down outside':gt 'mitkabuh','partyalone'
-				else
-					act 'Sit down outside':gt 'mitkabuh','partywithMira'
-				end
-			else
-				if MiraLoc ! 5:
-					act 'Sit down in the trailer':gt 'mitkabuh','partyalone'
-				else
-					act 'Sit down in the trailer':gt 'mitkabuh','partywithMira'
-				end
-			end
-		end
 		act 'Protest':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/drunkgirl.jpg"></center>'
@@ -719,6 +679,44 @@ if $ARGS[0] = 'solo_10':
 				end
 			end
 		end
+		act 'Bend over':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mitka/mitkasexpublic.jpg"></center>'
+			*nl
+			'Kolyamba bends you over a nearby log. He places one hand on your back to steady himself while guiding his dick into your '+iif(mesec=0,'pussy','ass')+'.'
+			'All you can manage are moans as Kolyamba fucks you, but you can''t help but think to yourself that the other guys may start treating you differently after tonight.'
+			'You are both so drunk that any type of rhythm is hard to maintain. Eventually Kolyamba speeds up a little and finishes inside of your '+iif(mesec=0,'pussy','ass')+'.'
+			'He gets up and goes back to drinking with Mitka and Vasyan, leaving you naked outside. After a little while you sober up enough to get dressed and go sit back by the boys.'
+			
+			npc_rel['A63'] += 1
+			npc_rel['A61'] += 5
+			npc_QW['A63'] = 11
+			gs 'boyStat', 'A61'
+			npc_sex['A61'] += 1
+			if mesec = 0:
+				gs 'cum_call','vagina','A61',1
+				gs 'arousal', 'vaginal', 10, 'sub'
+			else
+				gs 'cum_call','anus','A61',1
+				gs 'arousal', 'anal', 10, 'sub'
+			end
+			gs 'arousal', 'end'
+			gs 'stat'
+
+			if sunWeather = 1:
+				if MiraLoc ! 5:
+					act 'Sit down outside':gt 'mitkabuh','partyalone'
+				else
+					act 'Sit down outside':gt 'mitkabuh','partywithMira'
+				end
+			else
+				if MiraLoc ! 5:
+					act 'Sit down in the trailer':gt 'mitkabuh','partyalone'
+				else
+					act 'Sit down in the trailer':gt 'mitkabuh','partywithMira'
+				end
+			end
+		end
 	end
 end
 

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