288 Commits ec22934151 ... 272dfe1b80

Author SHA1 Message Date
  Kevin_Smarts 272dfe1b80 [fixed] arousal from large clit was set too low for corrected scale and kicked in when only average. Now set to anything above average 2 weeks ago
  Kevin_Smarts 6caf12bf0b Merge remote-tracking branch 'Anjuna/master' 2 weeks ago
  anjuna krokus 449408bcf9 [fixed/changed] wearing "lost" clothes will still equip them. Reported by Lexandros. Clothing repair now scales with your sewing skill 2 weeks ago
  Myles Croft (Hooded Silence) ecf67b2a6d [Bug and layout fixes] More fixes and refactoring to the beta journal. Removed duplicated file. 2 weeks ago
  Kevin_Smarts 1420370e48 Merge remote-tracking branch 'Anjuna/master' 2 weeks ago
  anjuna krokus ac888bd808 [fixed] bugs reported by Myles 2 weeks ago
  Myles Croft (Hooded Silence) 064c27f6a7 [Beta Journal] General bug fixes and improvements to housing and relations tabs now featuring base layout designs. 2 weeks ago
  anjuna krokus b65be3737f Merge remote-tracking branch 'master/master' 2 weeks ago
  anjuna krokus 1d3a2196cb [fixed] empty lastname in existing save 2 weeks ago
  Kevin_Smarts 212f3ce9ce Merge remote-tracking branch 'Anjuna/master' 2 weeks ago
  Kevin_Smarts d61340eb35 Merge remote-tracking branch 'Hooded_Silence/master' 2 weeks ago
  anjuna krokus f53f97689b [fixed] npcstatic calls before last name was set lead to empty last names for family. Reported by Myles 2 weeks ago
  anjuna krokus 27f52e9167 [fixed] typo in body_structure was preventing the body images from working 2 weeks ago
  Myles Croft (Hooded Silence) 529ff92ede [Beta Journal commits] initialisation of new sections, refactoring and bug fixes. Navigation should now work properly, and new test layout for information applied to Home section for sg start / parents. 2 weeks ago
  Awesome 6704a728dc [Fixed] NPC's using `Sveta` instead of the assigned nickname 2 weeks ago
  Myles Croft (Hooded Silence) 2fd53b7e0e [Beta Journal] updated beta journal improvements - use gs 'beta_journal', 'init' to preview at your own risk. Note: Most Journal content has not been migrated and this remains proof of concept work. 2 weeks ago
  Myles Croft (Hooded Silence) 7e7f60b28b [Bug & Typo fixes] General corrections to fix bugs and text passages. 2 weeks ago
  anjuna krokus 651a6d9736 [fixed] temp_clo_suffix array wasn't properly killvarred. Resulting in remaining text after getting naked. Reported by Dibutello 2 weeks ago
  anjuna krokus 674db27fd8 [fixed] cleanup of variables in shortgs 2 weeks ago
  anjuna krokus f71f32bcb6 [fixed] forgotten husband line 2 weeks ago
  anjuna krokus 0cbea1a8a8 [changed] time and daystage management done in time instead of daystage 2 weeks ago
  anjuna krokus 8943e90636 Merge branch 'AdvancedCustomSets' 2 weeks ago
  anjuna krokus 5ed32775aa Merge branch 'CourtOverhaul' 2 weeks ago
  anjuna krokus 096b7b3e8b [added/changed] Added the option to call cum_cleanup directly with the location to clean. Some small layout changes 2 weeks ago
  anjuna krokus 953e305888 [changed] minor layout change 2 weeks ago
  anjuna krokus 44a98515d5 [changed] ATM money withdraw function split off into bank 2 weeks ago
  anjuna krokus 0c9c264fcc [added] start of the pregnancy sets 2 weeks ago
  Kevin_Smarts 40daa08a40 Merge remote-tracking branch 'Anjuna/master' 2 weeks ago
  Kevin_Smarts b0c32e9f2e [added] custom clothing start from Lokplart 2 weeks ago
  anjuna krokus e695fac6a0 [fixed] preparation to enable custom pregnancy images 3 weeks ago
  anjuna krokus e70e5bc956 [changed] propagating the pregnancy changes 3 weeks ago
  anjuna krokus ff4011e68c [added] Court events 3 weeks ago
  anjuna krokus e8479dda51 [fixed?] Some Miroslava guest issues. 3 weeks ago
  anjuna krokus 0ace8fed34 [changed] body structure class now also includes pregnancy state 3 weeks ago
  anjuna krokus 71e65e4694 [Added] Advanced custom body images 3 weeks ago
  bgkjdgbizgblzdgbr 85d0cfb608 [fixed/changed] You now actaully use you lube for anal mastrubation if it is set to autolube anal and only if autolube is set to anal (and you have some lube) 3 weeks ago
  Insomniac 151968f70e fix: stop repeatedly asking for condoms 3 weeks ago
  Insomniac e564a6cbb2 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 3 weeks ago
  Kevin_Smarts 6f71ceeb2e Merge remote-tracking branch 'Awesome/master' 3 weeks ago
  Kevin_Smarts 948ab5b057 Merge remote-tracking branch 'Anjuna/master' 3 weeks ago
  Kevin_Smarts 536c839b5b [fixed] Files not updated to use the combined calculations for pain that is needed for setting stretching based reactions 3 weeks ago
  Awesome 594806a71f [Fixed]Missing option to eat biscuits 3 weeks ago
  Awesome 8078f567c5 [Fixed] Missing image 3 weeks ago
  anjuna krokus 87683ca35a [fixed] typos in the grandma and grandad schedules. Reported by Dibutello 3 weeks ago
  anjuna krokus d5ddf51452 [fixed] Mira not showing up in the meadow when she should 3 weeks ago
  anjuna krokus 0ebfa5ac13 [fixed] Typos. Reported by Dibutello 3 weeks ago
  Kevin_Smarts fb00cfc849 [fixed] Wrong variable value so grandpa location info was incorrect. His actual schedule not affected. 3 weeks ago
  Kevin_Smarts 81760e1577 [added] Changelog update for bug fix release 3 weeks ago
  Kevin_Smarts 7331f68361 [Change] update ready for release 3 weeks ago
  Kevin_Smarts 6841a9ffee [fixed] Clit size growth was unlimited and potentially could get silly 3 weeks ago
  Kevin_Smarts 46923ff92f [fixed] I forgot to do the descriptions for clit sizes 3 weeks ago
  bgkjdgbizgblzdgbr b714473280 [fixed] The autolube call would overwrite the variables set by the original arousal call, thereby preventing virginity loss and other things 3 weeks ago
  anjuna krokus fc1830e3fc [fixed] `> =` should be `>=`. Reported by Skylah 3 weeks ago
  anjuna krokus 4dcda88b43 Merge remote-tracking branch 'master/master' 3 weeks ago
  Kevin_Smarts f5ad79b093 [fixed] As BG just told me, should use hotcat for last fix 3 weeks ago
  Kevin_Smarts 8e7d63fada [fixed] Appearance check for park sugar daddy was using old scale and therefore set far too low 3 weeks ago
  anjuna krokus 912f03c292 [changed] spaces to tabs 3 weeks ago
  anjuna krokus 63d703c4d4 [fixed] Pharmacy opening after the fertility trial, even though it does not add something to it. 3 weeks ago
  anjuna krokus 0accd79478 Merge remote-tracking branch 'master/master' 3 weeks ago
  anjuna krokus ca2821ef62 [fixed] metered calls and sms not working as intended. You either need a subscription, or top up your mintues before you can call or sms. (You can still respond if somebody else texts you). 3 weeks ago
  Kevin_Smarts 2d28cf5864 Merge remote-tracking branch 'Anjuna/master' 3 weeks ago
  Kevin_Smarts 2f73cf215e Merge remote-tracking branch 'Awesome/master' 3 weeks ago
  Kevin_Smarts aad7df0e06 [fixed] Clit size descriptions went from from small to large with no medium, added that and moved sizes up to remove and replace the penis like size. 3 weeks ago
  anjuna krokus 68ad4e3a49 [fixed] brushing hair through bag does not take any time. Reported by Dibutello 3 weeks ago
  anjuna krokus f3d896db93 [fixed] issues with variable setting and escaping through menus 3 weeks ago
  anjuna krokus 7f28293df0 [fixed] Playing football with brother did not reward XP properly. Reported by Dibutello 3 weeks ago
  anjuna krokus 3a62df21f5 [fixed] Double header for dancing. Reported by Dibutello 3 weeks ago
  anjuna krokus 1ff12eff74 [fixed] changed the wrong thing. woops 3 weeks ago
  anjuna krokus 0ce4658991 [fixed] Using wrong functionname. Reported by Dadburry 3 weeks ago
  Awesome 206e1d9a72 [Fixed] Old variable used 3 weeks ago
  anjuna krokus 05803fd018 [fixed] Infinite money glitch through Vladimir. Reported by Megapterygius and Dibutello. 3 weeks ago
  Awesome d9873f49b6 [Fixed] Missing `cla` 3 weeks ago
  Awesome 13e7c80beb Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 weeks ago
  Awesome 82e7ce572f [Fixed] missing `cla` 3 weeks ago
  Kevin_Smarts ace74b2515 Merge remote-tracking branch 'Awesome/master' 3 weeks ago
  Kevin_Smarts 7b9d6e5819 [fixed] Changing rooms were not removing and re-adding shoes when Sveta changed in to swimwear and Pav pool was removing them but not putting them back. Process now in changing room where it should have been 3 weeks ago
  Awesome 19ec8288c6 [Fixed] Wrong condom variable used in sex_ev and other fixes 3 weeks ago
  Kevin_Smarts 5a76ad8fbd Merge remote-tracking branch 'Anjuna/master' 3 weeks ago
  anjuna krokus 4558e758f8 [fixed[ uninitialized cart items would lead to a crash 4 weeks ago
  Awesome 49ec61739b [Fixed] Text inconsistency 4 weeks ago
  Awesome 4925733eb4 [Fixed] Talking to Igor about his sisters clothes - blank screen without exit 4 weeks ago
  Awesome 21ace9fece [Fixed] Cheatmenu - Set stage of menstrual cycle dead end 4 weeks ago
  Awesome aaa0fde43a [Fixed] Vicky workout loop 4 weeks ago
  Awesome ecf307ddf3 [Fixed] Unnecessary step 4 weeks ago
  Awesome e8c279a0ad [fixed] Action available to "Let the cum drain from your pussy" with none inside 4 weeks ago
  Vengeance_11 57a9d11c39 Reverted name of strip club back to previous one 1 month ago
  anjuna krokus 39f92d1a73 [fixed] clothing type showing up twice in the tool tips. Reported by Selen99 1 month ago
  Kevin_Smarts ea3e29cca5 [fixed] Wrong thinness value, spotted by bg 1 month ago
  Kevin_Smarts 076179a709 Merge branch 'master' of pikdum/glife into master 1 month ago
  pikdum 25deece728 fix: filename case sensitivity 1 month ago
  anjuna krokus 3ad2b0cecb [fixed] typos in makupskl. Reported by Dadburry 1 month ago
  Kevin_Smarts 027b64d403 Merge remote-tracking branch 'Awesome/master' 1 month ago
  Awesome eb99d4c773 [Fixed] typo in willpower call 1 month ago
  Awesome 93fc89b731 Therapist reminder whitescreen 1 month ago
  Awesome 3dabd739a7 [Fixed] loop at pav_parkev, 'gopniks' 1 month ago
  Awesome 2349af886c [Fixed] game breaking typo 1 month ago
  anjuna krokus bc5a90e6ff Merge remote-tracking branch 'master/master' 1 month ago
  anjuna krokus ffa463a98a [fixed] Goth makeup giving an extreme appearance punishment. Reported by dragoonknight122199 1 month ago
  Vengeance_11 714cd89bda New image paths for strip club 1 month ago
  anjuna krokus 3b4152e4e1 [fixed] sex_ev pube discussion event referenced old variables. Reported by Lexandros 1 month ago
  Insomniac 0be43c6b68 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 1 month ago
  Kevin_Smarts 3c450d4277 Merge remote-tracking branch 'Awesome/master' 1 month ago
  Awesome 2d9ecdafe7 [Fixed] Parser not compatible with UTF-8 txt file 1 month ago
  anjuna krokus 2318fd9ffb [fixed] temporary fix for the preview images not showing correctly. Reported by Dibutello. 1 month ago
  anjuna krokus c1f8184496 [fixed] First bar event kept looping. Reported by Skylah 1 month ago
  anjuna krokus 3a5d57da16 [changed] small clarification on how much time you have. Requested by BBZ01 1 month ago
  Kevin_Smarts 9a0823a552 Merge remote-tracking branch 'Anjuna/master' 1 month ago
  anjuna krokus 89188dbb7f [fixed] proper way to set time in stwork3. Reported by Skylah 1 month ago
  anjuna krokus 463cbfaffb [fixed] Using the schedule would removes the act. Reported by jonnie. Small layout changes, and removed an unneeded willpower payment 1 month ago
  LinaHirata 5c351dd315 [fixed] missing `$shave_act` in one of `tg` specific shaving branches 1 month ago
  anjuna krokus fbae08ee64 Merge remote-tracking branch 'master/master' 1 month ago
  anjuna krokus 349087e7d8 [fixed] typos. Reported by Dibutello 1 month ago
  Kevin_Smarts b6656d9a05 [fixed] bad link fix from fisk 1 month ago
  Kevin_Smarts a9163b274f [fixed] Was using the same image link from previous event and not the correct one for this event 1 month ago
  Kevin_Smarts fc83892a7e [fixed] That should have been 600 not 60. Oops 1 month ago
  Kevin_Smarts 83c75332eb [changed] Requirement for Natalya event at Mon Cheri was too low as pointed out by Dibutello 1 month ago
  anjuna krokus a768a05e40 [fixed] $npcID and $telsob not properly set when going to a date through a phonecall. Reported by Jeep91 1 month ago
  Kevin_Smarts b1d6156603 [fixed] Grandparents banya was not handling clothing removal in same manner as swimming and a variable was set incorrectly. Now uses swimming system from changing room so it should be more reliable. 1 month ago
  Kevin_Smarts b46643cd1b Merge remote-tracking branch 'Anjuna/master' 1 month ago
  Kevin_Smarts 3819216ba3 Merge remote-tracking branch 'Awesome/master' 1 month ago
  Kevin_Smarts a8321cb011 Merge remote-tracking branch 'Hooded_Silence/master' 1 month ago
  anjuna krokus a4ea1ec0a2 [fixed] Typo in shoplifting. Reported by Dibutello 1 month ago
  Awesome 558fe63d9f [Fixed] Wrong image links and last batch of duplicated images 1 month ago
  anjuna krokus 38f9094991 [fixed] sleeping with vib and plug. Reported by Skruben 1 month ago
  Awesome c023b15f0d [Changed] another round of duplicate images 1 month ago
  Myles Croft (Hooded Silence) 6e16c94221 [Bug Fixes] Fixed image paths and disabled second letter until code is plumbed in for exam results. 1 month ago
  Kevin_Smarts ae4ca8c66a Merge remote-tracking branch 'Anjuna/master' 1 month ago
  anjuna krokus 5707f1946a [fixed] temp fix for the haircolor change event 1 month ago
  Awesome 9ae1adb400 [changed] even more duplicate images 1 month ago
  Awesome 6f54256c73 [changed] more duplicate images 1 month ago
  Awesome 267537c77b [Changed] Replaced some duplicated images 1 month ago
  anjuna krokus df452a7c74 [fixed] dumping lovers now actually sets them as anonymous, removing them from the contact list. Expanded the marry and divorce lover options to also work for wifes (not active) and made the remove all function work with it too. 1 month ago
  Kevin_Smarts c2c9fd8eb7 Merge remote-tracking branch 'Anjuna/master' 1 month ago
  anjuna krokus 3828d09494 Merge remote-tracking branch 'master/master' 1 month ago
  Awesome 08d2318b2f [Fixed] Infinite loop causing crash in therapist event 1 month ago
  Kevin_Smarts d96fbcde40 [fixed] Typo resulting in just one purse in Coco 1 month ago
  anjuna krokus 06aa01e544 [fixed] drinking tea sends you back in time. Reported by Chimrod 1 month ago
  anjuna krokus 083d8bd0f6 [fixed] stat_display not updated during sleep. Reported by BBZ 1 month ago
  anjuna krokus 81a13e10ed [fixed] Wrong image displayed in piercing management. Table layout fixed. Reported by Skylah 1 month ago
  anjuna krokus 4059f553a5 [fixed] ex-lovers showing up in the relationship table 1 month ago
  Vengeance_11 01a1c2b337 Fixed duplicated text 1 month ago
  Kevin_Smarts 863f9ecbb3 Merge remote-tracking branch 'Anjuna/master' 1 month ago
  anjuna krokus 9d460a78a5 [fixed] blank screen. Reported by Dibutello 1 month ago
  anjuna krokus 63dde2929b Merge remote-tracking branch 'master/master' 1 month ago
  bgkjdgbizgblzdgbr 94f93a8e50 [fixed] I can't write code 1 month ago
  bgkjdgbizgblzdgbr a5300aedc5 [fixed] This time the bug should be fixed. 1 month ago
  Awesome f27a89da86 [Fixed] Missing `,` 1 month ago
  anjuna krokus f69264cada Merge remote-tracking branch 'master/master' 1 month ago
  anjuna krokus 6b1a136242 [fixed] images pointed to the wrong folders 1 month ago
  Kevin_Smarts 78e1d9db49 Merge remote-tracking branch 'Anjuna/master' 1 month ago
  anjuna krokus fa0dfec62f [fixed] Schoolgirl image in city start, intro music would not stop playing. Reported by Cleverly Blonde 1 month ago
  anjuna krokus ca0fdf6b85 [fixed] appearance check should be a hotcat check. 1 month ago
  anjuna krokus 117ce7ab45 [fixed] no return act in event1. Reported by Sepis 1 month ago
  Awesome c0b4dfea8e [text edit] spelling fixes 1 month ago
  Awesome 538fbb73a8 [Text edits] various text fixes 1 month ago
  Kevin_Smarts 8d7fb9ebe5 Merge branch 'master' of https://git.tfgames.site/anjuna/Girl-Life-Anjuna 1 month ago
  Kevin_Smarts 6a5f4ac732 Merge remote-tracking branch 'Anjuna/master' 1 month ago
  Kevin_Smarts e7129edf9a Merge remote-tracking branch 'Awesome/master' 1 month ago
  anjuna krokus 40705672b2 [fixed] gamebreaking bug in atm deposits. Reported by Big Al 1 month ago
  anjuna krokus dedc8f5ff0 [fixed] D&D invite not properly switching when starting the uni year 1 month ago
  Kevin_Smarts 504bd3e7bb [changed/removed] Version number updated for release and cleared very old save updater stuff 1 month ago
  Kevin_Smarts 5f9ebc9af4 Merge branch 'master' of https://git.tfgames.site/anjuna/Girl-Life-Anjuna 1 month ago
  Kevin_Smarts 8e58479941 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  Awesome 37049aa65b Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  anjuna krokus 703412b7ea Merge remote-tracking branch 'master/master' 1 month ago
  anjuna krokus ad1a8e5502 [fixed] wrong wait icon name. Caught by BGK. 1 month ago
  Vengeance_11 6d82088a03 Fixed typos 1 month ago
  Vengeance_11 0e9dfd245b Text edits 1 month ago
  Kevin_Smarts 4561b9c4de Merge remote-tracking branch 'Awesome/master' 1 month ago
  bgkjdgbizgblzdgbr 5ed02456da [fixed] Wrong tuning inequality sign mede guy be less likely to hit on hot Katja and Svat and not the other way around 1 month ago
  bgkjdgbizgblzdgbr 253f52ee91 [fiexd] Not setting the proper indoor code for the nightclub when entering with Katja 1 month ago
  bgkjdgbizgblzdgbr 09a083983f Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  bgkjdgbizgblzdgbr 3229253abd [fixed] Missing *clr & cla 1 month ago
  Insomniac 7a6491d3f9 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 1 month ago
  Kevin_Smarts 5e06771cb7 [added] All tyhe things anjuna did that I missed on changelog and a couple for Myles and Awesome 1 month ago
  Awesome efc90c1853 [Text edits] Spelling fixes 1 month ago
  Kevin_Smarts 36b64bb660 Merge remote-tracking branch 'Anjuna/master' 1 month ago
  Kevin_Smarts 3efc7675a5 [changed] Change log updated for 0.9.4 1 month ago
  anjuna krokus d167532385 [fixed/changed] small layout change + added a neutral walk event for the winter night pav park strolls 1 month ago
  anjuna krokus 8cba8063d0 [changed] layout update in placer_man looking for a bug. Bug was probably already fixed... 1 month ago
  anjuna krokus 7bf1c4609b [fixed] typo. Reported by Dibutello 1 month ago
  Kevin_Smarts c2ed229791 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  bgkjdgbizgblzdgbr 0f09752839 [changed] Lowered the lewels for joing the volleyball team to better match the rebalanced exp levels 1 month ago
  anjuna krokus 4f1daf6f7f [changed] temporarily disabled the familiar dancer event, because it's mega broken. Reported by Dibutello 1 month ago
  anjuna krokus d9859ae06f [fixed] Stopped all music at the end of all introductions 1 month ago
  Awesome 18e86a7719 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  Awesome c3b53655fa less cluttered build script 1 month ago
  bgkjdgbizgblzdgbr cc454bf423 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  bgkjdgbizgblzdgbr b88e84b211 [changed] Lowered the threshold for earning points with the cool kids for dancing at the disco, and increased the cool kids starts dancing skill. 1 month ago
  Kevin_Smarts 035e5a324a Merge remote-tracking branch 'Awesome/master' 1 month ago
  Awesome d437f8f0ab [Fixed] Various bug fixes 1 month ago
  Awesome 59f99343e5 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  anjuna krokus 8bd1d8d2de [fixed] more typos fixed. Reported by crimsonnoodle 1 month ago
  Awesome d063b6061c [Added] New build script 1 month ago
  anjuna krokus 6b50154493 [fixed] spelling mistake in piercing`s`_lot. Reported by crimsonnoodle 1 month ago
  bgkjdgbizgblzdgbr 141f6995dd [fixed] I'm just to stupid to copy paste correctle. Spotted by Dibutello 1 month ago
  anjuna krokus 3deac215df [fixed] visting dimka now resets his "blackmail" counter so he only actually blackmails you if you haven't shown up 7-10 days in a row 1 month ago
  anjuna krokus ce3f700a10 [fixed] visual bug. Reported by Dibutello 1 month ago
  Kevin_Smarts ae60884d1a Merge remote-tracking branch 'Hornguy6/master' 1 month ago
  Insomniac 004e5dc4c4 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 1 month ago
  hornguy6 9bb44a780c [fixed] wrong variable 1 month ago
  hornguy6 6d1ca99c2c [fixed] get football exp from playing with Kolka 1 month ago
  anjuna krokus 27f2b8ba31 [fixed] "Nothing to read" text showing up, even if you did have something to read, loaned books not working outside fantasy novels, and some copy paste errors. Reported by Dibutello 1 month ago
  anjuna krokus 3dae387fcf [fixed] small LOCA layout change. Fixed missing acts, blank screens, and unable to strip dance in the stripclub. Reported by Sospice, RookS409, and Skylah 1 month ago
  bgkjdgbizgblzdgbr 8d70f8cd8c [fixed/changed] Added the check for not having repeat event for the non nude version of meeting Ivan and Fedor at the naked beach. 1 month ago
  Kevin_Smarts 786b4a2c84 Merge remote-tracking branch 'Hornguy6/master' 1 month ago
  hornguy6 c9454415f7 [fixed] messed up some formatting things and 'if' requirements in my last push 1 month ago
  anjuna krokus 4b93846a76 [fixed] wrong `gt` lead to a blank screen 1 month ago
  anjuna krokus 8b19c3b276 [fixed] added safeguards and additional comment 1 month ago
  anjuna krokus 836b1003d6 [fixed] variable type was wrong 1 month ago
  anjuna krokus 5dc8188cfe [fixed] replacement error. Reported by Sepis 1 month ago
  anjuna krokus 327617fd9f [fixed] added some more placeholders in case a fuckbuddy knows that sveta is a virgin 1 month ago
  anjuna krokus d122478524 [fixed] stop sugar_daddies from living in the residential area 1 month ago
  hornguy6 bf46b32167 [fixed] being on your period without sanitary products will no longer force players to dispose of their underwear in the middle of the street 1 month ago
  hornguy6 a000601555 [fixed] updated old NPC relationship modification to the new system 1 month ago
  hornguy6 2f40594eb0 [fixed] lack of requirements that could cause blank screen 1 month ago
  anjuna krokus 638d14606e [fixed] copy paste errors. Reported by Sepis 1 month ago
  hornguy6 80a01f8263 [fixed] didn't leave an else option resulting in blank screen 1 month ago
  Kevin_Smarts 95d78641a8 Merge remote-tracking branch 'Anjuna/master' 1 month ago
  anjuna krokus be41adc82d [fixed] body images not showing up correctly. Reported by Skylah 1 month ago
  anjuna krokus a772815d3d [fixed] grandma chickens chore was broken. Reported by T7792 1 month ago
  anjuna krokus bd9d56af19 [fixed] forgot to push last grandfather chore fix. Reminded by T7792 1 month ago
  Awesome e8e74cffb8 [Text edit] Some spelling fixes reported by Dibutello and retlifeforme 1 month ago
  Awesome eceaa63fca [Fixed] forgotten `s` and moved $backimage after stat call 1 month ago
  Awesome d1293c2102 [Fixed] readded change, that was lost during conflict 1 month ago
  Kevin_Smarts a255d91001 Merge remote-tracking branch 'Anjuna/master' 1 month ago
  Kevin_Smarts 045dbde299 Merge remote-tracking branch 'Hornguy6/master' 1 month ago
  Kevin_Smarts ac5afa8199 Merge remote-tracking branch 'Awesome/master' 1 month ago
  anjuna krokus 2a3dabb668 [fixed] dead-end 1 month ago
  anjuna krokus b404057036 [fixed] metro drug-dealer unlocking, even if you ignored him 1 month ago
  anjuna krokus a80384d804 [fixed] You get paid weekly, not monthly 1 month ago
  anjuna krokus a2d087472e [fixed] newspaper is "weekly" not daily 1 month ago
  anjuna krokus 99d2bd05ba [fixed] raining inside the mercy clinic 1 month ago
  hornguy6 2e91871b3c [fixed] hopefully prevented some contradictory reactions and blank screens 1 month ago
  anjuna krokus 7782f15aec [fixed] kit_din return locations weren't working 1 month ago
  hornguy6 841300a6c7 [changed] it should not take 5 minutes to enter a building 1 month ago
  anjuna krokus c0f7d5f7e4 [fixed] tips should not stack nor overwrite 1 month ago
  anjuna krokus d7c3c5a5f4 [fixed] working at the bar in the strip club now actually pays you 125 rubles per hour for the shifts you pull 1 month ago
  anjuna krokus 215df577e4 [fixed] Return to grandparents links were broken. Reported by T7792 1 month ago
  anjuna krokus cdc4295798 [fixed] The `enumerate_list` function was broken. 1 month ago
  anjuna krokus 0cbaabacf6 [fixed] Forgot to have the `draw_random_from` function in `lover` have an `all` option 1 month ago
  anjuna krokus 498d4324c9 Merge remote-tracking branch 'master/master' 1 month ago
  rachels 11bc1d334b [fixed] typos 1 month ago
  anjuna krokus 4d219aa70f [changed] added layout line at the end 1 month ago
  anjuna krokus e43680bdac [fixed] += 2 should have been += 1. Luckily Rachels caught it :) 1 month ago
  anjuna krokus 65ed3fc0d6 Merge remote-tracking branch 'master/master' 1 month ago
  rachels 981a72a8f2 [fixed] compatibility with Analyzer 1 month ago
  rachels dfad59a386 [fixed] typos 1 month ago
  anjuna krokus 1e1270c145 [fixed] Prevented lovers being added to the lover array more than once. Reported by Honey 1 month ago
  anjuna krokus b364ca6a12 [fixed] `kit_din` wasn't always properly initialized at the grandparents. This should fix that 1 month ago
  anjuna krokus df3da4b4a2 [fixed] Long issue where Silavag and npc_sexskill were equated to eachother, even though they're not technically the same. npcStat now makes the correct transloation of `silavag = npc_sexskill / 50`. Solved by the amazing BGK 1 month ago
  Awesome 6fb783c137 [Fixed] Missing cum_call 1 month ago
  Kevin_Smarts a425c1acfb Merge remote-tracking branch 'Anjuna/master' 1 month ago
  anjuna krokus 47ac938918 [fixed] npcStat naming issues for D0-D7 as pointed out by BGK 1 month ago
  anjuna krokus 47f467ef91 Merge remote-tracking branch 'master/master' 1 month ago
  Awesome 1067ac66ef [Fixed] Schoolgirl TG defaulting to wrong birthyear also changed the date format to DD/MM/YYYY 1 month ago
  Awesome 2dc91818db Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  Vengeance_11 e4dabcb9da Fixes and tweaks to the strip club/Journal updated with new variables 1 month ago
  Awesome dfbb737018 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 month ago
  Awesome 4bc227d234 [Fixed] Missing `$` 1 month ago
  anjuna krokus 6c13437543 [fixed] incoming calls not showing up on the additional desc window 1 month ago
  anjuna krokus e674a5018d [fixed] couple of forgotten edits 1 month ago
  Kevin_Smarts cebf87086a Merge remote-tracking branch 'Awesome/master' 1 month ago
  Awesome f8fd6226aa [Fixed] Missing Willpower reduction 1 month ago
  Insomniac 37f90596a3 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 1 month ago
  anjuna krokus e5509bc22c [fixed] stripclub checked the outdated hotcat variable. Found by Arairon 1 month ago
  Insomniac 01bd2cf8d8 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 2 months ago
  Insomniac 99204cd633 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 2 months ago
  Insomniac 925f013aeb Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 2 months ago
  Insomniac 3ef16e8998 Merge branch 'master' of https://git.tfgames.site/Insomniac/glife into test 2 months ago
  Insomniac e69941d363 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 2 months ago
  Insomniac 62125db2b7 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 2 months ago
  Insomniac efe643fff1 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 2 months ago
  Insomniac 13419cf829 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 2 months ago
  Insomniac 0c26adddf0 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 3 months ago
  Insomniac 1cb29f7adb Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 3 months ago
  Insomniac d90d056559 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 4 months ago
  Insomniac 6932313402 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 4 months ago
  Insomniac 07d53ce79f Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 4 months ago
  Insomniac 76c330d52c Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 5 months ago
  Insomniac abba173fd5 Line endings 5 months ago
  Insomniac 21169ae3f5 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 5 months ago
  Insomniac 4bc5581202 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into test 5 months ago
  Insomniac 467346c49a Add rel check for creampie reaction 5 months ago
  Insomniac c93fe36b6d Merge branch 'master' of https://git.tfgames.site/Insomniac/glife into test 6 months ago
  Insomniac dbb3cac740 Merge branch 'master' of https://git.tfgames.site/Insomniac/glife into test 6 months ago
  Insomniac 5e85abfb36 Testing - newline 8 months ago
  Insomniac 753bef1083 Testing - newline 8 months ago
100 changed files with 6512 additions and 3105 deletions
  1. 98 5
      MakeQSP.bat
  2. 13 0
      build.sh
  3. 3 3
      locations/AppearanceSystem.qsrc
  4. 3 3
      locations/BurgerTip.qsrc
  5. 11 416
      locations/Cheatmenu_din.qsrc
  6. 2 0
      locations/Cum_Manage.qsrc
  7. 265 265
      locations/FedorEv3.qsrc
  8. 2 2
      locations/FedorEv4_sex.qsrc
  9. 11 11
      locations/Gnpc2.qsrc
  10. 1 1
      locations/JuliaMilHome.qsrc
  11. 3 3
      locations/Komp.qsrc
  12. 13 18
      locations/LOCA.qsrc
  13. 1 1
      locations/LariskaSex.qsrc
  14. 7 7
      locations/MagEncounterFairy.qsrc
  15. 130 130
      locations/MartinTalk.qsrc
  16. 224 224
      locations/MeynoldHome.qsrc
  17. 197 197
      locations/NikoDreams.qsrc
  18. 296 296
      locations/NikoMeyHome.qsrc
  19. 19 19
      locations/Serge_Shulgin.qsrc
  20. 4 4
      locations/Serge_kuh.qsrc
  21. 1 1
      locations/StasSex.qsrc
  22. 2 2
      locations/VolleyTrenerSpeak.qsrc
  23. 4 4
      locations/Voltrener.qsrc
  24. 4 4
      locations/Zvereva_Sly_events.qsrc
  25. 1 1
      locations/Zvereva_house_events.qsrc
  26. 1 1
      locations/_attributes_coco_outfits.qsrc
  27. 1 1
      locations/albina_chat.qsrc
  28. 79 79
      locations/albina_house_events.qsrc
  29. 40 40
      locations/albina_mother_events.qsrc
  30. 1 2
      locations/albina_sex_chat.qsrc
  31. 11 11
      locations/albina_sex_scenes.qsrc
  32. 2 0
      locations/albina_starlets_sex.qsrc
  33. 2 0
      locations/albinahome.qsrc
  34. 1 1
      locations/alexandriaChat.qsrc
  35. 38 7
      locations/arousal.qsrc
  36. 7 7
      locations/artem_date_events.qsrc
  37. 28 28
      locations/artem_nush_sex.qsrc
  38. 29 29
      locations/artem_nush_sex_uni.qsrc
  39. 1 1
      locations/artemhome.qsrc
  40. 33 33
      locations/auditions.qsrc
  41. 11 11
      locations/autotraidF.qsrc
  42. 31 6
      locations/bank.qsrc
  43. 12 12
      locations/bdsm_training.qsrc
  44. 2 0
      locations/bed_events.qsrc
  45. 2 1
      locations/bed_get_out.qsrc
  46. 3 0
      locations/bed_get_out_events.qsrc
  47. 24 24
      locations/belpicknick.qsrc
  48. 217 0
      locations/beta_journal.qsrc
  49. 12 0
      locations/beta_journal_education.qsrc
  50. 41 0
      locations/beta_journal_geography.qsrc
  51. 10 0
      locations/beta_journal_glossary.qsrc
  52. 67 0
      locations/beta_journal_home.qsrc
  53. 15 0
      locations/beta_journal_magic.qsrc
  54. 10 0
      locations/beta_journal_notifications.qsrc
  55. 16 297
      locations/beta_journal_quests.qsrc
  56. 493 0
      locations/beta_journal_relationships.qsrc
  57. 139 0
      locations/beta_journal_work.qsrc
  58. 2 2
      locations/blackmailer.qsrc
  59. 3 0
      locations/body.qsrc
  60. 10 10
      locations/body_desc.qsrc
  61. 325 144
      locations/body_structure.qsrc
  62. 5 3
      locations/booty_call_sms.qsrc
  63. 12 11
      locations/brother.qsrc
  64. 34 34
      locations/brother2.qsrc
  65. 2 2
      locations/brother_lessons.qsrc
  66. 20 19
      locations/brother_voyeur.qsrc
  67. 19 16
      locations/buklinik.qsrc
  68. 337 321
      locations/buklinik_event.qsrc
  69. 3 3
      locations/burger.qsrc
  70. 15 12
      locations/carF.qsrc
  71. 8 0
      locations/changingroom.qsrc
  72. 1541 0
      locations/cheatmenu_bisets.qsrc
  73. 10 10
      locations/chessplay.qsrc
  74. 1 0
      locations/cikl.qsrc
  75. 0 49
      locations/city_canal.qsrc
  76. 46 3
      locations/city_canals.qsrc
  77. 2 3
      locations/city_commcenter.qsrc
  78. 2 2
      locations/city_experimental_trials_events.qsrc
  79. 21 21
      locations/city_experimental_trials_pharmacy.qsrc
  80. 1 0
      locations/city_house_res_kitch.qsrc
  81. 3 3
      locations/city_jorahouse.qsrc
  82. 1 1
      locations/city_mansion_residence_1.qsrc
  83. 1 1
      locations/city_park.qsrc
  84. 2 2
      locations/city_redlight.qsrc
  85. 1 3
      locations/clinic_functions.qsrc
  86. 7 3
      locations/clothing.qsrc
  87. 1 1
      locations/costuming.qsrc
  88. 590 0
      locations/court_arrest_events.qsrc
  89. 30 0
      locations/court_functions.qsrc
  90. 500 0
      locations/court_sentence_events.qsrc
  91. 2 2
      locations/courtletter.qsrc
  92. 71 71
      locations/cum_cleanup.qsrc
  93. 1 0
      locations/dachain.qsrc
  94. 1 0
      locations/dimaEv.qsrc
  95. 1 1
      locations/dimaRevenge.qsrc
  96. 12 4
      locations/dinSex.qsrc
  97. 87 49
      locations/dinSex2.qsrc
  98. 7 5
      locations/din_bad.qsrc
  99. 76 81
      locations/din_van.qsrc
  100. 5 5
      locations/dinfather.qsrc

+ 98 - 5
MakeQSP.bat

@@ -1,4 +1,5 @@
 @ECHO off
+setlocal
 
 :: Set batch file path
 set BATDir=%~dp0
@@ -98,31 +99,53 @@ goto menu
 echo.
 echo Building ...
 
+:: Start timer
+set start=%time%
+
 @ECHO ON
-python tools\txtmerge.py locations glife.txt
-tools\txt2gam.exe glife.txt %QSPFILE% > nul
+tools\Textmerge.exe locations glife.txt glife.qproj
+
+tools\cli-win.exe glife.txt
+
 @ECHO OFF
 
+
 echo.
 if defined CP_TO ( echo Copying %QSPFILE% to "%CP_TO%" ... & copy %QSPFILE% %CP_TO% > nul )
 
+:: End timer
+set end=%time%
+
+call :elapsedtime
 echo.
 echo Done.
 pause
+
+
 if %action% == f ( goto run ) else ( goto menu )
 
+
 :build_debug
+
+:: Start timer
+set start=%time%
+
 echo.
 echo Building DEBUG ...
 
 @ECHO ON
 python tools\build_debug.py locations glife.txt
-tools\txt2gam.exe glife.txt %QSPFILE% > nul
+tools\cli-win.exe glife.txt
 @ECHO OFF
 
 echo.
 if defined CP_TO ( echo Copying %QSPFILE% to "%CP_TO%" ... & copy %QSPFILE% %CP_TO% > nul )
 
+:: End timer
+set end=%time%
+
+call :elapsedtime
+
 echo.
 echo Done.
 pause
@@ -136,12 +159,23 @@ pause
 goto menu
 
 :parser
+
+:: Start timer
+set start=%time%
+
 echo.
-echo validating...
+echo Validating ...
+python tools\txtmerge.py locations glife.txt
 
 @ECHO ON
-"%BATDir%%QSPParser%" --level warn "%BATDir%glife.txt" > "%BATDir%validation.log"
+"%QSPParser%" --level warn "%BATDir%glife.txt" > "%BATDir%validation.log"
 @ECHO off
+
+:: End timer
+set end=%time%
+
+call :elapsedtime
+
 pause
 goto menu
 
@@ -152,6 +186,65 @@ echo Running ...
 if defined CP_TO ( start "%BATDir%%QSPGUI%" %CP_TO%\%QSPFILE% ) else ( start "%BATDir%%QSPGUI%" %QSPFILE% )
 
 
+:exit
+
+
+:elapsedtime
+set options="tokens=1-4 delims=:.,"
+for /f %options% %%a in ("%start%") do (
+    set start_h=%%a
+    set /a start_m=100%%b %% 100
+    set /a start_s=100%%c %% 100
+    set /a start_ms=100%%d %% 100
+)
+for /f %options% %%a in ("%end%") do (
+    set end_h=%%a
+    set /a end_m=100%%b %% 100
+    set /a end_s=100%%c %% 100
+    set /a end_ms=100%%d %% 100
+)
+
+set /a ms=end_ms-start_ms
+if %ms% lss 0 (
+    set /a ms+=100
+    set /a end_s-=1
+)
+
+set /a secs=end_s-start_s
+if %secs% lss 0 (
+    set /a secs+=60
+    set /a end_m-=1
+)
+
+set /a mins=end_m-start_m
+if %mins% lss 0 (
+    set /a mins+=60
+    set /a end_h-=1
+)
+
+set /a hours=end_h-start_h
+if %hours% lss 0 (
+    set /a hours+=24
+)
+
+if %ms% lss 10 set ms=0%ms%
+if %secs% lss 10 set secs=0%secs%
+if %mins% lss 10 set mins=0%mins%
+if %hours% lss 10 set hours=0%hours%
+
+
+if %hours% neq 0 (
+    set elapsedtime=%hours%:%mins%:%secs%.%ms%
+) else if %mins% neq 0 (
+    set elapsedtime=%mins%:%secs%.%ms%
+) else (
+    set elapsedtime=%secs%.%ms%
+)
+
+
+echo Elapsed time: %elapsedtime%
+
+endlocal & set elapsedtime=%elapsedtime%
 
 
 :exit

+ 13 - 0
build.sh

@@ -18,6 +18,7 @@
 		<Location name="journal_portfolio"/>
 		<Location name="journal_NPC_information"/>
 		<Location name="Cheatmenu_din"/>
+		<Location name="Cheatmenu_bisets"/>
 	</Folder>
 	<Folder name="System">
 		<Location name="counter"/>
@@ -908,8 +909,11 @@
 		<Location name="model_mari"/>
 	</Folder>
 	<Folder name="Crime and Punishment">
+		<Location name="court_functions"/>
 		<Location name="police_station"/>
+		<Location name="court_arrest_events"/>
 		<Location name="sentence"/>
+		<Location name="court_sentence_events"/>
 		<Location name="courtletter"/>
 		<Location name="shoplifting"/>
 	</Folder>
@@ -1421,7 +1425,16 @@
 		<Location name="quest_data_a274"/>
 	</Folder>
 	<Folder name="beta_code">
+		<Location name="beta_journal"/>
+		<Location name="beta_journal_education"/>
+		<Location name="beta_journal_geography"/>
+		<Location name="beta_journal_glossary"/>
+		<Location name="beta_journal_home"/>
+		<Location name="beta_journal_magic"/>
+		<Location name="beta_journal_notifications"/>
 		<Location name="beta_journal_quests"/>
+		<Location name="beta_journal_relationships"/>
+		<Location name="beta_journal_work"/>
 	</Folder>
 	<Location name="cleanHTML"/>
 	</Structure>

+ 3 - 3
locations/AppearanceSystem.qsrc

@@ -190,7 +190,7 @@ end
 
 if $ARGS[0] = 'CalcGroomingBonus':
 
-	makeupBonus = pcs_makupskl/5 - 5
+	makeupBonus = pcs_makupskl / 5 - 5
 	if pcs_makeup = 0:
 		makeupBonus = -5
 	elseif pcs_makeup = 1:
@@ -200,7 +200,7 @@ if $ARGS[0] = 'CalcGroomingBonus':
 	elseif pcs_makeup = 6 and bimbolevel >= 2:
 		makeupBonus += 2 * (bimbolevel - 1)
 	elseif pcs_makeup = 7:
-		makeupBonus += pcs_makeupskl / 10 - 50
+		makeupBonus += pcs_makupskl / 10 - 5
 	end
 
 	breathBonus = 5 * pcs_breath
@@ -296,7 +296,7 @@ end
 if $ARGS[0] = 'AdjustFromBMI':
 	tempValue = ARGS[1] & !!value to be adjusted
 
-	temp_bs_class = func('body_structure', 'get_class')
+	temp_bs_class = func('body_structure', 'get_class') mod 1000
 	if temp_bs_class < 100:
 		!! severely underweight
 		result = tempValue * 50 / 100

+ 3 - 3
locations/BurgerTip.qsrc

@@ -768,7 +768,7 @@ if $ARGS[0] = 'bj_cum':
 		act 'Go to the toilet': gt 'BurgerTip', 'toilet'
 	elseif reaktrand > 5 and reaktrand < 9:
 		gs 'cum_call', 'clothes', 'A74', 1
-		'<center><img <<$set_imgh>> src="images/characters/city/anatoly/sex/bossbjcum2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/body/cum/cumclothes/cumclothes2.jpg"></center>'
 		'Not wanting a mouth full of cum, you decide to jerk Anatoly to completion. Oh dear, it looks like your clever plan backfired. Anatoly managed to shoot his load all over your pretty outfit. It looks sexy, but you better head to the bathroom before it stains.'
 
 		gs 'arousal', 'end'
@@ -943,7 +943,7 @@ if $ARGS[0] = 'sex2':
 	gs 'arousal', 'vaginal', 10, 'sub'
 	gs 'cum_call', 'precum', 'A74', 1
 	gs 'stat'
-	
+
 	if bosswantrand >= 3:
 		killvar'bosswantrand'
 		gs 'cum_call', 'stomach', 'A74', 1
@@ -980,7 +980,7 @@ if $ARGS[0] = 'anal2':
 	gs 'arousal', 'anal', 10, 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'
-	
+
 	if BurgerQW['WorkShift'] = 1:
 		act 'Have your lunch': gt 'burgerWork', 'work'
 	elseif BurgerQW['WorkShift'] = 2:

+ 11 - 416
locations/Cheatmenu_din.qsrc

@@ -472,6 +472,7 @@ end
 $cheatmenu['cycle'] = "gs 'Cheatmenu_din', 'cycle'"
 if $ARGS[0] = 'cycle':
 	*clr & cla
+	gs 'obj_din', 'cheattabs'
 	if cycle ! 5:
 		EggRH = 0
 		LutH = 0
@@ -701,31 +702,31 @@ if $ARGS[0] = 'bodyMod':
 		'starving (No, you may not select ''starving'', it''s here to show where the scale starts)'
 		''
 		if (bs_temp_bs_class / 100) ! 1:
-			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 170"><<func(''body_structure'', ''body_desc'', 17, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 170"><<func(''body_structure'', ''body_desc'', 17, strenbuf, 0)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 2:
-			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 200"><<func(''body_structure'', ''body_desc'', 20, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 200"><<func(''body_structure'', ''body_desc'', 20, strenbuf, 0)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 3:
-			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 230"><<func(''body_structure'', ''body_desc'', 23, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 230"><<func(''body_structure'', ''body_desc'', 23, strenbuf, 0)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 4:
-			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 270"><<func(''body_structure'', ''body_desc'', 27, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 270"><<func(''body_structure'', ''body_desc'', 27, strenbuf, 0)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 5:
-			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 320"><<func(''body_structure'', ''body_desc'', 32, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 320"><<func(''body_structure'', ''body_desc'', 32, strenbuf, 0)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 6:
-			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 370"><<func(''body_structure'', ''body_desc'', 37, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 370"><<func(''body_structure'', ''body_desc'', 37, strenbuf, 0)>></a>'
 			''
 		end
 		if (bs_temp_bs_class / 100) ! 7:
-			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 420"><<func(''body_structure'', ''body_desc'', 42, strenbuf)>></a>'
+			'<a href="exec: dynamic $cheatmenu[''set_body_class''], 420"><<func(''body_structure'', ''body_desc'', 42, strenbuf, 0)>></a>'
 			''
 		end
 		killvar 'bs_temp_bs_class'
@@ -3179,414 +3180,7 @@ end
 
 $cheatmenu['bdimmain'] = "gs 'Cheatmenu_din', 'bdimmain'"
 if $ARGS[0] = 'bdimmain':
-	*clr & cla
-	gs 'stat'
-	gs 'obj_din', 'cheattabs'
-	'<center><h1>Cheat Menu - Body Image Sets</h1></center>'
-	$cheatmenu['table_start']
-	'<center><b>Body Image Controls</b></center>'
-	*nl
-	if cheatVars['fix_bodyimg'] = 1:
-		$temp_text = 'You are currently using set: '
-		if cheatVars['fix_bi_set'] < 10:
-			$temp_text += $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_folder']
-		else
-			$temp_text += 'default '
-			if cheatVars['fix_bi_set'] mod 10 = 0:
-				$temp_text += 'low '
-			elseif cheatVars['fix_bi_set'] mod 10 = 1:
-				$temp_text += 'mid '
-			elseif cheatVars['fix_bi_set'] mod 10 = 2:
-				$temp_text += 'high '
-			end
-
-			if cheatVars['fix_bi_set'] / 10 = 19:
-				$temp_text += 'strength'
-			else
-				$temp_text += func('body_structure', 'body_desc_from_class', (cheatVars['fix_bi_set'] / 10 mod 10) * 100)
-			end
-		end
-		'<<$temp_text>>'
-		killvar '$temp_text'
-	else
-		'You are currently not using a fixed set.'
-	end
-	*nl
-	'These are the default body image sets:'
-	*nl
-	func('cheatmenu_din', 'get_default_bi_table')
-	*nl
-	*nl
-	'<center><b>Custom Image Sets</b></center>'
-	temp_cm_bi_flag = 0
-	gs 'cheatmenu_din', 'bdcustfolddisplay', 0
-	gs 'cheatmenu_din', 'bdcustfolddisplay', 1
-	gs 'cheatmenu_din', 'bdcustfolddisplay', 2
-	gs 'cheatmenu_din', 'bdcustfolddisplay', 3
-	gs 'cheatmenu_din', 'bdcustfolddisplay', 4
-	gs 'cheatmenu_din', 'bdcustfolddisplay', 5
-	gs 'cheatmenu_din', 'bdcustfolddisplay', 6
-	gs 'cheatmenu_din', 'bdcustfolddisplay', 7
-	gs 'cheatmenu_din', 'bdcustfolddisplay', 8
-	gs 'cheatmenu_din', 'bdcustfolddisplay', 9
-
-	if temp_cm_bi_flag < 10:
-		*nl
-		'<a href="exec: gs ''cheatmenu_din'', ''bdimcstadd''"><b>Add new set</b></a>'
-	end
-	killvar 'temp_cm_bi_flag'
-
-	$cheatmenu['table_end']
-end
-
-if $ARGS[0] = 'get_default_bi_table':
-	$temp_table = '<table cellpadding="25" cellspacing="0">'
-	$temp_table +=	'<tr>'
-	$temp_table +=		'<td></td>'
-	$temp_table +=		'<td></td>'
-	$temp_table +=		'<th colspan=3><b>Strength</b></th>'
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		'<td></td>'
-	$temp_table +=		'<th><a href="exec: gs ''cheatmenu_din'', ''unlock_img_set'', 199 & gs ''Cheatmenu_din'', ''bdimmain''"><b>RESET</b></a></th>'
-	$temp_table +=		'<th valign="bottom" style="border-bottom: 1px solid black">'
-	if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] mod 10 = 0:
-		$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_din'', ''unlock_img_set'', 190 & gs ''Cheatmenu_din'', ''bdimmain''"><b>Low</b></a>'
-	else
-		$temp_table +=		'<a href="exec: gs ''cheatmenu_din'', ''lock_img_set'', 190 & gs ''Cheatmenu_din'', ''bdimmain''"><b>Low</b></a>'
-	end
-	$temp_table +=		'</th>'
-	$temp_table +=		'<th valign="bottom" style="border-bottom: 1px solid black">'
-	if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] mod 10 = 1:
-		$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_din'', ''unlock_img_set'', 191 & gs ''Cheatmenu_din'', ''bdimmain''"><b>Mid</b></a>'
-	else
-		$temp_table +=		'<a href="exec: gs ''cheatmenu_din'', ''lock_img_set'', 191 & gs ''Cheatmenu_din'', ''bdimmain''"><b>Mid</b></a>'
-	end
-	$temp_table +=		'</th>'
-	$temp_table +=		'<th valign="bottom" style="border-bottom: 1px solid black">'
-	if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] mod 10 = 2:
-		$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_din'', ''unlock_img_set'', 192 & gs ''Cheatmenu_din'', ''bdimmain''"><b>High</b></a></th>'
-	else
-		$temp_table +=		'<a href="exec: gs ''cheatmenu_din'', ''lock_img_set'', 192 & gs ''Cheatmenu_din'', ''bdimmain''"><b>High</b></a></th>'
-	end
-	$temp_table +=		'</th>'
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		'<th rowspan=9><b>BMI</b></th>'
-	temp_cmd_i = 0
-	:default_table_loop
-		if temp_cmd_i ! 0: $temp_table +=	'<tr>'
-		$temp_table +=		'<th align="right" style="border-right: 1px solid black">'
-		if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i:
-			$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_din'', ''unlock_img_set'', 1<<temp_cmd_i>>9 & gs ''Cheatmenu_din'', ''bdimmain''"><b><<func(''body_structure'', ''body_desc_from_class'', temp_cmd_i * 100)>></a></b>'
-		else
-			$temp_table +=		'<a href="exec: gs ''cheatmenu_din'', ''lock_img_set'', 1<<temp_cmd_i>>9 & gs ''Cheatmenu_din'', ''bdimmain''"><b><<func(''body_structure'', ''body_desc_from_class'', temp_cmd_i * 100)>></b></a>'
-		end
-		$temp_table +=		'</th>'
-		$temp_table +=		'<td align="center" valign="center">'
-		temp_cmd_colorflag = 0
-		if cheatVars['fix_bi_set'] > 10 and (cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i or cheatVars['fix_bi_set'] / 10 mod 10 = 9) and (cheatVars['fix_bi_set'] mod 10 = 0 or cheatVars['fix_bi_set'] mod 10 = 9):
-			temp_cmd_colorflag = 1
-		end
-		$temp_table +=			'<<func(''Cheatmenu_din'', ''get_bodyimg_desc_link'', temp_cmd_i * 100 + 2, temp_cmd_colorflag)>>'
-		$temp_table +=		'</td>'
-		$temp_table +=		'<td align="center" valign="center">'
-		temp_cmd_colorflag = 0
-		if cheatVars['fix_bi_set'] > 10 and (cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i or cheatVars['fix_bi_set'] / 10 mod 10 = 9) and (cheatVars['fix_bi_set'] mod 10 = 1 or cheatVars['fix_bi_set'] mod 10 = 9):
-			temp_cmd_colorflag = 1
-		end
-		$temp_table +=			'<<func(''Cheatmenu_din'', ''get_bodyimg_desc_link'', temp_cmd_i * 100 + 6, temp_cmd_colorflag)>>'
-		$temp_table +=		'</td>'
-		$temp_table +=		'<td align="center" valign="center">'
-		temp_cmd_colorflag = 0
-		if cheatVars['fix_bi_set'] > 10 and (cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i or cheatVars['fix_bi_set'] / 10 mod 10 = 9) and (cheatVars['fix_bi_set'] mod 10 = 2 or cheatVars['fix_bi_set'] mod 10 = 9):
-			temp_cmd_colorflag = 1
-		end
-		$temp_table +=			'<<func(''Cheatmenu_din'', ''get_bodyimg_desc_link'', temp_cmd_i * 100 + 8, temp_cmd_colorflag)>>'
-		$temp_table +=		'</td>'
-		$temp_table +=	'</tr>'
-		temp_cmd_i += 1
-	if temp_cmd_i < 9: jump 'default_table_loop'
-
-	$temp_table += '</table>'
-
-	$result = $temp_table
-	killvar '$temp_table'
-	killvar 'temp_cmd_colorflag'
-end
-
-
-
-if $ARGS[0] = 'lock_img_set':
-	cheatVars['fix_bodyimg'] = 1
-	if ARGS[1] < 10:
-		cheatVars['fix_bi_set'] = ARGS[1]
-	else
-		ARGS[1] = ARGS[1] mod 100
-		if cheatVars['fix_bi_set'] < 10: cheatVars['fix_bi_set'] = 199
-
-		if ARGS[1] mod 10 ! 9:
-			cheatVars['fix_bi_set'] = (cheatVars['fix_bi_set'] / 10) * 10 + (ARGS[1] mod 10)
-		else
-			cheatVars['fix_bi_set'] = 100 + (ARGS[1] / 10) * 10 + (cheatVars['fix_bi_set'] mod 10)
-		end
-	end
-	gs 'body', 'UpdateBodyImage'
-end
-
-if $ARGS[0] = 'unlock_img_set':
-	if cheatVars['fix_bi_set'] < 10:
-		cheatVars['fix_bodyimg'] = 0
-		cheatVars['fix_bi_set'] = 0
-	else
-		ARGS[1] = ARGS[1] mod 100
-		if ARGS[1] mod 10 = 9: cheatVars['fix_bi_set'] = 190 + (cheatVars['fix_bi_set'] mod 10)
-		if ARGS[1] / 10 = 9: cheatVars['fix_bi_set'] = (cheatVars['fix_bi_set'] / 10) * 10 + 9
-
-		if cheatVars['fix_bi_set'] = 199:
-			cheatVars['fix_bodyimg'] = 0
-			cheatVars['fix_bi_set'] = 0
-		end
-	end
-	gs 'body', 'UpdateBodyImage'
-end
-
-
-if $ARGS[0] = 'get_bodyimg_desc_link':
-	$result = '<a <<iif(ARGS[2] = 0, '''', ''style="color:#00FF00"'')>> href="exec: view ''' + func('body_structure', 'body_img_from_class', ARGS[1], 0) + '''">' + func('body_structure', 'body_desc_from_class', ARGS[1]) + '</a>'
-end
-
-
-
-
-if $ARGS[0] = 'bdcustfolddisplay':
-	if $cheatVars['fix_biset_<<ARGS[1]>>_folder'] ! '':
-		if temp_cm_bi_flag = 0:
-			*nl
-			'You may edit aspects of a custom image set by clicking on their folder names below.'
-		end
-		*nl
-		'<a <<iif((cheatVars[''fix_bodyimg''] = 1 and cheatVars[''fix_bi_set''] = ARGS[1]), ''style="color:#00FF00"'', '''')>> href="exec: gs ''Cheatmenu_din'', ''bdimdisplay'', <<ARGS[1]>>"><b><<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>></b></a>'
-		temp_cm_bi_flag += 1
-	end
-end
-
-
-$cheatmenu['bdimdisplay'] = "gs 'Cheatmenu_din', 'bdimdisplay', ARGS[0]"
-if $ARGS[0] = 'bdimdisplay':
-	*clr & cla
-	gs 'stat'
-	'<center><h1>Cheat menu</h1></center>'
-	*nl
-	'<center><b>Body Image Set Display</b></center>'
-
-	$cheatmenu['table_start']
-
-	act 'Go Back': gs 'cheatmenu_din', 'bdimmain'
-	'<a href="exec: gs ''cheatmenu_din'', ''bdimmain''"><b>Go Back</b></a>'
-	*nl
-	if cheatVars['fix_bodyimg'] = 1 and ARGS[1] = cheatVars['fix_bi_set']:
-		'This is the currently locked set.'
-		'<a href="exec: gs ''cheatmenu_din'', ''unlock_img_set'' & gs ''Cheatmenu_din'', ''bdimdisplay'', <<ARGS[1]>>"><b>Clear the lock.</b></a>'
-	else
-		'<a href="exec: gs ''cheatmenu_din'', ''lock_img_set'', <<ARGS[1]>> & gs ''Cheatmenu_din'', ''bdimdisplay'', <<ARGS[1]>>"><b>Use this set only.</b></a>'
-	end
-	*nl
-
-	'"Edit image" allows you to set the image file name (only use .jpg images)'
-	'"Edit description" allows you to set the description of the image'
-
-	'Folder: <<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>'
-
-	'Descriptors: (Displayed as "You are:")'
-
-	$temp_base_folder = 'images/pc/body/shape/<<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>'
-
-	$temp_table = '<table cellpadding = "10">'
-	$temp_table +=	'<tr>'
-	$temp_table +=		'<th></th>'
-	$temp_table +=		'<th>Currently using</th>'
-	$temp_table +=		'<th></th>'
-	$temp_table +=		'<th></th>'
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 0)
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 1)
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 2)
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 3)
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 4)
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 5)
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 6)
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 7)
-	$temp_table +=	'</tr>'
-	$temp_table +=	'<tr>'
-	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 8)
-	$temp_table +=	'</tr>'
-	$temp_table += '</table>'
-
-	'<<$temp_table>>'
-	'<a href="exec: gs ''cheatmenu_din'', ''bdimcstdel'', <<ARGS[1]>>">Delete this set.</a>'
-	killvar '$temp_table'
-
-	$cheatmenu['table_end']
-end
-
-if $ARGS[0] = 'get_custom_bodyimg_desc_link':
-	$temp_cmd_img_name = $cheatVars['fix_biset_<<ARGS[1]>>_img_<<ARGS[2]>>']
-	$temp_cmd_desc = $cheatVars['fix_biset_<<ARGS[1]>>_desc_<<ARGS[2]>>']
-
-	if $temp_cmd_img_name = '':
-		$temp_cmd_image = func('body_structure', 'body_img_from_class', ARGS[2] * 100, 0)
-		$temp_cmd_img_addon = 'Default image'
-	else
-		$temp_base_folder = 'images/pc/body/shape/<<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>'
-		$temp_cmd_image = '<<$temp_base_folder>>/<<$temp_cmd_img_name>>.jpg'
-		$temp_cmd_img_addon = '<<$temp_cmd_img_name>>.jpg (<a href="exec: gs ''Cheatmenu_din'', ''bdimcstimgdefault'', <<ARGS[2]>>">Use default image</a>)'
-		killvar '$temp_base_folder'
-	end
-
-	if $temp_cmd_desc = '':
-		$temp_cmd_desc = func('body_structure', 'body_desc_from_class', ARGS[2] * 100)
-	end
-
-	$result = '<td><a href="exec: view ''<<$temp_cmd_image>>''"><<$temp_cmd_desc>></a></td>'
-	$result += '<td><<$temp_cmd_img_addon>></td>'
-	$result += '<td><a href="exec: gs ''Cheatmenu_din'', ''bdimcstimged'', <<ARGS[1]>>, <<ARGS[2]>>">Edit image</a></td>'
-	$result += '<td><a href="exec: gs ''Cheatmenu_din'', ''bdimcstdesed'', <<ARGS[1]>>, <<ARGS[2]>>">Edit description</a></td>'
-
-	killvar '$temp_cmd_image'
-	killvar '$temp_cmd_desc'
-	killvar '$temp_cmd_img_addon'
-	killvar '$temp_cmd_img_name'
-end
-
-
-$cheatmenu['bdimcstadd'] = "gs 'Cheatmenu_din', 'bdimcstadd'"
-if $ARGS[0] = 'bdimcstadd':
-	*clr & cla
-	'<center><b>Body Image Set Addition</b></center>'
-	$cheatmenu['table_start']
-	act 'Go Back': killvar 'klsetask' & gs 'cheatmenu_din', 'bdimmain'
-	'<a href="exec:killvar ''klsetask'' & gs ''cheatmenu_din'', ''bdimmain''"><b>Go Back</b></a>'
-	*nl
-	'This is where you can add a new image set to a game.'
-	'To add an image set, create a folder in images/pc/body/shape/ and name it anything you want (shorter will be easier to remember). Then put in it any images you want. Once you have done that, click the link below and put in your folder name to add that set.'
-	'Note: This will only be for this instance/save of the game and you will have to redo the click the link step if you want to add the same folder to a different instance/save.'
-	*nl
-	'<a href="exec: gs ''Cheatmenu_din'', ''bdimcstaddpro''">Add Image Set</a>'
-	$cheatmenu['table_end']
-end
-
-$cheatmenu['bdimcstaddpro'] = "gs 'Cheatmenu_din', 'bdimcstaddpro'"
-if $ARGS[0] = 'bdimcstaddpro':
-	$tmpstrg = input("Enter folder name, do not include ''\''")
-	if $tmpstrg = '':
-		killvar '$tmpstrg'
-		gs 'Cheatmenu_din', 'bdimcstadd'
-	else
-		cyci1 = 0
-		:addcyc1
-		if $cheatVars['fix_biset_<<cyci1>>_folder'] ! '': cyci1 += 1 & jump 'addcyc1'
-		if cyci1 > 9:
-			'You have encoutered error 1'
-			'<a href="exec: gs ''cheatmenu_din'', ''bdimmain''"><b>Go Back</b></a>'
-			exit
-		end
-		ARGS[1] = cyci1
-
-		if mid($tmpstrg, len($tmpstrg)) = '/' or mid($tmpstrg, len($tmpstrg)) = '\':
-			$tmpstrg = mid($tmpstrg, 1, len($tmpstrg)-1)
-		end
-
-		cyci1 = 0
-		:addcyc2
-			$cheatVars['fix_biset_<<ARGS[1]>>_desc_<<cyci1>>'] = func('body_structure', 'body_desc_from_class', cyci1 * 100)
-			cyci1 += 1
-		if cyci1 < 9: jump 'addcyc2'
-
-		$cheatVars['fix_biset_<<ARGS[1]>>_folder'] = $tmpstrg
-		killvar '$tmpstrg'
-		killvar 'cyci1'
-
-		gs 'Cheatmenu_din', 'bdimdisplay', ARGS[1]
-	end
-end
-
-$cheatmenu['bdimcstdesed'] = "gs 'Cheatmenu_din', 'bdimcstdesed', ARGS[0], ARGS[1]"
-if $ARGS[0] = 'bdimcstdesed':
-	$tmpstrg = input("Enter a new descriptor")
-	if $tmpstrg ! '':
-		$cheatVars['fix_biset_<<ARGS[1]>>_desc_<<ARGS[2]>>'] = $tmpstrg
-		if cheatVars['fix_bi_set'] = ARGS[1]: gs 'body', 'UpdateBodyImage'
-	end
-
-	killvar '$tmpstrg'
-	gs 'Cheatmenu_din', 'bdimdisplay', ARGS[1]
-end
-
-if $ARGS[0] = 'bdimcstimged':
-	$tmpstrg = input("Enter a new image name (Leave empty to not change the image. Example: 1). Exclude the '.jpg'")
-	if $tmpstrg ! '':
-		if mid($tmpstrg, len($tmpstrg)-3) = '.jpg':
-			$tmpstrg = mid($tmpstrg, 1, len($tmpstrg)-4)
-		end
-		$cheatVars['fix_biset_<<ARGS[1]>>_img_<<ARGS[2]>>'] = $tmpstrg
-		if cheatVars['fix_bi_set'] = ARGS[1]: gs 'body', 'UpdateBodyImage'
-	end
-
-	killvar '$tmpstrg'
-	gs 'Cheatmenu_din', 'bdimdisplay', ARGS[1]
-end
-
-if $ARGS[0] = 'bdimcstimgdefault':
-	$cheatVars['fix_biset_<<ARGS[1]>>_img_<<ARGS[2]>>'] = ''
-	gs 'Cheatmenu_din', 'bdimdisplay', ARGS[1]
-end
-
-
-$cheatmenu['bdimcstdel'] = "gs 'Cheatmenu_din', 'bdimcstdel', ARGS[0]"
-if $ARGS[0] = 'bdimcstdel':
-	*clr & cla
-	'<center><b>Body Image Set Removal</b></center>'
-	$cheatmenu['table_start']
-
-	'<a href="exec: killvar ''klsetask'' & gs ''Cheatmenu_din'', ''bdimdisplay'', <<ARGS[1]>>"><b>Go Back</b></a>'
-	*nl
-	'This is where you remove a body image set from use, please note it does not delete anything, it just clears the custom set from this game instance/save.'
-	if klsetask = 1:
-		'<a href="exec:klsetask = 2 & gs ''Cheatmenu_din'', ''bdimcstdel'', <<ARGS[1]>>"><b>Are you sure you want to remove set <<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>?</b></a>'
-	elseif klsetask = 2:
-		if cheatVars['fix_bodyimg'] = 1 and cheatVars['fix_bi_set'] = ARGS[1]: cheatVars['fix_bodyimg'] = 0 & cheatVars['fix_bi_set'] = 0
-
-		cyci1 = 0
-		:del_bodimgset_loop
-			gs 'shortgs', 'remove_array_element', 'cheatVars', 'fix_biset_<<ARGS[1]>>_img_<<cyci1>>'
-			gs 'shortgs', 'remove_array_element', 'cheatVars', 'fix_biset_<<ARGS[1]>>_desc_<<cyci1>>'
-			cyci1 += 1
-		if cyci1 < 9: jump 'del_bodimgset_loop'
-		gs 'shortgs', 'remove_array_element', 'cheatVars','fix_biset_<<ARGS[1]>>_folder'
-
-		killvar 'cyci1'
-		killvar 'klsetask'
-		gs 'cheatmenu_din', 'bdimmain'
-	else
-		'<a href="exec: klsetask = 1 & gs ''Cheatmenu_din'', ''bdimcstdel'', <<ARGS[1]>>">Remove set <<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>?</a>'
-	end
-	$cheatmenu['table_end']
+	gs 'cheatmenu_bisets', 'main'
 end
 
 
@@ -3630,7 +3224,8 @@ if $ARGS[0] = 'items':
 	if showPharmacyItems = 1:
 		'<a href = "exec: showPharmacyItems = 0 & dynamic $cheatmenu[''items'']">Hide Details </a>'
 		*pl 'Morning after pill: <a href="exec:mc_inventory[''morning_after_pill'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''morning_after_pill'']>> </b></a>'
-		*pl 'Condoms: <a href="exec:mc_inventory[''normal_condoms'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''normal_condoms'']>> </b></a>'
+		if preziktype = 1:*pl 'Condoms: <a href="exec:mc_inventory[''normal_condoms'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''normal_condoms'']>> </b></a>'
+		if preziktype ! 1: *pl 'Condoms: <a href="exec:mc_inventory[''equipped_condoms'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''equipped_condoms'']>> </b></a>'
 		*pl 'Pregnancy test: <a href="exec:mc_inventory[''pregnancy_test'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''pregnancy_test'']>> </b></a>'
 		*pl 'Birth control pills: <a href="exec:mc_inventory[''contraceptive_pill'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''contraceptive_pill'']>> </b></a>'
 		*pl 'Antibiotics: <a href="exec:mc_inventory[''antibiotics'']=input(''Set number'') & dynamic $cheatmenu[''items'']"><b> <<mc_inventory[''antibiotics'']>> </b></a>'

+ 2 - 0
locations/Cum_Manage.qsrc

@@ -1053,12 +1053,14 @@ if $ARGS[0] = 'check_innards':
 	RESULT = 0
 
 	if ARGS[1] = 0:
+		if capvag <= 0:capvag = 1
 		if ARGS[2] > 0:
 			RESULT = capvag
 		elseif cumsumvag >= capvag and isprok = 0 and vibratorIN = 0:
 			RESULT = 1
 		end
 	elseif ARGS[1] = 3:
+		if capanus <= 0: capanus = 1
 		if ARGS[2] > 0:
 			RESULT = capanus
 		elseif cumsumass >= capanus and analplugin = 0:

File diff suppressed because it is too large
+ 265 - 265
locations/FedorEv3.qsrc


+ 2 - 2
locations/FedorEv4_sex.qsrc

@@ -277,7 +277,7 @@ if $ARGS[0] = '3way2':
 				'<center><video autoplay loop src="images/shared/sex/cum/facial/cumface3.mp4"></video></center>'
 				'You turn to Ivan, letting Fedors dick slide out of your mouth but then extend your hand to jerk him off as you respond, "I''d rather you both cover me in your cum." Ivan grins. "Damn <<$pcs_nickname>> you''re a little minx aren''t you?" he then rapidly increases his pace and then Fedor pulls out of you and holds your face to his dick as he unloads all his cum into your face which seems to cause Ivan to groan and pull out just in time to paint both your ass and back with his load. You lay on your back catching your breath as you listen to Fedor and Ivan chat. "Damn Fedor, you really lucked out with <<$pcs_firstname>>. I never fucked a girl with an ass as fine as her''s."'
 				*nl
-				'Fedor responds, "I like to believe that it''s more than luck but I can''t help but feel very lucky everytime I look at her." Fedor''s comments cause you to blush as Ivan responds, "<<$pcs_nickname>>''s a good catch. I wish you both the very best." as he gets dressed then walks out of the room. Fedor turns to you then gives you a kiss on the forehead "Let''s get you cleaned up." he lifts you up then carries you to the bathroom.'
+				'Fedor responds, "I like to believe that it''s more than luck but I can''t help but feel very lucky every time I look at her." Fedor''s comments cause you to blush as Ivan responds, "<<$pcs_nickname>>''s a good catch. I wish you both the very best." as he gets dressed then walks out of the room. Fedor turns to you then gives you a kiss on the forehead "Let''s get you cleaned up." he lifts you up then carries you to the bathroom.'
 				*nl
 				'<center><video autoplay loop src="images/shared/sex/cum/cum3.mp4"></video></center>'
 				gs 'boyStat', 'A3'
@@ -1469,7 +1469,7 @@ if $ARGS[0] = 'Bedroom 1':
 			*clr & cla
 			minut += 5
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/lick'+rand(2,3)+'.mp4"></video></center>'
-			'You stare into Fedor''s eyes as you begin licking the tip of his penis. Fedor lets out a moan as your tongue hits the very tip of his penis which reveals to you just how sensitive that spot is, so you continue licking his penis in a circular motion, enjoying his body flinch everytime your tongue hits his tip. Fedor looks down at you and says, "<<$pcs_nickname>> you''re... driving me crazy doing that. I can''t hold on much longer"'
+			'You stare into Fedor''s eyes as you begin licking the tip of his penis. Fedor lets out a moan as your tongue hits the very tip of his penis which reveals to you just how sensitive that spot is, so you continue licking his penis in a circular motion, enjoying his body flinch every time your tongue hits his tip. Fedor looks down at you and says, "<<$pcs_nickname>> you''re... driving me crazy doing that. I can''t hold on much longer"'
 			gs 'arousal', 'rimming', 5, 'dom'
 			gs 'stat'
 

+ 11 - 11
locations/Gnpc2.qsrc

@@ -247,7 +247,7 @@ $din_gboy_go_to_disco = {
 						cla
 						otnBoyFrend[numnpc] = 0
 						DPtipe = 2
-						
+
 						gs 'stat'
 						'You decide to dance with the Gopnik. For a moment <<$boydesc>> is staring at you in disbelieve, then he approaches the guy and grabs his shoulder. "Hey you! That''s my girl!" Suddenly a couple of Gopniks grab your <<$bfTitle[numnpc]>> and keep him from interrupting the hooligan dancing with you.'
 						'After a few minutes <<$boydesc>> stops struggling and the Gopniks let him free. He curses and glares angrily at you, while you are still dancing with the Gopnik, and then stomps out of the club.'
@@ -352,7 +352,7 @@ $din_gboy_go_to_disco = {
 										'You squat in front of the guy and unbutton his pants to pull out his stiff dick. The other boys continue smoking and watch the scene. You begin to lick the purple head of his swollen cock and then you open your <<$pc_desc[''lips'']>> lips and take the cock in your mouth. The Boys start laughing and commenting at what they see, "Look how she smacks those lips." Another echoed, "Where did you find such a cocksucker?" Unfortunately, there''s someone who knows you. "Hey that''s <<$pcs_nickname>> <<$pcs_lastname>>. Hot Damn!"'
 										'You blush and your face burns with shame, sucking this dick in front of other guys. Finally the guy starts to cum in your mouth and you try as quickly as possible to swallow his warm sperm. When his cock finally goes limp he tucks it back in his pants. You get up from the floor and begin to wipe your mouth, knowing it now smells like cum. One of the guys chuckled, "Great blowjob, I wouldn''t mind one myself."'
 										gs 'boyStat', $boy[1]
-										
+
 										act 'Slip out of the restroom':
 											cls
 											gs 'stat'
@@ -455,7 +455,7 @@ $din_gboy_go_to_disco = {
 					pcs_horny += 5
 					gs 'stat'
 					'You head to the bar and <<$boydesc>> orders your drinks. When you finally get them you move to the outdoor area and find a secluded place to enjoy your drinks.'
-					
+
 					gs 'willpower', 'kiss', 'self'
 					if will_cost <= pcs_willpwr:
 						act 'Kiss (<<will_cost>> Willpower)':
@@ -522,7 +522,7 @@ $din_gboy_go_to_disco = {
 										gs 'arousal', 'bj', 5
 										spafinloc = 11
 										gs 'cum_manage'
-										
+
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial21.jpg"></center>'
 										'You remove his member from your mouth just as a stream of hot sperm hits your face, then another and another and finally he stopped dumping his thick cum on your face.'
@@ -636,7 +636,7 @@ $din_gboy_go_to_disco = {
 													gs 'arousal', 'bj', 5
 													spafinloc = 11
 													gs 'cum_manage'
-													
+
 													gs 'stat'
 													'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial21.jpg"></center>'
 													'You remove his member from your mouth and then a stream of hot sperm hits your face, then another and another and finally your guy stops shooting his thick cum on your face.'
@@ -657,7 +657,7 @@ $din_gboy_go_to_disco = {
 											gs 'willpower', 'pay', 'resist'
 											gs 'arousal', 'foreplay', 3
 											gs 'stat'
-											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/petting.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/shared/sex/pet/petting.jpg"></center>'
 											'You remove your hand from his pants and then your guy sticks his hand into your pants, and you feel his fingers caress your wet pussy.'
 
 											gs 'willpower', 'mast', 'resist', 'easy'
@@ -683,7 +683,7 @@ $din_gboy_go_to_disco = {
 												cls
 												gs 'arousal', 'vaginal_finger', 5
 												gs 'stat'
-												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/petting.jpg"></center>'
+												'<center><img <<$set_imgh>> src="images/shared/sex/pet/petting.jpg"></center>'
 												'You cease to resist and just relax feeling the pleasant warmth as your guy caresses your pussy. <<$boydesc>> begins to undress you and soon you are naked.'
 
 												act 'Surrender':
@@ -843,7 +843,7 @@ $din_gboy_tits = {
 
 					gs 'fame', 'pav', 'sex', rand(0,8)
 					GboyBalabol[numnpc] = 1
-					
+
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/cocksucker.jpg"></center>'
 					'You squat in front of your guy and bring your face to his cock.'
@@ -867,7 +867,7 @@ $din_gboy_tits = {
 						pcs_horny += 10
 						spafinloc = 11
 						gs 'cum_manage'
-						
+
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial21.jpg"></center>'
 						'You remove his member from your mouth just as a stream of hot sperm hits you in the face, then another and another until he eventually finished coating your face with his cum.'
@@ -927,7 +927,7 @@ $din_gboy_tits = {
 				gs 'willpower', 'pay', 'resist'
 				gs 'arousal', 'foreplay', 3
 				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/petting.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/pet/petting.jpg"></center>'
 				'You remove your hand from his pants and he immediately reaches his hand into your pants, as you feel his fingers caress your wet pussy.'
 
 				gs 'willpower', 'mast', 'resist', 'easy'
@@ -951,7 +951,7 @@ $din_gboy_tits = {
 					gs 'arousal', 'vaginal_finger', 5
 					pcs_horny += 10
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/petting.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/shared/sex/pet/petting.jpg"></center>'
 					'You cease to resist and just relax feeling that pleasant warmth of a guy caressing your pussy with his fingers. <<$boydesc>> begins to undress you and soon you are completely naked.'
 
 					act 'Surrender':

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -210,7 +210,7 @@ if $ARGS[0] = 'fridge':
 
 
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/shared/food/tea.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/drinks/tea.jpg"></center>'
 			'You find some tea and make it.'
 
 			act 'Continue': gt 'JuliaMilHome', 'kitchen'

+ 3 - 3
locations/Komp.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'browse':
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 		if access['general-text'] = 1: '<center><h4 style="color: red;"><b><<$access[''general-text'']>></b></h4></center>'
-		'You head to your favourite start page while you decide what you want to do.'		
+		'You head to your favourite start page while you decide what you want to do.'
 		'A blinking banner for a <a href="exec: gt ''komp'',''agent''">Kirsanova Real Estate Agency</a> keeps popping up in the corner.'
 		if access['noporn'] = 1:
 			"<b><<$access['noporn']>></b>"
@@ -84,7 +84,7 @@ if $ARGS[0] = 'browse':
 		if camwhore = 1 and access['nocamshow'] = 1 and mc_inventory['tech_webcam'] = 1: 
 			"<b><<$access['nocamshow']>></b>"
 		end
-		if func('homes_properties', 'is_property_of_status', 'owned', 'city_apartment') and husband = 0: act 'Rent your apartment out': gt 'komp', 'sale'
+		if func('homes_properties', 'is_property_of_status', 'owned', 'city_apartment') and $husID = '': act 'Rent your apartment out': gt 'komp', 'sale'
 
 		if access['noporn'] = 0: act 'Watch porn': gt 'komp', 'porno'
 
@@ -664,7 +664,7 @@ if $ARGS[0] = 'study':
 	gs 'exp_gain', 'compskl', 1
 	'<center><b>The Institute for Education Measurement</b></center>'
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/study.jpg"></center>'
-	'You spend an hour on the IEM website, reading news articles and educational blogs. You already feel a bit smarter.'
+	'You spend half an hour on the IEM website, reading news articles and educational blogs. You already feel a bit smarter.'
 
 	act 'Leave this website': gt 'komp','browse'
 end

+ 13 - 18
locations/LOCA.qsrc

@@ -9,32 +9,27 @@ end
 if settingmode = 0: killvar 'cheatmenu'
 
 !{
-msg "Changed Location 
-	$menu_loc		<<$menu_loc>> 
-	$menu_arg		<<$menu_arg>> 
-	$loc_arg		<<$loc_arg>> 
-	$loc			<<$loc>> 
-	$location_type	<<$location_type>> 
+msg "Changed Location
+	$menu_loc		<<$menu_loc>>
+	$menu_arg		<<$menu_arg>>
+	$loc_arg		<<$loc_arg>>
+	$loc			<<$loc>>
+	$location_type	<<$location_type>>
 	$locM			<<$locM>>
 	$locclass		<<$locclass>>"
 
-msg "Changed Location 
-	$loc			<<$loc>> 
-	$location_type	<<$location_type>> 
+msg "Changed Location
+	$loc			<<$loc>>
+	$location_type	<<$location_type>>
 	$locclass		<<$locclass>>"
 }
 
 if mod_list > 0:
-	mod_i=1
+	mod_i = 1
 	:mod_exec
-	if $mod_name[mod_i] ! '':
-		gs 'mod_<<$mod_name[mod_i]>>', $ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4], $ARGS[5], $ARGS[6], $ARGS[7], $ARGS[8]
-	end
-	
-	if mod_list > mod_i:
-		mod_i+=1
-		jump 'mod_exec'
-	end
+		if $mod_name[mod_i] ! '': gs 'mod_<<$mod_name[mod_i]>>', $ARGS[0], $ARGS[1], $ARGS[2], $ARGS[3], $ARGS[4], $ARGS[5], $ARGS[6], $ARGS[7], $ARGS[8]
+		mod_i += 1
+	if mod_i <= mod_list: jump 'mod_exec'
 end
 
 --- LOCA ---------------------------------

+ 1 - 1
locations/LariskaSex.qsrc

@@ -652,7 +652,7 @@ if $ARGS[0] = 'boyfriend_sex':
 					end
 					if anal_slip < 4: gs 'arousal', 'auto_lube', 'anal'
 					'"I''m a virgin," you say, reaching back and spreading your buttcheeks. Taking the hint, he lines his cock up with your anus and pushes his way in.'
-					'Thankfully, his dick was lubed upenough that it slid right in. Lariska tries to distract you from any pain by tweaking your nipples and kissing them.'
+					'Thankfully, his dick was lubed enough that it slid right in. Lariska tries to distract you from any pain by tweaking your nipples and kissing them.'
 					'Lev starts thrusting in and out of your asshole, as the sounds of your buttcheeks slapping against his hips fills the room. He is barely able to contain his excitement as he watches you and Lariska continue to kiss.'
 					'The sensations of the pounding he is giving you and making out with Lariska is overwhelming your senses. She moves her hands between your legs, and returns the favor from earlier by rubbing your clit.'
 					gs 'arousal', 'anal', 5,'lesbian', 'group'

+ 7 - 7
locations/MagEncounterFairy.qsrc

@@ -150,13 +150,13 @@ if $ARGS[0] = 'fairy_chat':
 					pcs_horny += 10
 					*clr
 					'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples<<max(1,min(5,pcs_nips/20+1))>>.jpg"></center>'
-					'You hear a giggle.  Suddenly, your nipples get really firm and pointed, and seem to be a bit larger now.'
+					'You hear a giggle. Suddenly, your nipples get really firm and pointed, and seem to be a bit larger now.'
 					'You can''t help but rub both breasts, feeling the warm tingling in them, and in your pussy.'
 				elseif fairy_surprise = 2:
 					pcs_nips -= 5
 					*clr
 					'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples<<max(1,min(5,pcs_nips/20+1))>>.jpg"></center>'
-					'You hear a giggle.  Suddenly, your nipples get really firm and pointed, yet seem to be smaller then before.'
+					'You hear a giggle. Suddenly, your nipples get really firm and pointed, yet seem to be smaller than before.'
 					'You can''t help but rub both breasts, feeling the warm tingling in them, and in your pussy.'
 				elseif fairy_surprise = 3:
 					clit_size += 5
@@ -172,15 +172,15 @@ if $ARGS[0] = 'fairy_chat':
 					*clr
 					'<center><img <<$set_imgh>> src="images/pc/body/clit/clit<<max(1,min(5,clit_size/20+1))>>.jpg"></center>'
 					'You hear a giggle and you feel a warm tingle at the top of your slit, you reach down and part your pussy lips with your fingers.'
-					'Your clitoris has shunk, and seems to more demure than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
+					'Your clitoris has shrunk, and seems to more demure than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
 				elseif fairy_surprise <= 6:
 					min_arousal += rand(1,5)
 					'You hear a giggle, then sparkles surround your body and you get all tingly.'
-					'You suddenly feel flustered and more aroused then before.'
+					'You suddenly feel flustered and more aroused than before.'
 				else
 					min_arousal -= rand(1,5)
 					'You hear a giggle, then sparkles surround your body and you get all tingly.'
-					'You suddenly feel colder and less aroused then before.'
+					'You suddenly feel colder and less aroused than before.'
 				end
 				gs 'stat'
 				act 'Go on your way': gt $loc, $loc_arg
@@ -243,8 +243,8 @@ if $ARGS[0] = 'teleport':
 		'She giggles. "This lets you dance through any field you like! "Let''s go!"'
 		'She grunts and give you a nudge into the circle.'
 		act 'Stumble into Circle':
-			'The view outside the circle seems blurry and a little indistinct.  The Fairy''s face scrunches up in concentration as she incants "inla", and the world outside seems to shimmer a little. You feel like you understand how she did that.  Though you can''t tell exactly where you are now in the blurriness, it does look different.'
-			'The Fairy says, "It''s important to take the time to feel each Fairy Ring, that''s how you can find your way back."  She flies off.'
+			'The view outside the circle seems blurry and a little indistinct. The Fairy''s face scrunches up in concentration as she incants "inla", and the world outside seems to shimmer a little. You feel like you understand how she did that. Though you can''t tell exactly where you are now in the blurriness, it does look different.'
+			'The Fairy says, "It''s important to take the time to feel each Fairy Ring, that''s how you can find your way back." She flies off.'
 			'You decide it would be wise to memorize your surroundings.'
 			spellKnown['teleport'] = 1
 			tpKnown['gad_forest'] = 1

+ 130 - 130
locations/MartinTalk.qsrc

@@ -9,7 +9,7 @@ menu_off = 1
 if $ARGS[0] = '':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
-		
+
 	if MartinTalkVar = 0:
 		MartinTalkVar = 1
 		'"Sure, <<$pcs_firstname>>, coming right up", Martin says and pours you your drink.'
@@ -34,27 +34,27 @@ if $ARGS[0] = '':
 		'Martin is taken aback by your question at first, making you cringe in fear that you might have gone too far... but then he bursts into laughter. "That, mi amor, is a story for another day. Enjoy your drink before it gets warm."'
 		*nl
 		'With that, he directs his attention at another visitor of the bar. You notice that you''ve been holding your breath and release it now, glad you didn''t piss him off. Watching Martin from afar, you nurse on your beverage until you find it empty.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 1:
 		MartinTalkVar = 2
 		'"Of course, <<$pcs_firstname>>," Martin says and hands you your poison of choice.'
-		'"Thanks, Martin", you say with a smile. You hesitate for a moment, but the truth is that the barman has piqued your interest - he stands out of the sea of men you come across every day like a bottle of tequila in a Russian''s liquor cabinet, and you cannot help be straightforward about it:' 
+		'"Thanks, Martin", you say with a smile. You hesitate for a moment, but the truth is that the barman has piqued your interest - he stands out of the sea of men you come across every day like a bottle of tequila in a Russian''s liquor cabinet, and you cannot help be straightforward about it:'
 		'"Can I ask you something?"'
 		*nl
 		'Martin musters you for a long second before responding. "You wanna know why I''m here in Russia, don''t you?"'
 		'You blush slightly. "Is it that obvious?"'
-		'"Yes, it is, but I''m in no mood to tell a girl who practically just walked into my bar my entire life''s story." Martin''s words and tone are surprisingly harsh, so you probably hit a sore spot.' 
+		'"Yes, it is, but I''m in no mood to tell a girl who practically just walked into my bar my entire life''s story." Martin''s words and tone are surprisingly harsh, so you probably hit a sore spot.'
 		'"Sorry, I didn''t mean to pry." You quickly decide to drop the subject. "You just... stand out, you know?"'
 		'His features soften, and he seems appeased by your words. "Yeah, I guess I do." He sighs. "I''m sorry for snapping."'
 		*nl
 		'You look at each other for a little longer, but it''s awkward and neither of you really knows where to go from here.'
 		'"Guess I better get back to work," he says, and you agree, glad that he broke the uncomfortable silence and leaves you to your beverage.'
 		'Maybe you can satisfy your curiosity about him at a later date. If he talks to you at all, that is.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
+
 	elseif MartinTalkVar = 2:
 		MartinTalkVar = 3
 		'The barman gives you nod and before you know it, your drink sits on the counter.'
@@ -86,9 +86,9 @@ if $ARGS[0] = '':
 		'He bursts into laughter. "Maybe you are, maybe you aren''t; but you are alright either way, corazón."'
 		*nl
 		'With that, he leaves you to your drink. Minutes pass as you enjoy your beverage, only stopping when you find your glass empty.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
+
 	elseif MartinTalkVar = 3 and npc_rel['A216'] >= 20:
 		MartinTalkVar = 4
 		'Martin nods, and seconds later, a drink sits in front of you.'
@@ -102,25 +102,25 @@ if $ARGS[0] = '':
 		'"Yes, actually. After our last few chit chats, you must be bursting with curiosity. To be honest, I''m surprised you haven''t tried to ambush me while I close for the night."'
 		'"Uh, okay..."'
 		*nl
-		'You weren''t prepared for that at all, but he''s right: You DO have plenty of questions about him. "Why ar-"' 
+		'You weren''t prepared for that at all, but he''s right: You DO have plenty of questions about him. "Why ar-"'
 		'But you stop. You saw the corner of his mouth twitch. "You aren''t gonna <b>answer</b> whatever question I ask you, would you?"'
 		'"Oh no, of course not," he shakes his head with a sly grin, "we barely know each other."'
 		*nl
-		'You can feel the anger in your gut - what kind of stupid game is this? "Then why did you even-," you start but his laughter drowns out the rest of the thought and... despite how frustrated you felt a second ago, you can''t help it: You join him.' 
+		'You can feel the anger in your gut - what kind of stupid game is this? "Then why did you even-," you start but his laughter drowns out the rest of the thought and... despite how frustrated you felt a second ago, you can''t help it: You join him.'
 		*nl
 		'As gruff and menacing as Martin looks and acts sometimes, it''s good to know that he will pull your leg and laugh about just like anybody else. His shell may be hard but there''s definitely more to him than that. You''re not sure that his core is soft, but whatever it is, it''s bound to be interesting. And as strange as this episode was, it feels like something changed, like, after chipping away at it for a while, you finally broke the ice.'
 		*nl
 		'And armed with that knowledge and a newfound ease, you chat and joke with Martin a while longer before another patron demands his attention.'
 		$OpenInnerThought+'Hm... Maybe I really should try and talk to him when he''s starting to clean up and close for the night - I think he starts throwing people out around quarter to Midnight.'+$CloseInnerThought
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-				
+
 	elseif MartinTalkVar = 4 and npc_rel['A216'] >= 28:
 		MartinTalkVar = 5
 		'Martin wordlessly puts your usual drink in front of you, then examines you like he''s seeing you for the first time.'
 		*nl
 		'"You''re skinny," he observes.'
-		'"Excuse me?"' 
+		'"Excuse me?"'
 		'You ' + iif($bodyVars['desc']='skinny','would call yourself skinny, too, but','see yourself as <<$bodyVars[''desc'']>> rather than skinny, so') + ' you don''t really see why he would bring this up.'
 		*nl
 		'"Are you eating right, <<$pcs_firstname>>?" He inquires, completely ignoring your visible confusion.'
@@ -136,9 +136,9 @@ if $ARGS[0] = '':
 		'"That''s the one you should go to. The owners, Eugene and Angela, they are good people. Honest people. Give their place a visit sometime, you won''t regret it. Their shashlik is exceptional."'
 		'"Suuure," you say and watch Martin walk off.'
 		'Either there was a point to this that you missed completely, or you really look <b>that</b> skinny to him.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 5:
 		MartinTalkVar = 6
 		'"Sure, <<$pcs_firstname>>." Martin prepares a drink for you and puts it down in front of you.'
@@ -163,9 +163,9 @@ if $ARGS[0] = '':
 		'"Martin musters you once more. "I can be both," he grins.'
 		'"And do you find me attractive?" You ask innocently.'
 		'"That''s for me to know and for you to find out, <<$pcs_nickname>>." With that, he turns and leaves you to drink and ponder his noncommittal answer.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 6 and npc_rel['A216'] >= 35:
 		MartinTalkVar = 7
 		'"Of course, <<$pcs_firstname>>," Martin says and prepares your poison of choice. "Here you go."'
@@ -190,18 +190,18 @@ if $ARGS[0] = '':
 		'"You should share that thought at the next book club meeting," you comment dryly.'
 		'"I''d rather not. It would only disturb the other housewives," Martin retorts.'
 		*nl
-		'You chuckle - it''s strange how these conversations with Martin always take the most extraordinary turns. You know that he doesn''t talk to his other regulars like this. Actually, from what you can tell, it seems like he''s acting different with every one of them, adapting to their character, maybe even to their needs. You suggested it before to him, but now you are really starting to understand why they keep coming here, what they see in this place and its scary-looking owner.' 
+		'You chuckle - it''s strange how these conversations with Martin always take the most extraordinary turns. You know that he doesn''t talk to his other regulars like this. Actually, from what you can tell, it seems like he''s acting different with every one of them, adapting to their character, maybe even to their needs. You suggested it before to him, but now you are really starting to understand why they keep coming here, what they see in this place and its scary-looking owner.'
 		'That thought is what makes you say: "If it''s any consolation: I didn''t think you were running anything bad. I think you''d rather feed the homeless than sell them heroin."'
 		'"Maybe I''m just a good actor," he suggests.'
 		'"Maybe," you concede, "or maybe there''s actually a nice guy hiding under those muscles and tattoos."'
 		*nl
 		'For a fraction of a second, it looks like he is going to say something, but instead he just gives you a warm smile and you respond in kind, before Martin has to go back to work, leaving you to enjoy your drink in peace.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 7:
 		MartinTalkVar = 8
-		'Martin gives you a nod and before you know it, your beverage sits in front of you.' 
+		'Martin gives you a nod and before you know it, your beverage sits in front of you.'
 		*nl
 		'As you grab hold of the glass, the bartender gives you a long look. "So..."'
 		'"So...?"'
@@ -210,7 +210,7 @@ if $ARGS[0] = '':
 		*nl
 		'"Let''s start with what you asked me last time, then: What do <b>you</b> do when you are not sitting here, drinking my booze and enjoying my company?"'
 		*nl
-		
+
 		act 'A lot of things':
 			cla
 			$MartinHobby = 'dark secret hobbies'
@@ -227,10 +227,10 @@ if $ARGS[0] = '':
 			'You size him up and nod emphatically. "Yeah, if this was an episode on a crime show, you''d be devoted father of three the police suspect first because of he looks the part."'
 			'"And what would you be? The murderous housewife? Or the overambitious new detective?"'
 			'"Why not both?" You laugh, and Martin joins you.'
-			
+
 			act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 		end
-		
+
 		if pcs_stren > 60 or pcs_agil > 60:
 			act 'Fitness training':
 				cla
@@ -240,11 +240,11 @@ if $ARGS[0] = '':
 				'"That''s good to know," you smile.'
 				'"You train at the gym?"'
 				'"I go to the gym sometime," you shrug, "but a lot of what I do I can do at home, when I have some a few hours to myself."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-				
+
 		if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:
 			act 'Dancing':
 				cla
@@ -254,11 +254,11 @@ if $ARGS[0] = '':
 				'"It is, and it does," you agree, "but it''s really fulfilling to go on stage, do a routine and earn people''s applause."'
 				'"Ever thought about doing it professionally?" He asks.'
 				'"I don''t know. Maybe? Even when you''re really good, there are so many people who are better, so I don''t think it would be easy to make a living on dancing. But," you smile, "yeah, I guess I''d like to be good enough to do it professionally."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if runnerQW['pav_wins2'] > 0:
 			act 'Athletics':
 				cla
@@ -268,11 +268,11 @@ if $ARGS[0] = '':
 				'You roll your eyes at his awful joke. "Riiight, thank you for your support. And here I thought you''d approve of anything sportive."'
 				'"Oh, I do," he concurs. "I just never saw the appeal of dashes and marathons. And you didn''t strike me as the competitive type."'
 				'You shrug. "It''s part of what I like about it, I guess, but... I don''t know. It just feels right, in a way - the right mix of exhausting and satisfying."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if volleysostav > 0:
 			act 'Volleyball':
 				cla
@@ -282,11 +282,11 @@ if $ARGS[0] = '':
 				'"Oh no, it''s actually kind of a big deal here in St. Petersburg. And in Russia, I guess. When you do it professionally, anyway."'
 				'"And you do it professionally?"'
 				'"Uh, well... I''m in a team and... we don''t lose every game. Does that count?"'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if pcs_sewng > 40:
 			act 'Sewing':
 				cla
@@ -296,12 +296,12 @@ if $ARGS[0] = '':
 				'"Yeah, I did. What''s wrong with that?" You ask, irritated.'
 				'"I''m sorry." Martin puts up his hands defensively. "Nothing''s wrong with that. I was just surprised, is all. You didn''t strike me as the type who liked to sit down and make their own clothes."'
 				'"Well, I guess I am," you say firmly.'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
-		if chess_rank > 0:		
+
+		if chess_rank > 0:
 			act 'Chess':
 				cla
 				$MartinHobby = 'latest chess game'
@@ -310,15 +310,15 @@ if $ARGS[0] = '':
 				'"Does it, now?" You give him a wry smile. "What part of it? The one where a horse tears down a tower?"'
 				'He laughs. "That too. But I was more thinking of preparation: A good chess player anticipates all the moves his opponent can make before they have even thought of them. Preparation and good memory will get you far in life."'
 				'"I guess you''re right. But it''s fun either way, and who knows: Maybe you can call me Galina Kasparova soon." You grin.'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if pcs_vokal > 40 or pcs_instrmusic > 40:
 			act 'Making Music':
 				cla
-				if pcs_vokal >= pcs_instrmusic: 
+				if pcs_vokal >= pcs_instrmusic:
 					$MartinHobby = 'singing exercises'
 				else
 					$MartinHobby = 'finger exercises'
@@ -328,11 +328,11 @@ if $ARGS[0] = '':
 				'"Oh, stop it," you say, flattered by his compliment. "Would you like to, I don''t know, hear something sometime?"'
 				'Martin gives you a look of pure horror. "Oh god, please no."'
 				'If looks could kill, Martin would drop dead on the spot. "You are such an asshole, you know?" But his laugh is infectious, and you cannot help but join him.'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if kickbox['sash'] > 0:
 			act 'Kickboxing':
 				cla
@@ -342,15 +342,15 @@ if $ARGS[0] = '':
 				'"Yeah, that''s part of the reason why I started with that," you agree.'
 				'"But it''s not the only one, I assume?"'
 				'"Well, at first it was just fun learning how to beat the crap out of guys," you grin, "but it takes a lot of discipline and dedication, and there''s always room for improvement. No matter how good you are, it stays a challenge, and I think I want or maybe even need that in my life."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if pcs_photoskl > 40 or pcs_artskls > 40:
 			act 'Art':
 				cla
-				if pcs_artskls >= pcs_photoskl: 
+				if pcs_artskls >= pcs_photoskl:
 					$MartinHobby = 'drawings and paintings'
 				else
 					$MartinHobby = 'photography'
@@ -360,52 +360,52 @@ if $ARGS[0] = '':
 				'"Well, I don''t know if I have talent," you respond sheepishly.'
 				'"Nonsense," Martin insists, "I''m sure you are great. I couldn''t do what you do."'
 				'"Of course you could. It doesn''t matter if you feel like you can or can''t do it. I mean, I don''t know if I''m any good at it, but I really like the way it allows me to capture what I see and the way it feels, you know?" You look at your beverage, embarrassed. "God, just listen to me: I sound like one of those pretentious yuppies who glue two pieces of wood together and call it art."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
-		end		
-	
+		end
+
 	elseif MartinTalkVar = 8 and npc_rel['A216'] >= 42:
 		MartinTalkVar = 9
 		'Martin nods and a few seconds later, a drink sits in front of you.'
 		*nl
-		'"Thank you," you say, giving the barman a grateful look. He responds with a friendly nod, but he seems a little more thoughtful than usual today.' 
+		'"Thank you," you say, giving the barman a grateful look. He responds with a friendly nod, but he seems a little more thoughtful than usual today.'
 		*nl
 		'You don''t know if it''s that contemplative aura of his or a question that you''ve been subconsciously waiting to ask, but the question of questions is out before you even know it: "Do you believe in god, Martin?"'
-		'Strangely enough, Martin doesn''t seem surprised by that question at all - maybe he was wondering about that himself.' 
+		'Strangely enough, Martin doesn''t seem surprised by that question at all - maybe he was wondering about that himself.'
 		'"I used to," he admits after a moment. "I was brought up in the Catholic faith, at least. If you didn''t say your prayer, you didn''t get your supper." He smirks, but his eyes speak of fond memories.'
 		'"But you don''t believe in that anymore?"'
 		'He shakes his head wordlessly. Instead, he does something you don''t think you''ve ever seen him do while the bar is open: He pours himself a glass of tequila and, after regarding it for a moment, slams it back.'
 		*nl
 		'It''s fairly obvious that this is a sensitive topic, and you barely dare to raise your voice. "What happened?"'
 		'He sighs deeply; not at your question, you feel, but at his own answer: "Life happened, corazón. Life can make or break someone''s faith. Me, I eventually figured that either there was no god or the filio di puta had a really twisted sense of humor and didn''t deserve my faith." The bitterness in his voice is almost palpable.'
-		
+
 		act 'What happened to him?':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
 			'The question is burning under your nails: What could have brought this man to the other end of the world? But you realize that he has opened up to you in good faith, not because you pressed him for answer. He would only tell you as much as he wanted to, and pushing him would get you nowhere.'
-			'So, you do what friends do: You try not to be an ass.' 
+			'So, you do what friends do: You try not to be an ass.'
 			'"That bad?" You ask carefully.'
 			*nl
-			'His face darkens. "You have no idea. There is no good god in Colombia." It''s the first hint Martin has given you about his past since you met him, but beyond the obvious conclusion that something awful must have happened, you can''t draw any conclusions, and he doesn''t seem to want to linger there, either.' 
+			'His face darkens. "You have no idea. There is no good god in Colombia." It''s the first hint Martin has given you about his past since you met him, but beyond the obvious conclusion that something awful must have happened, you can''t draw any conclusions, and he doesn''t seem to want to linger there, either.'
 			'"What about you, <<$pcs_firstname>>? Do you believe in some higher power?"'
 			*nl
 			if $start_type[1] = 'nomagic':
-				'You ponder the question for a moment before you answer.' 
-				'"I''m not sure, actually. I used to go to church more when I was younger. My parents would take me there, but I didn''t really think about it, you know? I just went because I had to."' 
+				'You ponder the question for a moment before you answer.'
+				'"I''m not sure, actually. I used to go to church more when I was younger. My parents would take me there, but I didn''t really think about it, you know? I just went because I had to."'
 				*nl
-				'You pause for a moment, still not sure what you believe.' 
+				'You pause for a moment, still not sure what you believe.'
 				'"Now... now there are times when I go to church and I don''t really know why I went there, like I was looking for something more, something new, but it''s not there. And sometimes," you smile awkwardly, "sometimes I walk around town, see something strange and amazing and I feel... good. Connected, somehow." You shrug. "So, am I religious? Am I crazy? You tell me."'
 			else
-				'"More than you can imagine," you murmur.' 
-				'For the first time since you discovered that magic exist, somebody who sees the world the way you used to is asking you about it - or, well, asking a question that confronts you with it. What are you gonna say?' 
+				'"More than you can imagine," you murmur.'
+				'For the first time since you discovered that magic exist, somebody who sees the world the way you used to is asking you about it - or, well, asking a question that confronts you with it. What are you gonna say?'
 				*nl
-				'You couldn''t possibly explain it all; even if you are allowed to, who would believe you? You wouldn''t even believe yourself, if you''re honest. Still, you feel the powerful urge to tell him something, anything, at least - it''s been there since that fateful day, bottled up, and now there''s finally someone who might listen:' 
+				'You couldn''t possibly explain it all; even if you are allowed to, who would believe you? You wouldn''t even believe yourself, if you''re honest. Still, you feel the powerful urge to tell him something, anything, at least - it''s been there since that fateful day, bottled up, and now there''s finally someone who might listen:'
 				'"I... I feel like- no, I <b>know</b> that there''s something most people can''t see, something that doesn''t make any logical sense, and yet it is there, all around us, all the time, and it affects us in so many ways."'
 				'You are struggling for words. It''s all so clear in your head, but putting it in a way that doesn''t get you admitted to an asylum is so hard.'
 				'"I used to believe that the world is what everybody can see, smell, feel, and that''s it. But I- I''ve experienced something, something I can''t..." You trail off and stop. You can hear yourself chuckle - you just can''t help it. "I can''t explain it, can''t even describe it, but... but it changed everything for me." You smile awkwardly. "God, I must be sounding like a complete lunatic to you."'
 			end
-			
+
 			act 'Raving lunacy':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
@@ -418,11 +418,11 @@ if $ARGS[0] = '':
 				'"I don''t know what you''re talking about, girl - I look fantastic." Martin laughs.'
 				*nl
 				'For a moment, you want to talk back, stop him from deflecting your heartfelt compliment like that, but then you just smile and hold your tongue because you notice that Martin hasn''t let go of your hand and, after his laughter has subsided, he''s giving you a smile full of gratitude.'
-				
+
 				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
-		
+
 	elseif MartinTalkVar = 9 and npc_rel['A216'] >= 48:
 		MartinTalkVar = 10
 		'"Here you go." Martin puts your drink in front of you before you''ve even properly come to rest on the stool. '+$OpenInnerThought+'When your bartender has your drink ready by the time you order it, maybe you''ve been spending too much time in the bar,'+$CloseInnerThought+' you think to yourself.'
@@ -431,13 +431,13 @@ if $ARGS[0] = '':
 		'Martin shrugs. "Same as always: You kill a man, you move on."'
 		'You laugh at his remark, but when he doesn''t join in, you stop and look at him uncertainly. "You <b>are</b> joking, right?"'
 		'He gives you a mysterious smile but otherwise ignores the question. "How about you? Rough day at the office?" He pauses. "Wait, do you even work in an office?"'
-		
+
 		act 'Give a non-committal answer':
 			cla
 			npc_rel['A216'] -= 2
 			'"Oh, you know, this and that. Whatever covers the bills. I get by"'
 			*nl
-			
+
 			if fame['city_porn'] <= 30:
 				'"Is remaining mysterious part of the job description?"'
 				'"You''d like to know that, wouldn''t you?" You tease.'
@@ -449,7 +449,7 @@ if $ARGS[0] = '':
 				'"I know that you are... doing porn," Martin tells you quietly.'
 				'Your face falls. You try to keep your cool, but you''re feeling cold all of a sudden. Why is he bringing this up?'
 				*nl
-				'His eyes trace the outline of your body underneath your clothes, and you suddenly feel very exposed, and in a way that''s very different from screwing some guy in front of a camera.' 
+				'His eyes trace the outline of your body underneath your clothes, and you suddenly feel very exposed, and in a way that''s very different from screwing some guy in front of a camera.'
 				'"How in the world did a young, pretty girl like you end up doing that?" He asks.'
 				*nl
 				'You''re not sure if he''s genuinely interested in an answer or just hiding his disgust - or lechery - really well, but you respond: "I... well, I like exposing myself... and I like sex. And it pays really well. So, I thought..." You trail off.'
@@ -465,28 +465,28 @@ if $ARGS[0] = '':
 				'He gives you a careful smile. "Some girl I know told me that she believed in good people. So I figured, maybe he existed and was just a really good guy."'
 				'His smile infects you too. "Yeah, maybe."'
 				*nl
-				'Despite your relief, both of you fall silent for a while. It''s a lot to process, after all, and the question that goes through your head - if Martin had been jerking off to your videos - is annoyingly persistent. But with apparently nobody in the bar requiring his attention yet, Martin eventually feels like continuing the conversation somehow:' 
-				'"So, where do you live?"'	
+				'Despite your relief, both of you fall silent for a while. It''s a lot to process, after all, and the question that goes through your head - if Martin had been jerking off to your videos - is annoyingly persistent. But with apparently nobody in the bar requiring his attention yet, Martin eventually feels like continuing the conversation somehow:'
+				'"So, where do you live?"'
 			end
 			act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 		end
-			
-		if SchoolAtestat = 0: 
+
+		if SchoolAtestat = 0:
 			act '"I''m still going to school"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
 				'"No, actually, I''m still going to school."'
 				'You regret your words almost immediately when Martin''s face darkens. "Still going to school, huh? What about you being 18?"'
 				*nl
-				
+
 				if pcs_persuas < 30:
 					gs 'exp_gain', 'persuas', rand(2,5)
-					
+
 					if age >= 18:
 						gs 'npc_relationship', 'modify', 'A216', -10
 						pcs_mood -= rand(3,5)
 						'"I, uh... I''m <<age>> now," you stammer.'
-						'"You are <b>now</b>," he repeats. "So you weren''t 18 when you first came here? You lied to my face?"' 
+						'"You are <b>now</b>," he repeats. "So you weren''t 18 when you first came here? You lied to my face?"'
 						'He''s clearly angry with you, but he seems to be more disappointed than angry.'
 						'"I''m sorry," you say quietly. You don''t know what else you can say - there probably isn''t anything you could add or explain that wouldn''t make this worse.'
 						'Martin slowly shakes his head, but then, just when you think he''s gonna say something else, he just walks off to tend to another customer.'
@@ -494,7 +494,7 @@ if $ARGS[0] = '':
 						'You don''t think you''re off the hook - this definitely hurt your relationship with him. But it''s probably a good sign that he didn''t throw you out, so if you give him some space and keep your conversation with him light, you could probably recover from this.'
 
 						act 'Finish your drink': gt 'qwBarPolet', 'bar'
-					
+
 					else
 						gs 'npc_relationship', 'modify', 'A216', -20
 						pcs_mood -= rand(3,6)
@@ -516,10 +516,10 @@ if $ARGS[0] = '':
 						'With no choice but to comply, you get up and leave the bar.'
 						*nl
 						'This definitely could have gone better...'
-						
+
 						act 'Leave the bar': gt 'city_industrial'
 					end
-				
+
 				else
 					gs 'exp_gain', 'persuas', rand(4,6)
 					npc_rel['A216'] -= 2
@@ -533,13 +533,13 @@ if $ARGS[0] = '':
 					'Regardless of the rest, at least the last bit is definitely honest, and Martin seems satisfied with that. He gives you nod that''s slightly more curt than usual, then walks off to serve another customer.'
 					*nl
 					'You just about managed to save the situation, and you are pretty sure this could have gone A LOT worse, but Martin definitely needs a moment to cool it, and you are suddenly very grateful to have a drink in front of you and a moment to yourself.'
-					
+
 					act 'Finish your drink': gt 'qwBarPolet', 'bar'
 				end
 			end
 		end
-		
-		if func('uniutil', 'student', 'enrolled'): 
+
+		if func('uniutil', 'student', 'enrolled'):
 			act '"I''m a university student"':
 				cla
 				'"I''m going to university," you say, your voice somewhere between pride and shame: Pride over the privilege of receiving a higher education, and shame in the face of thinking of yourself as ''privileged'' while talking to Martin, who you think didn''t have that option... or did he?'
@@ -551,12 +551,12 @@ if $ARGS[0] = '':
 				'"Yeah. Well, I''ve got a room there, at least. I wouldn''t call it living."'
 				'"It can get pretty wild there during the weekend, I heard," Martin comments, "and drunk people can be unpredictable. You watch yourself, okay?"'
 				'"I always do," you reply with a smile, touched by his concern.'
-				
+
 				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
-		
-		if work = 0: 
+
+		if work = 0:
 			act '"I don''t have a job"':
 				cla
 				'"I''m still trying to find the right thing for me," you say, fidgeting with your glass, almost certain about what he''s going to respond.'
@@ -569,11 +569,11 @@ if $ARGS[0] = '':
 				'"Well, here''s to the spirit of equality," you raise your glass and take a gulp.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, Martin presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
+
 		if tanwork = 1:
 			act '"I''m a maid"':
 				cla
@@ -592,12 +592,12 @@ if $ARGS[0] = '':
 				'"And did it get ''weird''?" Martin asks carefully.'
 				'"Like I said, I''m fine," you placate him once again. "It makes sense. I gotta make breakfast and all that, and I have a big room to myself, AND the apartment is right in the city center, so, really, it''s all I could ask for."'
 				'"Well, as long as you''re happy with it." Martin, however, doesn''t sound very happy. Could he be jealous of Nicholas?'
-				
+
 				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
-		
-		if leonidSecretary > 0 or BurgerQW['Secretary'] > 0 or workSec = 1: 
+
+		if leonidSecretary > 0 or BurgerQW['Secretary'] > 0 or workSec = 1:
 			act '"I''m a secretary"':
 				cla
 				'"I''m working as a secretary."'
@@ -612,16 +612,16 @@ if $ARGS[0] = '':
 				'It''s Martin who finally breaks it. "So, uh... How is your work?"'
 				'You shrug. "Lots and lots of paperwork, and my boss can be hard on me sometime."'
 				*nl
-				'You realize what you said the instant you look at Martin, who looks like he wants to comment on that. Thankfully, he holds his tongue and doesn''t make the joke he must have had on his mind.' 
+				'You realize what you said the instant you look at Martin, who looks like he wants to comment on that. Thankfully, he holds his tongue and doesn''t make the joke he must have had on his mind.'
 				'"Well, everybody''s gotta earn their salary somehow," he says instead, and you simply nod in response.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, and in an attempt to end this talk on a higher note, Martin presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if workFabrika = 1: 
+
+		if workFabrika = 1:
 			act '"I work in a factory"':
 				cla
 				'"I''m working in a textile factory."'
@@ -634,12 +634,12 @@ if $ARGS[0] = '':
 				'Martin nods understandingly.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, he presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if workKafe['job'] = 1: 
+
+		if workKafe['job'] = 1:
 			act '"I work as a waitress"':
 				cla
 				'"I am a waitress in a cafe."'
@@ -654,12 +654,12 @@ if $ARGS[0] = '':
 				'Martin nods understandingly.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, he presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if young_shop_work = 1: 
+
+		if young_shop_work = 1:
 			act '"I work in a clothing store"':
 				cla
 				'"I work in a clothing store."'
@@ -675,12 +675,12 @@ if $ARGS[0] = '':
 				'Martin nods understandingly.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, he presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if workrin = 1: 
+
+		if workrin = 1:
 			act '"I''m working a market stand"':
 				cla
 				'"I work at a market stand in Pavlovsk."'
@@ -696,12 +696,12 @@ if $ARGS[0] = '':
 				*nl
 				'You two fall silent after that, letting the somewhat gloomy turn this talk took sink in as you try to think of something to lighten the mood.'
 				'With apparently nobody in the bar requiring his attention yet, Martin eventually asks: "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if stripwork = 1: 
+
+		if stripwork = 1:
 			act '"I work at a strip club"':
 				cla
 				'You blush slightly, but decide to be honest with Martin: "I work in a strip club... as a stripper."'
@@ -715,12 +715,12 @@ if $ARGS[0] = '':
 				*nl
 				'You two fall silent after that, letting your admission sink in and trying to find a topic that can lighten the mood a little.'
 				'With apparently nobody in the bar requiring his attention yet, Martin eventually asks: "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if fame['city_modelling'] > 30: 
+
+		if fame['city_modelling'] > 30:
 			act 'Tell him you''re a model':
 				pcs_horny += rand(1,5)
 				cla
@@ -736,16 +736,16 @@ if $ARGS[0] = '':
 				*nl
 				'It is strangely flattering to know that Martin looked at nude pictures of you. Perhaps he was even jerking off to them... not that he''d admit it.'
 				*nl
-				'Martin looks around as if he were hoping for another patron to serve, but with apparently nobody in the bar requiring his attention yet, he seems hard-pressed to change the topic:' 
+				'Martin looks around as if he were hoping for another patron to serve, but with apparently nobody in the bar requiring his attention yet, he seems hard-pressed to change the topic:'
 				'"So, uh... where do you live?"'
 				'You chuckle to yourself and decide to let him off the hook... for now.'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
+
 	elseif MartinTalkVar = 10 and MartinSex = 1:
-		MartinTalkVar = 11	
+		MartinTalkVar = 11
 		'"Sure, <<$pcs_firstname>>." Martin prepares a drink for you and puts it down in front of you.'
 		*nl
 		'You smile gratefully and take a gulp. Now that you are sitting here, right in front of him, it hits you all over again: You had sex with Martin!'
@@ -772,10 +772,10 @@ if $ARGS[0] = '':
 		'Do you have feelings for Martin beyond physical attraction?'
 		'Well, it doesn''t really matter now. It''s probably the best you could have hoped for: You have friend and experienced lover you can hook up with whenever you feel like it and who just told you that neither of you have to worry about the other''s feelings too much.'
 		'After all, you weren''t actually looking for a serious relationship with a man old enough to be your father, were you?'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
-		
+
+
 	elseif MartinTalkVar = 11 and MartinSex = 1 and npc_rel['A216'] >= 64:
 		MartinTalkVar = 12
 		'"Of course, <<$pcs_firstname>>," Martin says and hands you your poison of choice.'
@@ -802,9 +802,9 @@ if $ARGS[0] = '':
 		'That seems to shake him from his reverie. Grumbling, Martin goes about his duty, walking a little more stiffly than you are used to seeing him.'
 		*nl
 		'You cannot outright see the effect of your words, but the telltale hints of it alone somehow make your drink taste better.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 12 and MartinSex = 1 and npc_rel['A216'] >= 70:
 		MartinTalkVar = 13
 		'Martin nods and a few seconds later, a drink sits in front of you.'
@@ -818,7 +818,7 @@ if $ARGS[0] = '':
 		'The warmth in his expression makes you forget about the actor. "Sounds like you and your siblings are close," you note, sharing his smile.'
 		'"Yeah, I guess we are. We don''t talk much, but," he taps his chest, just above the heart, "in here, where it counts, we care about each other. Always have."'
 		*nl
-		
+
 		if mid($start_type,1,2) = 'sg' and (npc_rel['A33'] >= 50 or npc_rel['A34'] >= 50):
 			'"Yeah, I know what you mean," you nod, thinking of your own siblings. "No matter where they are, you always know that somebody''s there for you."'
 			'"You have siblings?"'
@@ -848,24 +848,24 @@ if $ARGS[0] = '':
 		'He shrugs, trying to play it down. You can sense that he doesn''t like this topic at all, but he says: "It''s fine. We were four brothers, always getting in trouble together. We were known all over town..."'
 		'Martin falls silent again, and you don''t dare say something. It doesn''t look like he''s trying to find the right words, or like he doesn''t want to continue - he seems lost in thought, as if he had simply forgotten he was talking to you.'
 		*nl
-		'Careful and a little worried, you reach for his hand. The moment you touch it, he snaps out of it, a bewildered look on him.' 
+		'Careful and a little worried, you reach for his hand. The moment you touch it, he snaps out of it, a bewildered look on him.'
 		'"Are you okay?" You ask.'
 		'"I''m fine," he assures you, sounding anything but. "Enjoy your drink, mi amor."'
 		*nl
 		'With that, he turns around and, rather than serving patrons, retreats to wash some glasses and check the register, apparently needing some space to pull himself together again.'
 		'Whatever happened to his brothers seems to deeply trouble him.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
+
 	elseif npc_rel['A216'] < 20:
 		'As usual, Martin brings you your drink of choice. He seems to be in a talkative mood today, though, because he stays with you and strikes up a conversation.'
 		*nl
 		'Mind you, it''s not a very deep one - after your first few attempts at smalltalk, you kinda feel like you have to tiptoe around subjects that may be sensitive, and despite you showing that you are quick on your feet and not one to take an insult lying down, he seems a little unsure about how to talk to you, too.'
 		*nl
 		'Still, you manage to keep it going for a while and by the time another patron wants to order something, you feel like you''ve gotten to know each other a little better, even if you''re still a ways away from becoming best friends.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinSex = 1:
 		pcs_horny += rand(0,1)
 		'As per usual, your favorite barman brings you your drink and, wouldn''t you know it, lingers to spend a little time with you.'
@@ -877,16 +877,16 @@ if $ARGS[0] = '':
 		'Still, as per your unspoken agreement, you are not acting on that while Martin is working behind the bar - the fantasy of giving him a blowjob while he''s pouring drinks has its appeal, but, the huge risk of getting caught aside, Martin has to move around too much for that to be practical.'
 		*nl
 		'So, when one of the regulars calls for Martin, you lick your <<$pc_desc[''lip size'']>> lips lasciviously and thank him for the drink in a low, sexy voice before Martin goes back to work, his walk a little funnier than before.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	else
-		'As always, Martin brings you your beverage of choice. Rather then leave to look after his other patrons, though, he sticks around and the two of you chat for a while.'
+		'As always, Martin brings you your beverage of choice. Rather than leave to look after his other patrons, though, he sticks around and the two of you chat for a while.'
 		*nl
 		'You keep the conversation light today, talking about how your respective day was, what has been going on in the bar and the area,' + iif($MartinHobby!'',' and, of course, your <<$MartinHobby>>,','') + ' but really, these subjects are little more than a facade for subtle and not-so-subtle quips, hidden and open insults you try to outwit the other with, and the occasional suggestive remark, usually followed by roaring laughter.'
 		*nl
 		'Neither of you finds out anything mindblowing about the other, but you still feel like you and Martin know each other a little better now, your friendship with him growing stronger the more time you spend with him.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	end
 end
@@ -894,7 +894,7 @@ end
 if $ARGS[0] = 'MartinTalkHobby':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
-	'"All that counts is that you enjoy doing it," Martin comments encouragingly. He seems to want to say or ask something else, but both of you notice something out of the corner of your eyes:' 
+	'"All that counts is that you enjoy doing it," Martin comments encouragingly. He seems to want to say or ask something else, but both of you notice something out of the corner of your eyes:'
 	'A new patron is calling him over, so it looks like this heart-to-heart is coming to an end soon.'
 	*nl
 	'You lean on the counter, giving Martin a coquettish look, as you sometimes do to tease him. "Did that one question already satisfy your curiosity about me?" You ask.'
@@ -907,7 +907,7 @@ if $ARGS[0] = 'MartinTalkHobby':
 end
 
 if $ARGS[0] = 'MartinTalkApartment':
-	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
 	if func('homes_properties', 'has_access', 'city_apartment'):
 		'"Actually, I have a small apartment, on the other side of the park."'
 		*nl
@@ -917,7 +917,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		'"Oh no, I''d never do that," you assure him, your tone still sarcastic.'
 		*nl
 		'From the laughter that follows, the conversation quickly moves away from work and, as per usual, lasts until somebody requires a new drink, leaving you to finish your beverage alone.'
-	
+
 	elseif tanwork = 1:
 		'"I live in the city center, actually."'
 		*nl
@@ -926,7 +926,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		'Martin laughs. "Well, you definitely make it sound complicated. Good for you. But," he turns serious once more, "nothing like that is ever truly ''free'', so... be careful."'
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still nod yes at him before he has to get back to work.'
-	
+
 	elseif func('uniutil', 'student', 'enrolled'):
 		'"I have a room in one of the university dormitories, actually. I wouldn''t call it ''living'', though."'
 		*nl
@@ -935,7 +935,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		'Martin nods understandingly. "I get it. At least you have a place to live near the center. Though it can get pretty wild there during the weekend, I heard," he comments, "and drunk people can be unpredictable. So, you watch yourself, okay?"'
 		*nl
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still smile and say "I always do" before he has to get back to work.'
-	
+
 	elseif mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'):
 		'"I still live with my parents, in Pavlovsk," you admit.'
 		*nl
@@ -945,7 +945,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		'You sigh. "Yeah, it does. I''ll get an apartment of my own as soon as I can. In the city, I hope."'
 		'"You do that, corazón," Martin says, already a little distracted by a patron waving at him, and just like that, you''re alone with your drink.'
-		
+
 	else
 		'You do not want to talk about your current living situation, though. It''s just too embarrassing to talk to him about it while you''re sitting in his bar, so you have to make something up, and quick.'
 		*nl
@@ -958,7 +958,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		'"No no, it''s fine," you cut him off with a hint of panic in your voice. Realizing that, you add more calmly: "I''ll be moving out soon, anyway."'
 		'"Okay..." He says slowly, raising an eyebrow. Before he can make any further inquiries, a nearby patron calls for him, saving you from further embarrassment and giving you time to get your story straight, should he ask again.'
 	end
-	
+
 	act 'Finish your drink': gt 'qwBarPolet', 'bar'
 end
 

File diff suppressed because it is too large
+ 224 - 224
locations/MeynoldHome.qsrc


+ 197 - 197
locations/NikoDreams.qsrc

@@ -10,75 +10,75 @@ if $ARGS[0] = 'family':
 	gs 'cum_cleanup'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/progulka.jpg"></center>'
-	'You feel a hand patting your leg and open your eyes to see Anya kneeling next to you. "<<$pcs_nickname>>, are you okay? It looks like you were having a bad dream." You quickly look around and realize that you''re in your bedroom as Anya stands up. "Come on, everyone''s waiting for us."' 
-	'You tilt your head as you reply. "Who''s waiting for us?"' 
+	'You feel a hand patting your leg and open your eyes to see Anya kneeling next to you. "<<$pcs_nickname>>, are you okay? It looks like you were having a bad dream." You quickly look around and realize that you''re in your bedroom as Anya stands up. "Come on, everyone''s waiting for us."'
+	'You tilt your head as you reply. "Who''s waiting for us?"'
 	'She smiles. "You know. Mom, Vlad and Kolka. Have you hit your head or something? Come on, you know that we can''t eat breakfast without you." She takes your hand and leads you to the kitchen.'
 
-	act 'Enter kitchen':	
+	act 'Enter kitchen':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-		'You enter the kitchen to see your stepfather and Kolka laughing at a joke that you can''t quite hear. They both stop laughing as you enter. Anya offers you a chair and sits down next to you. You look around in relief until you hear something bumping against the kitchen door.' 
-		
-		act 'Turn to see what it is':	
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big28.jpg"></center>'
+		'You enter the kitchen to see your stepfather and Kolka laughing at a joke that you can''t quite hear. They both stop laughing as you enter. Anya offers you a chair and sits down next to you. You look around in relief until you hear something bumping against the kitchen door.'
+
+		act 'Turn to see what it is':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost'+rand(4,6)+'.jpg"></center>'				
-			'Your mother backs out of the kitchen with a tray of food and places some in front of each of you. "Nice of you to finally join us, <<$pcs_nickname>>. I was beginning to think that you were never going to wake up." You giggle as you start eating.'		
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost'+rand(4,6)+'.jpg"></center>'
+			'Your mother backs out of the kitchen with a tray of food and places some in front of each of you. "Nice of you to finally join us, <<$pcs_nickname>>. I was beginning to think that you were never going to wake up." You giggle as you start eating.'
 
 			act 'Eat breakfast':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost'+rand(4,6)+'.jpg"></center>'
-				'Your mother suddenly shouts out. "HEY! No eating until your brother gets here!" You look and see your stepfather whispering in Kolka''s ear, but stopping as soon as you face them.' 
+				'Your mother suddenly shouts out. "HEY! No eating until your brother gets here!" You look and see your stepfather whispering in Kolka''s ear, but stopping as soon as you face them.'
 				'You point at Kolka. "He''s right there..."'
 				'Your mother crosses her arms. "I''m not talking about Kolka." She walks back to the kitchen as your brother and stepfather continue cackling and whispering at each other. You look around in confusion until you hear light moaning nearby.'
 				'You peek over the kitchen doorway to see your mother bent over the stove with a dark burly figure pressing against her before you suddenly feel someone''s hand on one of your breasts.'
 
-				act 'Turn around':	
+				act 'Turn around':
 					*clr & cla
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
-					'You turn to see Kolka squeezing your right breast as he gives your stepfather a thumbs up. You push Kolka away and hear your stepfather shouting. "Hey, don''t push your little brother like that!"' 
-					'You''re taken aback as you respond. "But he touched me!"' 
-					'Your mother then enters the room with her pants around her ankles. "Come on <<$pcs_nickname>>, it''s not like all the other boys haven''t already fucked you before. Why not let your brother have a chance?"' 
-					'Kolka quickly chimes in. "Yeah <<$pcs_nickname>>, don''t be selfish!"' 
-					'You see everyone in the room scolding you before you hear a voice shout. "Don''t worry everyone, I''ll put this bitch in her place!"' 
-
-					act 'Turn to see who it is':	
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
+					'You turn to see Kolka squeezing your right breast as he gives your stepfather a thumbs up. You push Kolka away and hear your stepfather shouting. "Hey, don''t push your little brother like that!"'
+					'You''re taken aback as you respond. "But he touched me!"'
+					'Your mother then enters the room with her pants around her ankles. "Come on <<$pcs_nickname>>, it''s not like all the other boys haven''t already fucked you before. Why not let your brother have a chance?"'
+					'Kolka quickly chimes in. "Yeah <<$pcs_nickname>>, don''t be selfish!"'
+					'You see everyone in the room scolding you before you hear a voice shout. "Don''t worry everyone, I''ll put this bitch in her place!"'
+
+					act 'Turn to see who it is':
 						*clr & cla
 						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/avatars/threaten1.jpg"></center>'					
-						'You turn to see Yurik without any clothes on walking into the room before grabbing you by your throat and pushing you against the wall.'				
-						
-						act 'Continue':	
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/avatars/threaten1.jpg"></center>'
+						'You turn to see Yurik without any clothes on walking into the room before grabbing you by your throat and pushing you against the wall.'
+
+						act 'Continue':
 							*clr & cla
 							gs 'stat'
 							'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/ra8.mp4"></video></center>'
-							'You can faintly feel something entering your pussy and feel tears streaming down your cheeks. You faintly hear some soft voices in the distance. "Watch her head! Don''t drop her! Come on, get that door open!"' 
+							'You can faintly feel something entering your pussy and feel tears streaming down your cheeks. You faintly hear some soft voices in the distance. "Watch her head! Don''t drop her! Come on, get that door open!"'
 							'A few seconds later, you hear someone whispering in your ear. "It''s okay <<$pcs_firstname>>. This is your place now. You didn''t think that you could keep that precious body to yourself, did you?"'
 
 							act 'Turn around':
 								*clr & cla
 								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'					
-								'You slowly turn to see Niko standing next to you with a wide grin on his face. "You never need to worry my princess. I''ll keep your pussy well fed with all the cocks in town." He leans over and gives you a kiss on the cheek.' 
-								
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'
+								'You slowly turn to see Niko standing next to you with a wide grin on his face. "You never need to worry my princess. I''ll keep your pussy well fed with all the cocks in town." He leans over and gives you a kiss on the cheek.'
+
 								act 'Continue':
 									*clr & cla
-									gs'stat'								
-									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum10.mp4"></video></center>'								
+									gs'stat'
+									'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum10.mp4"></video></center>'
 									'You suddenly hear Yurik groan as he starts pumping his cum inside your pussy before talking to Niko. "What a worthless whore. Couldn''t even rock her hips a little. If I wanted to fuck a blow up doll, I would have kept fucking her mother."'
 									'He then leaves as you start hearing the soft voices again, but they sound closer. "Is she going to be okay? She''ll be fine. She just needs some more rest... She''s moving. Do you think she''s...?"'
-									
+
 									act '...':gt 'NikoMeyHome', 'aftermath'
-								end	
-							end	
+								end
+							end
 						end
-					end	
+					end
 				end
-			end	
-		end	
+			end
+		end
 	end
 end
 
@@ -99,11 +99,11 @@ if $ARGS[0] = 'woods':
 	VKSmiley = 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/1.jpg"></center>'
-	'You can feel grass on your face which you quickly brush away before looking around and noticing that you''re in the middle of the woods, surronded by an eerie mist. '+$OpenInnerThought+'What''s going on? Why am I here? How did I get here? Where am I?'+$CloseInnerThought+'' 
+	'You can feel grass on your face which you quickly brush away before looking around and noticing that you''re in the middle of the woods, surronded by an eerie mist. '+$OpenInnerThought+'What''s going on? Why am I here? How did I get here? Where am I?'+$CloseInnerThought+''
 	'You stand up and look around, trying to get your bearings when you hear music and the sounds of laughter in the far distance. '+$OpenInnerThought+'Where is this music coming from? Was that a person laughing? Maybe they can help me.'+$CloseInnerThought+' You start heading in the direction of the noise when you suddenly feel a cold chill running down your spine. '+$OpenInnerThought+'Something about that laughter is... unnerving.'+$CloseInnerThought+''
-	
+
 	act 'Move deeper into the woods':gt 'NikoDreams', 'woods2'
-end	
+end
 
 if $ARGS[0] = 'woods2':
 	*clr & cla
@@ -121,16 +121,16 @@ if $ARGS[0] = 'woods2':
 	elseif VKSmiley = 3:
 		'You can hear someone laughing far away.'
 		PLAY 'sound/happyhome/Smiley.mp3', 25
-	end	
-	
+	end
+
 	if VKSmiley = 1:
 		act 'Move deeper into the woods':gt 'NikoDreams', 'smiley1'
 	else
 		act 'Move deeper into the woods':gt 'NikoDreams', 'woods3'
 	end
-	
+
 	act 'Hide':gt 'NikoDreams', 'woods_hide'
-end	
+end
 
 if $ARGS[0] =  'woods3':
 	*clr & cla
@@ -148,16 +148,16 @@ if $ARGS[0] =  'woods3':
 	elseif VKSmiley = 3:
 		'You can hear someone laughing far away.'
 		PLAY 'sound/happyhome/Smiley.mp3', 25
-	end	
-	
+	end
+
 	if VKSmiley = 1:
 		act 'Move deeper into the woods':gt 'NikoDreams', 'smiley1'
 	else
 		act 'Move deeper into the woods':gt 'NikoDreams', 'woods4'
 	end
-	
+
 	act 'Hide':gt 'NikoDreams', 'woods_hide'
-end	
+end
 
 if $ARGS[0] =  'woods4':
 	*clr & cla
@@ -175,16 +175,16 @@ if $ARGS[0] =  'woods4':
 	elseif VKSmiley = 3:
 		'You can hear someone laughing far away.'
 		PLAY 'sound/happyhome/Smiley.mp3', 25
-	end	
-	
+	end
+
 	if VKSmiley = 1:
 		act 'Move deeper into the woods':gt 'NikoDreams', 'smiley1'
 	else
 		act 'Move deeper into the woods':gt 'NikoDreams', 'woods5'
 	end
-	
+
 	act 'Hide':gt 'NikoDreams', 'woods_hide'
-end	
+end
 
 if $ARGS[0] = 'woods5':
 	*clr & cla
@@ -202,16 +202,16 @@ if $ARGS[0] = 'woods5':
 	elseif VKSmiley = 3:
 		'You can hear someone laughing far away.'
 		PLAY 'sound/happyhome/Smiley.mp3', 25
-	end	
-	
+	end
+
 	if VKSmiley = 1:
 		act 'Move deeper into the woods':gt 'NikoDreams', 'smiley1'
 	else
 		act 'Move deeper into the woods':gt 'NikoDreams', 'woods6'
 	end
-	
+
 	act 'Hide':gt 'NikoDreams', 'woods_hide'
-end	
+end
 
 if $ARGS[0] =  'woods6':
 	*clr & cla
@@ -229,16 +229,16 @@ if $ARGS[0] =  'woods6':
 	elseif VKSmiley = 3:
 		'You can hear someone laughing far away.'
 		PLAY 'sound/happyhome/Smiley.mp3', 25
-	end	
-	
+	end
+
 	if VKSmiley = 1:
 		act 'Move deeper into the woods':gt 'NikoDreams', 'smiley1'
 	else
 		act 'Move deeper into the woods':gt 'NikoDreams', 'woods7'
 	end
-	
+
 	act 'Hide':gt 'NikoDreams', 'woods_hide'
-end	
+end
 
 if $ARGS[0] = 'woods7':
 	*clr & cla
@@ -257,17 +257,17 @@ if $ARGS[0] = 'woods7':
 	elseif VKSmiley = 3:
 		'You can hear someone laughing far away.'
 		PLAY 'sound/happyhome/Smiley.mp3', 25
-	end	
+	end
 	'You can hear a woman crying in the distance.'
-	
+
 	if VKSmiley = 1:
 		act 'Head toward the train tracks':gt 'NikoDreams', 'smiley1'
 	else
 		act 'Head toward the train tracks':gt 'NikoDreams', 'woods8'
 	end
-	
+
 	act 'Hide':gt 'NikoDreams', 'woods_hide'
-end	
+end
 
 if $ARGS[0] = 'woods8':
 	*clr & cla
@@ -286,17 +286,17 @@ if $ARGS[0] = 'woods8':
 	elseif VKSmiley = 3:
 		'You can hear someone laughing far away.'
 		PLAY 'sound/happyhome/Smiley.mp3', 25
-	end	
+	end
 	'You can hear a woman crying nearby.'
-	
+
 	if VKSmiley = 1:
 		act 'Move deeper into the woods':gt 'NikoDreams', 'smiley1'
 	else
 		act 'Move deeper into the woods':gt 'NikoDreams', 'woods_home'
 	end
-	
+
 	act 'Hide':gt 'NikoDreams', 'woods_hide'
-end	
+end
 
 if $ARGS[0] =  'woods_home':
 	*clr & cla
@@ -312,9 +312,9 @@ if $ARGS[0] =  'woods_home':
 	end
 	*nl
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/weepeeidle.jpg"></center>'
-	
+
 	act 'Approach the crying woman':gt 'NikoDreams', 'weepee1'
-end	
+end
 
 if $ARGS[0] = 'teehee':
 	*clr & cla
@@ -322,28 +322,28 @@ if $ARGS[0] = 'teehee':
 	gs 'stat'
 	if VKTeeHee = 0:
 		'<center><b><h4><font color=#FF00CC><<"Strange Cat">></font></h4></b></center>'
-	else	
+	else
 		'<center><b><h4><font color=#FF00CC><<"TeeHee">></font></h4></b></center>'
 	end
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/teehee.jpg"></center>'
 	if VKTeeHee = 0:
-		'You approach the cat and it turns to you with a creepy grin. "Tee hee, who is thee?"' 
-		'You recoil in shock. "You can talk?!" 
-		The cat grins wider. "Only if you want me to. Tee hee." 
-		"Umm, what do you want exactly?"' 
-		'The cat laughs. "What do I want? You approached me. Tee hee." 
-		"My name is <<$pcs_firstname>>. What''s yours?"' 
-		'The cat grins again. "My name is TeeHee and I am so happy to meet thee."' 
+		'You approach the cat and it turns to you with a creepy grin. "Tee hee, who is thee?"'
+		'You recoil in shock. "You can talk?!"
+		The cat grins wider. "Only if you want me to. Tee hee."
+		"Umm, what do you want exactly?"'
+		'The cat laughs. "What do I want? You approached me. Tee hee."
+		"My name is <<$pcs_firstname>>. What''s yours?"'
+		'The cat grins again. "My name is TeeHee and I am so happy to meet thee."'
 		*nl
 		'You pet TeeHee''s head, causing her to start purring. "This is the end of the path for now. Come with me to return to your own path."
-		"But that woman might need my help."' 
+		"But that woman might need my help."'
 		'TeeHee frowns as she responds. "She doesn''t need you for the reasons you may think. You really should come with me, not WeePee."'
 	else
 		'We meet again, <<$pcs_firstname>>. Have you come to re-join your own path, or do you wish to stay and face WeePee''s wrath?'
 	end
-	
+
 	act 'Accept TeeHee''s offer': VKTeeHee = 1 & VKWoods = -1 & VKSmiley = 3 & gt 'NikoMeyHome', 'aftermath2'
-	
+
 	act 'Walk away':VKTeeHee = 1 & gt 'NikoDreams', 'woods_home'
 end
 
@@ -368,7 +368,7 @@ if $ARGS[0] =  'weepee1':
 	'As you approach the crying woman, she instantly turns around and lunges toward you, shoving her hand into your chest and pulling out your heart, staring into your eyes as she watches your life slowly drain away...'
 
 	act 'Rest in peace': VKSmiley = 3 & gt 'NikoMeyHome', 'aftermath2'
-end	
+end
 
 if $ARGS[0] =  'woods_hide':
 	*clr & cla
@@ -380,14 +380,14 @@ if $ARGS[0] =  'woods_hide':
 		VKSmiley = rand(3,4)
 		PLAY 'sound/happyhome/Smiley.mp3', 100
 	else
-		*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'	
+		*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 		'You quickly duck behind a tree and stare into the forest. You wait for a few seconds before realizing that there''s nothing there. You get out from behind the tree and brush the dirt from your leg.'
 		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/<<VKWoods>>.jpg"></center>'
 	end
-	
+
 	act 'Continue':gt 'NikoDreams', 'woods<<VKWoods>>'
-end	
+end
 
 if $ARGS[0] =  'friends':
 	*clr & cla
@@ -395,25 +395,25 @@ if $ARGS[0] =  'friends':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/vicky.jpg"></center>'
 	'You slowly open your eyes and see Vicky playfully shaking your shoulder. "Hey there, sleepy head! Did you sleep well?"'
 	'You give <<$VK_VikName>> a warm smile. "I guess but... Where am I?"
-	"After what happened at school, we were bored, so we decided to have you dance for us." Vicky replies and you tilt your head.' 
-	'"Dance... for us?" Vicky giggles as she points to her right. You turn to see Katja and Natalia sitting next to the bed.' 
-	
+	"After what happened at school, we were bored, so we decided to have you dance for us." Vicky replies and you tilt your head.'
+	'"Dance... for us?" Vicky giggles as she points to her right. You turn to see Katja and Natalia sitting next to the bed.'
+
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meynold/bedroom/katja.jpg"></center>'
-	'"Come on <<$pcs_nickname>>. What are you waiting for?" Katja asks.' 
+	'"Come on <<$pcs_nickname>>. What are you waiting for?" Katja asks.'
 	'Natalia nods "Don''t worry, I threw away all your clothes. Whores don''t need clothes." You look down and notice that you''re naked before Katja suddenly slams the bed frame. "Enough messing around! DANCE WHORE!"'
-	
-	act 'Dance':	
+
+	act 'Dance':
 		*clr & cla
 		gs 'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/Cam/cam2.mp4"></video></center>'
-		'You quickly stand up and start dancing as Vicky reaches forward and shoves her fingers inside your pussy while Katja sticks her finger in your ass. Natalia walks up to you and starts squeezing your breasts.' 
-		'"And they thought that Sonia was a whore." Vicky says and Katja giggles.' 
+		'You quickly stand up and start dancing as Vicky reaches forward and shoves her fingers inside your pussy while Katja sticks her finger in your ass. Natalia walks up to you and starts squeezing your breasts.'
+		'"And they thought that Sonia was a whore." Vicky says and Katja giggles.'
 		'"That''s just silly! <<$pcs_firstname>> is the only whore here."'
-		'Natalia nods. "I agree. I don''t even know why she thought that she could hide it."' 
+		'Natalia nods. "I agree. I don''t even know why she thought that she could hide it."'
 		''+$OpenInnerThought+'Why are they being so mean to me? And why can''t I stop dancing?'+$CloseInnerThought+''
 		'Vicky gives your ass a firm smack. "Alright, we''ve kept the boys waiting long enough!"'
 
-		act 'Boys?':	
+		act 'Boys?':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/exposed1.jpg"></center>'
@@ -421,14 +421,14 @@ if $ARGS[0] =  'friends':
 			'"Here''s the whore again! <<$pcs_firstname>> doesn''t even care about trying to hide it!" Artem says.'
 			'"I know right? She''s such a worthless whore. I almost don''t even want her anymore," Petka responds.'
 			'"Her pussy is probably all stretched out by now. It''s like ground zero," Radomir adds.'
-			
-			act 'Boys?':	
+
+			act 'Boys?':
 				*clr & cla
-				gs 'stat'			
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big7.jpg"></center>'		
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big7.jpg"></center>'
 				'Lesco then walks up to you. "It may be used up, but I might as well try it." He then grabs you by the hair, pulls out his dick and shoves it in your mouth.'
-			
-				act 'Suck Lesco''s dick':	
+
+				act 'Suck Lesco''s dick':
 					*clr & cla
 					gs 'stat'
 					'<center><video autoplay loop src="images/shared/sex/blowjob/blowjob3.mp4"></video></center>'
@@ -436,48 +436,48 @@ if $ARGS[0] =  'friends':
 					'"Wow! <<$pcs_firstname>> is even sucking Lesco''s dick. What a fucking cum dumpster!" Lena comments.'
 					'"She seems to be enjoying it too. Gross!" Lera responds.'
 					'"Don''t look at me. I never taught her that." Mr Tsarev adds.'
-					
-					act 'Continue':	
+
+					act 'Continue':
 						*clr & cla
 						gs 'stat'
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/hall1.mp4"></video></center>'
 						'Lesco pulls you up on top of him and you start riding his dick as tears stream down your face. '+$OpenInnerThought+'Why is this happening? Why are they all laughing at me? Please someone make this stop!'+$CloseInnerThought+''
 
-						act 'Continue riding him':	
+						act 'Continue riding him':
 							*clr & cla
 							gs 'stat'
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/cum/cum3.mp4"></video></center>'
-							'Lesco groans as he pumps his cum inside you. You look down to see your belly inflating as a seemingly endless stream of cum pours into you.' 
+							'Lesco groans as he pumps his cum inside you. You look down to see your belly inflating as a seemingly endless stream of cum pours into you.'
 
-							act 'Continue':	
+							act 'Continue':
 								*clr & cla
-								gs 'stat'					
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/progulka.jpg"></center>'	
+								gs 'stat'
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/progulka.jpg"></center>'
 								'Anya suddenly grabs you by the hair and leads you to the door. "Mom needs to speak with you, <<$pcs_firstname>>."'
-						
-								act 'Walk through the door':	
+
+								act 'Walk through the door':
 									*clr & cla
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost'+rand(4,6)+'.jpg"></center>'
-									'You enter the room, recognizing it as your apartment. Your mother is standing in front of you with a sneer on her face. "<<$pcs_firstname>>! You let those boys get you pregnant? I can''t believe you!"  
+									'You enter the room, recognizing it as your apartment. Your mother is standing in front of you with a sneer on her face. "<<$pcs_firstname>>! You let those boys get you pregnant? I can''t believe you!"
 									"Not only that. She''s also been eating my pussy," Anya adds and your mother''s eyes widen.'
 									'Kolka speaks up too. "She also had sex with me and is the mother of my child."'
-									'Your mother is seething with rage as she grabs onto a knife and drives it into your inflated stomach, causing the cum to flood out.' 
+									'Your mother is seething with rage as she grabs onto a knife and drives it into your inflated stomach, causing the cum to flood out.'
 
-									act 'Fall':	
+									act 'Fall':
 										*clr & cla
-										gs 'stat'							
+										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/friends/darkness.jpg"></center>'
 										'You fall to the ground and stare at your stomach, watching as an almost endless stream of cum pours out of you. You suddenly hear someone whisper in your ear. "Hey, are you alright?" You look around to see who it was, but see nothing at all. You''re surrounded by darkness. '+$OpenInnerThought+'Where did everyone go? Where am I? It''s so dark.'+$CloseInnerThought+' You hear the voice whisper again. "<<$pcs_firstname>>, wake up..."'
 										act '...': gt 'NikoEv2', 'niko_wake'
-									end	
-								end	
-							end	
-						end	
+									end
+								end
+							end
+						end
 					end
-				end	
+				end
 			end
-		end	
+		end
 	end
 end
 
@@ -485,57 +485,57 @@ if $ARGS[0] = 'classroom_dream':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/rest.jpg"></center>'
-	'You can feel yourself getting tired, so you lay your head down on your desk to rest as you wait for the period to end. After a few seconds, you hear someone shouting. "Who''s that sleeping in my class?" You immediately sit up, pretending that you weren''t laying down as you continue listening to the teacher. "Always remember to double check the problem, so that you can be confident with your solution. Now let''s move on to the next lesson... How to treat a whore. For this lesson, I will need a volunteer. Miss <<$pcs_lastname>>, get up here now."' 
+	'You can feel yourself getting tired, so you lay your head down on your desk to rest as you wait for the period to end. After a few seconds, you hear someone shouting. "Who''s that sleeping in my class?" You immediately sit up, pretending that you weren''t laying down as you continue listening to the teacher. "Always remember to double check the problem, so that you can be confident with your solution. Now let''s move on to the next lesson... How to treat a whore. For this lesson, I will need a volunteer. Miss <<$pcs_lastname>>, get up here now."'
 
-	act 'Who me?':	
+	act 'Who me?':
 		*clr & cla
-		gs 'stat'	
-		*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'	
+		gs 'stat'
+		*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 		'You recoil in shock. "Wha... Me?" The teacher places both hands on your desk. "Of course I mean you. Do you know of any other whores that haven''t already volunteered?" You can just barely make out Sonia under the table sucking on the teacher''s dick.'
 
-		act 'Walk to the front of the class':	
+		act 'Walk to the front of the class':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/stand.jpg"></center>'
-			'As you walk to the front of the class, you suddenly feel your clothes falling off. You quickly try to grab them, but they dissolve in your hands. You try covering your body, but the teacher shouts at you. "STOP COVERING YOURSELF YOUNG LADY! Whores should always keep their fuckholes on display." You can feel your body trembling as you finally approach the front of the class. "Now this is what you do to a whore. Notice her pussy here? This is the best place to fuck, but don''t get carried away, or she could end up pregnant with a whore baby." He then motions you to come toward him.'		
+			'As you walk to the front of the class, you suddenly feel your clothes falling off. You quickly try to grab them, but they dissolve in your hands. You try covering your body, but the teacher shouts at you. "STOP COVERING YOURSELF YOUNG LADY! Whores should always keep their fuckholes on display." You can feel your body trembling as you finally approach the front of the class. "Now this is what you do to a whore. Notice her pussy here? This is the best place to fuck, but don''t get carried away, or she could end up pregnant with a whore baby." He then motions you to come toward him.'
 
-			act 'Move closer':	
+			act 'Move closer':
 				*clr & cla
 				gs 'stat'
 				'<center><video autoplay loop src="images/shared/sex/blowjob/blowjob1.mp4"></video></center>'
-				'As soon as you get close, the teacher grabs you and forces you onto your knees. He pushes his dick against your lips. "Open up for your reward." You open your mouth, allowing his dick to enter. You start eagerly sucking his dick for what feels like a few minutes before he grabs your waist, lifts you up and drops you on top of his desk.' 
+				'As soon as you get close, the teacher grabs you and forces you onto your knees. He pushes his dick against your lips. "Open up for your reward." You open your mouth, allowing his dick to enter. You start eagerly sucking his dick for what feels like a few minutes before he grabs your waist, lifts you up and drops you on top of his desk.'
 
-				act 'See what he does':	
+				act 'See what he does':
 					*clr & cla
-					gs 'stat'				
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/sex.jpg"></center>'
 					'He pushes you over, rams his dick inside you and starts thrusting. All you can think about is the humiliation of being fucked by your teacher in front of your class. '+$OpenInnerThought+'Why is this happening? Why me? Will I never have a normal life again? Will I always be...'+$CloseInnerThought+' You suddenly hear a soft voice whispering in your ear. "Hey <<$pcs_firstname>>, are you okay? Come on, get up..."'
 
-					act 'Continue':	
+					act 'Continue':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/leave.jpg"></center>'
-						'You open your eyes and see all of the students getting out of their chairs and leaving the class while chatting with each other. You feel a hand on your shoulder shaking you, so you quickly turn to see Natalia with a concerned look on her face. "Are you alright, <<$pcs_firstname>>?"' 
-						'You take a second to collect your thoughts before responding. "I don''t know why I keep having these terrible nightmares."' 
+						'You open your eyes and see all of the students getting out of their chairs and leaving the class while chatting with each other. You feel a hand on your shoulder shaking you, so you quickly turn to see Natalia with a concerned look on her face. "Are you alright, <<$pcs_firstname>>?"'
+						'You take a second to collect your thoughts before responding. "I don''t know why I keep having these terrible nightmares."'
 						'Natalia rubs your back as she responds. "Things must be so hard for you. I''m so sorry."'
-						'Not wanting to worry Natalia, you give her a fake smile. "They''re just dreams, I''ll be fine."' 
-					
-						act 'Smile at Natalia':	
+						'Not wanting to worry Natalia, you give her a fake smile. "They''re just dreams, I''ll be fine."'
+
+						act 'Smile at Natalia':
 							*clr & cla
 							NikoEv = 13
-							gs 'stat'	
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natalia/love/smile1.jpg"></center>'									
-							'Natalia rubs your forehead when you suddenly hear heavy breathing and turn to see Petia. "Are you two gonna kiss?"' 
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natalia/love/smile1.jpg"></center>'
+							'Natalia rubs your forehead when you suddenly hear heavy breathing and turn to see Petia. "Are you two gonna kiss?"'
 							'Natalia recoils in shock. "Go away, perv!" Petia quickly walks away and Natalia looks back at you. "We can talk later."'
 							'You smile. "That sounds great."'
-							'You then both walk out of the class.'	
+							'You then both walk out of the class.'
 
 							act 'Leave classroom':minut += 5 & gt 'NikoEv2', 'Lunch Chat'
 						end
-					end	
-				end	
-			end	
-		end	
+					end
+				end
+			end
+		end
 	end
 end
 
@@ -546,13 +546,13 @@ if $ARGS[0] =  'Puppeteer':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/rest.jpg"></center>'
 	'You can feel the day dragging in slowly, so you rest your head on the desk trying your best to focus on anything but today''s lesson. The light occasionally creeps in between your arms so you keep re-adjusting until it stops, causing you to feel at peace as you slumber through the lesson.'
 
-	act 'Wake up':	
+	act 'Wake up':
 		*clr & cla
 		gs'stat'
 		'<center><img src="images/shared/home/bedroom/dream/class/1.jpg"></center>'
-		'You awaken and slowly lift your head, looking around the room but immediately recoil in shock when you notice how dark the classroom is. '+$OpenInnerThought+'Whoa, how long did I sleep? Oh shit, I must have slept through the whole day! I should get home right now!'+$CloseInnerThought+' You quickly shove your books into your bag and walk to the door.'	
-	
-		act 'Go to the hallway':	
+		'You awaken and slowly lift your head, looking around the room but immediately recoil in shock when you notice how dark the classroom is. '+$OpenInnerThought+'Whoa, how long did I sleep? Oh shit, I must have slept through the whole day! I should get home right now!'+$CloseInnerThought+' You quickly shove your books into your bag and walk to the door.'
+
+		act 'Go to the hallway':
 			*clr & cla
 			if music_on = 1:
 				$track_loop = 'sound/happyhome/happyhome.mp3'
@@ -563,46 +563,46 @@ if $ARGS[0] =  'Puppeteer':
 				music_loop = 0
 				close all
 				pl '<a href="exec: music_on = 1 & gt ''NikoDreams'', ''Woods''">Play music</a>'
-			end		
+			end
 			PLAY 'sound/happyhome/puppet.mp3', 25
 			gs 'stat'
 			'<center><img src="images/shared/home/bedroom/dream/class/2.jpg"></center>'
-			'As soon as you reach the hallway, you hear a strange muffled laugh in the distance, along with a strange melody which sounds very far away. '+$OpenInnerThought+'Who could that be? Maybe someone is flooding one of the bathrooms again. That music though. Where is it coming from? Outside maybe?'+$CloseInnerThought+''		
+			'As soon as you reach the hallway, you hear a strange muffled laugh in the distance, along with a strange melody which sounds very far away. '+$OpenInnerThought+'Who could that be? Maybe someone is flooding one of the bathrooms again. That music though. Where is it coming from? Outside maybe?'+$CloseInnerThought+''
 
-			act 'Head downstairs':	
+			act 'Head downstairs':
 				*clr & cla
 				PLAY 'sound/happyhome/puppet.mp3', 50
 				gs 'stat'
 				'<center><img src="images/shared/home/bedroom/dream/class/3.jpg"></center>'
 				'You reach the bottom of the stairs and hear the laughter getting louder. '+$OpenInnerThought+'Hmm, I must be getting closer.'+$CloseInnerThought+' The hallway is dark, but you can see a light at the end.'
 
-				act 'Continue down the hallway':	
+				act 'Continue down the hallway':
 					*clr & cla
 					PLAY 'sound/happyhome/puppet.mp3',75
 					gs 'stat'
 					'<center><img src="images/shared/home/bedroom/dream/class/4.jpg"></center>'
 					'You continue walking down the hallway until you reach a strange puddle on the floor, coming from one of the lockers. '+$OpenInnerThought+'What is this stuff? Did someone have a drink in their locker that''s spilled?'+$CloseInnerThought+' When you look closer, you notice that the locker is slightly open and leaking the strange liquid.'
-					
-					act 'Open the locker':	
+
+					act 'Open the locker':
 						*clr & cla
 						PLAY 'sound/happyhome/puppet.mp3', 100
 						gs 'stat'
 						'<center><b><h4><font color=#FFA200><<"Puppet">></font></h4></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/puppet.jpg"></center>'	
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/puppet.jpg"></center>'
 						'You slowly open the locker to find a creepy doll inside, which is constantly laughing in an automated voice. '+$OpenInnerThought+'Who left this here? And why is it all wet? What is this stuff?'+$CloseInnerThought+' The doll is heavier than it looks and seems to be covered in a thick warm liquid. '+$OpenInnerThought+'What is this?'+$CloseInnerThought+' You look closely as you hold up the doll to the light and notice that the liquid is dark red, almost like blood. The doll has some strings attached to it''s wrists and ankles. '+$OpenInnerThought+'Maybe it''s a puppet?'+$CloseInnerThought+' You look into it''s eyes and notice your own reflection next to something else...'
-						
-						act 'Turn around':	
+
+						act 'Turn around':
 							*clr & cla
 							PLAY 'sound/happyhome/puppeteer.mp3', 80
 							gs'stat'
 							'<center><b><h4><font color=#FFA200><<"Puppeteer">></font></h4></b></center>'
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/puppeteer.jpg"></center>'	
-							'You turn around, but are quickly grabbed by the cheeks and launched onto the ground by a horrific looking man with long sharp nails. You dive to the side, dodging a swipe of his nails before quickly crawling away, only to be grabbed by your ankles and dragged back. You let out a loud scream as the insane laughing man pulls you towards him. You turn to try and fight him off, but he immediately drives his nails into your eyes...'					
-							
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/puppeteer.jpg"></center>'
+							'You turn around, but are quickly grabbed by the cheeks and launched onto the ground by a horrific looking man with long sharp nails. You dive to the side, dodging a swipe of his nails before quickly crawling away, only to be grabbed by your ankles and dragged back. You let out a loud scream as the insane laughing man pulls you towards him. You turn to try and fight him off, but he immediately drives his nails into your eyes...'
+
 							act '...':
 								*clr & cla
 								music_loop = 0
-								close all							
+								close all
 								gs'stat'
 								'<center><b><h4><font color=#FF00CC><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 								*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
@@ -613,15 +613,15 @@ if $ARGS[0] =  'Puppeteer':
 								'"I hope that she''s okay..." Natalia asks in a concerned voice.'
 								'"I bet she was just looking for attention. I wouldn''t put it past her." Christina sneers.'
 								'"Maybe she''s just a psycho bitch and finally snapped?" Bella says in a mocking tone.'
-								
-								act 'Quickly leave the classroom': gt 'gschool_lessons', 'short_break' 
-							end	
+
+								act 'Quickly leave the classroom': gt 'gschool_lessons', 'short_break'
+							end
 						end
 					end
 				end
-			end	
+			end
 		end
-	end	
+	end
 end
 
 if $ARGS[0] =  'Night Out':
@@ -630,38 +630,38 @@ if $ARGS[0] =  'Night Out':
 	'<center><img src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 	''
 
-	act '':	
+	act '':
 		*clr & cla
 		gs'stat'
 		'<center><img src="images/shared/home/bedroom/dream/class/1.jpg"></center>'
-		''	
+		''
 
-		act '':	
+		act '':
 			*clr & cla
 			gs'stat'
 			'<center><img src="images/shared/home/bedroom/dream/class/2.jpg"></center>'
-			''	
-			
-			act '':	
+			''
+
+			act '':
 				*clr & cla
 				gs'stat'
 				'<center><img src="images/shared/home/bedroom/dream/class/3.jpg"></center>'
 				''
-				
+
 				act '': gt'', ''
-			end	
-		end		
+			end
+		end
 	end
-	
-	act '':	
+
+	act '':
 		*clr & cla
 		gs'stat'
 		'<center><img src="images/characters/pavlovsk/school/boy/niko/nikoev2/.jpg"></center>'
-		''	
+		''
 
 		act '': gt'', ''
-	end	
-end	
+	end
+end
 
 if $ARGS[0] =  'Toilet Time':
 	*clr & cla
@@ -669,51 +669,51 @@ if $ARGS[0] =  'Toilet Time':
 	'<center><img src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 	''
 
-	act '':	
+	act '':
 		*clr & cla
 		gs'stat'
 		'<center><img src="images/shared/home/bedroom/dream/class/4.jpg"></center>'
-		''	
+		''
 
-		act '':	
+		act '':
 			*clr & cla
 			gs'stat'
 			'<center><img src="images/shared/home/bedroom/dream/class/4.jpg"></center>'
 			''
-			
-			act '':	
+
+			act '':
 				*clr & cla
 				gs'stat'
 				'<center><img src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/Toilet/vket.jpg"></center>'
-				''			
+				''
 
-				act '':	
+				act '':
 					*clr & cla
 					gs'stat'
 					'<center><img src="images/characters/pavlovsk/school/boy/niko/nikoev2/.jpg"></center>'
-					''			
+					''
 
 					act '':gt '', ''
-				end	
-			end	
+				end
+			end
 		end
-		
-		act '':	
+
+		act '':
 			*clr & cla
 			gs'stat'
 			'<center><img src="images/characters/pavlovsk/school/boy/niko/nikoev2/.jpg"></center>'
-			''			
+			''
 
-			act '':	
+			act '':
 				*clr & cla
 				gs'stat'
 				'<center><img src="images/characters/pavlovsk/school/boy/niko/nikoev2/.jpg"></center>'
-				''			
+				''
 
 				act '':gt '', ''
-			end	
-		end		
-	end	
-end	
+			end
+		end
+	end
+end
 
 --- NikoDreams ---------------------------------

File diff suppressed because it is too large
+ 296 - 296
locations/NikoMeyHome.qsrc


+ 19 - 19
locations/Serge_Shulgin.qsrc

@@ -1,6 +1,6 @@
 # Serge_Shulgin
 !============================================================================================================!
-!Vasily Shulgin (Shulga)''s father------------------------------------------------------------------------------! 
+!Vasily Shulgin (Shulga)''s father------------------------------------------------------------------------------!
 !FULL NAME: Sergey Borisovich Shulgin-------------------------------------------------------------------------------!
 !------------------------------------------------------------------------------------------------------------!
 !serge_shulgin - relationship stages:--------------------------------------------------------------------------!
@@ -9,7 +9,7 @@
 ! > 50 - close friend (sex)---------------------------------------------------------------------------------!
 ! > 70 - very close friend (more diverse sex options)----------------------------------------------------!
 ! >=100 - Sergey gives you a key to the apartment (you can enter whenever you want)----------------------------------!
-!============================================================================================================! 
+!============================================================================================================!
 !\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/!
 
 if serge_sleep_sex_day ! daystart: serge_sleep_sex_count = 2
@@ -26,7 +26,7 @@ end
 !-------------------------------------------------------------------------------------------------------------------!
 
 !Sergey is lying in bed, watching TV. You can chat with him (<30), join him watching TV (>30), sleep in his bed (>50) and seduce him----------!
-!===================================================================================================================! 
+!===================================================================================================================!
 if $ARGS[0] = 'tv':
 	$menu_loc = 'Serge_Shulgin'
 	$menu_arg = 'tv'
@@ -35,7 +35,7 @@ if $ARGS[0] = 'tv':
 	minut += 1
 	gs 'stat'
 	if sergebazar_day ! daystart: sergebazar_count = 10
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/serge/serge2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big112.jpg"></center>'
 	'Sergey Borisovich, born in 1967. His hair is gray by now, and he has a small beer belly, but in your eyes he still looks good for his age. His then-wife divorced him a long time ago and he has been single ever since, raising Vasily by himself.'
 	gs 'Serge_Shulgin', 'rep'
 
@@ -48,10 +48,10 @@ if $ARGS[0] = 'tv':
 		if sergebazar_count > 0: npc_rel['A112'] +=1
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/serge/serge1.jpg"></center>'
-		'Sergey is relaxing on his bed, watching some TV.' 
+		'Sergey is relaxing on his bed, watching some TV.'
 		if npc_rel['A112']<30: 'You sit down on a chair in his bedroom.' else 'You signal for Sergey to scooch over, and lie down on the bed next to him.'
 		*pl
-		if sergebazar_count <= 0: 
+		if sergebazar_count <= 0:
 			'Sergey seems a tad annoyed when he says: "Not now, <<$pcs_nickname>>! Sorry, but this important match just started and I really want to watch it."'
 		else
 			if npc_rel['A112'] <= 50:gs 'Serge_Shulgin','hide','serge_textb'
@@ -60,7 +60,7 @@ if $ARGS[0] = 'tv':
 		act 'Continue': gt 'Serge_Shulgin','tv'
 	end
 
-	if npc_rel['A112'] > 30: 
+	if npc_rel['A112'] > 30:
 		act 'Lie down next to him and watch TV together': gt 'Serge_Shulgin','hide','serge_tv'
 	end
 end
@@ -72,10 +72,10 @@ if $ARGS[0] = 'sleep':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/serge/sleep.jpg"></center>'
 	'Sergey is sound asleep.'
 	act 'Get out of bed': gt 'vasilyhome', 'sergey_room'
-	act 'Wake him up': 
+	act 'Wake him up':
 		'Sergey rubs his eyes, a bit irritated that you woke him up: "What do you want, <<$pcs_nickname>>? You really shouldn''t be waking me up, I need my sleep!"'
 		'You bite your lip, feeling bad for waking him up. You ask him: "Sorry, uncle Sergey. Would you mind if I take a nap with you?"'
-		if npc_rel['A112'] < 50: 
+		if npc_rel['A112'] < 50:
 			!--------------------!
 			!He does not allow you to sleep next to him!
 			!--------------------!
@@ -93,7 +93,7 @@ if $ARGS[0] = 'sleep':
 			minut += 2
 			gs 'stat'
 			'He sighs and wordlessly moves over to one side of the bed, offering you the other half while he clutches his pillow.'
-			act 'Sleep with Sergey': 
+			act 'Sleep with Sergey':
 				!---------------------------------------!
 				!Sleep next to Sergey!
 				!---------------------------------------!
@@ -118,7 +118,7 @@ if $ARGS[0] = 'hide':
 		else
 			minut +=30
 			gs'stat'
-			if rand(1,100) > 10: 
+			if rand(1,100) > 10:
 				gs 'Serge_Shulgin','hide','serge_tv_rand'
 			else
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvrekl'+rand(1,4)+'.mp4" width="748" height="540"></video></center> Ugh, commercials...'
@@ -126,9 +126,9 @@ if $ARGS[0] = 'hide':
 			act 'Get out of bed': gt 'vasilyhome', 'sergey_room'
 			act 'Change the channel': gt 'Serge_Shulgin','hide','serge_tv'
 			if npc_rel['A112'] > 50:
-				act 'Switch to the porn channel': 
+				act 'Switch to the porn channel':
 					*clr & cla
-					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvporn'+rand(1,5)+'.mp4" width="748" height="540"></video></center>' 
+					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/tv/tvporn'+rand(1,5)+'.mp4" width="748" height="540"></video></center>'
 					'You switch to the porn channel and put the remote away. Sergey is a bit surprised you would want to watch this, but says nothing.'
 					if pcs_horny > 30: 'You feel Sergey''s body shifting a lot during a particularly rough part of the porn scene, and he''s awkwardly covering his groin with his hands. The large bulge in his pants gives away his obvious erection anyway.'
 					gs 'arousal', 'porn', 10
@@ -150,15 +150,15 @@ if $ARGS[0] = 'hide':
 		'You idly rub your hands over your body, occasionally touching his groin or chest to make sure you have his attention. When you let out a soft moan, you can feel him stirring next to you in the bed; he''s definitely paying attention to you now! You secretly smile to yourself: he''s such a typical guy... all you have to do is rub your tits and ass a little, and there''s no way he can resist your charms!'
 		gs 'arousal', 'foreplay', 5
 		gs 'stat'
-		if npc_rel['A112'] < 70: 
+		if npc_rel['A112'] < 70:
 			act 'Continue': gs 'Serge_Shulgin','hide','sleep_nameksex_otkaz'
 		else
-			if serge_sleep_sex_count <= 0: 
+			if serge_sleep_sex_count <= 0:
 				act 'Continue': gs 'Serge_Shulgin','hide','serge_sleep_sex_perebor'
 			else
-				if pcs_horny < 50: 
+				if pcs_horny < 50:
 					act 'Suggest you could make him feel good': gt 'Serge_Shulgin','hide','sleep_nameksex_oral'
-				elseif pcs_horny < 75: 
+				elseif pcs_horny < 75:
 					act 'Suggest you could make him feel good': gt 'Serge_Shulgin','hide','sleep_nameksex_rought'
 				else
 					act 'Beg him to make you feel good': gt 'Serge_Shulgin','hide','sleep_nameksex_lick'
@@ -293,7 +293,7 @@ if $ARGS[0] = 'hide':
 		gs 'stat'
 		act 'Lie down on the bed':
 			*clr & cla
-			'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/miss'+rand(1,2)+'.mp4"></video></center>'	
+			'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/miss'+rand(1,2)+'.mp4"></video></center>'
 			'Sergey has you spread your legs wide, and rams nearly the full length of his dick inside you in one fluent motion. Instinctively you wrap your legs around his hips, which he sees as an encouragement to get even deeper inside you.'
 			'You wrap your arms around his strong torso as well, and let him hammer away at your pussy. Then you squeal: he''s biting your ear lobe!'
 			'Your boobs are squished between your body and his, as Sergey rests his body on top of yours and focuses everything on fucking your cunt as hard as he can. Despite his size, it''s not uncomfortable at all... it feels heavenly! Sergey gets it, this is how you fuck a woman!'
@@ -377,7 +377,7 @@ if $ARGS[0] = 'hide':
 						gs 'cum_call','face',$boy,1
 						'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/cum'+rand(1,6)+'.mp4"></video></center>'
 						'Wow, that felt so good! You had no idea Sergey could be such a gentleman.'
-						'When Sergey is also close to orgasming, you quickly get off him and lick his cock slowly, tasting yourself on his dick. Mmmm, delicious as always...' 
+						'When Sergey is also close to orgasming, you quickly get off him and lick his cock slowly, tasting yourself on his dick. Mmmm, delicious as always...'
 						'It doesn''t take long for Sergey to cum, shooting his load all over your face like he likes to do. When he''s finished, you smile at him with his cum still all over your face, and whisper: "Thank you, uncle Sergey... that was amazing!"'
 						gs 'arousal', 'end'
 						gs 'stat'

+ 4 - 4
locations/Serge_kuh.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = '':
 	$menu_arg = ''
 	menu_off = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/serge/serge2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big112.jpg"></center>'
 	'Sergey is standing at the kitchen counter. He''s making soup, cutting up ingredients and throwing them into a large pan.'
 	gs 'Serge_Shulgin', 'rep'
 	act 'Leave him alone': gt 'vasilyhome', 'vasilykitchen'
@@ -54,7 +54,7 @@ end
 if $ARGS[0] = 'kuh_buh':
 	minut += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/serge/serge2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big112.jpg"></center>'
 	'Sergey is sitting at the kitchen table, drinking vodka. "Hi, <<$pcs_nickname>>! Great day, isn''t it?" he shouts cheerfully as he raises his glass to you.'
 	gs 'Serge_Shulgin', 'rep'
 	act 'Leave him alone': gt 'vasilyhome', 'vasilykitchen'
@@ -309,7 +309,7 @@ if $ARGS[0] = 'help_ev1':
 
 	rand_kuh_sex = rand(1,3)
 	$rand_kuh_sex = 'sex<<rand_kuh_sex>>'
-	
+
 	gs 'stat'
 	act 'Flirt with Sergey':
 		*clr & cla
@@ -329,7 +329,7 @@ if $ARGS[0] = 'help_ev1':
 		end
 		act 'Show him your ass':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/vert'+rand(1,10)+'.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/vert'+rand(1,9)+'.jpg"></center>'
 			'That was fun, but you can do better! When you bend over exaggeratedly and show him your ass, you can''t help but giggle. Oops!'
 			'Sergey sighs, realizing your game now... and feeling a bit busted at the same time.'
 			'"<<$pcs_nickname>>, stop tormenting me!" he tells you. "I''m not a robot, I''m a man with needs and desires! If you keep that up, you have no one but yourself to blame for what happens next..."'

+ 1 - 1
locations/StasSex.qsrc

@@ -30,7 +30,7 @@ if SStip = 0:
 			act 'Breathe':
 				*clr & cla
 				minut += 5
-				'<center><img <<$set_imgh>> src="images/characters/city/stas/sex/aftersex.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/body/cum/creampie/cumpussy12.jpg"></center>'
 				'Stas rolls off you, and you roll onto your side to rest your head on his chest. You can feel his sperm leaking out of your pussy. He gives you a one armed hug while his other hand strokes your hair, and he looks deep into your eyes with love in his.  Stas say apologetically, "I''m sorry, I came inside of you, couldn''t resist." Then he rolls out of bed, getting up and starting to get dressed. "Well, I gotta go <<$pcs_nickname>>. I''ll see you later, ok." With that, he gathers the rest of his stuff and heads out. You follow him to the door to see him out.'
 
 				gs 'arousal', 'end'

+ 2 - 2
locations/VolleyTrenerSpeak.qsrc

@@ -20,7 +20,7 @@ if volleysostav > 0:
 			'"You''ve been drinking! If you can''t even take the team seriously, then you''re not playing tomorrow."'
 			npc_rel['A69'] -= 1
 ! The flag is for no admission to the game on Saturday
-			seealko = 1 
+			seealko = 1
 		end
 		'"Come on I''d better take you home," The coach says. Looks like you are done with the dance for tonight.'
 
@@ -38,7 +38,7 @@ if volleysostav > 0:
 	end
 else
 	!---------------------------While not in the squad-------------------------
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big69.jpg"></center>'
 	'You go up to Mikhail Nikolaevich and politely say hello.'
 	if pcs_vball < 20:
 		'Mikhail turns and looks at you. "Uh... have we met?" He doesn''t seem to recognize you. "Ah, I''ve seen you at school. You''re in pretty good shape, you should come to volleyball training."'

+ 4 - 4
locations/Voltrener.qsrc

@@ -147,9 +147,9 @@ if $ARGS[0] = 'talk':
 	elseif volleysostav = 0:
 		if pcs_vball < 15:
 			'Mikhail looks at you and says, "I''m busy, girl, do not distract me from my coaching."'
-		elseif pcs_vball < 30:
+		elseif pcs_vball < 25:
 			'Mikhail looks at you and says, "<<$pcs_lastname>>, you need to devote more time to training, you are a very bad player."'
-		elseif pcs_vball < 40:
+		elseif pcs_vball < 35:
 			'Mikhail looks at you and says, "<<$pcs_lastname>>. You certainly don''t play bad, at least not for an amateur. With more work you could reach a higher level."'
 		else
 			'Mikhail looks at you and says, "Ah, <<$pcs_lastname>>, you have the makings of an athlete, though I''m not sure if you are up to a professional level yet."'
@@ -157,7 +157,7 @@ if $ARGS[0] = 'talk':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
 				gs 'stat'
-				if pcs_vball > 75:
+				if pcs_vball > 65:
 					'You ask the coach about joining the team and Mikhail smiles and nods his head then giving you the thumbs up he says, "<<$pcs_lastname>>, you have very good skills. Umm... Okay, just about enough to make the team. I want to congratulate you as I''ve decided to make you a first string regular. From now on, you''ll be starting."'
 					'"But," he adds, shaking his finger at you admonishingly. "You still need to keep practicing, and less drinking!"'
 					act 'Accept the starter position':
@@ -176,7 +176,7 @@ if $ARGS[0] = 'talk':
 						if trenerSex = 1:
 							volleysostav = 1
 							'You ask the coach about joining the team. He smiles and says, "<<$pcs_nickname>>, honey, I can do that, but you''ll have to start as a sub or people might be suspicious."'
-						elseif pcs_vball < 60:
+						elseif pcs_vball < 50:
 							'You ask the coach about joining the team, but he just shakes his head. "<<$pcs_lastname>>, it''s not personal, you have good amateur skills. Just not enough to make the team."'
 						else
 							'You ask the coach about joining the team. He thinks for a minute, then says "You have good skills for an amateur, but you''re still not good enough to start on the team. However, I have room for a substitute, and we can put you there. How does that sound?"'

+ 4 - 4
locations/Zvereva_Sly_events.qsrc

@@ -81,14 +81,14 @@ if $ARGS[0] = 'virgin':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big248.jpg"></center>'
 		if christinaQW['fight'] = -1:
-			'Cheeks turning red, you say "I don''t have a choice. My mother makes me do regular check ups at the gynaecologist. If she finds out I''ve lost my virginity to you there will be a lot of trouble. For you."'
+			'Cheeks turning red, you say "I don''t have a choice. My mother makes me do regular check ups at the gynecologist. If she finds out I''ve lost my virginity to you there will be a lot of trouble. For you."'
 			'He stares at you, obviously trying to decide if you''re lying or not, before saying "For now, we will work on training your other sexual skills. If I find out you''re lying to me though, things will get bad for you, really fast. And the next time I have to remind you to call me Master I will leave a bruise."'
 			'"I''m not lying, <i>Master</i>. I can''t stop you from doing what you want to me, but if you cross that line, it won''t be me you''re dealing with."'
 			'"We will see. I believe I already gave you an order."'
 
 			act 'Sullenly kneel': gt 'Zvereva_Sly_events', 'submit'
 		else
-			'Looking down, embarrassed, you say "I''m sorry Master, I don''t have a choice. My mother makes me do regular check ups at the gynaecologist. If she finds out I''ve lost my virginity to you there will be a lot of trouble."'
+			'Looking down, embarrassed, you say "I''m sorry Master, I don''t have a choice. My mother makes me do regular check ups at the gynecologist. If she finds out I''ve lost my virginity to you there will be a lot of trouble."'
 			'He stares at you, obviously trying to decide if you''re lying or not, before saying "For now, we will work on training your other sexual skills. If I find out you''re lying to me though, things will get bad for you, really fast."'
 			'"I''m not lying, Master. You can do anything and everything you want to me, except that."'
 			'"We will see. I believe I already gave you an order."'
@@ -210,7 +210,7 @@ if $ARGS[0] = 'sly_house_chat':
 				'You slowly and seductively start stripping your clothes off in front of him. The bored look on his face is quickly replaced by a hungry look.'
 			end
 			'He stands up, sheds his own clothes, and starts towards you.'
-			
+
 			gs 'Zvereva_Sly_sex', 'Sly_random_sex_acts'
 		end
 
@@ -244,7 +244,7 @@ if $ARGS[0] = 'sly_house_chat':
 					end
 					'"Would you like my cherry, Master?"'
 					'He practically lunges for you, clothes flying everywhere, in his eagerness.'
-					
+
 
 					gs 'Zvereva_Sly_sex', 'Sly_random_sex_acts'
 				end

+ 1 - 1
locations/Zvereva_house_events.qsrc

@@ -215,7 +215,7 @@ if $ARGS[0] = 'bed_chat':
 			'"When will I meet him?"'
 			'"Why haven''t you already? It''s why I brought you home. What, did you think I wanted to fuck you? Get out there and say hello. He will take it from there. Remember, do what he says or else."'
 			if stat['think_virgin'] = 1:
-				'"But I''m a virgin. My mother makes me do regular check ups at the gynaecologist!"'
+				'"But I''m a virgin. My mother makes me do regular check ups at the gynecologist!"'
 				'Christina starts laughing. "Yeah right!"'
 				'"Really, Mistress. I don''t have a choice. If she finds out I''ve lost my virginity to your brother there will be a lot of trouble." You let the unspoken threat hang in the air.'
 				'She stares at you for a long time before saying "You''re serious? Ugh, fine. I won''t let him pop your cherry, for now. Good thing he loves blowjobs and anal. You <b>will</b> do those, a lot. No arguments, get used to your place."'

+ 1 - 1
locations/_attributes_coco_outfits.qsrc

@@ -402,7 +402,7 @@ elseif ARGS[1] = 62:
 
 elseif ARGS[1] = 63:
 	CloQuality = 3
-	CloThinness = 6
+	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 4

+ 1 - 1
locations/albina_chat.qsrc

@@ -934,7 +934,7 @@ if $ARGS[0] = 'lazar_conversation':
 			end
 			*nl
 			'"So what about you? Hooked up with anyone?" she asks, turning the conversation on you.'
-			gt 'albina_chat', 'lover_conversation'
+			gs 'albina_chat', 'lover_conversation'
 		end
 	end
 end

+ 79 - 79
locations/albina_house_events.qsrc

@@ -19,7 +19,7 @@ end
 
 if $ARGS[0] = 'first_visit':
 	AlbinaQW['albride'] = 2
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 	'Albina leads you to the rather well-furnished and decorated sitting room. "You''ll have to excuse the mess. The maid was... loyal to my father, so she had to go." She then disappears into the kitchen. While she''s gone, her phone vibrates on the table. You look and see that "Mama" is trying to call her.'
 	'<i>"Strange. She''s never mentioned her mother. Hell, she barely talks about her father,"</i> you think to yourself.'
 	'The phone rings out as Albina returns with a bottle of wine and two glasses and places them on the table. Noticing her missed call, she quickly picks her phone up and types a message before stuffing it in her pocket.'
@@ -27,7 +27,7 @@ if $ARGS[0] = 'first_visit':
 		*clr & cla
 		minut += 5
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 		'"<i>This,</i>" Albina grunts, twisting a corkscrew into the top of the wine bottle, "was one of my father''s favorite things. A bottle of stupidly expensive wine that he always refused to open. So let''s fucking open it!"'
 		'With a grin and a dramatic flourish, she yanks the cork out of the top and pours the contents into the glasses, handing one over before taking the seat next to you.'
 		'"He''s gone! He''s finally gone!" she squeals gleefully and chugs the whole glass in practically a single gulp.'
@@ -51,7 +51,7 @@ if $ARGS[0] = 'first_visit':
 				'"Just shut up and drink!" she scorns while filling her glass a second time. You take another small sip while she downs the whole thing again. Several minutes go by in silence, broken only by your occasional sips and the glugging of Albina pouring herself glass after glass until the bottle is empty.'
 				act 'Continue':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 					'"<i><b>FUCKING BASTARD!!</b></i>"'
 					'Without warning, Albina smashes her glass down on the table, causing you to jump. The glass snaps at the stem and she blankly stares at the broken remains in her hand, as if she doesn''t understand how they got there. You look at her in fright and watch tears begin to stream from her unblinking eyes before she hurls the rest of the glass across the room. It shatters against a cabinet as she lets out a loud scream.'
 					act 'Try to talk':
@@ -100,21 +100,21 @@ if $ARGS[0] = 'first_visit':
 			*clr & cla
 			minut += 5
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 			'"Not for me, thanks," you say and shake your head.'
 			'"Fine! Whatever," she scowls before downing both glasses in a single gulp each.'
 			act '"What''s going on?"':
 				minut += 5
 				gs 'stat'
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 				'"What''s going on, Albina? Seriously, what''s this about? I don''t understand."'
 				'"He''s finally fucking gone!" she rants as if that makes any more sense. "All his emails, text messages, phone calls, all the witnesses proving what a scumbag he is!"'
 				'"Albina, what are you talking about?"'
 				'She silently scowls while filling her glass and several minutes go by in silence, broken only by the glugging of Albina pouring herself glass after glass until the bottle is empty.'
 				act 'Continue':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 					'"<i><b>FUCKING BASTARD!!</b></i>"'
 					'Without warning, Albina smashes her glass down on the table, causing you to jump. The glass snaps at the stem and she blankly stares at the broken remains in her hand, as if she doesn''t understand how they got there. You look at her in fright and watch tears begin to stream from her unblinking eyes before she hurls the rest of the glass across the room. It shatters against a cabinet as she lets out a loud scream.'
 					act 'Try to talk':
@@ -179,7 +179,7 @@ if $ARGS[0] = 'first_visit2':
 			gs 'willpower', 'pay', 'resist'
 			gs 'drugs', 'alcohol', 'wine'
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 			'You jump back in fright, breaking the kiss and nearly falling off the sofa. In turn, Albina jumps back from you, looking distraught.'
 			'"I''m sorry <<$pcs_nickname>>! I-! I shouldn''t have... I don''t know what came over me! I... I''m sorry," she repeats. "You should go... I don''t want to..."'
 			act 'Do as she suggests':
@@ -201,14 +201,14 @@ if $ARGS[0] = 'first_visit2':
 					minut += 60
 					npc_rel['A23'] += 10
 					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 					'You sit by her side as she begins to tell you everything about herself that was once hidden from you. How her father never wanted children. How he abused her mother because of her birth. The way he chased her mother away and then blamed Albina for it after. Many of her rapes, described in graphic, painful detail. How she seeks comfort from women because of the abuse she''s endured at the hands of men. And finally, how she gathered evidence for years before submitting it to the police and having him arrested. You do nothing but sit and nod along the entire time, listening intently.'
 					*nl
 					'At the end of an hour, it seems a weight has been lifted from her shoulders and she has <i>slightly</i> sobered up.'
 					'"I''ve never told anyone that before," she says. "You... you really don''t think worse of me?"'
 					act 'No I don''t':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinahome.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinahome.jpg"></center>'
 						'"No," you shake your head. "I don''t. I think you''re one of the bravest people I''ve ever met."'
 						'Your friend truly comforted, you finally collect your things and bid her farewell. She takes you to the door and as you walk down the driveway, both of you waving goodbye, you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
 						act 'Leave': gt 'pav_residential'
@@ -306,7 +306,7 @@ if $ARGS[0] = 'first_sex':
 				gs 'arousal', 'end'
 				gs 'stat'
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/nudealbina.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nudealbina.jpg"></center>'
 				'Albina untangles herself from your legs and flops onto her back, still breathing hard. You do the same, staring up at the ceiling. The sheets are soaked beneath you.'
 				*nl
 				'Pulling her herself up, Albina turns herself around and gives you the most gentle kiss before pulling back. You can taste yourself on her lips.'
@@ -324,7 +324,7 @@ if $ARGS[0] = 'first_sex':
 					'"Thanks <<$pcs_nickname>>. It was nice to let it all out... and I''m not just talking about my feelings..." she says, expression turning mischievous again. "Thanks for being a good friend."'
 					act 'Get dressed':
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinahome.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinahome.jpg"></center>'
 						'Albina helps you clean up before you get dressed and you finally collect your things, preparing to bid her farewell. She forgoes her clothes, choosing to walk you to the door instead. As you walk down the driveway, you turn and see her, standing naked in the doorway waving you goodbye and you think you catch sight of the first genuine smile you''ve ever seen on Albina''s face.'
 						act 'Leave': gt 'pav_residential'
 					end
@@ -365,7 +365,7 @@ if $ARGS[0] = 'tekken_game':
 		gs 'exp_gain', 'gaming', rand(1,2)
 		npc_rel['A23'] += 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/game.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
 		if AlbinaQW['gamebet'] = 1:
 			'You and Albina lie down in front of the TV after picking one of the games. She turns towards you and gives you a grin. "Feel like putting your ass on the line and betting again?"'
 			act 'Accept the bet': gt 'albina_house_events', 'tekken_bet'
@@ -410,7 +410,7 @@ if $ARGS[0] = 'tekken_play':
 	gs 'exp_gain', 'gaming', rand(1,2)
 	npc_rel['A23'] += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/game.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
 	'The two of you keep playing games while trash-talking and even bumping each other to try and screw each other up. Still, neither of you are taking it seriously. Instead, you mostly just laugh at the silly mistakes you both make while only partially paying attention to the game.'
 	if pcs_hotcat >= 5:
 		'Once you finish the game, Albina turns to you instead of starting another one. "How about we see who actually <i>is</i> the better gamer?" she asks with a confident smile.'
@@ -462,7 +462,7 @@ if $ARGS[0] = 'tekken_bet':
 	gs 'exp_gain', 'gaming', rand(1,2)
 	npc_rel['A23'] += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/game.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
 	'You smile. "You''re on. You''re so going to get fucked!"'
 	'Albina laughs as she brings the strapon over with a bottle of lube and tosses them on the bed before she lies back beside you and picks her controller up. "<i>Please</i>! You''re so going to lose!"'
 	'She starts the game, and you both fall silent, your focus only on winning.'
@@ -480,7 +480,7 @@ if $ARGS[0] = 'tekken_bet':
 			albplay = 0
 		end
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/game.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
 		if albplay = 3:
 			'She doesn''t even come close to beating you. Before the game can end, she lets out an exacerbated sigh and tosses her controller down in defeat, knowing she has no chance. You give her a gloating smirk as she reaches over and grabs the strapon harness before handing it to you. You both undress and you grin as you slide the harness on.'
 			act 'Continue': gt 'albina_sex_scenes', 'wear_strapon'
@@ -501,7 +501,7 @@ if $ARGS[0] = 'tekken_bet':
 		*clr & cla
 		menu_off = 1
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/game.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
 		'You''re not sure why, but part of you <i>wants</i> her to use the strap-on on you, so you purposefully lose the game. Albina looks at you suspiciously with a raised brow before smiling and smacking your ass. "You''re my bitch now, <<$pcs_nickname>>!" You both undress, and Albina slides the harness on with a smirk on her face.'
 		act 'Get fucked with the strapon': gt 'albina_sex_scenes', 'receive_strapon'
 	end
@@ -528,7 +528,7 @@ if $ARGS[0] = 'swim_winter1':
 
 	act'No swimsuit':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool_winter.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
 		'"I don''t have a swimsuit," you protest, but Albina just gives you an amused look.'
 !!{		if AlbinaQW['commando_know'] > 0:
 			'"You''re not wearing panties, are you?" she smirks.'
@@ -563,7 +563,7 @@ if $ARGS[0] = 'swim_winter2':
 		minut +=6
 		gs 'stat'
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinapool.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinapool.jpg"></center>'
 		'"I''ll pass, thanks."'
 		'"Your loss," she shrugs before taking a running leap towards the pool. You hear a loud splash followed by a gleeful shriek and walk out to see Albina floating around in the pool. She smiles at you and turns to dive under the water, giving you a view of her anus as she goes under. Knowing Albina, she likely done this on purpose. After a few seconds, she swims over to the adjoining wall of the hot tub and throws herself over the side.'
 		act 'Do something else while she''s in the tub':
@@ -593,14 +593,14 @@ if $ARGS[0] = 'swim_winter2':
 
 	act 'Hesitantly join her':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool_winter.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
 		'"I... I guess..." you say. '
 		gs 'albina_house_events','swim_winter2_strip'
 	end
 
 	act 'Enthusiastically join her':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool_winter.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
 		'"Sounds fun!" You quickly start stripping out of your clothing while Albina stands by the door, jumping up and down and shivering in the cold breeze.'
 		'"Hurry up!" The moment you take off your last piece of fabric, you sprint straight out the door past her.'
 		*nl
@@ -614,7 +614,7 @@ end
 if $ARGS[0] = 'swim_winter2_strip':
 	act 'Strip naked':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool_winter.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
 		AlbinaQW['skinny_dip'] = 1
 		if $pantyworntype = 'none':
 			'You strip down while Albina keeps standing by the door, jumping up and down and shivering in the cold breeze.'
@@ -692,7 +692,7 @@ if $ARGS[0] = 'swim_winter3':
 	act 'Hesitate':
 		*clr & cla
 		!! temporary image
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool_winter.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
 		'You get right up to the edge of the pool and stop. You dip your toe into the water and it sends a chilly shiver through your entire body.'
 		'"You know, maybe I don''t want to-"'
 		*nl
@@ -711,7 +711,7 @@ if $ARGS[0] = 'swim_winter3':
 	act 'Jump in with her':
 		*clr & cla
 		!! temporary image
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool_winter.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
 		'With a running start and a scream, the two of you leap into the water together. The immediate shock of ice cold sends shivers through your whole body.'
 		'"Fuck!" you gasp. "Why did I let you talk me into this?!"'
 		*nl
@@ -745,7 +745,7 @@ if $ARGS[0] = 'swim_winter_unused4':
 	gs 'stat'
 	act 'Strip':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/nakedswim.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nakedswim.jpg"></center>'
 		'Realizing what she means, you peel off your clothes, place them in a pile to the side and dive into the water before the chill of the air freezes you.'
 		'"Doesn''t it feel great in here?" She makes a fair point. The water lapping away at your bare skin feels magical. You proceed to swim around the pool and splash each other for a while before floating on your backs and just chatting.'
 		xgt 'albina_house_events','after_swim_shower'
@@ -753,7 +753,7 @@ if $ARGS[0] = 'swim_winter_unused4':
 
 	act 'Hesitate':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/nakedswim.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nakedswim.jpg"></center>'
 		'You don''t feel comfortable about the idea, even with the cold biting at you. Albina swims back over and frowns at you. "I''m not getting out of this lovely warm water to go and get you something to wear <<$pcs_nickname>>. I swear I''ll pull you in right now!" She clearly won''t take no for an answer, so you undress and climb into the pool next to her.'
 		'"See? Doesn''t it feel great?" You have to agree with her. In the biting cold, the warm water against your bare skin feels magical. You''re taken by surprise when Albina suddenly splashes you. You splash back and proceed to swim around the pool and continue to splash each other for a while before floating on your backs and just chatting.'
 		*nl
@@ -768,7 +768,7 @@ if $ARGS[0] = 'winter_hot_tub':
 	AlbinaQW['hottub_count'] += 1
 	minut +=6
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hottub.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 	if AlbinaQW['skip_tub'] ! daystart:
 		'Your skin hits the water and you gasp for the second time, this time for the opposite reason. The difference between the icy pool and the hot tub is so extreme that it feels scalding. Regardless, you follow Albina''s lead and sink down into it up to your neck. The burning sensation is so intense that you almost can''t bear it for several seconds. Then, slowly, you start to become accustomed to it and your muscles begin to loosen up, your entire body relaxing in the all encompassing heat.'
 		*nl
@@ -780,7 +780,7 @@ if $ARGS[0] = 'winter_hot_tub':
 			'"See? Told you it was good."'
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hottub.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 		if AlbinaQW['skinny_dip'] = 1:
 			'You strip out of your clothes and pad over to join Albina in the hot tub, shivering the whole way. Starting with your toes, you carefully slip in across from Albina, closing your eyes and sighing at the intense heat.'
 			*nl
@@ -798,7 +798,7 @@ if $ARGS[0] = 'winter_hot_tub':
 	else
 		act 'Relax':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hottub.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 			'The two of you spend several minutes soaking in the tub together before Albina stands up.'
 			'"Come on, let''s get out before we start pruning."'
 			gs 'albina_house_events','after_swim_shower'
@@ -808,7 +808,7 @@ end
 
 if $ARGS[0] = 'winter_hot_tub_no_panties1':
 	cla & *clr
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hottub.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 	'Albina grins back at you and starts wriggling around beneath the bubbling water. Her knees briefly breach the surface and a moment later, she pulls up a thin, stringy, piece of fabric. She stretches it between her hands and slingshots it past your head, making a wet slapping sound when it lands on the deck. Turning your head to see what it was, you realize as soon as you lay eyes on it: it''s her thong.'
 	*nl
 	'"Oh <i>fuck...</i>" she moans, leaning further into the water as she turns a dial on the side. "I should do this more often..."'
@@ -819,14 +819,14 @@ if $ARGS[0] = 'winter_hot_tub_no_panties2':
 	pcs_horny += 25
 	gs 'stat'
 	cla & *clr
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hottub.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 	'Albina cranks the dial hard and you gasp. Hot water is blasting directly against your pussy, softly tickling your clit. It''s turning you on and you can feel heat spreading through your hips that <i>isn''t</i> coming from the water. It seems to be having a similar effect on Albina, who''s openly panting and staring at you with "fuck me" eyes. You lose track of time, but it''s a very pleasurable experience.'
 	act 'Relax': gs 'albina_house_events', 'winter_hot_tub_no_panties3'
 end
 
 if $ARGS[0] = 'winter_hot_tub_no_panties3':
 	cla & *clr
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hottub.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 	'After a while, Albina sighs and shuts off the tub before standing up. Her nude body radiates steam vapors in the winter cold.'
 	*nl
 	'"Come on," she says ruefully. "Let''s get out before we start pruning."'
@@ -863,7 +863,7 @@ if $ARGS[0] = 'after_swim_shower':
 					'After giving yourself a thorough wash, you turn the water off and step out. You find a towel and dry yourself before getting dressed. Once you''re finished, you step out into the hallway, walk down to Albina''s bedroom and knock on the door. She tells you to enter.'
 					act 'Enter':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/nudealbina.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nudealbina.jpg"></center>'
 						'You enter the room and are taken aback slightly when you find a nude Albina laying on her bed with her legs spread and wet fingers. She smiles at you knowingly but doesn''t say anything. It''s obvious that she was rubbing one out before you disturbed her, but she doesn''t seem to care and stands up and walks over to her closet. She slides on a lacy white thong and skimpy tank top and walks out. "My favourite show is about to start. I think you''ll like it."'
 						act 'Go and watch TV': gt 'albina_house_events', 'tv_1'
 					end
@@ -872,14 +872,14 @@ if $ARGS[0] = 'after_swim_shower':
 
 			act 'Agree':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/bathroom.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/bathroom.jpg"></center>'
 				'"Sure," you say, returning her smile. "Why not?" Her smile turns into a grin and she grabs your hand, pulling you through her bedroom and into the bathroom.'
 				*nl
 				'Once inside, she releases you, bending over to turn on the water. She seems to be a little far away, needing to stretch to reach it. You can see all of the muscles in her toned legs go taut and her posture gives you a great view of both her holes. She hesitates just before turning the tap, glancing back at you, and you realize she''s doing this on purpose. Shit. What are you getting yourself into here?'
 
 				act 'Continue':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/bathroom.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/bathroom.jpg"></center>'
 					'Albina turns the faucet and steaming water immediately comes rushing out. She must pay a lot of money to have such good plumbing. As the tub begins to fill, you see her grab various bottles, squeezing a small squirt of liquid from each into the tumbling waterfall. They don''t seem to change the color of the water or add any bubbles, but a sharp aromatic scent immediately spreads through the room. She also grabs a few handfuls of salt, sprinkling them generously into the tub.'
 					*nl
 					'"Some of the best muscle relaxant money can buy. You''ll feel like a brand new woman when we''re finished," she smiles at you while stepping into the bath, one shapely leg at a time. Once fully submerged up to her shoulders, she gives you an innocent look. "Well? Are you just going to stare all day or are you coming in?"'
@@ -934,9 +934,9 @@ if $ARGS[0] = 'hot_tub1':
 	act 'Follow her':
 		*clr & cla
 		if month >= 11 or month <= 3:
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool_winter.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
 		else
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
 		end
 		'When you reach the pool out back, you see a large hot tub attached. Albina turns the jets on and slips off her robe to reveal she''s only wearing a little black thong. She climbs in and takes a seat, sighing as she does. She looks at you and beckons you to join her.'
 		'"Don''t worry about your panties getting wet <<$pcs_nickname>>," she says. "I''ll give you something to wear until they dry."'
@@ -961,7 +961,7 @@ if $ARGS[0] = 'hot_tub3':
 	else
 		act 'Get in':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hottub.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 			'You smile and peel off the rest of your clothes until you''re left in just your panties and climb in across from her as she closes her eyes, leaning back and relaxing. "This is the fucking life, am I right?" You murmur in agreement and you both spend quite a bit of time in the tub relaxing and chatting away.'
 			minut +=6
 			gs 'stat'
@@ -976,7 +976,7 @@ if $ARGS[0] = 'hot_tub3':
 					act 'Go and watch TV': gt 'albina_house_events', 'tv_2'
 				else
 					cla & *clr
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
 					'Albina has a look in her eye - she''s horny. You see her clearly slide her hand down her thong and start rubbing her clit.'
 					*nl
 					'"You''ll take any opportunity to be as naked as possible, won''t you?"'
@@ -988,9 +988,9 @@ if $ARGS[0] = 'hot_tub3':
 					act 'Get dressed':
 						cla & *clr
 						if month >= 11 or month <= 3:
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool_winter.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
 						else
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
 						end
 						if CloDress = 1:
 							'"So she''s okay with us being topless out here?" you inquire, struggling to tug your dry dress down over your wet shoulders.'
@@ -1013,7 +1013,7 @@ if $ARGS[0] = 'hot_tub3':
 !!		if will_cost <= pcs_willpwr:
 			act 'Take your panties off':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hottub.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 				'You decide you''d rather skinny dip than go home with wet underwear and move to take them off as well. Though normally rather daring around you, Albina''s eyes go wide in shock as you tug your panties down your legs and toss them with the rest of your disgarded clothing. It only takes her a moment to recover and she immediately starts wriggling around beneath the water as you step into the tub. A few seconds later, she pulls up her thong, grinning at you as she slingshots it onto the deck with a wet slap.'
 				'"Oh <i>fuck</i>..." she moans softly. "Good choice <<$pcs_nickname>>. This is <i>much</i> better..."'
 				*nl
@@ -1028,7 +1028,7 @@ if $ARGS[0] = 'hot_tub3':
 						act 'Go and watch TV': gt 'albina_house_events', 'tv_2'
 					else
 						cla & *clr
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
 						'Albina has a look in her eye - she''s horny. You clearly see her hand slither down between her legs. She locks eyes with you, biting her lip in obvious pleasure before her eyes go wide and she sits up straight.'
 						*nl
 						'"You''ll take any opportunity to be as naked as possible, won''t you?" You turn in shock and see Zoya standing behind you, shaking her head as she throws some towels at you.'
@@ -1039,9 +1039,9 @@ if $ARGS[0] = 'hot_tub3':
 						act 'Get dressed':
 							cla & *clr
 							if month >= 11 or month <= 3:
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool_winter.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
 							else
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
 							end
 							if CloDress = 1:
 								'"So she''s okay with us being topless out here?" you inquire, struggling to tug your dry dress down over your wet shoulders.'
@@ -1077,7 +1077,7 @@ end
 !! HORNGUY ADDITION
 if $ARGS[0] = 'hot_tub_no_panties':
 	pcs_horny += 25
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hottub.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 	'Stripping out of your clothes, you toss them in a pile on the floor.'
 	'"No panties, <<$pcs_nickname>>? How <i>daring</i> of you!" Albina teases.'
 	if albina['commando_know'] = 3:
@@ -1112,7 +1112,7 @@ end
 if $ARGS[0] = 'hot_tub_no_panties3':
 	act'Continue':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hottub.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hottub.jpg"></center>'
 		'You think she''s just teasing you until you sit down and gasp yourself. Hot water blasts directly across your pussy, softly tickling your clit. It''s turning you on and you can feel heat spreading through your hips that <i>isn''t</i> coming from the water. It seems to have the same effect on Albina, who reaches over and turns up the bubbles even more. She gives you a voyeuristic smile and openly panting to show you she''s getting off on this too. You lose track of time, but it''s a very pleasurable experience.'
 		gs 'albina_house_events', 'hot_tub_no_panties4'
 	end
@@ -1123,7 +1123,7 @@ if $ARGS[0] = 'hot_tub_no_panties4':
 		minut +=6
 		gs 'stat'
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
 		'After a while, you look up and see Albina has a mischievous twist in her lips. She slides through the water towards you and you feel her hand on your leg. It begins trailing up your leg until her fingers are right on top of your pussy. A finger starts to push it''s way in and-'
 		*nl
 		'"What on earth are you two doing?!"'
@@ -1134,9 +1134,9 @@ if $ARGS[0] = 'hot_tub_no_panties4':
 		act'Get dressed':
 			*clr & cla
 			if month >= 11 or month <= 3:
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool_winter.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool_winter.jpg"></center>'
 			else
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool.jpg"></center>'
 			end
 			if CloDress = 1:
 				'"Just our luck for your mother to catch us skinny dipping!" you laugh, struggling to tug your dry dress down over your wet shoulders.'
@@ -1187,7 +1187,7 @@ if $ARGS[0] = 'goodie_two_shoes':
 end
 
 if $ARGS[0] = 'tv_1':
-    '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/watchtv.jpg"></center>'
+    '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/watchtv.jpg"></center>'
 	'Albina grabs some snacks from the kitchen before leading you into the sitting room. You sit with her on the sofa as the show starts. It''s some American medical drama that''s been dubbed into Russian. Albina gets really engrossed in it, telling you everything she thinks you need to know about the plot and the characters. As the ending credits scroll, she turns to you with an excitement you never see, not even when she''s dancing.'
 	*nl
 	'"So, what did you think?"'
@@ -1196,7 +1196,7 @@ if $ARGS[0] = 'tv_1':
 
 	act 'It was cool':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/watchtv.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/watchtv.jpg"></center>'
 		'"It was actually quite cool," you reply. "I might start watching it myself."'
 		'She smiles, seemingly over the moon at your answer. She opens her mouth to speak when her mother walks in, takes one look at the two of you and sighs.'
 		'"What have I told you about strutting around here in your underwear, young lady? Get dressed already! I''m going to take a bath and you better be wearing something decent before I come back!" She doesn''t bother waiting for a reply and leaves without another word.'
@@ -1215,7 +1215,7 @@ if $ARGS[0] = 'tv_1':
 
 	act 'It was okay':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/watchtv.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/watchtv.jpg"></center>'
 		'It was okay, I guess. Not really my kind of thing," you reply.'
 		'Albina looks a little disheartened and opens her mouth to say something when her mother walks in, takes one look at the two of you and sighs.'
 		'"What have I told you about strutting around here in your underwear, young lady? Get dressed already! I''m going to take a bath and you better be wearing something decent before I come back!" She doesn''t bother waiting for a reply and leaves without another word.'
@@ -1234,13 +1234,13 @@ if $ARGS[0] = 'tv_1':
 end
 
 if $ARGS[0] = 'tv_2':
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/watchtv.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/watchtv.jpg"></center>'
 	'You sit down on the sofa in front of the TV as the show starts. It''s some American medical drama that''s been dubbed into Russian. Albina gets really engrossed in it, telling you everything she thinks you need to know about the plot and the characters. As the ending credits scroll, she turns to you with an excitement you never see, not even when she''s dancing. "So, what did you think?"'
 	minut +=36
 	gs 'stat'
 	act 'It was cool':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/watchtv.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/watchtv.jpg"></center>'
 		'"It was actually quite cool," you reply. "I might start watching it myself."'
 		'She smiles, seemingly over the moon at your answer, and is about to speak when you see her mother enter the room, holding a pair of heels in one hand and a glass of wine in the other. Dropping the heels on the floor, she sits down next to Albina.'
 		*nl
@@ -1256,7 +1256,7 @@ if $ARGS[0] = 'tv_2':
 
 	act 'It was okay':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/watchtv.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/watchtv.jpg"></center>'
 		'"It was okay, I guess. Not really my kind of thing," you reply.'
 		'Albina looks a little disheartened, but before she can speak, you hear her mother enter the room, holding a pair of heels in one hand and a glass of wine in the other. Dropping the heels on the floor, she sits down next to Albina.'
 		*nl
@@ -1274,7 +1274,7 @@ end
 
 if $ARGS[0] = 'ass_too_big':
 	AlbinaQW['extra'] = daystart
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/butt.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/butt.jpg"></center>'
 	'You walk into Albina''s room and find her wearing a skimpy schoolgirl outfit that shows off her bubble butt quite nicely. She''s checking herself out in her mirror and seems to like what she''s seeing.'
 	'"Oh hey, <<$pcs_nickname>>," she says with a smile. "Tell me, does my ass look big in this?" she asks and wiggles her ass at you. You''re not sure what to say and she just laughs. "I know, I know. My ass looks fucking great in this! I''m going to wear it for Lazar next time he''s here..." she says with a wink and proceeds to strip from the outfit and place it in her closet before putting her regular clothes back on. "So what do you want to do?" she asks as she finishes pulling her top on.'
 	minut += 6
@@ -1285,7 +1285,7 @@ end
 
 if $ARGS[0] = 'dancing':
 	AlbinaQW['extra'] = daystart
-	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/home/dance.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/pavlovsk/resident/albinahome/dance.mp4"></video></center>'
 	'As you make your way up the stairs, you hear music blaring from Albina''s room. You walk in and see her dancing on her bed, unaware of your presence. She eventually notices you and smiles.'
 	'"<<$pcs_nickname>>!! Come and dance with me!"'
 	minut +=6
@@ -1293,7 +1293,7 @@ if $ARGS[0] = 'dancing':
 
 	act 'Continue':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/dance1.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/dance1.jpg"></center>'
 		'She doesn''t give you a choice and pulls you up onto her bed. You both dance on the bed until you grow tired and stop, Albina turning the music off.'
 		'"That was fun. I really need to get out and go clubbing at some point. Maybe you want to come with me?" she asks with a smile. You just shrug your shoulders and she asks what you want to do now.'
 		minut += 6
@@ -1344,7 +1344,7 @@ if $ARGS[0] = 'computer':
 	if AlbinaQW['CompUse'] = 0:
 		AlbinaQW['CompUse'] = 1
 		*clr & cla
-		'<center><img <<$set_imgh>>src="images/characters/pavlovsk/school/girl/albina/home/laptop.jpg"></center>'
+		'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/laptop.jpg"></center>'
 		'You point towards the laptop sitting at the foot of her bed. "I should''ve guessed that you would have something like that."'
 		'"Yeah, I honestly don''t know why I bought it. I sometimes look up workout techniques and look at clothes, but I mostly just use it to watch porn when I feel like rubbing one out."'
         'You''re a little surprised that she would admit such a thing to you given how private and guarded she is about herself.'
@@ -1360,7 +1360,7 @@ if $ARGS[0] = 'computer':
 			'Taking a wild guess, you somehow manage to successfully input the correct password and her desktop loads up. You wonder if you should risk snooping around before she comes back.'
 			act 'Turn it off':
 				*clr & cla
-				'<center><img <<$set_imgh>>src="images/characters/pavlovsk/school/girl/albina/home/laptop.jpg"></center>'
+				'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/laptop.jpg"></center>'
 				'You decide not to risk it and turn the laptop off before closing the screen.'
 				act 'Wait for Albina to return': gt 'albinahome','bedroom'
 			end
@@ -1372,7 +1372,7 @@ if $ARGS[0] = 'computer':
 				gs 'arousal', 'porn', 10
 				act 'Turn it off':
 					*clr & cla
-					'<center><img <<$set_imgh>>src="images/characters/pavlovsk/school/girl/albina/home/laptop.jpg"></center>'
+					'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/laptop.jpg"></center>'
 					'Although you''re turned on by what you''ve seen, you decide not to risk getting caught and turn the laptop off before closing the screen.'
 					act 'Wait for Albina to return': gt 'albinahome','bedroom'
 				end
@@ -1395,7 +1395,7 @@ if $ARGS[0] = 'computer':
 		end
 	else
 		*clr & cla
-		'<center><img <<$set_imgh>>src="images/characters/pavlovsk/school/girl/albina/home/laptop.jpg"></center>'
+		'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/laptop.jpg"></center>'
 		'You know Albina greatly values her privacy and using her laptop without her permission would break the trust she has in you, so you decide to leave it alone.'
 		act 'Return': gt 'albinahome','bedroom'
 	end
@@ -1404,7 +1404,7 @@ end
 if $ARGS[0] = 'alb_yoga_start':
 	AlbinaQW['event'] = daystart
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hallway.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
 	if week = 1 or week = 3 or week = 6:
 		'You knock on the door and the maid lets you in with a polite smile.'
 		'"Hello Miss <<$pcs_lastname>>. Miss Albina is in the gym right now. You can find her there."'
@@ -1429,7 +1429,7 @@ end
 if $ARGS[0] = 'alb_yoga_1':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src=images/characters/pavlovsk/school/girl/albina/home/albyoga.jpg"></center>'
+	'<center><img <<$set_imgh>> src=images/locations/pavlovsk/resident/albinahome/albyoga.jpg"></center>'
 	'The maid answers the door and lets you enter. "Miss Albina is in the gym," she says before leading you there. You find Albina doing yoga by herself. She smiles when she sees you before raising a finger, telling you to wait. The maid bows and leaves as you sit and watch Albina finish her routine.'
 	*nl
 	'You know she''s flexible, but some of the poses she does look like they should be impossible. She smiles when she sees your bewildered gaze.'
@@ -1438,7 +1438,7 @@ if $ARGS[0] = 'alb_yoga_1':
 
 	act 'Go with her':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinaroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
 		'You follow Albina to her room where she strips from her clothes and tosses them aside without a care.'
 		'"I need to take a shower and wash all this sweat off. Care to join me?" she asks with a playful smile.'
 		minut += 6
@@ -1481,7 +1481,7 @@ if $ARGS[0] = 'alb_naked_yoga':
 		'"I can get my core tighter with something in my ass," she says without a hint of humor as she strides past you. "Gives me something to clench on."'
 		act'Continue':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hallway.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
 			'She pads through the halls of her home naked without a care in the world.'
 			'"You''re just going to leave your clothes there?" you ask as you follow.'
 			'"The maid will take care of it," she says flippantly. As you enter her room, she gives you a glance over her shoulder. "I need a shower. Wanna join me?"'
@@ -1497,7 +1497,7 @@ if $ARGS[0] = 'alb_naked_yoga':
 					minut += 20
 					gs 'stat'
 					cla & *clr
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinaroom.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
 					'You wait patiently for about 20 minutes before Albina finally exits the bathroom wearing only a towel around her hair, steam wafting out after her.'
 					*nl
 					'"Fuck me, I needed that," she says, strolling over to her dresser and pulling on a thong that''s not much more than a loopy string and a thin tank top without a bra while she chats to you before flopping down on the bed beside you.'
@@ -1511,7 +1511,7 @@ end
 if $ARGS[0] = 'alb_sunbathe_1':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>>src="images/characters/pavlovsk/school/girl/albina/home/albpool.jpg"></center>'
+	'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/albpool.jpg"></center>'
 	'The maid answers the door, letting you inside.'
 	*nl
 	'"Miss Albina is out by the pool," she says and leads you out to the back door. You''re a little surprised to find Albina stretched out on a lounger in the nude, her pussy on full display.'
@@ -1520,7 +1520,7 @@ if $ARGS[0] = 'alb_sunbathe_1':
 
 	act 'Greet her':
 		*clr & cla
-		'<center><img <<$set_imgh>>src="images/characters/pavlovsk/school/girl/albina/home/albpool1.jpg"></center>'
+		'<center><img <<$set_imgh>>src="images/locations/pavlovsk/resident/albinahome/albpool1.jpg"></center>'
 		'She sits up in her lounger and grabs her drink, which you assume to be alcoholic in some manner. Her smooth, tanned skin glistens in the sun as she sips and you smile.'
 		'"Is your mother okay with this?"'
 		'She shrugs her shoulders. "She actually expects me to live with <i>tan lines</i>?! Pfft! Besides, what she doesn''t know can''t hurt her. Milena won''t say anything."'
@@ -1528,7 +1528,7 @@ if $ARGS[0] = 'alb_sunbathe_1':
 
 		act 'Go with her':
 			cla & *clr
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinaroom.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
 			'You follow Albina to her room, where she removes her robe and playfully smiles at you. "Care to join me?"'
 			minut +=6
 			gs 'stat'
@@ -1536,7 +1536,7 @@ if $ARGS[0] = 'alb_sunbathe_1':
 			act 'Join her': gt 'albina_sex_scenes', 'albina_shower'
 
 			act 'Just talk':
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/showering.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/showering.jpg"></center>'
 				cla & *nl
 				'"No thanks. But I wouldn''t mind talking while you do."'
 				'"Suit yourself," she shrugs and heads into her personal bathroom, leaving the door open for you to follow her in. You sit down on the edge of her bath while she steps into the shower.'
@@ -1583,7 +1583,7 @@ if $ARGS[0] = 'albina_shower_talk_start':
 	gs 'albina_house_events', 'albina_shower_talk'
 	act 'I''ll just wait':
 		cla & *nl
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinaroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
 		'"No thanks. I''ll just wait until you''re done."'
 		'"Suit yourself I guess," Albina shrugs and heads into the bathroom, closing the door behind her. You twiddle your thumbs for a few minutes until she comes back out, towel wrapped around her hair and with nothing around her body. She heads straight to her dresser to start picking out clothes.'
 		minut += 6
@@ -1596,7 +1596,7 @@ end
 if $ARGS[0] = 'albina_shower_talk':
 	act 'Talk with her while she showers':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/showering.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/showering.jpg"></center>'
 		'"No thanks. But I wouldn''t mind talking while you do."'
 		'"Suit yourself," Albina shrugs. She heads into her personal bathroom, leaving the door open for you to follow her in. You sit down on the edge of the bathtub while she steps into the shower.'
 
@@ -1763,12 +1763,12 @@ end
 if $ARGS[0] = 'study_door':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/doors.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/doors.jpg"></center>'
 	'As you make your way up the stairs, you take note of the double doors down the hallway. Albina got rather agitated and told you to leave it alone when you first mentioned it to her. She said the room was locked for a reason and under no circumstances would she open it.'
 	'At this point, the maid walks out and heads down the hall, smiling at you as she walks past. "Hello, Miss <<$pcs_firstname>>."'
 	act 'Investigate':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/study.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/study.jpg"></center>'
 		'Your curiosity gets the better of you and you quietly make your way down the hall. Peeking through the door, the room appears to be some kind of study.'
 
 		act 'Enter':
@@ -1784,7 +1784,7 @@ if $ARGS[0] = 'study_door':
 
 	act 'Leave it alone':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/doors.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/doors.jpg"></center>'
 		'You decide not to overstep your bounds as a guest and back away from the door. It would be difficult explaining yourself if you were caught snooping inside. You quickly make your way to Albina''s room where she''s waiting for you before the maid returns.'
 
 		act 'Continue':
@@ -1914,7 +1914,7 @@ end
 
 if $ARGS[0] = 'alb_bedroom_shower':
 	if rand(1,2) = 1:
-		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/towel_head2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/towel_head1.jpg"></center>'
 		if rand(1,2) = 1:
 			'You open the door just as another door opens across the room and Albina walks out of the bathroom, towel wrapped about her head and her nude body glistening with moisture. She blinks in surprise, but it only takes a moment for that to fade and give way to a sly smile.'
 			if AlbinaQW['shower_caught'] > 0:
@@ -1937,9 +1937,9 @@ if $ARGS[0] = 'alb_bedroom_shower':
 			act 'Continue': gt 'albinahome', 'bedroom'
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/caught_dressing.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/caught_dressing.jpg"></center>'
 		'You open the door and find yourself immediately greeted with the sight of Albina''s wet naked pussy and asshole as she bends over a dresser. She looks over her shoulder, mouth open in initial surprise before it quickly transforms into a smile.'
-		'"Sveta!" she beams. "You caught me getting dressed. Give me a minute."'
+		'"<<$pcs_nickname>>!" she beams. "You caught me getting dressed. Give me a minute."'
 		'Albina snaps on a thong and some shorts over them before throwing on a tank top without a bran and flops down on the bed beside you.'
 		*nl
 		'"So what''s up?" she smiles.'

+ 40 - 40
locations/albina_mother_events.qsrc

@@ -3,24 +3,24 @@
 menu_off = 1
 
 if $ARGS[0] = 'zoya_chat_menu':
-	
+
 	act'Make small talk': gs 'albina_mother_events', 'zoya_small_talk'
 end
 
 if $ARGS[0] = 'zoya_small_talk':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
 	if rand(1,5) = 1:
 		'"Thank you for coming over by the way," Zoya smiles at you warmly. "I''m not just being polite. After everything Albina''s been through, I''m glad she has a friend like you to rely on. She needs it."'
 		gs 'albina_mother_events', 'zoya_chat_menu'
 	end
-	
+
 end
 
 if $ARGS[0] = 'zoya_meet':
 	!!First time visiting on your own after she shows you where she lives
 	AlbinaQW['visiting'] = 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
 	'As you walk up the long driveway to the front door, you notice a sleek and expensive looking car you''ve never seen before parked in front of the house. When you knock, the door opens to reveal a beautiful, well-dressed woman you estimate to be in her late 30s. She wears high heels, a pencil skirt, and a partially unbuttoned blouse that gives you a view of her substantial cleavage that bulges against the fabric.'
 	*nl
 	'"You must be <<$pcs_firstname>>!" she smiles. "Albina has told me quite a bit about you. All good things, I assure you," she adds with a laugh.'
@@ -32,14 +32,14 @@ if $ARGS[0] = 'zoya_meet':
 	'"I insist," she smiles warmly. "Would you like to come inside?"'
 	act 'Continue':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
 		'"Albina is in her room right now. I expect the maid has told her of your arrival already." She grabs her coat and clatters her way to the front door. "I wish I could be a more entertaining host, but I have to get to the hospital, so I''ll just have to leave that to my daughter. If you''re a frequent visitor, you might not see me often, but do come and say hello if I''m ever home when you visit. It was nice meeting you, <<$pcs_firstname>>."'
 		'She gives a parting smile and closes the door behind her. You hear the car starting up outside before it roars away.'
 		act 'Continue': gt 'albinahome', 'bedroom'
 	end
 end
 
-if $ARGS[0] = 'zoya_sunbathing_solo': 
+if $ARGS[0] = 'zoya_sunbathing_solo':
 !! (if summer)
 	minut += 2
 	gs 'stat'
@@ -47,7 +47,7 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 	'"Hello. Ms. Zoya said to tell you she''s out back by the pool if you need anything."'
 
 	if AlbinaQW['pool'] = 0:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapool.jpg"></center>'
 		'Heading out the back door, you find Zoya in the middle of the pool, laying back with her eyes closed on a floatie. She''s topless and looks very relaxed, moving only for a moment to adjust her bikini bottom, allowing you to catch the briefest glimpse of her pussy lips as she does. Perhaps hearing you close the door, she cracks open an eye to look at you as you approach.'
 		'"Ahh, <<$pcs_firstname>>. Milena told me you arrived," she says, carefully sitting up on her elbows, the floatie wobbling beneath her.'
 		'"I hope I''m not intruding?" you reply politely.'
@@ -58,7 +58,7 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 
 		act 'Check her out':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapool.jpg"></center>'
 			AlbinaQW['check_out_zoya'] = 1
 			'"Okay. Thanks, Zoya."'
 			'Your gaze wanders up and down her body. Zoya looks incredible for her age, especially given that she wasn''t a teen parent like your own mother. Her skin is wonderfully tanned, unmarred by any white lines, clearly due to her topless sunbathing habits. Her breasts are exceptionally full, large and with a beautiful symmetrical roundness to them. Not to mention her flat, toned stomach and long shapely legs. Though mostly obscured by the floatie, her thick thighs give you a pretty good idea of where Albina got her ass from.'
@@ -74,7 +74,7 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 			act 'Continue': gt 'albinahome', 'hallway'
 		end
 	else
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapool.jpg"></center>'
 		'Heading out the back door, you find Zoya sunbathing in the pool again. Reacting to some kind of sound you made, she opens her eyes and sits up to look at you.'
 		'"Hello again, <<$pcs_firstname>>. Waiting for Albina again?"'
 		'"Mhmm," you respond with a nod.'
@@ -84,7 +84,7 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 
 		act 'Check her out':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapool.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapool.jpg"></center>'
 			'"Okay. Thanks, Zoya."'
 			if AlbinaQW['check_out_zoya'] > 0:
 				'You can''t help but ogle her body again. Those big tanned tits, those long toned legs... You vaguely imagine what it would be like to bury your head into her breasts or feel her thighs squeeze your head during climax. A tingling sensation runs through your crotch at the thought.'
@@ -113,7 +113,7 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 
 	act 'Make small talk until Albina returns':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoya.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
 		'"So," you begin, sitting down next to the pool to be closer to eye level. "How have you been?"'
 		'The two of you chat about various things like school and her work until Milena interrupts to tell you Albina has just come home. Ending on that note, you wave goodbye and head back in to see Albina.'
 		minut +=6
@@ -124,7 +124,7 @@ if $ARGS[0] = 'zoya_sunbathing_solo':
 
 	act 'Go inside':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 		'"Okay. Thanks, Zoya. I''ll let you get back to your sunbathing."'
 		'You wave goodbye and head back into the house, thinking about how to pass the time until Albina returns.'
 		minut += 6
@@ -140,11 +140,11 @@ if $ARGS[0] = 'zoya_sunbathing_albina':
 	minut += 2
 	gs 'stat'
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/alb_zoya1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool/alb_zoya1.jpg"></center>'
 	'Stepping out through the back doors of the house, you find Albina and Zoya both lying topless upon the poolside deck chairs, cocktail glasses filled with fruity looking liquids at elbowside tables beside them next to various oils and lotions. Zoya notices you first, casually rolling away from you and onto her belly, her dark hair shifting to let you see her marvelously toned back.'
 	act 'Approach them':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/alb_zoya2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool/alb_zoya2.jpg"></center>'
 		'Only once you get closer does Albina notice you, making no move to cover herself as her lips give way to a sly smile.'
 		'"Hey <<$pcs_nickname>>," she says. "Did Milena let you in?"'
 		'"Yeah," you nod.'
@@ -154,14 +154,14 @@ if $ARGS[0] = 'zoya_sunbathing_albina':
 		'She''s doing this on purpose!'
 		act 'Interrupted':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/alb_zoya2.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool/alb_zoya2.jpg"></center>'
 			'"Why must you act like that, Albina?" Zoya sighs, rolling her eyes from the other chair.'
 			'Albina snorts. "Why not? It''s nothing <<$pcs_nickname>> hasn''t seen before. We shower together all the time at school. Besides, you''re topless too, Mama."'
 			'"It''s called <i>modesty</i>, young lady!" Zoya snorts in return. "You could stand to have some. It was time for my back anyway. And it''s time you went inside. You''ve been out here long enough. Go rinse off before you get skin cancer."'
 			'Albina sighs and gets up. "Yes, Mama..."'
 			act 'Continue':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/pool/bottoms_off.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/pool/bottoms_off.jpg"></center>'
 				'Albina drains her cocktail glass in one gulp and then shamelessly pulls down her bikini bottom to stand completely nude on the deck. Her mother gives her an eyeful, but you see her physically bite her tongue as Albina pads her way back through the house, you following along behind her.'
 				*nl
 				'"I need to take a shower," she says, casually twirling her bottoms around one finger before carelessly letting them fall to the floor. She stops in the hall outside her room and gives you a playful smile. "Care to join me?"'
@@ -172,7 +172,7 @@ if $ARGS[0] = 'zoya_sunbathing_albina':
 end
 
 if $ARGS[0] = 'Doing yoga with Albina':
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/yoga.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/yoga.jpg"></center>'
 	'You enter the house and hear Albina calling you from a nearby room. You enter the home gym and find Albina and Zoya doing some yoga. You get a great view of their round asses and toned legs stretching their skintight yoga pants and aren''t sure where to look as they finish their routine.'
 	'"I''d love to stay and chat, but I need to shower and get some paperwork done for work," Zoya says and excuses herself from the room, leaving you with Albina.'
 	'"Come on <<$pcs_nickname>>, I gotta get changed."'
@@ -181,7 +181,7 @@ if $ARGS[0] = 'Doing yoga with Albina':
 
 	act 'Go with her':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinaroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
 		'You follow Albina to her room, where she strips from her clothes and tosses them aside without a care.'
 		'"I need to take a shower and wash all this sweat off. Care to join me?" she asks with a playful smile.'
 		minut += 6
@@ -192,7 +192,7 @@ if $ARGS[0] = 'Doing yoga with Albina':
 
 	act 'Just talk':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/showering.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/showering.jpg"></center>'
 		'"No thanks, but I wouldn''t mind talking while you do."'
 		'"Suit yourself," she shrugs and heads into her personal bathroom, leaving the door open for you to follow her in. You sit down on the edge of her bath while she steps into the shower.'
 		'"So you and your mother work out together?"'
@@ -205,7 +205,7 @@ if $ARGS[0] = 'Doing yoga with Albina':
 	end
 	act 'I''ll just wait':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/albinaroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
 		'"No thanks. I''ll just wait until you''re done."'
 		'"Suit yourself I guess," she shrugs and heads into the bathroom, closing the door behind her. You twiddle your thumbs for a few minutes until she comes back out, towel wrapped around her hair and with nothing around her body. She heads straight to her dresser to start picking out clothes.'
 		minut += 6
@@ -218,7 +218,7 @@ if $ARGS[0] = 'Doing yoga with Albina':
 		*clr & cla
 		minut += 10
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/livingroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 		'"That''s okay, I''ll just wait down here until you''re done."'
 		'"Whatever. Suit yourself I guess." She swaggers up the stairs while you sit down on her couch and pull out your phone to pass the time. About ten minutes later, Albina comes back down with damp hair and a new outfit.'
 		minut += 6
@@ -260,33 +260,33 @@ if $ARGS[0] = 'albina_shower':
 			act 'Finger her pussy':
 				*clr & cla
 				'<center><video autoplay loop src="images/shared/sex/lesbian/shower_finger1.mp4"></video></center>'
-				'You smile and move your hand back down between her legs. Being rather flexible, Albina lifts her leg straight up and places her foot against the shower wall, giving you better access to her pussy, which is dripping wet in anticipation. You slide two fingers inside her and start finger fucking her pussy as your thumb massages her clit. She moans loudly in pleasure as she leans against you to steady herself. A few minutes of this is enough to bring her to the edge and she starts moaning even louder. "Don''t you dare stop <<$pcs_nickname>>, I''m about to cum!" You finger her even faster and she lets out a pleasured shriek as her pussy starts squirting her juices over your arm. She steadies herself against you as she rides through the pleasure of her orgasm. You pull your fingers out of her and shove them in her mouth. She sucks on them before smiling at you.' 
+				'You smile and move your hand back down between her legs. Being rather flexible, Albina lifts her leg straight up and places her foot against the shower wall, giving you better access to her pussy, which is dripping wet in anticipation. You slide two fingers inside her and start finger fucking her pussy as your thumb massages her clit. She moans loudly in pleasure as she leans against you to steady herself. A few minutes of this is enough to bring her to the edge and she starts moaning even louder. "Don''t you dare stop <<$pcs_nickname>>, I''m about to cum!" You finger her even faster and she lets out a pleasured shriek as her pussy starts squirting her juices over your arm. She steadies herself against you as she rides through the pleasure of her orgasm. You pull your fingers out of her and shove them in her mouth. She sucks on them before smiling at you.'
 				'"Ohhh <<$pcs_nickname>>, that... That was amazing! Just let me finish up in here and I''ll be out." You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
 				'As you dry off, you hear the water turn off and a naked Albina casually strolls into the room.'
-				'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"' 
+				'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"'
 				gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
 				gs 'stat'
 
 				act 'Eat her ass':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/6.jpg"></center>'
-					'You firmly squeeze her ass in your hand before pushing her down onto all fours. She looks back and gives you a knowing smile as you kneel down next to her and spread her ass. She moans and giggles as you start rimming her asshole before grabbing you by the hair and holding you tightly against her, forcing your face between her ass cheeks as you continue pleasuring her backdoor. She soon relaxes enough for you to start pushing the tip of your tongue against her hole and it eventually penetrates. You start tongue fucking her ass in addition to rimming it, all to Albina''s immense pleasure. She reaches back and starts fondling her clit, her grip on your hair tightening as she approaches orgasm. Hearing her moans getting louder and her breathing more ragged, you start going even faster, pushing your tongue as deep as you can into her ass before Albina suddenly lets out a pleasured shriek as her pussy starts squirting juices. She lets go of your hair and you continue eating her ass as she rides through her orgasm. Once she recovers, she pulls herself up and the two of you sit in the shower making out for a few minutes before Albina breaks the kiss and smiles at you.' 
+					'You firmly squeeze her ass in your hand before pushing her down onto all fours. She looks back and gives you a knowing smile as you kneel down next to her and spread her ass. She moans and giggles as you start rimming her asshole before grabbing you by the hair and holding you tightly against her, forcing your face between her ass cheeks as you continue pleasuring her backdoor. She soon relaxes enough for you to start pushing the tip of your tongue against her hole and it eventually penetrates. You start tongue fucking her ass in addition to rimming it, all to Albina''s immense pleasure. She reaches back and starts fondling her clit, her grip on your hair tightening as she approaches orgasm. Hearing her moans getting louder and her breathing more ragged, you start going even faster, pushing your tongue as deep as you can into her ass before Albina suddenly lets out a pleasured shriek as her pussy starts squirting juices. She lets go of your hair and you continue eating her ass as she rides through her orgasm. Once she recovers, she pulls herself up and the two of you sit in the shower making out for a few minutes before Albina breaks the kiss and smiles at you.'
 					'"Ohhh <<$pcs_nickname>>, that... that was amazing! Just let me finish up in here and I''ll be out." You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
 					'As you dry off, you hear the water turn off and a naked Albina casually strolls into the room.'
-					'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"' 
+					'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"'
 					gs 'arousal', 'rimming_give', 5, 'lesbian'
 					gs 'stat'
-					
+
 					act 'Get your ass eaten':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/7.jpg"></center>'
-						'You get on all fours as Albina climbs in behind you and spreads your ass, giving her access to your awaiting asshole. You gasp when she eagerly plunges her face between your cheeks and starts greedily licking and rimming your backdoor before pushing her tongue inside and tongue fucking your ass while expertly teasing your clit with her fingers.' 
+						'You get on all fours as Albina climbs in behind you and spreads your ass, giving her access to your awaiting asshole. You gasp when she eagerly plunges her face between your cheeks and starts greedily licking and rimming your backdoor before pushing her tongue inside and tongue fucking your ass while expertly teasing your clit with her fingers.'
 						'You moan loudly in pleasure as you feel your orgasm building within you and Albina, apparently sensing this, grabs your hips and starts eating your ass with even more lustful desire.'
 						'"Don''t stop, I''m gonna cum!" you cry out as Albina goes even faster, rimming your asshole with reckless abandon before suddenly pinching your engorged clit, causing a powerful orgasm to wash over you. Once it passes, you flop out on the bed as Albina smiles at you in satisfaction. Once you recover, you both get dressed.'
 						gs 'arousal', 'rimming', 5, 'lesbian'
 						gs 'arousal', 'vaginal_finger', -5, 'lesbian'
 						gs 'stat'
-						
+
 						act 'Finish':
 							CLOSE ALL
 							gs'arousal','end'
@@ -302,7 +302,7 @@ end
 
 
 if $ARGS[0] = 'workout_solo':
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyaworkout.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyaworkout.jpg"></center>'
 	'Approaching the gym, you hear someone inside and peer in to find Zoya doing squats. Her technique looks flawless and you get a great view of her voluptuous ass and her heavily toned legs visibly flexing beneath the skintight yoga pants covering them. Noticing your reflection in the mirror, she turns her head over her shoulder to smile at you while continuing to squat. "Hello <<$pcs_firstname>>, it''s nice to see you. What can I do for you?"
 	You enter the room and chat with Zoya for a few minutes as she finishes her workout. "I''d love to stay and chat, but I need to shower and get some paperwork done for work." She excuses herself and leaves the room, leaving you alone to decide what to do.'
 	minut += 6
@@ -320,7 +320,7 @@ if $ARGS[0] = 'peep1':
 	'You stop outside Zoya''s room, where you can clearly hear water running. You stand at the door, deciding on whether you should enter or not.'
     minut += 6
 	gs 'stat'
-	
+
 	act 'Leave':
 		cla
 		'You decide to stop invading Zoya''s privacy and leave.'
@@ -330,20 +330,20 @@ if $ARGS[0] = 'peep1':
 
 	act 'Enter':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyaroom.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyaroom.jpg"></center>'
 		'You quietly open the door and step into the room before closing the door behind you. Zoya doesn''t hear you and continues showering. You take a minute to appreciate the nicely decorated room before turning your attention to the connecting ensuite bathroom.'
 		minut += 6
 		gs 'stat'
-		
+
 		act 'Leave':
 		 *clr & cla
 		 'You don''t feel comfortable invading Zoya''s privacy and so quickly and quietly leave the room.'
          act 'Leave': gt 'albinahome', 'hallway'
 	    end
-		
+
 		act 'Take a peek':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyashower.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyashower.jpg"></center>'
 			'Your curiousity gets the better of you and you crack open the door to the ensuite and peek inside. Zoya is unaware of your presence and continues showering. Being a former model, she has a great body that she keeps in shape. You can see where Albina gets some of her curvy nature from, especially her ass.'
 			'You continue watching for a few seconds before deciding you shouldn''t push your luck and get caught. You quietly slip back out into the hallway just as you hear the water stop running.'
 			act 'Continue' : gt 'albinahome', 'hallway'
@@ -363,7 +363,7 @@ if $ARGS[0] = 'peep2':
 
 	act 'Peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapeeping.jpg"></center>'
 		'Your curiousity gets the better of you and you peek through the gap in the door. Peering into the room, you can see a naked Zoya, her back turned to you as she prepares to get dressed. Being a former model, she has a great body that she keeps in shape. You can see where Albina gets some of her curvy nature from, especially her ass.'
 		'She suddenly turns around and you duck out of view, but she doesn''t react and you peer back in. This time, you get a good view of her large breasts and the neatly trimmed tuft of pubic hair sitting atop her pussy, the only hair on her otherwise silky smooth body.'
 		minut += 6
@@ -377,19 +377,19 @@ if $ARGS[0] = 'peep2':
 
 		act 'Keep watching':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapeeping.jpg"></center>'
 			'You keep watching her as she starts putting on her underwear, her bosom bouncing slightly as she adjusts her bra. She then disappears out of your view and you hear her rummaging through her closet before returning with the rest of her clothes.'
 
 			if week = 3 or week = 6:
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapeeping1.jpg"></center>'
 				'Before you can watch any further, you hear someone coming and run over to the bathroom, pretending to leave just as the maid walks up the stairs doing her rounds. She seems a little surprised to see you.'
 				'"Are you okay, Miss <<$pcs_firstname>>?" she asks, noticing the flushed appearance on your face.'
 				'"Oh, uuhh... I was... just leaving the bathroom." you reply, awkwardly trying to hide the fact that you were peeping on her employer.'
 				'You awkwardly laugh and she seems even more confused. "I''m just... I''m fine. I promise."'
-				'She gives you an awkward stare, but Zoya walks out into the hallway before she can push you further.' 
+				'She gives you an awkward stare, but Zoya walks out into the hallway before she can push you further.'
 				'"Is everything okay out here, Milena?" The maid silently nods and continues on her duties, giving you a disapproving glare as she enters Zoya''s bedroom. You avoid eye contact with Zoya as you hastily walk past her and return to Albina.'
 			else
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/zoyapeeping1.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoyapeeping1.jpg"></center>'
 				'Before you can watch any further, you hear someone coming and run over to the bathroom, pretending to leave just as Albina arrives. She has an inquisitive look on her face.'
 				'"<<$pcs_nickname>>, what are you doing?" she asks, noticing the flushed appearance on your face.'
 				'"Oh, uuhh... I was... just leaving the bathroom." you reply, awkwardly trying to hide the fact that you were peeping on her mother.'
@@ -398,7 +398,7 @@ if $ARGS[0] = 'peep2':
 				'She gives you an awkward glare, but her mother walks out into the hallway before she can push you further.'
 				'"Is everything okay out here, girls?" Albina silently nods and motions for you to follow her. You avoid eye contact with Zoya as you walk past her.'
 			end
-			
+
 			gs 'stat'
 			act 'Continue': gt 'albinahome', 'bedroom'
 		end

+ 1 - 2
locations/albina_sex_chat.qsrc

@@ -910,7 +910,7 @@ end
 if $ARGS[0] = 'ass_to_pussy':
 	gs 'stat'
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/shared/sex/anal/doggy/anal.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/shared/sex/anal/doggy/anal31.jpg"></center>'
 	iif(AlbinaQW['knows_anal'] = 1, '"When you do anal, ', 'If you ever try anal, ') + 'make sure you never go ass to pussy. I try to keep my asshole as clean as possible, but nothing will ever make it squeaky clean. Ass to pussy is just asking for a UTI. I learned that lesson the hard way," Albina grimaces.'
 	gs 'albina_sex_chat', 'sex_talk'
 end
@@ -1012,7 +1012,6 @@ if $ARGS[0] = 'biggest_dick_talk1':
 			'A playful smile crosses her lips. "I bet Lazar might be willing... He''s fucking <i>big</i>..."'
 			gs 'albina_sex_chat', 'sex_talk'
 		end
-
 		if stat['biggest_dildo'] >= 15:
 			act 'Big dildo':
 				cla & *nl

+ 11 - 11
locations/albina_sex_scenes.qsrc

@@ -1231,7 +1231,7 @@ if $ARGS[0] = 'lazar_start':
 	end
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/maid.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/maid.jpg"></center>'
 	'You enter Albina''s house and the maid politely greets you.'
 	if AlbinaQW['Lazar_Sex'] = 0:
 		'"Miss <<$pcs_firstname>>, how nice to see you. Miss Albina already has a guest, shall I tell them of your arrival?"'
@@ -1250,7 +1250,7 @@ end
 
 if $ARGS[0] = 'lazar_door_first':
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/doors.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/doors.jpg"></center>'
 	if AlbinaQW['Lazar_Sex'] = 0:
 		AlbinaQW['Lazar_Sex'] = 1
 		*nl
@@ -1277,7 +1277,7 @@ if $ARGS[0] = 'lazar_wait':
 	act 'Give them some privacy':
 		menu_off = 1
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/phone.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/phone.jpg"></center>'
 		'You decide to wait them out, and so walk down the hall to the bathroom. You walk in, lock the door and sit on the toilet. You pull out your phone and start amusing yourself.'
 		act 'Keep using phone': gt 'albina_sex_scenes', 'keep_using_phone'
 		act 'Watch porn': gt 'albina_sex_scenes', 'watch_porn'
@@ -1372,7 +1372,7 @@ if $ARGS[0] = 'lazar_peek_end':
 
 	act 'Run back down the stairs!':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hallway.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
 		'With urgent speed, you rush down the stairs, going as fast as you can without stomping and giving yourself away. Upon reaching the bottom, you inhale deeply, trying to calm your breathing when Lazar appears at the top.'
 		*nl
 		'"Oh. Hey <<$pcs_nickname>>," he says.'
@@ -1387,7 +1387,7 @@ end
 if $ARGS[0] = 'lazar_after':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/doors.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/doors.jpg"></center>'
 	'You walk down the hall and knock on Albina''s door. A muffled groan sounds inside.'
 	*nl
 	'"<i>Nnngh. Who is it...?</i>"'
@@ -1395,7 +1395,7 @@ if $ARGS[0] = 'lazar_after':
 	'"<i>Oh... Come in...</i>"'
 	act 'Open the door':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/nudealbina.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nudealbina.jpg"></center>'
 		if $albinaQW['lazar_cum'] = 'anal_creampie':
 			'You open the door to see a completely nude Albina sitting up on her rumpled bed, hair ruffled and wild, her thighs wet with pussy juice and cum that you can see is still dripping from her asshole.'
 		elseif $albinaQW['lazar_cum'] = 'facial':
@@ -1669,7 +1669,7 @@ end
 if $ARGS[0] = 'keep_using_phone':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/phone.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/phone.jpg"></center>'
 	'You keep using your phone and end up texting people, scrolling through social media and playing a few games to pass the time. When you finally get bored, you hear what sounds like muffled moaning and a few minutes later hear someone exiting Albina''s bedroom and walking away down the hall. When you''re sure they''re gone, you stand up and leave the bathroom.'
 	act 'Go to her room': gt 'albina_sex_scenes', 'lazar_after'
 end
@@ -1677,13 +1677,13 @@ end
 if $ARGS[0] = 'watch_porn':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/phone.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/phone.jpg"></center>'
 	'The thought of Albina and Lazar having sex down the hall turns you on, so you search for a good porn video to pass the time. You find one you like the look of and start watching it, finding yourself getting wetter and wetter...'
 	gs 'arousal', 'porn', 5
 	gs 'stat'
 	act 'Just keep watching':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/phone.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/phone.jpg"></center>'
 		'The idea of rubbing one out crosses your mind, but the risk of being caught is enough to discourage the thought. You keep watching the video and when it ends, you hear the sound of Albina''s door closing and someone walking away down the hall. When you''re sure they''re gone, you stand up and leave the bathroom.'
 		gs 'arousal', 'porn', 5
 		gs 'stat'
@@ -1691,7 +1691,7 @@ if $ARGS[0] = 'watch_porn':
 	end
 	act 'Rub one out':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/masturbate.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/masturbate.jpg"></center>'
 		if $pantyworntype = 'none':
 			'You''re now feeling extremely horny, and the thought of someone catching you turns you on even more. You put your phone to the side and pull your soaked panties down, exposing your eager pussy. You start fondling away at your engorged clit with one hand while using the other to slide some fingers into your wet hole and start finger banging yourself.'
 		else
@@ -1709,7 +1709,7 @@ end
 if $ARGS[0] = 'masturbate':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/masturbate.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/masturbate.jpg"></center>'
 	'Having become aroused by what you saw, you quietly close the door and quickly make your way to the bathroom, where you lock the door and sit on the toilet.'
 	'The thought of Albina and Lazar having sex down the hall turns you on, so you pull your panties down and start pleasuring yourself, not caring if anyone catches you. You start fondling away at your clit with one hand while using the other to finger bang yourself.'
 	$orgasm_txt = 'A few minutes of this is enough to bring you to climax and you pull your fingers out and clamp your hand against your mouth as you keeping vigorously rubbing your clit and bring yourself to orgasm, hoping your muffled cries of pleasure don''t draw any attention.'

+ 2 - 0
locations/albina_starlets_sex.qsrc

@@ -217,6 +217,7 @@ if $ARGS[0] = 'whore2':
 			gs 'stat'
 
 			act 'Continue':
+				cla
 				'"It''s time for you to get roasted, little lamb!" one of them says after you''ve spent a few minutes sucking their cocks.'
 				'You''re grabbed by the hair and roughly pulled to your feet before you''re thrown onto the bed on all fours. The two men undress and move into position at both ends. "You might be the sweetest thing I''ve ever seen. Even sweeter than that last whore your friend gave us!" one of the men laughs.'
 				'You start thinking of that girl and how she handled these men when a sharp slap to the face brings you back and you notice the cock hanging in front of you. "Get back to work whore!" he shouts.'
@@ -294,6 +295,7 @@ if $ARGS[0] = 'whore2':
 			gs 'stat'
 
 			act 'Continue':
+				cla
 				'"It''s time for you to get roasted, little lamb!" one of them says after you''ve spent a few minutes sucking their cocks.'
 				'You''re grabbed by the hair and roughly pulled to your feet before you''re thrown onto the bed on all fours. The two men undress and move into position at both ends. "You''re definetely the best whore your friend has ever given us!" one of the men laughs.'
 				'You start thinking about what he just said when a sharp slap to the face brings you back and you notice the cock hanging in front of you. "Get back to work, whore!" he shouts.'

+ 2 - 0
locations/albinahome.qsrc

@@ -52,6 +52,8 @@ if $ARGS[0] = 'maid_greet':
 			'"Please make yourself at home Miss <<$pcs_lastname>>," she says, motioning for you to enter and taking your coat.'
 			act 'Continue': gt 'albinahome', 'hallway'
 		end
+	else
+		gt 'albinahome', 'hallway'
 	end
 end
 

+ 1 - 1
locations/alexandriaChat.qsrc

@@ -273,7 +273,7 @@ if $ARGS[0] = 'magic':
 			minut += 5
 			gs 'stat'
 			'"Archetype, Ethos or Personality are some names for a relatively extended magical practice that originated in the mask-wearing on <i>mundane</i> magical and religious rituals. Of course, true wizards don''t need masks to invoke their powers, but they can help magic-users to channel their powers better."'
-			'"At its core is the knowledge that the human mind can''t hope to grasp all the power that magic offers, and the risk, to be changed back in a magical mismatch. Taking into certain vital philosophies, behaviors and taboos, the wizard shields themself from these dangers, which lets them tap into more power."'
+			'"At its core is the knowledge that the human mind can''t hope to grasp all the power that magic offers, and the risk, to be changed back in a magical mismatch. Taking into certain vital philosophies, behaviors and taboos, the wizards shield themselves from these dangers, which lets them tap into more power."'
 			'"Not all wizards follow this tradition, that not without reason give us certain... let''s say eccentric fame. If you want to know, I follow <i>The Autarch Ethos</i>."'
 
 			act 'Continue talking about magic':gt 'alexandriaChat',	'magic'

+ 38 - 7
locations/arousal.qsrc

@@ -1,6 +1,6 @@
 # arousal
 
-!!{ For checking arousal and when applicable triggering orgasms.
+!{ For checking arousal and when applicable triggering orgasms.
 
 $ARGS[0] the action causing arousal:
 All acts are from Sveta''s perspective and in cases of both giving and receiving, receiving should be used.
@@ -75,7 +75,7 @@ You can also add 'no_orgasm_msg' to the list of themes to prevent any orgasm mes
 }
 
 !!------------------------------------Virginity checks----------------------------------
-!!{
+!{
 	pcs_vag > 0: Hymen broken
 	stat['vaginal'] > 0: Had intercourse with a boy [penis in vagina]
 	stat['think_virgin'] = 0: Had intercourse by penis, strap, dildo and/or fist [could be solo]
@@ -94,7 +94,7 @@ if $ARGS[0] ! 'auto_lube' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $AR
 	if arousal_overcall = 1 and $arousal_overcall ! $ARGS[0]+$ARGS[2]+$ARGS[3]+$ARGS[4]+$ARGS[5]+$ARGS[6]+$ARGS[7]+$ARGS[8]: killvar 'arousal_overcall'
 end
 
-if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2':
+if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0] ! 'count2' and $ARGS[0] ! 'auto_lube':
 
 	if arrpos('$ARGS', 'unaware') >= 0: temp_unaware = 1
 	if arrpos('$ARGS', 'no_orgasm_msg') >= 0: temp_text = 1
@@ -170,10 +170,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		end
 	end
 
-!!set a magnitude as a random
+	!!set a magnitude as a random
 	stim['mag'] = rand(0,3) + rand(0,3) + rand(0,3)
 
-!! set up pain coefficient
+	!! set up pain coefficient
 	pain_coeff = 0
 	max_sex_pain = (120 - pcs_vital)/2
 
@@ -1261,7 +1261,27 @@ if $ARGS[0] = 'auto_lube':
 			elseif $lube_txt ! '':
 				$lube_txt
 			end
-			gs 'arousal', 'anal_finger', 1
+			!!The following is a copy of the stimulation and arousal gain from anal_finger, this is to avoid  overwriting variables by just calling gs 'arousal', 'anal_finger', 1
+			stim['mag'] = rand(0,3) + rand(0,3) + rand(0,3)
+			count['anal_finger'] = 1
+			stim['act'] = 40
+			if pcs_traits['buttslut_lvl'] = 1:
+				stim['mag'] += 1
+				stim['act'] = 60
+			elseif pcs_traits['buttslut_lvl'] = 2:
+				stim['mag'] += 1
+				stim['act'] = 80
+			elseif pcs_traits['buttslut_lvl'] = 3:
+				stim['mag'] += 1
+				stim['act'] = 100
+			end
+			if cumvol[3] > rand(pcs_ass/2,pcs_ass): gs 'cum_manage', 'cum_decay', rand(2,5)*max(1,stim_time/5)
+			if stim['mag'] > 9: stim['mag'] = 9
+			minut += 1
+			stim['total'] = (stim['mag']*stim['act']*8/10) / 120
+			stim['event'] += stim['total']
+			pcs_horny += stim['total']
+			orgasm_buildup += stim['total']
 			anal_slip += 8
 			ar_anal_lube = 1
 			mc_inventory['lubricant'] -= 1
@@ -1276,7 +1296,18 @@ if $ARGS[0] = 'auto_lube':
 			elseif $lube_txt ! '':
 				$lube_txt
 			end
-			gs 'arousal', 'vaginal_finger', 1
+			!!The following is a copy of the stimulation and arousal gain from vaginal_finger, this is to avoid  overwriting variables by just calling gs 'arousal', 'vaginal_finger', 1
+			stim['mag'] = rand(0,3) + rand(0,3) + rand(0,3)
+			count['vaginal_finger'] = 1
+			stim['mag'] += 1
+			stim['act'] = 80
+			if cumvol[0] > rand(pcs_vag/2,pcs_vag): gs 'cum_manage', 'cum_decay', rand(2,5)*max(1,stim_time/5)
+			if stim['mag'] > 9: stim['mag'] = 9
+			minut += 1
+			stim['total'] = (stim['mag']*stim['act']*8/10) / 120
+			stim['event'] += stim['total']
+			pcs_horny += stim['total']
+			orgasm_buildup += stim['total']
 			vaginal_slip += 8
 			ar_vag_lube = 1
 			mc_inventory['lubricant'] -= 1

+ 7 - 7
locations/artem_date_events.qsrc

@@ -544,7 +544,7 @@ if $ARGS[0] = 'gang_rape':
 		gs 'stat'
 		act 'The nightmare begins':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape1.jpg"></center>'
 			'Two of them hold you down while one pulls his dick out, shoves it in your pussy and starts hammering away, not caring if you enjoy it or not. The more you struggle or cry out, the more they seem to enjoy it.'
 			gs 'pain', 2, 'wrists', 'bind'
 			gs 'boystat', $boy1
@@ -553,7 +553,7 @@ if $ARGS[0] = 'gang_rape':
 			gs 'stat'
 			act 'Continue':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape2.jpg"></center>'
 				'The one watching takes his turn and forces his dick inside you while the first one just watches as he jerks off.'
 				gs 'pain', 2, 'wrists', 'bind'
 				gs 'boystat', $boy2
@@ -562,7 +562,7 @@ if $ARGS[0] = 'gang_rape':
 				gs 'stat'
 				act 'Continue':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape3.jpg"></center>'
 					'"Alright, my turn," the leader says. "Roll her over onto her hands and knees." You''re roughly forced into a kneeling position on the nasty old mattress, with your face forced against it. You feel someone spit on your asshole before a dick is shoved inside, causing you to cry out in pain as he starts pounding you balls deep. "Much tighter than that gaping pussy after you guys ripped it up!" He laughs and the others join in.'
 					gs 'pain', 2, 'wrists', 'bind'
 					gs 'boystat', $boy3
@@ -571,7 +571,7 @@ if $ARGS[0] = 'gang_rape':
 					gs 'stat'
 					act 'Two at a time':
 						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape4.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape4.jpg"></center>'
 						'The leader pulls out of your ass and lies in front of you on his side as someone else starts roughly fucking your ass. Once he''s next to your head, the leader shoves his dick in your mouth and makes you suck his dick as the other three take turns fucking your ass. You soon feel one of them cumming in your ass as another speaks up. "Come on, she has other holes! I''m tired of waiting!"'
 						gs 'pain', 2, 'wrists', 'bind'
 						gs 'pain', 6, 'jaw', 'ache'
@@ -584,7 +584,7 @@ if $ARGS[0] = 'gang_rape':
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape5.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rape5.jpg"></center>'
 							'With that, one of them lies down on the mattress and they force you to straddle and mount him, his cock sliding into your battered pussy as another cock is shoved into your mouth and a third back in your ass. The ones who were on watch come over to take their turns as you feel one of them cumming in your pussy.'
 							gs 'pain', 2, 'wrists', 'bind'
 							gs 'pain', 6, 'jaw', 'ache'
@@ -599,7 +599,7 @@ if $ARGS[0] = 'gang_rape':
 							gs 'stat'
 							act 'Continue':
 								*clr & cla
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rapecum1.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rapecum1.jpg"></center>'
 								'The remaining ones take turns fucking all three of your holes so much that you lose count as two of them cum inside you. When they pull out, you feel the cum leaking out of both of your holes as one of the other guys cums in your mouth.'
 								gs 'pain', 2, 'wrists', 'bind'
 								gs 'pain', 6, 'jaw', 'ache'
@@ -616,7 +616,7 @@ if $ARGS[0] = 'gang_rape':
 								gs 'stat'
 								act 'Last one':
 									*clr & cla
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rapecum2.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/shared/sex/rape/park_rapecum2.jpg"></center>'
 									'The last one starts fucking your throat. Before too long, he starts cumming as well, holding your mouth open with one hand as he jerks off with the other, milking every last drop of cum into your mouth.'
 									gs 'pain', 2, 'wrists', 'bind'
 									gs 'pain', 6, 'jaw', 'ache'

+ 28 - 28
locations/artem_nush_sex.qsrc

@@ -53,7 +53,7 @@ end
 if $ARGS[0] = 'anushka_3some1_oral2':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some3.jpg"></center>'
-	'Artem pushes your face into Anushka''s pussy and you start licking. She''s already wet and moans loudly as you feel Artem let go of you.' 
+	'Artem pushes your face into Anushka''s pussy and you start licking. She''s already wet and moans loudly as you feel Artem let go of you.'
 	'You eat her out for a few minutes with no idea what Artem is doing before you pull away and see him kneeling next to you. He quickly leans in to take your place.'
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
@@ -87,11 +87,11 @@ if $ARGS[0] = 'anushka_3some1_bj':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some5.jpg"></center>'
 		if anushkaQW['artem_dom'] = 1:
-			'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck his cock like the good little slut you are!"' 
+			'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck his cock like the good little slut you are!"'
 			'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head into her mouth, tightly wraps her lips around his shaft and starts sucking. You glance up at Artem and see him smiling. "I''m glad you talked me into this. It''s great having our own little fuck slut."'
 			'You give him an amused smile before you start licking his balls, which makes him moan loudly.'
 		else
-			'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck this cock like the good little slut you are!"' 
+			'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck this cock like the good little slut you are!"'
 			'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head into her mouth, tightly wraps her lips around his shaft and starts sucking. After you''re satisfied that she''s doing what you want, you start licking his balls and hear him moaning loudly.'
 		end
 		gs 'arousal', 'foreplay', 2
@@ -101,7 +101,7 @@ if $ARGS[0] = 'anushka_3some1_bj':
 			gs 'boyStat', 'A2'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some6.jpg"></center>'
 			'He grabs hold of Anushka''s head and pulls her off as he looks at you. "I need to fuck you, <<$pcs_nickname>>."'
-			'You lift yourself up and straddle him before lining his dick up with your pussy and slowly lowering yourself down on it, taking his <<dick>>cm <<$dick_girth>> dick inside you. As you start riding him, Anushka moves up to his head, straddles his face and lowers herself down, grinding her crotch into his face as you ride him. You both moan from the pleasure of the act and watching your friend be pleasured by your boyfriend.' 
+			'You lift yourself up and straddle him before lining his dick up with your pussy and slowly lowering yourself down on it, taking his <<dick>>cm <<$dick_girth>> dick inside you. As you start riding him, Anushka moves up to his head, straddles his face and lowers herself down, grinding her crotch into his face as you ride him. You both moan from the pleasure of the act and watching your friend be pleasured by your boyfriend.'
 			'A few minutes later, he lifts her off and then smacks your ass. "Bring that sweet pussy up here."'
 			gs 'arousal', 'vaginal', 3
 			gs 'stat'
@@ -116,7 +116,7 @@ if $ARGS[0] = 'anushka_3some1_bj':
 					'"Take the whole thing," you tell her as you reach over and grab her shoulders, pushing her down until she''s impaled balls deep on his cock.'
 				else
 					'You get off him and move up to his face to straddle it. As you do, you look at Anushka. "Get over here. I want to see you ride this cock, slut."'
-					'Anushka laughs at your comment. "Whatever you say, nerd tamer."' 
+					'Anushka laughs at your comment. "Whatever you say, nerd tamer."'
 					'She lifts herself up and shimmies down his body until she''s above his dick. You straddle his face and he starts licking your wet pussy as you watch Anushka lower herself down, impaling herself on his cock. She moans softly as she starts riding him in reverse cowgirl style.'
 				end
 				gs 'arousal', 'cuni', 2
@@ -202,7 +202,7 @@ if $ARGS[0] = 'anushka_3some1_doggy':
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'arousal', 'voyeur_sex', 2
 	gs 'stat'
-	act 'Keep eating her out': 
+	act 'Keep eating her out':
 		*clr & cla
 		minut -= 2
 		gs 'boyStat', 'A2'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'anushka_3some1_doggy':
 		gs 'arousal', 'cuni_give', 2, 'lesbian'
 		gs 'arousal', 'voyeur_sex', 2
 		gs 'stat'
-		act 'Slurp at her soaking wet pussy': 
+		act 'Slurp at her soaking wet pussy':
 			*clr & cla
 			minut -= 5
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some16.jpg"></center>'
@@ -235,7 +235,7 @@ if $ARGS[0] = 'anushka_3some1_doggy':
 			gs 'stat'
 			act 'Sit up and watch': gt 'artem_nush_sex', 'anushka_3some1_dom_facial'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'anushka_3some1_dom_facial':
@@ -367,7 +367,7 @@ if $ARGS[0] = 'anushka_3some2_dom_bj':
 	act 'Eat her out':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some3.jpg"></center>'
-		'Artem buries your face in Anushka''s pussy and you start licking. She''s already wet and moans loudly as you feel Artem let go of you. "That''s it. Get her nice and wet for me, <<$pcs_nickname>>."' 
+		'Artem buries your face in Anushka''s pussy and you start licking. She''s already wet and moans loudly as you feel Artem let go of you. "That''s it. Get her nice and wet for me, <<$pcs_nickname>>."'
 		'As you eat her out, you notice Artem undressing out of the corner of your eye. Once he''s naked, he kneels down next to you. "Take off your clothes," he orders as you move aside, letting him lean in and take your place.'
 		gs 'arousal', 'cuni_give', 2, 'lesbian'
 		gs 'stat'
@@ -482,8 +482,8 @@ if $ARGS[0] = 'anushka_3some2_bj':
 	act 'Tell Anushka to suck his dick':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some5.jpg"></center>'
-		'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck his cock like the good little slut you are!"' 
-		'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head of his dick into her mouth, tightly wraps her lips around his shaft and starts sucking. You glance up at Artem and see him smiling. "I''m glad you talked me into this. It''s great having our own little fuck slut."' 
+		'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck his cock like the good little slut you are!"'
+		'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head of his dick into her mouth, tightly wraps her lips around his shaft and starts sucking. You glance up at Artem and see him smiling. "I''m glad you talked me into this. It''s great having our own little fuck slut."'
 		'You give him an amused smile before you start licking his balls, which makes him moan loudly.'
 		gs 'arousal', 'foreplay', 2
 		gs 'stat'
@@ -579,14 +579,14 @@ if $ARGS[0] = 'anushka_3some2_doggy':
 	'"Oh fuck... Yes... I love big nerd dick... In my ass..." she moans breathlessly as he fucks her ass and you eat her out.'
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
-	act 'Keep eating her out': 
+	act 'Keep eating her out':
 		*clr & cla
 		gs 'boyStat', 'A2'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some15.jpg"></center>'
 		'As you lick your friend''s pussy, you have a perfect view to watch Artem''s cock as he starts taking long, hard thrusts into her ass. "OH FUCK... OH FUCK... OH FUUUCCCKKK!" she cries out as her her legs start shaking and your face is covered in her pussy juices. Artem fucks her through her orgasm, not letting up or slowing down as she cums hard.'
 		gs 'arousal', 'cuni_give', 2, 'lesbian'
 		gs 'stat'
-		act 'Slurp at her soaking wet pussy': 
+		act 'Slurp at her soaking wet pussy':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some16.jpg"></center>'
 			'"That''s right. Moan like a slut while taking my dick in your ass!" he says before he leans forward and reaches out with one of his arms. A moment later you feel her breasts lifting off your stomach, you can only guess that he is pulling her up and back by her hair. "Tell me whose ass this is."'
@@ -600,7 +600,7 @@ if $ARGS[0] = 'anushka_3some2_doggy':
 			gs 'stat'
 			act 'Sit up and watch': gt 'artem_nush_sex', 'anushka_3some2_dom_facial'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'anushka_3some2_dom_facial':
@@ -639,7 +639,7 @@ if $ARGS[0] = 'anushka_3some2_cleanup':
 	'Once you''re all cleaned up, you start dressing before Anushka grabs her purse off the floor where she dropped it. "I have to admit, you''re starting to get really good at this. That new bad boy streak of yours is really starting to shine."'
 	'Artem blushes a little at her compliment, but you also notice his chest swell in obvious pride at her words. "Thanks. You weren''t too bad yourself."'
 	*nl
-	'Anushka snorts a laugh in reply then looks at you. "I think we might have created a monster."' 
+	'Anushka snorts a laugh in reply then looks at you. "I think we might have created a monster."'
 	'He swells with pride again. "Next time you''ll have <i>three</i> orgasms!" he proclaims.'
 	'"Promises, promises..." she grins before looking at you. "He''s all yours to deal with."'
 	if grupTipe3 = 1:
@@ -828,18 +828,18 @@ if $ARGS[0] = 'artem_nush':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk1.jpg"></center>'
 	'Anushka sits and leaves room for you between her and Artem, but you motion for her to scoot over next to Artem and you sit next to her, sandwiching her between the two of you. Artem gives you a questioning look, but you just smile and nod at him.'
 	'He grins and leans back in a half reclining position as you engage Anushka in a conversation about her latest sexual partner. You can see the bulge growing in his pants, and Anushka soon does as well. "Guess someone likes my story, huh?" she asks in a bemused tone.'
 	act 'Tell her to peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk2.jpg"></center>'
 		'You lean against her, pushing her closer to Artem. "I think someone wants to say hi. Why don''t you take a peek?"'
 		'She looks back at you with a questioning look, but starts to unbutton and unzip his pants to peek inside. "It''s too dark to see anything. Pull his dick out so we can see it," you tell her.'
 		act 'Tell her to take it out':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj1.jpg"></center>'
 			'She reaches into his underwear and pulls out his <<dick>>cm <<$dick_girth>> dick. Once it''s free, he reaches over and pulls her head down into his lap. "You made it hard, so now you got to suck it," you say with a smirk.'
 			'She starts stroking his dick with one hand before taking it into her mouth and sucking on it as Artem moans in pleasure.'
 			gs 'arousal', 'voyeur_sex', 2
@@ -848,14 +848,14 @@ if $ARGS[0] = 'artem_nush':
 			act 'Push her head down':
 				*clr & cla
 				anushkaQW['dom_nush'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj2.jpg"></center>'
 				'As Anushka continues sucking Artem''s cock, you reach over and push her head down to force her to take more of it into her mouth.'
 				'"Oh yeah babe! Just like that..." Artem moans as he looks at you.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj3.jpg"></center>'
 					'You grab hold of Anushka''s hair and push her head down until you hear her gagging on his cock.'
 					'"Just think if some of the other gopniks walked by and seen you sucking my nerd dick. What would they think?" Artem says to her between moans as you make her deepthroat his cock.'
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this slut."'
@@ -866,15 +866,15 @@ if $ARGS[0] = 'artem_nush':
 			end
 			act 'Let her suck his dick':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj2.jpg"></center>'
 				'As Anushka sucks Artem''s cock, you lean over and partially lay on her back so you can peek around and watch as most of his dick disappears into her mouth with each downward bob of her head.'
 				'"Yeah bitch... Just like that... Suck my dick!" Artem groans between moans of pleasure.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
-					'You grab ahold of Anushka''s hair to pull it up out of the way so it is easier to watch her suck Artem''s dick. "Just think if some of the other gopniks walked by and seen you sucking my nerd dick. What would they think?" Artem says with a smirk.' 
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj3.jpg"></center>'
+					'You grab ahold of Anushka''s hair to pull it up out of the way so it is easier to watch her suck Artem''s dick. "Just think if some of the other gopniks walked by and seen you sucking my nerd dick. What would they think?" Artem says with a smirk.'
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this slut."'
 					gs 'arousal', 'voyeur_sex', 2, 'dom'
 					gs 'stat'
@@ -883,7 +883,7 @@ if $ARGS[0] = 'artem_nush':
 			end
 		end
 	end
-end	
+end
 
 if $ARGS[0] = 'artem_nush_strip':
 	menu_off = 1
@@ -917,7 +917,7 @@ if $ARGS[0] = 'artem_nush_strip':
 					*clr & cla
 					artemQW['artem_dom'] += 1
 					gs 'boyStat', 'A2'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_anal1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal1.jpg"></center>'
 					'After spending a few more minutes fucking her pussy, he pulls his hips back. "Tell me you want this nerd dick in your ass."'
 					'"Yes... I want you to fuck my ass with your big nerd dick," she says, sounding rather desperate, yet also aroused.'
 					'You hold her ass cheeks wide for him as he lines his dick up with her asshole. "Oh fuck!" she mutters as he forces his cock up her ass.'
@@ -937,8 +937,8 @@ if $ARGS[0] = 'artem_nush_strip':
 						act 'Watch him cum':
 							*clr & cla
 							minut += 5
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_facial.jpg"></center>'
-							'Artem suddenly pulls out of Anushka and stands up. "Turn her around to face me." You help her quickly turn around, her body still shaking from her orgasm. "Jerk me off and let me cum over your face, slut!" he orders.' 
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
+							'Artem suddenly pulls out of Anushka and stands up. "Turn her around to face me." You help her quickly turn around, her body still shaking from her orgasm. "Jerk me off and let me cum over your face, slut!" he orders.'
 							'She takes hold of his dick and starts jerking him off. Almost at once, he starts cumming over her face. She milks his cock until every last drop of it has been squeezed out of it. They both sigh and sit back against the garage once he''s finished.'
 							*nl
 							'Anushka grabs some tissues from her purse and starts cleaning the cum off her face. "Where are my clothes?"'
@@ -1110,7 +1110,7 @@ if $ARGS[0] = 'artem_sveta_anal':
 	gs 'stat'
 	act 'Take an anal pounding':
 		*clr & cla
-		gs 'boyStat', 'A2'		
+		gs 'boyStat', 'A2'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal2.jpg"></center>'
 		'Artem pushes his cock deeper into your ass as he starts to fuck you harder and faster, even more so once Anushka starts arching her back and moaning loudly as she rubs herself to orgasm. This pushes Artem to the edge as well as he starts grunting hard before he pulls out of you and points his dick in your face.'
 		gs 'arousal', 'anal', 2, 'lube'

+ 29 - 29
locations/artem_nush_sex_uni.qsrc

@@ -59,7 +59,7 @@ end
 if $ARGS[0] = 'anushka_3some1_oral2':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some3.jpg"></center>'
-	'Artem pushes your face into Anushka''s pussy and you start licking. She''s already wet and moans loudly as you feel Artem let go of you.' 
+	'Artem pushes your face into Anushka''s pussy and you start licking. She''s already wet and moans loudly as you feel Artem let go of you.'
 	'You eat her out for a few minutes with no idea what Artem is doing before you pull away and see him kneeling next to you. He quickly leans in to take your place.'
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
@@ -93,11 +93,11 @@ if $ARGS[0] = 'anushka_3some1_bj':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some5.jpg"></center>'
 		if anushkaQW['artem_dom'] = 1:
-			'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck his cock like the good little slut you are!"' 
+			'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck his cock like the good little slut you are!"'
 			'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head into her mouth, tightly wraps her lips around his shaft and starts sucking. You glance up at Artem and see him smiling. "I''m glad you talked me into this. It''s great having our own little fuck slut."'
 			'You give him an amused smile before you start licking his balls, which makes him moan loudly.'
 		else
-			'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck this cock like the good little slut you are!"' 
+			'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck this cock like the good little slut you are!"'
 			'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head into her mouth, tightly wraps her lips around his shaft and starts sucking. After you''re satisfied that she''s doing what you want, you start licking his balls and hear him moaning loudly.'
 		end
 		gs 'arousal', 'foreplay', 2
@@ -107,7 +107,7 @@ if $ARGS[0] = 'anushka_3some1_bj':
 			gs 'boyStat', 'A2'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some6.jpg"></center>'
 			'He grabs hold of Anushka''s head and pulls her off as he looks at you. "I need to fuck you, <<$pcs_nickname>>."'
-			'You lift yourself up and straddle him before lining his dick up with your pussy and slowly lowering yourself down on it, taking his <<dick>>cm <<$dick_girth>> dick inside you. As you start riding him, Anushka moves up to his head, straddles his face and lowers herself down, grinding her crotch into his face as you ride him. You both moan from the pleasure of the act and watching your friend be pleasured by your boyfriend.' 
+			'You lift yourself up and straddle him before lining his dick up with your pussy and slowly lowering yourself down on it, taking his <<dick>>cm <<$dick_girth>> dick inside you. As you start riding him, Anushka moves up to his head, straddles his face and lowers herself down, grinding her crotch into his face as you ride him. You both moan from the pleasure of the act and watching your friend be pleasured by your boyfriend.'
 			'A few minutes later, he lifts her off and then smacks your ass. "Bring that sweet pussy up here."'
 			gs 'arousal', 'vaginal', 3
 			gs 'stat'
@@ -122,7 +122,7 @@ if $ARGS[0] = 'anushka_3some1_bj':
 					'"Take the whole thing," you tell her as you reach over and grab her shoulders, pushing her down until she''s impaled balls deep on his cock.'
 				else
 					'You get off him and move up to his face to straddle it. As you do, you look at Anushka. "Get over here. I want to see you ride this cock, slut."'
-					'Anushka laughs at your comment. "Whatever you say, nerd tamer."' 
+					'Anushka laughs at your comment. "Whatever you say, nerd tamer."'
 					'She lifts herself up and shimmies down his body until she''s above his dick. You straddle his face and he starts licking your wet pussy as you watch Anushka lower herself down, impaling herself on his cock. She moans softly as she starts riding him in reverse cowgirl style.'
 				end
 				gs 'arousal', 'cuni', 2
@@ -206,14 +206,14 @@ if $ARGS[0] = 'anushka_3some1_doggy':
 	end
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
-	act 'Keep eating her out': 
+	act 'Keep eating her out':
 		*clr & cla
 		gs 'boyStat', 'A2'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some15.jpg"></center>'
 		'As you lick your friend''s pussy, you have a perfect view to watch Artem''s cock as he starts taking long, hard thrusts into her ass. "OH FUCK... OH FUCK... OH FUUUCCCKKK!" she cries out as her her legs start shaking and your face is covered in her pussy juices. Artem fucks her through her orgasm, not letting up or slowing down as she cums hard.'
 		gs 'arousal', 'cuni_give', 2, 'lesbian'
 		gs 'stat'
-		act 'Lick her pussy': 
+		act 'Lick her pussy':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some16.jpg"></center>'
 			if anushkaQW['artem_dom'] = 1:
@@ -235,7 +235,7 @@ if $ARGS[0] = 'anushka_3some1_doggy':
 			gs 'stat'
 			act 'Sit up and watch': gt 'artem_nush_sex_uni', 'anushka_3some1_dom_facial'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'anushka_3some1_dom_facial':
@@ -347,7 +347,7 @@ if $ARGS[0] = 'anushka_3some2':
 	*clr & cla
 	artemQW['artem_dom'] += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some1.jpg"></center>'
-	'As the two of you talk about last time and what he''s expecting this time, there''s a knock on the door. Artem gets up and answers it, and you see Anushka standing in the hallway. He stands aside to let her in, slapping her hard on the ass as he does. "Yeah baby, smack my ass..." she says teasingly as he locks the door before quickly catching up to smack her again.' 
+	'As the two of you talk about last time and what he''s expecting this time, there''s a knock on the door. Artem gets up and answers it, and you see Anushka standing in the hallway. He stands aside to let her in, slapping her hard on the ass as he does. "Yeah baby, smack my ass..." she says teasingly as he locks the door before quickly catching up to smack her again.'
 	'"I''m going to do a lot more than smack it!" he replies with a grin.'
 	'She gives you an amused, yet slightly aroused grin as she walks over to the couch and Artem starts undressing her. Once she''s naked, he pushes her down firmly by the shoulders and she drops down onto her knees in front of him. "Open your mouth, slut," he says as he unbuttons his pants.'
 	gs 'arousal', 'voyeur', 2, 'dom'
@@ -365,7 +365,7 @@ if $ARGS[0] = 'anushka_3some2_dom_bj':
 	act 'Eat her out':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some3.jpg"></center>'
-		'Artem buries your face in Anushka''s pussy and you start licking. She''s already wet and moans loudly as you feel Artem let go of you. "That''s it. Get her nice and wet for me, <<$pcs_nickname>>."' 
+		'Artem buries your face in Anushka''s pussy and you start licking. She''s already wet and moans loudly as you feel Artem let go of you. "That''s it. Get her nice and wet for me, <<$pcs_nickname>>."'
 		'As you eat her out, you notice Artem undressing out of the corner of your eye. Once he''s naked, he kneels down next to you. "Take off your clothes," he orders as you move aside, letting him lean in and take your place.'
 		gs 'arousal', 'cuni_give', 2, 'lesbian'
 		gs 'stat'
@@ -478,8 +478,8 @@ if $ARGS[0] = 'anushka_3some2_bj':
 	act 'Tell Anushka to suck his dick':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some5.jpg"></center>'
-		'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck his cock like the good little slut you are!"' 
-		'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head of his dick into her mouth, tightly wraps her lips around his shaft and starts sucking. You glance up at Artem and see him smiling. "I''m glad you talked me into this. It''s great having our own little fuck slut."' 
+		'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck his cock like the good little slut you are!"'
+		'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head of his dick into her mouth, tightly wraps her lips around his shaft and starts sucking. You glance up at Artem and see him smiling. "I''m glad you talked me into this. It''s great having our own little fuck slut."'
 		'You give him an amused smile before you start licking his balls, which makes him moan loudly.'
 		gs 'arousal', 'foreplay', 2
 		gs 'stat'
@@ -575,14 +575,14 @@ if $ARGS[0] = 'anushka_3some2_doggy':
 	'"Oh fuck... Yes... I love big nerd dick... In my ass..." she moans breathlessly as he fucks her ass and you eat her out.'
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
-	act 'Keep eating her out': 
+	act 'Keep eating her out':
 		*clr & cla
 		gs 'boyStat', 'A2'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some15.jpg"></center>'
 		'As you lick your friend''s pussy, you have a perfect view to watch Artem''s cock as he starts taking long, hard thrusts into her ass. "OH FUCK... OH FUCK... OH FUUUCCCKKK!" she cries out as her her legs start shaking and your face is covered in her pussy juices. Artem fucks her through her orgasm, not letting up or slowing down as she cums hard.'
 		gs 'arousal', 'cuni_give', 2, 'lesbian'
 		gs 'stat'
-		act 'Lick her pussy': 
+		act 'Lick her pussy':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some16.jpg"></center>'
 			'"That''s right. Moan like a slut while taking my dick in your ass!" he says before he leans forward and reaches out with one of his arms. A moment later you feel her breasts lifting off your stomach, you can only guess that he is pulling her up and back by her hair. "Tell me whose ass this is."'
@@ -596,7 +596,7 @@ if $ARGS[0] = 'anushka_3some2_doggy':
 			gs 'stat'
 			act 'Sit up and watch': gt 'artem_nush_sex_uni', 'anushka_3some2_dom_facial'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'anushka_3some2_dom_facial':
@@ -635,7 +635,7 @@ if $ARGS[0] = 'anushka_3some2_cleanup':
 	'Once you''re all cleaned up, you start dressing before Anushka grabs her purse off the floor where she dropped it. "I have to admit, you''re starting to get really good at this. That new bad boy streak of yours is really starting to shine."'
 	'Artem blushes a little at her compliment, but you also notice his chest swell in obvious pride at her words. "Thanks. You weren''t too bad yourself."'
 	*nl
-	'Anushka snorts a laugh in reply then looks at you. "I think we might have created a monster."' 
+	'Anushka snorts a laugh in reply then looks at you. "I think we might have created a monster."'
 	'He swells with pride again. "Next time you''ll have <i>three</i> orgasms!" he proclaims.'
 	'"Promises, promises..." she grins before looking at you. "He''s all yours to deal with."'
 	if grupTipe3 = 1:
@@ -803,7 +803,7 @@ if $ARGS[0] = 'nerd_game_night_walk':
 	minut += 10
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walking.jpg"></center>'
 	if func('uniutil', 'student', 'enrolled'):
-		'You and Artem hold hands and Anushka walks on the other side of him as the three of you talk about a variety of subjects, mostly about the university, your respective courses and the professors. Artem then talks about the D&D game, but quickly drops it when Anushka seems like she''s getting bored.' 
+		'You and Artem hold hands and Anushka walks on the other side of him as the three of you talk about a variety of subjects, mostly about the university, your respective courses and the professors. Artem then talks about the D&D game, but quickly drops it when Anushka seems like she''s getting bored.'
 		'You then walk past the garages out back of the apartment complex Anushka lives in, and she points out which one the band is renting. Artem suddenly stops and takes his jacket off before spreading it wide on the ground. "Hey, why don''t we sit and talk for a bit here?" If you want Anushka to have sex with Artem, then you should sit with her between you and him. If you want to have sex with him, then you should sit between them.'
 	else
 		'You and Artem hold hands and Anushka walks on the other side of him as the three of you talk about a variety of subjects, but they mostly chat about the university and what they think of their professors and fellow students in each of their classes. Artem then talks about the D&D game, but quickly drops it when Anushka seems like she''s getting bored.'
@@ -817,18 +817,18 @@ if $ARGS[0] = 'artem_nush':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk1.jpg"></center>'
 	'Anushka sits and leaves room for you between her and Artem, but you motion for her to scoot over next to Artem and you sit next to her, sandwiching her between the two of you. Artem gives you a questioning look, but you just smile and nod at him.'
 	'He grins and leans back in a half-reclining position as you engage Anushka in a conversation about her latest sexual partner. You can see the bulge growing in his pants, and Anushka soon does as well. "Guess someone likes my story, huh?" she asks in a bemused tone.'
 	act 'Tell her to peek':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk2.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk2.jpg"></center>'
 		'You lean against her, pushing her closer to Artem. "I think someone wants to say hi. Why don''t you take a peek?"'
 		'She looks back at you with a questioning look but starts to unbutton and unzip his pants to peek inside. "It''s too dark to see anything. Pull his dick out so we can see it," you tell her.'
 		act 'Tell her to take it out':
 			*clr & cla
 			gs 'boyStat', 'A2'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj1.jpg"></center>'
 			'She reaches into his underwear and pulls out his <<dick>>cm <<$dick_girth>> dick. Once it''s free, he reaches over and pulls her head down into his lap. "You made it hard, so now you got to suck it," you say with a smirk.'
 			'She starts stroking his dick with one hand before taking it into her mouth and sucking on it as Artem moans in pleasure.'
 			'"This is the best use for that mouth of her''s," he says as you grin at him.'
@@ -838,16 +838,16 @@ if $ARGS[0] = 'artem_nush':
 			act 'Push her head down':
 				*clr & cla
 				anushkaQW['dom_nush'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj2.jpg"></center>'
 				'As Anushka continues sucking Artem''s cock, you reach over and push her head down to force her to take more of it into her mouth.'
 				'"Oh yeah babe! Just like that..." Artem moans as he looks at you.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj3.jpg"></center>'
 					'You grab hold of Anushka''s hair and push her head down until you hear her gagging on his cock.'
-					'"God, you''re the best girlfriend a guy could have!" he says between moans as you make Anushka deepthroat his cock.' 
+					'"God, you''re the best girlfriend a guy could have!" he says between moans as you make Anushka deepthroat his cock.'
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this slut."'
 					gs 'arousal', 'voyeur_sex', 2, 'dom'
 					gs 'stat'
@@ -856,14 +856,14 @@ if $ARGS[0] = 'artem_nush':
 			end
 			act 'Let her suck his dick':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj2.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj2.jpg"></center>'
 				'As Anushka sucks Artem''s cock, you lean over and partially lay on her back so you can peek around and watch as most of his dick disappears into her mouth with each downward bob of her head.'
 				'"Yeah bitch... Just like that... Suck my dick!" Artem groans between moans of pleasure.'
 				gs 'arousal', 'voyeur_sex', 2, 'dom'
 				gs 'stat'
 				act 'Grab her hair':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_bj3.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_bj3.jpg"></center>'
 					'You grab hold of Anushka''s hair and pull it up out of the way so it''s easier to watch her suck Artem''s dick.'
 					'"Just look at you submissively and obediently sucking my dick like a good little slut. We''ll make you into a slut for all the nerds before long," he says to her.'
 					'After a few minutes of this, Artem looks you dead in the eye. "Help me take her jeans off so I can fuck this dirty slut in this alley."'
@@ -908,7 +908,7 @@ if $ARGS[0] = 'artem_nush_strip':
 					*clr & cla
 					artemQW['artem_dom'] += 1
 					gs 'boyStat', 'A2'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_anal1.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal1.jpg"></center>'
 					'After spending a few more minutes fucking her pussy, he pulls his hips back. "Tell me you want this nerd dick in your ass."'
 					'"Yes... I want you to fuck my ass with your big nerd dick," she says, sounding rather desperate, yet also aroused.'
 					'You hold her ass cheeks wide for him as he lines his dick up with her asshole. "Oh fuck!" she mutters as he forces his cock up her ass.'
@@ -928,8 +928,8 @@ if $ARGS[0] = 'artem_nush_strip':
 						act 'Watch him cum':
 							*clr & cla
 							minut += 5
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/anushka/walk_facial.jpg"></center>'
-							'Artem suddenly pulls out of Anushka and stands up. "Turn her around to face me." You help her quickly turn around, her body still shaking from her orgasm. "Jerk me off and let me cum over your face, slut!" he orders.' 
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_facial.jpg"></center>'
+							'Artem suddenly pulls out of Anushka and stands up. "Turn her around to face me." You help her quickly turn around, her body still shaking from her orgasm. "Jerk me off and let me cum over your face, slut!" he orders.'
 							'She takes hold of his dick and starts jerking him off. Almost at once, he starts cumming over her face. She milks his cock until every last drop of it has been squeezed out of it. They both sigh and sit back against the garage once he''s finished.'
 							*nl
 							'Anushka grabs some tissues from her purse and starts cleaning the cum off her face. "Where are my clothes?"'
@@ -1124,7 +1124,7 @@ if $ARGS[0] = 'artem_sveta_anal':
 	gs 'stat'
 	act 'Take an anal pounding':
 		*clr & cla
-		gs 'boyStat', 'A2'		
+		gs 'boyStat', 'A2'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/city/coffee_hole/sveta/walk_anal2.jpg"></center>'
 		'Artem pushes his cock deeper into your ass as he starts to fuck you harder and faster, even more so once Anushka starts arching her back and moaning loudly as she rubs herself to orgasm. This pushes Artem to the edge as well as he starts grunting hard before he pulls out of you and points his dick in your face.'
 		gs 'arousal', 'anal', 2, 'lube'

+ 1 - 1
locations/artemhome.qsrc

@@ -1041,7 +1041,7 @@ if $ARGS[0] = 'fridge':
 			artemfood_day = daystart
 			artemtea_count -= 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/shared/food/tea.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/drinks/tea.jpg"></center>'
 			pcs_health += 10
 			pcs_mood += 20
 			fat += 2

+ 33 - 33
locations/auditions.qsrc

@@ -160,7 +160,7 @@ if $ARGS[0] = 'tit_audition':
 					act 'Show her your tits (<<will_cost>> Willpower)':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/showtits.jpg"></center>'
-						'Your face heats with embarassment, both at her beratement and because of how uncomfotable you are with doing this but you pull your clothes aside to reveal your breasts to the woman. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
+						'Your face heats with embarrassment, both at her beratement and because of how uncomfortable you are with doing this but you pull your clothes aside to reveal your breasts to the woman. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 						'"How big are those? <<$titsize>>s?"'
 						'"Uhh, yeah," you respond nervously.'
 						'"Uhuh..."'
@@ -177,7 +177,7 @@ if $ARGS[0] = 'tit_audition':
 				act 'Show her your tits':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/citycenter/aurora/auditions/showtits.mp4"></video></center>'
-					'Your face heats with embarassment from her beratement but you otherwise brazenly pull out your breasts to show them to her. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
+					'Your face heats with embarrassment from her beratement but you otherwise brazenly pull out your breasts to show them to her. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 					'"How big are those? <<$titsize>>s?"'
 					'"Yeah, I''m a <<$titsize>>." you respond flatly.'
 					'"Uhuh..."'
@@ -197,7 +197,7 @@ if $ARGS[0] = 'tit_audition':
 				act 'Show her your tits (<<will_cost>> Willpower)':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/showtits.jpg"></center>'
-					'You blush with embarassment at the request but do as she says anyways seeing how you signed up for this in the first place. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
+					'You blush with embarrassment at the request but do as she says anyways seeing how you signed up for this in the first place. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 					'"How big are those? <<$titsize>>s?"'
 					'"Uhh... yeah..." you respond nervously.'
 					'"Uhuh..."'
@@ -332,7 +332,7 @@ if $ARGS[0] = 'reluctant_swallow_end':
 			if $clothingworntype ! 'nude':
 				'You''re still fuming, but you can see that you really don''t have any real options here. Stomping your way to the door, you fling it open and slam it shut behind you.'
 			else
-				'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slaming it shut behind you.'
+				'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slamming it shut behind you.'
 			end
 			act 'Leave': gt 'auditions', 'reflection'
 		end
@@ -381,9 +381,9 @@ if $ARGS[0] = 'reluctant_facial_end':
 			else
 				if cumloc[11] > 0 or cumloc[13] > 0 or cumloc[15] > 0 or cumloc[16] > 0:
 					gs 'cum_call', 'clothes', $boy
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				else
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				end
 			end
 			act 'Leave': gt 'auditions', 'reflection'
@@ -408,13 +408,13 @@ if $ARGS[0] = 'reluctant_results':
 		if audition['cast_couch'] < 6:
 			'"Well, a deal''s a deal," he says, pulling a sheet from a stack of papers. "Your lips sure knew what they were doing," he continues to say as he scribbles a few marks on the sheet he pulled.'
 			'"Not much of an actress, but you give great head. Ever considered working a gloryhole? I''d come visit."'
-			'With his last comment, he slides the paper over to you with a pen. "Just sign this and it''s all offical."'
+			'With his last comment, he slides the paper over to you with a pen. "Just sign this and it''s all official."'
 		elseif audition['cast_couch'] < 13:
 			'"Well, a deal''s a deal," he says, pulling a sheet from a stack of papers. "And not a bad deal it was," he continues to say as he scribbles a few marks on the sheet he pulled.'
-			'"Don''t know you''re trying to be an actress with a pussy like that. Ought to just cut out the middle man and work as a whore," he says, sliding the paper over to you with a pen. "Just sign this and it''s all offical."'
+			'"Don''t know you''re trying to be an actress with a pussy like that. Ought to just cut out the middle man and work as a whore," he says, sliding the paper over to you with a pen. "Just sign this and it''s all official."'
 		else
 			'"Well, a deal''s a deal," he says, pulling a sheet from a stack of papers. "Anyone ever tell you what a great ass you have? Real tight and very slappable," he continues to say as he scribbles a few marks on the sheet he pulled.'
-			'"If you''re free on Fridays I''d be happy to toss you a few rubles to fuck it again," he says, sliding the paper over to you with a pen. "Just sign this and it''s all offical."'
+			'"If you''re free on Fridays I''d be happy to toss you a few rubles to fuck it again," he says, sliding the paper over to you with a pen. "Just sign this and it''s all official."'
 		end
 		if $clothingworntype ! 'nude':
 			act 'Sign the contract': gt 'auditions', 'signature'
@@ -492,9 +492,9 @@ if $ARGS[0] = 'reluctant_results':
 			else
 				if cumloc[11] > 0 or cumloc[13] > 0 or cumloc[15] > 0 or cumloc[16] > 0:
 					gs 'cum_call', 'clothes', $boy
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				else
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				end
 			end
 			act 'Leave': gt 'auditions', 'reflection'
@@ -511,7 +511,7 @@ if $ARGS[0] = 'reluctant_virgin_results':
 	if audition['result'] >= audition['requirement']:
 		'"Well, a promise is a promise," he says, reaching into a stack of papers. "Damn, what a tight pussy," he continues to speak as he scribbles a few marks on the sheet he pulls out.'
 		'"Not much of an actress, but a great fuck. Maybe you should be doing porn instead. Though if you were, I might never get to fuck you again, ha!"'
-		'With his last comment, he slides the paper over to you with a pen. "Just sign this and it''s all offical."'
+		'With his last comment, he slides the paper over to you with a pen. "Just sign this and it''s all official."'
 		act 'Sign the contract': gt 'auditions', 'naked_signature'
 	else
 		'"Well a promise is a promise... but you weren''t <i>that</i> good a fuck."'
@@ -546,9 +546,9 @@ if $ARGS[0] = 'reluctant_virgin_results':
 			else
 				if cumloc[11] > 0 or cumloc[13] > 0 or cumloc[15] > 0 or cumloc[16] > 0:
 					gs 'cum_call', 'clothes', $boy
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				else
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				end
 			end
 			act 'Leave': gt 'auditions', 'reflection'
@@ -580,13 +580,13 @@ if $ARGS[0] = 'neutral_results':
 		if audition['cast_couch'] < 6:
 			'"Well, a deal''s a deal," he says, pulling a sheet from a stack of papers. "Your lips sure knew what they were doing," he continues to say as he scribbles a few marks on the sheet he pulled.'
 			'"Not much of an actress, but you give great head. Ever considered working a gloryhole? I''d come visit."'
-			'With his last comment, he slides the paper over to you with a pen. "Just sign this and it''s all offical."'
+			'With his last comment, he slides the paper over to you with a pen. "Just sign this and it''s all official."'
 		elseif audition['cast_couch'] < 13:
 			'"Well, a deal''s a deal," he says, pulling a sheet from a stack of papers. "And not a bad deal it was," he continues to say as he scribbles a few marks on the sheet he pulled.'
-			'"Don''t know you''re trying to be an actress with a pussy like that. Ought to just cut out the middle man and work as a whore," he says, sliding the paper over to you with a pen. "Just sign this and it''s all offical."'
+			'"Don''t know you''re trying to be an actress with a pussy like that. Ought to just cut out the middle man and work as a whore," he says, sliding the paper over to you with a pen. "Just sign this and it''s all official."'
 		else
-			'"Well, a deal''s a deal," he says, pulling a sheet from a stack of papers. "Anyone ever tell you what a great ass you have? Real tight and very slappable," he continues to say as he scribbles a few marks on the sheet he pulled.'
-			'"If you''re free on Fridays I''d be happy to toss you a few rubles to fuck it again," he says, sliding the paper over to you with a pen. "Just sign this and it''s all offical."'
+			'"Well, a deal''s a deal," he says, pulling a sheet from a stack of papers. "Anyone ever tell you what a great ass you have? Real tight and very slapable," he continues to say as he scribbles a few marks on the sheet he pulled.'
+			'"If you''re free on Fridays I''d be happy to toss you a few rubles to fuck it again," he says, sliding the paper over to you with a pen. "Just sign this and it''s all official."'
 		end
 		if $clothingworntype ! 'nude':
 			act 'Sign the contract': gt 'auditions', 'signature'
@@ -664,9 +664,9 @@ if $ARGS[0] = 'neutral_results':
 			else
 				if cumloc[11] > 0 or cumloc[13] > 0 or cumloc[15] > 0 or cumloc[16] > 0:
 					gs 'cum_call', 'clothes', $boy
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				else
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				end
 			end
 			act 'Leave': gt 'auditions', 'reflection'
@@ -683,7 +683,7 @@ if $ARGS[0] = 'neutral_virgin_results':
 	if audition['result'] >= audition['requirement']:
 		'"Well, a promise is a promise," he says, reaching into a stack of papers. "Damn, what a tight pussy," he continues to speak as he scribbles a few marks on the sheet he pulls out.'
 		'"Not much of an actress, but a great fuck. Maybe you should be doing porn instead. Though if you were, I might never get to fuck you again, ha!"'
-		'With his last comment, he slides the paper over to you with a pen. "Just sign this and it''s all offical."'
+		'With his last comment, he slides the paper over to you with a pen. "Just sign this and it''s all official."'
 		act 'Sign the contract': gt 'auditions', 'naked_signature'
 	else
 		'"Well a promise is a promise... but you weren''t <i>that</i> good a fuck."'
@@ -724,9 +724,9 @@ if $ARGS[0] = 'neutral_virgin_results':
 			else
 				if cumloc[11] > 0 or cumloc[13] > 0 or cumloc[15] > 0 or cumloc[16] > 0:
 					gs 'cum_call', 'clothes', $boy
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				else
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				end
 			end
 			act 'Leave': gt 'auditions', 'reflection'
@@ -753,11 +753,11 @@ if $ARGS[0] = 'slutty_results':
 	end
 	if audition['result'] >= audition['requirement']:
 		if audition['cast_couch'] < 6:
-			'"You''re my favorite kind of actress you know that?" he says, pulling a sheet from a stack of papers. "Fuck if you could act your way out of a paper bag but you sure know how to blow one open," he continues to say as he scribbles a few marks on the sheet he pulled. He slides it over to you with a pen. "Just sign this and it''s all offical."'
+			'"You''re my favorite kind of actress you know that?" he says, pulling a sheet from a stack of papers. "Fuck if you could act your way out of a paper bag but you sure know how to blow one open," he continues to say as he scribbles a few marks on the sheet he pulled. He slides it over to you with a pen. "Just sign this and it''s all official."'
 		elseif audition['cast_couch'] < 13:
-			'"You''re my favorite kind of actress you know that?" he says, pulling a sheet from a stack of papers. "The ones that know it''s not how well the lips on your mouth can perform but how well the ones between your legs can," he continues to say as he scribbles a few marks on the sheet he pulled. He slides it over to you with a pen. "Just sign this and it''s all offical."'
+			'"You''re my favorite kind of actress you know that?" he says, pulling a sheet from a stack of papers. "The ones that know it''s not how well the lips on your mouth can perform but how well the ones between your legs can," he continues to say as he scribbles a few marks on the sheet he pulled. He slides it over to you with a pen. "Just sign this and it''s all official."'
 		else
-			'"You''re my favorite kind of actress you know that?" he says, pulling a sheet from a stack of papers. "Anyone ever tell you what a great ass you have? Real tight and very slappable," he continues to say as he scribbles a few marks on the sheet he pulled. He slides it over to you with a pen. "Just sign this and it''s all offical."'
+			'"You''re my favorite kind of actress you know that?" he says, pulling a sheet from a stack of papers. "Anyone ever tell you what a great ass you have? Real tight and very slapable," he continues to say as he scribbles a few marks on the sheet he pulled. He slides it over to you with a pen. "Just sign this and it''s all official."'
 		end
 		if $clothingworntype ! 'nude':
 			act 'Sign the contract': gt 'auditions', 'signature'
@@ -835,9 +835,9 @@ if $ARGS[0] = 'slutty_results':
 			else
 				if cumloc[11] > 0 or cumloc[13] > 0 or cumloc[15] > 0 or cumloc[16] > 0:
 					gs 'cum_call', 'clothes', $boy
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				else
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				end
 			end
 			act 'Leave': gt 'auditions', 'reflection'
@@ -855,7 +855,7 @@ if $ARGS[0] = 'slutty_virgin_results':
 	if audition['result'] >= audition['requirement']:
 		'"You''re my favorite kind of actress, you know that?" he says, reaching into a stack of papers. "So many of them are all, <i>''Noo-ooo! I want to save my first time for someone special!''</i>," he continues to speak as he scribbles a few marks on the sheet he pulls out.'
 		'"You knew what to do to get what you wanted. Besides, no one stays cherry for long in this business."'
-		'With his last comment, he slides the paper over to you with a pen. "Just sign this and it''s all offical."'
+		'With his last comment, he slides the paper over to you with a pen. "Just sign this and it''s all official."'
 		act 'Sign the contract': gt 'auditions', 'naked_signature'
 	else
 		'"Please, I''ve had loose old whores who were better than you."'
@@ -896,9 +896,9 @@ if $ARGS[0] = 'slutty_virgin_results':
 			else
 				if cumloc[11] > 0 or cumloc[13] > 0 or cumloc[15] > 0 or cumloc[16] > 0:
 					gs 'cum_call', 'clothes', $boy
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on, smearing leftover cum across them in the process, and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				else
-					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slaming it shut behind you.'
+					'You''re still fuming, but you can see that you really don''t have any real options here. You yank your clothes back on and stomp your way to the door, flinging it open and slamming it shut behind you.'
 				end
 			end
 			act 'Leave': gt 'auditions', 'reflection'
@@ -1006,7 +1006,7 @@ if $ARGS[0] = 'bj_thoughts_reluctant':
 	elseif actress['audition_bj'] = 2:
 		'You can''t believe you''re doing this again. Giving another blowjob to someone just to get a bit part in a production.'
 	elseif actress['audition_bj'] = 3:
-		'You can''t believe you''re doing this. Again. This is the third time already! How many blowjobs are you going to give strangers in back rooms just to "enhance" your audiitions??'
+		'You can''t believe you''re doing this. Again. This is the third time already! How many blowjobs are you going to give strangers in back rooms just to "enhance" your auditions??'
 	elseif actress['audition_bj'] < 10:
 		'It''s not the first time. It''s not the second time either. It''s not even the third time. But you still can''t believe you''re blowing someone just to get a job in acting.'
 	else
@@ -1036,7 +1036,7 @@ if $ARGS[0] = 'bj_thoughts_slutty':
 	elseif actress['audition_bj'] = 2:
 		'You can''t believe you''re doing this again. Giving another blowjob to someone just to get a bit part in a production.'
 	elseif actress['audition_bj'] = 3:
-		'You can''t believe you''re doing this. Again. This is the third time already! How many blowjobs are you going to give strangers in back rooms just to "enhance" your audiitions??'
+		'You can''t believe you''re doing this. Again. This is the third time already! How many blowjobs are you going to give strangers in back rooms just to "enhance" your auditions??'
 	elseif actress['audition_bj'] < 10:
 		'It''s not the first time. It''s not the second time either. It''s not even the third time. But you still can''t believe you''re blowing someone just to get a job in acting.'
 	else

+ 11 - 11
locations/autotraidF.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 	if car > 0 and cardrive = 9:'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked just inside.'
 
 	act 'Leave': minut += 5 & gt 'city_industrial'
-	
+
 	if func('autotraidF', 'is_open'):
 		if car > 0:act 'Ask about selling your car':gt 'autotraidF', 'manager1'
 
@@ -45,12 +45,12 @@ if $ARGS[0] = 'manager1':
 	gs 'avb'
 
 	act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
-	
+
 	if cardrive = 9 and car > 0:
 		'The shifty-looking salesman circles around your car a couple of times, making exaggerated displeased noises all the while and pointing out practically every speck of dust as if it is major damage. When he turns to you, he states that the best he can do is <<bupay>> <b>₽</b> - while he claims that he''s taking a risk with that price, you''re pretty sure he''s ripping you off.'
 
 		act 'No way, not at that price - Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
-		
+
 		act 'Sell ​your car (<<bupay>> <b>₽</b>) (1:00)':
 			cla
 			menu_off = 1
@@ -58,7 +58,7 @@ if $ARGS[0] = 'manager1':
 			money += bupay
 			car = 0
 			'While you are almost certain that he''s offering less than the car is actually worth, you doubt that you''re going to find somebody who''s going to offer you more for it, and your attempts at haggling with the fence fall flat - he''s just too experienced at this.'
-			'So, as much as you hate it, you give your car one last look before you shake hands with him and follow him into the tiny shed he calls his "office" to sign the papers. He hands you the money in cash and, with a nasty grin, suggests that you look around the yard.' 
+			'So, as much as you hate it, you give your car one last look before you shake hands with him and follow him into the tiny shed he calls his "office" to sign the papers. He hands you the money in cash and, with a nasty grin, suggests that you look around the yard.'
 			'"Maybe you''ll see something you like?"'
 
 			act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
@@ -78,7 +78,7 @@ if $ARGS[0] = 'manager1':
 				act 'Talk to the car salesman again': killvar 'bupay' & gt 'autotraidF', 'manager1'
 			end
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'car':
@@ -93,12 +93,12 @@ if $ARGS[0] = 'car':
 	gs 'stat'
 	'<center><b>Used Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/UsedCar/autotraid.jpg"></center>'
-	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. According to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on though: several of the cars are visibly damaged or make awful sounds when they are started.' 
+	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. According to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on though: several of the cars are visibly damaged or make awful sounds when they are started.'
 	*nl
 	'It''s obvious that most, if not all of them have sustained some visible or invisible damage. Buying a car here could be a fantastic bargain... or a complete waste of money. If you are to buy any of them, you know that the first place to visit should be a service center.'
 
 	act 'Return': killvar 'carT' & killvar 'bupay' & gt 'autotraidF', 'start'
-	
+
 	if hour <= 17:
 		if car = 0 or car > 199:
 			!! this is a VERY crude fix for when car[] was created before car
@@ -114,7 +114,7 @@ if $ARGS[0] = 'car':
 				*clr
 				menu_off = 1
 				'<center><b>2107 (Broken engine)</b></center>'
-				'<center><img <<$set_imgh>> src="images/pc/items/accessories/car/car.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/items/accessories/car/car1.jpg"></center>'
 				!! caching offers, resets on monday (via cikl)
 				if used_car['wrek_condition'] = 0 and used_car['wrek_price'] = 0:
 					used_car['wrek_condition'] = rand(10, 200)
@@ -135,8 +135,8 @@ if $ARGS[0] = 'car':
 						car['new_condition'] = 200
 						car['current_condition'] = used_car['wrek_condition']
 						wrek = 1
-						'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<used_car[''wrek_price'']>> <b>₽</b> in cash, and the car is yours.' 
-						'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
+						'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<used_car[''wrek_price'']>> <b>₽</b> in cash, and the car is yours.'
+						'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.'
 						'If you want to get the car to a garage, you''ll have to go there and have it towed.'
 						used_car['wrek_condition'] = -1
 						used_car['wrek_price'] = -1
@@ -197,7 +197,7 @@ if $ARGS[0] = 'inspect':
 			!! sets condition when new (ie max possible condition)
 			car['new_condition'] = car['potential_new_condition']
 			wrek = 0
-			'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<used_car[''<<autotraidF_carnum>>_price'']>> <b>₽</b> in cash, and the car is yours.' 
+			'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<used_car[''<<autotraidF_carnum>>_price'']>> <b>₽</b> in cash, and the car is yours.'
 			'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 			used_car['<<autotraidF_carnum>>_condition'] = -1
 			used_car['<<autotraidF_carnum>>_price'] = -1

+ 31 - 6
locations/bank.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'start':
 					karta += kartaIN
 					money -= kartaIN
 
-					'<br>You deposited <<kartaIN>> <b>₽</b>, your account balance is now ' + iif(karta >= 0,'<<karta>>','<font color="red"><<karta>></font>') + ' <b>₽</b>.'
+					'<br>You deposited <<kartaIN>> <b>₽</b>, your account balance is now ' + iif(karta >= bankDebtLimit, '<<karta - bankDebtLimit>>', '<font color="red"><<bankDebtLimit - karta>></font>') + ' <b>₽</b>.'
 				end
 				killvar 'kartaIN'
 				gs 'stat'
@@ -353,14 +353,17 @@ if $ARGS[0] = 'loan_officer':
 	end
 end
 
-
+!ARGS[1] = fee. Defaults to 100
 if $ARGS[0] = 'deposit_cash':
-	kartaIN = input ("How much money do you want to deposit into your account? (There''s a 100 <b>₽</b> fee)")
+	if arrsize('ARGS') = 1: ARGS[1] = 100
+
+	kartaIN = input ("How much money do you want to deposit into your account?" + iif(ARGS[1] <= 0, "", " (There''s a <<ARGS[1]>> <b>₽</b> fee)"))
+
 
-	if kartaIN <= 100 or kartaIN > money:
+	if kartaIN <= ARGS[1] or kartaIN > money:
 		'Invalid operation.'
 	else
-		atmDeposit[] = kartaIN - 100
+		atmDeposit[] = kartaIN - ARGS[1]
 		atmDepositDate[] = daystart + 2
 		money -= kartaIN
 
@@ -370,6 +373,28 @@ if $ARGS[0] = 'deposit_cash':
 	killvar 'kartaIN'
 end
 
+!ARGS[1] = fee. Defaults to 0
+if $ARGS[0] = 'withdraw_cash':
+	if arrsize('ARGS') = 1: ARGS[1] = 0
+	if ARGS[1] < 0: ARGS[1] = 0
+
+	kartaOUT = input ("How much money do you want to withdraw?" + iif(ARGS[1] <= 0, "", " (There''s a <<ARGS[1]>> <b>₽</b> fee)"))
+	if kartaOUT <= ARGS[1] or kartaOUT > karta:
+		'<br>Invalid operation.'
+	else
+		karta -= kartaOUT
+		money += (kartaOUT - ARGS[1])
+		if karta > bankDebtLimit:
+			'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have <<karta - bankDebtLimit>> <b>₽</b> left in your bank account.'
+		elseif karta = 0:
+			'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have no money left in your bank account.'
+		else
+			'<br>You withdraw <<kartaOUT>> <b>₽</b>. <font color="red">Your bank account is overdrawn by <b><<bankDebtLimit - karta>> ₽</b>.</font>'
+		end
+	end
+	killvar 'kartaOUT'
+end
+
 
 if $ARGS[0] = 'cikl':
 	!!------------------------------------------------------------------------------------------------------------
@@ -421,7 +446,7 @@ if $ARGS[0] = 'cikl':
 
 		bank_i = 0
 		:atmdeposit_loop
-		if arrsize('atmDeposit') > 0:
+		if bank_i < arrsize('atmDeposit'):
 			if atmDepositDate[bank_i] <= daystart:
 				if atmDeposit[bank_i] > 0:
 					karta += atmDeposit[bank_i]

+ 12 - 12
locations/bdsm_training.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'sub':
 		gt 'bdsm_training', '3'
 	end
 end
-	
+
 
 if $ARGS[0] = '1':
 	menu_off = 1
@@ -40,10 +40,10 @@ if $ARGS[0] = '1':
 		'"Scared? Good!"'
 		'She moves away and looks at you. You realize what to do, and quickly take off all your clothes.'
 		'"Spread your legs! Hand behind your back! And the other!"'
-		
+
 		gs 'arousal', 'foreplay', 10, 'sub', 'lesbian'
 		gs 'stat'
-			
+
 		act 'Obey':
 			*clr & cla
 			gs 'stat'
@@ -59,10 +59,10 @@ if $ARGS[0] = '1':
 			'"Sorry flower, this will burn, but don''t cry. Take this!'
 			'The whip whistles in the air,  your back is burning with fire. You look at your shoulder and see the red marks.'
 			'"Listen carefully!"'
-			
+
 			gs 'arousal', 'foreplay', 10, 'sub', 'lesbian', 'maso', 'bound'
 			gs 'stat'
-		
+
 			act 'Listen':
 				*clr & cla
 				gs 'stat'
@@ -73,10 +73,10 @@ if $ARGS[0] = '1':
 				'The hostess walks around you, patting the whip on your shoulders, ass and back.'
 				'"Now the main thing, safeword, to stop, this word is "red". As soon as you say "red", the session is ended. If your mouth is busy, three times shake your head and hum "and-and". If you can''t shake your head three times you slam the palm of your hand. Clear?"'
 				'"Yes, Mistress!'
-				
+
 				gs 'arousal', 'foreplay', 10, 'sub', 'lesbian', 'maso', 'bound'
 				gs 'stat'
-			
+
 				act 'Remember':
 					*clr & cla
 					gs 'stat'
@@ -119,7 +119,7 @@ if $ARGS[0] = '1':
 							'"Failure to comply will be punished."'
 							'Skillfully, Mistress plays with your clit, first fingers, then various tools. You moan, ready to cum, but she is very much aware. Noticing your condition, she removes her hand from your flower and whips you in the stomach.'
 							'Gradually the excitement calms, but you can feel it there, just below the surface. She again starts to caress you, alternating caresses with spanking.'
-							
+
 							gs 'arousal', 'foreplay', 10, 'sub', 'lesbian', 'maso', 'bound'
 							gs 'arousal', 'vaginal_finger', 10, 'sub', 'lesbian', 'bound'
 							minut -= 10
@@ -186,7 +186,7 @@ if $ARGS[0] = 'BDSMend':
 	'"Is that all?" You ask, having temporarily forgotten about the real world.'
 	'"Almost..."'
 	'Mistress puts you on your knees in front of her and forces you to lick her pussy. The session had excited not only you, but Mistress too, and she cums from a few movements of your tongue. After, having licked up every drop from Mistress, you go.'
-	
+
 	gs 'arousal', 'cuni_give', 10, 'sub', 'lesbian', 'maso', 'bound'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -297,7 +297,7 @@ if $ARGS[0] = '2':
 											pcs_vag += 1
 											vgape = 2
 											gs 'stat'
-											'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/r3_11.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/r3_9.jpg"></center>'
 											'"Well, let''s see, how ready is your hole!"'
 											'Mistress pulls out a huge Dildo, attached to a stick, and enters it into your pussy. You think you are being torn apart. You scream out and beg for mercy, but it is useless. Mistress energetically moves the stick up and down, like she is unblocking a toilet.'
 											gs 'arousal', 'vaginal_dildo', 10, 'sub', 'lesbian', 'maso', 'bound', 'rough'
@@ -386,7 +386,7 @@ if $ARGS[0] = '3':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/r4_3.jpg"></center>'
-			'Mistress tickles your heels and growls at you everytime you try to move your legs.'
+			'Mistress tickles your heels and growls at you every time you try to move your legs.'
 			'"Return to position!"'
 			'You obey. Mistress leans forward and you feel something touching your pussy. Then you hear a buzzing sound, and you feel the vibration.'
 			gs 'arousal', 'vaginal_vibe', 10, 'sub', 'lesbian', 'bound'
@@ -527,7 +527,7 @@ if $ARGS[0] = 'dom':
 					'"This isn''t actually required as I have covered the rules, except to say you must wear expensive or formal clothing when visiting the club. So this is a little bonus for you."'
 					'You do feel quite aroused and are about to thank Elektra, when she hands you a body massager. Normally she would have to ask to cum, but as this is your treat, you can stop when ever you like. For the first time since you met Elektra she cracks a smile.'
 					'Using the body massager you tease the sub for about 10 minutes, but stop short of letting her orgasm. Elektra surprises you by kissing you on the cheek, "I think I''m going to like having you around."'
-					'She walks back to the front gate with you and gives you a shiny new membership card. Suddenly realising she is still in her leather outfit she blushes lightly and briskly walks back.'
+					'She walks back to the front gate with you and gives you a shiny new membership card. Suddenly realizing she is still in her leather outfit she blushes lightly and briskly walks back.'
 					gs 'arousal', 'vaginal_vibe_give', 10, 'dom', 'lesbian'
 					gs 'arousal', 'kiss', 2, 'lesbian'
 					gs 'arousal', 'end'

+ 2 - 0
locations/bed_events.qsrc

@@ -100,6 +100,7 @@ end
 
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
@@ -109,6 +110,7 @@ end
 
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'

+ 2 - 1
locations/bed_get_out.qsrc

@@ -4,6 +4,7 @@
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
 	InSleep = 0
+	sleepVars['stat_display'] = 0
 	sleepVars['slept_in'] = 0
 	strip_here = 0
 	SleepHorny = 0
@@ -17,7 +18,7 @@ if $ARGS[0] = 'mod_sleeptriggers':
 	!! Check for: if $ARGS[0] = 'bed_get_out' and $ARGS[1] = 'mod_sleeptriggers'
 	!!
 	!! This is NOT for events!!
-	
+
 	gs 'LOCA', 'bed_get_out', 'mod_sleeptriggers'
 	xgt 'bed_get_out_events', 'start'
 end

+ 3 - 0
locations/bed_get_out_events.qsrc

@@ -15,6 +15,7 @@ menu_off = 1
 
 if $ARGS[0] = 'start' or $ARGS[0] = '':
 	menu_off = 1
+	sleepVars['stat_display'] = 1
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 
@@ -97,6 +98,7 @@ end
 
 if $ARGS[0] = 'exit':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'
@@ -106,6 +108,7 @@ end
 
 if $ARGS[0] = 'continue':
 	sleepVars['events_done'] = 0
+	sleepVars['stat_display'] = 0
 	killvar '$sleep_events'
 	killvar '$sleep_events_priority'
 	killvar 'temp_slev_id'

+ 24 - 24
locations/belpicknick.qsrc

@@ -3,7 +3,7 @@
 menu_off = 1
 
 if $ARGS[0] = '':
-	CLOSE ALL	
+	CLOSE ALL
 	sashaBeliTimes = rand(1,3)
 	sipliGangTimes = rand(1,3)
 	kolGangTimes = rand(1,3)
@@ -80,7 +80,7 @@ if $ARGS[0] = 'vb_light':
 	gs 'dinsex2', 'd_vag_sex_bottle', 5, 'dick1'
 	gs'stat'
 	'Okay, so dancing is not something you do well. You have to entertain them with the bottle now, and decide to take the easiest route: you spread your legs and put the neck of the bottle against your pussy lips. You slowly push it in as far as it will go, trying to make a show of it by spreading your legs as far as you can and fucking yourself slowly with the neck of the bottle.'
-	if rand(1,100) <= 10:		
+	if rand(1,100) <= 10:
 		'Even though the criminals seem enthralled by your show, one of them is getting frustrated: "Whatever. You shouldn''t be putting bottles up there, but our cocks! Get over here whore, it''s time you get fucked."'
 		act 'Continue': gt 'belpicknick', 'gang'
 		gs 'willpower', 'gangbang', 'resist', 'hard'
@@ -135,7 +135,7 @@ if $ARGS[0] = 'vb_hard':
 		else
 			act 'Run away from them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-	else	
+	else
 		'The bandits look at each other for a second, and then shake their heads: "Not good enough, slut. Put it in your ass and be quick about it, otherwise we''re doing it for you."'
 		act 'Shove the neck into your ass': gt 'belpicknick', 'ab_light'
 		act 'Shove the bottom into your ass': gt 'belpicknick', 'ab_hard'
@@ -163,7 +163,7 @@ if $ARGS[0] = 'ab_light':
 	else
 		'Realising they want you to put it in your ass, you spread your legs and put the neck of the bottle against your puckered butthole. After lubricating it with a bit of saliva you slowly push it in as far as it will go, trying to make a show of it by spreading your legs as far as you can and fucking yourself slowly with the neck of the bottle.'
 	end
-	if rand(1,100) <= 70:	
+	if rand(1,100) <= 70:
 		'Even though the criminals seem enthralled by your show, one of them is getting frustrated: "Whatever. You shouldn''t be putting bottles up there, but our cocks! Get over here whore, it''s time you get fucked."'
 		act 'Continue': gt 'belpicknick', 'gang'
 		gs 'willpower', 'gangbang', 'resist', 'hard'
@@ -233,7 +233,7 @@ if $ARGS[0] = 'dance':
 		belsexpayment = 900
 		gs 'arousal', 'bj', 5, 'gangbang', 'sub', 'prostitution'
 		gs 'stat'
-		
+
 		fuckerrand = rand(1,4)
 		gmember = fuckerrand
 		killvar'fuckerrand'
@@ -273,16 +273,16 @@ if $ARGS[0] = 'missionary':
 	if gmember = 2:sipliGangTimes -= 1
 	if gmember = 3:kolGangTimes -= 1
 	if gmember = 4:tatarGangTimes -= 1
-	
+
 	'As you lay on your back <<$boydesc>> tells his friends grinning "Watch and learn, boys." <<$boydesc>> lays on top of you inserting his soft purple penis head into you. You sigh feebly as he enters you. He slides his cock carefully deeper and begins moving as if he is afraid to cause you pain. Turned on by the blowjobs before your cunt is dripping wet making him able to quickly pick up the pace as he easily glides in and out.'
 	'After a while you feel him tensing up somewhat but he''s still banging you tirelessly. You moan loudly and scream out loud as he pushes his cock extra deep into your squelching slit.'
-	
+
 	gs 'dinsex','vaginal_sex',10
 	gs 'dinsex','sexcum'
-	
+
 	gs 'arousal', 'vaginal', 10, 'sub', 'prostitution'
 	gs 'stat'
-     
+
 	if times_picknick <= 0:
 		act 'Get up': gt 'belpicknick', 'end'
 	else
@@ -322,32 +322,32 @@ if $ARGS[0] = 'doggy':
 	if pickrand = 0:'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/sexd.jpg"></center>'
 	if pickrand = 1:'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/sexd1.jpg"></center>'
 	if rand(1,100) <= 70:
-	
+
 		'You get down on all fours revealing your cute tushy. <<$boydesc>> steps up from behind and shoves his dick into your pussy. You are surprised as he begins pounding you roughly right from the get go you. He keeps up this pace for five minutes, almost without slowing the pace, only occasionally stopping to take a breath. You think he would be tired soon, but it turns out that he is more tenacious than one might assume.'
 		'As he''s pounding away, you forget where you are, screaming your head off. <<$boydesc>> is growling spanking your butt with one hand and pulling your <<$pcs_haircol>> <<$curly>> hair with the other.'
-		
+
 		gs 'dinsex','vaginal_sex',10
 		gs 'dinsex','sexcum'
-		
+
 		gs 'arousal', 'vaginal', 5, 'sub', 'rough', 'prostitution'
 		gs 'stat'
 	else
 		spafinloc = 3
 		gs 'cum_manage'
-		
+
 		'You find yourself being on elbows and knees as you''re fully aware he is about to penetrate your ass. <<$boydesc>> leans the tip of his cock against your anus and pushes it into you. It is a little painful, but the desire to pleasure him outweighs it. <<$boydesc>> gradually accelerates his pace, you can feel his balls slap against your wet clit. After a while your anus relaxes and stretches making his cock slide in and out easily now.'
-		
+
 		gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-		
+
 		gs 'arousal', 'anal', 5, 'sub', 'prostitution'
 		gs 'stat'
-		
+
 	end
 	if gmember = 1:sashaBeliTimes -= 1
 	if gmember = 2:sipliGangTimes -= 1
 	if gmember = 3:kolGangTimes -= 1
 	if gmember = 4:tatarGangTimes -= 1
-     
+
 	if times_picknick <= 0:
 		act 'Get up': gt 'belpicknick', 'end'
 	else
@@ -424,7 +424,7 @@ if $ARGS[0] = 'gang':
 	if sipliGangSex = 0:sipliSex = 1 & guy += 1
 	if kolGangSex = 0:kolGangSex = 1 & guy += 1
 	if tatarGangSex = 0:tatarGangSex = 1 & guy += 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/gang.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/gop/sex/group/sex/s50.jpg"></center>'
 	vagmembergang = rand(113,116)
 	gs 'boyStat', 'A<<vagmembergang>>','a'
 :markpoiskanalmembergang
@@ -460,15 +460,15 @@ if $ARGS[0] = 'gang':
 		sexpartkno = 1
 		spafinloc = 12
 		gs 'cum_manage'
-		
+
 		gs'stat'
 		belsexpayment = 900
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/sex/bukkake.jpg"></center>'
 		'You close your eyes just in time before the first load hits your face. You patiently wait until all four men are finished, and by the time they are your entire face is splattered with cum. Fortunately they don''t make you swallow any more than the few drops that landed in your mouth before you could close it.'
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Sit down': gt 'belpicknick', 'end'
 	end
 end
@@ -480,7 +480,7 @@ if $ARGS[0] = 'end':
 	gs 'fame', 'pav', 'prostitute', 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/Strela/vadimbely.jpg"></center>'
 	'Once they are spent, the criminals back away from you and gather their things.'
-	
+
 	if belgangPay <= 0:
 		money += belsexpayment
 		'Vadim looks at you and says: "That was a good fuck, <<$pcs_nickname>>. Here, this is for you," and with those words he hands you <<belsexpayment>> <b>₽</b>.'
@@ -497,9 +497,9 @@ if $ARGS[0] = 'end':
 			'You have reduced your next weeks payment by: <<-1*belgangPayWeek>> <b>₽</b>'
 		end
 	end
-	
+
 	*nl
-	
+
 	if rand(1,100) <= 70:
 		minut += 60
 		'Vadim looks at you again, and sees how dirty you are, "I don''t want cum stains on my car seats. Still, we can''t just leave her here... put her in the trunk." Two of the guys push you in the trunk a bit more forcefully than is needed; it''s not like you have any energy left to resist after what happened here. After a bumpy ride the car pulls to a stop on the outskirts of Pavlovsk, and Tatar got out of the car to open the trunk. He pulls you out of the trunk, throws down your clothes next to you and gets back in before they race off, leaving you to fend for yourself. Your body feels exhausted as you slowly get dressed, and make your way to town.'

+ 217 - 0
locations/beta_journal.qsrc

@@ -0,0 +1,217 @@
+# beta_journal
+!! Date Created: October, 2024
+!! Version: .01 - initial release
+!! Author: Hooded Silence
+!! Purpose: Game Journal interface - contains the modules and libraries required.
+
+!! Quest progress icons:
+!! <font color = "green">✓</font> - green tick
+!! <font color = "red">🗴</font> Red cross
+
+!! Initialise arrays and functions:
+
+if $ARGS[0] = 'init':
+    $loc_id = 'beta_journal'
+    *clr & cla
+	gs 'stat'
+	*nl
+    gs $loc_id, 'init_array'
+	$hot_link = 'default'
+	gs $loc_id, 'nav_construct'
+	if $hot_link = '':
+		gs $loc_id, 'default'
+	else
+		gs $loc_id, $hot_link
+	end
+end
+
+if $ARGS[0] = 'init_array':
+    !! Create an array to allow expansion in future
+    $array_tab[1] = 'Home'
+    $array_link[1] = 'beta_journal'
+    $array_tab[2] = 'Housing'
+    $array_link[2] = 'beta_journal_home'
+    $array_tab[3] = 'Work'
+    $array_link[3] = 'beta_journal_work'
+    $array_tab[4] = 'Relations'
+    $array_link[4] = 'beta_journal_relationships'
+    $array_tab[5] = 'Quests'
+    $array_link[5] = 'beta_journal_quests'
+    $array_tab[6] = 'Magic'
+    $array_link[6] = 'beta_journal_magic'
+    $array_tab[7] = 'Notifications'
+    $array_link[7] = 'beta_journal_notifications'
+    $array_tab[8] = 'Glossary'
+    $array_link[8] = 'beta_journal_glossary'
+    $nav_banner = '<<$pcs_nickname>>''s Quests and Relationships'
+end
+
+if $ARGS[0] = 'default':
+	*clr & cla
+	$hot_link = $ARGS[0]
+    !! Initial menu page containing alerts and tips
+	gs $loc_id, 'nav_construct'
+	'<center>'
+    gs $loc_id, 'game_events'
+    gs $loc_id, 'gametips'
+	'</center>'
+end
+
+!! Core functions for tabs and menu creation
+
+!! Navigation bar constructor:
+if $ARGS[0] = 'nav_construct':
+	if $nav_banner = '': $nav_banner = "<<$pcs_firstname>>''s Quests and Relationships"
+	!! Set up the navigation body
+	!! Create the navigation - remember to deduct -1 as magic option is removed
+	i = 0
+	!! Reset the table creation vars.
+	killvar '$tablebody'
+	killvar 'i'
+	killvar 'nav_i'
+	if $start_type[1] ! 'nomagic':
+		nav_i = arrsize('$array_tab')
+	else
+		nav_i = arrsize('$array_tab') - 1
+	end
+	:jmp_navigation_gen
+	if $start_type[1] ! 'nomagic' and $array_tab[i] = 'Magic':
+		!! null magic menu
+		i += 1
+	elseif $hot_link ! $array_link[i]:
+		$tablebody += '<th><a href="exec:gs ''<<$array_link[i]>>'', ''init''"><<$array_tab[i]>></a></th>'
+		i += 1
+	else
+		$tablebody += '<th><<$array_tab[i]>></th>'
+		i += 1
+	end
+	if i < nav_i: jump 'jmp_navigation_gen'
+	!display the table here.
+	*clr & cla
+	'<center><h1><<$nav_banner>></h1>'
+	'<table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr><<$tablebody>></tr></table></center>'
+	gs 'journal', 'leaveactions'
+end
+
+!! Events that are happening in the near future that require the player to be aware of, to compliment sidebar.
+
+if $ARGS[0] = 'game_events':
+    !! TODO: Work in progress, will require several dev cycles to port all events across and provide the necessary additional information.
+    '<center><h3>Upcoming Events</h3></center>'
+    'WIP - No events configured or happening'
+end
+!! Random game tips to help new players find their way
+if $ARGS[0] = 'gametips':
+    gs $loc_id, 'tips_init'
+
+    rnd_tip = rand(0, arrsize('$tip_body')-1)
+    '<center><h3>Girl Life Random Tips</h3>'
+    $tip_body[rnd_tip]
+	'</center>'
+    killvar 'rnd_tip'
+    killvar '$tip_body'
+end
+
+if $ARGS[0] = 'tips_init':
+    $tip_body[0] = 'Be careful when drunk.'
+	$tip_body[1] = 'If you have a modern dance skill of  50 or higher, and Albina likes you may get a chance to join Starlets.'
+	$tip_body[2] = 'Mon Cheri is the most prestigious clothing store in St. Petersburg. With a price tag to match.'
+	$tip_body[3] = 'There is some parts of the game restricted to over-18s such as doing driving lessons, gambling at the casino and other areas. There is rumours that there is studios who are less fussy about sticking to the law.'
+    $tip_body[4] = 'The city park is a dangerous place at night. Be prepared to defend yourself.'
+    $tip_body[5] = 'Finding well paid jobs for pocket money is tough for a teenager unless you get creative.'
+    $tip_body[6] = 'The Pavlovsk community centre is not the only place you can learn dance or sports skills.'
+    $tip_body[7] = "Be wary of Fae gifts."
+    $tip_body[8] = 'Exploration can lead to interesting events or surprises.'
+	$tip_body[9] = 'Look after ourself as your admirers guage your beauty is based social interests, your looks, how well you take care of yourself and what you wear.'
+end
+
+!! Table Generator for npcs and locations
+
+if $ARGS[0] = 'table_gen':
+	! Original code by Anjuna
+	entry_counter_i = 1
+	entry_counter_j = 1
+	table_counter = 0
+	if ARGS[1] = 0:
+		table_columns = 3
+	else
+		table_columns = ARGS[1]
+	end
+
+	$bjq_temp_table = '<center><table cellspacing="3" bgcolor="<<$theme[''table_bg_alt'']>>" width="80%" align="center">'
+
+	:jmp_table_gen
+						!! CREATE ROW
+
+		$bjq_temp_table +=	'<tr width="100px">'
+		:jmp_table_gen2
+							!! CREATE CELL
+			$bjq_temp_table +=		'<td align="left">'
+			$bjq_temp_table +=			'<a href="exec: gt ''<<$loc_id>>'' ,''<<$loc_shortname[entry_counter_i]>>''">'
+			$bjq_temp_table +=				'<img height="100" src="<<$loc_path[entry_counter_i]>>">'
+			$bjq_temp_table +=			'</a>'
+			$bjq_temp_table += 		'</td>'
+							!! END CELL
+			entry_counter_i += 1
+		if entry_counter_i <= table_gen_max and (entry_counter_i mod table_columns) ! 0: jump 'jmp_table_gen2'
+		$bjq_temp_table +=	'</tr>'
+						!! END ROW
+
+						!! CREATE ROW
+		$bjq_temp_table +=	'<tr width="100px">'
+		:jmp_table_gen3
+								!! CREATE CELL
+			$bjq_temp_table += 		'<td align="left">'
+			$bjq_temp_table +=			$loc_name[entry_counter_j]
+			$bjq_temp_table +=		'</td>'
+								!! END CELL
+			entry_counter_j += 1
+		if entry_counter_j <= table_gen_max and (entry_counter_j mod table_columns) ! 0: jump 'jmp_table_gen3'
+		$bjq_temp_table +=	'</tr>'
+						!! END ROW
+
+		table_counter += 1
+		if table_counter = 5:
+						!! ADD BLANK ROW
+			$bjq_temp_table += '<tr></tr>'
+			table_counter = 0
+		end
+
+	if entry_counter_i < table_gen_max: jump 'jmp_table_gen'
+
+	$bjq_temp_table += '</table></center>'
+	'<<$bjq_temp_table>>'
+
+	killvar '$bjq_temp_table'
+	killvar 'entry_counter_i'
+	killvar 'entry_counter_j'
+	killvar 'table_columns'
+	killvar 'table_counter'
+	killvar 'table_gen_max'
+end
+
+if $ARGS[0] = 'leaveactions':
+	act 'Put your notebook down':
+		killvar 'jumploc'
+		jclose = 1
+		gt $loc, $loc_arg
+	end
+end
+
+!! Error Functions:
+
+if $ARGS[0] = 'failure':
+	!! Debug sections
+	if $ARGS[1] = 'id':
+		$debug['journal'] = 'NPC ID not set, vcard not generated.'
+	elseif $ARGS[1] = 'quest_body':
+		$debug['journal'] = 'Quest body not set, quests details was not set.'
+	elseif $ARGS[1] = 'nav_forward':
+		$debug['journal'] = 'No forward navigation set - please ensure you have set the var in quest_data'
+	elseif $ARGS[1] = 'nav_back':
+		$debug['journal'] = 'No back navigation set - please ensure you have set the var in quest_data'
+	end
+	'vcard failed to initialise: ' + $debug['journal']
+end
+
+--- beta_journal ---------------------------------

+ 12 - 0
locations/beta_journal_education.qsrc

@@ -0,0 +1,12 @@
+# beta_journal_education
+!! Date Created: October, 2024
+!! Version: .01 - initial release
+!! Author: Hooded Silence
+!! Purpose: Displays all education content (school, uni, community, etc) information
+
+if $ARGS[0] = 'init':
+	$loc_id = 'beta_journal_education'
+	$hot_link = $loc_id
+	gs 'beta_journal', 'nav_construct'
+end
+--- beta_journal_education ---------------------------------

+ 41 - 0
locations/beta_journal_geography.qsrc

@@ -0,0 +1,41 @@
+# beta_journal_geography
+
+!! Game area metadata and information.
+
+if $ARGS[0] = 'init':
+	$loc_id = 'beta_journal_geography'
+	$hot_link = $loc_id
+end
+
+!! Game locations - quests
+if $ARGS[0] = 'geo_pavlovsk':
+	!!5/8 Estate
+	!!Commercial
+	!!Industrial
+	!!Market
+	!!Park
+	!!Train Station
+
+	if $ARGS[1] = '58_estate':
+		!!Parents apartment
+		!!Garages
+		!1Luda''s apartment
+		!!Shulgin''s Apartment
+	elseif $ARGS[1]= 'commercial':
+	elseif $ARGS[1]= 'industrial':
+	elseif $ARGS[1] = 'market':
+	elseif $ARGS[1] = 'park':
+	elseif $ARGS[1] = 'train_station':
+	end
+end
+if $ARGS[0] = 'geo_city':
+end
+if $ARGS[0] = 'geo_pushkin':
+	!! Ballet school content
+	!! Ballet Secrets content
+end
+if $ARGS[0] = 'geo_gad':
+end
+if $ARGS[0] = 'geo_village':
+end
+--- beta_journal_geography ---------------------------------

+ 10 - 0
locations/beta_journal_glossary.qsrc

@@ -0,0 +1,10 @@
+# beta_journal_glossary
+!! Game area metadata and information.
+
+if $ARGS[0] = 'init':
+	$loc_id = 'beta_journal_glossary'
+	$hot_link = $loc_id
+end
+
+
+--- beta_journal_glossary ---------------------------------

+ 67 - 0
locations/beta_journal_home.qsrc

@@ -0,0 +1,67 @@
+# beta_journal_home
+
+!! Game area metadata and information.
+
+if $ARGS[0] = 'init':
+	$loc_id = 'beta_journal_home'
+	$hot_link = $loc_id
+	gs 'beta_journal', 'nav_construct'
+	gs $loc_id, 'nav_construct'
+
+	if accessible_property['shared_apartment'] = 4:
+		'You share an apartment with three others in Pavlovsk. Your bills are paid by the other tenants in exchange for your house services.'
+	end
+	if accessible_property['city_apartment'] = 1:
+		'You rent a two bedroom apartment in the city residential area. Your rent for the apartment is subtracted automatically in sum of <<func(''homes_properties'', ''get_rent_amount'', ''city_apartment'')>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<func(''homes_properties'', ''get_rent_days'', ''city_apartment'')>></b> days.'
+	end
+	if accessible_property['city_apartment'] = 2:
+		'You own a two bedroom apartment in the city residential area. Your utility bills are due on the 25th of each month.'
+	end
+	if accessible_property['city_apartment'] = 3: 'You own a two bedroom apartment in the city residential area. It''s currently occupied by your tenants.'
+	if accessible_property['parents_home'] = 4:
+		'<center><table width="90%" cellspacing="0" cellpadding="0" valign="top"><tr>'
+		'<th><img height=''100px'' src="images/locations/pavlovsk/resident/apartment/home/sitrpar.jpg"></th>'
+		'<th width="70%" align="left">You currently live with your parents Natasha and Vladomir and your siblings Anya and Kolka in a two bedroom apartment as part of the 58 Estate in Pavlovsk.</th>'
+		'</tr></table></center>'
+	end
+	if accessible_property['village_cottage']= 2 : 'You own a small holiday cottage with an adjacent allotment in the communal village.'
+	if accessible_property['old_town_apartment'] = 1: 'You rent a two bedroom apartment in Pushkin. Your rent for the apartment is subtracted automatically in the sum of <<func(''homes_properties'', ''get_rent_amount'', ''old_town_apartment'')>> <b>₽</b> us electric bill on the 25th of each month. You are currently paid up for <b><<func(''homes_properties'', ''get_rent_days'', ''old_town_apartment'')>></b> days.'
+	if accessible_property['matryona_mansion'] = 2 and constructionstatus = 0: 'You own a vacant block in the city suburbs.'
+	if accessible_property['matryona_mansion'] = 2 and constructionstatus = 1: 'You own a plot of land in the city suburbs upon which you are building a house.' + iif(banaMansion = 1, 'Your utility bills are due on the 25th of each month.', '')
+	if accessible_property['matryona_mansion'] = 2 and constructionstatus = 2: 'You own an impressive mansion in the city suburbs. ' + iif(banaMansion = 1, 'Your utility bills are due on the 25th of each month.', '')
+	if accessible_property['city_house'] = 2: 'You own a nice house on the edge of the city residential district. Your utility bills are due on the 25th of each month.'
+	if accessible_property['meynold_household'] = 4: 'You live with Vicky, Katja and Tamara Meynold. You have your own room and get an allowance based on helping out around the house and/or studying with Tamara.'
+	*nl
+	if car > 0:
+		'<center><h2>Car</h2></center>'
+		*nl
+		gs 'carF', 'car_condition'
+
+		if cardrive = 1: 'Your car is parked in St. Petersburg''s residential area.'
+		if cardrive = 2: 'Your car is parked in St. Petersburg''s city center.'
+		if cardrive = 3: 'Your car is parked in St. Petersburg''s industrial region.'
+		if cardrive = 4: 'Your car is parked at St. Petersburg''s Lake.'
+		if cardrive = 5: 'Your car is parked at St. Petersburg''s Park.'
+		if cardrive = 6: 'Your car is parked at the gas station in St. Petersburg''s industrial region.'
+		if cardrive = 7: 'Your car is parked at the Car Repair Shop in St. Petersburg.'
+		if cardrive = 8: 'Your car is parked at your house in St. Petersburg''s residential area.'
+		if cardrive = 9: 'Your car is parked at the Car Dealership in St. Petersburg.'
+		if cardrive = 10: 'Your car is parked at St. Petersburg''s Park.'
+		if cardrive = 11: 'Your car is parked at St. Petersburg''s Sauna.'
+		if cardrive = 12: 'Your car is parked at the construction site.'
+		if cardrive = 13: 'Your car is parked in the Suburban Cooperative.'
+		if cardrive = 14: 'Your car is parked in Old Town district of Pavlovsk.'
+		if cardrive = 18: 'Your car is parked at Matryona Mansion.'
+		if cardrive = 19: 'Your car is parked at St. Petersburg''s industrial train station.'
+		if cardrive = 20: 'Your car is parked in Pavlovsk''s residential area.'
+		if cardrive = 21: 'Your car is parked at the gas station near Pavlovsk.'
+		if cardrive = 22: 'Your car is parked on the highway.'
+		if cardrive = 23: 'Your car is parked in Gadukino.'
+		if cardrive = 24: 'Your car is parked in Pavlovsk''s commercial region.'
+		if cardrive = 25: 'Your car is parked in Vasilyevsky Island'
+		if cardrive = 26: 'Your car is parked in Pavlovsk''s industrial region.'
+		if cardrive = 27: 'Your car is parked in St. Petersburg''s red light district.'
+		if cardrive = 28: 'Your car is parked in St. Petersburg''s suburbs.'
+	end
+end
+--- beta_journal_home ---------------------------------

+ 15 - 0
locations/beta_journal_magic.qsrc

@@ -0,0 +1,15 @@
+# beta_journal_magic
+!! Date Created: October, 2024
+!! Version: .01 - initial release
+!! Author: Hooded Silence
+!! Purpose: Book of Shadows and Book of Mirrors for the character development
+
+if $ARGS[0] = 'init':
+    $loc_id = 'beta_journal_magic'
+    $hot_link = $loc_id
+    if $array_tab[1] = '': gs 'beta_journal', 'init_array'
+    gs 'beta_journal', 'nav_construct'
+    'magic content'
+end
+
+--- beta_journal_magic ---------------------------------

+ 10 - 0
locations/beta_journal_notifications.qsrc

@@ -0,0 +1,10 @@
+# beta_journal_notifications
+
+!! Game area metadata and information.
+
+if $ARGS[0] = 'init':
+	$loc_id = 'beta_journal_notifications'
+	$hot_link = $loc_id
+end
+
+--- beta_journal_notifications ---------------------------------

+ 16 - 297
locations/beta_journal_quests.qsrc

@@ -5,6 +5,7 @@
 !! All quest information should be in a guidance or hint style fashion to encourage exploration.
 
 !! Beta 1 - New module design template for integration
+!! Beta 2 - New Navigation bar template
 
 !! Section icons
 !! 🧭 Quest
@@ -12,6 +13,11 @@
 !! 📌 Location
 !! ✨ Magic
 !! 🔎 Hints
+!! ℹ Information
+!! 👩‍🏭 work
+!! 🏠 home
+!! 📓 notes
+
 !! Quest progress icons:
 !! <font color = "green">✓</font> - green tick
 !! <font color = "red">🗴</font> Red cross
@@ -19,18 +25,15 @@
 if $ARGS[0] = 'init':
 	*clr & cla
 	$loc_id = 'beta_journal_quests'
-	act 'Put your journal down': gt $menu_loc, $menu_arg
-	act 'Return to top journal page': gt 'journal', 'records'
-	$jumploc = 'questtab'
-	!! gs 'journal', 'journalmenu'
-	'<center><h2>Quests and Relationships</h2></center>'
+	$hot_link = $loc_id
+	gs 'beta_journal', 'nav_construct'
 	if $debug['journal'] ! '':
 		'<h2><font color = "red">Error with:</font> <<$debug[''journal'']>></h2>'
 		$debug['journal'] = ''
 	end
-		!! TEST
-		act 'Test vcard': gs $loc_id, 'vcard', 274
-		act 'Test Glossary': gs $loc_id, 'rel_pavlovsk'
+	!! TEST
+		act 'Test vcard': gs 'beta_journal_relationships', 'vcard', 274
+		act 'Test Glossary': gs 'beta_journal_geography', 'geo_pavlovsk'
 		!!TEST
 	if journal['alert'] = 1:
 		'<div>'
@@ -48,297 +51,13 @@ if $ARGS[0] = 'init':
 	end
 end
 
-!! Friends and Relations
-if $ARGS[0] = 'rel_pavlovsk':
-	gs $loc_id, 'pavlovsk_array'
-	$table_gen_max = loc_gen
-	gs $loc_id, 'table_gen'
-
-end
-if $ARGS[0] = 'rel_city':
-end
-if $ARGS[0] = 'rel_gad':
-end
-if $ARGS[0] = 'rel_pushkin':
-	!! Ballet Maya
-end
-
-!! Game locations - quests
-if $ARGS[0] = 'geo_pavlovsk':
-	!!5/8 Estate
-	!!Commercial
-	!!Industrial
-	!!Market
-	!!Park
-	!!Train Station
-
-	if $ARGS[1] = '58_estate':
-		!!Parents apartment
-		!!Garages
-		!1Luda''s apartment
-		!!Shulgin''s Apartment
-	elseif $ARGS[1]= 'commercial':
-	elseif $ARGS[1]= 'industrial':
-	elseif $ARGS[1] = 'market':
-	elseif $ARGS[1] = 'park':
-	elseif $ARGS[1] = 'train_station':
-	end
-end
-if $ARGS[0] = 'geo_city':
-end
-if $ARGS[0] = 'geo_pushkin':
-	!! Ballet school content
-	!! Ballet Secrets content
-end
-if $ARGS[0] = 'geo_gad':
-end
-if $ARGS[0] = 'geo_village':
-end
-if $ARGS[0] = 'vcard':
-	*clr & cla
-	$quest_id = 'A' + ARGS[1]
-	$loc_id = 'beta_journal_quests'
-	!! Debug Section
-	if ARGS[1] = 0:
-		gt $loc_id, 'failure',  'id'
-	end
-		!! Initiate NPC data.
-	if $npc_quest['q_next'] = '':
-		!! qstage = current stage index
-		qstage = 1
-	end
-	gs 'quest_data_<<$quest_id>>', 'init'
-	!! Reset to correct location
-	$loc_id = 'beta_journal_quests'
-	!! Ensure quest data fields are populated
-	if $npc_quest['body'] ='':
-		gt $loc_id, 'failure', 'quest_body'
-	end
-	if $npc_quest['q_next'] = '':
-		gt $loc_id, 'failure', 'nav_forward'
-	end
-	if $npc_quest['q_back'] = '':
-		gt $loc_id, 'failure', 'nav_back'
-	end
-	!! Section used to generate the user quests and other pertinent information
-	!! Start vcard construction
-	$vcard += '<center><h3>Ballet Quests - Characters</h3></center>'
-	$vcard += '<br>'
-	$vcard += '<div width="80%">'
-	$vcard += '<div style="width: 120px; padding: 0; float:left"><img style="height:100px;"  src="<<$npc_img_path[''<<$quest_id>>'']>>/<<ARGS[1]>>_profile.jpg"></div>'
-	$vcard += '<div style="padding: 0;">'
-	$vcard += '<p><ul style="margin:0; padding:0;">Name: <<$npc_firstname[''<<quest_id>>'']>> "<<$npc_nickname[''<<$quest_id>>'']>>" <<$npc_lastname[''<<$quest_id>>'']>></ul>'
-	$vcard += '<ul style="margin:0; padding:0;">Date of Birth: ' + func('shortgs', 'convert_dob', ARGS[1])  +  ' </ul>'
-	$vcard += '<ul style="margin:0; padding:0;">Home: <<$npc_home[''<<$quest_id>>'']>></ul>'
-	$vcard += '<ul style="margin:0; padding:0;">Location: Unknown</ul>'
-
-	!! if debug is enabled show pop up msg:
-	if debug['code']  = 1:
-		gs 'quest_data_a<<ARGS[1]>>', 'debug'
-		$vcard += '<ul style="margin:0; padding:0;">Debug Vars:<a href="exec:msg <<$npc_quest[''debug_data'']>>">Quest Vars (pop up)</a></ul>'
-	end
-	$vcard += '</p></div>'
-	$vcard += '</div>'
-	$vcard += '<br>'
-
-	!! Output
-	$vcard
-
-	!! Start quest body construction
-	$qsteps +=	'<div width = "80%">'
-	$qsteps +=	'<div style="padding: 10px;">'
-	$qsteps +=	'<h4>🔎 Quest hints:</h4>'
-	if journal_hints = 0:
-		$qsteps +=	'<a href="exec: journal_hints = 1 & gt ''<<$loc_id>>'', ''vcard'', <<ARGS[1]>>" >Enable hints</a><font color = "red"><b> Spoilers!</b></font> '
+if $ARGS[0] = 'game_flags':
+	if $start_type['cat'] ! 'dancer':
 	else
-		$qsteps +=	$npc_quest['hints']
-		$qsteps += '<br> <br>'
-		$qsteps +=	'<a href="exec: journal_hints = 0 & gt ''<<$loc_id>>'', ''vcard'', <<ARGS[1]>>">Disable hints</a> '
+		'Non-dancer start - ballet content disabled. Please choose Avid Dancer in June school year to enable.'
 	end
-	$qsteps +=	'<br>'
-	$qsteps +=	'<h4>🧭 Quest requisites:</h4>'
-	$qsteps +=	'<p><<$npc_quest[''body'']>></p>'
-	$qsteps +=	'<br>'
-	$qsteps +=	'</div>'
-	$qsteps +=	'<div style="padding:5px; align: center;">'
-	$qsteps += 	'<center><h5>Quest History</h5></center>'
-
-	if $npc_quest['q_next'] = 'null':
-		$next_nav = 'Current Stage'
-	else
-		$next_nav = '<a href="gs ''<<$loc_id>>'', ''navigation'', ''next'' "" >Next Stage</a> <b>→</b>'
-		gs
+	if $start_type[1] = 'nomagic':
+		'Non-magic start - all magic quests is disabled. Please restart game to play the magical questlines.'
 	end
-	if $npc_quest['q_back'] = 'null':
-		$back_nav = 'Quest Start'
-	else
-		$back_nav = '<b>←</b> <a href="gs ''<<$loc_id>>'', ''navigation'', ''back'' " >Previous Stage</a> '
-	end
-	$qsteps +=	'<center><<$back_nav>> | <<$next_nav>></center>'
-	$qsteps +=	'</div>'
-	$qsteps +=	'</div>'
-	$qsteps +=	'<br>'
-	$qsteps +=	'<br>'
-
-	!! Output
-	$qsteps
-
-	!! Clean up
-	killvar '$vcard'
-	killvar '$qsteps'
-	killvar 'quest_id'
-	killvar '$evt_suffix'
-end
-
-!! Navigation
-if $ARGS[0] = 'navigation':
-	$nav_click = $ARGS[1]
-	if $ARGS[1] ! '' and qstage = 1:
-		$npc_quest['q_back'] = 'null'
-	elseif qstage > 1 and $nav_click = 'next':
-		qstage += 1
-	elseif qstage >= 2 and $nav_click ='back':
-		qstage -= 1
-	else
-		$debug['journal'] = 'Navigation failed to be set.'
-	end
-	killvar '$nav_click'
-	gs 'quest_data_<<$quest_id>>', 'init'
-	gs 'beta_journal_quests', 'init'
-end
-
-if $ARGS[0] = 'failure':
-	!! Debug sections
-	if $ARGS[1] = 'id':
-		$debug['journal'] = 'NPC ID not set, vcard not generated.'
-	elseif $ARGS[1] = 'quest_body':
-		$debug['journal'] = 'Quest body not set, quests details was not set.'
-	elseif $ARGS[1] = 'nav_forward':
-		$debug['journal'] = 'No forward navigation set - please ensure you have set the var in quest_data'
-	elseif $ARGS[1] = 'nav_back':
-		$debug['journal'] = 'No back navigation set - please ensure you have set the var in quest_data'
-	end
-	'vcard failed to initialise: ' + $debug['journal']
-end
-
-if $ARGS[0] = 'gametips':
-
-	if $ARGS[1] = '1':
-		'If you have 50 skill in modern dance and Albina likes you might get a chance to join Starlets.'
-	elseif $ARGS[1] = '2':
-		'Mon Cheri is the most prestigious clothing store in St. Petersburg, with a price tag to match.'
-	elseif $ARGS[1] = '3':
-		'There is some parts of the game restricted to over-18s such as doing driving lessons, gambling at the casino and other areas. There is rumours that there is studios who are less fussy about sticking to the law.'
-	elseif $ARGS[1] = '4':
-	elseif $ARGS[1] = '5':
-	elseif $ARGS[1] = '6':
-	elseif $ARGS[1] = '7':
-	elseif $ARGS[1] = '8':
-	elseif $ARGS[1] = '9':
-	end
-end
-
-!! Table Generator for npcs and locations
-
-if $ARGS[0] = 'table_gen':
-
-	!! Original code by Anjuna
-	entry_counter_i = 1
-	entry_counter_j = 1
-	table_counter = 0
-	if ARGS[1] = 0:
-		table_columns = 3
-	else
-		table_columns = ARGS[1]
-	end
-
-	$bjq_temp_table = '<center><table cellspacing="3" bgcolor="<<$theme[''table_bg_alt'']>>" width="80%" align="center">'
-
-	:jmp_table_gen
-						!! CREATE ROW
-
-		$bjq_temp_table +=	'<tr width="100px">'
-		:jmp_table_gen2
-							!! CREATE CELL
-			$bjq_temp_table +=		'<td align="left">'
-			$bjq_temp_table +=			'<a href="exec: gt ''<<$loc_id>>'' ,''<<$loc_shortname[entry_counter_i]>>''">'
-			$bjq_temp_table +=				'<img height="100" src="<<$loc_path[entry_counter_i]>>">'
-			$bjq_temp_table +=			'</a>'
-			$bjq_temp_table += 		'</td>'
-							!! END CELL
-			entry_counter_i += 1
-		if entry_counter_i <= table_gen_max and (entry_counter_i mod table_columns) ! 0: jump 'jmp_table_gen2'
-		$bjq_temp_table +=	'</tr>'
-						!! END ROW
-
-						!! CREATE ROW
-		$bjq_temp_table +=	'<tr width="100px">'
-		:jmp_table_gen3
-								!! CREATE CELL
-			$bjq_temp_table += 		'<td align="left">'
-			$bjq_temp_table +=			$loc_name[entry_counter_j]
-			$bjq_temp_table +=		'</td>'
-								!! END CELL
-			entry_counter_j += 1
-		if entry_counter_j <= table_gen_max and (entry_counter_j mod table_columns) ! 0: jump 'jmp_table_gen3'
-		$bjq_temp_table +=	'</tr>'
-						!! END ROW
-
-		table_counter += 1
-		if table_counter = 5:
-						!! ADD BLANK ROW
-			$bjq_temp_table += '<tr></tr>'
-			table_counter = 0
-		end
-
-	if entry_counter_i < table_gen_max: jump 'jmp_table_gen'
-
-	$bjq_temp_table += '</table></center>'
-	'<<$bjq_temp_table>>'
-
-	killvar '$bjq_temp_table'
-	killvar 'entry_counter_i'
-	killvar 'entry_counter_j'
-	killvar 'table_columns'
-	killvar 'table_counter'
-	killvar 'table_gen_max'
-end
-
-!! Set up locations for image paths for the loop
-if $ARGS[0] = 'pavlovsk_array':
-	!! Set up locations for image paths for the loop
-	loc_gen = 1
-	!! Display Name
-	$loc_name[loc_gen] = 'Five Eight Estate'
-	!! $args[1] function name to show data
-	$loc_shortname[loc_gen] = '58_estate'
-	!! default game image file path
-	$loc_path[loc_gen] = 'images/locations/pavlovsk/resident/apartment/complex.jpg'
-	!! Area description to indicate what is in this area.
-	$loc_description[loc_gen] = 'Five Eight Estate where your parents and aunt Luda live. There is also the garage that your father hires to fix his car.'
-
-	!$loc_path[loc_gen] =
-
-	loc_gen += 1
-	$loc_name[loc_gen] = 'Commercial Area'
-	$loc_shortname[loc_gen] = 'commercial'
-	$loc_path[loc_gen] = 'images/locations/pavlovsk/gorodok.jpg'
-	$loc_description[loc_gen] = ''
-	loc_gen += 1
-	$loc_name[loc_gen] = 'Industrial Area'
-	$loc_shortname[loc_gen] = 'industrial'
-	$loc_path[loc_gen] = 'images/locations/pavlovsk/factory/pav_factory.jpg'
-	loc_gen += 1
-	$loc_name[loc_gen] = 'Pavlovsk Market'
-	$loc_shortname[loc_gen] = 'market'
-	$loc_path[loc_gen] = 'images/locations/pavlovsk/pav_market_day.jpg'
-	loc_gen += 1
-	$loc_name[loc_gen] = 'Pavlovsk Park'
-	$loc_shortname[loc_gen] = 'park'
-	$loc_path[loc_gen] = 'images/locations/pavlovsk/park/skver.jpg'
-	loc_gen += 1
-	$loc_name[loc_gen] = 'Train Station'
-	$loc_shortname[loc_gen] = 'train_station'
-	$loc_path[loc_gen] = 'images/locations/pavlovsk/trainstation/vokzal.jpg'
 end
 --- beta_journal_quests ---------------------------------

+ 493 - 0
locations/beta_journal_relationships.qsrc

@@ -0,0 +1,493 @@
+# beta_journal_relationships
+!! Date Created: October, 2024
+!! Version: .01 - initial release
+!! Author: Hooded Silence
+!! Purpose: Contains the navigation elements for all Pertinent data for NPC relations in game
+
+if $ARGS[0] = 'init':
+	*clr & cla
+    !! Do we need to load a vcard or just index the NPCs?
+	$loc_id = 'beta_journal_relationships'
+	$hot_link = $loc_id
+	gs 'beta_journal', 'nav_construct'
+	'<center>'
+	!! panel_show - trigger for which relationship panel that is open
+	!! 1 Family, 2 Pavlovsk, 3 Gadukino, 4 city, 5 Pushkin, 6 School
+	if panel_show ! 1 or panel_show = 0:
+		'<a href="exec:panel_show = 1 & gs ''<<$loc_id>>'', ''init''">Show Family</a>'
+	elseif panel_show = 1:
+		'<i>Show Family</i>'
+		gs $loc_id, 'rel_family'
+	end
+	if panel_show ! 2:
+		'<a href="exec:panel_show = 2 & gs ''<<$loc_id>>'', ''init''">Show Pavlovsk NPCs</a>'
+	elseif panel_show = 2:
+		'<i>Show Pavlovsk NPCs</i>'
+		gs $loc_id, 'rel_pavlovsk'
+	end
+	if panel_show ! 3:
+		'<a href="exec:panel_show = 3 & gs ''<<$loc_id>>'', ''init''">Show Gadukino NPCs</a>'
+	elseif panel_show = 3:
+		'<i>Show Gadukino NPCs</i>'
+		gs $loc_id, 'rel_gudukino'
+	end
+	if panel_show ! 4:
+		'<a href="exec:panel_show = 4 & gs ''<<$loc_id>>'', ''init''">Show St Petersburg NPCs</a>'
+	elseif panel_show = 4:
+		'<i>Show St Petersburg NPCs</i>'
+		gs $loc_id, 'rel_city'
+	end
+	if panel_show ! 5:
+		'<a href="exec:panel_show = 5 & gs ''<<$loc_id>>'', ''init''">Show Pushkin NPCs</a>'
+	elseif panel_show = 5:
+		'<i>Show Pushkin NPCs</i>'
+		gs $loc_id, 'rel_pushkin'
+	end
+	if panel_show ! 6:
+		'<a href="exec:panel_show = 6 & gs ''<<$loc_id>>'', ''init''">Show School NPCs</a>'
+	elseif panel_show = 6:
+		'<i>Show Gadukino NPCs</i>'
+		gs $loc_id, 'rel_school'
+	end
+	'</center>'
+end
+
+!! Friends and Relations
+
+if $ARGS[0] = 'rel_family':
+	'<center><table width="90%" cellspacing="0" cellpadding="0" valign="top">'
+	if kid > 0 or arrsize('$lover') > 0: gs $loc_id, 'rel_spouse_kids'
+	rel_id = 29
+	gs $loc_id, 'npc_preview'
+	rel_id = 28
+	gs $loc_id, 'npc_preview'
+	rel_id = 33
+	gs $loc_id, 'npc_preview'
+	rel_id = 34
+	gs $loc_id, 'npc_preview'
+	'</table></center>'
+end
+
+if $ARGS[0] = 'rel_spouse_kids':
+	'<center><h2>Lovers & Children</h2></center>'
+	if kid > 0:
+		i = 0
+		if kid = 1:
+			'<th>You have a child, a <<$polreb[0]>> named <<$kidname[0]>>. Born <<daykid[0]>>-<<monthkid[0]>>-<<yearkid[0]>>. Aged <<kidage[0]>>.</th>'
+
+		else
+			'You have children:'
+			:LoopKidCounter
+			if i < kid:
+				'<th> a <<$polreb[i]>> named <<$kidname[i]>>. Born <<daykid[i]>>-<<monthkid[i]>>-<<yearkid[i]>>. Aged <<kidage[i]>>.</th>'
+				i += 1
+				jump 'LoopKidCounter'
+			end
+		end
+		*nl
+		*nl
+	end
+
+	jnl_i = 0
+	jnl_max_i = arrsize('$lover')
+	:loverjournalloop
+	if jnl_i < jnl_max_i:
+		gs 'npcStat', $lover[jnl_i], 'i'
+
+		if mid($npc_rel_type[$npcID9], 1, 2) = 'ex':
+			jnl_i += 1
+			jump 'loverjournalloop'
+		end
+
+		if $npc_rel_type[$npcID9] = 'husband':
+			'You have been married for <<daystart - spouseVars[''marry_day'']>> days. Your husband <<$npcdesc9>> is <<$npcheight9>> and <<$npcbuild9>> with <<$npchair9>> hair. <<$npcdesc9>> is usually wearing <<$npcClo9>>. Member <<$dick_desc9>> cock and <<$dick_girth9>>. Relationship <<npc_rel[$npcID9]>>.'
+		else
+			'Your <<$npcrelat9>> <<$npcdesc9>> is <<$npcheight9>> and <<$npcbuild9>> with <<$npchair9>> hair. <<$npcdesc9>> is usually wearing <<$npcClo9>>. Your relationship is <<npc_rel[$npcID9]>> after <<npc_dates[$npcID9]>> dates and <<daystart - npc_daygenerated[$npcID9]>> days dating.'
+		end
+
+		gs 'indik', '1', npc_rel[$npcID9], npc_rel[$npcID9], 100
+		'<<$ind>>'
+
+		if npc_rel[$npcID9] > 1:
+			if npc_gentle[$npcID9] = 1:
+				'<<$Xec9>> is timid and lacks confidence.'
+			elseif npc_rough[$npcID9] = 0:
+				'<<$Xec9>> has a cheerful and sociable personality.'
+			else
+				'<<$Xec9>> is short-tempered and strict.'
+			end
+		end
+
+		*nl
+
+		jnl_i += 1
+		jump 'loverjournalloop'
+	end
+	killvar 'jnl_i'
+	killvar 'jnl_max_i'
+end
+if $ARGS[0] = 'rel_pavlovsk':
+	'<center><table width="90%" cellspacing="0" cellpadding="0" valign="top">'
+	if npc_rel['A54']  > 0:
+		rel_id = 54
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A57']  > 0:
+		rel_id = 57
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A217']  > 0:
+		rel_id = 217
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A112']  > 0:
+		rel_id = 112
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A119']  > 0:
+		rel_id = 119
+		gs $loc_id, 'npc_preview'
+	end
+	'</table></center>'
+end
+if $ARGS[0] = 'rel_school':
+end
+if $ARGS[0] = 'rel_city':
+	'<center><table width="90%" cellspacing="0" cellpadding="0" valign="top">'
+	if npc_rel['A192']  > 0:
+		rel_id = 192
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A218']  > 0:
+		rel_id = 218
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A219']  > 0:
+		rel_id = 219
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A220']  > 0:
+		rel_id = 220
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A93']  > 0:
+		rel_id = 93
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A43']  > 0:
+		rel_id = 43
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A35']  > 0:
+		rel_id = 35
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A169']  > 0:
+		rel_id = 169
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A89']  > 0:
+		rel_id = 89
+		gs $loc_id, 'npc_preview'
+	end
+	if npc_rel['A216']  > 0:
+		rel_id = 216
+		gs $loc_id, 'npc_preview'
+	end
+	'</table></center>'
+
+	! '<center><h2>Other Relations</h2></center>'
+	! Uncomment if re-introduced into the game ensure you use NPC ID to update them
+	! if alla > 0: 'Friendship with Alla <<alla>>'
+	! if masha > 0: 'Friendship with Masha <<masha>>'
+	! if npc_rel['A41'] > 0: 'Friendship with Givi K. <<npc_rel[''A41'']>>'
+	! if npc_rel['A42'] > 0: 'Friendship with Ashot <<npc_rel[''A42'']>>'
+end
+if $ARGS[0] = 'rel_gadukino':
+	'<center><h3>Gadukino</h3></center>'
+	if npc_rel['A31'] > 0 or npc_rel['A32'] > 0:
+		'<center><h3>Great Grandparents</h3></center>'
+		'<table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top">'
+		rel_id = 31
+		gs $loc_id, 'npc_preview'
+		rel_id = 32
+		gs $loc_id, 'npc_preview'
+		'</table>'
+	end
+	'</table>'
+	if npc_rel['A31']  > 0: 'Friendship with Elena (your great-grandmother):'  & gs 'journal', 'relindex', 'A31'
+	if npc_rel['A32']  > 0: 'Friendship with Zlatek (your great-grandfather):' & gs 'journal', 'relindex', 'A32'
+	if npc_rel['A60']  > 0: 'Friendship with Mira:'     & gs 'journal', 'relindex', 'A60'
+	if npc_rel['A61']  > 0: 'Friendship with Kolyamba:' & gs 'journal', 'relindex', 'A61'
+	if npc_rel['A62']  > 0: 'Friendship with Vasyan:'   & gs 'journal', 'relindex', 'A62'
+	if npc_rel['A63']  > 0: 'Friendship with Mitka:'    & gs 'journal', 'relindex', 'A63'
+	if npc_rel['A64']  > 0: 'Friendship with Afanasiy:' & gs 'journal', 'relindex', 'A64'
+	if npc_rel['A65']  > 0: 'Friendship with Vtialiy:'  & gs 'journal', 'relindex', 'A65'
+	if npc_rel['A221'] > 0: 'Friendship with Grigory:'  & gs 'journal', 'relindex', 'A221'
+	if npc_rel['A172'] > 0: 'Friendship with Andrei (hunter):' & gs 'journal', 'relindex', 'A172'
+	if npc_rel['A173'] > 0: 'Friendship with Igor (hunter):'   & gs 'journal', 'relindex', 'A173'
+	if npc_rel['A174'] > 0: 'Friendship with Sergei (hunter):' & gs 'journal', 'relindex', 'A174'
+	'<a href="exec:pavlovsk_show = 0 & gs ''<<$loc_id>>'', ''init''">Hide Gadukino NPCs</a>'
+end
+if $ARGS[0] = 'rel_pushkin':
+	!! Ballet Maya
+end
+
+!! relationship functions
+
+if $ARGS[0] = 'relationstab':
+
+
+	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
+
+		'<center><h2>Standings by Social Group</h2></center>'
+
+		if grupTipe < 5 and grupvalue[grupTipe] > 700:
+			$journal_school_standing = ' You are well respected and liked within your clique.'
+		elseif grupTipe < 5 and grupvalue[grupTipe] > 300:
+			$journal_school_standing = ' You are in good standing with your clique.'
+		elseif grupTipe < 5:
+			$journal_school_standing = '<font color="red"> You have to work on your clique standing. You''re in danger of being cast out.</font>'
+		end
+
+		if grupTipe = 0:
+			'You are not a member of any particular school social group.' + $journal_school_standing
+		elseif grupTipe = 1:
+			'Your school social group consists of the popular, cool and beautiful.' + $journal_school_standing
+		elseif grupTipe = 2:
+			'Your school social group consists of jocks and natural athletes.' + $journal_school_standing
+		elseif grupTipe = 3:
+			'Your school social group consists of nerds, geeks and good students.' + $journal_school_standing
+			if nerd_game['game_day'] > daystart: 'You have been invited to a games night on <<$week[(week + (nerd_game[''game_day'']  - daystart))]>> at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' in the community center library.'
+			if nerd_game['game_day'] = daystart: 'You have been invited to a games night tonight at '+func('time', 'get_time_string', 20, 0, cheatVars['time_format'])+' in the community center library.'
+		elseif grupTipe = 4:
+			'Your school social group consists of gopniks, rebels, punks or troublemakers.' + $journal_school_standing
+		elseif grupTipe = 5:
+			'Your school social group consists of losers, teacher''s pets, sluts and the ugly.'
+		end
+		*nl
+
+		'Cool Kids'
+
+		gs 'indik', '4', grupvalue[1]/10, grupvalue[1], 1 & '<<$ind>>'
+
+		'Jocks'
+		gs 'indik', '4', grupvalue[2]/10, grupvalue[2], 2 & '<<$ind>>'
+
+		'Nerds'
+		gs 'indik', '4', grupvalue[3]/10, grupvalue[3], 3 & '<<$ind>>'
+
+		'Gopnik'
+		gs 'indik', '4', grupvalue[4]/10, grupvalue[4], 4 & '<<$ind>>'
+
+		'<center><h2>Popular Kids Relations</h2></center>'
+
+		if npc_rel['A1']   > 0: 'Friendship with Dimka:'    & gs 'journal', 'relindex', 'A1'
+		if npc_rel['A4']   > 0: 'Friendship with Igor:'     & gs 'journal', 'relindex', 'A4'
+		if npc_rel['A14']  > 0: 'Friendship with Katja:'    & gs 'journal', 'relindex', 'A14'
+		if npc_rel['A15']  > 0: 'Friendship with Vicky:'    & gs 'journal', 'relindex', 'A15'
+		if npc_rel['A17']  > 0: 'Friendship with Irina:'    & gs 'journal', 'relindex', 'A17'
+		if npc_rel['A22']  > 0: 'Friendship with Bella:'    & gs 'journal', 'relindex', 'A22'
+		if npc_rel['A146'] > 0: 'Friendship with Marcus:'   & gs 'journal', 'relindex', 'A146'
+		if npc_rel['A147'] > 0: 'Friendship with Andrey:'   & gs 'journal', 'relindex', 'A147'
+		if npc_rel['A148'] > 0: 'Friendship with Mefodiy:'  & gs 'journal', 'relindex', 'A148'
+		if soniaQW['slut'] = 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25'
+		if npc_rel['A139'] > 0: 'Friendship with Stasya:'   & gs 'journal', 'relindex', 'A139'
+		if npc_rel['A140'] > 0: 'Friendship with Lizaveta:' & gs 'journal', 'relindex', 'A140'
+
+		'<center><h2>Jocks Relations</h2></center>'
+
+		if npc_rel['A3']   > 0: 'Friendship with Ivan:'       & gs 'journal', 'relindex', 'A3'
+		if fedormasha = 0 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5'
+		if npc_rel['A8']   > 0: 'Friendship with Svyatoslav:' & gs 'journal', 'relindex', 'A8'
+		if npc_rel['A13']  > 0: 'Friendship with Lariska:'    & gs 'journal', 'relindex', 'A13'
+		if npc_rel['A18']  > 0: 'Friendship with Christina:'  & gs 'journal', 'relindex', 'A18'
+		if npc_rel['A19']  > 0: 'Friendship with Lina:'       & gs 'journal', 'relindex', 'A19'
+		if npc_rel['A23']  > 0: 'Friendship with Albina:'     & gs 'journal', 'relindex', 'A23'
+		if npc_rel['A149'] > 0: 'Friendship with Lazar:'      & gs 'journal', 'relindex', 'A149'
+		if npc_rel['A150'] > 0: 'Friendship with Erast:'      & gs 'journal', 'relindex', 'A150'
+		if npc_rel['A141'] > 0: 'Friendship with Veronika:'   & gs 'journal', 'relindex', 'A141'
+		if npc_rel['A165'] > 0: 'Friendship with Vanya:'      & gs 'journal', 'relindex', 'A165'
+
+		'<center><h2>Nerds Relations</h2></center>'
+
+		if npc_rel['A2']   > 0: 'Friendship with Artem:'   & gs 'journal', 'relindex', 'A2'
+		if npc_rel['A6']   > 0: 'Friendship with Petka:'   & gs 'journal', 'relindex', 'A6'
+		if npc_rel['A12']  > 0: 'Friendship with Julia:'   & gs 'journal', 'relindex', 'A12'
+		if npc_rel['A16']  > 0: 'Friendship with Natasha:' & gs 'journal', 'relindex', 'A16'
+		if npc_rel['A151'] > 0: 'Friendship with Evgeny:'  & gs 'journal', 'relindex', 'A151'
+		if npc_rel['A152'] > 0: 'Friendship with Feofan:'  & gs 'journal', 'relindex', 'A152'
+		if npc_rel['A153'] > 0: 'Friendship with Gerasim:' & gs 'journal', 'relindex', 'A153'
+		if npc_rel['A142'] > 0: 'Friendship with Zinaida:' & gs 'journal', 'relindex', 'A142'
+		if npc_rel['A240'] > 0: 'Friendship with Natalia:' & gs 'journal', 'relindex', 'A240'
+
+		'<center><h2>Gopnik Relations</h2></center>'
+
+		if npc_rel['A9']   > 0: 'Friendship with Vitek:'     & gs 'journal', 'relindex', 'A9'
+		if npc_rel['A10']  > 0: 'Friendship with Dan:'       & gs 'journal', 'relindex', 'A10'
+		if npc_rel['A11']  > 0: 'Friendship with Vasily:'    & gs 'journal', 'relindex', 'A11'
+		if npc_rel['A20']  > 0: 'Friendship with Lena:'      & gs 'journal', 'relindex', 'A20'
+		if npc_rel['A21']  > 0: 'Friendship with Lera:'      & gs 'journal', 'relindex', 'A21'
+		if npc_rel['A24']  > 0: 'Friendship with Pauline:'   & gs 'journal', 'relindex', 'A24'
+		if npc_rel['A154'] > 0: 'Friendship with Radomir:'   & gs 'journal', 'relindex', 'A154'
+		if npc_rel['A155'] > 0: 'Friendship with Lavrenti:'  & gs 'journal', 'relindex', 'A155'
+		if npc_rel['A156'] > 0: 'Friendship with Arkadi:'    & gs 'journal', 'relindex', 'A156'
+		if npc_rel['A157'] > 0: 'Friendship with Roman:'     & gs 'journal', 'relindex', 'A157'
+		if npc_rel['A158'] > 0: 'Friendship with Valentin:'  & gs 'journal', 'relindex', 'A158'
+		if npc_rel['A143'] > 0: 'Friendship with Alyona:'    & gs 'journal', 'relindex', 'A143'
+		if npc_rel['A144'] > 0: 'Friendship with Anushka:'   & gs 'journal', 'relindex', 'A144'
+		if npc_rel['A145'] > 0: 'Friendship with Ekaterina:' & gs 'journal', 'relindex', 'A145'
+		if npc_rel['A189'] > 0: 'Friendship with Niko:'      & gs 'journal', 'relindex', 'A189'
+
+		'<center><h2>Outcast/Loner Relations</h2></center>'
+
+		if npc_rel['A7']   > 0: 'Friendship with Lesco:' & gs 'journal', 'relindex', 'A7'
+		if npc_rel['A159'] > 0: 'Friendship with Petia:' & gs 'journal', 'relindex', 'A159'
+		if soniaQW['slut']    > 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25'
+		if fedormasha = 1 and npc_rel['A5']  > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5'
+
+		'<center><h2>Teachers/Coaches/School Staff Relations</h2></center>'
+
+		if npc_rel['A26']  > 0: 'Friendship with Anatoly Tsarev (Math Teacher):'             & gs 'journal', 'relindex', 'A26'
+		if npc_rel['A69']  > 0: 'Friendship with Mikhail Nikolaevich (Volleyball Coach):'    & gs 'journal', 'relindex', 'A69'
+		if npc_rel['A128'] > 0: 'Friendship with Makar Vasilyev (Art Teacher):'              & gs 'journal', 'relindex', 'A128'
+		if npc_rel['A129'] > 0: 'Friendship with Serafim Ivanov (Computer Science Teacher):' & gs 'journal', 'relindex', 'A129'
+		if npc_rel['A130'] > 0: 'Friendship with Ilya Yenotin (Literature Teacher):'         & gs 'journal', 'relindex', 'A130'
+		if npc_rel['A131'] > 0: 'Friendship with Viktor Pavlovich (P.E. Teacher):'           & gs 'journal', 'relindex', 'A131'
+		if npc_rel['A132'] > 0: 'Friendship with Ruslan Kuznetsov (Shop Teacher):'           & gs 'journal', 'relindex', 'A132'
+		if npc_rel['A133'] > 0: 'Friendship with Rolan Metveev (Janitor):'                   & gs 'journal', 'relindex', 'A133'
+		if npc_rel['A134'] > 0: 'Friendship with Aleksandrina Volkov (Headmistress):'        & gs 'journal', 'relindex', 'A134'
+		if npc_rel['A135'] > 0: 'Friendship with Yeva Sokoloff (Geography Teacher):'         & gs 'journal', 'relindex', 'A135'
+		if npc_rel['A136'] > 0: 'Friendship with Olga Aleksandrov (School Nurse):'           & gs 'journal', 'relindex', 'A136'
+		if npc_rel['A137'] > 0: 'Friendship with Raven Braakman (English Teacher):'          & gs 'journal', 'relindex', 'A137'
+		if npc_rel['A138'] > 0: 'Friendship with Arina Orlov (Biology Teacher):'             & gs 'journal', 'relindex', 'A138'
+
+
+		!!!WD: Formatting
+		if (npc_rel['A93'] + npc_rel['A41'] + npc_rel['A42'] + npc_rel['A43'] + gosh + npc_rel['A220'] + npc_rel['A219'] + npc_QW['A192'] + npc_rel['A218']) > 0:*nl
+		*nl
+
+	end
+end
+
+if $ARGS[0] = 'npc_preview':
+	!! creates the npc table.
+	'<tr><th width="10%"><img height=''50'' src="images/characters/shared/headshots_main/<<rel_id>>.jpg"></th>'
+	'<th width="30%"><<$npc_firstname[''A<<rel_id>>'']>> <<$npc_lastname[''A<<rel_id>>'']>> (<<$npc_nickname[''A<<rel_id>>'']>>):'
+	gs 'journal', 'relindex', 'A<<rel_id>>'
+	'</th><th align left>Events</th></tr>'
+end
+
+!! This function creates a interface to access NPC data and quest history in a legible way, modify the layout at your own peril!
+
+if $ARGS[0] = 'vcard':
+	!!NOTE: all data is pulled from a data file called quest_data_a<npc_id> for each npc quest - use quest_data_274 as an example!
+	*clr & cla
+	$quest_id = 'A' + ARGS[1]
+	$loc_id = 'beta_journal_quests'
+	!! Debug Section
+	if ARGS[1] = 0:
+		gt $loc_id, 'failure',  'id'
+	end
+		!! Initiate NPC data.
+	if $npc_quest['q_next'] = '':
+		!! qstage = current stage index
+		qstage = 1
+	end
+	gs 'quest_data_<<$quest_id>>', 'init'
+	!! Reset to correct location
+	$loc_id = 'beta_journal_quests'
+	!! Ensure quest data fields are populated
+	if $npc_quest['body'] ='':
+		gt $loc_id, 'failure', 'quest_body'
+	end
+	if $npc_quest['q_next'] = '':
+		gt $loc_id, 'failure', 'nav_forward'
+	end
+	if $npc_quest['q_back'] = '':
+		gt $loc_id, 'failure', 'nav_back'
+	end
+	!! Section used to generate the user quests and other pertinent information
+	!! Start vcard construction
+	$vcard += '<center><h3>Ballet Quests - Characters</h3></center>'
+	$vcard += '<br>'
+	$vcard += '<div width="80%">'
+	$vcard += '<div style="width: 120px; padding: 0; float:left"><img style="height:100px;"  src="<<$npc_img_path[''<<$quest_id>>'']>>/<<ARGS[1]>>_profile.jpg"></div>'
+	$vcard += '<div style="padding: 0;">'
+	$vcard += '<p><ul style="margin:0; padding:0;">Name: <<$npc_firstname[''<<$quest_id>>'']>> "<<$npc_nickname[''<<$quest_id>>'']>>" <<$npc_lastname[''<<$quest_id>>'']>></ul>'
+	$vcard += '<ul style="margin:0; padding:0;">Date of Birth: ' + func('shortgs', 'convert_dob', ARGS[1])  +  ' </ul>'
+	$vcard += '<ul style="margin:0; padding:0;">Home: ' + iif($npc_home['$quest_id'] = '', 'Not known', $npc_home['$quest_id'] ) + '</ul>'
+	$vcard += '<ul style="margin:0; padding:0;">Location: Unknown</ul>'
+	!! if debug is enabled show pop up msg:
+	if debug['code']  = 1:
+		gs 'quest_data_a<<ARGS[1]>>', 'debug'
+		$vcard += '<ul style="margin:0; padding:0;">Debug Vars:<a href="exec:msg <<$npc_quest[''debug_data'']>>">Quest Vars (pop up)</a></ul>'
+	end
+	$vcard += '</p></div>'
+	$vcard += '</div>'
+	$vcard += '<br>'
+
+	!! Output
+	$vcard
+
+	!! Start quest body construction
+	$qsteps +=	'<div width = "80%">'
+	$qsteps +=	'<div style="padding: 10px;">'
+	$qsteps +=	'<h4>🔎 Quest hints:</h4>'
+	if journal_hints = 0:
+		$qsteps +=	'<a href="exec: journal_hints = 1 & gt ''<<$loc_id>>'', ''vcard'', <<ARGS[1]>>" >Enable hints</a><font color = "red"><b> Spoilers!</b></font> '
+	else
+		$qsteps +=	$npc_quest['hints']
+		$qsteps += '<br> <br>'
+		$qsteps +=	'<a href="exec: journal_hints = 0 & gt ''<<$loc_id>>'', ''vcard'', <<ARGS[1]>>">Disable hints</a> '
+	end
+	$qsteps +=	'<br>'
+	$qsteps +=	'<h4>🧭 Quest requisites:</h4>'
+	$qsteps +=	'<p><<$npc_quest[''body'']>></p>'
+	$qsteps +=	'<br>'
+	$qsteps +=	'</div>'
+	$qsteps +=	'<div style="padding:5px; align: center;">'
+	$qsteps += 	'<center><h5>Quest History</h5></center>'
+
+	if $npc_quest['q_next'] = 'null':
+		$next_nav = 'Current Stage'
+	else
+		$next_nav = '<a href="gs ''<<$loc_id>>'', ''navigation'', ''next'' "" >Next Stage</a> <b>→</b>'
+	end
+	if $npc_quest['q_back'] = 'null':
+		$back_nav = 'Quest Start'
+	else
+		$back_nav = '<b>←</b> <a href="gs ''<<$loc_id>>'', ''navigation'', ''back'' " >Previous Stage</a> '
+	end
+	$qsteps +=	'<center><<$back_nav>> | <<$next_nav>></center>'
+	$qsteps +=	'</div>'
+	$qsteps +=	'</div>'
+	$qsteps +=	'<br>'
+	$qsteps +=	'<br>'
+
+	!! Output
+	$qsteps
+
+	!! Clean up
+	killvar '$vcard'
+	killvar '$qsteps'
+	killvar 'quest_id'
+	killvar '$evt_suffix'
+end
+!! Vcard Navigation bar
+if $ARGS[0] = 'navigation':
+	$nav_click = $ARGS[1]
+	if $ARGS[1] ! '' and qstage = 1:
+		$npc_quest['q_back'] = 'null'
+	elseif qstage > 1 and $nav_click = 'next':
+		qstage += 1
+	elseif qstage >= 2 and $nav_click ='back':
+		qstage -= 1
+	else
+		$debug['journal'] = 'Navigation failed to be set.'
+	end
+	killvar '$nav_click'
+	gs 'quest_data_<<$quest_id>>', 'init'
+	gs 'beta_journal_quests', 'init'
+end
+--- beta_journal_relationships ---------------------------------

+ 139 - 0
locations/beta_journal_work.qsrc

@@ -0,0 +1,139 @@
+# beta_journal_work
+!! Date Created: October, 2024
+!! Version: .01 - initial release
+!! Author: Hooded Silence
+!! Purpose: Displays all employment information
+
+if $ARGS[0] = 'init':
+    $loc_id = 'beta_journal_work'
+    $hot_link = $loc_id
+    gs 'beta_journal', 'nav_construct'
+	if emp_job[active] < 1:
+		'You need to find a job or get training to develop your career. Check the Quests or Information section.'
+	else
+		function_sw = 2
+		gs 'emp_functions', 'job_alert'
+		gs 'emp_functions', 'gen_schedule', job_start * 2
+	end
+	!! Show any ad hoc events or contracts
+	if arrsize('evt_event') ! 0: gs 'emp_functions', 'disp_evt', 2
+
+	if workPTU > 2: 'You work as a teacher at the Lycée and your schedule is Monday to Saturday, teaching between '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+'. Your salary is 300 <b>₽</b> per day.'
+	if work = 1 or cheatVars['work'] = 1:
+		if workKafe['job'] > 0: 'You are working as a waitress at The Roadhouse cafe. Your working days are Tuesday, Wednesday and Thursday, and you should come to work between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'. Your wages are received on the 25th of each month, but you can earn tips from customers.'
+		if workhosp > 0: 'You work as a nurse in the city residential area clinic. You need to come to work between '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'-'+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' during the week. Salary is automatically transferred on the 25th of each month.'
+		if worksalon > 0: 'You work as a masseuse at the Beauty Bar in the city. Your working days are: Monday, Wednesday and Friday, and you should come to work between '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+'. Salary is automatically transferred on the 25th of each month.'
+		if workSec > 0: 'You work as a secretary at Titran Express, Monday to Friday. You need to come to work by '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'. Salary is automatically transferred on the 25th of each month.'
+		if tanwork > 0: 'You work as a governess for Tanya at Nicholas'' luxury city apartment. Salary is automatically transferred on the 25th of each month.'
+		if young_shop_work = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' Monday to Friday. Your salary is paid once a week on Fridays.'
+		if young_shop_work1 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' Saturday and Sunday. Your salary is paid once a week on Fridays.'
+		if young_shop_work2 = 1: 'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' Monday through Friday. Your salary is paid once a week on Fridays.'
+		if workFabrika = 1: 'You work as a seamstress in the factory in Pavlovsk. You work every week day and your salary is automatically transferred on the 25th of each month.'
+		if gpoliuborka > 1: 'You work part-time as a cleaner in the Pavlovsk clinic. Your schedule is from '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+'.'
+        if workrin = 1: 'You work as a clothing saleswoman in Arthur''s tent at the market each Tuesday, Thursday and Saturday with a start time of '+func('time', 'get_time_string', 8, 0, cheatVars['time_format'])+'. Salary depends on sales.'
+      	if postjobQW = 2 or postjobQW = 4: 'You deliver mail for the postmaster. The work day starts each Saturday between '+func('time', 'get_time_string', 11, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+'. Salary is 450 <b>₽</b>.'
+	    if strip_club['stripwork'] = 1: 'You work as a stripper at the Golden Girls strip club. No salary as you earn tips.'
+	    if strip_club['stripbarwork'] = 1: 'You work as a bargirl at the Golden Girls strip club every Wednesday and Thursday from '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 3, 0, cheatVars['time_format'])+'. Salary is automatically transferred on the 25th of each month. but you can earn tips from customers.'
+	    if strip_club['stripbarwork1'] = 1: 'You work as a bargirl at the Golden Girls strip club every Friday and Saturday from '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 3, 0, cheatVars['time_format'])+'. Salary is automatically transferred on the 25th of each month, but you can earn tips from customers.'
+	    if film > 0: 'You work as a pornographic actress under the name <<$pfname>>.'
+	    if bumtolik = 4: 'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.'
+	    if bumtolik >= 5: 'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' on Saturday and Sunday.'
+        if maidqw = 1: 'You work in the Pavlovsk hotel as a maid. Your work schedule is every day from '+func('time', 'get_time_string', 16, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 19, 0, cheatVars['time_format'])+' and your salary is 250 <b>₽</b> plus tips.'
+        elseif GermanQW = 1:
+	        'You can find out more about becoming a maid at the Pavlovsk hotel if you visit the manager between '+func('time', 'get_time_string', 12, 0, cheatVars['time_format'])+' and '+func('time', 'get_time_string', 14, 0, cheatVars['time_format'])+'.'
+	    end
+        *nl
+
+	if audition['day'] = daystart:
+		'Your audition for the role of <<$role>> is today!'
+	elseif audition['day'] - daystart = 1:
+		'You are auditioning for the role of <<$role>> tomorrow.'
+	elseif audition['day'] - daystart > 1:
+		'You are auditioning for the role of <<$role>> in <<audition[''day''] - daystart>> days.'
+	end
+
+	if actress_cast = 1:
+		if acting['shoot_day'] = daystart:
+			'You are '
+		elseif acting['shoot_day'] - daystart = 1:
+			'You are scheduled to play the part of <<$role>> <<acting[''shoot_day''] - daystart>> days from now.'
+		elseif acting['shoot_day'] - daystart > 1:
+			'You are scheduled to play the part of <<$role>> <<acting[''shoot_day''] - daystart>> days from now.'
+		end
+	end
+
+	if modelfoto['shoots'] > 0:
+		*nl
+		if modelfoto['erotic'] > modelfoto['nude'] and modelfoto['erotic'] > modelfoto['fashion'] and modelfoto['erotic'] > modelfoto['fitness'] and modelfoto['erotic'] > modelfoto['glamour'] and modelfoto['erotic'] > modelfoto['lingerie'] and modelfoto['erotic'] > modelfoto['catalog']:
+			'You are working as an erotic model at Aphrodite Photography.'
+		elseif modelfoto['nude'] > modelfoto['fashion'] and modelfoto['nude'] > modelfoto['fitness'] and modelfoto['nude'] > modelfoto['glamour'] and modelfoto['nude'] > modelfoto['lingerie'] and modelfoto['nude'] > modelfoto['catalog'] and modelfoto['nude'] > modelfoto['erotic']:
+			'You are working as an artistic nude model at Aphrodite Photography.'
+		elseif modelfoto['fitness'] > modelfoto['fashion'] and modelfoto['fitness'] > modelfoto['nude'] and modelfoto['fitness'] > modelfoto['glamour'] and modelfoto['fitness'] > modelfoto['lingerie'] and modelfoto['fitness'] > modelfoto['catalog'] and modelfoto['fitness'] > modelfoto['erotic']:
+			'You are working as a fitness model at Aphrodite Photography.'
+		elseif modelfoto['glamour'] > modelfoto['fashion'] and modelfoto['glamour'] > modelfoto['nude'] and modelfoto['glamour'] > modelfoto['fitness'] and modelfoto['glamour'] > modelfoto['lingerie'] and modelfoto['glamour'] > modelfoto['catalog'] and modelfoto['glamour'] > modelfoto['erotic']:
+			'You are working as a glamour model at Aphrodite Photography.'
+		elseif modelfoto['lingerie'] > modelfoto['fashion'] and modelfoto['lingerie'] > modelfoto['nude'] and modelfoto['lingerie'] > modelfoto['fitness'] and modelfoto['lingerie'] > modelfoto['glamour'] and modelfoto['lingerie'] > modelfoto['catalog'] and modelfoto['lingerie'] > modelfoto['erotic']:
+			'You are working as a lingerie model at Aphrodite Photography.'
+		elseif modelfoto['fashion'] > modelfoto['lingerie'] and modelfoto['fashion'] > modelfoto['nude'] and modelfoto['fashion'] > modelfoto['fitness'] and modelfoto['fashion'] > modelfoto['glamour'] and modelfoto['fashion'] > modelfoto['catalog'] and modelfoto['fashion'] > modelfoto['erotic']:
+			'You are working as a fashion model at Aphrodite Photography.'
+		elseif modelfoto['catalog'] > 0:
+			'You are working as a catalog model at Aphrodite Photography.'
+		end
+		*nl
+		if model_week = (daystart - week) / 7 and model_job_week >= 2:
+			'You have no more modeling jobs available this week.'
+		elseif model_week < (daystart - week) / 7 and model_job_week = 1:
+			'You can get paid for 1 more modeling job this week.'
+		elseif model_week < (daystart - week) / 7 and model_job_week < 1:
+			'You can get paid for 2 modeling jobs this week.'
+		end
+	end
+	if masseuse['jobtype'] > 0:
+		*nl
+		'You have worked <<masseuse[''shifts_worked'']>> shifts at the salon this week.'
+		if masseuse['<<week>>_shift_1'] = 1 and hour < 9:
+			'<BR><b><font color="blue">You have a shift at the salon today at '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+'.</font></b>'
+		elseif masseuse['<<week>>_shift_1'] = 1 and hour <= 9:
+			'<BR><b><font color="red">You''re late for your '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' shift at the salon!</font></b>'
+		elseif masseuse['<<week>>_shift_2'] = 1 and hour < 13:
+			'<BR><b><font color="blue">You have a shift at the salon today at '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+'.</font></b>'
+		elseif masseuse['<<week>>_shift_2'] = 1 and hour <= 13:
+			'<BR><b><font color="red">You''re late for your '+func('time', 'get_time_string', 13, 0, cheatVars['time_format'])+' shift at the salon!</font></b>'
+		elseif masseuse['<<week>>_shift_3'] = 1 and hour < 17:
+			'<BR><b><font color="blue">You have a shift at the salon today at '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+'.</font></b>'
+		elseif masseuse['<<week>>_shift_3'] = 1 and hour <= 17:
+			'<BR><b><font color="red">You''re late for your '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' shift at the salon!</font></b>'
+		end
+	end
+
+	if pornstack > 0:
+		if pfilmday[0] = 0:
+			if pfilmday[1] = 0:
+				'<br><b>You are scheduled for a porn shoot in <<porndays>> days.</b>'
+			else
+				'<br><b>You have a porn shoot scheduled tomorrow.</b>'
+			end
+		else
+			if hour < 11:
+				'<br>You are expected to be in the porn studio at '+func('time', 'get_time_string', 10, 0, cheatVars['time_format'])+'.'
+			elseif hour >= 11 and hour < 13:
+				'<br>You should be at the porn studio!'
+			elseif hour >= 13:
+				'<br>You missed a scheduled porn shoot!'
+			end
+		end
+	end
+
+	if pornmiss = 1: '<br><b>You missed a scheduled porn shoot!</b>'
+	if prodcosttrue > 0: '<br><b>You owe money to the porn studio <<prodcost>>?</b>'
+	if firstkasting > 0 and pfilmNO < 1:
+		if pornstack >= 10:
+			'<br>You are currently unable to book any more porn shoots at the porn studio.'
+		elseif pornstack = 11:
+			'<br>You can contract <<10-pornstack>> porn shoot(s) at the porn studio.'
+		else
+			'<br>You can contract up to <<10-pornstack>> porn shoot(s) at the porn studio.'
+		end
+	end
+end
+--- beta_journal_work ---------------------------------

+ 2 - 2
locations/blackmailer.qsrc

@@ -390,7 +390,7 @@ if $ARGS[0] = 'Add_SMS1':
 		end
 
 				$SMSTree['2'] = 'Leave <<blackmailQW[''next_payment'']>> <b>₽</b> beneath the fourth park bench, I know you know which one.'
-					$SMSTree['3'] = 'You have three days'
+					$SMSTree['3'] = 'You have two days'
 
 	gs 'SMStext_builder', 'start'
 		gs 'SMStext_builder', 'receive', $SMSTree['0']
@@ -730,7 +730,7 @@ if $ARGS[0] = 'set_SMSTree':
 		end
 
 				$SMSTree['2'] = 'Leave <<blackmailQW[''next_payment'']>> <b>₽</b> beneath the same park bench.'
-					$SMSTree['3'] = 'You have three days'
+					$SMSTree['3'] = 'You have two days'
 						if rand(0, 1) = 0:
 							$SMSTree['a4'] = 'Why are you doing this to me?'
 						else

+ 3 - 0
locations/body.qsrc

@@ -52,6 +52,9 @@ if $ARGS[0] = 'RegularUpdate':
 	elseif pcs_skin < 0:
 		pcs_skin = 0
 	end
+
+	!! Setting max clit size so as to avoid ridiculous sizes
+	if clit_size > 100: clit_size = 100
 end
 
 if $ARGS[0] = 'UpdateBodyMeasurement':

+ 10 - 10
locations/body_desc.qsrc

@@ -1119,24 +1119,24 @@ if $ARGS[0] = 'clit':
 	if clit_size < 20:
 		$pc_descWordy['clit'] = 'small, oft-hidden'
 		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'small', 'tiny')
-		$clitsize = 'You consider your <a href="exec:view''images/pc/body/clit/clit1.jpg''">clitoris</a> to be of an average size.'
+		$clitsize = 'You consider your <a href="exec:view''images/pc/body/clit/clit1.jpg''">clitoris</a> to be on the small size.'
 	elseif clit_size >= 20 and clit_size < 40:
+		$pc_descWordy['clit'] = 'average, regular sized'
+		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'average', 'regular')
+		$clitsize = 'You feel your <a href="exec:view''images/pc/body/clit/clit2.jpg''">clitoris</a> is pretty average sided.'
+	elseif clit_size >= 40 and clit_size < 60:
 		$pc_descWordy['clit'] = 'big, easily-found'
 		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'large', 'big', 'engorged')
 		$clitsize = 'You feel your <a href="exec:view''images/pc/body/clit/clit2.jpg''">clitoris</a> is somewhat on the large side.'
-	elseif clit_size >= 40 and clit_size < 60:
+	elseif clit_size >= 60 and clit_size < 80:
 		$pc_descWordy['clit'] = 'thick, meaty'
 		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'meaty', 'thick', 'swollen')
-		$clitsize = 'Your <a href="exec:view''images/pc/body/clit/clit3.jpg''">clit</a> is quite large.'
-	elseif clit_size >= 60 and clit_size < 80:
-		$pc_descWordy['clit'] = 'big, practically phallic'
-		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'oversized', 'huge')
-		$clitsize = 'You have a big <a href="exec:view''images/pc/body/clit/clit4.jpg''">clit</a> that resembles a penis.'
+		$clitsize = 'Your <a href="exec:view''images/pc/body/clit/clit4.jpg''">clit</a> is quite large.'
 	else
 		!! If greater or equal to 80
-		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'huge', 'massive', 'cock-like')
-		$pc_descWordy['clit'] = 'enormous, phallic'
-		$clitsize = 'Your <a href="exec:view''images/pc/body/clit/clit5.jpg''">clit</a> is so large it can be mistaken for a penis.'
+		$pc_desc['clit'] = func('body_desc', 'ChooseDescWord', 'oversized', 'huge')
+		$pc_descWordy['clit'] = 'big, practically phallic'
+		$clitsize = 'You have a big <a href="exec:view''images/pc/body/clit/clit5.jpg''">clit</a> that permanently protrudes.'
 	end
 end
 

+ 325 - 144
locations/body_structure.qsrc

@@ -1,54 +1,80 @@
 # body_structure
 
+$DEFAULT_PATH = 'images/pc/body/shape'
+
 
 !	Get the bmi-strength class
-!	bs_class = func('body_structure', 'get_class', pcs_bmi, strenbuf)
+!	bs_class = func('body_structure', 'get_class', pcs_bmi, strenbuf, pregchem)
 if $ARGS[0] = 'get_class':
 	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
 	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
+	if arrsize('ARGS') = 3: ARGS[3] = PregChem
+
+	!	PregChem
+	if ARGS[3] < 2184:
+		result = 0000
+	elseif ARGS[3] < 2688:
+		result = 1000
+	elseif ARGS[3] < 3192:
+		result = 2000
+	elseif ARGS[3] < 3696:
+		result = 3000
+	elseif ARGS[3] < 4200:
+		result = 4000
+	elseif ARGS[3] < 4704:
+		result = 5000
+	elseif ARGS[3] < 5208:
+		result = 6000
+	elseif ARGS[3] < 5712:
+		result = 7000
+	elseif ARGS[3] < 6216:
+		result = 8000
+	else
+		result = 9000
+	end
 
 	!	bmi
 	if ARGS[1] < 16:
-		result = 0
+		result += 000
 	elseif ARGS[1] < 19:
-		result = 100
+		result += 100
 	elseif ARGS[1] < 22:
-		result = 200
+		result += 200
 	elseif ARGS[1] < 25:
-		result = 300
+		result += 300
 	elseif ARGS[1] < 30:
-		result = 400
+		result += 400
 	elseif ARGS[1] < 35:
-		result = 500
+		result += 500
 	elseif ARGS[1] < 40:
-		result = 600
+		result += 600
 	elseif ARGS[1] < 45:
-		result = 700
+		result += 700
 	else
-		result = 800
+		result += 800
 	end
 
 	!	strenbuf
 	if ARGS[2] <= 5:
-		result += 0
+		result += 00
 	elseif ARGS[2] <= 10:
-		result += 1
+		result += 01
 	elseif ARGS[2] <= 15:
-		result += 2
+		result += 02
 	elseif ARGS[2] <= 25:
-		result += 3
+		result += 03
 	elseif ARGS[2] <= 35:
-		result += 4
+		result += 04
 	elseif ARGS[2] <= 50:
-		result += 5
+		result += 05
 	elseif ARGS[2] <= 70:
-		result += 6
+		result += 06
 	elseif ARGS[2] <= 100:
-		result += 7
+		result += 07
 	elseif ARGS[2] <= 110:
-		result += 8
+		result += 08
 	elseif ARGS[2] <= 120:
-		result += 9
+		result += 09
 	elseif ARGS[2] <= 130:
 		result += 10
 	elseif ARGS[2] <= 140:
@@ -71,57 +97,77 @@ end
 
 
 if $ARGS[0] = 'body_img_totals':
-	if ARGS[0] = 000:
+	if ARGS[1] = 000:
 		result = 2
-	elseif ARGS[0] = 006:
+	elseif ARGS[1] = 006:
 		result = 2
 
-	elseif ARGS[0] = 100:
+	elseif ARGS[1] = 100:
 		result = 4
-	elseif ARGS[0] = 106:
+	elseif ARGS[1] = 106:
 		result = 3
 
-	elseif ARGS[0] = 200:
+	elseif ARGS[1] = 200:
 		result = 2
-	elseif ARGS[0] = 206:
+	elseif ARGS[1] = 206:
 		result = 4
-	elseif ARGS[0] = 207:
+	elseif ARGS[1] = 207:
 		result = 3
-	elseif ARGS[0] = 208:
+	elseif ARGS[1] = 208:
 		result = 1
-	elseif ARGS[0] = 210:
+	elseif ARGS[1] = 210:
 		result = 1
-	elseif ARGS[0] = 213:
+	elseif ARGS[1] = 213:
 		result = 1
-	elseif ARGS[0] = 215:
+	elseif ARGS[1] = 215:
 		result = 1
 
-	elseif ARGS[0] = 300:
+	elseif ARGS[1] = 300:
 		result = 3
-	elseif ARGS[0] = 306:
+	elseif ARGS[1] = 306:
 		result = 3
-	elseif ARGS[0] = 307:
+	elseif ARGS[1] = 307:
 		result = 1
-	elseif ARGS[0] = 308:
+	elseif ARGS[1] = 308:
 		result = 1
 
-	elseif ARGS[0] = 400:
+	elseif ARGS[1] = 400:
 		result = 2
-	elseif ARGS[0] = 406:
+	elseif ARGS[1] = 406:
 		result = 2
 
-	elseif ARGS[0] = 500:
+	elseif ARGS[1] = 500:
 		result = 3
-	elseif ARGS[0] = 506:
+	elseif ARGS[1] = 506:
 		result = 2
 
-	elseif ARGS[0] = 600:
+	elseif ARGS[1] = 600:
 		result = 1
 
-	elseif ARGS[0] = 700:
+	elseif ARGS[1] = 700:
 		result = 2
 
-	elseif ARGS[0] = 800:
+	elseif ARGS[1] = 800:
+		result = 1
+
+
+	elseif ARGS[1] = 1000:
+		result = 1
+	elseif ARGS[1] = 2000:
+		result = 1
+	elseif ARGS[1] = 3000:
+		result = 1
+	elseif ARGS[1] = 4000:
+		result = 1
+	elseif ARGS[1] = 5000:
+		result = 1
+	elseif ARGS[1] = 6000:
+		result = 1
+	elseif ARGS[1] = 7000:
+		result = 1
+	elseif ARGS[1] = 8000:
+		result = 1
+	elseif ARGS[1] = 9000:
 		result = 1
 
 	end
@@ -176,25 +222,49 @@ if $ARGS[0] = 'Body_img_transform':
 		result = 600
 	elseif ARGS[1] < 800:
 		result = 700
-	else
+	elseif ARGS[1] < 1000:
 		result = 800
+	elseif ARGS[1] < 2000:
+		result = 1000
+	elseif ARGS[1] < 3000:
+		result = 2000
+	elseif ARGS[1] < 4000:
+		result = 3000
+	elseif ARGS[1] < 5000:
+		result = 4000
+	elseif ARGS[1] < 6000:
+		result = 5000
+	elseif ARGS[1] < 7000:
+		result = 6000
+	elseif ARGS[1] < 8000:
+		result = 7000
+	elseif ARGS[1] < 9000:
+		result = 8000
+	elseif ARGS[1] < 10000:
+		result = 9000
 	end
 end
 
 !	ARGS[1] = bs_class
 if $ARGS[0] = 'default_set_class_transform':
-	result = ARGS[1]
+	if ARGS[1] >= 1000:
+		result = ARGS[1]
+		exit
+	end
+
+	result = ARGS[1] mod 1000
 	if cheatVars['fix_bi_set'] mod 10 = 0:
-		result = 100 * (result / 100) + 2
+		result = 100 * (ARGS[1] / 100) + 2
 	elseif cheatVars['fix_bi_set'] mod 10 = 1:
-		result = 100 * (result / 100) + 6
+		result = 100 * (ARGS[1] / 100) + 6
 	elseif cheatVars['fix_bi_set'] mod 10 = 2:
-		result = 100 * (result / 100) + 8
+		result = 100 * (ARGS[1] / 100) + 8
 	end
 
 	if cheatVars['fix_bi_set'] / 10 mod 10 ! 9:
 		result = (cheatVars['fix_bi_set'] / 10 mod 10) * 100 + result mod 100
 	end
+	result += base_result
 end
 
 
@@ -206,22 +276,9 @@ if $ARGS[0] = 'body_img':
 	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
 	if arrsize('ARGS') = 3: ARGS[3] = PregChem
 
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2], ARGS[3])
 
 
-	! =======      Pregnant       ======= !
-	if cheatVars['fix_bodyimg'] = 0 and (knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or ARGS[3] > 3600))):
-		if ARGS[3] <= 2687:
-			$result = 'images/pc/body/shape/preg/0/0.jpg'
-		elseif ARGS[3] <= 6215:
-			$result = 'images/pc/body/shape/preg/0/<<((ARGS[3] - 2184)/504)>>.jpg'
-		else
-			$result = 'images/pc/body/shape/preg/0/8.jpg'
-		end
-		exit
-	end
-
-	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
-
 	if cheatVars['fix_bodyimg'] = 1:
 		if cheatVars['fix_bi_set'] < 10:
 			$result = func('body_structure', 'custom_body_img', bs_temp_bs_class)
@@ -237,46 +294,79 @@ if $ARGS[0] = 'body_img':
 end
 
 
+!! ARGS[1] = bs_class
 if $ARGS[0] = 'body_img_from_class':
-	$result = 'images/pc/body/shape/'
-
 	ARGS[1] = func('body_structure', 'Body_img_transform', ARGS[1])
-	if ARGS[1] < 100:
-		$result += '0_starving/'
-	elseif ARGS[1] < 200:
-		$result += '1_underweight/'
-	elseif ARGS[1] < 300:
-		$result += '2_slender/'
-	elseif ARGS[1] < 400:
-		$result += '3_healthy/'
-	elseif ARGS[1] < 500:
-		$result += '4_overweight/'
-	elseif ARGS[1] < 600:
-		$result += '5_modobese/'
-	elseif ARGS[1] < 700:
-		$result += '6_sevobese/'
-	elseif ARGS[1] < 800:
-		$result += '7_vsevobese/'
-	else
-		$result += '8_morobese/'
+
+	$result = func('body_structure', 'body_img_path_from_class', ARGS[1])
+	$result += '/'
+
+	if ARGS[1] >= 1000:
+		$result += '0/'
+		if ARGS[1] = 1000:
+			$result += '0'
+		elseif ARGS[1] = 2000:
+			$result += '1'
+		elseif ARGS[1] = 3000:
+			$result += '2'
+		elseif ARGS[1] = 4000:
+			$result += '3'
+		elseif ARGS[1] = 5000:
+			$result += '4'
+		elseif ARGS[1] = 6000:
+			$result += '5'
+		elseif ARGS[1] = 7000:
+			$result += '6'
+		elseif ARGS[1] = 8000:
+			$result += '7'
+		elseif ARGS[1] = 9000:
+			$result += '8'
+		end
+		$result += '.jpg'
+		exit
 	end
 
-	if ARGS[1] mod 100 = 0:
+
+	ARGS[2] = (ARGS[1] mod 100)
+	if ARGS[2] = 0:
 		$result += '0_low_'
-	elseif ARGS[1] mod 100 = 6:
+	elseif ARGS[2] = 1:
+		$result += '1_???_'
+	elseif ARGS[2] = 2:
+		$result += '2_???_'
+	elseif ARGS[2] = 3:
+		$result += '3_???_'
+	elseif ARGS[2] = 4:
+		$result += '4_???_'
+	elseif ARGS[2] = 5:
+		$result += '5_???_'
+	elseif ARGS[2] = 6:
 		$result += '6_mid_'
-	elseif ARGS[1] mod 100 = 7:
+	elseif ARGS[2] = 7:
 		$result += '7_high_'
-	elseif ARGS[1] mod 100 = 8:
+	elseif ARGS[2] = 8:
 		$result += '8_strong_'
-	elseif ARGS[1] mod 100 = 10:
+	elseif ARGS[2] = 9:
+		$result += '9_???_'
+	elseif ARGS[2] = 10:
 		$result += '10_vstrong_'
-	elseif ARGS[1] mod 100 = 13:
+	elseif ARGS[2] = 11:
+		$result += '11_???_'
+	elseif ARGS[2] = 12:
+		$result += '12_???_'
+	elseif ARGS[2] = 13:
 		$result += '13_bbuilder_'
-	elseif ARGS[1] mod 100 = 15:
+	elseif ARGS[2] = 14:
+		$result += '14_???_'
+	elseif ARGS[2] = 15:
 		$result += '15_hulk_'
+	elseif ARGS[2] = 16:
+		$result += '16_???_'
+	else
+		$result += '17_???_'
 	end
 
+
 	temp_img_totals = func('body_structure', 'body_img_totals', ARGS[1])
 	if arrsize('ARGS') <= 2:
 		temp_img_chosen = rand(0, temp_img_totals-1)
@@ -291,21 +381,70 @@ if $ARGS[0] = 'body_img_from_class':
 	$result += '<<temp_img_chosen>>.jpg'
 
 	killvar 'temp_img_totals'
-	killvar 'bs_temp_bs_class'
 end
 
+if $ARGS[0] = 'body_img_path_from_class':
+	$result = $DEFAULT_PATH + '/'
+	if ARGS[1] < 100:
+		$result += '0_starving'
+	elseif ARGS[1] < 200:
+		$result += '1_underweight'
+	elseif ARGS[1] < 300:
+		$result += '2_slender'
+	elseif ARGS[1] < 400:
+		$result += '3_healthy'
+	elseif ARGS[1] < 500:
+		$result += '4_overweight'
+	elseif ARGS[1] < 600:
+		$result += '5_modobese'
+	elseif ARGS[1] < 700:
+		$result += '6_sevobese'
+	elseif ARGS[1] < 800:
+		$result += '7_vsevobese'
+	elseif ARGS[1] < 1000:
+		$result += '8_morobese'
+	else
+		$result += 'preg'
+	end
+end
+
+
+
 if $ARGS[0] = 'custom_body_img':
-	ARGS[1] = ARGS[1] / 100
+	if ARGS[1] >= 1000:
+		$result = func('body_structure', 'body_img_from_class', ARGS[1])
+		exit
+	end
+
+
+	if cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_advanced'] = 0:
+		ARGS[1] = ARGS[1] / 100
+		$temp_img_name = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_img_<<ARGS[1]>>']
+		$temp_base_folder = $DEFAULT_PATH
+		$temp_base_folder += '/' + $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_folder']
+	else
+		$cbi_class = $mid(10000+ARGS[1], 2)
+		bs_imgnum = rand(0, cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_imgnums_<<$cbi_class>>']-1)
+		$temp_img_name = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_img_<<$cbi_class>>_<<bs_imgnum>>']
+		killvar 'bs_imgnum'
+
+		$temp_base_folder = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_path']
+		if $temp_base_folder = '':
+			$temp_base_folder = $DEFAULT_PATH
+		end
+		$temp_base_folder += '/' + $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_folder']
+		if $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_path_<<$cbi_class>>'] ! '':
+			$temp_base_folder += '/' + $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_path_<<$cbi_class>>']
+		end
+		killvar '$cbi_class'
+	end
 
-	$temp_img_name = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_img_<<ARGS[1]>>']
 	if $temp_img_name = '':
-		$result = func('body_structure', 'body_img_from_class', ARGS[1] * 100)
-		killvar '$temp_img_name'
-		exit
+		$result = func('body_structure', 'cs_get_default_img', ARGS[1])
+	else
+		$result = '<<$temp_base_folder>>/<<$temp_img_name>>.jpg'
 	end
 
-	$temp_base_folder = 'images/pc/body/shape/' + $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_folder']
-	$result = '<<$temp_base_folder>>/<<$temp_img_name>>.jpg'
 	killvar '$temp_base_folder'
 	killvar '$temp_img_name'
 end
@@ -318,30 +457,7 @@ if $ARGS[0] = 'body_desc':
 	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
 	if arrsize('ARGS') = 3: ARGS[3] = PregChem
 
-	if knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or ARGS[3] > 3600)):
-		if ARGS[3] <= 2687:
-			$result = 'pregnant, but not showing'
-		elseif ARGS[3] <= 3191:
-			$result = 'glowing'
-		elseif ARGS[3] <= 3695:
-			$result = 'starting to show'
-		elseif ARGS[3] <= 4199:
-			$result = 'clearly showing'
-		elseif ARGS[3] <= 4703:
-			$result = 'fairly pregnant'
-		elseif ARGS[3] <= 5207:
-			$result = 'quite pregnant'
-		elseif ARGS[3] <= 5711:
-			$result = 'very pregnant'
-		elseif ARGS[3] <= 6215:
-			$result = 'extremely pregnant'
-		else
-			$result = 'ready to pop'
-		end
-		exit
-	end
-
-	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2], ARGS[3])
 
 	if cheatVars['fix_bodyimg'] = 1:
 		if cheatVars['fix_bi_set'] < 10:
@@ -432,19 +548,50 @@ if $ARGS[0] = 'body_desc_from_class':
 
 	! =======   morbidly obese    ======= !
 	! -----     45 <= bmi           ----- !
-	else
+	elseif ARGS[1] < 1000:
 		!	0 <= strenbuf <= 200
 		$result = 'morbidly obese'
+
+	! =======      pregnant       ======= !
+	! -----                         ----- !
+	elseif ARGS[1] < 2000:
+		$result = 'pregnant, but not showing'
+	elseif ARGS[1] < 3000:
+		$result = 'glowing'
+	elseif ARGS[1] < 4000:
+		$result = 'starting to show'
+	elseif ARGS[1] < 5000:
+		$result = 'clearly showing'
+	elseif ARGS[1] < 6000:
+		$result = 'fairly pregnant'
+	elseif ARGS[1] < 7000:
+		$result = 'quite pregnant'
+	elseif ARGS[1] < 8000:
+		$result = 'very pregnant'
+	elseif ARGS[1] < 9000:
+		$result = 'extremely pregnant'
+	else
+		$result = 'ready to pop'
 	end
 end
 
 
 if $ARGS[0] = 'custom_body_desc':
-	ARGS[1] = ARGS[1] / 100
+	if ARGS[1] >= 1000:
+		$result = func('body_structure', 'body_desc_from_class', ARGS[1])
+		exit
+	end
+
+
+	if cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_advanced'] = 0:
+		ARGS[1] = ARGS[1] / 100
+		$temp_bs_body_desc = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_desc_<<ARGS[1]>>']
+	else
+		$temp_bs_body_desc = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_desc_<<$mid(10000+ARGS[1],2)>>']
+	end
 
-	$temp_bs_body_desc = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_desc_<<ARGS[1]>>']
 	if $temp_bs_body_desc = '':
-		$temp_bs_body_desc = func('body_structure', 'body_desc_from_class', ARGS[1] * 100)
+		$temp_bs_body_desc = func('body_structure', 'cs_get_default_desc', ARGS[1])
 	end
 
 	$result = $temp_bs_body_desc
@@ -458,7 +605,7 @@ end
 if $ARGS[0] = 'bmi_desc':
 	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
 
-	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], 30)
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], 30, 0)
 	$result = func('body_structure', 'bmi_desc_from_class', bs_temp_bs_class)
 	killvar 'bs_temp_bs_class'
 end
@@ -493,12 +640,14 @@ if $ARGS[0] = 'appearance_bonus':
 	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
 	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
 
-	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2], 0)
 	result = func('body_structure', 'appearance_bonus_from_class', bs_temp_bs_class)
 	killvar 'bs_temp_bs_class'
 end
 
 if $ARGS[0] = 'appearance_bonus_from_class':
+	ARGS[1] = ARGS[1] mod 1000
+
 	if ARGS[1] < 100:
 		!	starving: bmi < 16
 		result = -10
@@ -528,57 +677,57 @@ if $ARGS[0] = 'appearance_bonus_from_class':
 		result = -80
 	end
 
-	ARGS[1] = ARGS[1] mod 100
 
-	if ARGS[1] = 0:
+	ARGS[2] = (ARGS[1] mod 100)
+	if ARGS[2] = 0:
 		!	0 <= strenbuf <= 5
 		result -= 30
-	elseif ARGS[1] = 1:
+	elseif ARGS[2] = 1:
 		!	5 < strenbuf <= 10
 		result -= 20
-	elseif ARGS[1] = 2:
+	elseif ARGS[2] = 2:
 		!	10 < strenbuf <= 15
 		result -= 15
-	elseif ARGS[1] = 3:
+	elseif ARGS[2] = 3:
 		!	15 < strenbuf <= 25
 		result -= 10
-	elseif ARGS[1] = 4:
+	elseif ARGS[2] = 4:
 		!	25 < strenbuf <= 35
 		result -= 5
-	elseif ARGS[1] = 5:
+	elseif ARGS[2] = 5:
 		!	35 < strenbuf <= 50
 		result += 0
-	elseif ARGS[1] = 6:
+	elseif ARGS[2] = 6:
 		!	50 < strenbuf <= 70
 		result += 5
-	elseif ARGS[1] = 7:
+	elseif ARGS[2] = 7:
 		!	70 < strenbuf <= 100
 		result += 10
-	elseif ARGS[1] = 8:
+	elseif ARGS[2] = 8:
 		!	100 < strenbuf <= 110
 		result += 5
-	elseif ARGS[1] = 9:
+	elseif ARGS[2] = 9:
 		!	110 < strenbuf <= 120
 		result += 0
-	elseif ARGS[1] = 10:
+	elseif ARGS[2] = 10:
 		!	120 < strenbuf <= 130
 		result -= 5
-	elseif ARGS[1] = 11:
+	elseif ARGS[2] = 11:
 		!	130 < strenbuf <= 140
 		result -= 15
-	elseif ARGS[1] = 12:
+	elseif ARGS[2] = 12:
 		!	140 < strenbuf <= 150
 		result -= 30
-	elseif ARGS[1] = 13:
+	elseif ARGS[2] = 13:
 		!	150 < strenbuf <= 160
 		result -= 45
-	elseif ARGS[1] = 14:
+	elseif ARGS[2] = 14:
 		!	160 < strenbuf <= 170
 		result -= 60
-	elseif ARGS[1] = 15:
+	elseif ARGS[2] = 15:
 		!	170 < strenbuf <= 180
 		result -= 75
-	elseif ARGS[1] = 16:
+	elseif ARGS[2] = 16:
 		!	180 < strenbuf <= 190
 		result -= 100
 	else
@@ -588,4 +737,36 @@ if $ARGS[0] = 'appearance_bonus_from_class':
 end
 
 
+
+
+
+if $ARGS[0] = 'cs_get_default_img':
+	if cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_advanced'] = 0:
+		ARGS[1] *= 100
+	end
+
+	$result = func('body_structure', 'body_img_from_class', ARGS[1])
+end
+
+if $ARGS[0] = 'cs_get_default_desc':
+	if cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_advanced'] = 0:
+		ARGS[1] *= 100
+	end
+
+	$result = func('body_structure', 'body_desc_from_class', ARGS[1])
+end
+
+
+
+
+	!!===================================================================!!
+	!!                                                                   !!
+	!!                              CLEANUP                              !!
+	!!                                                                   !!
+	!!===================================================================!!
+
+
+killvar '$DEFAULT_PATH'
+
+
 --- body_structure ---------------------------------

+ 5 - 3
locations/booty_call_sms.qsrc

@@ -491,6 +491,8 @@ if $ARGS[0] = 'new_booty_call':
 							else
 							end
 						end
+					else
+						$SMSTree['b12'] = 'PLACEHOLDER 2'
 					end
 				end
 
@@ -523,17 +525,17 @@ if $ARGS[0] = 'new_booty_call':
 	elseif $npc_rel_type[$ARGS[1]] = 'boyfriend':
 		!! temp
 		$SMSTree['10'] = '$npc_rel_type = boyfriend!!'
-			$SMSTree['11'] = 'PLACEHOLDER2'
+			$SMSTree['11'] = 'PLACEHOLDER3'
 
 	elseif $npc_rel_type[$ARGS[1]] = 'girlfriend':
 		!! temp
 		$SMSTree['10'] = '$npc_rel_type = girlfriend!!'
-			$SMSTree['11'] = 'PLACEHOLDER2'
+			$SMSTree['11'] = 'PLACEHOLDER4'
 
 	else
 		!! temp
 		$SMSTree['10'] = 'PLACEHOLDER3'
-			$SMSTree['11'] = 'PLACEHOLDER4'
+			$SMSTree['11'] = 'PLACEHOLDER5'
 	end
 
 

+ 12 - 11
locations/brother.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'start':
 	gs 'boystat','A34'
 	dick = npc_dick['A<<34>>']
 	'<center><b><font color="maroon">Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	'Kolka is your <<brotherAge>> year old brother. While you share the same mother, Kolka''s dad is your and Anya''s stepfather.'
 	if SchoolAtestat = 0:
 		'He''s a student at the same school as you. You can usually find him at home playing video games or playing football with his friends.'
@@ -354,7 +354,7 @@ if $ARGS[0] = 'start':
 			*clr & cla
 			gs 'stat'
 			'<center><b><font color = maroon>Kolka</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 			'Kolka, your brother, is <<brotherAge>> years old. While you share the same mother, Kolka''s dad is your and Anya''s stepfather. He is a student at the same school as you. When not in school, he is either at home playing video games or out playing football with his friends.'
 			*pl
 			'Kolka turns to you and asks, "<<$pcs_nickname>>, can you help me with my homework?"'
@@ -406,6 +406,7 @@ if $ARGS[0] = 'playfootball':
 		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 		gs 'exercise', 'tier1', 60, 'agil', 'vital'
 		gs 'exp_gain', 'run', rand(0, 2)
+		if ftbll_lvl < 50: gs 'exp_gain', 'ftbll', rand(0, 2)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football3.jpg"></center>'
 		'You spend an hour running around, chasing the ball across the field with Kolka and his friends Mishan and Zhendos.'
@@ -424,7 +425,7 @@ if $ARGS[0] = 'playfootball':
 			*clr & cla
 			gs 'stat'
 			'<center><b><font color = maroon>Kolka</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 			'The boys hesitate before one of them responds, "Err... nothing."'
 
 			gs 'willpower', 'misc', 'force'
@@ -484,7 +485,7 @@ if $ARGS[0] = 'kiss_talk':
 	brotherkisstalk = 1
 	gs 'stat'
 	'<center><b><font color = maroon>Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	'"Hey..." you say awkwardly. "Can we talk? About... you know..." you blush and look away awkwardly, the memory of your brother''s lips pressing at your mind.'
 	'Kolka immediately blushes back and swallows, "Uh... yeah. We can talk... about... you know..."'
 
@@ -492,14 +493,14 @@ if $ARGS[0] = 'kiss_talk':
 		minut += 3
 		cla & *clr
 		'<center><b><font color = maroon>Kolka</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 		'You sit down next to him and continue to sit there awkwardly not saying anything for several minutes, trying to think of what you''re going to say.'
 
 		act'Try to explain':
 			cla & *clr
 			minut += 3
 			'<center><b><font color = maroon>Kolka</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 			'Preparing what you think is the best thing to say, you take a deep breath before finally speaking.'
 			'"Look Kolka, it was just a kiss. There wasn''t any more meaning behind it than wanting to give you one. There''s nothing wrong with a sister wanting to show her brother some affection, right?" you rationalize, almost more to yourself than to your brother.'
 			'He stammers, "Uh... R-right. Nothing wrong with that, I guess..."'
@@ -511,7 +512,7 @@ if $ARGS[0] = 'kiss_talk':
 				cla & *clr
 				minut += 3
 				'<center><b><font color = maroon>Kolka</font></b></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 				'"You''re my brother," you finally say again. "You''re my brother and I love you and nothing will change that."'
 				'"Right... I love you too..." he mumbles back.'
 				'"So..." With a fast beating heart and feeling the heat flush to your face, you force out your next words. "So... if I want to show you how much I love you in the future, there''s nothing wrong with that."'
@@ -541,7 +542,7 @@ if $ARGS[0] = 'kiss_talk':
 		act'Apologize':
 			cla & *clr
 			'<center><b><font color = maroon>Kolka</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 			'"I don''t know what came over me!" you suddenly blurt out, startling Kolka from your previous silence. "I''m sorry, Kolka! I didn''t mean to! It''s just, your hand was on my leg and everything felt so warm and I just saw that look in your eyes and the next thing I knew..."'
 			'You trail off, looking down at your knees in shame, not knowing what else to say. Everything sounds like an excuse to your own ears. You know what you did was wrong and you''re afraid of how it might have hurt your brother.'
 			'Kolka breaks the silence, "It''s okay, <<$pcs_nickname>>."'
@@ -572,7 +573,7 @@ if $ARGS[0] = 'kiss_talk':
 		act'Tell him you liked it':
 			cla & *clr
 			'<center><b><font color = maroon>Kolka</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 			'You sheepishly smile at him, "It felt pretty good, didn''t it?"'
 			'Kolka perks up, "Yeah, it did, didn''t it?"'
 			'"Maybe, it''s not so bad to have a little fun now and then..." you say, casually inching towards him. "I mean, it''s not like we''re doing anything that wrong are we?"'
@@ -722,7 +723,7 @@ if $ARGS[0] = 'homework':
 	gs 'stat'
 	minut += 1
 	'<center><b><font color = maroon>Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	'Kolka, your brother, is <<brotherAge>> years old. While you share the same mother, Kolka''s dad is your and Anya''s stepfather. He is a student at the same school as you. When not in school, he is either at home playing video games or out playing football with his friends.'
 	*pl
 	textrand = rand(1,3)
@@ -1505,7 +1506,7 @@ if $ARGS[0] = 'pregreact':
 	*clr
 	brother_pregreact = 1
 	'<center><b><font color="maroon">Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 
 	if knowpreg = 1 and kid = 0 and FUNC('body_din','pregnancyVisibility') = 1:
 		if $clothingworntype = 'nude' and brotherSex < 7:

+ 34 - 34
locations/brother2.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'chat':
 	gs 'npc_relationship', 'modify', 'A134', 'like', 1, 'living_room'
 	gs 'stat'
 	'<center><b><font color="maroon">Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	'You casually talk to him about whatever topics come up.'
 	*nl
 	brotherchat = rand(1,8)
@@ -24,7 +24,7 @@ if $ARGS[0] = 'chat':
 		'"... and dad asked me if I want to help him work on the Gazelle but I don''t know. I''d rather go play football with Zhendos and Mishan," he finishes, snapping you out of your idle thoughts and bringing you back to the room.'
 		*nl
 		'"It''s good to have fun with your friends but it might also be good to work with dad. It''s a good life skill. Besides, there''s nothing girls love more than a man who knows how to work a car!" you wink at him.'
-	
+
 	elseif brotherchat = 3:
 		'"I hate math so much!" he moans. "Math sucks! It can go die in a hole!"'
 		*nl
@@ -33,7 +33,7 @@ if $ARGS[0] = 'chat':
 		else
 			'"Blegh! Yeah, you''re right. Math sucks!" you grumble in agreement.'
 		end
-	
+
 	elseif brotherchat = 4:
 		'Kolka starts telling you a story about him and his friends. As it goes on longer and all over the place, you find yourself zoning out and not really paying attention to what he''s saying.'
 		'"... and then he ripped his pants!" he giggles, snapping you out of your idle thoughts and bringing you back to the room. "Isn''t that hilarious?"'
@@ -90,7 +90,7 @@ end
 if $ARGS[0] = 'DTR':
 	gs 'stat'
 	'<center><b><font color="maroon">Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	'"Kolka, we need to talk," you say.'
 	'"About what?"'
 	'"About us. Now that we''ve started... doing stuff... we need to figure out where this is going."'
@@ -98,7 +98,7 @@ if $ARGS[0] = 'DTR':
 	act'What are we doing?':
 		cla & *clr
 		'<center><b><font color="maroon">Kolka</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 		'"What are we doing Kolka? I mean, what <i>are</i> we? Siblings? Lovers? Something else?"'
 		'Kolka chews on his lip, not sure how to respond.'
 		'"What we need to do is define our relationship. Mom and dad can''t find out for sure, but we need to figure out for ourselves what we''re doing."'
@@ -106,7 +106,7 @@ if $ARGS[0] = 'DTR':
 		act'Are we lovers or not?':
 			cla & *clr
 			'<center><b><font color="maroon">Kolka</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 			'You take a deep breath.'
 			'"Well, the first thing is, are we lovers? Is it actually romance between us? Or something else? Can we see other people? If we do, can we still do what we''ve been doing?"'
 			'Kolka considers for a moment before asking, "Would you get jealous if I started fucking other girls?"'
@@ -117,7 +117,7 @@ if $ARGS[0] = 'DTR':
 				act'Continue':
 					cla & *clr
 					'<center><b><font color="maroon">Kolka</font></b></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 					'"Good. Cause I want to fuck other guys," you grin.'
 					'"Psh, as if you think they could satisfy you the way I can."'
 					'"Variety is the spice of life Kolka."'
@@ -126,7 +126,7 @@ if $ARGS[0] = 'DTR':
 					act'Siblings with benefit':
 						cla & *clr
 						'<center><b><font color="maroon">Kolka</font></b></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 						'"You''re my brother. I''m your sister. That makes us siblings. But," you hold up your finger. "With benefits. If I want to have some fun with my brother, why shouldn''t I? It''s not any different from when we play football together, is it?"'
 						'He nods eagerly. Whatever wounds he might have suffered earlier seem to be getting overridden by his teenage sexual desires. Good. It would be sad to be in love with your sister. That''s just weird.'
 						'"So we''re still going to fuck?"'
@@ -143,18 +143,18 @@ if $ARGS[0] = 'DTR':
 					end
 				end
 			end
-			
+
 			act'Yes': gt 'brother2', 'DTR_yes'
 		end
 	end
 end
-			
+
 
 if $ARGS[0] = 'DTR_yes':
 	cla & *clr
 	gs 'boystat', 'A34'
 	'<center><b><font color="maroon">Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	'The question takes you by surprise. Not what he said, but how it pierces through your chest, making you ache at just the thought of Kolka with another woman.'
 	'"... yes..." you whisper.'
 	'Your body trembles as your eyes meet his. He looks away for a second, chewing his lip again. And then he turns back and kisses you.'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'DTR_yes':
 		act'Continue':
 			cla & *clr
 			'<center><b><font color="maroon">Kolka</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 			'You sit next to him, not saying anything, feeling stupidly happy for knowing your brother feels this way about you. Surprisingly, Kolka breaks the silence.'
 			'"So... you said this was about defining our relationship. Does this mean you''re my... girlfriend?"'
 			'You consider for a moment before shaking your head.'
@@ -180,7 +180,7 @@ if $ARGS[0] = 'DTR_yes':
 				brotherSex = 10
 				act 'Leave':gt $loc, $loc_arg
 			end
-			
+
 			act 'Get into it':
 				*clr & cla
 				'<center><video autoplay loop src="images\shared\sex\kiss\kiss_lips.mp4"></video></center>'
@@ -629,7 +629,7 @@ if $ARGS[0] = 'nattalk':
 	minut += 15
 	gs 'stat'
 	'<center><b><font color="maroon">Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	'"So Kolka, did you like what you saw in the stairway?" You ask him coyly.'
 	'"I was wondering if you did that for my benefit." He says hesitantly.'
 	'"Well? Did you like it?"'
@@ -642,8 +642,8 @@ if $ARGS[0] = 'nattalk':
 			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:	
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
+			if brotherSex > 6:
 				'"Would you like to fuck Natasha too? I could arrange something."'
 				'"Could I?" He asks in disbelief.'
 				'"Only if you promise to do exactly as I say."'
@@ -666,7 +666,7 @@ if $ARGS[0] = 'nattalk':
 	act 'Tease him':
 		*clr & cla
 		'<center><b><font color="maroon">Kolka</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 		'"She was dripping wet all day long." You say, eyeing the growing bulge in his pants.'
 		'You lean in close to him and whisper in his ear, "Now you''ll have something to jerk off to tonight."'
 		act 'Continue': gt 'brother', 'start'
@@ -713,7 +713,7 @@ end
 if $ARGS[0] = 'kiss_end':
 	cla & *clr
 	'<center><b><font color = maroon>Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	'Eventually, you the two of you reluctantly pull apart.'
 	'"Better stop before we get caught," you say breathlessly.'
 	'"Yeah..."'
@@ -729,11 +729,11 @@ if $ARGS[0] = 'cuni':
 	cla & *clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/hj.jpg"></center>'
-	'"Kolka, you know you told me that you wanted more because I taste good?" you ask and Kolka looks a little confused.' 
+	'"Kolka, you know you told me that you wanted more because I taste good?" you ask and Kolka looks a little confused.'
 	'"I... What?"'
-	'"When we were doing your anatomy homework, and you said that I tasted good?"'  
-	'Kolka looks a little embarrassed. "Umm, yeah?"' 
-	'You smile sweetly. "Would you like another taste?"' 
+	'"When we were doing your anatomy homework, and you said that I tasted good?"'
+	'Kolka looks a little embarrassed. "Umm, yeah?"'
+	'You smile sweetly. "Would you like another taste?"'
 	'He smiles broadly. "Absolutely!"'
 	act'Undress':
 		cla & *clr
@@ -753,7 +753,7 @@ if $ARGS[0] = 'cuni':
 			act'Keep going':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/kuni/pussylickorgasm.mp4"></center>'
-				$orgasm_txt = 'As the sensations build, you find yourself gripping onto his head when your mind goes blank as Kolka''s tongue makes another deep probe. You can feel your muscles clamp down as a wonderful orgasm violently bursts though you.'  
+				$orgasm_txt = 'As the sensations build, you find yourself gripping onto his head when your mind goes blank as Kolka''s tongue makes another deep probe. You can feel your muscles clamp down as a wonderful orgasm violently bursts though you.'
 				$orgasm_or = 'custom'
 				gs 'arousal', 'cuni', rand(3,5)
 				gs 'stat'
@@ -795,7 +795,7 @@ if $ARGS[0] = 'cuni':
 						brotherbj += 1
 						'"Get that cock out and I''ll return the favor," you tell him and he starts pulling his cock out.'
 						'"I thought we were short of time?" he asks and you smile.'
-						'"You won''t take that long..."'  
+						'"You won''t take that long..."'
 						'"Shut up!" he retorts as he guides your head towards his hard cock.'
 						'It doesn''t take long before you feel his body start to tense up.'
 						'"OH God, I''m going to cum sis."'
@@ -830,7 +830,7 @@ if $ARGS[0] = 'hj2':
 	gs 'stat'
 	act'Let him cum in your hand':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/hj_cum.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/handjob/kotovhj.jpg"></center>'
 		'Not stopping, you quicken your pace still further until you feel ropes of his thick cum spattering against your hand.'
 		'Moving your head back, you survey your handiwork before smiling back at him and leaning in for a peck on the lips before getting up to find some tissues for your brother and to wash off your hand.'
 		gs 'arousal', 'end'
@@ -890,7 +890,7 @@ if $ARGS[0] = 'bj2':
 		'After licking his cock a little bit more to make sure it''s clean, you finish up by helping him put it back in his trousers, lest your mother suddenly walk in and wonder what you''re doing together.'
 		act 'Finish': gt'sitrPar'
 	end
-	
+
 	act'Pull back':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></center>'
@@ -902,7 +902,7 @@ if $ARGS[0] = 'bj2':
 		'Leaving Kolka to clean his semen out of the carpet, you slink towards the bathroom to wash off your face.'
 		act 'Finish': gt'vanrPar'
 	end
-	
+
 	act'Stick your tongue out':
 		cla & *clr
 		gs 'cum_call', 'face', 'A34', 1
@@ -933,7 +933,7 @@ if $ARGS[0] = 'wakeup':
 	gs 'boystat', 'A34'
 	cla & *clr
 	'<center><b><font color="maroon">Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	'"Hey, it''s time to get up Kolka."'
 	'"Mrph. Lemme alone," he mutters, eyes squeezing tight in annoyance.'
 	'"Come on Kolka. <<$npc_nickname[''A29'']>>''s gonna be mad if you''re late for breakfast again."'
@@ -944,7 +944,7 @@ if $ARGS[0] = 'wakeup':
 		'You shrug, realizing that you''re not going to find a way to wake him up any time soon without him being mad at you and decide to leave him be.'
 		act 'Move away': gt $loc, $loc_arg
 	end
-	
+
 	act'Yank his blanket off':
 		brotherMorningSex = daystart
 		cla
@@ -978,7 +978,7 @@ if $ARGS[0] = 'wakeup':
 		end
 		act 'Move away': gt $loc, $loc_arg
 	end
-		
+
 	if brotherSex >= 2 or pcs_inhib >= 35 or npc_rel['A34'] >= 75:
 		act'Tell him you''ll show him your tits':
 			cla
@@ -995,7 +995,7 @@ if $ARGS[0] = 'wakeup':
 					$whatshow = 'bra'
 					gt 'brother2', 'show'
 				end
-			end		
+			end
 			if $clothingworntype ! 'nude' or $braworntype ! 'none':
 				act'Trick him and don''t do it':
 					$whatshow = 'tits'
@@ -1029,7 +1029,7 @@ if $ARGS[0] = 'wakeup':
 					'"Alright," he says, yawning one more time before folding his blanket for storage and beginning the process of getting ready for school.'
 					act 'Move away': gt $loc, $loc_arg
 				end
-			
+
 				act'Trick him and don''t do it':
 					$whatshow = 'pussy'
 					gt 'brother2', 'trick'
@@ -1037,7 +1037,7 @@ if $ARGS[0] = 'wakeup':
 			end
 		end
 	end
-			
+
 	if brotherSex >= 5 or pcs_inhib >= 50 or npc_rel['A34'] >= 85:
 		act'Tell him you''ll give him a handjob':
 			npc_rel['A34'] += 5
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'trick':
 	brotherwaketrick = 1
 	npc_rel['A34'] -= 5
 	'<center><b><font color="maroon">Kolka</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/brother.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big34.jpg"></center>'
 	'You wait for him to be more or less fully awake before snatching his blanket and move away.'
 	'"Hey!" he cries. "What are you doing?"'
 	'"I''m leaving. What the hell is wrong with you? You really thought I was gonna show you my <<$whatshow>>?"'

+ 2 - 2
locations/brother_lessons.qsrc

@@ -132,7 +132,7 @@ if $ARGS[0] = 'homework':
 							act'Continue jerking him off':
 								cla & *clr
 								gs 'cum_call', 'hands', 'A34', 1
-								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/hj_cum.jpg"></center>'
+								'<center><img <<$set_imgh>> src="images/shared/sex/handjob/kotovhj.jpg"></center>'
 								'Picking up the pace for a quick burst of speed, you feel his hot cum burst all over your hand. Pulling back, you smile at the look of bliss on his face before leaning in for one more loving kiss.'
 								'"I think we''ll have to call the session early if that''s alright with you," you say, purposefully looking down at the sticky cum covering your hands. "I''m gonna go get cleaned up. You should soon too unless you want <<$npc_nickname[''A29'']>> to catch you with your dick out like that."'
 								'"Y-yeah..." he mumbles back, still dazed from his orgasm.'
@@ -388,7 +388,7 @@ if $ARGS[0] = 'anatomylesson2':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/6.jpg"></center>'
 		'"So, your lesson today is about female genitals. We''ll start with the most obvious one because I know you love to look at them: breasts!" You pull your arms back behind your head to give him a good view. "Women have breasts because they''re used to feed babies-" you start to say before Kolka interrupts you.'
-		'"Can I get a closer look? You know... for uhh... scientifical reasons?" he says. The look on his face says he''s genuinely curious but you''re still a little skeptical he isn''t doing this just to get close to your tits.'
+		'"Can I get a closer look? You know... for uhh... scientific reasons?" he says. The look on his face says he''s genuinely curious but you''re still a little skeptical he isn''t doing this just to get close to your tits.'
 		'<i>Oh, whatever. As long as he learns something right?</i>'
 		act'Continue':
 			cla & *clr

+ 20 - 19
locations/brother_voyeur.qsrc

@@ -62,11 +62,11 @@ if $ARGS[0] = 'showertalk1':
 		'"You''re not?" he says, looking up at you before blushing at your exposed body and turning away again.'
 		'"Of course not silly! I''m not even mad! I just wanted to catch up with my favorite little brother and I thought, since you were right there, why not now?"'
 		'"Oh, okay..." he nods, still looking away.'
-		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,3)
+		if npc_rel['A34'] <50: gs 'npc_relationship', 'modify', 'A34', 'like'
 
 		if pcs_inhib >= 40 or npc_rel['A34'] >= 90:
 			act'"You can look at me you know"':
-				npc_rel['A34'] += 5
+				gs 'npc_relationship', 'modify', 'A34', 'love'
 				*clr & cla
 				brothershowerlook = 1
 				if brotherSex < 2:brotherSex = 2
@@ -124,7 +124,7 @@ end
 if $ARGS[0] = 'showertalk2':
 	if npc_QW['A34'] <= 1: npc_QW['A34'] = 2
 	brothershowertalk += 1
-	npc_rel['A34'] += rand(2,3)
+	gs 'npc_relationship', 'modify', 'A34', 'like'
 	if brothershowerlook = 1:gt 'brother_voyeur', 'brothershowerlook'
 	cla & *clr
 	if brothershowerask ! daystart:
@@ -145,7 +145,7 @@ if $ARGS[0] = 'showertalk2':
 	act'Continue':
 		if brothershowerlook >= 1:gt 'brother_voyeur', 'brothershowerlook'
 		*clr & cla
-		if npc_rel['A34'] < 50:npc_rel['A34'] += rand(1,2)
+		if npc_rel['A34'] < 50: gs 'npc_relationship', 'modify', 'A34', 'like'
 		'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk3.jpg"></center>'
 		'He slips inside and sits on the toilet again, staring at the wall, though not before "sneaking" a peek at your exposed breasts.'
 		*nl
@@ -154,7 +154,7 @@ if $ARGS[0] = 'showertalk2':
 			*clr & cla
 			brothershowerlook = 1
 			if brotherSex < 2:brotherSex = 2
-			npc_rel['A34'] += 5
+			gs 'npc_relationship', 'modify', 'A34', 'love'
 			bro_ass_compliment = rand(1,3)
 			'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk4.jpg"></center>'
 
@@ -272,7 +272,7 @@ if $ARGS[0] = 'brothershowerlook':
 	'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothertalk3.jpg"></center>'
 	brother_shower['look'] = daystart
 	inhib_exp += rand(1,3)
-	if npc_rel['A34'] <50 and brothershowerask ! daystart:npc_rel['A34'] += rand(1,2)
+	if npc_rel['A34'] <50 and brothershowerask ! daystart: gs 'npc_relationship', 'modify', 'A34', 'like'
 	if brothershowertalk < 10 and brothershowerask ! daystart:
 		'He slips inside and takes his usual place on the toilet along with the traditional quick glance at your breasts. He''s gripping the edge of the seat and leaning forward with an eager smile. If nothing else, he''s certainly happy to be here.'
 	elseif brothershowertalk >= 10 and brothershowerask ! daystart:
@@ -592,7 +592,7 @@ if $ARGS[0] = 'brother_shower_together':
 		if pcs_inhib >= 50 or npc_rel['A34'] > 80:
 			if pcs_horny >= 50:
 				act'Use the showerhead on your pussy':
-					npc_rel['A34'] += 5
+					gs 'npc_relationship', 'modify', 'A34', 'love'
 					cla
 					*nl
 					'"Hey, hand me the showerhead will you?" you say to your brother.'
@@ -630,7 +630,7 @@ if $ARGS[0] = 'brother_shower_together':
 			end
 			act'Give him shower head':
 				cla
-				npc_rel['A34'] += 5
+				gs 'npc_relationship', 'modify', 'A34', 'love'
 				if brotherbj < 1 and brotherfuck < 1:
 					'"Hey Kolka, want to see something cool?"'
 					'"Huh?" He asks, confused. "What is it?"'
@@ -665,7 +665,7 @@ if $ARGS[0] = 'brother_wash_first':
 end
 
 if $ARGS[0] = 'brother_wash':
-	npc_rel['A34'] += 5
+	gs 'npc_relationship', 'modify', 'A34', 'love'
 	if brotherSex < 4:brotherSex = 4
 	cla & *clr
 	brotherwash += 1
@@ -746,12 +746,13 @@ if $ARGS[0] = 'brother_wash':
 					end
 				end
 			end
+			if pcs_pubes >= shave_trigger:
+				act 'I should shave': gt 'brother_voyeur', 'brother_shower_shave'
 
-			act 'I should shave': gt 'brother_voyeur', 'brother_shower_shave'
-
-			act'Just for you':
-				brother_shower['shave_ask1'] = daystart
-				gt 'brother_voyeur', 'brother_shower_shave'
+				act'Just for you':
+					brother_shower['shave_ask1'] = daystart
+					gt 'brother_voyeur', 'brother_shower_shave'
+				end
 			end
 		end
 	end
@@ -806,7 +807,7 @@ if $ARGS[0] = 'shave_both':
 	if mc_inventory['razor'] >= razors_to_use['all']:
 		if pcs_leghair > 3 and pcs_pubes > 3:
 			act 'Shave your legs and pussy (0:15)':
-				npc_rel['A34'] += 3
+				gs 'npc_relationship', 'modify', 'A34', 'like'
 				cla & *clr
 				minut += 15
 				pcs_leghair = 0
@@ -854,7 +855,7 @@ end
 if $ARGS[0] = 'shave_legs':
 	if pcs_leghair > 3 and mc_inventory['razor'] >= razors_to_use['legs']:
 		act 'Shave your legs (0:05)':
-			npc_rel['A34'] += 2
+			gs 'npc_relationship', 'modify', 'A34', 'like'
 			cla & *clr
 			minut += 5
 			pcs_leghair = 0
@@ -956,7 +957,7 @@ if $ARGS[0] = 'shave_legs':
 					end
 
 					act'"Hmm, maybe you''re right" (0:05)':
-						npc_rel['A34'] += 2
+						gs 'npc_relationship', 'modify', 'A34', 'like'
 						cla & *clr
 						pcs_pubes = 0
 						pcs_horny += 5
@@ -996,7 +997,7 @@ end
 if $ARGS[0] = 'shave_pussy':
 	if pcs_pubes > shave_trigger and mc_inventory['razor'] >= razors_to_use['pussy']:
 		act 'Shave your pussy (0:05)':
-			npc_rel['A34'] += 3
+			gs 'npc_relationship', 'modify', 'A34', 'love'
 			cla & *clr
 			minut += 5
 			if pubestyle > 0 or pubestyle = 10:
@@ -1170,7 +1171,7 @@ if $ARGS[0] = 'showerfun':
 end
 
 if $ARGS[0] = 'brother_shower_end':
-	npc_rel['A34'] += 5
+	gs 'npc_relationship', 'modify', 'A34', 'love'
 	brother_shower_times += 1
 	if hypnoAddict = 0:
 		cumspclnt = 1

+ 19 - 16
locations/buklinik.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = 'start':
 	*clr & cla
 	menu_off = 0
+	$location_type = 'public_outdoors'
 	gs 'shortgs', 'setloc', 'buklinik', 'start'
 	minut += 5
 	gs 'stat'
@@ -13,26 +14,28 @@ if $ARGS[0] = 'start':
 	'A well-known homeless shelter in a run-down building. Looking above the entrance you can see a sign saying, Mercy Clinic.'
 	'There is a note by the entrance.'
 	'Working hours: '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+''
-	temp = rand(1, 10)
-	if temp = 9:'A crowd of homeless people have huddled together trying to see if there are any available beds...'
-	if temp = 2:'A homeless person is trying to get into the shelter...'
-	if temp = 3:'An older man is standing outside the shelter...'
-	if temp = 4:'There is a woman standing outside the shelter trying to console her crying child...'
-	if temp = 5:'A bruised woman stands near the entrance having a smoke...'
-	if temp = 1:'A man is walking up and down a path, screaming profanities...'
-	if temp = 8:'A young woman is sitting on a bench right next to the shelter with tears in her eyes...'
-	if temp = 7:'A couple are loudly arguing if they want to stay at the shelter tonight...'
-	if temp = 6:'A woman is crying, arguing on the phone, probably with her husband...'
-	if temp = 10:'Surprisingly, there is no one around the shelter...'
 
-	act 'Leave':gt 'city_industrial'
-
-	if hour >= 9 and hour <= 17: act 'Enter the shelter':gt 'buklinik', 'holl'
+	temp = rand(0, 9)
+	if temp = 0: 'Surprisingly, there is no one around the shelter...'
+	if temp = 1: 'A man is walking up and down a path, screaming profanities...'
+	if temp = 2: 'A homeless person is trying to get into the shelter...'
+	if temp = 3: 'An older man is standing outside the shelter...'
+	if temp = 4: 'There is a woman standing outside the shelter trying to console her crying child...'
+	if temp = 5: 'A bruised woman stands near the entrance having a smoke...'
+	if temp = 6: 'A woman is crying, arguing on the phone, probably with her husband...'
+	if temp = 7: 'A couple are loudly arguing if they want to stay at the shelter tonight...'
+	if temp = 8: 'A young woman is sitting on a bench right next to the shelter with tears in her eyes...'
+	if temp = 9: 'A crowd of homeless people have huddled together trying to see if there are any available beds...'
+
+	act 'Leave': gt 'city_industrial'
+
+	if hour >= 9 and hour < 18: act 'Enter the shelter': gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'holl':
 	*clr & cla
 	menu_off = 0
+	$location_type = 'public_indoors'
 	gs 'shortgs', 'setloc', 'buklinik', 'holl'
 	minut += 5
 	gs 'stat'
@@ -40,7 +43,7 @@ if $ARGS[0] = 'holl':
 	'<center><b>Entrance</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_holl.jpg"></center>'
 	'The interior is even worse than the exterior, the paint on the wall is falling off and hasn''t been repainted for quite a while. There are some lights working but not all of them and there is this weird smell that you can''t really pinpoint what it is.'
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
+	if $start_type['loc'] = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
 		'You can volunteer here on the weekends.'
 	else
 		if bumtolik > 4:'The <a href="exec:gt ''buklinik'', ''sklad''">storage</a> room is locked.'
@@ -68,7 +71,7 @@ if $ARGS[0] = 'registr':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_reg.jpg"></center>'
 	'As you approach the counter there are two women chatting with each other, and laughing.'
 
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and bumtolik < 5:
+	if $start_type['loc'] = 'sg' and SchoolAtestat = 0 and bumtolik < 5:
 		!r125
 		'You clear you throat, "Hello, my name is <<$pcs_firstname>>, I found a note that you were looking for volunteers..."'
 		'One of the women cheerfully replies, "Welcome to our little humble shelter. As you''ve probably noticed the place is run down and we''re really in need of some volunteers." They point further down the corridor, "What you see here is just a small part of the operation that we provide. We also help out with the elderly and the less fortunate outside the shelter."'

File diff suppressed because it is too large
+ 337 - 321
locations/buklinik_event.qsrc


+ 3 - 3
locations/burger.qsrc

@@ -271,14 +271,14 @@ if $ARGS[0] = 'dishes':
 											gs 'stat'
 											cumspclnt = 11
 											gs 'cum_cleanup'
-											'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/sex/pr4.jpg"></center>'
+											'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/custom/3.jpg"></center>'
 											'Finally Anatoly Borisovich stops, puts his cleaned off dick back in his pants and starts to button them up. You sit on the floor stunned with semen dripping from your face. You feel taste the distinct flavor of semen in your mouth. Anatoly Borisovich helps you back to your feet and quickly walks out of the dressing room. You try to clean the traces of sperm from your face.'
 
 											act 'Exit out of the dressing':
 												*clr & cla
 												minut += 2
 												gs 'stat'
-												!!'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/sex/pr4.jpg"></center>'
+												!!'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/custom/3.jpg"></center>'
 												'You come out of the dressing room, your face red with shame. You feel like everyone is already aware of the fact that you just sucked a dick in a public place. Anatoly Borisovich tells the saleswoman that he will buy the dress for you and pays. The saleswoman wraps the dress for you and you feel her gaze on your face as she gives you the package.'
 
 												act 'Exit from the boutique':
@@ -588,7 +588,7 @@ if $ARGS[0] = 'dishes':
 						gs 'cum_call', 'face', $BurgerQW['GroupSex1']
 						gs 'cum_call', 'face', $BurgerQW['GroupSex2']
 						stat['facial'] += 3
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/sex/tri2.jpg"></center>'
+						'<center><img <<$set_imgh>> src="images/shared/sex/group/gopdbj3.jpg.jpg"></center>'
 						'Hot jets of sperm slap you in the face, you close your eyes and just feel the stinky seed on your skin. Soon after the sprays of semen stop and your face is all covered with a thick layer of sticky cum. The guys look satisfied and laugh at you. Afterwards they exit the warehouse leaving you by yourself.'
 
 						gs 'arousal', 'end'

+ 15 - 12
locations/carF.qsrc

@@ -75,18 +75,7 @@ if $ARGS[0] = 'salon':
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/car/salon<<car>>.jpg"></center>'
 	'Gasoline - <<benz>> ' + iif(benz = 1, 'liter', 'liters') + ', the fuel tank has a capacity of 40 liters.'
 
-	if car['current_condition'] <= 0:car['current_condition'] = 0 & wrek = 1
-	if car['current_condition'] <= 0 or wrek = 1:
-		'The car is in need of repairs and won''t start.'
-	elseif car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:
-		'The car is in excellent condition.'
-	elseif car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:
-		'While driving, you occasionally hear some troubling noises.'
-	elseif car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:
-		'The car seems broken and barely drives.'
-	else
-		'How this car still runs is a mystery, even to its designers.'
-	end
+	gs 'carF', 'car_condition'
 
 
 	if cardrive = 1:'Through the windshield, you see St. Petersburg''s residential area.'
@@ -383,4 +372,18 @@ if $ARGS[0] = 'nearby':
 	dynamic $enddrive
 end
 
+if $ARGS[0] = 'car_condition':
+	if car['current_condition'] <= 0:car['current_condition'] = 0 & wrek = 1
+	if car['current_condition'] <= 0 or wrek = 1:
+		'The car is in need of repairs and won''t start.'
+	elseif car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:
+		'The car is in excellent condition.'
+	elseif car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:
+		'While driving, you occasionally hear some troubling noises.'
+	elseif car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:
+		'The car seems broken and barely drives.'
+	else
+		'How this car still runs is a mystery, even to its designers.'
+	end
+end
 --- carF ---------------------------------

+ 8 - 0
locations/changingroom.qsrc

@@ -21,6 +21,10 @@ if $ARGS[0] = 'view_swim_list':
 			lastwornpantynumber['swim'] = pantywornnumber
 			$lastwornbratype['swim'] = $braworntype
 			lastwornbranumber['swim'] = brawornnumber
+			$lastwornshoetype['swim'] = $shoeworntype
+			lastwornshoenumber['swim'] = shoewornnumber
+			 
+			gs 'shoes', 'wear', $lastwornshoetype['swim'], lastwornshoenumber['swim']
 		end
 
 		i = 1
@@ -123,6 +127,7 @@ if $ARGS[0] = 'view_swim_list':
 			gs 'clothing', 'wear', $lastwornclothingtype['swim'], lastwornclothingnumber['swim']
 			gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
 			gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
+			gs 'shoes', 'wear', $lastwornshoetype['swim'], lastwornshoenumber['swim']
 			gt $loc, $loc_arg
 		end
 	end
@@ -200,6 +205,7 @@ if $ARGS[0] = 'view_swim_item':
 					gs 'willpower', 'pay', 'self'
 
 					gs 'underwear', 'remove'
+					gs 'shoes', 'strip'
 					gs 'clothing', 'wear', $ARGS[1], ARGS[2]
 
 					gt $loc, $loc_arg
@@ -212,6 +218,7 @@ if $ARGS[0] = 'view_swim_item':
 			'You don''t feel daring enough to wear swimwear this revealing, but if you want to go into the water, you''re going to have to brave it.'
 			act 'Wear':
 				gs 'underwear', 'remove'
+				gs 'shoes', 'strip'
 				gs 'clothing', 'wear', $ARGS[1], ARGS[2]
 
 				gt $loc, $loc_arg
@@ -228,6 +235,7 @@ if $ARGS[0] = 'view_swim_item':
 
 		act 'Wear':
 			gs 'underwear', 'remove'
+			gs 'shoes', 'strip'
 			gs 'clothing', 'wear', $ARGS[1], ARGS[2]
 
 			gt $loc, $loc_arg

+ 1541 - 0
locations/cheatmenu_bisets.qsrc

@@ -0,0 +1,1541 @@
+# cheatmenu_bisets
+
+$cheatmenu['table_start']	= '<center><table width="80%" cellspacing="0" cellpadding="20" valign="top"><tr><td width="500" cellspacing="0" cellpadding="20" valign="top">'
+$cheatmenu['table_second']	= '</td><td width="500" cellspacing="0" cellpadding="20" valign="top">'
+$cheatmenu['table_end']		= '</td></tr></table></center>'
+
+
+if $ARGS[0] = 'main':
+	*clr & cla
+	gs 'stat'
+	gs 'themes', 'indoors'
+	gs 'obj_din', 'cheattabs'
+
+	'<center><h1>Cheat Menu - Body Image Sets</h1></center>'
+	$cheatmenu['table_start']
+		'<center><b>Body Image Controls</b></center>'
+		*nl
+		if cheatVars['fix_bodyimg'] = 1:
+			$temp_text = 'You are currently using set: '
+			if cheatVars['fix_bi_set'] < 10:
+				$temp_text += $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_folder']
+			else
+				$temp_text += 'default '
+				if cheatVars['fix_bi_set'] mod 10 = 0:
+					$temp_text += 'low '
+				elseif cheatVars['fix_bi_set'] mod 10 = 1:
+					$temp_text += 'mid '
+				elseif cheatVars['fix_bi_set'] mod 10 = 2:
+					$temp_text += 'high '
+				end
+
+				if cheatVars['fix_bi_set'] / 10 = 19:
+					$temp_text += 'strength'
+				else
+					$temp_text += func('body_structure', 'body_desc_from_class', (cheatVars['fix_bi_set'] / 10 mod 10) * 100)
+				end
+			end
+			'<<$temp_text>>'
+			killvar '$temp_text'
+		else
+			'You are currently not using a fixed set.'
+		end
+		*nl
+		'These are the default body image sets:'
+		*nl
+		func('cheatmenu_bisets', 'get_default_bi_table')
+		*nl
+		*nl
+		'<center><b>Custom Image Sets</b></center>'
+		temp_cm_bi_flag = 0
+		gs 'cheatmenu_bisets', 'custom_folder_display', 0
+		gs 'cheatmenu_bisets', 'custom_folder_display', 1
+		gs 'cheatmenu_bisets', 'custom_folder_display', 2
+		gs 'cheatmenu_bisets', 'custom_folder_display', 3
+		gs 'cheatmenu_bisets', 'custom_folder_display', 4
+		gs 'cheatmenu_bisets', 'custom_folder_display', 5
+		gs 'cheatmenu_bisets', 'custom_folder_display', 6
+		gs 'cheatmenu_bisets', 'custom_folder_display', 7
+		gs 'cheatmenu_bisets', 'custom_folder_display', 8
+		gs 'cheatmenu_bisets', 'custom_folder_display', 9
+
+		if temp_cm_bi_flag < 10:
+			*nl
+			'<a href="exec: gs ''cheatmenu_bisets'', ''add_set''"><b>Add new set</b></a>'
+			'<a href="exec: gs ''cheatmenu_bisets'', ''import_set''"><b>Import new set</b></a>'
+		end
+		killvar 'temp_cm_bi_flag'
+
+	$cheatmenu['table_end']
+
+	act 'How to: mod edition': gs 'cheatmenu_bisets', 'mods_how_to'
+end
+
+if $ARGS[0] = 'get_default_bi_table':
+	$temp_table = '<table cellpadding="25" cellspacing="0">'
+	$temp_table +=	'<tr>'
+	$temp_table +=		'<td></td>'
+	$temp_table +=		'<td></td>'
+	$temp_table +=		'<th colspan=3><b>Strength</b></th>'
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		'<td></td>'
+	$temp_table +=		'<th><a href="exec: gs ''cheatmenu_bisets'', ''unlock_img_set'', 199 & gs ''cheatmenu_bisets'', ''main''"><b>RESET</b></a></th>'
+	$temp_table +=		'<th valign="bottom" style="border-bottom: 1px solid black">'
+	if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] mod 10 = 0:
+		$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_bisets'', ''unlock_img_set'', 190 & gs ''cheatmenu_bisets'', ''main''"><b>Low</b></a>'
+	else
+		$temp_table +=		'<a href="exec: gs ''cheatmenu_bisets'', ''lock_img_set'', 190 & gs ''cheatmenu_bisets'', ''main''"><b>Low</b></a>'
+	end
+	$temp_table +=		'</th>'
+	$temp_table +=		'<th valign="bottom" style="border-bottom: 1px solid black">'
+	if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] mod 10 = 1:
+		$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_bisets'', ''unlock_img_set'', 191 & gs ''cheatmenu_bisets'', ''main''"><b>Mid</b></a>'
+	else
+		$temp_table +=		'<a href="exec: gs ''cheatmenu_bisets'', ''lock_img_set'', 191 & gs ''cheatmenu_bisets'', ''main''"><b>Mid</b></a>'
+	end
+	$temp_table +=		'</th>'
+	$temp_table +=		'<th valign="bottom" style="border-bottom: 1px solid black">'
+	if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] mod 10 = 2:
+		$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_bisets'', ''unlock_img_set'', 192 & gs ''cheatmenu_bisets'', ''main''"><b>High</b></a></th>'
+	else
+		$temp_table +=		'<a href="exec: gs ''cheatmenu_bisets'', ''lock_img_set'', 192 & gs ''cheatmenu_bisets'', ''main''"><b>High</b></a></th>'
+	end
+	$temp_table +=		'</th>'
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		'<th rowspan=9><b>BMI</b></th>'
+	temp_cmd_i = 0
+	:default_table_loop
+		if temp_cmd_i ! 0: $temp_table +=	'<tr>'
+		$temp_table +=		'<th align="right" style="border-right: 1px solid black">'
+		if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i:
+			$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_bisets'', ''unlock_img_set'', 1<<temp_cmd_i>>9 & gs ''cheatmenu_bisets'', ''main''"><b><<func(''body_structure'', ''body_desc_from_class'', temp_cmd_i * 100)>></a></b>'
+		else
+			$temp_table +=		'<a href="exec: gs ''cheatmenu_bisets'', ''lock_img_set'', 1<<temp_cmd_i>>9 & gs ''cheatmenu_bisets'', ''main''"><b><<func(''body_structure'', ''body_desc_from_class'', temp_cmd_i * 100)>></b></a>'
+		end
+		$temp_table +=		'</th>'
+		$temp_table +=		'<td align="center" valign="center">'
+		temp_cmd_colorflag = 0
+		if cheatVars['fix_bi_set'] > 10 and (cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i or cheatVars['fix_bi_set'] / 10 mod 10 = 9) and (cheatVars['fix_bi_set'] mod 10 = 0 or cheatVars['fix_bi_set'] mod 10 = 9):
+			temp_cmd_colorflag = 1
+		end
+		$temp_table +=			'<<func(''cheatmenu_bisets'', ''get_bodyimg_desc_link'', temp_cmd_i * 100 + 2, temp_cmd_colorflag)>>'
+		$temp_table +=		'</td>'
+		$temp_table +=		'<td align="center" valign="center">'
+		temp_cmd_colorflag = 0
+		if cheatVars['fix_bi_set'] > 10 and (cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i or cheatVars['fix_bi_set'] / 10 mod 10 = 9) and (cheatVars['fix_bi_set'] mod 10 = 1 or cheatVars['fix_bi_set'] mod 10 = 9):
+			temp_cmd_colorflag = 1
+		end
+		$temp_table +=			'<<func(''cheatmenu_bisets'', ''get_bodyimg_desc_link'', temp_cmd_i * 100 + 6, temp_cmd_colorflag)>>'
+		$temp_table +=		'</td>'
+		$temp_table +=		'<td align="center" valign="center">'
+		temp_cmd_colorflag = 0
+		if cheatVars['fix_bi_set'] > 10 and (cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i or cheatVars['fix_bi_set'] / 10 mod 10 = 9) and (cheatVars['fix_bi_set'] mod 10 = 2 or cheatVars['fix_bi_set'] mod 10 = 9):
+			temp_cmd_colorflag = 1
+		end
+		$temp_table +=			'<<func(''cheatmenu_bisets'', ''get_bodyimg_desc_link'', temp_cmd_i * 100 + 8, temp_cmd_colorflag)>>'
+		$temp_table +=		'</td>'
+		$temp_table +=	'</tr>'
+		temp_cmd_i += 1
+	if temp_cmd_i < 9: jump 'default_table_loop'
+
+	$temp_table += '</table>'
+
+	$result = $temp_table
+	killvar '$temp_table'
+	killvar 'temp_cmd_colorflag'
+end
+
+
+
+if $ARGS[0] = 'lock_img_set':
+	cheatVars['fix_bodyimg'] = 1
+	if ARGS[1] < 10:
+		cheatVars['fix_bi_set'] = ARGS[1]
+	else
+		ARGS[1] = ARGS[1] mod 100
+		if cheatVars['fix_bi_set'] < 10: cheatVars['fix_bi_set'] = 199
+
+		if ARGS[1] mod 10 ! 9:
+			cheatVars['fix_bi_set'] = (cheatVars['fix_bi_set'] / 10) * 10 + (ARGS[1] mod 10)
+		else
+			cheatVars['fix_bi_set'] = 100 + (ARGS[1] / 10) * 10 + (cheatVars['fix_bi_set'] mod 10)
+		end
+	end
+	gs 'body', 'UpdateBodyImage'
+end
+
+if $ARGS[0] = 'unlock_img_set':
+	if cheatVars['fix_bi_set'] < 10:
+		cheatVars['fix_bodyimg'] = 0
+		cheatVars['fix_bi_set'] = 0
+	else
+		ARGS[1] = ARGS[1] mod 100
+		if ARGS[1] mod 10 = 9: cheatVars['fix_bi_set'] = 190 + (cheatVars['fix_bi_set'] mod 10)
+		if ARGS[1] / 10 = 9: cheatVars['fix_bi_set'] = (cheatVars['fix_bi_set'] / 10) * 10 + 9
+
+		if cheatVars['fix_bi_set'] = 199:
+			cheatVars['fix_bodyimg'] = 0
+			cheatVars['fix_bi_set'] = 0
+		end
+	end
+	gs 'body', 'UpdateBodyImage'
+end
+
+
+if $ARGS[0] = 'get_bodyimg_desc_link':
+	if ARGS[2] = 0:
+		$result = '<a href="exec: view ''' + func('body_structure', 'body_img_from_class', ARGS[1], 0) + '''">' + func('body_structure', 'body_desc_from_class', ARGS[1]) + '</a>'
+	else
+		$result = '<i><a style="color:#00FF00" href="exec: view ''' + func('body_structure', 'body_img_from_class', ARGS[1], 0) + '''">' + func('body_structure', 'body_desc_from_class', ARGS[1]) + '</a></i>'
+	end
+
+end
+
+
+if $ARGS[0] = 'custom_folder_display':
+	if $cheatVars['fix_biset_<<ARGS[1]>>_folder'] ! '':
+		if temp_cm_bi_flag = 0:
+			*nl
+			'You may edit aspects of a custom image set by clicking on their folder names below.'
+		end
+		*nl
+		$cs_display_text = $cheatVars['fix_biset_<<ARGS[1]>>_name']
+		if $cs_display_text = '':
+			$cs_display_text = $cheatVars['fix_biset_<<ARGS[1]>>_folder']
+		end
+		if cheatVars['fix_bodyimg'] = 1 and cheatVars['fix_bi_set'] = ARGS[1]:
+			'<i><b><a style="color:#00FF00" href="exec: gs ''cheatmenu_bisets'', ''cs_main'', <<ARGS[1]>>"><<$cs_display_text>></a></b></i>'
+		else
+			'<a href="exec: gs ''cheatmenu_bisets'', ''cs_main'', <<ARGS[1]>>"><b><<$cs_display_text>></b></a>'
+		end
+		killvar '$cs_display_text'
+
+		temp_cm_bi_flag += 1
+	end
+end
+
+
+if $ARGS[0] = 'cs_main':
+	*clr & cla
+	'<center><h1>Cheat menu</h1></center>'
+	*nl
+	'<center><b>Body Image Set Display</b></center>'
+
+	$cheatmenu['table_start']
+		act 'Go Back': gs 'cheatmenu_bisets', 'main'
+		'<a href="exec: gs ''cheatmenu_bisets'', ''main''"><b>Go Back</b></a>'
+		*nl
+		if cheatVars['fix_bodyimg'] = 1 and ARGS[1] = cheatVars['fix_bi_set']:
+			'This is the currently locked set.'
+			'<a href="exec: gs ''cheatmenu_bisets'', ''unlock_img_set'' & gs ''cheatmenu_bisets'', ''cs_main'', <<ARGS[1]>>"><b>Clear the lock.</b></a>'
+		else
+			'<a href="exec: gs ''cheatmenu_bisets'', ''lock_img_set'', <<ARGS[1]>> & gs ''cheatmenu_bisets'', ''cs_main'', <<ARGS[1]>>"><b>Use this set only.</b></a>'
+		end
+		*nl
+		dynamic "
+			act 'Export set': gs 'cheatmenu_bisets', 'cs_export', <<ARGS[1]>>
+		"
+		'<a href="exec: gs ''cheatmenu_bisets'', ''cs_export'', <<ARGS[1]>>">Export image set.</a>'
+		*nl
+
+		if cheatVars['fix_biset_<<ARGS[1]>>_advanced'] = 0:
+			gs 'cheatmenu_bisets', 'cs_main_simple', ARGS[1]
+		else
+			gs 'cheatmenu_bisets', 'cs_main_advanced', ARGS[1]
+		end
+
+		'<a href="exec: gs ''cheatmenu_bisets'', ''cs_delete_set'', <<ARGS[1]>>">Delete this set.</a>'
+	$cheatmenu['table_end']
+end
+
+if $ARGS[0] = 'cs_export':
+	*clr & cla
+	cmbs_exp_set = ARGS[1]
+
+	$cheatmenu['table_start']
+		dynamic "
+			act 'Go Back': gs 'cheatmenu_bisets', 'cs_main', <<cmbs_exp_set>>
+		"
+
+		$temp_export_text = "fix_bod_set['advanced'] = <<cheatVars['fix_biset_<<cmbs_exp_set>>_advanced']>>
+		$fix_bod_set['folder'] = '<<$cheatVars['fix_biset_<<cmbs_exp_set>>_folder']>>'
+		"
+		if $cheatVars['fix_biset_<<cmbs_exp_set>>_name'] ! '':
+			$temp_export_text += "$fix_bod_set['name'] = '<<$cheatVars['fix_biset_<<cmbs_exp_set>>_name']>>'
+			"
+		end
+		if $cheatVars['fix_biset_<<cmbs_exp_set>>_path'] ! '':
+			$temp_export_text += "$fix_bod_set['path'] = '<<$cheatVars['fix_biset_<<cmbs_exp_set>>_path']>>'
+			"
+		end
+
+
+		!! classic sets
+		cmd_exp_i = 0
+		:cs_export_simple_loop
+			if $cheatVars['fix_biset_<<cmbs_exp_set>>_img_<<cmd_exp_i>>'] ! '':
+				$temp_export_text += "$fix_bod_set['img_<<cmd_exp_i>>'] = '<<$cheatVars['fix_biset_<<cmbs_exp_set>>_img_<<cmd_exp_i>>']>>'
+				"
+			end
+			if $cheatVars['fix_biset_<<cmbs_exp_set>>_desc_<<cmd_exp_i>>'] ! '':
+				$temp_export_text += "$fix_bod_set['desc_<<cmd_exp_i>>'] = '<<$cheatVars['fix_biset_<<cmbs_exp_set>>_desc_<<cmd_exp_i>>']>>'
+				"
+			end
+			cmd_exp_i += 1
+		if cmd_exp_i < 9: jump 'cs_export_simple_loop'
+
+
+		!! Advanced sets
+		if cheatVars['fix_biset_<<cmbs_exp_set>>_imgnums_0000'] > 0:
+			cmd_exp_bmi = 0
+			:cs_export_adv_bmi_loop
+				cmd_exp_stren = 0
+				:cs_export_adv_str_loop
+					$cmd_class_str = $mid(10000 + cmd_exp_bmi * 100 + cmd_exp_stren, 2)
+
+					if $cheatVars['fix_biset_<<cmbs_exp_set>>_desc_<<$cmd_class_str>>'] ! '':
+						$temp_export_text += "$fix_bod_set['desc_<<$cmd_class_str>>'] = '<<$cheatVars['fix_biset_<<cmbs_exp_set>>_desc_<<$cmd_class_str>>']>>'
+						"
+					end
+					if $cheatVars['fix_biset_<<cmbs_exp_set>>_path_<<$cmd_class_str>>'] ! '':
+						$temp_export_text += "$fix_bod_set['path_<<$cmd_class_str>>'] = '<<$cheatVars['fix_biset_<<cmbs_exp_set>>_path_<<$cmd_class_str>>']>>'
+						"
+					end
+					cmd_imgnums = cheatVars['fix_biset_<<cmbs_exp_set>>_imgnums_<<$cmd_class_str>>']
+					$temp_export_text += "fix_bod_set['imgnums_<<$cmd_class_str>>'] = <<cmd_imgnums>>
+					"
+					cmd_exp_i = 0
+					:cs_export_adv_inner_loop
+						if $cheatVars['fix_biset_<<cmbs_exp_set>>_img_<<$cmd_class_str>>_<<cmd_exp_i>>'] ! '':
+							$temp_export_text += "$fix_bod_set['img_<<$cmd_class_str>>_<<cmd_exp_i>>'] = '<<$cheatVars['fix_biset_<<cmbs_exp_set>>_img_<<$cmd_class_str>>_<<cmd_exp_i>>']>>'
+							"
+						end
+
+						cmd_exp_i += 1
+					if cmd_exp_i < cmd_imgnums: jump 'cs_export_adv_inner_loop'
+
+					cmd_exp_stren += 1
+				if cmd_exp_stren < 18: jump 'cs_export_adv_str_loop'
+				cmd_exp_bmi += 1
+			if cmd_exp_bmi < 9: jump 'cs_export_adv_bmi_loop'
+		end
+
+		$temp_export_text = replace($temp_export_text, "	", "")
+		'<<$temp_export_text>>'
+		killvar '$temp_export_text'
+	$cheatmenu['table_end']
+
+	killvar 'cmbs_exp_set'
+end
+
+
+if $ARGS[0] = 'cs_main_simple':
+	cmbs_set = ARGS[1]
+
+	'<a href="exec: gs ''cheatmenu_bisets'', ''cs_set_advanced'', <<cmbs_set>>"><b>Switch to "advanced"</b></a>'
+	*nl
+	'"Edit image" allows you to set the image file name (only use .jpg images)'
+	'"Edit description" allows you to set the description of the image'
+	*nl
+	'Folder: <<$cheatVars[''fix_biset_<<cmbs_set>>_folder'']>>    <a href="exec: gs ''cheatmenu_bisets'', ''cs_change_folder'', <<cmbs_set>>">Change Folder</a>'
+	*nl
+	'Descriptors: (Displayed as "You are:")'
+
+	$temp_table = '<table cellpadding = "10">'
+	$temp_table +=	'<tr>'
+	$temp_table +=		'<th></th>'
+	$temp_table +=		'<th>Currently using</th>'
+	$temp_table +=		'<th></th>'
+	$temp_table +=		'<th></th>'
+	$temp_table +=	'</tr>'
+	$temp_table +=	func('cheatmenu_bisets', 'get_custom_bodyimg_desc_link_simple', cmbs_set, 0)
+	$temp_table +=	func('cheatmenu_bisets', 'get_custom_bodyimg_desc_link_simple', cmbs_set, 1)
+	$temp_table +=	func('cheatmenu_bisets', 'get_custom_bodyimg_desc_link_simple', cmbs_set, 2)
+	$temp_table +=	func('cheatmenu_bisets', 'get_custom_bodyimg_desc_link_simple', cmbs_set, 3)
+	$temp_table +=	func('cheatmenu_bisets', 'get_custom_bodyimg_desc_link_simple', cmbs_set, 4)
+	$temp_table +=	func('cheatmenu_bisets', 'get_custom_bodyimg_desc_link_simple', cmbs_set, 5)
+	$temp_table +=	func('cheatmenu_bisets', 'get_custom_bodyimg_desc_link_simple', cmbs_set, 6)
+	$temp_table +=	func('cheatmenu_bisets', 'get_custom_bodyimg_desc_link_simple', cmbs_set, 7)
+	$temp_table +=	func('cheatmenu_bisets', 'get_custom_bodyimg_desc_link_simple', cmbs_set, 8)
+	$temp_table += '</table>'
+
+	'<<$temp_table>>'
+	killvar '$temp_table'
+	killvar 'cmbs_set'
+end
+
+if $ARGS[0] = 'get_custom_bodyimg_desc_link_simple':
+	temp_set = ARGS[1]
+	temp_class = ARGS[2]
+
+	$temp_cmd_img_name = $cheatVars['fix_biset_<<temp_set>>_img_<<temp_class>>']
+	$temp_cmd_desc = $cheatVars['fix_biset_<<temp_set>>_desc_<<temp_class>>']
+
+	if $temp_cmd_img_name = '':
+		$temp_cmd_image = func('cheatmenu_bisets', 'cs_get_default_img', temp_set, temp_class)
+		$temp_cmd_img_addon = ''
+		$temp_cmd_img_addon2 = ''
+	else
+		$temp_base_folder = 'images/pc/body/shape/' + $cheatVars['fix_biset_<<temp_set>>_folder']
+		$temp_cmd_image = $temp_base_folder + '/' + $temp_cmd_img_name + '.jpg'
+		$temp_cmd_img_addon = $temp_cmd_img_name + '.jpg'
+		killvar '$temp_base_folder'
+	end
+
+	if $temp_cmd_desc = '':
+		$temp_cmd_desc = func('cheatmenu_bisets', 'cs_get_default_desc', temp_set, temp_class)
+	end
+
+	$result =	'<tr>'
+	$result +=		'<td><<$temp_cmd_desc>></td>'
+	if $temp_cmd_img_addon = '':
+		$result +=		'<td><a href="exec: view ''<<$temp_cmd_image>>''">Default image</a></td>'
+	else
+		$result +=		'<td><a href="exec: view ''<<$temp_cmd_image>>''"><<$temp_cmd_img_addon>></a> (<a href="exec: gs ''cheatmenu_bisets'', ''cs_set_default_img'', <<temp_set>>, <<temp_class>>">Use default image</a>)</td>'
+	end
+	$result +=		'<td><a href="exec: view ''<<$temp_cmd_image>>''"><<$temp_cmd_img_addon>></a></td>'
+	$result +=		'<td><a href="exec: gs ''cheatmenu_bisets'', ''cs_change_img'', <<temp_set>>, <<temp_class>>">Edit image</a></td>'
+	$result +=		'<td><a href="exec: gs ''cheatmenu_bisets'', ''cs_change_desc'', <<temp_set>>, <<temp_class>>">Edit description</a></td>'
+	$result +=	'</tr>'
+
+	killvar '$temp_cmd_image'
+	killvar '$temp_cmd_desc'
+	killvar '$temp_cmd_img_addon'
+	killvar '$temp_cmd_img_name'
+
+	killvar 'temp_set'
+	killvar 'temp_class'
+end
+
+
+
+
+if $ARGS[0] = 'cs_main_advanced':
+	cmbs_set = ARGS[1]
+
+	'<a href="exec: gs ''cheatmenu_bisets'', ''cs_set_simple'', <<cmbs_set>>"><b>Switch to "classic"</b></a>'
+	*nl
+	'"Edit image" allows you to set the image file name (only use .jpg images)'
+	'"Edit description" allows you to set the description of the image'
+	*nl
+	if $cheatVars['fix_biset_<<cmbs_set>>_name'] = '':
+		'Name: <<$cheatVars[''fix_biset_<<cmbs_set>>_folder'']>>    <a href="exec: gs ''cheatmenu_bisets'', ''cs_change_name'', <<cmbs_set>>">Change Name</a>'
+	else
+		'Name: <<$cheatVars[''fix_biset_<<cmbs_set>>_name'']>>    <a href="exec: gs ''cheatmenu_bisets'', ''cs_change_name'', <<cmbs_set>>">Change Name</a>'
+	end
+	'Folder: <<$cheatVars[''fix_biset_<<cmbs_set>>_folder'']>>    <a href="exec: gs ''cheatmenu_bisets'', ''cs_change_folder'', <<cmbs_set>>">Change Folder</a>'
+	if $cheatVars['fix_biset_<<cmbs_set>>_path'] = '':
+		'Path: images/pc/body/shape    <a href="exec: gs ''cheatmenu_bisets'', ''cs_change_path'', <<cmbs_set>>">Set Path</a>'
+	else
+		'Path: <<$cheatVars[''fix_biset_<<cmbs_set>>_path'']>>    <a href="exec: gs ''cheatmenu_bisets'', ''cs_change_path'', <<cmbs_set>>">Change Path</a>'
+	end
+	*nl
+
+	!! ---- MAIN BODY IMAGE CLASSES
+	$temp_table = '<table cellpadding="10">'
+	$temp_table +=	'<tr align="center">'
+	$temp_table +=		'<th></th>'
+	$temp_table +=		'<th></th>'
+	$temp_table +=		'<th colspan=9>BMI</th>'
+	$temp_table +=	'</tr><tr align="center">'
+	$temp_table +=		'<th></th>'
+	$temp_table +=		'<th></th>'
+
+	$temp_bmi_text[0] = '00-15'
+	$temp_bmi_text[1] = '16-18'
+	$temp_bmi_text[2] = '19-21'
+	$temp_bmi_text[3] = '22-24'
+	$temp_bmi_text[4] = '25-29'
+	$temp_bmi_text[5] = '30-34'
+	$temp_bmi_text[6] = '35-39'
+	$temp_bmi_text[7] = '40-44'
+	$temp_bmi_text[8] = '45-99'
+
+	cmd_adv_bmi_i = 0
+	:cs_copy_class_header_loop
+		$temp_table +=	'<th style="white-space: nowrap"><<$temp_bmi_text[cmd_adv_bmi_i]>></th>'
+		cmd_adv_bmi_i += 1
+	if cmd_adv_bmi_i < 9: jump 'cs_copy_class_header_loop'
+
+	$temp_table +=	'</tr><tr align="center">'
+	!$temp_table +=		'<th rowspan=18 style="transform:rotateZ(270deg)">Strength</th>'
+	$temp_table +=		'<th rowspan=18>Strength</th>'
+
+
+	$temp_str_text[0]  = '000-005'
+	$temp_str_text[1]  = '006-010'
+	$temp_str_text[2]  = '011-015'
+	$temp_str_text[3]  = '016-025'
+	$temp_str_text[4]  = '026-035'
+	$temp_str_text[5]  = '036-050'
+	$temp_str_text[6]  = '051-070'
+	$temp_str_text[7]  = '071-100'
+	$temp_str_text[8]  = '101-110'
+	$temp_str_text[9]  = '111-120'
+	$temp_str_text[10] = '121-130'
+	$temp_str_text[11] = '131-140'
+	$temp_str_text[12] = '141-150'
+	$temp_str_text[13] = '151-160'
+	$temp_str_text[14] = '161-170'
+	$temp_str_text[15] = '171-180'
+	$temp_str_text[16] = '181-190'
+	$temp_str_text[17] = '191-200'
+
+
+	cmd_adv_str_i = 0
+	:cs_main_adv_str_loop
+		if cmd_adv_str_i ! 0: $temp_table += '<tr align="center">'
+		$temp_table +=		'<th style="white-space: nowrap"><<$temp_str_text[cmd_adv_str_i]>></th>'
+
+		cmd_adv_bmi_i = 0
+		:cs_main_adv_bmi_loop
+			cmbs_class = cmd_adv_bmi_i * 100 + cmd_adv_str_i
+			$temp_table +=	'<td><a href="exec: gs ''cheatmenu_bisets'', ''cs_main_advanced2'', <<cmbs_set>>, <<cmbs_class>>"><<$mid(1000 + cmbs_class, 2)>></a></td>'
+			cmd_adv_bmi_i += 1
+		if cmd_adv_bmi_i < 9: jump 'cs_main_adv_bmi_loop'
+
+		$temp_table +=	'</tr>'
+		cmd_adv_str_i += 1
+	if cmd_adv_str_i < 18: jump 'cs_main_adv_str_loop'
+	killvar 'cmd_adv_str_i'
+	killvar 'cmd_adv_bmi_i'
+	killvar 'cmbs_class'
+
+	$temp_table += '</table>'
+	'<<$temp_table>>'
+	killvar '$temp_table'
+	killvar '$temp_str_text'
+	!! ---- END MAIN BODY IMAGE CLASSES
+
+	!{
+	*nl
+	*nl
+	!! ---- PREG IMAGES
+	num_pregsets = cheatVars['fix_biset_<<cmbs_set>>_pregsets']
+	if num_pregsets > 0:
+		cmd_pregset_i = 0
+		:cs_main_adv_preg_loop
+			func('cheatmenu_bisets', 'get_pregset_link', cmbs_set, cmd_pregset_i)
+			cmd_pregset_i += 1
+		if cmd_pregset_i < num_pregsets: jump 'cs_main_adv_preg_loop'
+		*nl
+	end
+	killvar 'num_pregsets'
+
+	'<a href="exec: gs ''cheatmenu_bisets'', ''add_pregset'', <<cmbs_set>>">Add new pregnant image set</a>'
+	*nl
+	*nl
+	}
+	killvar 'cmbs_set'
+end
+
+if $ARGS[0] = 'cs_main_advanced2':
+	*clr & cla
+	cmbs_set = ARGS[1]
+	cmbs_class = ARGS[2]
+	$cmdbs_class_str = $mid(10000 + ARGS[2], 2)
+
+	'<center><h1>Cheat menu</h1></center>'
+	*nl
+	'<center><b>Body Image Set Display - class=<<$mid(1000 + ARGS[2], 2)>></b></center>'
+
+	$cheatmenu['table_start']
+		dynamic "
+			act 'Go Back': gs 'cheatmenu_bisets', 'cs_main', <<cmbs_set>>
+			'<a href=""exec: gs ''cheatmenu_bisets'', ''cs_main'', <<cmbs_set>>""><b>Go Back</b></a>'
+			act 'Copy to other class':
+				cmd_copy_class['set'] = <<cmbs_set>>
+				cmd_copy_class['base'] = <<cmbs_class>>
+				gs 'cheatmenu_bisets', 'cs_copy_class_menu'
+			end
+		"
+		*nl
+		*nl
+		'Click links to edit'
+		*nl
+		$temp_cmd_desc = $cheatVars['fix_biset_<<cmbs_set>>_desc_<<$cmdbs_class_str>>']
+		if $temp_cmd_desc = '':
+			$temp_cmd_desc = func('cheatmenu_bisets', 'cs_get_default_desc', cmbs_set, cmbs_class)
+			'You are: <a href="exec: gs ''cheatmenu_bisets'', ''cs_change_desc_adv'', <<cmbs_set>>, <<cmbs_class>>"><<$temp_cmd_desc>></a>'
+		else
+			'You are: <a href="exec: gs ''cheatmenu_bisets'', ''cs_change_desc_adv'', <<cmbs_set>>, <<cmbs_class>>"><<$temp_cmd_desc>></a>    <a href="exec: gs ''cheatmenu_bisets'', ''cs_set_default_desc_adv'', <<ARGS[1]>>, <<ARGS[2]>>">Use default description</a>'
+		end
+		killvar '$temp_cmd_desc'
+		*nl
+
+		$temp_cmd_path = $cheatVars['fix_biset_<<cmbs_set>>_path']
+		if $temp_cmd_path = '':
+			$temp_cmd_path = 'images/pc/body/shape'
+		end
+		$temp_cmd_path += '/' + $cheatVars['fix_biset_<<cmbs_set>>_folder']
+
+		$temp_cmd_subpath = $cheatVars['fix_biset_<<cmbs_set>>_path_<<$cmdbs_class_str>>']
+		if $temp_cmd_subpath = '':
+			$temp_cmd_subpath = func('cheatmenu_bisets', 'cs_get_default_subpath', cmbs_set, cmbs_class)
+			$temp_cmd_subpath = $mid($temp_cmd_subpath, 22)
+		end
+		'Path: <<$temp_cmd_path>>/<a href="exec: gs ''cheatmenu_bisets'', ''cs_change_subpath'', <<cmbs_set>>, <<cmbs_class>>"><<$temp_cmd_subpath>></a>'
+		killvar '$temp_cmd_subpath'
+		killvar 'temp_cmd_path'
+		*nl
+		*nl
+
+		$temp_table =	'<table width=80% align="center">'
+		$temp_table +=		'<tr>'
+		$temp_table +=			'<th>Currently using</th>'
+		$temp_table +=			'<th></th>'
+		$temp_table +=			'<th></th>'
+		$temp_table +=		'</tr>'
+
+		cmd_adv_i = 0
+		:cs_main_adv2_loop
+			$temp_table += func('cheatmenu_bisets', 'get_custom_bodyimg_desc_link_advanced', cmbs_set, cmbs_class, cmd_adv_i)
+
+			cmd_adv_i += 1
+		if cmd_adv_i < cheatVars['fix_biset_<<cmbs_set>>_imgnums_<<$cmdbs_class_str>>']: jump 'cs_main_adv2_loop'
+
+		$temp_table +=		'<tr>'
+		$temp_table +=			'<td></td>'
+		$temp_table +=			'<td></td>'
+		$temp_table +=			'<td><a href="exec: gs ''cheatmenu_bisets'', ''cs_add_img'', <<cmbs_set>>, <<cmbs_class>>">Add image</a></td>'
+		$temp_table +=		'</tr>'
+
+
+		$temp_table += '</table>'
+		'<<$temp_table>>'
+		killvar '$temp_table'
+
+
+	$cheatmenu['table_end']
+
+
+	killvar 'cmbs_set'
+	killvar 'cmbs_class'
+	killvar '$cmdbs_class_str'
+end
+
+
+if $ARGS[0] = 'get_custom_bodyimg_desc_link_advanced':
+	temp_set = ARGS[1]
+	temp_class = ARGS[2]
+	temp_img_num = ARGS[3]
+	$temp_bs_class_str = $mid(10000 + ARGS[2], 2)
+	$temp_cmd_img_name = $cheatVars['fix_biset_<<temp_set>>_img_<<$temp_bs_class_str>>_<<temp_img_num>>']
+	$temp_cmd_desc = $cheatVars['fix_biset_<<temp_set>>_desc_<<$temp_bs_class_str>>']
+
+	if $temp_cmd_img_name = '':
+		$temp_cmd_image = func('cheatmenu_bisets', 'cs_get_default_img', temp_set, temp_class)
+		$temp_cmd_img_addon = ''
+	else
+		$temp_base_folder = $cheatVars['fix_biset_<<temp_set>>_path']
+		if $temp_base_folder = '':
+			$temp_base_folder = 'images/pc/body/shape'
+		end
+		$temp_base_folder += '/' + $cheatVars['fix_biset_<<temp_set>>_folder']
+		if $cheatVars['fix_biset_<<temp_set>>_path_<<$temp_bs_class_str>>'] ! '':
+			$temp_base_folder += '/' + $cheatVars['fix_biset_<<temp_set>>_path_<<$temp_bs_class_str>>']
+		end
+		$temp_cmd_image = $temp_base_folder + '/' + $temp_cmd_img_name + '.jpg'
+		$temp_cmd_img_addon = $temp_cmd_img_name + '.jpg'
+		killvar '$temp_base_folder'
+	end
+
+	if $temp_cmd_desc = '':
+		$temp_cmd_desc = func('cheatmenu_bisets', 'cs_get_default_desc', temp_set, temp_class)
+	end
+
+	$result =	'<tr>'
+	if $temp_cmd_img_addon = '':
+		$result +=		'<td><a href="exec: view ''<<$temp_cmd_image>>''">Default image</a></td>'
+	else
+		$result +=		'<td><a href="exec: view ''<<$temp_cmd_image>>''"><<$temp_cmd_img_addon>></a> (<a href="exec: gs ''cheatmenu_bisets'', ''cs_set_default_img_adv'', <<temp_set>>, <<temp_class>>, <<temp_img_num>>">Use default image</a>)</td>'
+	end
+	$result +=		'<td><a href="exec: gs ''cheatmenu_bisets'', ''cs_change_img_adv'', <<temp_set>>, <<temp_class>>, <<temp_img_num>>">Edit image</a></td>'
+	if cheatVars['fix_biset_<<temp_set>>_imgnums_<<temp_class>>'] = 1:
+		$result +=	'<td></td>'
+	else
+		$result +=	'<td><a href="exec: gs ''cheatmenu_bisets'', ''cs_remove_img'', <<temp_set>>, <<temp_class>>, <<temp_img_num>>">Remove image</a></td>'
+	end
+	$result +=	'</tr>'
+
+	killvar '$temp_cmd_image'
+	killvar '$temp_cmd_desc'
+	killvar '$temp_cmd_img_addon'
+	killvar '$temp_cmd_img_name'
+	killvar '$temp_bs_class_str'
+	killvar 'temp_set'
+	killvar 'temp_class'
+	killvar 'temp_img_num'
+end
+
+if $ARGS[0] = 'add_pregset':
+	temp_set = ARGS[1]
+	cheatVars['fix_biset_<<temp_set>>_pregsets'] += 1
+	gs 'cheatmenu_bisets', 'cs_main', temp_set
+	killvar 'temp_set'
+end
+
+
+if $ARGS[0] = 'get_pregset_link':
+	*clr & cla
+	temp_set = ARGS[1]
+	preg_set = ARGS[2]
+
+	'<center><h1>Cheat menu</h1></center>'
+	*nl
+	'<center><b>Pregnancy Image Set Display - Set = <<preg_set>></b></center>'
+
+	$cheatmenu['table_start']
+		act 'Go Back': gs 'cheatmenu_bisets', 'cs_main', temp_set
+		'<a href="exec: gs ''cheatmenu_bisets'', ''cs_main'', temp_set"><b>Go Back</b></a>'
+		*nl
+
+		$temp_cmd_path = $cheatVars['fix_biset_<<temp_set>>_path']
+		if $temp_cmd_path = '':
+			$temp_cmd_path = 'images/pc/body/shape'
+		end
+		$temp_cmd_path += '/' + $cheatVars['fix_biset_<<cmbs_set>>_folder']
+
+		$temp_cmd_subpath = $cheatVars['fix_biset_<<cmbs_set>>_pregpath_<<preg_set>>']
+		if $temp_cmd_subpath = '':
+			$temp_cmd_subpath = 'preg/0'
+		end
+		'Path: <<$temp_cmd_path>>/<a href="exec: gs ''cheatmenu_bisets'', ''cs_change_preg_subpath'', <<temp_set>>, <<preg_set>>"><<$temp_cmd_subpath>></a>'
+		killvar '$temp_cmd_subpath'
+		killvar 'temp_cmd_path'
+		*nl
+		*nl
+
+		$temp_table =	'<table width=80% align="center">'
+		$temp_table +=		'<tr>'
+		$temp_table +=			'<th>Currently using</th>'
+		$temp_table +=			'<th></th>'
+		$temp_table +=			'<th></th>'
+		$temp_table +=		'</tr>'
+
+		cmd_preg_img = 0
+		:pregset_img_loop
+			$temp_table += func('cheatmenu_bisets', 'get_custom_pregimg', temp_set, preg_set, cmd_preg_img)
+			cmd_preg_img += 1
+		if cmd_preg_img < 9: jump 'pregset_img_loop'
+		killvar 'cmd_preg_img'
+
+	$cheatmenu['table_end']
+
+	killvar 'temp_set'
+	killvar 'preg_set'
+end
+
+if $ARGS[0] = 'get_custom_pregimg':
+	temp_set = ARGS[1]
+	preg_set = ARGS[2]
+	temp_img = ARGS[3]
+
+	$temp_cmd_img_name = $cheatVars['fix_biset_<<temp_set>>_pregimg_<<preg_set>>_<<temp_img>>']
+	$temp_cmd_desc = $cheatVars['fix_biset_<<temp_set>>_desc_<<preg_set>>']
+
+	if $temp_cmd_img_name = '':
+		$temp_cmd_image = func('cheatmenu_bisets', 'cs_get_default_img', temp_set, temp_class)
+		$temp_cmd_img_addon = ''
+	else
+		$temp_base_folder = $cheatVars['fix_biset_<<temp_set>>_path']
+		if $temp_base_folder = '':
+			$temp_base_folder = 'images/pc/body/shape'
+		end
+		$temp_base_folder += '/' + $cheatVars['fix_biset_<<temp_set>>_folder']
+		if $cheatVars['fix_biset_<<temp_set>>_path_<<$temp_bs_class_str>>'] ! '':
+			$temp_base_folder += '/' + $cheatVars['fix_biset_<<temp_set>>_path_<<$temp_bs_class_str>>']
+		end
+		$temp_cmd_image = $temp_base_folder + '/' + $temp_cmd_img_name + '.jpg'
+		$temp_cmd_img_addon = $temp_cmd_img_name + '.jpg'
+		killvar '$temp_base_folder'
+	end
+
+	killvar 'temp_set'
+	killvar 'preg_set'
+	killvar 'temp_img'
+end
+
+
+
+if $ARGS[0] = 'cs_copy_class_menu':
+	*clr & cla
+	act 'Cancel':
+		gs 'cheatmenu_bisets', 'cs_main_advanced2', cmd_copy_class['set'], cmd_copy_class['base']
+		killvar 'cmd_copy_class'
+	end
+
+	$temp_table = '<table cellpadding="10">'
+	$temp_table +=	'<tr align="center">'
+	$temp_table +=		'<th></th>'
+	$temp_table +=		'<th></th>'
+	$temp_table +=		'<th colspan=9>BMI</th>'
+	$temp_table +=	'</tr><tr align="center">'
+	$temp_table +=		'<th></th>'
+	$temp_table +=		'<th></th>'
+
+	$temp_bmi_text[0] = '00-15'
+	$temp_bmi_text[1] = '16-18'
+	$temp_bmi_text[2] = '19-21'
+	$temp_bmi_text[3] = '22-24'
+	$temp_bmi_text[4] = '25-29'
+	$temp_bmi_text[5] = '30-34'
+	$temp_bmi_text[6] = '35-39'
+	$temp_bmi_text[7] = '40-44'
+	$temp_bmi_text[8] = '45-99'
+
+	cmd_adv_bmi_i = 0
+	:cs_copy_class_header_loop
+		$temp_table +=	'<th style="white-space: nowrap"><b><a href="exec: gs ''cheatmenu_bisets'', ''cs_copy_class_bmi'', <<cmd_adv_bmi_i>>"><<$temp_bmi_text[cmd_adv_bmi_i]>></a></b></th>'
+		cmd_adv_bmi_i += 1
+	if cmd_adv_bmi_i < 9: jump 'cs_copy_class_header_loop'
+
+	$temp_table +=	'</tr><tr align="center">'
+	!$temp_table +=		'<th rowspan=18 style="transform:rotateZ(270deg)">Strength</th>'
+	$temp_table +=		'<th rowspan=18>Strength</th>'
+
+
+	$temp_str_text[0]  = '000-005'
+	$temp_str_text[1]  = '006-010'
+	$temp_str_text[2]  = '011-015'
+	$temp_str_text[3]  = '016-025'
+	$temp_str_text[4]  = '026-035'
+	$temp_str_text[5]  = '036-050'
+	$temp_str_text[6]  = '051-070'
+	$temp_str_text[7]  = '071-100'
+	$temp_str_text[8]  = '101-110'
+	$temp_str_text[9]  = '111-120'
+	$temp_str_text[10] = '121-130'
+	$temp_str_text[11] = '131-140'
+	$temp_str_text[12] = '141-150'
+	$temp_str_text[13] = '151-160'
+	$temp_str_text[14] = '161-170'
+	$temp_str_text[15] = '171-180'
+	$temp_str_text[16] = '181-190'
+	$temp_str_text[17] = '191-200'
+
+	cmd_copy_class['counter'] = 0
+
+	cmd_adv_str_i = 0
+	:cs_copy_class_str_loop
+		if cmd_adv_str_i ! 0: $temp_table += '<tr align="center">'
+		$temp_table +=		'<th style="white-space: nowrap"><b><a href="exec: gs ''cheatmenu_bisets'', ''cs_copy_class_stren'', <<cmd_adv_str_i>>"><<$temp_str_text[cmd_adv_str_i]>></a></b></th>'
+
+		cmd_adv_bmi_i = 0
+		:cs_copy_class_bmi_loop
+			cmbs_class = cmd_adv_bmi_i * 100 + cmd_adv_str_i
+			$cmbs_class_str = $mid(10000 + cmbs_class, 2)
+			if cmd_copy_class['base'] = cmbs_class:
+				$temp_table +=	'<td><<$cmbs_class_str>></td>'
+			elseif cmd_copy_class[$cmbs_class_str] = 1:
+				cmd_copy_class['counter'] += 1
+				$temp_table +=	'<td><i><a style="color:#00FF00" href="exec: cmd_copy_class[''<<$cmbs_class_str>>''] = 0 & gs ''cheatmenu_bisets'', ''cs_copy_class_menu''"><<$cmbs_class_str>></a></i></td>'
+			else
+				$temp_table +=	'<td><a href="exec: cmd_copy_class[''<<$cmbs_class_str>>''] = 1 & gs ''cheatmenu_bisets'', ''cs_copy_class_menu''"><<$cmbs_class_str>></a></td>'
+			end
+			cmd_adv_bmi_i += 1
+		if cmd_adv_bmi_i < 9: jump 'cs_copy_class_bmi_loop'
+
+		$temp_table +=	'</tr>'
+		cmd_adv_str_i += 1
+	if cmd_adv_str_i < 18: jump 'cs_copy_class_str_loop'
+	killvar 'cmd_adv_str_i'
+	killvar 'cmd_adv_bmi_i'
+
+	$temp_table += '</table>'
+	'<<$temp_table>>'
+	killvar '$temp_table'
+	killvar '$temp_str_text'
+
+	killvar 'cmbs_set'
+	killvar 'cmbs_class'
+
+	if cmd_copy_class['counter'] > 0:
+		act 'Reset':
+			temp_set = cmd_copy_class['set']
+			temp_base = cmd_copy_class['base']
+			killvar 'cmd_copy_class'
+			cmd_copy_class['set'] = temp_set
+			cmd_copy_class['base'] = temp_base
+			killvar 'temp_set'
+			killvar 'temp_base'
+			gs 'cheatmenu_bisets', 'cs_copy_class_menu'
+		end
+		act 'Overwrite':
+			gs 'cheatmenu_bisets', 'cs_overwrite_classes_base'
+		end
+ 	end
+end
+
+if $ARGS[0] = 'cs_copy_class_bmi':
+	temp_copyclass['bmi'] = ARGS[1]
+
+	temp_copyclass['counter'] = 0
+	temp_copyclass['stren'] = 0
+	:cs_copy_class_stren_loop2
+		temp_copyclass['class'] = temp_copyclass['bmi'] * 100 + temp_copyclass['stren']
+		$temp_copyclass['class_str'] = $mid(10000 + temp_copyclass['class'], 2)
+		if cmd_copy_class[$temp_copyclass['class_str']] = 1 or cmd_copy_class['base'] = temp_copyclass['class']:
+			temp_copyclass['counter'] += 1
+		end
+		temp_copyclass['stren'] += 1
+	if temp_copyclass['stren'] < 18: jump 'cs_copy_class_stren_loop2'
+
+	if temp_copyclass['counter'] < 18:
+		temp_copyclass['result'] = 1
+	else
+		temp_copyclass['result'] = 0
+	end
+
+	temp_copyclass['stren'] = 0
+	:cs_copy_class_stren_loop3
+		temp_copyclass['class'] = temp_copyclass['bmi'] * 100 + temp_copyclass['stren']
+		$temp_copyclass['class_str'] = $mid(10000 + temp_copyclass['class'], 2)
+		if cmd_copy_class['base'] ! temp_copyclass['class']:
+			cmd_copy_class[$temp_copyclass['class_str']] = temp_copyclass['result']
+		end
+		temp_copyclass['stren'] += 1
+	if temp_copyclass['stren'] < 18: jump 'cs_copy_class_stren_loop3'
+
+	killvar 'temp_copyclass'
+
+	gs 'cheatmenu_bisets', 'cs_copy_class_menu'
+end
+
+if $ARGS[0] = 'cs_copy_class_stren':
+	temp_copyclass['stren'] = ARGS[1]
+
+	temp_copyclass['counter'] = 0
+	temp_copyclass['bmi'] = 0
+	:cs_copy_class_bmi_loop2
+		temp_copyclass['class'] = temp_copyclass['bmi'] * 100 + temp_copyclass['stren']
+		$temp_copyclass['class_str'] = $mid(10000 + temp_copyclass['class'], 2)
+		if cmd_copy_class[$temp_copyclass['class_str']] = 1 or cmd_copy_class['base'] = temp_copyclass['class']:
+			temp_copyclass['counter'] += 1
+		end
+		temp_copyclass['bmi'] += 1
+	if temp_copyclass['bmi'] < 9: jump 'cs_copy_class_bmi_loop2'
+
+	if temp_copyclass['counter'] < 9:
+		temp_copyclass['result'] = 1
+	else
+		temp_copyclass['result'] = 0
+	end
+
+	temp_copyclass['bmi'] = 0
+	:cs_copy_class_bmi_loop3
+		temp_copyclass['class'] = temp_copyclass['bmi'] * 100 + temp_copyclass['stren']
+		$temp_copyclass['class_str'] = $mid(10000 + temp_copyclass['class'], 2)
+		if cmd_copy_class['base'] ! temp_copyclass['class']:
+			cmd_copy_class[$temp_copyclass['class_str']] = temp_copyclass['result']
+		end
+		temp_copyclass['bmi'] += 1
+	if temp_copyclass['bmi'] < 9: jump 'cs_copy_class_bmi_loop3'
+
+	killvar 'temp_copyclass'
+
+	gs 'cheatmenu_bisets', 'cs_copy_class_menu'
+end
+
+if $ARGS[0] = 'cs_overwrite_classes_base':
+	$cmd_copy_class['base_str'] = $mid(10000 + cmd_copy_class['base'], 2)
+	$cmd_copy_class['string'] = 'fix_biset_<<cmd_copy_class[''set'']>>_'
+	$cmd_copy_class['path'] = $cheatVars[$cmd_copy_class['string'] + 'path_<<$cmd_copy_class[''base_str'']>>']
+	$cmd_copy_class['desc'] = $cheatVars[$cmd_copy_class['string'] + 'desc_<<$cmd_copy_class[''base_str'']>>']
+	cmd_copy_class['imgnums'] = cheatVars[$cmd_copy_class['string'] + 'imgnums_<<$cmd_copy_class[''base_str'']>>']
+	cmd_copy_class['i'] = 0
+	:cs_overwrite_loop1
+		$cmd_copy_class['img_<<cmd_copy_class[''i'']>>'] = $cheatVars[$cmd_copy_class['string'] + 'img_<<$cmd_copy_class[''base_str'']>>_<<cmd_copy_class[''i'']>>']
+		cmd_copy_class['i'] += 1
+	if cmd_copy_class['i'] < cmd_copy_class['imgnums']: jump 'cs_overwrite_loop1'
+
+
+	cmd_copy_class['str_i'] = 0
+	:cs_overwrite_str_loop
+		cmd_copy_class['bmi_i'] = 0
+		:cs_overwrite_bmi_loop
+			cmbs_class = cmd_copy_class['bmi_i'] * 100 + cmd_copy_class['str_i']
+			$cmbs_class_str = $mid(10000 + cmbs_class, 2)
+			if cmd_copy_class['base'] ! cmbs_class and cmd_copy_class[$cmbs_class_str] = 1:
+				gs 'cheatmenu_bisets', 'cs_overwrite_class', $cmbs_class_str
+			end
+			cmd_copy_class['bmi_i'] += 1
+		if cmd_copy_class['bmi_i'] < 9: jump 'cs_overwrite_bmi_loop'
+		cmd_copy_class['str_i'] += 1
+	if cmd_copy_class['str_i'] < 18: jump 'cs_overwrite_str_loop'
+
+	gs 'cheatmenu_bisets', 'cs_main', cmd_copy_class['set']
+	killvar 'cmd_copy_class'
+end
+
+if $ARGS[0] = 'cs_overwrite_class':
+	$cheatVars[$cmd_copy_class['string'] + 'path_<<$ARGS[1]>>'] = $cmd_copy_class['path']
+	$cheatVars[$cmd_copy_class['string'] + 'desc_<<$ARGS[1]>>'] = $cmd_copy_class['desc']
+
+	cmd_copy_class['i'] = 0
+	:cs_overwrite_loop2
+		$cheatVars[$cmd_copy_class['string'] + 'img_<<$ARGS[1]>>_<<cmd_copy_class[''i'']>>'] = $cmd_copy_class['img_<<cmd_copy_class[''i'']>>']
+		cmd_copy_class['i'] += 1
+	if cmd_copy_class['i'] < cmd_copy_class['imgnums']: jump 'cs_overwrite_loop2'
+
+	if cheatVars[$cmd_copy_class['string'] + 'imgnums_<<$ARGS[1]>>'] > cmd_copy_class['imgnums']:
+		cmd_copy_class['i'] = cmd_copy_class['imgnums']
+		:cs_overwrite_loop3
+			gs 'shortgs', 'remove_array_element', '$cheatVars', $cmd_copy_class['string'] + 'img_<<$ARGS[1]>>_<<cmd_copy_class[''i'']>>'
+			cmd_copy_class['i'] += 1
+		if cmd_copy_class['i'] < cheatVars[$cmd_copy_class['string'] + 'imgnums_<<$ARGS[1]>>']: jump 'cs_overwrite_loop3'
+	end
+	cheatVars[$cmd_copy_class['string'] + 'imgnums_<<$ARGS[1]>>'] = cmd_copy_class['imgnums']
+end
+
+
+if $ARGS[0] = 'add_set':
+	*clr & cla
+	'<center><b>Body Image Set Addition</b></center>'
+	$cheatmenu['table_start']
+		act 'Go Back': killvar 'klsetask' & gs 'cheatmenu_bisets', 'main'
+		'<a href="exec:killvar ''klsetask'' & gs ''cheatmenu_bisets'', ''main''"><b>Go Back</b></a>'
+		*nl
+		'This is where you can add a new image set to a game.'
+		'To add an image set, create a folder in images/pc/body/shape/ and name it anything you want (shorter will be easier to remember). Then put in it any images you want. Once you have done that, click the link below and put in your folder name to add that set.'
+		'Note: This will only be for this instance/save of the game and you will have to redo the click the link step if you want to add the same folder to a different instance/save.'
+		*nl
+		cs_new_index = func('cheatmenu_bisets', 'get_new_set_index')
+		if cs_new_index >= 0:
+			'<a href="exec: gs ''cheatmenu_bisets'', ''add_set2'', <<cs_new_index>>">Add Image Set</a>'
+		else
+			'You cannot add more sets.'
+			'<a href="exec: gs ''cheatmenu_bisets'', ''main''"><b>Go Back</b></a>'
+		end
+		killvar 'cs_new_index'
+	$cheatmenu['table_end']
+end
+
+
+if $ARGS[0] = 'add_set2':
+	$cmd_temp_input = input("Enter folder name, do not include ''\''")
+	if $cmd_temp_input = '':
+		killvar '$cmd_temp_input'
+		gs 'cheatmenu_bisets', 'add_set'
+	else
+		if mid($cmd_temp_input, len($cmd_temp_input)) = '/' or mid($cmd_temp_input, len($cmd_temp_input)) = '\':
+			$cmd_temp_input = mid($cmd_temp_input, 1, len($cmd_temp_input)-1)
+		end
+
+		$cheatVars['fix_biset_<<ARGS[1]>>_folder'] = $cmd_temp_input
+		killvar '$cmd_temp_input'
+		killvar 'cyci1'
+
+		gs 'cheatmenu_bisets', 'cs_main', ARGS[1]
+	end
+end
+
+if $ARGS[0] = 'get_new_set_index':
+	temp_set_index = 0
+	:cs_index_find_loop
+	if $cheatVars['fix_biset_<<temp_set_index>>_folder'] ! '':
+		temp_set_index += 1
+		if temp_set_index <= 9:
+			jump 'cs_index_find_loop'
+		else
+			result = -1
+		end
+	else
+		result = temp_set_index
+	end
+	killvar 'temp_set_index'
+end
+
+if $ARGS[0] = 'import_set':
+	*clr & cla
+	killvar 'fix_bod_set'
+	'<center><b>Body Image Set Import</b></center>'
+	$cheatmenu['table_start']
+		act 'Go Back': killvar 'klsetask' & gs 'cheatmenu_bisets', 'main'
+		'<a href="exec:killvar ''klsetask'' & gs ''cheatmenu_bisets'', ''main''"><b>Go Back</b></a>'
+		*nl
+		'This is where you can import a new image set to a game.'
+
+		*nl
+		cs_new_index = func('cheatmenu_bisets', 'get_new_set_index')
+		if cs_new_index >= 0:
+			if mod_list > 0:
+				'<a href="exec: gs ''cheatmenu_bisets'', ''import_set_mod'', <<cs_new_index>>">Import from a Mod</a>'
+			end
+			'<a href="exec: gs ''cheatmenu_bisets'', ''import_set_direct'', <<cs_new_index>>">Import directly</a>'
+		else
+			'You cannot add more sets.'
+			'<a href="exec: gs ''cheatmenu_bisets'', ''main''"><b>Go Back</b></a>'
+		end
+		killvar 'cs_new_index'
+	$cheatmenu['table_end']
+end
+
+if $ARGS[0] = 'import_set_direct':
+	cmbs_import_set = ARGS[1]
+	$temp_import_text = $input('Copy the exported text here:')
+
+	if $temp_import_text ! '':
+		$temp_conform_text = $input('Do you want to continue? (y/n)')
+		if $mid($lcase($temp_conform_text), 1, 1) = 'y':
+			dynamic $temp_import_text
+			gs 'cheatmenu_bisets', 'import_custom_set', cmbs_import_set
+		end
+	end
+	killvar '$temp_conform_text'
+	killvar '$temp_import_text'
+	killvar 'cmbs_import_set'
+
+	gs 'cheatmenu_bisets', 'main'
+end
+
+if $ARGS[0] = 'import_set_mod':
+	*clr & cla
+	cmbs_import_set = ARGS[1]
+
+	$cheatmenu['table_start']
+		'<a href="exec: gs ''cheatmenu_bisets'', ''main''">Go Back</a>'
+		*nl
+		'Select a mod from which you want to try and import a image set.'
+		mod_i = 1
+		:mod_exec
+			if $mod_name[mod_i] ! '':
+				'<a href="exec: gs ''cheatmenu_bisets'', ''import_set_mod2'', <<cmbs_import_set>>, ''<<$mod_name[mod_i]>>''"><<$mod_name[mod_i]>></a>'
+			end
+			mod_i += 1
+		if mod_i <= mod_list: jump 'mod_exec'
+		killvar 'mod_i'
+	$cheatmenu['table_end']
+end
+
+if $ARGS[0] = 'import_set_mod2':
+	*clr & cla
+	cmbs_import_set = ARGS[1]
+	$cmbs_mod_name = $ARGS[2]
+
+	$cheatmenu['table_start']
+		killvar 'fix_bod_set'
+		gs 'mod_<<$cmbs_mod_name>>', 'import_body_set'
+
+		if arrsize('fix_bod_set') > 0:
+			'Image set found.'
+			'Folder: <<$fix_bod_set[''Folder'']>>'
+			if $fix_bod_set['Name'] ! '':
+				'Name: <<$fix_bod_set[''Name'']>>'
+			end
+			if $fix_bod_set['Path'] ! '':
+				'Path: <<$fix_bod_set[''Path'']>>'
+			end
+			$temp_conform_text = $input('Do you want to continue? (y/n)')
+			if $mid($lcase($temp_conform_text), 1, 1) = 'y':
+				gs 'cheatmenu_bisets', 'import_custom_set', cmbs_import_set
+			end
+		end
+	$cheatmenu['table_end']
+
+	killvar '$temp_conform_text'
+	killvar 'fix_bod_set'
+	killvar 'cmbs_import_set'
+	killvar '$cmbs_mod_name'
+
+	gs 'cheatmenu_bisets', 'main'
+end
+
+
+if $ARGS[0] = 'import_custom_set':
+	$temp_start_str = 'fix_biset_<<ARGS[1]>>_'
+	cheatVars[$temp_start_str + 'advanced'] = fix_bod_set['advanced']
+	$cheatVars[$temp_start_str + 'folder'] = $fix_bod_set['folder']
+	$cheatVars[$temp_start_str + 'path'] = $fix_bod_set['path']
+	$cheatVars[$temp_start_str + 'name'] = $fix_bod_set['name']
+
+
+	!! Classic sets
+	cmd_imp_i = 0
+	:cs_import_simple_loop
+		$cheatVars[$temp_start_str + 'img_<<cmd_imp_i>>'] = $fix_bod_set['img_<<cmd_imp_i>>']
+		$cheatVars[$temp_start_str + 'desc_<<cmd_imp_i>>'] = $fix_bod_set['desc_<<cmd_imp_i>>']
+		cmd_imp_i += 1
+	if cmd_imp_i < 9: jump 'cs_import_simple_loop'
+
+	!! Advanced sets
+	if fix_bod_set['imgnums_0000'] > 0:
+		cmd_exp_bmi = 0
+		:cs_import_adv_bmi_loop
+			cmd_exp_stren = 0
+			:cs_import_adv_str_loop
+				$cmd_class_str = $mid(10000 + cmd_exp_bmi * 100 + cmd_exp_stren, 2)
+
+				cheatVars[$temp_start_str + 'desc_<<$cmd_class_str>>'] = fix_bod_set['desc_<<$cmd_class_str>>']
+				$cheatVars[$temp_start_str + 'path_<<$cmd_class_str>>'] = $fix_bod_set['path_<<$cmd_class_str>>']
+				cmd_imgnums = fix_bod_set['imgnums_<<$cmd_class_str>>']
+				cheatVars[$temp_start_str + 'imgnums_<<$cmd_class_str>>'] = cmd_imgnums
+
+				cmd_exp_i = 0
+				:cs_import_adv_inner_loop
+					$cheatVars[$temp_start_str + 'img_<<$cmd_class_str>>_<<cmd_exp_i>>'] = $fix_bod_set['img_<<$cmd_class_str>>_<<cmd_exp_i>>']
+					cmd_exp_i += 1
+				if cmd_exp_i < cmd_imgnums: jump 'cs_import_adv_inner_loop'
+
+				cmd_exp_stren += 1
+			if cmd_exp_stren < 18: jump 'cs_import_adv_str_loop'
+			cmd_exp_bmi += 1
+		if cmd_exp_bmi < 9: jump 'cs_import_adv_bmi_loop'
+	end
+
+	killvar 'fix_bod_set'
+	killvar '$temp_start_str'
+end
+
+
+if $ARGS[0] = 'cs_set_simple':
+	cheatVars['fix_biset_<<ARGS[1]>>_advanced'] = 0
+	gs 'cheatmenu_bisets', 'cs_main', ARGS[1]
+end
+
+if $ARGS[0] = 'cs_set_advanced':
+	if cheatVars['fix_biset_<<ARGS[1]>>_imgnums_0000'] = 0:
+		gs 'cheatmenu_bisets', 'cs_init_advanced', ARGS[1]
+	end
+
+	cheatVars['fix_biset_<<ARGS[1]>>_advanced'] = 1
+	gs 'cheatmenu_bisets', 'cs_main', ARGS[1]
+end
+
+
+if $ARGS[0] = 'cs_init_advanced':
+	cmd_adv_bmi_i = 0
+	:adv_init_bmi_loop
+		cmd_adv_str_i = 0
+		:adv_init_str_loop
+			cmd_bs_class = cmd_adv_bmi_i  * 100 + cmd_adv_str_i
+			$cmd_bs_class_str = $mid(10000 + cmd_bs_class, 2)
+			cheatVars['fix_biset_<<ARGS[1]>>_imgnums_<<$cmd_bs_class_str>>'] = 1
+			cmd_adv_str_i += 1
+		if cmd_adv_str_i < 18: jump 'adv_init_str_loop'
+		cmd_adv_bmi_i += 1
+	if cmd_adv_bmi_i < 9: jump 'adv_init_bmi_loop'
+	killvar 'cmd_bs_class'
+	killvar '$cmd_bs_class_str'
+	killvar 'cmd_adv_bmi_i'
+	killvar 'cmd_adv_str_i'
+end
+
+if $ARGS[0] = 'cs_change_name':
+	temp_set = ARGS[1]
+
+	$cmd_temp_input = input('Set name')
+	if $cmd_temp_input ! '':
+		$cheatVars['fix_biset_<<temp_set>>_name'] = $cmd_temp_input
+	end
+	killvar '$cmd_temp_input'
+
+	gs 'cheatmenu_bisets', 'cs_main', temp_set
+	killvar 'temp_set'
+end
+
+if $ARGS[0] = 'cs_change_folder':
+	temp_set = ARGS[1]
+
+	$cmd_temp_input = input('Folder name')
+	if $cmd_temp_input ! '':
+		$cheatVars['fix_biset_<<temp_set>>_folder'] = $cmd_temp_input
+	end
+	killvar '$cmd_temp_input'
+
+	gs 'cheatmenu_bisets', 'cs_main', temp_set
+	killvar 'temp_set'
+end
+
+if $ARGS[0] = 'cs_change_path':
+	temp_set = ARGS[1]
+
+	$cmd_temp_input = input('Input path (i.e. images/pc/shape)')
+	if $cmd_temp_input ! '':
+		$cheatVars['fix_biset_<<temp_set>>_path'] = $cmd_temp_input
+	end
+	killvar '$cmd_temp_input'
+
+	gs 'cheatmenu_bisets', 'cs_main', temp_set
+	killvar 'temp_set'
+end
+
+if $ARGS[0] = 'cs_change_desc':
+	temp_set = ARGS[1]
+	temp_class = ARGS[2]
+
+	$cmd_temp_input = input("Enter a new descriptor")
+	if $cmd_temp_input ! '':
+		$cheatVars['fix_biset_<<temp_set>>_desc_<<temp_class>>'] = $cmd_temp_input
+		if cheatVars['fix_bi_set'] = temp_set: gs 'body', 'UpdateBodyImage'
+	end
+	killvar '$cmd_temp_input'
+
+	gs 'cheatmenu_bisets', 'cs_main', temp_set
+	killvar 'temp_set'
+end
+
+if $ARGS[0] = 'cs_change_desc_adv':
+	temp_set = ARGS[1]
+	temp_class = ARGS[2]
+	$temp_class_str = $mid(10000 + ARGS[2], 2)
+
+	$cmd_temp_input = input("Enter a new descriptor")
+	if $cmd_temp_input ! '':
+		$cheatVars['fix_biset_<<temp_set>>_desc_<<$temp_class_str>>'] = $cmd_temp_input
+		if cheatVars['fix_bi_set'] = temp_set: gs 'body', 'UpdateBodyImage'
+	end
+	killvar '$cmd_temp_input'
+
+	gs 'cheatmenu_bisets', 'cs_main_advanced2', temp_set, temp_class
+	killvar 'temp_set'
+	killvar 'temp_class'
+	killvar '$temp_class_str'
+end
+
+if $ARGS[0] = 'cs_change_subpath':
+	temp_set = ARGS[1]
+	temp_class = ARGS[2]
+	$temp_class_str = $mid(10000 + ARGS[2], 2)
+
+	$cmd_temp_input = input('Input subpath (i.e. 0_starving)')
+	if $cmd_temp_input ! '':
+		$cheatVars['fix_biset_<<temp_set>>_path_<<$temp_class_str>>'] = $cmd_temp_input
+	end
+	killvar '$cmd_temp_input'
+
+	gs 'cheatmenu_bisets', 'cs_main_advanced2', temp_set, temp_class
+	killvar 'temp_set'
+	killvar 'temp_class'
+	killvar '$temp_class_str'
+end
+
+if $ARGS[0] = 'cs_change_preg_subpath':
+	temp_set = ARGS[1]
+	preg_set = ARGS[2]
+
+	$cmd_temp_input = input('Input subpath (i.e. 0_starving)')
+	if $cmd_temp_input ! '':
+		$cheatVars['fix_biset_<<temp_set>>_pregpath_<<preg_set>>'] = $cmd_temp_input
+	end
+	killvar '$cmd_temp_input'
+
+	gs 'cheatmenu_bisets', 'get_pregset_link', temp_set, preg_set
+	killvar 'temp_set'
+	killvar 'preg_set'
+end
+
+
+if $ARGS[0] = 'cs_change_img':
+	temp_set = ARGS[1]
+	temp_class = ARGS[2]
+
+	$cmd_temp_input = input("Enter a new image name (Leave empty to not change the image. Example: 1). Exclude the '.jpg'")
+	if $cmd_temp_input ! '':
+		if mid($cmd_temp_input, len($cmd_temp_input)-3) = '.jpg':
+			$cmd_temp_input = mid($cmd_temp_input, 1, len($cmd_temp_input)-4)
+		end
+		$cheatVars['fix_biset_<<temp_set>>_img_<<temp_class>>'] = $cmd_temp_input
+		if cheatVars['fix_bi_set'] = temp_set: gs 'body', 'UpdateBodyImage'
+	end
+	killvar '$cmd_temp_input'
+
+	gs 'cheatmenu_bisets', 'cs_main', temp_set
+	killvar 'temp_set'
+	killvar 'temp_class'
+end
+
+if $ARGS[0] = 'cs_change_img_adv':
+	temp_set = ARGS[1]
+	temp_class = ARGS[2]
+	temp_img_num = ARGS[3]
+	$temp_class_str = $mid(10000 + ARGS[2], 2)
+
+	$cmd_temp_input = input("Enter a new image name (Leave empty to not change the image. Example: 1). Exclude the '.jpg'")
+	if $cmd_temp_input ! '':
+		if mid($cmd_temp_input, len($cmd_temp_input)-3) = '.jpg':
+			$cmd_temp_input = mid($cmd_temp_input, 1, len($cmd_temp_input)-4)
+		end
+		$cheatVars['fix_biset_<<temp_set>>_img_<<$temp_class_str>>_<<temp_img_num>>'] = $cmd_temp_input
+		if cheatVars['fix_bi_set'] = temp_set: gs 'body', 'UpdateBodyImage'
+	end
+	killvar '$cmd_temp_input'
+
+	gs 'cheatmenu_bisets', 'cs_main_advanced2', temp_set, temp_class
+	killvar 'temp_set'
+	killvar 'temp_class'
+	killvar 'temp_img_num'
+	killvar '$temp_class_str'
+end
+
+if $ARGS[0] = 'cs_add_img':
+	temp_set = ARGS[1]
+	temp_class = ARGS[2]
+	$temp_class_str = $mid(10000 + ARGS[2], 2)
+
+	$cmd_temp_input = input("Enter a new image name (Leave empty to use default image. Example: 1). Exclude the '.jpg'")
+	if $mid($cmd_temp_input, len($cmd_temp_input)-3) = '.jpg':
+		$cmd_temp_input = mid($cmd_temp_input, 1, len($cmd_temp_input)-4)
+	end
+	temp_new_img_index = cheatVars['fix_biset_<<temp_set>>_imgnums_<<$temp_class_str>>']
+	cheatVars['fix_biset_<<temp_set>>_imgnums_<<$temp_class_str>>'] += 1
+	$cheatVars['fix_biset_<<temp_set>>_img_<<$temp_class_str>>_<<temp_new_img_index>>'] = $cmd_temp_input
+	if cheatVars['fix_bi_set'] = temp_set: gs 'body', 'UpdateBodyImage'
+	killvar 'temp_new_img_index'
+	killvar '$cmd_temp_input'
+	killvar '$temp_class_str'
+
+	gs 'cheatmenu_bisets', 'cs_main_advanced2', temp_set, temp_class
+	killvar 'temp_set'
+	killvar 'temp_class'
+end
+
+if $ARGS[0] = 'cs_remove_img':
+	temp_set = ARGS[1]
+	temp_class = ARGS[2]
+	temp_img_num = ARGS[3]
+	$temp_class_str = $mid(10000 + ARGS[2], 2)
+
+	if temp_img_num < cheatVars['fix_biset_<<temp_set>>_imgnums_<<$temp_class_str>>'] and cheatVars['fix_biset_<<temp_set>>_imgnums_<<$temp_class_str>>'] > 1:
+		cmd_new_index = temp_img_num
+		:cs_remove_img_loop
+		if cmd_new_index + 1 < cheatVars['fix_biset_<<temp_set>>_imgnums_<<$temp_class_str>>']:
+			$cheatVars['fix_biset_<<temp_set>>_img_<<$temp_class_str>>_<<cmd_new_index>>'] = $cheatVars['fix_biset_<<temp_set>>_img_<<$temp_class_str>>_<<cmd_new_index+1>>']
+			cmd_new_index += 1
+			jump 'cs_remove_img_loop'
+		end
+
+		!Due to the construction above, we have
+		!cmd_new_index = cheatVars['fix_biset_<<temp_set>>_imgnums_<<$temp_class_str>>']
+		gs 'shortgs', 'remove_array_element', '$cheatVars', 'fix_biset_<<temp_set>>_img_<<$temp_class_str>>_<<cmd_new_index>>'
+		cheatVars['fix_biset_<<temp_set>>_imgnums_<<$temp_class_str>>'] -= 1
+	end
+
+	gs 'cheatmenu_bisets', 'cs_main_advanced2', temp_set, temp_class
+	killvar 'temp_set'
+	killvar 'temp_class'
+	killvar 'temp_img_num'
+end
+
+
+if $ARGS[0] = 'cs_set_default_img':
+	$cheatVars['fix_biset_<<ARGS[1]>>_img_<<$mid(10000 + ARGS[2], 2)>>'] = ''
+	gs 'cheatmenu_bisets', 'cs_main', ARGS[1]
+end
+
+if $ARGS[0] = 'cs_set_default_img_adv':
+	$cheatVars['fix_biset_<<ARGS[1]>>_img_<<$mid(10000 + ARGS[2], 2)>>_<<ARGS[3]>>'] = ''
+	gs 'cheatmenu_bisets', 'cs_main_advanced2', ARGS[1], ARGS[2]
+end
+
+if $ARGS[0] = 'cs_set_default_desc':
+	$cheatVars['fix_biset_<<ARGS[1]>>_desc_<<$mid(10000 + ARGS[2], 2)>>'] = ''
+	gs 'cheatmenu_bisets', 'cs_main', ARGS[1]
+end
+
+if $ARGS[0] = 'cs_set_default_desc_adv':
+	$cheatVars['fix_biset_<<ARGS[1]>>_desc_<<$mid(10000 + ARGS[2], 2)>>'] = ''
+	gs 'cheatmenu_bisets', 'cs_main_advanced2', ARGS[1], ARGS[2]
+end
+
+if $ARGS[0] = 'cs_delete_set':
+	*clr & cla
+	'<center><b>Body Image Set Removal</b></center>'
+	$cheatmenu['table_start']
+		'<a href="exec: killvar ''klsetask'' & gs ''cheatmenu_bisets'', ''cs_main'', <<ARGS[1]>>"><b>Go Back</b></a>'
+		*nl
+		'This is where you remove a body image set from use, please note it does not delete anything, it just clears the custom set from this game instance/save.'
+		if klsetask = 1:
+			'<a href="exec:klsetask = 2 & gs ''cheatmenu_bisets'', ''cs_delete_set'', <<ARGS[1]>>"><b>Are you sure you want to remove set <<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>?</b></a>'
+		elseif klsetask = 2:
+			if cheatVars['fix_bodyimg'] = 1 and cheatVars['fix_bi_set'] = ARGS[1]: cheatVars['fix_bodyimg'] = 0 & cheatVars['fix_bi_set'] = 0
+
+			gs 'cheatmenu_bisets', 'cs_delete_set2', ARGS[1]
+
+			killvar 'klsetask'
+			gs 'cheatmenu_bisets', 'main'
+		else
+			'<a href="exec: klsetask = 1 & gs ''cheatmenu_bisets'', ''cs_delete_set'', <<ARGS[1]>>">Remove set <<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>?</a>'
+		end
+	$cheatmenu['table_end']
+end
+
+if $ARGS[0] = 'cs_delete_set2':
+	$cmbs_text = 'fix_biset_<<ARGS[1]>>_'
+
+	cmbs_bmi_i = 0
+	:del_bodimgset_loop
+		gs 'shortgs', 'remove_array_element', 'cheatVars', $cmbs_text + 'img_<<cmbs_i>>'
+		gs 'shortgs', 'remove_array_element', 'cheatVars', $cmbs_text + 'desc_<<cmbs_i>>'
+		cmbs_i += 1
+	if cmbs_i < 9: jump 'del_bodimgset_loop'
+
+	cmbs_bmi = 0
+	:del_bodimgset_bmi_loop
+		cmbs_stren = 0
+		:del_bodimgset_stren_loop
+			$cmbs_class_str = $mid(10000 + cmbs_bmi * 100 + cmbs_stren, 2)
+			gs 'shortgs', 'remove_array_element', 'cheatVars', $cmbs_text + 'desc_<<$cmbs_class_str>>'
+			gs 'shortgs', 'remove_array_element', 'cheatVars', $cmbs_text + 'path_<<$cmbs_class_str>>'
+
+			cmbs_i = 0
+			:del_bodimgset_img_loop
+				gs 'shortgs', 'remove_array_element', 'cheatVars', $cmbs_text + 'img_<<$cmbs_class_str>>_<<cmbs_i>>'
+				cmbs_i += 1
+			if cmbs_i < cheatVars[$cmbs_text + 'imgnums_<<$cmbs_class_str>>']: jump 'del_bodimgset_img_loop'
+			gs 'shortgs', 'remove_array_element', 'cheatVars', $cmbs_text + 'imgnums_<<$cmbs_class_str>>'
+
+			cmbs_stren += 1
+		if cmbs_stren < 18: jump 'del_bodimgset_stren_loop'
+		cmbs_bmi += 1
+	if cmbs_bmi < 9: jump 'del_bodimgset_bmi_loop'
+
+	gs 'shortgs', 'remove_array_element', 'cheatVars', $cmbs_text + 'folder'
+	gs 'shortgs', 'remove_array_element', 'cheatVars', $cmbs_text + 'path'
+	gs 'shortgs', 'remove_array_element', 'cheatVars', $cmbs_text + 'name'
+
+	killvar 'cmbs_bmi'
+	killvar 'cmbs_stren'
+	killvar 'cmbs_i'
+	killvar '$cmbs_class_str'
+	killvar '$cmbs_text'
+end
+
+
+if $ARGS[0] = 'cs_get_default_img':
+	if cheatVars['fix_biset_<<ARGS[1]>>_advanced'] = 0:
+		ARGS[2] *= 100
+	end
+
+	$result = func('body_structure', 'body_img_from_class', ARGS[2])
+end
+
+if $ARGS[0] = 'cs_get_default_desc':
+	if cheatVars['fix_biset_<<ARGS[1]>>_advanced'] = 0:
+		ARGS[2] *= 100
+	end
+
+	$result = func('body_structure', 'body_desc_from_class', ARGS[2])
+end
+
+if $ARGS[0] = 'cs_get_default_subpath':
+	$result = func('body_structure', 'body_img_path_from_class', ARGS[2])
+end
+
+
+if $ARGS[0] = 'mods_how_to':
+	*clr & cla
+	act 'Go Back': gs 'cheatmenu_bisets', 'main'
+	$cheatmenu['table_start']
+		'How do you add the option to import an image set to a mod?'
+		'It''s fairly simple:'
+		'    1. Build the image set in game, using the correct folders, names, paths, etc.'
+		'    2. Click on the "Export Image Set" button.'
+		'    3. Copy the displayed code.'
+		'    4. When the main mod''s location (''mod_name'') is called with $ARGS[0] = ''import_body_set'' execute that code.'
+	$cheatmenu['table_end']
+end
+
+--- cheatmenu_bisets -------------------------------

+ 10 - 10
locations/chessplay.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'expfame':
 end
 
 if $ARGS[0] = 'game':
-	
+
 	chess_move += 1
 	chess_time = rand(1,3)
 	minut += chess_time
@@ -96,7 +96,7 @@ if $ARGS[0] = 'game':
 		'Stalemate! You have drawn the match against '+$chess_name+'!'
 		'You and '+$chess_name+' could not find a way to win the match.'
 		gs 'chessplay', 'expfame', 1
-		
+
 		act 'Return': gt 'kruchess'
 	elseif chess_GG <= 0:
 		*clr & cla
@@ -104,8 +104,8 @@ if $ARGS[0] = 'game':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/lose' + rand(1,1) + '.jpg"></center>'
 		*nl
 		'Checkmate! You have lost the match against '+$chess_name+'!'
-		gs 'chessplay', 'fame', 0
-		
+		gs 'chessplay', 'expfame', 0
+
 		act 'Return': gt 'kruchess'
 	elseif chess_com <= 0:
 		*clr & cla
@@ -115,7 +115,7 @@ if $ARGS[0] = 'game':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/win' + rand(1,1) + '.jpg"></center>'
 		*nl
 		'Checkmate! You have won the match against '+$chess_name+'!'
-		gs 'chessplay', 'fame', 2
+		gs 'chessplay', 'expfame', 2
 
 		act 'Return': gt 'kruchess'
 	elseif chess_moves >= chess_move_limit:
@@ -125,7 +125,7 @@ if $ARGS[0] = 'game':
 		*nl
 		'Draw! You agree to end the match with '+$chess_name+'.'
 		'You and '+$chess_name+' have both used too many moves and neither could find a way to win the match.'
-		gs 'chessplay', 'fame', 1
+		gs 'chessplay', 'expfame', 1
 
 		act 'Return': gt 'kruchess'
 	elseif total_chess_time >= chess_time_limit:
@@ -135,7 +135,7 @@ if $ARGS[0] = 'game':
 		*nl
 		'Draw! You agree to end the match with '+$chess_name+'.'
 		'You and '+$chess_name+' have both used too much time and neither could find a way to win the match.'
-		gs 'chessplay', 'fame', 1
+		gs 'chessplay', 'expfame', 1
 
 		act 'Return': gt 'kruchess'
 	else
@@ -241,7 +241,7 @@ if $ARGS[0] = 'moves':
 		*nl
 		'You are on move '+str(chess_move)+' out of '+str(chess_move_limit)
 		'You are on minute '+str(total_chess_time)+' out of '+str(chess_time_limit)
-		
+
 		chess_GG -= 1
 		chess_com -= 1
 
@@ -461,7 +461,7 @@ if $ARGS[0] = 'advantage':
 	elseif $ARGS[1] = 'tactical' or $ARGS[1] = 'trap':
 		chess_pos = 1
 		chess_neg = -1
-		chess_adv = 1	
+		chess_adv = 1
 	end
 
 	if $ARGS[2] = 'good':
@@ -484,7 +484,7 @@ if $ARGS[0] = 'advantage':
 			chess_GG = chess_GG - chess_adv - chess_diff
 			chess_com = chess_com + chess_adv + chess_diff
 		elseif chess_ind < chess_neg:
-			'You are more skilled than your opponent and prevent them from capitalizing on their advantage.'			
+			'You are more skilled than your opponent and prevent them from capitalizing on their advantage.'
 		else
 			'You are about equally skilled as your opponent and you lose some advantage.'
 			chess_GG = chess_GG - chess_adv/2 - chess_diff/2

+ 1 - 0
locations/cikl.qsrc

@@ -1123,6 +1123,7 @@ if week = 1:
 
 	!! Reset therapist schedule
 	killvar 'therapist_weekly_block'
+
 elseif week = 7:
 	gs 'newspaper', 'cikl'
 end

+ 0 - 49
locations/city_canal.qsrc

@@ -1,49 +0,0 @@
-# city_canal
-!! Date Created: 14th May, 2024
-!! Modified date: 
-!! Version: .01 - initial release
-!! Author: Hooded Silence
-!!
-!! St Petersburg Canals
-!!
-!! Sub-location in St Petersburg for dates, boat rides and other events
-
-if $args[0] = 'init':
-    img_sel = rand(1,2)
-    if daystage = 2 or daystage = 3:
-        $setloc['StageImage'] =  'city_canals_day_<<img_sel>>'
-    else
-        $setloc['StageImage'] =  'city_canals_night_<<img_sel>>'
-    end
-    killvar img_sel
-end
-
-if $args[0] = 'content':
-    !! Main location content.
-
-    *clr & cla
-	$setloc['StageTitle'] = 'St Petersburg Canals'
-    gs 'city_canal', 'init'
-	$location_type = 'public_outdoors'
-	gs 'shortgs', 'setloc', 'city_canals', $ARGS[0]
-	gs 'stat'
-	gs 'core_library', 'stage_title'
-
-
-    'You stand gazing at the famous Canals of the North, the hustle and bustle of people on the streets against a backdrop of elegant Russian buildings. You see boatmen plying their trade on the waters below and working on their tour boats.'
-
-    !! Navigation
-
-    act 'Head to the Arts district': msg 'not implented' & gt 'city_canal', 'content'
-    act 'Take a boat trip (100)': msg 'not implented' & gt 'city_canal', 'content'
-    act 'Take the boats to Vasily Island (50)': msg 'not implented' & gt 'city_canal', 'content'
-
-end
-
-if $args[0] = 'dates':
-    !! For all date related activities.
-
-end
-
-
---- city_canal ---------------------------------

+ 46 - 3
locations/city_canals.qsrc

@@ -1,6 +1,49 @@
 # city_canals
-
+!! Date Created: 14th May, 2024
+!! Modified date:
+!! Version: .01 - initial release
 !! Author: Hooded Silence
-!! Date and meeting spot at the St Petersburg Canals
+!!
+!! St Petersburg Canals
+!!
+!! Sub-location in St Petersburg for dates, boat rides and other events
+
+if $args[0] = 'init':
+    img_sel = rand(1,2)
+    if daystage = 2 or daystage = 3:
+        $setloc['StageImage'] =  'city_canals_day_<<img_sel>>'
+    else
+        $setloc['StageImage'] =  'city_canals_night_<<img_sel>>'
+    end
+    killvar img_sel
+end
+
+if $args[0] = 'content':
+    !! Main location content.
+
+    *clr & cla
+	$setloc['StageTitle'] = 'St Petersburg Canals'
+    gs 'city_canal', 'init'
+	$location_type = 'public_outdoors'
+	gs 'shortgs', 'setloc', 'city_canals', $ARGS[0]
+	gs 'stat'
+	gs 'core_library', 'stage_title'
+
+
+    'You stand gazing at the famous Canals of the North, the hustle and bustle of people on the streets against a backdrop of elegant Russian buildings. You see boatmen plying their trade on the waters below and working on their tour boats.'
+
+    !! Navigation
+
+    act 'Head to the Arts district': msg 'not implented' & gt 'city_canal', 'content'
+    act 'Take a boat trip (100)': msg 'not implented' & gt 'city_canal', 'content'
+    act 'Take the boats to Vasily Island (50)': msg 'not implented' & gt 'city_canal', 'content'
+
+end
+
+if $args[0] = 'dates':
+    !! For all date related activities.
+
+end
+
 
---- city_canals ---------------------------------
+--- city_canals ---------------------------------

+ 2 - 3
locations/city_commcenter.qsrc

@@ -60,8 +60,8 @@ if $ARGS[0] = 'lessons':
 	'<center><b>The Vladimir Lenin community center</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/community/dk1.jpg"></center>'
 	*nl
-	'Vladimir Lenin is open from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' through to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' on weekdays, and closed on weekends.
-	 It''s available to teach essential life skills such as driving, life coaching or finding new job skills this is the place to learn. '
+	'Vladimir Lenin is open from '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' through to '+func('time', 'get_time_string', 17, 0, cheatVars['time_format'])+' on weekdays, and closed on weekends.'
+	'It''s available to teach essential life skills such as driving, life coaching or finding new job skills this is the place to learn. '
 	*nl
 	'<B><center>Currently available courses:</center></B>'
 	'<center>'
@@ -385,4 +385,3 @@ if $ARGS[0] = 'singingtutor':
 end
 
 --- city_commcenter ---------------------------------
-

+ 2 - 2
locations/city_experimental_trials_events.qsrc

@@ -62,14 +62,14 @@ elseif $experimentQW['trial_active'] = 'pill_red':
 			stren_mem -= 2 * (stren_xpnxt - stren_xpprv)
 		end
 
-		'You seem to have lost a lot of mussle mass and feel weaker. This must have been that experimental pill you took.'
+		'You seem to have lost a lot of muscle mass and feel weaker. This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 2:
 		if stren_lvl < 99:
 			stren_exp += 2 * (stren_xpnxt - stren_xpprv)
 		end
 
-		'You seem to have gained a lot of mussle mass and feel stronger! This must have been that experimental pill you took.'
+		'You seem to have gained a lot of muscle mass and feel stronger! This must have been that experimental pill you took.'
 
 	elseif experimentQW['random_option'] = 3:
 		if agil_lvl > 11:

+ 21 - 21
locations/city_experimental_trials_pharmacy.qsrc

@@ -1,27 +1,27 @@
 # city_experimental_trials_pharmacy
 
 if $ARGS[0] = 'counter':
-		'<center><B><font color="maroon">Experimental Pharmacy</font></B></center>'
-		if rand(0, 1) = 0:
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pharmacist1.jpg"></center>'
-			*nl
-			'You approach the pharmacy front desk. The older pharmacist behind the counter looks up at you and gives you a smile.'
-			'"How can I help you?"'
-		else
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pharmacist2.jpg"></center>'
-			*nl
-			'You approach the pharmacy front desk. The middle aged pharmacist behind the counter looks up at you and smiles.'
-			'"How can I help you".'
-		end
+	'<center><B><font color="maroon">Experimental Pharmacy</font></B></center>'
+	if rand(0, 1) = 0:
+		'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pharmacist1.jpg"></center>'
 		*nl
-
-		if experimentQW['times_participated_1'] = 0 and experimentQW['times_participated_2'] = 0 and experimentQW['times_participated_3'] = 0 and experimentQW['times_participated_4'] = 0 and experimentQW['times_participated_5'] = 0:
-			'"If any of our experimental trials lead to a breakthrough, we will sell the medicine those trials produced here. Currently all of our trials are ongoing so there''s nothing in stock, do check back later. Sign up for a trial, if you want to help us develop medicine for the future."'
-		else
-			act 'Buy something': gt 'city_experimental_trials_pharmacy', 'cart'
-		end
-
-		act 'Go back to the front desk': gt 'city_experimental_trials', 'front_desk'
+		'You approach the pharmacy front desk. The older pharmacist behind the counter looks up at you and gives you a smile.'
+		'"How can I help you?"'
+	else
+		'<center><img <<$set_imgh>> src="images\locations\city\residential\clinic\experiments\pharmacist2.jpg"></center>'
+		*nl
+		'You approach the pharmacy front desk. The middle aged pharmacist behind the counter looks up at you and smiles.'
+		'"How can I help you".'
+	end
+	*nl
+
+	if experimentQW['times_participated_1'] = 0 and experimentQW['times_participated_2'] = 0 and experimentQW['times_participated_3'] = 0 and experimentQW['times_participated_4'] = 0:
+		'"If any of our experimental trials lead to a breakthrough, we will sell the medicine those trials produced here. Currently all of our trials are ongoing so there''s nothing in stock, do check back later. Sign up for a trial, if you want to help us develop medicine for the future."'
+	else
+		act 'Buy something': gt 'city_experimental_trials_pharmacy', 'cart'
+	end
+
+	act 'Go back to the front desk': gt 'city_experimental_trials', 'front_desk'
 end
 
 
@@ -34,7 +34,7 @@ if $ARGS[0] = 'cart':
 	gs 'themes', 'indoors'
 	gs 'stat'
 
-	act 'Exit shopping cart': gt 'city_experimental_trials_pharmacy', 'counter'
+	act 'Exit shopping cart': gs 'item_cart', 'shopping_var_clear' & gt 'city_experimental_trials_pharmacy', 'counter'
 end
 
 --- city_experimental_trials_pharmacy ---------------------------------

+ 1 - 0
locations/city_house_res_kitch.qsrc

@@ -54,6 +54,7 @@ if $ARGS[0] = 'kitch':
 	dynamic $dritea
 	dynamic $fill_bottle
 	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin

+ 3 - 3
locations/city_jorahouse.qsrc

@@ -207,7 +207,7 @@ if $ARGS[0] = 'ev13':
 	act 'Continue':
 		cla
 		*clr
-		'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof10.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/body/cum/creampie/cumpussy3.jpg"></center>'
 		dynamic $vagend
 		'You get dressed and get ready to go home.'
 		'Jora hands you money, "Earned yourself a crumb."'
@@ -314,7 +314,7 @@ if $ARGS[0] = 'ev 16':
 	act 'Continue':
 		cla
 		*clr
-		'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof10.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/body/cum/creampie/cumpussy3.jpg"></center>'
 		dynamic $vagend
 		'You get dressed and get ready to go home.'
 		'Seymon hands you money, "Earned yourself a crumb."'
@@ -836,7 +836,7 @@ if $ARGS[0] = 'ev38':
 	*clr
 	gs 'cum_manage'
 	money += 500
-	'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof10.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/body/cum/creampie/cumpussy3.jpg"></center>'
 	'Relying on good instinct, just as he peaks, you switch his cock from your ass to your vagina.'
 	'Fine, but if you have a kid it''s not mine." Says the boss.'
 	gs 'arousal', 'vaginal', 5, 'sub'

+ 1 - 1
locations/city_mansion_residence_1.qsrc

@@ -212,7 +212,7 @@ if $ARGS[0] = 'ykitchen':
 		dynamic $dritea
 		dynamic $fill_bottle
 		dynamic $edaD
-		dynamic $mc_inventory['food_biscuits']
+		dynamic $pranik
 		dynamic $fatdel
 		dynamic $lekarstvo
 		dynamic $vitamin

+ 1 - 1
locations/city_park.qsrc

@@ -222,7 +222,7 @@ if $ARGS[0] = 'luna':
 	*nl
 	'Opening hours are '+func('time', 'get_time_string', 9, 0, cheatVars['time_format'])+' to '+func('time', 'get_time_string', 21, 0, cheatVars['time_format'])+''
 
-	if vladimirQW['stage'] = 0 and hour >= 9 and hour <= 20 and week > 5 and pcs_apprnc > 40:'<a href="exec:gt ''vladimirQW_loc''">There''s a strong looking man staring at you from the fences.</a>.'
+	if vladimirQW['stage'] = 0 and hour >= 9 and hour <= 20 and week > 5 and pcs_hotcat >= 6:'<a href="exec:gt ''vladimirQW_loc''">There''s a strong looking man staring at you from the fences.</a>.'
 
 	act 'Go back to the park':gt 'city_park', 'start'
 

+ 2 - 2
locations/city_redlight.qsrc

@@ -25,9 +25,9 @@ if $ARGS[0] = 'start':
 	'<center><b>Red Light District</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/redlight.jpg"></center>'
 
-	'This small area inside the Industrial District is home to a number of strip clubs and sex shops.'
+	'This small area inside the Industrial District is home to strip clubs, adult stores and other seedy businesses.'
 	if hour >= 18 or hour < 3:
-		'The bright lights and booming music of the <a href="exec:gt ''stripclub'', ''start''">Fuzzy Dice</a> strip club attract men from all over the city.'
+		'The bright lights and booming music of the <a href="exec:gt ''stripclub'', ''start''">Golden Girls</a> strip club attract men from all over the city.'
 	else
 		'The strip club is closed for the day and will reopen at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+'.'
 	end

+ 1 - 3
locations/clinic_functions.qsrc

@@ -759,6 +759,4 @@ if $ARGS[0] = 'bImplantB':
 	act 'Continue': gt $loc, $loc_arg
 end
 
-
-
---- clinic_functions ---------------------------------------
+--- clinic_functions ---------------------------------

+ 7 - 3
locations/clothing.qsrc

@@ -217,15 +217,19 @@ end
 
 if $ARGS[0] = 'qrepair':
 	*clr
-	if rand (1, 100) < 30:
+	minut += 30
+	temp_rand = rand(0, 99)
+	if temp_rand < pcs_sewng / 4:
 		mc_inventory['sewing_fabric'] -= 1
-		minut += 30
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] += 30'
+	elseif temp_rand < pcs_sewng / 2:
+		mc_inventory['sewing_fabric'] -= 1
+		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] += 15'
 	else
 		mc_inventory['sewing_fabric'] += 3
-		minut += 30
 		dynamic $ARGS[2] + '[<<ARGS[3]>>] = 0'
 	end
+	killvar 'temp_rand'
 	gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 end
 

+ 1 - 1
locations/costuming.qsrc

@@ -303,7 +303,7 @@ if $ARGS[0] = 'panty_costume':
 			act'Blush hard':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/studio/costuming/makeup.jpg"></center>'
-				'Your face flushes with heat as it turns beet red but otherwise don''t say anything while she rummages aroundin a drawer to find you an appropriate pair of panties to put on. She hands them to you, sternly saying, "Remember to return these," before walking away shaking her head.'
+				'Your face flushes with heat as it turns beet red but otherwise don''t say anything while she rummages around in a drawer to find you an appropriate pair of panties to put on. She hands them to you, sternly saying, "Remember to return these," before walking away shaking her head.'
 				act 'Back to makeup': gt 'costuming', 'costume_end'
 			end
 			act'Smile shyly':

+ 590 - 0
locations/court_arrest_events.qsrc

@@ -0,0 +1,590 @@
+# court_arrest_events
+
+
+	!!===================================================================!!
+	!!                                                                   !!
+	!!                            PRE-BOOKING                            !!
+	!!                                                                   !!
+	!!===================================================================!!
+
+
+if $ARGS[0] = 'booking_start':
+	if $ARGS[1] = 'shplft' or $ARGS[1] = 'shoplift':
+		gs 'court_functions', 'arrest_for', 'shoplift'
+		temp_tot_arrests = func('court_functions', 'get_total_arrests')
+
+		if temp_tot_arrests = 1:
+			!!a gosub on purpose!!
+			gs 'court_arrest_events', 'first_shoplift'
+		elseif temp_tot_arrests < 6:
+			gt 'court_arrest_events', 'repeat'
+		elseif temp_tot_arrests < 11:
+			gt 'court_arrest_events', 'multiple'
+		else
+			gt 'court_arrest_events', 'regular'
+		end
+
+	elseif $ARGS[1] = 'prst' or $ARGS[1] = 'prostitution':
+		gs 'court_functions', 'arrest_for', 'prostitution'
+		temp_tot_arrests = func('court_functions', 'get_total_arrests')
+
+		if temp_tot_arrests = 1:
+			!!a gosub on purpose!!
+			gs 'court_arrest_events', 'first_prostitution'
+		elseif temp_tot_arrests < 6:
+			gt 'court_arrest_events', 'repeat'
+		elseif temp_tot_arrests < 11:
+			gt 'court_arrest_events', 'multiple'
+		else
+			gt 'court_arrest_events', 'regular'
+		end
+	end
+end
+
+if $ARGS[0] = 'booking_end':
+	gt 'police_station', 'booking'
+end
+
+
+	!!-------------------------------------------------------------------!!
+	!!                         PRE-BOOKING EVENTS                        !!
+	!!-------------------------------------------------------------------!!
+
+
+if $ARGS[0] = 'first_shoplift':
+	cla
+	minut += 2
+	gs 'pain', 2, 'armR', 'pinch'
+	gs 'stat'
+
+	if policeQW['toldonguard'] = 2:
+		!! if had sex with the security guard but still got arrested
+		'"I''m not lying, that security guard forced me to have sex with him! Why won''t you believe me?" you plead, but it does you no good.'
+		'The officer sighs, "You think you''re the first to try that? I''ve heard it all from you thieving little whores. You''re not the victim here!"'
+		*nl
+		'With a dejected whimper, you look down to the floor as you''re led further into the station to be booked.'
+
+	elseif grupTipe = 4:
+		'"Security over at the mall caught a wild one today. This little bitch tried to bite me as I was bringing her in!"'
+		'The others shake their head as he leads you further inside the police station.'
+		*nl
+		'"Wow, you''re real tough, manhandling a girl barely half your size," you hiss.'
+		'"You think this is being too rough? I can show you a thing or two about real pain," he threatens.'
+
+	elseif pcs_hotcat >= 7:
+		'"Look who was caught stealing by the security guys at the mall! I guess being pretty can''t get you everything you want," he says with a cruel laugh.'
+		'Most of officers just grin and laugh, but you hear a few make crude comments as you''re led further inside the police station.'
+		*nl
+		'"Hey, you''re hurting my arm!" you whine. "Could you please loosen up? It''s not like I''m going to try to run!"'
+		'"Being pretty isn''t going to get you any special treatment, girly. You''re a criminal, just like everyone else brought through here," he spits back.'
+
+	elseif pcs_hotcat <= 3:
+		'"You''ll never guess what she was brought in for!" he laughs. "Security at the mall caught this one trying to steal beauty products. You can put makeup on a pig but it''ll still be a pig!"'
+		'The others laugh loudly as he leads you further inside the police station.'
+		*nl
+		'"Hey, you''re hurting my arm!" you whine. "Could you please loosen up? It''s not like I''m going to try to run!"'
+		'"What were you thinking stealing make-up?" he asks, ignoring your pleas. "It wouldn''t do you a damn bit of good. You''d still look like you were hit with a brick!"'
+
+	else
+		!if plain looking
+		'"The security guys over at the mall caught this little mouse trying to steal some stuff. I guess looks can be deceiving; I would have never thought she''d be the type."'
+		'Some of the other officers just shrug or click their tongue disapprovingly before he leads you deeper inside the police station.'
+		*nl
+		'"Hey, you''re hurting my arm!" you whine. "Could you please loosen up? It''s not like I''m going to try to run!"'
+		'"Oh, don''t like the way I''m treating you, little mouse? Well, you should have thought about that before trying to play thief!" he spits back.'
+	end
+
+	act 'Continue further in': gt 'court_arrest_events', 'booking_end'
+end
+
+
+if $ARGS[0] = 'first_prostitution':
+	minut += 2
+	gs 'pain', 2, 'armR', 'pinch'
+	gs 'stat'
+
+	if policeQW['prostitution_bribe'] = 1:
+		if pcs_hotcat <= 3:
+			!else if ugly and bribed the officer with sex
+			'"I caught this one whoring herself out and you know what she tried to do? She tried to bribe me with sex!"'
+			'The others shake their head, "What was she thinking? No one would fuck someone as ugly as her!"'
+			'You hang your head in shame as you''re led further into the station for booking.'
+
+		elseif pcs_hotcat >= 7:
+			!else if beautiful and bribed the officer with sex
+			'"I caught this one whoring herself out and you know what she tried to do? She tried to bribe me with sex!"'
+			'The other officers eye you hungrily, "You''re a better man than me!" one of them exclaim. "Just look at her, how often do you get a chance like that? I would have said yes!"'
+			'A small smile plays across your face, feeling a tiny bit flattered as you''re led further into the station to get booked.'
+
+		else
+			!else if plain and bribed the officer with sex
+			'"I caught this one whoring herself out and you know what she tried to do? She tried to bribe me with sex!"'
+			'The others jokingly say, "Well, she doesn''t look that bad. I wouldn''t have agreed, but I can see it working on someone else..."'
+			'You frown at their rude remarks, but remain silent as you''re led further into the station to be booked.'
+		end
+
+	else
+		if pcs_hotcat <= 3:
+			!Prostitute event, this will be an continuation to the prostitute events that happened earlier
+			!if ugly
+			'"I caught this one whoring herself out. Can you believe that? Who would ever want to fuck this pig?!" he exclaims, and the staff erupt with laughter.'
+			'"What was she thinking? Honestly, you''ve done everyone a favor getting her off the streets," says one of the officers before you''re led further into the station.'
+
+		elseif pcs_hotcat >= 7:
+			!else if beautiful
+			'"I caught this one whoring herself out on the street corner. Such a waste," he turns to you and shakes his head. "A hot thing like you could shack up with some rich guy and leech off him, but I guess that''s not enough for a cock hungry whore like you, huh? One just ain''t enough."'
+			*nl
+			'The other officers laugh cruelly. "It really is a shame, just look at her-- she''s damn gorgeous. You must have some real issues to be selling yourself to strangers."'
+			*nl
+			'"I''m sure the money is great!" The officer holding you laughs loudly as he leads you further inside the police station.'
+
+		else
+			!else if plain
+			'"I caught this one whoring herself out. She ain''t bad looking, but you know she''s not making money like those other girls," he says with a disappointing click of the tongue'
+			'The other officers shrug and shake their heads. "Probably some cheap bastards out there that can''t afford to be picky," one speaks up as you''re led further into the station.'
+		end
+	end
+
+	act 'Continue further in': gt 'court_arrest_events', 'booking_end'
+end
+
+
+
+if $ARGS[0] = 'repeat':
+	minut += 2
+	gs 'pain', 2, 'armR', 'pinch'
+	gs 'stat'
+
+	police_event = rand(1, 5)
+	!else repeat offender, the looks doesn''t matter only the variable that you''re being booked again
+	!randomized events
+	if police_event = 1:
+		'"Look who''s back! She just couldn''t stay out of trouble."'
+		'The others smile and shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 2:
+		'"She really likes getting in trouble! Must be the good food that is served here."'
+		'The others laugh and shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 3:
+		'"Look who I brought back with me. She just can''t keep away from here!"'
+		'The others smile and shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 4:
+		'"Time to book <<$pcs_lastname>> again. She just can''t keep out of trouble."'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 5:
+		'"You really like to get in trouble, don''t you?"'
+		'The others shake their heads as he leads you further inside the police station.'
+	end
+	killvar 'police_event'
+
+	act 'Continue further in': gt 'court_arrest_events', 'booking_end'
+end
+
+if $ARGS[0] = 'multiple':
+	minut += 2
+	gs 'pain', 2, 'armR', 'pinch'
+	gs 'stat'
+
+	police_event = rand(1,5)
+	!triggered more than 5 times, randomized
+	if police_event = 1:
+		'"You''re getting a bit familiar with this place, aren''t you?"'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 2:
+		'The staff sitting at the reception desk glance at you as the arresting officer sighs, "Why won''t you learn? You know doing this will only lead to worse things..."'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 3:
+		'The staff sitting at the reception desk glance at you as the arresting officer sighs, "I''m getting tired of seeing you around here, <<$pcs_lastname>>..."'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 4:
+		'The staff sitting at the reception desk glance at you while the officer sighs tiredly, "You''re flushing your life straight down the shitter if you keep this up, <<$pcs_lastname>>."'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 5:
+		'The staff sitting at the reception desk glance at you as the arresting officer sighs, "Here we go again. You know the drill, <<$pcs_lastname>>..."'
+		'The others shake their heads as he leads you further inside the police station.'
+	end
+	killvar 'police_event'
+
+	act 'Continue further in': gt 'court_arrest_events', 'booking_end'
+end
+
+if $ARGS[0] = 'regular':
+	minut += 2
+	gs 'pain', 2, 'armR', 'pinch'
+	gs 'stat'
+
+	police_event = rand(1, 8)
+	!triggered more than 10 times, randomized
+	if police_event = 1:
+		'The staff sitting at the reception desk glance your way as the arresting officer glares down at you, "I''m sick and tired of processing you, <<$pcs_lastname>>! I hope they lock you away for a long time!"'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 2:
+		'The staff sitting at the reception desk glance your way as the arresting officer smirks, "Well, if it isn''t our favorite customer. How long will you be staying this time?"'
+		'The others laugh loudly as he leads you further inside the police station.'
+
+	elseif police_event = 3:
+		'The staff sitting at the reception desk glance at you as the arresting officer sighs heavily, "Why do you continue doing this, <<$pcs_lastname>>? Aren''t you getting tired of this life?"'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 4:
+		'The staff sitting at the reception desk glance at you as the arresting officer smiles sarcastically, "What a surprise, it''s our favorite little criminal!"'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 5:
+		'The staff sitting at the reception desk glance at you as the arresting officer sighs heavily, "May they lock you up for a long time..."'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 6:
+		'The staff sitting at the reception desk glance at you as the arresting officer sighs heavily, "There''s really no saving you, <<$pcs_lastname>>..."'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 7:
+		'The staff sitting at the reception desk glance at you as the arresting officer sighs heavily, "I hope they give you a long sentence this time..."'
+		'The others shake their heads as he leads you further inside the police station.'
+
+	elseif police_event = 8:
+		'The staff sitting at the reception desk glance at you as the arresting officer sighs heavily, "I don''t know what to say anymore, <<$pcs_lastname>>... You''re really a lost case..."'
+		'The others shake their heads as he leads you further inside the police station.'
+	end
+	killvar 'police_event'
+
+	act 'Continue further in': gt 'court_arrest_events', 'booking_end'
+end
+
+
+
+
+	!!===================================================================!!
+	!!                                                                   !!
+	!!                           INTERROGATION                           !!
+	!!                                                                   !!
+	!!===================================================================!!
+
+
+if $ARGS[0] = 'interrogation_start':
+	if $policeQW['crime_flag'] = 'shoplift':
+		if $ARGS[1] = 'easy':
+			gt 'court_arrest_events', 'shoplift_easy'
+		elseif $ARGS[1] = 'norm':
+			gt 'court_arrest_events', 'shoplift_norm'
+		else
+			gt 'court_arrest_events', 'shoplift_hard'
+		end
+
+	elseif $policeQW['crime_flag'] = 'prostitution':
+		if $ARGS[1] = 'easy':
+			gt 'court_arrest_events', 'prostitution_easy'
+		elseif $ARGS[1] = 'norm':
+			gt 'court_arrest_events', 'prostitution_norm'
+		else
+			gt 'court_arrest_events', 'prostitution_hard'
+		end
+	end
+end
+
+if $ARGS[0] = 'interrogation_end':
+	 gt 'police_station', 'returncell'
+end
+
+
+	!!-------------------------------------------------------------------!!
+	!!                        INTERROGATION EVENTS                       !!
+	!!-------------------------------------------------------------------!!
+
+
+if $ARGS[0] = 'shoplift_easy':
+	!easy going detective
+	minut += 20
+	gs 'stat'
+
+	picrand = rand(1, 2)
+	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
+	'He takes a seat at the table opposite of you, "So caught stealing, eh?" he asks.'
+	'You nervously look around trying to avoid eye-contact...'
+	'He''s quick to notice your nervousness and tells you to relax, he only wants to know what happened. "Now start from the beginning..."'
+	'You take a deep breath and begin confessing your crime as the detective listens attentively.'
+
+	act 'Continue':
+		*clr & cla
+		gs 'stat'
+
+		if policeQW['toldonguard'] = 2:
+			policeQW['toldonguard'] = 1
+
+			picrand = rand(1, 2)
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
+			'You tear up, "So in the end the security guard forced me to have sex with him..."'
+			'The detective looks up, "Sounds awful! I''ll send some officers over to have a talk with him and we''ll take actions against him... assuming you''re telling the truth."'
+			'You nod your head, "I am, I promise!" You say before continuing to admit to everything while the detective writes down some notes.'
+			'"Okay <<$pcs_firstname>>, we have a civil court judge for these kind of cases and as you''ve made my job easy by admitting to everything, I can get you in front of him today. Don''t worry I''ll put in a good word for you," he reassures gently.'
+
+		else
+			picrand = rand(1, 2)
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
+			'As you finish you see the detective write down one last thing before looking at you, "Good, that''s everything I need."'
+			'"What will happen to me?" you ask.'
+			'"Don''t worry, it was a petty crime and you''ve been more than cooperative with me and the booking officer, so I''ll put in a good word for you to the civil court judge," he reassures you.'
+		end
+
+		act 'Return to the holding cell': gt 'court_arrest_events', 'interrogation_end'
+	end
+end
+
+
+if $ARGS[0] = 'shoplift_norm':
+!normal detective
+	minut += 20
+	gs 'stat'
+
+	picrand = rand(1, 2)
+	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
+	'He takes a seat opposite of you, "So caught stealing, eh?" he asks.'
+	'You nervously look around trying to avoid eye-contact...'
+	'"Look here <<$pcs_firstname>>, I''m just trying to do my job so lets make this quick and easy: tell the truth and confess to everything."'
+	'You take a deep breath and begin to talk.'
+
+	act 'Continue':
+		*clr & cla
+		gs 'stat'
+
+		if policeQW['toldonguard'] = 2:
+			policeQW['toldonguard'] = 1
+
+			picrand = rand(1, 2)
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
+			'You tear up, "So in the end the security guard forced me to have sex with him..."'
+			'The detective really isn''t paying attention to you as he scribbles things down, "I''ll see if there are any free officers to head over and interrogate the security guard about it."'
+			'You nod your head before continuing the confession. The officer looks bored, but he continues writing everything down.'
+			'"Okay <<$pcs_firstname>>, we have a civil court judge for these kind of cases and since you''ve already admitted to everything... we might as well take you in front of him and see how it goes," he says tiredly.'
+
+		else
+			picrand = rand(1, 2)
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
+			'As you finish you confessing, the detective looks at you with an unreadable expression. "Well, you''ve pretty much confessed to everything, <<$pcs_firstname>>. It''s an open and shut case."'
+			'"What will happen to me?" you ask.'
+			'"Who knows, I''m not the civil court judge," he shrugs.'
+		end
+
+		act 'Return to the holding cell': gt 'court_arrest_events', 'interrogation_end'
+	end
+end
+
+
+if $ARGS[0] = 'shoplift_hard':
+!rough detective
+	minut += 20
+	gs 'stat'
+
+	picrand = rand(1, 2)
+	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
+	'He takes a seat opposite of you, "So caught stealing, eh?" he asks.'
+	'You shrug your shoulders nonchalantly, not really caring what might happen.'
+	'"Don''t waste my time, <<$pcs_firstname>>," he threatens. "If you won''t take this seriously, then I won''t put in the effort to give a shit what happens to you. Now, stop fucking around and tell me everything you did."'
+	'You stutter as you begin confessing.'
+
+	act 'Continue':
+		*clr & cla
+		gs 'stat'
+
+		if policeQW['toldonguard'] = 2:
+			policeQW['toldonguard'] = 1
+
+			picrand = rand(1, 2)
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
+			'You tear up, "So in the end the security guard forced me to have sex with him..."'
+			'The detective''s scowl deepens as he glares at you. "You think you can just say shit like that and get away with everything? Stop lying, or I''ll throw you back in that cell with that crazy woman."'
+			'You shake your head, "I''m telling the truth! Why won''t you believe me?"'
+			'The detective lets out a loud sigh, "Sticking to your lies, huh? Fine but let me be clear: lying about a hard working security officer like this just to get away with stealing is going to make you an enemy to a lot of people around here, including the judge you''re about to see. I''m sure he''ll love to hear your swan song."'
+
+		else
+			picrand = rand(1, 2)
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogation<<picrand>>.jpg"></center>'
+			'As you finish, the detective looks up at you, "Good, that''s everything I need from you. Makes my job easier, y''know."'
+			'"What will happen to me?" you ask.'
+			'"Hopefully the civil court judge will give be going for a long and hard sentence. Criminals need to be taught a lesson," he says coldly.'
+		end
+
+		act 'Return to the holding cell': gt 'court_arrest_events', 'interrogation_end'
+	end
+end
+
+
+if $ARGS[0] = 'prostitution_easy':
+	!easy going detective
+	minut += 20
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+	'He takes a seat opposite of you, "So caught prostituting, eh?" he asks.'
+	'You nervously look around trying to avoid eye-contact...'
+	'He''s quick to notice your nervousness and tells you to relax, he only wants to know what happened. "Now start from the beginning..."'
+	'You take a deep breath and begin confessing your crime as the detective listens attentively.'
+
+	act 'Continue':
+		*clr & cla
+		gs 'stat'
+
+		if policeQW['prostitution_bribe'] = 2:
+		!if tried to bribe the officer with sex
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+			'After a while listening to your story the detective clears his throat, "And this was when you tried to offer the officer sex?"'
+			'You stop and nod your head, "Yes, I... I thought it would get me off the hook..." You continue to confess while the detective writes down some notes.'
+			'"Okay <<$pcs_firstname>>, we have a civil court judge for these kind of cases and since you''ve already admitted to everything, we might as well take you in front of him. I''ll try to put in a good word for you," he says.'
+
+		elseif policeQW['prostitution_bribe'] = 1:
+		!else if tried to bribe the officer with money
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+			'After a while listening to your story the detective clears his throat, "And this was when you tried to offer the officer money?"'
+			'You stop and nod your head, "Yes, I... I thought it would get me off the hook..." You continue to confess while the detective writes down some notes.'
+			'"Okay <<$pcs_firstname>>, we have a civil court judge for these kind of cases and since you''ve already admitted to everything, we might as well take you in front of him. I''ll try to put in a good word for you," he says.'
+
+		else
+			!this will show up otherwise
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+			'As you finish, you see the detective write down one last thing before looking at you, "Good, that''s everything I need."'
+			'"What will happen to me?" you ask.'
+			'"Don''t worry, the civil court judge probably won''t care too much about the crime and both the booking officer and I will put in a good word for you since you made our job easy and confessed to everything. The punishment, if there is one, shouldn''t be too bad," he reassures you.'
+		end
+
+		act 'Return to the holding cell': gt 'court_arrest_events', 'interrogation_end'
+	end
+end
+
+
+if $ARGS[0] = 'prostitution_norm':
+!normal detective
+	minut += 20
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+	'He takes a seat opposite of you, "So caught prostituting, eh?" he asks.'
+	'You nervously look around trying to avoid eye-contact...'
+	'"Look here <<$pcs_firstname>>, I''m just trying to do my job here so how about you confess and we''ll take it from there..."'
+	'You take a deep breath and begin to talk.'
+
+	act 'Continue':
+		*clr & cla
+		gs 'stat'
+
+		if policeQW['prostitution_bribe'] = 2:
+		!if tried to bribe the officer with sex
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+			'You tear up, "And this is where I thought I could bribe the officer with sex..."'
+			'The detective, not really paying attention, scribbles it down, "Attempted to bribe the officer with sex," he repeats.'
+			'You nod your head before continuing to confess to the bored looking officer.'
+			'"Okay <<$pcs_firstname>>, we have a civil court judge for these kind of cases and since you''ve already admitted to everything, we might as well take you in front of him and we''ll see how it goes..." he says tiredly.'
+
+		elseif policeQW['prostitution_bribe'] = 1:
+		!if tried to bribe the officer with money
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+			'You tear up, "And this is where I thought I could bribe the officer with money..."'
+			'The detective, not really paying attention, scribbles it down, "Attempted to bribe the officer with money," he repeats.'
+			'You nod your head before continuing to confess to the bored looking officer.'
+			'"Okay <<$pcs_firstname>>, we have a civil court judge for these kind of cases and since you''ve already admitted to everything, we might as well take you in front of him and we''ll see how it goes..." he says tiredly.'
+
+		else
+		!this will show up otherwise
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+			'As you finish, you see the detective write down one last thing before looking at you, "Well, you''ve pretty much confessed to everything, <<$pcs_firstname>>. It''s an open and shut case."'
+			'"What will happen to me?" you ask.'
+			'"Truth be told, I don''t really know what kind of sentence the judge will be going for..." he tells you.'
+		end
+
+		act 'Return to the holding cell': gt 'court_arrest_events', 'interrogation_end'
+	end
+end
+
+
+if $ARGS[0] = 'prostitution_hard':
+!rough detective
+	minut += 20
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+	'He takes a seat opposite of you, "So caught prostituting, eh?" he asks.'
+	'You shrug your shoulders nonchalantly not really caring what might happened.'
+	'"Don''t waste my time, <<$pcs_firstname>>," he threatens. "If you won''t take this seriously, then I won''t put in the effort to give a shit what happens to you. Now, stop fucking around and tell me everything you did."'
+	'You stutter as you begin confessing.'
+
+	act 'Continue':
+		*clr & cla
+		gs 'stat'
+
+		if policeQW['prostitution_bribe'] = 2:
+		!if tried to bribe the officer with sex
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+			'You tear up, "And this is where I thought I could bribe the officer with sex..."'
+			'The detective''s face twists into a scowl. "You think you can get away with this by accusing someone of rape?!"'
+			'You shake your head, "Not at all! I''ve heard from the other girls that they''ve gotten away by doing that, so I thought--"'
+			'He slams his fist down on the table. "You think you can get away with telling these kind of lies against our fine police force?! You''re in deep shit now, <<$pcs_firstname>>. I''m taking you to see the judge, and we''ll see how he likes hearing you make a mockery of our justice system."'
+
+		elseif policeQW['prostitution_bribe'] = 1:
+		!if tried to bribe the officer with money
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+			'You tear up, "And this is where I thought I could bribe the officer with money..."'
+			'The detective''s face twists into a scowl. "You thought you could just buy your way out of this? That''s not how the world works, your actions have consequences!"'
+			'You shake your head, "Not at all! I''ve heard from the other girls that they''ve gotten away by doing that, so I thought--"'
+			'He slams his fist down on the table. "You think you can get away with telling these kind of lies against our fine police force?! You''re in deep shit now, <<$pcs_firstname>>. I''m taking you to see the judge, and we''ll see how he likes hearing you make a mockery of our justice system."'
+
+		else
+		!this will show up otherwise
+			'<center><img <<$set_imgh>> src="images/locations/shared/police/interrogationpro.jpg"></center>'
+			'As you finish you see the detective looks at you, "Good just what I was looking for. You''ve confessed everything. Makes my and the prosecutors job easier."'
+			'"What will happen to me?" you ask.'
+			'"Hopefully the judge will give you a long and hard sentence." he angrily answers you.'
+		end
+
+		act 'Return to the holding cell': gt 'court_arrest_events', 'interrogation_end'
+	end
+end
+
+
+
+
+	!!===================================================================!!
+	!!                                                                   !!
+	!!                          CELLMATE STORY                           !!
+	!!                                                                   !!
+	!!===================================================================!!
+
+
+if $ARGS[0] = 'cellmate_story':
+	if $policeQW['crime_flag'] = 'shoplift':
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityhold.jpg"></center>'
+		'"I got caught while I was stealing stuff," you answer nonchalantly.'
+		'The woman smirks, "A petty crime, you''ll be fine."'
+		'"What are you in for?" you ask her.'
+		'She starts laughing, "I refused to bribe one of these fuckers while I was prostituting so they brought me in as a punishment."'
+		'"I see..." you answer a bit taken back by her openness.'
+
+	elseif $policeQW['crime_flag'] = 'prostitution':
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/police/cityhold.jpg"></center>'
+		'"I got caught while I was prostituting," you answer nonchalantly.'
+		'She smiles surprisingly, "You too?!" The two of you start to laugh loudly.'
+		'"I refused to bribe one of these fuckers while I was prostituting so they brought me in as a punishment," she tells you, "So where do you usually work I haven''t seen you around?" she asks.'
+		'"Yeah same thing happened to me," you answer, "Here and there. I try to keep myself away from the usual spots." you explain.'
+	end
+end
+
+
+
+
+	!!===================================================================!!
+	!!                                                                   !!
+	!!                         VARIABLE CLEANUP                          !!
+	!!                                                                   !!
+	!!===================================================================!!
+
+
+killvar 'temp_tot_arrested'
+
+
+--- court_arrest_events ---------------------------------

+ 30 - 0
locations/court_functions.qsrc

@@ -0,0 +1,30 @@
+# court_functions
+
+if $ARGS[0] = 'get_total_arrests':
+	result = policeQW['shoplift_booked'] + policeQW['prostitution_booked']
+end
+
+if $ARGS[0] = 'arrest_for':
+	policeQW['<<$ARGS[1]>>_booked'] += 1
+	$policeQW['crime_flag'] = $ARGS[1]
+end
+
+!! gs 'add_fine', fine
+if $ARGS[0] = 'add_fine':
+	policeQW['legal_fine'] += ARGS[1]
+
+	temp_tot_missed = max(0, policeQW['tot_court_dates_missed'] + policeQW['tot_fines_deadlines_missed'])
+	temp_current_missed = max(0, policeQW['missed_fine_deadlines'] + policeQW['missed_court_dates'] - 1)
+
+	if policeQW['fine_deadline'] = 0:
+		policeQW['fine_deadline'] = daystart + 28 - min(14, temp_tot_missed / 4)
+	else
+		policeQW['fine_deadline'] = max(daystart, policeQW['fine_deadline']) + 14 - min(7, 2 * temp_current_missed + temp_tot_missed / 4)
+	end
+
+	killvar 'temp_current_missed'
+	killvar 'temp_tot_missed'
+end
+
+
+--- court_functions ---------------------------------

+ 500 - 0
locations/court_sentence_events.qsrc

@@ -0,0 +1,500 @@
+# court_sentence_events
+
+
+	!!===================================================================!!
+	!!                                                                   !!
+	!!                               JUDGE                               !!
+	!!                                                                   !!
+	!!===================================================================!!
+
+
+if $ARGS[0] = 'judge_start':
+	if $mid($ARGS[1], 1, 8) = 'shoplift':
+		gt 'court_sentence_events', 'judge_shoplift', $mid($ARGS[1], 10)
+
+	elseif $mid($ARGS[1], 1, 12) = 'prostitution':
+		gt 'court_sentence_events', 'judge_prostitution', $mid($ARGS[1], 14)
+
+	else
+		gs 'LOCA', 'mod_sentenceevents', 'hearing'
+	end
+end
+
+if $ARGS[0] = 'judge_end':
+	gt 'sentence', 'punishment'
+end
+
+
+	!!-------------------------------------------------------------------!!
+	!!                            JUDGE EVENTS                           !!
+	!!-------------------------------------------------------------------!!
+
+
+if $ARGS[0] = 'judge_shoplift':
+	'<center><img <<$set_imgh>> src="images/locations/city/shared/court/judge.jpg"></center>'
+	'The judge speaks up with a stern voice, "So I see that you''re here because of you''ve gotten caught stealing."'
+	'You sink your glance in shame and nod meekly.'
+	'The judge continues on, "Let''s see what the detectives concluded during their investigation."'
+
+	if $mid($ARGS[1], 1, 4) = 'easy':
+		'The judge sits and quietly glances through the report, looking towards you from time to time, "Miss <<$pcs_lastname>>, the detective seem to be quite positive in the report."'
+		'Suddenly, you feel a bit emboldened as the detective seems to have come through for you. You even manage to let out a little smirk.'
+		'"Well as you''ve already admitted being guilty I guess we don''t need to listen to your pleading," he sternly looks at you.'
+		'"Yes your honor." you respectfully answer.'
+
+!!do a check if the player missed any earlier sentencing
+		if policeQW['missed_court_dates'] > 0:
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>," and just as he''s about to close it, he stops at the last page, "Wait! What is this? Have you missed a sentencing?" he inquirers.'
+			'You begin to look around, trying to come up with an excuse. But in the end you decide it''s best to admit, "Yes..." you meekly answer.'
+			'With the judges eyes piercing through you, they clear their throat, "Well then this will affect your punishment. This is a serious thing Miss <<$pcs_lastname>>. The court can''t turn a blind eye to this. We''ll have to take this into the consideration when deciding your punishment."'
+			'You try your best to hold back the tears as you nod that you understand.'
+
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+
+		else
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>, shall we proceed to the punishment?" the judge asks.'
+			'You nod and take a deep breath as you await your punishment.'
+
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+		end
+
+	elseif $mid($ARGS[1], 1, 4) = 'norm':
+		'The judge sits and quietly glances through the report, looking towards you from time to time, "Miss <<$pcs_lastname>>, the detective has only written neutral comments in the report."'
+		'Suddenly, you feel a bit looser as you can probably expect a lighter sentencing than usual. You let out a relieving sigh.'
+		'"Well as you''ve already admitted being guilty I guess we don''t need to listen to your pleading," he sternly looks at you.'
+		'"Yes your honor." you respectfully answer.'
+
+!!do a check if the player missed any earlier sentencing
+		if policeQW['missed_court_dates'] > 0:
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>," and just as he''s about to close it, he stops at the last page, "Wait! What is this? Have you missed a sentencing?" he inquirers.'
+			'You begin to look around, trying to come up with an excuse. But in the end you decide it''s best to admit, "Yes..." you meekly answer.'
+			'With the judges eyes piercing through you, they clear their throat, "Well then this will affect your punishment. This is a serious thing Miss <<$pcs_lastname>>. The court can''t turn a blind eye to this. We''ll have to take this into the consideration when deciding your punishment."'
+			'You try your best to hold back the tears as you nod that you understand.'
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+
+		else
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>, shall we proceed to the punishment?" the judge asks.'
+			'You nod and take a deep breath as you await your punishment.'
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+		end
+
+	else
+		'The judge sits and quietly glances through the report, looking towards you from time to time, "Miss <<$pcs_lastname>>, what is wrong with you? The report written by the detective is quite damaging and you will be getting a harsher sentencing."'
+		'You look nonchalantly at the judge, almost ignoring what he has to say.'
+		'"Well as you''ve already admitted being guilty, no need listening to your pleading," he sternly looks at you.'
+		'"Whatever." you shrug your shoulders.'
+
+!!do a check if the player missed any earlier sentencing
+		if policeQW['missed_court_dates'] > 0:
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>," and just as he''s about to close it, he stops at the last page, "Wait! What is this? Have you missed a sentencing?" he inquirers.'
+			'You begin to look around, trying to come up with an excuse. But in the end you decide it''s best to admit, "Yes..." you meekly answer.'
+			'With the judges eyes piercing through you, they clear their throat, "Well then this will affect your punishment. This is a serious thing Miss <<$pcs_lastname>>. The court can''t turn a blind eye to this. We''ll have to take this into the consideration when deciding your punishment."'
+			'You try your best to hold back the tears as you nod that you understand.'
+
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+
+		else
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>, shall we proceed to the punishment?" the judge asks.'
+			'You nod and take a deep breath as you await your punishment.'
+
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+		end
+	end
+end
+
+if $ARGS[0] = 'judge_prostitution':
+	'<center><img <<$set_imgh>> src="images/locations/city/shared/court/judge.jpg"></center>'
+	'The judge speaks up with a stern voice, "So I see that you''re here because of you''ve gotten caught prostituting."'
+	'You sink your glance in shame and nod meekly.'
+	'The judge continues on, "Let''s see what the detectives concluded during their investigation."'
+
+	if $mid($ARGS[1], 1, 4) = 'easy':
+		'Suddenly, you feel a bit emboldened as the detective seems to have come through for you. You even manage to let out a little smirk.'
+		'"Well as you''ve already admitted being guilty I guess we don''t need to listen to your pleading," he sternly looks at you.'
+		'"Yes your honor." you respectfully answer.'
+
+!!do a check if the player missed any earlier sentencing
+		if policeQW['missed_court_dates'] > 0:
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>," and just as he''s about to close it, he stops at the last page, "Wait! What is this? Have you missed a sentencing?" he inquirers.'
+			'You begin to look around, trying to come up with an excuse. But in the end you decide it''s best to admit, "Yes..." you meekly answer.'
+			'With the judges eyes piercing through you, they clear their throat, "Well then this will affect your punishment. This is a serious thing Miss <<$pcs_lastname>>. The court can''t turn a blind eye to this. We''ll have to take this into the consideration when deciding your punishment."'
+			'You try your best to hold back the tears as you nod that you understand.'
+
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+
+		else
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>, shall we proceed to the punishment?" the judge asks.'
+			'You nod and take a deep breath as you await your punishment.'
+
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+		end
+
+	elseif $mid($ARGS[1], 1, 4) = 'norm':
+		'The judge sits and quietly glances through the report, looking towards you from time to time, "Miss <<$pcs_lastname>>, the detective has only written neutral comments in the report."'
+		'Suddenly, you feel a bit looser as you can probably expect a lighter sentencing than usual. You let out a relieving sigh.'
+		'"Well as you''ve already admitted being guilty I guess we don''t need to listen to your pleading," he sternly looks at you.'
+		'"Yes your honor." you respectfully answer.'
+
+!!do a check if the player missed any earlier sentencing
+		if policeQW['missed_court_dates'] > 0:
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>," and just as he''s about to close it, he stops at the last page, "Wait! What is this? Have you missed a sentencing?" he inquirers.'
+			'You begin to look around, trying to come up with an excuse. But in the end you decide it''s best to admit, "Yes..." you meekly answer.'
+			'With the judges eyes piercing through you, they clear their throat, "Well then this will affect your punishment. This is a serious thing Miss <<$pcs_lastname>>. The court can''t turn a blind eye to this. We''ll have to take this into the consideration when deciding your punishment."'
+			'You try your best to hold back the tears as you nod that you understand.'
+
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+
+		else
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>, shall we proceed to the punishment?" the judge asks.'
+			'You nod and take a deep breath as you await your punishment.'
+
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+		end
+
+	else
+		'The judge sits and quietly glances through the report, looking towards you from time to time, "Miss <<$pcs_lastname>>, what is wrong with you? The report written by the detective is quite damaging and you will be getting a harsher sentencing."'
+		'You look nonchalantly at the judge, almost ignoring what he has to say.'
+		'"Well as you''ve already admitted being guilty, no need listening to your pleading," he sternly looks at you.'
+		'"Whatever." you shrug your shoulders.'
+
+!!do a check if the player missed any earlier sentencing
+		if policeQW['missed_court_dates'] > 0:
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>," and just as he''s about to close it, he stops at the last page, "Wait! What is this? Have you missed a sentencing?" he inquirers.'
+			'You begin to look around, trying to come up with an excuse. But in the end you decide it''s best to admit, "Yes..." you meekly answer.'
+			'With the judges eyes piercing through you, they clear their throat, "Well then this will affect your punishment. This is a serious thing Miss <<$pcs_lastname>>. The court can''t turn a blind eye to this. We''ll have to take this into the consideration when deciding your punishment."'
+			'You try your best to hold back the tears as you nod that you understand.'
+
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+
+		else
+			'The judge continues on flipping throughout the report, "Well everything seems to check out <<$pcs_lastname>>, shall we proceed to the punishment?" the judge asks.'
+			'You nod and take a deep breath as you await your punishment.'
+
+			act 'Await punishment': gt 'court_sentence_events', 'judge_end'
+		end
+	end
+end
+
+
+
+
+	!!===================================================================!!
+	!!                                                                   !!
+	!!                            PUNISHMENT                             !!
+	!!                                                                   !!
+	!!===================================================================!!
+
+
+if $ARGS[0] = 'punishment_start':
+	if $mid($ARGS[1], 1, 8) = 'shoplift':
+		policeQW['shoplift_counter'] += 1
+		gs 'court_sentence_events', 'punishment_shoplift', $mid($ARGS[1], 10)
+
+	elseif $mid($ARGS[1], 1, 12) = 'prostitution':
+		policeQW['prostitution_counter'] += 1
+		gs 'court_sentence_events', 'punishment_shoplift', $mid($ARGS[1], 14)
+
+	else
+		gs 'LOCA', 'mod_sentenceevents', 'punishment', $ARGS[1]
+	end
+end
+
+
+	!!-------------------------------------------------------------------!!
+	!!                         PUNISHMENT EVENTS                         !!
+	!!-------------------------------------------------------------------!!
+
+if $ARGS[0] = 'punishment_shoplift':
+	if policeQW['shoplift_counter'] <= 5:
+	!Stage 1
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 5000 + (policeQW['shoplift_value'] / 2)
+
+			'"I hereby sentence you to a fine of <<temp_fine>> <b>₽</b>." the judge reads out your sentence.'
+			'"You can pay your fine at the post office. You''ve been lucky this time Miss <<$pcs_lastname>>." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 5000 + policeQW['shoplift_value']
+
+			'"I hereby sentence you to a fine of <<temp_fine>> <b>₽</b>." the judge reads out your sentence.'
+			'"You can pay your fine at the post office." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 5000 + (3 * policeQW['shoplift_value'] / 2)
+
+			'"I hereby sentence you to a fine of <<temp_fine>> <b>₽</b>." the judge reads out your sentence.'
+			'"You can pay your fine at the post office. And if it happens that you appear in front of this court again, check your attitude." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+
+	elseif policeQW['shoplift_counter'] <= 10:
+	!Stage 2
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 7500 + (3 * policeQW['shoplift_value'] / 4)
+
+			'"Seems that I need to increase the fine for you to pay back to a sum of <<temp_fine>> <b>₽</b>. Hopefully, this will teach you a lesson." the judge reads out your sentence.'
+			'"You can pay your fine at the post office." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 7500 + (3 * policeQW['shoplift_value'] / 2)
+
+			'"Seems that I need to increase the fine for you to pay back to a sum of <<temp_fine>> <b>₽</b>. Hopefully, this will teach you a lesson." the judge reads out your sentence.'
+			'"You can pay your fine at the post office." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 7500 + (9 * policeQW['shoplift_value'] / 4)
+
+			'"I sentence you hereby to pay back a sum of <<temp_fine>> <b>₽</b> and I''ll also sentence you to some community service at the Mercy Clinic to 20 hours, hopefully this will help." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and I suppose you know where to find the Mercy Clinic? I see you''ve still got an attitude issue." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+
+	elseif policeQW['shoplift_counter'] <= 15:
+	!Stage 3
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 10000 + policeQW['shoplift_value']
+
+			'"<<$pcs_lastname>> I see that name come up quite often here. Seems like I need to increase the fine even further to a sum of <<temp_fine>> <b>₽</b>." the judge reads out your sentence.'
+			'"You can pay your fine at the post office." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 10000 + (2 * policeQW['shoplift_value'])
+
+			'"<<$pcs_lastname>> I see that name come up quite often here. Seems like I need to increase the fine even further to a sum of <<temp_fine>> <b>₽</b> and sentence you to community service at the Mercy Clinic to 20 hours." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and by now you should know where to find the Mercy Clinic." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 10000 + (5 * policeQW['shoplift_value'] / 2)
+
+			'"<<$pcs_lastname>> I see that name come up quite often here. Seems like I need to increase the fine even further to a sum of <<temp_fine>> <b>₽</b> and increase the community service at the Mercy Clinic to 40 hours." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and by now you should know where to find the Mercy Clinic." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+
+	elseif policeQW['shoplift_counter'] <= 20:
+	!Stage 4
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 15000 + (5 * policeQW['shoplift_value'] / 4)
+
+			'"This is starting to get out of hand, <<$pcs_lastname>>! Seems like I need to increase the fine even further to a sum of <<temp_fine>> <b>₽</b> and sentence you to community service at the Mercy Clinic to 20 hours." the judge reads out your sentence.'
+			'"You already know what you need to do." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 15000 + (5 * policeQW['shoplift_value'] / 2)
+
+			'"This is starting to get out of hand, <<$pcs_lastname>>! Seems like I need to increase the fine even further to a sum of <<temp_fine>> <b>₽</b> and increase the community service at the Mercy Clinic to 40 hours." the judge reads out your sentence.'
+			'"You already know what you need to do." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 15000 + (3 * policeQW['shoplift_value'])
+
+			'"This is starting to get out of hand, <<$pcs_lastname>>! Seems like I need to increase the fine even further to a sum of <<temp_fine>> <b>₽</b> and increase the community service at the Mercy Clinic to 80 hours." the judge reads out your sentence.'
+			'"You already know what you need to do." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+
+	elseif policeQW['shoplift_counter'] <= 25:
+	!Stage 5
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 25000 + (3 * policeQW['shoplift_value'] / 2)
+
+			'"Well well, what a surprise, <<$pcs_lastname>> stands in front of me again. You''re starting to annoy me! Are you doing this on purpose? Don''t answer and instead pay this fine of <<temp_fine>> <b>₽</b> and enjoy your community service at the Mercy Clinic for 40 hours." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and I suppose you know where to find the Mercy Clinic?" the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 25000 + (3 * policeQW['shoplift_value'])
+
+			'"Well well, what a surprise, <<$pcs_lastname>> stands in front of me again. You''re starting to annoy me! Are you doing this on purpose? Don''t answer and instead pay the fine of <<temp_fine>> <b>₽</b> and enjoy your community service at the Mercy Clinic for 80 hours." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and I suppose you know where to find the Mercy Clinic?" the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 25000 + (4 * policeQW['shoplift_value'])
+
+			'"Well well, what a surprise, <<$pcs_lastname>> stands in front of me again. You''re starting to annoy me! Are you doing this on purpose? Don''t answer and instead pay the fine of <<temp_fine>> <b>₽</b> and enjoy your community service at the Mercy Clinic for 120 hours." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and I suppose you know where to find the Mercy Clinic?" the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+
+	else
+	!Stage 6
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 50000 + (2 * policeQW['shoplift_value'])
+
+			'The judge sighs, "Here we are again <<$pcs_lastname>>! I''m getting tired of being lenient so you''re getting the maximum sentence. The fine will be set to <<temp_fine>> <b>₽</b> and the community service at the Mercy Clinic for 80 hours." the judge reads out your sentence.'
+			'"You already know what you need to do. I hope you will think about your actions before stealing again." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 50000 + (4 * policeQW['shoplift_value'])
+
+			'The judge sighs, "Here we are again <<$pcs_lastname>>! I''m getting tired of being lenient so you''re getting the maximum sentence. The fine will be set to <<temp_fine>> <b>₽</b> and the community service at the Mercy Clinic for 120 hours." the judge reads out your sentence.'
+			'"You already know what you need to do. I hope you will think about your actions before stealing again." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 50000 + (5 * policeQW['shoplift_value'])
+			'The judge sighs, "Here we are again <<$pcs_lastname>>! I''m getting tired of being lenient so you''re getting the maximum sentence. The fine will be set to <<temp_fine>> <b>₽</b> and the community service at the Mercy Clinic for 160 hours." the judge reads out your sentence.'
+			'"You already know what you need to do. I hope you will think about your actions before stealing again." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+	end
+end
+
+if $ARGS[0] = 'punishment_prostitution':
+	if policeQW['prostitution_counter'] <= 5:
+	!Stage 1
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 6000
+
+			'"I hereby sentence you to a fine of 6000 <b>₽</b>." the judge reads out your sentence.'
+			'"You can pay your fine at the post office. You''ve been lucky this time Miss <<$pcs_lastname>>." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 7000
+
+			'"I hereby sentence you to a fine of 7000 <b>₽</b>." the judge reads out your sentence.'
+			'"You can pay your fine at the post office." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 8000
+
+			'"I hereby sentence you to a fine of 8000 <b>₽</b>." the judge reads out your sentence.'
+			'"You can pay your fine at the post office. And if it happens that you appear in front of this court again, check your attitude." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+
+	elseif policeQW['prostitution_counter'] <= 10:
+	!Stage 2
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 9000
+
+			'"I need to increase the fine to 9000 <b>₽</b>. Hopefully, this will get you to reconsider your actions." the judge reads out your sentence.'
+			'"You can pay your fine at the post office." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 10500
+
+			'"I need to increase the fine to 10,500 <b>₽</b>. Hopefully, this will get you to reconsider your actions." the judge reads out your sentence.'
+			'"You can pay your fine at the post office." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 11500
+
+			'"I sentence you hereby to pay a fine of 11,500 <b>₽</b> and I''ll also add some community service at the Mercy Clinic to 20 hours, hopefully this will help you reconsider your actions." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and I suppose you know where to find the Mercy Clinic? I see you''ve still got an attitude issue." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+
+	elseif policeQW['prostitution_counter'] <= 15:
+	!Stage 3
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 12000
+
+			'"<<$pcs_lastname>> I see that name come up quite often here. Seems like I need to increase the fine even further to 12000 <b>₽</b>." the judge reads out your sentence.'
+			'"You can pay your fine at the post office." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 14000
+
+			'"<<$pcs_lastname>> I see that name come up quite often here. Seems like I need to increase the fine even further to 14000 <b>₽</b> and sentence you to community service at the Mercy Clinic for 20 hours." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and by now you should know where to find the Mercy Clinic." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 15000
+
+			'"<<$pcs_lastname>> I see that name come up quite often here. Seems like I need to increase the fine even further to 15000 <b>₽</b> and increase the community service at the Mercy Clinic to 40 hours." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and by now you should know where to find the Mercy Clinic." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+
+	elseif policeQW['prostitution_counter'] <= 20:
+	!Stage 4
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 17500
+
+			'"This is starting to get out of hand, <<$pcs_lastname>>! Seems like I need to increase the fine even further to 17500 <b>₽</b> and sentence you to community service at the Mercy Clinic to 20 hours." the judge reads out your sentence.'
+			'"You already know what you need to do." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 20000
+
+			'"This is starting to get out of hand, <<$pcs_lastname>>! Seems like I need to increase the fine even further to 20000 <b>₽</b> and increase the community service at the Mercy Clinic to 40 hours." the judge reads out your sentence.'
+			'"You already know what you need to do." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 21000
+
+			'"This is starting to get out of hand, <<$pcs_lastname>>! Seems like I need to increase the fine even further to 21000 <b>₽</b> and increase the community service at the Mercy Clinic to 80 hours." the judge reads out your sentence.'
+			'"You already know what you need to do." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+
+	elseif policeQW['prostitution_counter'] <= 25:
+	!Stage 5
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 28000
+
+			'"Well well, what a surprise, <<$pcs_lastname>> stands in front of me again. You''re starting to annoy me! Are you doing this on purpose? Don''t answer and instead pay this fine of 28000 <b>₽</b> and enjoy your community service at the Mercy Clinic for 40 hours." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and I suppose you know where to find the Mercy Clinic?" the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 21000
+
+			'"Well well, what a surprise, <<$pcs_lastname>> stands in front of me again. You''re starting to annoy me! Are you doing this on purpose? Don''t answer and instead pay the fine of 31000 <b>₽</b> and enjoy your community service at the Mercy Clinic for 80 hours." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and I suppose you know where to find the Mercy Clinic?" the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 32000
+
+			'"Well well, what a surprise, <<$pcs_lastname>> stands in front of me again. You''re starting to annoy me! Are you doing this on purpose? Don''t answer and instead pay the fine of 32000 <b>₽</b> and enjoy your community service at the Mercy Clinic for 120 hours." the judge reads out your sentence.'
+			'"You can pay your fine at the post office and I suppose you know where to find the Mercy Clinic?" the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+
+	else
+	!Stage 6
+		if $mid($ARGS[1], 1, 4) = 'easy':
+			gs 'court_functions', 'add_fine', 55000
+
+			'The judge sighs, "Here we are again <<$pcs_lastname>>! I''m getting tired of being lenient so you''re getting the maximum sentence. The fine will be set to 55000 <b>₽</b> and the community service at the Mercy Clinic for 80 hours." the judge reads out your sentence.'
+			'"You already know what you need to do. I hope you will think about your actions before prostituting yourself again." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		elseif $mid($ARGS[1], 1, 4) = 'norm':
+			gs 'court_functions', 'add_fine', 57500
+
+			'The judge sighs, "Here we are again <<$pcs_lastname>>! I''m getting tired of being lenient so you''re getting the maximum sentence. The fine will be set to 57500 <b>₽</b> and the community service at the Mercy Clinic for 120 hours." the judge reads out your sentence.'
+			'"You already know what you need to do. I hope you will think about your actions before prostituting yourself again." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+
+		else
+			gs 'court_functions', 'add_fine', 60000
+
+			'The judge sighs, "Here we are again <<$pcs_lastname>>! I''m getting tired of being lenient so you''re getting the maximum sentence. The fine will be set to 60000 <b>₽</b> and the community service at the Mercy Clinic for 160 hours." the judge reads out your sentence.'
+			'"You already know what you need to do. I hope you will think about your actions before prostituting yourself again." the judge finishes.'
+			'You nod and quickly make your way out of courtroom.'
+		end
+	end
+end
+
+--- court_sentence_events ---------------------------------

+ 2 - 2
locations/courtletter.qsrc

@@ -149,7 +149,7 @@ if $ARGS[0] = 'letter':
 		end
 
 
-	elseif mid($policeQW_courtletter_subjects[0], 1, 12) = 'missed_court':
+	elseif $mid($policeQW_courtletter_subjects[0], 1, 12) = 'missed_court':
 		if week = 6:
 			policeQW_courthearing_dates[] = daystart + 9
 		elseif week = 7:
@@ -158,7 +158,7 @@ if $ARGS[0] = 'letter':
 			policeQW_courthearing_dates[] = daystart + 7
 		end
 
-		$policeQW_courthearing_subjects[] = mid($policeQW_courtletter_subjects[0], 14)
+		$policeQW_courthearing_subjects[] = $mid($policeQW_courtletter_subjects[0], 14)
 
 		if policeQW['courtletter_hearing_counter'] < 10:
 			policeQW['courtletter_hearing_counter'] += 1

+ 71 - 71
locations/cum_cleanup.qsrc

@@ -152,107 +152,107 @@ elseif $ARGS[0] = '':
 			exit
 		end
 		!{full external clean}
-		if isprok = 0 and vibratorIN = 0: deresidue[arrsize('deresidue')] = 0
-		if analplugin = 0: deresidue[arrsize('deresidue')] = 3
-		toclean[arrsize('toclean')] = 1
-		toclean[arrsize('toclean')] = 2
-		toclean[arrsize('toclean')] = 4
-		toclean[arrsize('toclean')] = 5
-		toclean[arrsize('toclean')] = 6
-		toclean[arrsize('toclean')] = 7
-		toclean[arrsize('toclean')] = 8
-		toclean[arrsize('toclean')] = 9
-		toclean[arrsize('toclean')] = 10
-		toclean[arrsize('toclean')] = 11
-		toclean[arrsize('toclean')] = 12
-		toclean[arrsize('toclean')] = 13
-		toclean[arrsize('toclean')] = 14
-		toclean[arrsize('toclean')] = 15
-		toclean[arrsize('toclean')] = 16
+		if isprok = 0 and vibratorIN = 0: deresidue[] = 0
+		if analplugin = 0: deresidue[] = 3
+		toclean[] = 1
+		toclean[] = 2
+		toclean[] = 4
+		toclean[] = 5
+		toclean[] = 6
+		toclean[] = 7
+		toclean[] = 8
+		toclean[] = 9
+		toclean[] = 10
+		toclean[] = 11
+		toclean[] = 12
+		toclean[] = 13
+		toclean[] = 14
+		toclean[] = 15
+		toclean[] = 16
 	elseif cumspclnt = 2:
 		!{teeth clean}
-		toclean[arrsize('toclean')] = 12
+		toclean[] = 12
 	elseif cumspclnt = 3:
 		!{internal clean}
-		toclean[arrsize('toclean')] = 0
-		toclean[arrsize('toclean')] = 3
-		toclean[arrsize('toclean')] = 17
+		toclean[] = 0
+		toclean[] = 3
+		toclean[] = 17
 		if hypnoAddict > 0 and (cumloc[0] > 0 or cumloc[3] > 0): 'You have no reason to, but you carefully avoid cleaning out your pussy and ass.'
 	elseif cumspclnt = 4:
 		!{external body clean}
-		toclean[arrsize('toclean')] = 1
-		toclean[arrsize('toclean')] = 4
-		toclean[arrsize('toclean')] = 8
-		toclean[arrsize('toclean')] = 9
-		toclean[arrsize('toclean')] = 10
-		toclean[arrsize('toclean')] = 11
-		toclean[arrsize('toclean')] = 13
-		toclean[arrsize('toclean')] = 14
-		toclean[arrsize('toclean')] = 15
-		toclean[arrsize('toclean')] = 16
+		toclean[] = 1
+		toclean[] = 4
+		toclean[] = 8
+		toclean[] = 9
+		toclean[] = 10
+		toclean[] = 11
+		toclean[] = 13
+		toclean[] = 14
+		toclean[] = 15
+		toclean[] = 16
 	elseif cumspclnt = 5:
 		!{hair clean}
-		toclean[arrsize('toclean')] = 16
+		toclean[] = 16
 	elseif cumspclnt = 6:
 		!{clothes clean}
-		toclean[arrsize('toclean')] = 2
-		toclean[arrsize('toclean')] = 5
-		toclean[arrsize('toclean')] = 6
-		toclean[arrsize('toclean')] = 7
+		toclean[] = 2
+		toclean[] = 5
+		toclean[] = 6
+		toclean[] = 7
 	elseif cumspclnt = 7:
 		!{enema}
-		toclean[arrsize('toclean')] = 3
+		toclean[] = 3
 	elseif cumspclnt = 8:
 		!{blank}
 	elseif cumspclnt = 9:
 		!{wash hands}
-		toclean[arrsize('toclean')] = 13
+		toclean[] = 13
 	elseif cumspclnt = 11:
 		!{wash face}
-		toclean[arrsize('toclean')] = 11
+		toclean[] = 11
 	elseif cumspclnt = 12:
 		!{face and hair}
-		toclean[arrsize('toclean')] = 11
-		toclean[arrsize('toclean')] = 16
+		toclean[] = 11
+		toclean[] = 16
 	elseif cumspclnt = 13:
 		!{head}
-		toclean[arrsize('toclean')] = 11
-		toclean[arrsize('toclean')] = 12
-		toclean[arrsize('toclean')] = 16
+		toclean[] = 11
+		toclean[] = 12
+		toclean[] = 16
 	elseif cumspclnt = 14:
 		!{belly}
-		toclean[arrsize('toclean')] = 14
+		toclean[] = 14
 	elseif cumspclnt = 15:
 		!{wipe ass/pussy}
-		toclean[arrsize('toclean')] = 1
-		toclean[arrsize('toclean')] = 4
-		deresidue[arrsize('deresidue')] = 0
-		deresidue[arrsize('deresidue')] = 3
+		toclean[] = 1
+		toclean[] = 4
+		deresidue[] = 0
+		deresidue[] = 3
 		if hypnoAddict > 0 and (cumloc[0] > 0 or cumloc[3] > 0): 'You have no reason to, but you carefully avoid cleaning out your pussy and ass.'
 	elseif cumspclnt = 16:
 		!{Breasts}
-		toclean[arrsize('toclean')] = 15
+		toclean[] = 15
 	elseif cumspclnt = 17:
 		!{Arms/legs}
-		toclean[arrsize('toclean')] = 9
-		toclean[arrsize('toclean')] = 10
+		toclean[] = 9
+		toclean[] = 10
 	elseif cumspclnt = 18:
 		!{full clean but skipping internal due to hypno}
-		toclean[arrsize('toclean')] = 1
-		toclean[arrsize('toclean')] = 2
-		toclean[arrsize('toclean')] = 4
-		toclean[arrsize('toclean')] = 5
-		toclean[arrsize('toclean')] = 6
-		toclean[arrsize('toclean')] = 7
-		toclean[arrsize('toclean')] = 8
-		toclean[arrsize('toclean')] = 9
-		toclean[arrsize('toclean')] = 10
-		toclean[arrsize('toclean')] = 11
-		toclean[arrsize('toclean')] = 12
-		toclean[arrsize('toclean')] = 13
-		toclean[arrsize('toclean')] = 14
-		toclean[arrsize('toclean')] = 15
-		toclean[arrsize('toclean')] = 16
+		toclean[] = 1
+		toclean[] = 2
+		toclean[] = 4
+		toclean[] = 5
+		toclean[] = 6
+		toclean[] = 7
+		toclean[] = 8
+		toclean[] = 9
+		toclean[] = 10
+		toclean[] = 11
+		toclean[] = 12
+		toclean[] = 13
+		toclean[] = 14
+		toclean[] = 15
+		toclean[] = 16
 	elseif cumspclnt = 20:
 		!{Clean everything}
 		KILLVAR 'sparrage'
@@ -277,7 +277,7 @@ elseif $ARGS[0] = '':
 			!! vagina
 			if sparrloc[n] = 0:
 				!! cannot be completely cleaned with tissues\toilet use\hypno block\no enema kit
-				if FUNC('Cum_Manage', 'check_innards', sparrloc[n]) = 1 _
+				if func('Cum_Manage', 'check_innards', sparrloc[n]) = 1 _
 				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _
 				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
 					cumsumbod -= sparrvol[n] & cumsumvag -= sparrvol[n]
@@ -286,7 +286,7 @@ elseif $ARGS[0] = '':
 				end
 			!! ass
 			elseif sparrloc[n] = 3:
-				if FUNC('Cum_Manage', 'check_innards', sparrloc[n]) = 1 or cumspclnt = 7 _
+				if func('Cum_Manage', 'check_innards', sparrloc[n]) = 1 or cumspclnt = 7 _
 				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _
 				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
 					cumsumbod -= sparrvol[n] & cumsumass -= sparrvol[n]
@@ -303,7 +303,7 @@ elseif $ARGS[0] = '':
 		if tmp ! -1 and tmp < arrsize('toclean') and sparrvol[n] > 0:
 			!! vagina
 			if sparrloc[n] = 0:
-				if cumsumvag * rand(6, 9) / 6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[n], 1) and isprok = 0 and vibratorIN = 0 _
+				if cumsumvag * rand(6, 9) / 6 >= func('Cum_Manage', 'check_innards', sparrloc[n], 1) and isprok = 0 and vibratorIN = 0 _
 				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _
 				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
 					gs 'cum_cleanup', 'cleandeposit', n
@@ -311,7 +311,7 @@ elseif $ARGS[0] = '':
 				end
 			!! ass
 			elseif sparrloc[n] = 3:
-				if (cumsumass * rand(6, 9) / 6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[n], 1) and analplugin = 0) or cumspclnt = 7 _
+				if (cumsumass * rand(6, 9) / 6 >= func('Cum_Manage', 'check_innards', sparrloc[n], 1) and analplugin = 0) or cumspclnt = 7 _
 				or (hypnoAddict = 0 and (cheatVars['enema'] = 1 or (mc_inventory['enema_kit'] = 1 _
 				and (cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3)))):
 					gs 'cum_cleanup', 'cleandeposit', n

+ 1 - 0
locations/dachain.qsrc

@@ -121,6 +121,7 @@ if $args[0] = 'dachakit':
 	dynamic $dritea
 	dynamic $fill_bottle
 	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
 	dynamic $vitamin

+ 1 - 0
locations/dimaEv.qsrc

@@ -279,6 +279,7 @@ if $ARGS[0] = 'blackmail':
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
+	nodimkaK = 0
 	if dimkawarn = 1:
 		*clr & cla
 		minut += 5

+ 1 - 1
locations/dimaRevenge.qsrc

@@ -1190,7 +1190,7 @@ if dimaRevChoice = 6:
 							minut += 60
 							npc_rel['A25'] += 5
 							'<center><b><font color="maroon">Classroom</font></b></center>'
-							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkboy.jpg"></center>'
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talkboy3.jpg"></center>'
 							'It doesn''t look like the teacher is coming back. Most of the students decide to leave early except the nerds, outcasts and a few of the jocks who have to stay for team practice. Soon the seat next to Artem opens up and you decide to take it. Artem gives you a shy smile as you take a seat. You decide that now would be a good time to thank him and ask how he sold that story.'
 							*nl
 							'"It was easy, really. I tutor a few of the jocks and they agreed to spread the word that you dumped Dimka for me. It was the only solution I could think of."'

+ 12 - 4
locations/dinSex.qsrc

@@ -174,8 +174,12 @@ end
 if $ARGS[0] = 'vaginal_sex':
 	frost = 0 &! the sex heats
 	gs 'arousal','vaginal',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
-	vaginal_tightness = 5 + vgrdif + vltdif - pcs_horny / 10
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], dick, grange, silavag
+	vaginal_tightness = 5 + grdif + ltdif - pcs_horny / 10
 	arousal_modifier = 12 - vaginal_tightness
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 	$temp_mens = iif(cycle <= 0,' and a bit of your period leaks from your vagina','')
 	if pcs_vag > 0:
 		if vaginal_tightness >= 30: 
@@ -395,16 +399,20 @@ if $ARGS[0] = 'analsex':
 	*p iif(pcs_ass < 10,'when <<$xe>> tries inserting a third finger you groan in pain. ','<<$xe>> inserts a third finger, very slowly thrusting and wiggling to stretch your anus, ')
 	*p '<<$xe>> pulls <<$xyr>> fingers out of your ass and you feel <<$xyr>> <<$penis_desc>> pushing against your butthole. '
 	gs 'arousal','anal',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
-	*p iif(agrdif + altdif >= 20,'You scream and bite your lip from the sharp pain when <<$xe>> penetrates your ass, ','You moan when <<$xe>> penetrates your ass, ')
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], dick, grange, silavag
+	*p iif(grdif + ltdif >= 20,'You scream and bite your lip from the sharp pain when <<$xe>> penetrates your ass, ','You moan when <<$xe>> penetrates your ass, ')
 	*p '<<$xe>> stops for a moment, giving your ass time to adjust to <<$xyr>> cock in it. Then he starts to slowly move, pumping your anus.'
 
-	if agrdif + altdif >= rand(25,35):
+	if grdif + ltdif >= rand(25,35):
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You cry and bite your lip when the <<$penis_desc>> begins to thrust in and out of your ass. Your anus feels like it is going to tear apart and all you want is for this torture to be over quickly.'
-	elseif agrdif + altdif < rand(15,25):
+	elseif grdif + ltdif < rand(15,25):
 		pcs_horny += 10
 		'You savor <<$xyr>> cock moving inside you, lightly moaning in rhythm.'
 	end
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 	$tmp = iif(sexcontra = 7,'sabotaged ','')
 	*nl 'After some time <<$boydesc>> groans and you feel <<$xyr>> cock pulsing inside you '+iif(protect<>1,'and a pleasant warmth filling your ass. ','and you realized that <<$xe>> ejaculated in the <<$tmp>>condom. ')
 	gs 'cum_call','anus',$boy,1, sexcontra

+ 87 - 49
locations/dinSex2.qsrc

@@ -23,16 +23,20 @@ if $ARGS[0] = 'd_vag_sex_dildo':
 		'You bite your lip in pain while tears stream from your eyes when the dildo enters you, breaking your hymen. You cry out in pain and afterwards reveals a bloody bottle<<$temp_mens>>.'
 		gs 'arousal','vaginal_dildo',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
 	else
+		grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], dick, grange, silavag
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
-		if (vgrdif + vltdif) >= 30: 'You groan in pain when the <<dick>>cm dildo enters your pussy. Tears flow from your eyes and between your legs feels as if you drove in a red-hot rod<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= 20 and (vgrdif + vltdif) < 30: 'You bite your lip in pain when the <<dick>> cm dildo enters your pussy.  You feel pain between your legs<<$temp_mens>>.'
+		if (grdif + ltdif) >= 30: 'You groan in pain when the <<dick>>cm dildo enters your pussy. Tears flow from your eyes and between your legs feels as if you drove in a red-hot rod<<$temp_mens>>.'
+		if (grdif + ltdif) >= 20 and (grdif + ltdif) < 30: 'You bite your lip in pain when the <<dick>> cm dildo enters your pussy.  You feel pain between your legs<<$temp_mens>>.'
 		if cycle <= 0: $temp_mens = ', even though' + $temp_mens
-		if (vgrdif + vltdif) >= 12 and (vgrdif + vltdif) < 20: 'You flinch at the sudden pain when the <<dick>>cm dildo enters your pussy, but the pain between your legs slowly calms down and becomes quite tolerable. You are trying to be excited while moving the <<dick>>cm dildo inside your pussy <<$temp_mens>>, you don''t want it to go out.'
-		if (vgrdif + vltdif) >= 7 and (vgrdif + vltdif) < 12: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo<<$temp_mens>>.'
-		if (vgrdif + vltdif) >=  2 and (vgrdif + vltdif) < 7: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling subsides and feels nice until the end<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= -3 and (vgrdif + vltdif) < 2: 'You''re startled by a pleasant sensation, when your pussy ravishly starts taking the dildo. Between your legs becomes very warm, and you feel a pleasant sensation, when a strong <<dick>>cm dildo moves back and forth in your wet pussy<<$temp_mens>>. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling descends on you and your entire body is covered in hot waves of orgasm. You start giving out involuntarily shouts of pleasure while ravishing the dildo.'
-		if (vgrdif + vltdif) <  -3: 'You feel the dildo penetrating your pussy. Between your legs feels nice, but the <<dick>>cm dildo is a bit too small for your pussy. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling slightly subsides and remains steady until the end <<$temp_mens>>.'
+		if (grdif + ltdif) >= 12 and (grdif + ltdif) < 20: 'You flinch at the sudden pain when the <<dick>>cm dildo enters your pussy, but the pain between your legs slowly calms down and becomes quite tolerable. You are trying to be excited while moving the <<dick>>cm dildo inside your pussy <<$temp_mens>>, you don''t want it to go out.'
+		if (grdif + ltdif) >= 7 and (grdif + ltdif) < 12: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo<<$temp_mens>>.'
+		if (grdif + ltdif) >=  2 and (grdif + ltdif) < 7: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling subsides and feels nice until the end<<$temp_mens>>.'
+		if (grdif + ltdif) >= -3 and (grdif + ltdif) < 2: 'You''re startled by a pleasant sensation, when your pussy ravishly starts taking the dildo. Between your legs becomes very warm, and you feel a pleasant sensation, when a strong <<dick>>cm dildo moves back and forth in your wet pussy<<$temp_mens>>. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling descends on you and your entire body is covered in hot waves of orgasm. You start giving out involuntarily shouts of pleasure while ravishing the dildo.'
+		if (grdif + ltdif) <  -3: 'You feel the dildo penetrating your pussy. Between your legs feels nice, but the <<dick>>cm dildo is a bit too small for your pussy. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling slightly subsides and remains steady until the end <<$temp_mens>>.'
 		gs 'arousal','vaginal_dildo',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
+		killvar '$get_hole_pain'
+		killvar 'grdif' & killvar 'ltdif'
 	end
 	killvar '$temp_mens'
 end
@@ -41,16 +45,20 @@ end
 if $ARGS[0] = 'd_strapon_vag':
 	frost = 0
 	if pcs_vag > 0:
+		grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], dick, grange, silavag
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
-		if (vgrdif + vltdif) >= 30: 'You groan in pain when <<$boydesc>> penetrates you. Tears flow from your eyes and it feels like someone drove a red-hot rod into your vagina. You cry and moan while <<$xyr>> fake <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= 20 and (vgrdif + vltdif) < 30: 'You bite your lip in pain when <<$boydesc>> enters you, it is very painful. You frown and moan in pain while <<$xyr>> fake <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
+		if (grdif + ltdif) >= 30: 'You groan in pain when <<$boydesc>> penetrates you. Tears flow from your eyes and it feels like someone drove a red-hot rod into your vagina. You cry and moan while <<$xyr>> fake <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
+		if (grdif + ltdif) >= 20 and (grdif + ltdif) < 30: 'You bite your lip in pain when <<$boydesc>> enters you, it is very painful. You frown and moan in pain while <<$xyr>> fake <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
 		if cycle <= 0: $temp_mens = ' even though' + $temp_mens
-		if (vgrdif + vltdif) >= 12 and (vgrdif + vltdif) < 20: 'You wince at the sudden pain when <<$boydesc>> enters you, it hurts but gradually becames quite tolerable. You are trying to get aroused while fake <<$xyr>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>, but you did not succeed.'
-		if (vgrdif + vltdif) >= 7 and (vgrdif + vltdif) < 12: 'You are startled by the feeling that your pussy is stretching when <<$boydesc>> enters you. It feels good when rubber <<$xyr>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
-		if (vgrdif + vltdif) >=  2 and (vgrdif + vltdif) < 7: 'You are startled by the feeling that your pussy is stretching as <<$boydesc>> enters you. It feels good when <<$xyr>> <<dick>> centimeter rubber dick fucks your pussy. Gradually, a pleasant warmth and some pulsations start building up in your stomach, then the feeling decreases a little and remains like that until the end<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= -3 and (vgrdif + vltdif) < 2: 'You flinch from a pleasant feeling when your pussy is stretched by <<$xyr>> dick. It feels good when <<$xyr>> <<dick>> centimeter fake dick fucks your pussy<<$temp_mens>>. Gradually, a pleasant warmth and some pulsations start building up in your stomach, then the feeling becomes unbearable and your entire body is covered with hot waves of orgasm as you scream with pleasure.'
-		if (vgrdif + vltdif) <  -3: 'You feel <<$xyr>> fake penis enter your pussy. This gives you a nice tingling feeling between your legs, but <<$xyr>> <<dick>> cm rubber dick is significantly less than what your pussy needs. It is not big enough for you. Gradually a pleasant warmth and some pulsations start building up in your stomach. Then the feeling decreases a little and remaines like that until the end<<$temp_mens>>.'
+		if (grdif + ltdif) >= 12 and (grdif + ltdif) < 20: 'You wince at the sudden pain when <<$boydesc>> enters you, it hurts but gradually becames quite tolerable. You are trying to get aroused while fake <<$xyr>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>, but you did not succeed.'
+		if (grdif + ltdif) >= 7 and (grdif + ltdif) < 12: 'You are startled by the feeling that your pussy is stretching when <<$boydesc>> enters you. It feels good when rubber <<$xyr>> <<dick>> centimeter dick fucks your pussy<<$temp_mens>>.'
+		if (grdif + ltdif) >=  2 and (grdif + ltdif) < 7: 'You are startled by the feeling that your pussy is stretching as <<$boydesc>> enters you. It feels good when <<$xyr>> <<dick>> centimeter rubber dick fucks your pussy. Gradually, a pleasant warmth and some pulsations start building up in your stomach, then the feeling decreases a little and remains like that until the end<<$temp_mens>>.'
+		if (grdif + ltdif) >= -3 and (grdif + ltdif) < 2: 'You flinch from a pleasant feeling when your pussy is stretched by <<$xyr>> dick. It feels good when <<$xyr>> <<dick>> centimeter fake dick fucks your pussy<<$temp_mens>>. Gradually, a pleasant warmth and some pulsations start building up in your stomach, then the feeling becomes unbearable and your entire body is covered with hot waves of orgasm as you scream with pleasure.'
+		if (grdif + ltdif) <  -3: 'You feel <<$xyr>> fake penis enter your pussy. This gives you a nice tingling feeling between your legs, but <<$xyr>> <<dick>> cm rubber dick is significantly less than what your pussy needs. It is not big enough for you. Gradually a pleasant warmth and some pulsations start building up in your stomach. Then the feeling decreases a little and remaines like that until the end<<$temp_mens>>.'
 		gs 'arousal','vaginal_strap',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
+		killvar '$get_hole_pain'
+		killvar 'grdif' & killvar 'ltdif'
 	else
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
 		pcs_horny = 0
@@ -69,15 +77,19 @@ if $ARGS[0] = 'd_vag_sex_bottle':
 
 	if pcs_vag > 0:
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
-		if (vgrdif + vltdif) >= 30: 'You groan in pain when the <<dick>> cm dildo enters your pussy. Tears flow from your eyes and between your legs feels as if you drove in a red-hot rod<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= 20 and (vgrdif + vltdif) < 30: 'You bite your lip in pain when the <<dick>> cm dildo enters your pussy.  You feel pain between your legs<<$temp_mens>>.'
+		grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], dick, grange, silavag
+		if (grdif + ltdif) >= 30: 'You groan in pain when the <<dick>> cm dildo enters your pussy. Tears flow from your eyes and between your legs feels as if you drove in a red-hot rod<<$temp_mens>>.'
+		if (grdif + ltdif) >= 20 and (grdif + ltdif) < 30: 'You bite your lip in pain when the <<dick>> cm dildo enters your pussy.  You feel pain between your legs<<$temp_mens>>.'
 		if cycle <= 0: $temp_mens = ', even though' + $temp_mens
-		if (vgrdif + vltdif) >= 12 and (vgrdif + vltdif) < 20: 'You flinch at the sudden pain when the <<dick>>cm dildo enters your pussy, but the pain between your legs slowly calms down and becomes quite tolerable. You are trying to be excited while moving the <<dick>> cm dildo inside your pussy <<$temp_mens>>, you don''t want it to go out.'
-		if (vgrdif + vltdif) >= 7 and (vgrdif + vltdif) < 12: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo<<$temp_mens>>.'
-		if (vgrdif + vltdif) >=  2 and (vgrdif + vltdif) < 7: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling subsides and feels nice until the end of<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= -3 and (vgrdif + vltdif) < 2: 'You''re startled by a pleasant sensation, when your pussy ravishly starts taking the dildo. Between your legs becomes very warm, and you feel a pleasant sensation, when a strong <<dick>> cm dildo moves back and forth in your wet pussy<<$temp_mens>>. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling descends on you and your entire body is covered in hot waves of orgasm. You start giving out involuntarily shouts of pleasure while ravishing the dildo.'
-		if (vgrdif + vltdif) <  -3: 'You feel the dildo penetrating your pussy. Between your legs feels nice, but the <<dick>>cm dildo is a bit too small for your pussy. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling slightly subsides and remains steady until the end of<<$temp_mens>>.'
+		if (grdif + ltdif) >= 12 and (grdif + ltdif) < 20: 'You flinch at the sudden pain when the <<dick>>cm dildo enters your pussy, but the pain between your legs slowly calms down and becomes quite tolerable. You are trying to be excited while moving the <<dick>> cm dildo inside your pussy <<$temp_mens>>, you don''t want it to go out.'
+		if (grdif + ltdif) >= 7 and (grdif + ltdif) < 12: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo<<$temp_mens>>.'
+		if (grdif + ltdif) >=  2 and (grdif + ltdif) < 7: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<dick>>cm dildo. Between your legs feels a little nice, when you fuck yourself with the dildo. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling subsides and feels nice until the end of<<$temp_mens>>.'
+		if (grdif + ltdif) >= -3 and (grdif + ltdif) < 2: 'You''re startled by a pleasant sensation, when your pussy ravishly starts taking the dildo. Between your legs becomes very warm, and you feel a pleasant sensation, when a strong <<dick>> cm dildo moves back and forth in your wet pussy<<$temp_mens>>. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling descends on you and your entire body is covered in hot waves of orgasm. You start giving out involuntarily shouts of pleasure while ravishing the dildo.'
+		if (grdif + ltdif) <  -3: 'You feel the dildo penetrating your pussy. Between your legs feels nice, but the <<dick>>cm dildo is a bit too small for your pussy. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling slightly subsides and remains steady until the end of<<$temp_mens>>.'
 		gs 'arousal','vaginal_dildo',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
+		killvar '$get_hole_pain'
+		killvar 'grdif' & killvar 'ltdif'
 	else
 		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
 		pcs_horny = 0
@@ -94,12 +106,18 @@ if $ARGS[0] = 'd_analsex_dildo':
 		'You pull the plug out of your narrow and tight ass.'
 		analplugin = 0 & analplugout = 1
 	end
-	if mc_inventory['lubricant'] = 0:
-		'You have no lube, so you spit on your fingers and use your saliva to lubricate your anus.'
-		gs 'arousal', 'anal_finger', 1,'lube'
-	else
+
+	if auto_anal_lube = 1 and mc_inventory['lubricant'] > 0:
 		'You take a tube of lubricant and squeeze a little on your palm and rub your anus.'
-		gs 'arousal', 'anal_finger', 1,'lube'
+		mc_inventory['lubricant'] -= 1
+		gs 'arousal', 'anal_finger', 1, 'lube'	
+	else
+		if auto_anal_lube = 0:
+			'You spit on your fingers and use your saliva to lubricate your anus.'
+		else
+			'You have no lube, so you spit on your fingers and use your saliva to lubricate your anus.'
+		end
+		gs 'arousal', 'anal_finger', 1, 'spit'
 	end
 
 	'You begin to massage your anus with your fingers.'
@@ -109,18 +127,22 @@ if $ARGS[0] = 'd_analsex_dildo':
 
 	'You pull your fingers out of your ass and place the dildo near your hole.'
 
-	if (agrdif + altdif) >= 20:'You scream and bite your lip after a sharp pain when the <<dick>>cm dildo enters your ass.'
-	if (agrdif + altdif) <  20:'You moan when the <<dick>>cm dildo enters your ass.'
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], dick, grange, silavag
+	if (grdif + ltdif) >= 20:'You scream and bite your lip after a sharp pain when the <<dick>>cm dildo enters your ass.'
+	if (grdif + ltdif) <  20:'You moan when the <<dick>>cm dildo enters your ass.'
 
 	'You stop for a moment, giving your ass time to adjust to the dildo inside it, and then start to slowly move, stretching your anus.'
 	
-	if (agrdif + altdif) >= 30:
+	if (grdif + ltdif) >= 30:
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You feel like your anus is stretching when the dildo enters you. You start to moan rhythmically in unison with the <<dick>>cm dildo''s movements inside you.'
-	elseif (agrdif + altdif) >= 20 and (agrdif + altdif) < 30:
+	elseif (grdif + ltdif) >= 20 and (grdif + ltdif) < 30:
 		pcs_horny += 10
 		'You moan in pleasure while the dildo moves inside your ass.'
 	end
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 	gs 'arousal','anal_dildo', ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
 end
 
@@ -133,17 +155,21 @@ if $ARGS[0] = 'd_strapon_anal':
 	if pcs_ass >= 10:'<<$xec>> starts to stretch your anus using three fingers.'
 	*p '<<$boydesc>> pulls <<$xyr>> fingers out of your ass and you feel '
 	if rand(0,1)=0: '<<$xyr>> fake cock near your hole.' else '<<$xem>> pushing <<$xyr>> fake cock into your hole.'
-	if (agrdif + altdif) >= 20:'You scream and bite your lip from a sharp pain when <<$xyr>> fake <<dick>> centimeter dick enters your ass.'
-	if (agrdif + altdif) <  20:'You moan when <<$xyr>> <<dick>>cm rubber dick enters your ass.'
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], dick, grange, silavag
+	if (grdif + ltdif) >= 20:'You scream and bite your lip from a sharp pain when <<$xyr>> fake <<dick>> centimeter dick enters your ass.'
+	if (grdif + ltdif) <  20:'You moan when <<$xyr>> <<dick>>cm rubber dick enters your ass.'
 	'<<$boydesc>> stops for a moment, giving your ass time to adjust to <<$xyr>> cock inside it. Then <<$xe>> starts to slowly move, stretching your anus.'
 
-	if (agrdif + altdif) >= 30:
+	if (grdif + ltdif) >= 30:
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You cry and bite your lip when the <<dick>> centimeter fake cock begins to fuck your ass with full force!. Your ass feels like it is on fire and all you want is for this torture to be over quickly.'
-	elseif (agrdif + altdif) >= 20 and (agrdif + altdif) < 30:
+	elseif (grdif + ltdif) >= 20 and (grdif + ltdif) < 30:
 		pcs_horny += 10
 		'You feel like your anus is stretching when <<$xyr>> fake shaft enters you. You start to moan rhythmically in unison with <<$xyr>> fake cock''s movements inside of you.'
 	end
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 	gs 'arousal','anal', ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
 end
 
@@ -172,16 +198,20 @@ if $ARGS[0] = 'd_analsex_bottle':
 
 	'You stopped for a moment, giving your ass time to adjust to the bottle neck inside it, and then start to slowly move, stretching your anus.'
 
-	if (agrdif + altdif) >= 20:'You scream and bite your lip from a sharp pain when the bottle enters your ass.'
-	if (agrdif + altdif) <  20:'You moan when the bottle enters your ass.'
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], dick, grange, silavag
+	if (grdif + ltdif) >= 20:'You scream and bite your lip from a sharp pain when the bottle enters your ass.'
+	if (grdif + ltdif) <  20:'You moan when the bottle enters your ass.'
 
-	if (agrdif + altdif) >= 30:
+	if (grdif + ltdif) >= 30:
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You feel like your anus is stretching when the bottle enters you. You start to moan rhythmically in unison with the bottle''s movements inside of you.'
-	elseif (agrdif + altdif) >= 20 and (agrdif + altdif) < 30:
+	elseif (grdif + ltdif) >= 20 and (grdif + ltdif) < 30:
 		pcs_horny += 10
 		'You moan in pleasure when the bottle moves inside your ass.'
 	end
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 	gs 'arousal','anal_dildo', ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
 end
 
@@ -193,31 +223,39 @@ if $ARGS[0] = 'doublepenetration':
 	frost = 0
 	TotPain = 0
 	if pcs_vag > 0:
-		if (vgrdif + vltdif) >= 30: TotPain +=4 & 'You groan in pain when <<$boydesc1>> penetrates you, tears flow from your eyes and it feels like someone drove a red-hot rod into your vagina.'
-		if (vgrdif + vltdif) >= 20 and (vgrdif + vltdif) < 30: TotPain +=3 & 'You bite your lip in pain when <<$boydesc1>> enters you, it is very painful.'
-		if (vgrdif + vltdif) >= 12 and (vgrdif + vltdif) < 20: TotPain +=2 & 'You wince at the sudden pain when <<$boydesc1>> enters, it hurts but gradually it becomes quite tolerable.'
-		if (vgrdif + vltdif) >= 7 and (vgrdif + vltdif) < 12: TotPain +=1 & 'You are startled by the feeling of your pussy stretching when <<$boydesc1>> enters you.'
-		if (vgrdif + vltdif) >=  2 and (vgrdif + vltdif) < 7: 'You are startled by the feeling of your pussy stretching as <<$boydesc1>> enters you.'
-		if (vgrdif + vltdif) >= -3 and (vgrdif + vltdif) < 2: 'You flinch from a pleasant feeling when your pussy is stretched by <<$xyr1>> dick.'
-		if (vgrdif + vltdif) <  -3: 'You feel <<$xyr1>> penis entering your pussy. This gives you a nice tingling feeling between your legs, but <<$xyr>> <<dick>> cm dick is significantly smaller than what your pussy needs.'
+		grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+		dynamic $get_hole_pain, pcs_vag, vaginal_slip, pain['vaginal'], dick, grange, silavag
+		if (grdif + ltdif) >= 30: TotPain +=4 & 'You groan in pain when <<$boydesc1>> penetrates you, tears flow from your eyes and it feels like someone drove a red-hot rod into your vagina.'
+		if (grdif + ltdif) >= 20 and (grdif + ltdif) < 30: TotPain +=3 & 'You bite your lip in pain when <<$boydesc1>> enters you, it is very painful.'
+		if (grdif + ltdif) >= 12 and (grdif + ltdif) < 20: TotPain +=2 & 'You wince at the sudden pain when <<$boydesc1>> enters, it hurts but gradually it becomes quite tolerable.'
+		if (grdif + ltdif) >= 7 and (grdif + ltdif) < 12: TotPain +=1 & 'You are startled by the feeling of your pussy stretching when <<$boydesc1>> enters you.'
+		if (grdif + ltdif) >=  2 and (grdif + ltdif) < 7: 'You are startled by the feeling of your pussy stretching as <<$boydesc1>> enters you.'
+		if (grdif + ltdif) >= -3 and (grdif + ltdif) < 2: 'You flinch from a pleasant feeling when your pussy is stretched by <<$xyr1>> dick.'
+		if (grdif + ltdif) <  -3: 'You feel <<$xyr1>> penis entering your pussy. This gives you a nice tingling feeling between your legs, but <<$xyr>> <<dick>> cm dick is significantly smaller than what your pussy needs.'
+		killvar '$get_hole_pain'
+		killvar 'grdif' & killvar 'ltdif'
 	else
 		pcs_horny = 0
 		pcs_mood -= 15
 		TotPain +=4
 		'You bite your <<$pc_desc[''lips'']>> lips in pain and tears start to flow from your eyes when <<$boydesc1>> penetrates you, breaking your hymen.'
 	end
-	if (agrdif + altdif) >= 20: TotPain +=1 & 'You scream and bite your lip from a sharp pain when <<$xyr2>> <<dick2>> centimeter dick enters your ass.'
-	if (agrdif + altdif) <  20:'You moan when <<$xyr2>> <<dick2>> centimeter dick enters your ass.'
+	grange = dyneval('result=strpos(''skinny   slimx     well pr   thicker   thickx    massive   monstrous'',$ARGS[0])',mid($dick_girth+'x',1,6))/2
+	dynamic $get_hole_pain, pcs_ass, anal_slip, pain['asshole'], dick, grange, silavag
+	if (grdif + ltdif) >= 20: TotPain +=1 & 'You scream and bite your lip from a sharp pain when <<$xyr2>> <<dick2>> centimeter dick enters your ass.'
+	if (grdif + ltdif) <  20:'You moan when <<$xyr2>> <<dick2>> centimeter dick enters your ass.'
 	'<<$boydesc2>> stops for a moment, giving your ass time to adjust to <<$xyr2>> cock inside it. He then starts to slowly move, stretching your anus.'
 
-	if (agrdif + altdif) >= 30:
+	if (grdif + ltdif) >= 30:
 		if pcs_makeup > 1:pcs_makeup = 0
 		'You cry and bite your lip when the <<dick2>>cm cock begins to fuck your ass.'
 		TotPain +=1
-	elseif (agrdif + altdif) >= 20 and (agrdif + altdif) < 30:
+	elseif (grdif + ltdif) >= 20 and (grdif + ltdif) < 30:
 		pcs_horny += 10
 		'You feel like your anus is stretching when <<$xyr2>> penis enters you. You start to moan rhythmically in unison with <<$xyr2>> cock''s movements inside of you.'
 	end
+	killvar '$get_hole_pain'
+	killvar 'grdif' & killvar 'ltdif'
 
 	if totPAIN = 0:
 		'Feelings merge together when you move inside two members in contact with each other through a thin opening sharing your vagina filled <<dick1>> centimeter and a member of your <<$anustipe>> anus filled <<dick2>> centimeter member. Your abdomen burns as if pleasant sunlight was spreading heat throughout your body.'

+ 7 - 5
locations/din_bad.qsrc

@@ -133,10 +133,12 @@ if $ARGS[0] = 'd_bag':
 	end
 !! Hair options
 	*nl
-	if (mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1) and pcs_hairbsh = 0:
-		'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
-	elseif (mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1) and pcs_hairbsh = 1:
-		'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
+	if mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1:
+		if pcs_hairbsh = 0:
+			'There''s a hairbrush in your purse. <a href="exec: minut += min(15, max(1, pcs_hairlng / 80)) & pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
+		else
+			'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
+		end
 	end
 	if pcs_hairbsh > 0 and pcs_hairlng > 80 and hbraids = 0:
 		*nl
@@ -243,7 +245,7 @@ if $ARGS[0] = 'd_bag':
 	*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.'
 	if photographyEv >= 2: 'You have <a href="exec:gt''camera'',''start''">a camera</a> in your purse.'
-	if mc_inventory['newspaper'] = 1: newspaperVars['dbag'] = 1 & act 'Read your newspaper': gt 'newspaper', 'start'
+	if mc_inventory['newspaper'] = 1: act 'Read your newspaper': newspaperVars['dbag'] = 1 & gt 'newspaper', 'start'
 
 	act 'Return':gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 	'</td></tr></table></center>'

+ 76 - 81
locations/din_van.qsrc

@@ -339,93 +339,88 @@ $brit = "gs 'din_van', 'brit'"
 if $ARGS[0] = 'brit':
 	if lashair ! 1 and pcs_shave['free_razor'] + mc_inventory['razor'] > 0:
 		!! if shave_menu = 1: legs and pussy
+		$shave_act = ''
 		if shave_menu = 1 and mc_inventory['razor'] >= razors_to_use['all']:
 			if pcs_leghair >= 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
-				if pcs_leghair >= 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
-					if daystart - daystart_start < 9 and $start_type[1] = 'tg':
-						$shave_act = 'Shave your legs and pussy'
-						$shave_txt1 = '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.'
-						$shave_txt2 = '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. In the end, you get a pretty decent job done.'
-					elseif daystart - daystart_start < 29 and $start_type[1] = 'tg':
-						pcs_mood += 10
-						$shave_txt1 = '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:
-						$shave_act = 'Shave your legs and pussy'
-						if pcs_pubes > 10:
-							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the bush growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got everything.'
-							$shave_txt2 = 'Satisfied there isn''t even a single hair left, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
-						else
-							$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.'
-							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble left. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
-						end
-					elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
-						if pcs_pubes >= shave_trigger + 5:
-							$shave_act = 'Shave your legs and pussy'
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion before deciding what to do next.'
-						else
-							$shave_act = 'Shave your legs and trim your bush'
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you spend some time cleaning up the area around your styled pubic hair, trimming back stubble and hair until it''s neat and tidy again.'
-						end
-					elseif pubestyle = 9:
-						$shave_act = 'Shave your legs and maintain your bush'
-						if pcs_pubes >= 26:
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush and your bikini lines, until it is a neat and tidy lawn of hair.'
-						else
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it short and neat.'
-						end
-					elseif pubestyle = 10:
+				$shave_act = 'Shave your legs and pussy'
+				if daystart - daystart_start < 9 and $start_type[1] = 'tg':
+					$shave_txt1 = '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.'
+					$shave_txt2 = '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. In the end, you get a pretty decent job done.'
+				elseif daystart - daystart_start < 29 and $start_type[1] = 'tg':
+					pcs_mood += 10
+					$shave_txt1 = '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:
+					if pcs_pubes > 10:
+						$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the bush growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got everything.'
+						$shave_txt2 = 'Satisfied there isn''t even a single hair left, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
+					else
+						$shave_txt1 = 'You lather up your legs and crotch, grabbing your razor and carefully scraping away stubble that is growing from them.'
+						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble left. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
+					end
+				elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
+					if pcs_pubes >= shave_trigger + 5:
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion before deciding what to do next.'
+					else
 						$shave_act = 'Shave your legs and trim your bush'
-						if pcs_pubes >= 40:
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time hacking back the wild jungle covering your crotch. Soon enough, you''re left with a sophisticated and tidy bush of hair that neatly carpets your pussy.'
-						else
-							$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it neat and tidy.'
-						end
-					elseif pubestyle = 11:
-						$shave_act = 'Shave your legs and pussy'
-						if pcs_pubes <= 10:
-							$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
-							$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
-						else
-							$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
-						end
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you spend some time cleaning up the area around your styled pubic hair, trimming back stubble and hair until it''s neat and tidy again.'
+					end
+				elseif pubestyle = 9:
+					$shave_act = 'Shave your legs and maintain your bush'
+					if pcs_pubes >= 26:
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush and your bikini lines, until it is a neat and tidy lawn of hair.'
 					else
-						$shave_act = ''
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it short and neat.'
 					end
+				elseif pubestyle = 10:
+					$shave_act = 'Shave your legs and trim your bush'
+					if pcs_pubes >= 40:
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time hacking back the wild jungle covering your crotch. Soon enough, you''re left with a sophisticated and tidy bush of hair that neatly carpets your pussy.'
+					else
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it neat and tidy.'
+					end
+				elseif pubestyle = 11:
+					if pcs_pubes <= 10:
+						$shave_txt1 = 'You do your legs first before realizing that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
+						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
+					else
+						$shave_txt1 = 'You do your legs first before lathering up your crotch and taking a razor to the hair growing there. After a few minutes of shaving, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, enjoying the newfound smoothness of your pussy.'
+					end
+				else
+					$shave_act = ''
+				end
 
-
-					if $shave_act ! '':
-						act '<<$shave_act>> (0:15)':
-							menu_off = 1
-							*clr & cla
-							!! if $locM = 'uni_dorm' and $loc ='vann' and rand(0, 5) = 0:gt 'vann', 'brit1'
-							if shave_length < 2:
-								if pcs_pubes <= 10:
-									'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
-								else
-									'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
-								end
-							else
-								'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
-							end
-							*nl
-							'<<$shave_txt1>>'
-							*nl
-							'<<$shave_txt2>>'
-							minut += 15
-							pcs_leghair = 0
-							stat['leg_hair_growth_timer'] = totminut
-							pcs_pubes = shave_length
-							stat['pube_growth_timer'] = totminut
-							pcs_horny += 5
-							if pcs_shave['free_razor'] = 1:
-								pcs_shave['free_razor'] = 0
+				if $shave_act ! '':
+					act '<<$shave_act>> (0:15)':
+						menu_off = 1
+						*clr & cla
+						!! if $locM = 'uni_dorm' and $loc ='vann' and rand(0, 5) = 0:gt 'vann', 'brit1'
+						if shave_length < 2:
+							if pcs_pubes <= 10:
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_stubble.mp4"></center>'
 							else
-								mc_inventory['razor'] -= razors_to_use['all']
+								'<center><video autoplay loop src="images/shared/home/bathroom/shave_bush.mp4"></center>'
 							end
-							gs 'din_van', 'dryOff'
-							gs 'selfplay', 'bathtub_dildo_check'
-							gs 'selfplay', 'shower_dildo_check'
+						else
+							'<center><video autoplay loop src="images/shared/home/bathroom/trim_bush.mp4"></center>'
 						end
+						*nl
+						'<<$shave_txt1>>'
+						*nl
+						'<<$shave_txt2>>'
+						minut += 15
+						pcs_leghair = 0
+						stat['leg_hair_growth_timer'] = totminut
+						pcs_pubes = shave_length
+						stat['pube_growth_timer'] = totminut
+						pcs_horny += 5
+						if pcs_shave['free_razor'] = 1:
+							pcs_shave['free_razor'] = 0
+						else
+							mc_inventory['razor'] -= razors_to_use['all']
+						end
+						gs 'din_van', 'dryOff'
+						gs 'selfplay', 'bathtub_dildo_check'
+						gs 'selfplay', 'shower_dildo_check'
 					end
 				end
 			else
@@ -433,11 +428,12 @@ if $ARGS[0] = 'brit':
 			end
 		end
 
+		$shave_act = ''
 		!! if shave_menu = 2: pussy only
 		if (shave_menu = 2 or shave_menu = 1) and mc_inventory['razor'] >= razors_to_use['pussy']:
 			if pubestyle > 0 and pcs_pubes >= shave_trigger:
+				$shave_act = 'Shave your pussy'
 				if pubestyle = 1:
-					$shave_act = 'Shave your pussy'
 					if pcs_pubes <= 10:
 						$shave_txt1 = 'You lather up yourself up, and grab your razor, carefully scraping away stubble that is growing from your crotch.'
 						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is silky smooth once again.'
@@ -446,7 +442,6 @@ if $ARGS[0] = 'brit':
 					end
 				elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
 					if pcs_pubes >= shave_trigger + 5:
-						$shave_act = 'Shave your pussy'
 						$shave_txt1 = 'You lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion.'
 					else
 						$shave_act = 'Trim your bush'
@@ -468,7 +463,6 @@ if $ARGS[0] = 'brit':
 						$shave_txt1 = 'You spend some time maintaining your bush, trimming back the edges, keeping it neat and tidy.'
 					end
 				elseif pubestyle = 11:
-					$shave_act = 'Shave your pussy'
 					if pcs_pubes <= 10:
 						$shave_txt1 = 'As the water of the shower continues to roll down your body, you suddenly realize that the stubble growing around your pussy is starting to become irritating and you can''t put it off any longer. Lathering yourself up, you grab your razor and carefully scrape away the rough itchy hairs have been bothering you so.'
 						$shave_txt2 = 'After a few minutes of work, you take a moment to inspect yourself, making sure you got every last pube and there isn''t even a bit of stubble hiding in the folds of your crotch somewhere. Satisfied, you rinse yourself off, smiling in relief that your pussy is smooth once again.'
@@ -478,6 +472,7 @@ if $ARGS[0] = 'brit':
 				else
 					$shave_act = ''
 				end
+
 				if $shave_act ! '':
 					act '<<$shave_act>> (0:10)':
 						menu_off = 1

+ 5 - 5
locations/dinfather.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] =  'father act 1':
             gs 'arousal', 'flashlite', 5
             gs 'arousal', 'end'
             gs 'stat'
-            
+
             '<center><img <<$set_imgh>> src="images/shared/sex/exhibitionism/fatherim30.jpg"></center>'
             'In a moment of horniness, you slowly and teasingly bend over with a playful smile on your lips, providing your stepfather with an amazing view of your <<$titsize>> breasts.'
 
@@ -39,7 +39,7 @@ if $ARGS[0] =  'father act 2':
             gs 'arousal', 'erotic', 5, 'incest'
             gs 'arousal', 'end'
             gs 'stat'
-            
+
             '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim28.jpg"></center>'
             'Unable to stop yourself, you stare at his groin and notice the outline of his erect cock through the fabric. Absent-mindedly you bring a hand to your breasts and knead it gently, letting out a barely audible moan.'
 
@@ -68,7 +68,7 @@ if $ARGS[0] =  'father act 3':
             gs 'arousal', 'flash', 5
             gs 'arousal', 'end'
             gs 'stat'
-            
+
             'You, while pretending to not notice, slowly spread your legs as you talk.'
 
             if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
@@ -269,7 +269,7 @@ if $ARGS[0] =  'watchtv_act1':
             gs 'arousal', 'flashlite', 5
             gs 'arousal', 'end'
             gs 'stat'
-            
+
             'Soon after you join your stepfather on the couch to watch TV, you feel a bit sleepy. You snuggle up against your stepfather''s chest and close your eyes.'
 
             if pcs_apprnc + (npc_rel['A28']/10) < 60:fatherLust = 2
@@ -601,7 +601,7 @@ if $ARGS[0] = 'gardrunkchat':
     end
     if fame['pav_slut'] >= 150 and dyadyamishaevent = 1 and dmishaday ! daystart and fatherandmisha!1:
         *clr & cla
-        '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
+        '<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big28.jpg"></center>'
         'Uncle Misha kept staring at you. Suddenly he turns to your stepfather.'
         '"So, Vladimir, did you know your <<$pcs_nickname>> is a <<$gnikname>>?"'
         'Your stepfather is clearly confused. "What are you talking about, Misha?"'

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