1
0

235 İşlemeler bae344eed8 ... debc7e695d

Yazar SHA1 Mesaj Tarih
  Kevin_Smarts debc7e695d [fixed] number separaters and nipple/lip confusion resolved from Hooded Silence 1 yıl önce
  Kevin_Smarts 7887bc0d0b Merge remote-tracking branch 'Hornguy6/master' 1 yıl önce
  hornguy6 bfb79b83f0 [fixed] missing word 1 yıl önce
  Kevin_Smarts 7db3dfb747 [fixed] Returning to wrong place when using default sports shortcut and wrong variable in array breaking the Too Risque only button 1 yıl önce
  Kevin_Smarts d60c2e61f4 [added] Option to change into and out of sports clothing directly in places where you can exercise and access changing room 1 yıl önce
  Kevin_Smarts e2e5bbd4b8 [fixed] timings for Squats in exercise sets all set to show first set 1 yıl önce
  Kevin_Smarts 930a8627b2 Merge remote-tracking branch 'Hornguy6/master' 1 yıl önce
  Kevin_Smarts 1e9f7693d9 [text edit] missing word 1 yıl önce
  Kevin_Smarts bf8518ec1d [fixed] Very old style cum calls updated and so gosubs I made into gotos in error in last commit 1 yıl önce
  Kevin_Smarts 96800c8da3 [fixed] some old style cum calls removed and tidied things up so that it is a bit easier to follow 1 yıl önce
  hornguy6 7215ff892e [fixed] consistency and dead ends 1 yıl önce
  Kevin_Smarts d9569fad35 [fixed] correction for heavy weight use 1 yıl önce
  Kevin_Smarts 90e5bbd5ce [fixed] typo 1 yıl önce
  Kevin_Smarts 8e91498129 [fixed] added thje word squat to the 5th column 1 yıl önce
  Kevin_Smarts f503cd9026 [fixed] Screen not being cleared causing actions to remain 1 yıl önce
  Kevin_Smarts 5e614dbef6 [fixed] 3 amigo beer time makes the boys like you now 1 yıl önce
  Kevin_Smarts 6f594bb3d6 [fixed] group bonus from "rebel" uniform to Gopnik added to stairwell chat and fixed inhib check in wardrobe 1 yıl önce
  Kevin_Smarts 92dce707ec [fixed] Attributes for school skirts and some of the messages for them were wrong and needed re-evaluation 1 yıl önce
  Kevin_Smarts 9b0957b53a Merge remote-tracking branch 'HotMike/master' 1 yıl önce
  HotMike 47e576936c Text edit: typos and grammar in Katja. 1 yıl önce
  Anya 2de4af282f [fixed] image address to match existing folder 1 yıl önce
  Kevin_Smarts 9d57b3eec3 Merge remote-tracking branch 'Vengeance_11/master' 1 yıl önce
  Kevin_Smarts 6cfa9ce3a5 [changed] Moved gym exercise images to more logical location under instruction from Anya 1 yıl önce
  Vengeance_11 631fed8a95 Proofreading. Nuff said. 1 yıl önce
  Kevin_Smarts 690b78870d [added] updater to hopefully fix fuckbuddy bug in old saves 1 yıl önce
  Kevin_Smarts c752fd0e75 [changed] Butt training gains merged into exercise gosub to make it cleaner, thanks bg! 1 yıl önce
  Kevin_Smarts cb85d25e65 [added] New butt exercises, images in next image pack 1 yıl önce
  Kevin_Smarts 0fb99fd6bf [fixed] "text edits and line breaks added. The main change is changing the person that stops you in the hall from Sonia to a teacher, since Sonia no longer makes sense with the changes to how we make her fall now." - nutluck 1 yıl önce
  Kevin_Smarts 1a45a7f07c [fixed] Eye colour couldn't decide if its gray or grey 1 yıl önce
  Kevin_Smarts 68e0375470 Merge remote-tracking branch 'Anya/master' 1 yıl önce
  Kevin_Smarts 9104ccbaac Merge remote-tracking branch 'HotMike/master' 1 yıl önce
  Anya dd03b2289f [added] - new 2023 splashes 1 yıl önce
  HotMike 72d632bd3d Text edit. Fixed my own typo 1 yıl önce
  hornguy6 76cd62271c [fixed] using shoe variables for coats instead of coat variables for coats 1 yıl önce
  bgkjdgbizgblzdgbr 01193314a5 [fixed] Mother should also use the correct day for graduation now. 1 yıl önce
  bgkjdgbizgblzdgbr 4125a3f8a9 [fixed] Changed the SchoolAtestat = 0 to $home['current'] = 'parents_home' so you can actaully eat at home whne still living there. 1 yıl önce
  Kevin_Smarts 8895959b5a Merge remote-tracking branch 'HotMike/master' 1 yıl önce
  bgkjdgbizgblzdgbr 8b37d3133b [changed/fixed] Fixed the date of the last day of school. 1 yıl önce
  HotMike 861cc99e32 [Fix] missing space, reported by yanzaqw1 1 yıl önce
  HotMike e9d0d34837 Merge remote-tracking branch 'upstream/master' 1 yıl önce
  Kevin_Smarts 0674e0a3a7 [fixed] Correction for living at home check in your bedroom at parent's house 1 yıl önce
  Kevin_Smarts e9bc36b71e [fixed] Typos found by analyser 1 yıl önce
  HotMike 9d37cae5be Rewrite the chance code for Rolan. Now the chance should be 1/3 for a panty steal to start. 1 yıl önce
  Kevin_Smarts 8f1399a690 [fixed] Scandalicious everywhere!! 1 yıl önce
  HotMike 3001d7cdce Merge remote-tracking branch 'upstream/master' 1 yıl önce
  HotMike c19d6b8d5b Merge branch 'hotmike_1' 1 yıl önce
  HotMike 3b6afd2947 Rolan Grammar 1 yıl önce
  Kevin_Smarts 38a7b34d4f [fixed] Sleep was been held in suspension due to wrong sign and added daystart check to fix early next morning sleep deg 1 yıl önce
  Kevin_Smarts 159ee5dd7a [fixed] Names for 2 stores showing on quality sort in error 1 yıl önce
  Kevin_Smarts 3fe96a76fe Merge branch 'master' of hotmike/glife into master 1 yıl önce
  Anya 5270ec10c0 [fixed] Fixing nutlucks nutlucking 1 yıl önce
  Kevin_Smarts 2b3c55a555 [added] filters for panties and bodysuits, with cleanup for bras 1 yıl önce
  Kevin_Smarts f458a4a7c4 [revert] Changes to Nat from HS reversed by request as incomplete 1 yıl önce
  Kevin_Smarts 848eefc11d Merge remote-tracking branch 'Hooded_Silence/master' 1 yıl önce
  Kevin_Smarts 9716078f1c [fixed] Bras were not being sorted by quality in error 1 yıl önce
  Kevin_Smarts e20bbf31ca Merge remote-tracking branch 'Hornguy6/master' 1 yıl önce
  Kevin_Smarts 457683142d [changed] experience gains from chess increased depending on level of opponant and added fame on same scale 1 yıl önce
  Kevin_Smarts fccf417068 [fixed] Condoms in cheat menu to show all types and should fix problem with count being wrong 1 yıl önce
  Kevin_Smarts 9acac653d1 [fixed] No cum was being added from these sex events 1 yıl önce
  Kevin_Smarts 4d6b514367 [fixed] Wrong number in ARGS leadin to no card charge when buying guitar 1 yıl önce
  Kevin_Smarts 1c506afae6 [Added] Filters for bras, finally 1 yıl önce
  hornguy6 944b5a9ea5 [fixed] missing variable setting might have caused a problem 1 yıl önce
  HotMike 3f14c838fd [Text Edit] Rolan's events Capitals, text from variable names. 1 yıl önce
  HotMike feff06a420 Fix Grammer in random encounter. 1 yıl önce
  HotMike 0798ebd585 Some small grammar edits 1 yıl önce
  hornguy6 534c0e745a [changed] many things about the sex_ev files 1 yıl önce
  HotMike e3e2891e46 One more typo 1 yıl önce
  HotMike b6f1b97d6a Fix typos in Leonid arc 1 yıl önce
  HotMike 36d5f6c07f Fix some more typos in Anna's arc 1 yıl önce
  HotMike 5e86bb5ae9 Fix more typos in Anna's story arc 1 yıl önce
  HotMike 461ac32deb Fix more typos in Anna story arc 1 yıl önce
  HotMike afe4d5b0f9 Fix various typos 1 yıl önce
  HotMike 1a47abd118 Fixed missing image which is already present in media download 1 yıl önce
  bgkjdgbizgblzdgbr 8fac30833d [changed] Chnge some instrmusic_lvl checks to pcs_instrmusic, since that is skill that ells how well you play, and added exp gain to playing with nush. 1 yıl önce
  bgkjdgbizgblzdgbr 2cb5d44dc0 [fixed] Apprently Feofan loves that you flash other people that don't care. Also change it to the proper gs. 1 yıl önce
  Kevin_Smarts f5621af4db Merge remote-tracking branch 'origin/master' 1 yıl önce
  Kevin_Smarts 6d3408f6c7 [Fixed] This variable should never have been, thanks Unstable Egghead for pointing out its loney and pointless existance 1 yıl önce
  Kevin_Smarts e92338ea3e Merge branch 'hypno-threshold-fix' of Unstable.Egghead/glife into master 1 yıl önce
  Joshua Gwinn 3e5e3d4e3a Fix variable timeTresh using a non-existent variable hypnoType vs the intended hypnoTime 1 yıl önce
  bgkjdgbizgblzdgbr a3f158f311 [changed] Small update on the City Nightclub. A full bar with menu, nomore prostitution but you can be picked up by a couple on the dance floor. 1 yıl önce
  bgkjdgbizgblzdgbr 99a2b1aa13 [fixed] Not updated to correct rage of pcs_skin 1 yıl önce
  bgkjdgbizgblzdgbr efbf346b48 [fixed] Temporary variable for calculating groming penelties to appearence not reset properly. 1 yıl önce
  Sauls_Gaming_PC\Saul 1aa8df32ed Merge remote-tracking branch 'origin/master' 1 yıl önce
  Sauls_Gaming_PC\Saul dbe52fdd12 Merge remote-tracking branch 'Hornguy6/master' 1 yıl önce
  bgkjdgbizgblzdgbr fa7a11d791 [fiexd] More safe guards to the setting of grades in the intro. 1 yıl önce
  bgkjdgbizgblzdgbr a27a7dd341 [added] Making sure you don't have honework when school is over. 1 yıl önce
  hornguy6 e31e707f25 [fixed] forgot to remove duplicates - the old booty_call folder is still in there as a backup, currently holding off deleting it 1 yıl önce
  bgkjdgbizgblzdgbr 25ccd3afe2 [added] Some music store stuff by nutluck. 1 yıl önce
  Sauls_Gaming_PC\Saul fbdba3f041 Merge remote-tracking branch 'Hornguy6/master' 1 yıl önce
  Sauls_Gaming_PC\Saul 9c69d5235a [Test] 1 yıl önce
  bgkjdgbizgblzdgbr 6874b8c020 [changed] some sonia stuff by nutluck. 1 yıl önce
  Hooded Silence 582d36ad55 The Kevin Will Hate Me update - Part I 1 yıl önce
  bgkjdgbizgblzdgbr 4e5cb022ff [fixed] Cut and paste mistake made everybody much mor ugly, 1 yıl önce
  Kevin_Smarts 15bb7c57b4 Merge branch 'master' of jeep91/glife into master 1 yıl önce
  hornguy6 5fed86cb66 [added] various small things 1 yıl önce
  hornguy6 5612f958c2 [fixed] booty call date planning was using wrong variables 1 yıl önce
  hornguy6 7ef2666017 [fixed] original hookup setup situations now correctly send to the new files 1 yıl önce
  bgkjdgbizgblzdgbr 2fe06813df [added] New attibutes for training "bodybuilder" strength and for a bigger butt. Changed the apperance calculation and body picture selection to take the new strength pluss varibale into account. 1 yıl önce
  jeep91 afe8a6dba9 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 yıl önce
  jeep91 3a7f93851f Revert "[changed] Added the possibilty for Sveta to take driving lesson if owning a fake passport" 1 yıl önce
  jeep91 92d715e130 Revert "[fixed] Missing declaration of fake passport for driving license" 1 yıl önce
  bgkjdgbizgblzdgbr 9c8c888be8 [fixed] Biodad is not mom. Also it don't make sense that the father of you baby doesn't like you prevent you from telling Katja that they are the father. 1 yıl önce
  bgkjdgbizgblzdgbr f76f2f0d4e [fixed] I don't knbow how to code. 1 yıl önce
  Kevin_Smarts 37e9592048 Merge branch 'sources-changes' of StephanFuchs/glife into master 1 yıl önce
  jeep91 eb20e35e34 [fixed] Correction of string on screen for transparent clothing photshoot 1 yıl önce
  hornguy6 168a5bc355 [added] converstion from booty calls into a more all purpose type of event 1 yıl önce
  jeep91 a189094b87 [changed] Add bodysuit to the status window in the toolbar 1 yıl önce
  jeep91 77df53a35e [fixed] Missing declaration of fake passport for driving license 1 yıl önce
  jeep91 d7cc98393a [changed] Set name to the fake one instead of the real one in foto album for realism 1 yıl önce
  jeep91 cc86534d87 [changed] Added the possibilty for Sveta to take driving lesson if owning a fake passport 1 yıl önce
  jeep91 9db0b73e2d [fixed] Wrong variables for foto events 1 yıl önce
  Kevin_Smarts b6f5c4383c Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 yıl önce
  Kevin_Smarts 2389aef43a [changed] Text assumed you live in the city 1 yıl önce
  Vengeance_11 ce9bb9ee9d Framework for Albina at the university 1 yıl önce
  bgkjdgbizgblzdgbr b2140a8f05 [changed] The Uni Cafe now uses the system for bying food introduced with The Coffee Hole. 1 yıl önce
  bgkjdgbizgblzdgbr 3a37321a0e Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 yıl önce
  bgkjdgbizgblzdgbr ca09d612dc [fixed] More uni bugs. Thanks to DriveBy for spotting it. 1 yıl önce
  Kevin_Smarts f85565a537 Merge remote-tracking branch 'Hooded_Silence/master' 1 yıl önce
  Kevin_Smarts ac9ee17a6e Merge remote-tracking branch 'origin/master' 1 yıl önce
  Kevin_Smarts f0810dd305 [fixed] temp as geting overwritten and used before being set for use in text lines so just bypassed its use 1 yıl önce
  bgkjdgbizgblzdgbr 024f37962e [fixed] More uni bugs. 1 yıl önce
  Kevin_Smarts 33c13b80c1 [fixed] Values for clothing coverage not cleared in attributes files causing them to remain consistant 1 yıl önce
  Hooded Silence 15f54e4bd8 Changed waxing to match Stat Display and added new geoloc function. 1 yıl önce
  Kevin_Smarts 241c7f17de Merge remote-tracking branch 'Vengeance_11/master' 1 yıl önce
  Kevin_Smarts 115f6240b8 Merge remote-tracking branch 'Expurt/master' 1 yıl önce
  Vengeance11 076ad61fac Proofreading/text edits 1 yıl önce
  Kevin_Smarts 3a458049f3 [fixed] I can't believe have stupid I am 1 yıl önce
  Kevin_Smarts dcce4a835b [fixed] Block setting Christina's relationship to 20 if it is less than that. 1 yıl önce
  Kevin_Smarts 2707e97458 [changed] Made it clear what withdrawal Sveta is suffering from in this stat message 1 yıl önce
  Kevin_Smarts 175cb97276 [fixed] Wrong name on business card 1 yıl önce
  3xpurt 2b1cc562f4 [changed] Safer mod removal for Emergency menu (now asks for confirmation). Option to disable mods only displays if mods are installed. 1 yıl önce
  3xpurt eca807b5e8 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 yıl önce
  Kevin_Smarts 43f80d6614 [added] Image for braiding hair with Anya and dream about that momment for city starts 1 yıl önce
  3xpurt 4e45e6344e [fixed] location not found error in korrPar 1 yıl önce
  Kevin_Smarts 8e4d60b28d [fixed] Tapestry options using $curloc causing blank screen issues 1 yıl önce
  Kevin_Smarts b3d7368f3d [fixed] Bug fixes from noobtrain (I altered the card game odds to a compromise setting) 1 yıl önce
  Kevin_Smarts deff0b61dd Merge remote-tracking branch 'Hooded_Silence/master' 1 yıl önce
  Hooded Silence 02d34ed089 Minor improvements to how variables are displayed in private bathrooms and kitchens. 1 yıl önce
  Kevin_Smarts 603e3c5eeb [fixed] Some car repair code was screwy and renamed a couple of variables to help others when working on this stuff 1 yıl önce
  Kevin_Smarts 2244269abe [fixed] Missing end 1 yıl önce
  Kevin_Smarts 193f1f482c [fixed] Override of auto $loc_arg to prevent loop 1 yıl önce
  Stephan Fuchs e6eff36701 [FIX] $npc_notes index 5 -> 'A5' 1 yıl önce
  Stephan Fuchs bb5f0d4c36 [Spelling] You mother->Your mother 1 yıl önce
  Stephan Fuchs b2ba24fb3b Merge remote-tracking branch 'kevinsmarts/master' 1 yıl önce
  Vengeance11 04dcd349f6 Extra end added by mistake 1 yıl önce
  Vengeance11 ce125cceb5 Text edit 1 yıl önce
  Kevin_Smarts 840c4d1377 [changed] Quitting the cheer team has extra step to reduce accidents 1 yıl önce
  Vengeance11 576feb41d6 Albina teaches Sveta a new skill, removed unneeded calculations and fixed typos 1 yıl önce
  Stephan Fuchs 51c002b63c Merge remote-tracking branch 'kevinsmarts/master' 1 yıl önce
  Kevin_Smarts e7aeb4fbe0 Merge remote-tracking branch 'Hooded_Silence/release' 1 yıl önce
  Hooded Silence 1ca1323404 File didn't save the changes, reverted. 1 yıl önce
  Stephan Fuchs 37add943b8 Merge remote-tracking branch 'kevinsmarts/master' 1 yıl önce
  Hooded Silence 1c2d0ab12b Variable bug fixes, and added non-penetrative masturbation choice to city apartment. 1 yıl önce
  bgkjdgbizgblzdgbr 8dcf7ed389 [fixed] Missing reset of old group value when saying no to the gopniks. 1 yıl önce
  Kevin_Smarts 417382c0aa Merge remote-tracking branch 'Hooded_Silence/release' 1 yıl önce
  Kevin_Smarts 63e60084f3 Merge branch 'master' of https://git.tfgames.site/HoodedSilence/glife 1 yıl önce
  Kevin_Smarts 9c18697311 Merge remote-tracking branch 'origin/master' 1 yıl önce
  Kevin_Smarts 5fdf641b40 [added] Leotard for Dancer (sg) 1 yıl önce
  Stephan Fuchs 57f0fa31be Merge remote-tracking branch 'kevinsmarts/master' 1 yıl önce
  bgkjdgbizgblzdgbr d11e69256f [fixed/added] Made such that you can't take birthcontrol through the remider icon if you don't have any. Added a new text to tell you if you are out of birth control. 1 yıl önce
  Stephan Fuchs be90efb55f Merge remote-tracking branch 'kevinsmarts/master' 1 yıl önce
  bgkjdgbizgblzdgbr 406d9b241e [fixed] Made sure that the nerd game nights aren't at the pav community center in the second year. 1 yıl önce
  bgkjdgbizgblzdgbr 7ff41d56b2 [added/fixed] Make it clear if you stop studying with Katja because it was to late or you where in no condition to study, and fixed a missing reset of the variable. 1 yıl önce
  bgkjdgbizgblzdgbr 9ccc27fb31 [added] Random events at the Coffee Hole with Katja. 1 yıl önce
  bgkjdgbizgblzdgbr 2f464df609 [added] Katja quest for uni. 1 yıl önce
  bgkjdgbizgblzdgbr 435c324f0c [fixed] Wrong dispaly of grade in journal. 1 yıl önce
  bgkjdgbizgblzdgbr 7ae0a41071 [changed] non slut fame can now at most be 1200. 1 yıl önce
  bgkjdgbizgblzdgbr f0da79d406 [fixed] Wrong call to body_desc instead of to update the appreacence after getting eye work done. 1 yıl önce
  bgkjdgbizgblzdgbr 0ccd1fbce9 [changed] Deleted copy of breast description that have been move to another file 1 yıl önce
  Hooded Silence 43338896df More loc transitions, code clean up and variable fixes. 1 yıl önce
  Kevin_Smarts 069c089c7b [changed] Dancer city start to get a leotard and niucer swimwear in basic clothing pack 1 yıl önce
  Hooded Silence acd9821aaf Missing apostrophe that went wayward. 1 yıl önce
  Stephan Fuchs 1582189409 Merge remote-tracking branch 'kevinsmarts/master' 1 yıl önce
  Kevin_Smarts 5035728242 [fixed] Wrong numbered file name in link 1 yıl önce
  Kevin_Smarts 8180f957bd [fixed] Bodysuits were not by put on correctly from saved outfits leading to broken image box 1 yıl önce
  Kevin_Smarts 988230deb9 [fixed] Bad links spotted by sword 1 yıl önce
  Kevin_Smarts 8544c2df9e [fixed] Return code post date was not working from some loactions as 'start' was hardcoded 1 yıl önce
  Kevin_Smarts 1b35f9a0aa [fixed] Fronty was having a crisis of identity 1 yıl önce
  Kevin_Smarts 167bd9b77d [fixed] One tiny little missing apostrphe breaking everything 1 yıl önce
  Kevin_Smarts 774bee03fa [fixed] Left some reference code there in error. Shouldn't have broken anything 1 yıl önce
  Kevin_Smarts 1dc7157c00 [fixed] Very skimpy tops were able to by-pass the uniform regulations as only skirt length and outfit thickness was being checked. Now there are checs on inhib value and most revealing top cut to fix that. 1 yıl önce
  Kevin_Smarts 14af718915 Merge remote-tracking branch 'Hooded_Silence/release' 1 yıl önce
  Hooded Silence fbcc4cabb3 Updated Havana (fit) to use new location function and to use the tampon call. 1 yıl önce
  Kevin_Smarts 9a7e834924 [fixed] Missing gosub so no actions after putting on panties post urban rape event 1 yıl önce
  Kevin_Smarts af1d4ca0cc [changed] Starting school uniform for beautiful start was too kool for skool 1 yıl önce
  Kevin_Smarts 3523bba1c1 [fixed] typo 1 yıl önce
  Kevin_Smarts 94c01cc0c6 Merge remote-tracking branch 'Hooded_Silence/release' 1 yıl önce
  Hooded Silence 2b3581585c Fixed missing daily check that wayward from revisions and other code wrangling, and corrected variable type on check at various locations. 1 yıl önce
  Hooded Silence 6a1058b257 Loop-de-loop acrobatics are banned for good reason. Fixed check event loop logic. 1 yıl önce
  Kevin_Smarts 6f7a14b8c4 [fixed] Sorry, last commit had bad code. I've whippped it into shape 1 yıl önce
  Kevin_Smarts 907a9e7bf4 Merge remote-tracking branch 'Hooded_Silence/release' 1 yıl önce
  Kevin_Smarts a8ba945559 [added] Inhib ratings for clothing that expose pussy or breasts which raise the highest inhib level for clothing 1 yıl önce
  Hooded Silence b17b309443 emp functions update, and a new set location function to replace existing code in a more simplified manner. 1 yıl önce
  Kevin_Smarts 66547c126c Merge remote-tracking branch 'Derryth_Love/master' 1 yıl önce
  Kevin_Smarts 30b26e0148 [added] small QoL fix to the stats display to add a date suffix based on the event generator system from Hooded Silence 1 yıl önce
  Kevin_Smarts 157088f140 [changed] New way to set default school uniform outfit to be used when dressing for school in the morning. 1 yıl önce
  Kevin_Smarts 4b51fd23a6 [fixed] Attributes for this outfit were incorrect. It is actually a dress and should be in the dress folder but just correcting attributes for now 1 yıl önce
  Derryth_Love aa38edec2d Codes cry for hlpf, resolved 1 yıl önce
  Kevin_Smarts 60a7d62b8a [fixed] Missing clearances of action when forced to strip out of an outfit because you can't wear it 1 yıl önce
  Kevin_Smarts 120ba76d87 [changed] Beautiful start (sg) has had a starting wardrobe make over with cooler clothing to suit their look 1 yıl önce
  Kevin_Smarts 4620f51b22 [added] Option to end rental agreement in shared apartment 1 yıl önce
  Kevin_Smarts f4f4f7e7ae [fixed] Removed occasional lack of bra when picking set outfits when wearing a bodysuit 1 yıl önce
  Kevin_Smarts fd454e5957 [changed] willpower for all the starts to match school girl changes to starting willpower by nutluck 1 yıl önce
  Kevin_Smarts ad4ea1acb6 [fixed] Typos 1 yıl önce
  Kevin_Smarts 2b10fb7f9f [changed] Made things less cryptic in the Mercy clinic panty flash event 1 yıl önce
  Kevin_Smarts df75ea0ee8 [fixed] quality descriptions for underwear wasn't matching the attributes as they were on different scales. 1 yıl önce
  Kevin_Smarts a659dc5863 [added] Dispose option for bodysuits 1 yıl önce
  Kevin_Smarts ddd3565326 Merge remote-tracking branch 'hornguy6/master' 1 yıl önce
  Kevin_Smarts 67e5ac09e0 Merge remote-tracking branch 'netuttki/master' 1 yıl önce
  Kevin_Smarts d794c848d8 Merge remote-tracking branch 'maankamara/master' 1 yıl önce
  Kevin_Smarts 657e92a898 [fixed] Threre's no "color bone" for many reasons. 1 yıl önce
  hornguy6 26b054b01a [fixed] hopefully no more disappearing clothing 1 yıl önce
  netuttki 35cfe383f6 Merge remote-tracking branch 'upstream/master' 1 yıl önce
  maankamara b8ccfa7a7e changed stallionQ variables into uniform format for case sensitive indexing 1 yıl önce
  maankamara edd5f5e52a [change] shifted BC shot effect counter to work in positive numbers for clarity 1 yıl önce
  maankamara 145d872044 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 yıl önce
  maankamara 16316b9a0b [hotfix] A bit too heavy delete finger, returned some text lines 1 yıl önce
  maankamara 4aa4d5cbb1 [Fixed] Birthcontrol shot and implant purchase logic errors 1 yıl önce
  Kevin_Smarts 45035e77ae [fixed] Spelling errors 1 yıl önce
  maankamara c87b0b9f2b [fixed]Infinite loop when returning home to worried mother while still in school 1 yıl önce
  Kevin_Smarts df6a0b77e8 [changed] Should be able to visit family home even if you start in city or at uni, unless Mom threw you out. 1 yıl önce
  Kevin_Smarts 8a3888e6b9 Merge remote-tracking branch 'maankamara/master' 1 yıl önce
  Kevin_Smarts 82d63fddeb Merge remote-tracking branch 'Derryth_Love/master' 1 yıl önce
  Kevin_Smarts ff6f1d80fd [fixed] it was raising A14 instead of A4 when you talked to him at the disco. so it was raising Katja instead by mistake. fix from nutluck 1 yıl önce
  maankamara bac38b7336 reverting the nikointro change 1 yıl önce
  Derryth_Love d9980fdbd2 fixed missing gossip images 1 yıl önce
  maankamara f758a7f1e8 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 1 yıl önce
  Kevin_Smarts 9019fc3b97 [fixed] Lunch chat with Niko had Gopnik exception but that just lead to deadend. 1 yıl önce
  maankamara 0edf9a434a [fixed]Gopnik sveta getting blank screen with Niko during lunch chat 1 yıl önce
  Kevin_Smarts 503dcde467 [fixed] Cum_cleanup shouldn't be reseting brushed teeth bonus. Its done manually for cases that need it 1 yıl önce
  Stephan Fuchs 677d45b8a8 VSC Workspace 1 yıl önce
  netuttki 25e4ce2a19 Merge remote-tracking branch 'upstream/master' 1 yıl önce
  Hooded Silence 35738bb582 Test. Ignore 1 yıl önce
  netuttki 87c03b1bce Merge remote-tracking branch 'upstream/master' 1 yıl önce
  netuttki ce54556d7b Merge remote-tracking branch 'upstream/master' 1 yıl önce
100 değiştirilmiş dosya ile 2863 ekleme ve 1949 silme
  1. 8 0
      glife.code-workspace
  2. 26 3
      glife.qproj
  3. 24 10
      locations/ApperanceSystem.qsrc
  4. 1 1
      locations/BDsex.qsrc
  5. 7 1
      locations/Cheatmenu_din.qsrc
  6. 7 7
      locations/FedorMisc.qsrc
  7. 7 7
      locations/KatjaHomeTalk.qsrc
  8. 5 6
      locations/Komp.qsrc
  9. 1 1
      locations/MagEncounterFairy.qsrc
  10. 9 3
      locations/NikoDates.qsrc
  11. 246 244
      locations/NikoEv.qsrc
  12. 21 7
      locations/NikoWhore.qsrc
  13. 1 1
      locations/_attributes_danilovich_coats.qsrc
  14. 4 2
      locations/_attributes_salacious_outfits.qsrc
  15. 24 24
      locations/_attributes_school.qsrc
  16. 1 1
      locations/abduction.qsrc
  17. 1 1
      locations/abductionCustomer.qsrc
  18. 50 19
      locations/albinahome.qsrc
  19. 12 11
      locations/anush_bedroom.qsrc
  20. 16 41
      locations/anushapt.qsrc
  21. 1 1
      locations/anushkaev1.qsrc
  22. 16 49
      locations/artemhome.qsrc
  23. 3 3
      locations/autosalonF.qsrc
  24. 5 5
      locations/autoservisF.qsrc
  25. 9 12
      locations/autotraidF.qsrc
  26. 110 110
      locations/avb.qsrc
  27. 3 4
      locations/avtonorm.qsrc
  28. 1 1
      locations/bass.qsrc
  29. 6 12
      locations/bedr.qsrc
  30. 132 121
      locations/bedrPar.qsrc
  31. 4 4
      locations/beg.qsrc
  32. 15 15
      locations/beg1.qsrc
  33. 251 0
      locations/beverage.qsrc
  34. 5 43
      locations/body.qsrc
  35. 1 1
      locations/body_desc.qsrc
  36. 9 5
      locations/booty_call.qsrc
  37. 236 14
      locations/bras.qsrc
  38. 3 2
      locations/buklinik_event.qsrc
  39. 26 21
      locations/carF.qsrc
  40. 2 2
      locations/cardgame_durak.qsrc
  41. 40 2
      locations/chessplay.qsrc
  42. 3 2
      locations/cikl.qsrc
  43. 3 3
      locations/city_clinic.qsrc
  44. 9 5
      locations/city_coffee_hole.qsrc
  45. 6 3
      locations/city_house_res_misc.qsrc
  46. 1 1
      locations/city_industrial.qsrc
  47. 1 1
      locations/city_jorahouse.qsrc
  48. 2 2
      locations/city_mansion_residence_2.qsrc
  49. 3 0
      locations/city_mansion_residence_3.qsrc
  50. 117 60
      locations/city_musicstore.qsrc
  51. 275 281
      locations/city_nightclub.qsrc
  52. 1 1
      locations/city_residential.qsrc
  53. 11 3
      locations/clothing.qsrc
  54. 11 3
      locations/clothing_QV.qsrc
  55. 15 6
      locations/clothing_attributes.qsrc
  56. 4 10
      locations/crossfit_north_box.qsrc
  57. 0 1
      locations/cum_cleanup.qsrc
  58. 4 4
      locations/danceclass.qsrc
  59. 5 4
      locations/dateM.qsrc
  60. 4 1
      locations/din_bad.qsrc
  61. 6 5
      locations/din_van.qsrc
  62. 2 2
      locations/dina.qsrc
  63. 4 0
      locations/dreams.qsrc
  64. 15 13
      locations/emp_functions.qsrc
  65. 2 2
      locations/ender.qsrc
  66. 5 5
      locations/enderKik.qsrc
  67. 80 35
      locations/exercise.qsrc
  68. 13 9
      locations/exp_gain.qsrc
  69. 5 3
      locations/fame.qsrc
  70. 76 74
      locations/father.qsrc
  71. 7 18
      locations/fertility.qsrc
  72. 86 49
      locations/fit.qsrc
  73. 121 0
      locations/food.qsrc
  74. 83 11
      locations/food_menu.qsrc
  75. 11 11
      locations/foto_albums.qsrc
  76. 2 2
      locations/foto_events.qsrc
  77. 1 1
      locations/foto_nude_debut.qsrc
  78. 1 1
      locations/foto_shoot.qsrc
  79. 2 0
      locations/gdksport.qsrc
  80. 3 0
      locations/gopskver.qsrc
  81. 4 0
      locations/gschool_chats.qsrc
  82. 26 20
      locations/gschool_cheerleading.qsrc
  83. 88 88
      locations/gschool_coolkid_chats.qsrc
  84. 1 1
      locations/gschool_events.qsrc
  85. 31 31
      locations/gschool_gopnik_chats.qsrc
  86. 5 5
      locations/gschool_gossip.qsrc
  87. 3 0
      locations/gschool_grounds.qsrc
  88. 194 224
      locations/gschool_jock_chats.qsrc
  89. 23 2
      locations/gschool_lessons.qsrc
  90. 16 13
      locations/gschool_lessons1.qsrc
  91. 12 10
      locations/gschool_lessons2.qsrc
  92. 10 8
      locations/gschool_lessons3.qsrc
  93. 1 1
      locations/gschool_lunch.qsrc
  94. 10 10
      locations/gschool_nerd_chats.qsrc
  95. 17 21
      locations/gschool_outcast_chats.qsrc
  96. 1 0
      locations/gschool_socialchg.qsrc
  97. 7 5
      locations/hookup_after.qsrc
  98. 5 1
      locations/hookup_morning.qsrc
  99. 57 57
      locations/hotel_anna.qsrc
  100. 3 3
      locations/igor_schedule.qsrc

+ 8 - 0
glife.code-workspace

@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	],
+	"settings": {}
+}

+ 26 - 3
glife.qproj

@@ -668,7 +668,6 @@
 		<Location name="volAndGev"/>
 	</Folder>
 	<Folder name="Booty call">
-		<Location name="booty_call"/>
 		<Location name="booty_call_after"/>
 		<Location name="booty_call_condoms"/>
 		<Location name="booty_call_cowgirl"/>
@@ -682,7 +681,6 @@
 		<Location name="booty_call_work_talk1"/>
 		<Location name="booty_call_sex"/>
 		<Location name="booty_call_shower"/>
-		<Location name="booty_call_sms"/>
 		<Location name="booty_call_start"/>
 		<Location name="booty_call_stats"/>
 		<Location name="booty_call_talk"/>
@@ -690,6 +688,32 @@
 		<Location name="booty_call_virgin"/>
 		<Location name="booty_call_leave"/>
 	</Folder>
+	<Folder name="Sex Events For Generic NPCs">
+		<Location name="sex_ev_after"/>
+		<Location name="sex_ev_condoms"/>
+		<Location name="sex_ev_cowgirl"/>
+		<Location name="sex_ev_cum"/>
+		<Location name="sex_ev_doggy"/>
+		<Location name="sex_ev_foreplay"/>
+		<Location name="sex_ev_foreplay_desc"/>
+		<Location name="sex_ev_miss"/>
+		<Location name="sex_ev_morning"/>
+		<Location name="sex_ev_pillow_talk"/>
+		<Location name="sex_ev_pillow_talk2"/>
+		<Location name="sex_ev_favorite_part"/>
+		<Location name="sex_ev_work_talk1"/>
+		<Location name="sex_ev_sex"/>
+		<Location name="sex_ev_shower"/>
+		<Location name="sex_ev_start"/>
+		<Location name="sex_ev_stats"/>
+		<Location name="sex_ev_talk"/>
+		<Location name="sex_ev_reactions"/>
+		<Location name="sex_ev_virgin"/>
+		<Location name="sex_ev_leave"/>
+		<Location name="sex_ev_hookup_leave"/>
+		<Location name="booty_call"/>
+		<Location name="booty_call_sms"/>
+	</Folder>
 	<Folder name="Station Campus">
 		<Location name="pav_market"/>
 		<Location name="pav_train_hall"/>
@@ -866,7 +890,6 @@
 		<Location name="city_nightclub"/>
 		<Location name="city_nightclubToilet"/>
 		<Location name="Club2"/>
-		<Location name="vipclub"/>
 		<Location name="danceclass"/>
 		<Location name="city_library"/>
 		<Location name="fit"/>

+ 24 - 10
locations/ApperanceSystem.qsrc

@@ -174,23 +174,29 @@ if $ARGS[0] = 'SetBodyShapeBonus':
 		if succubusflag = 1:
 			tempBodyShapeBonus += 10
 		else
-			if strenbuf > 180:
-				tempBodyShapeBonus -= 70
+			if strenbuf > 190:
+				tempBodyShapeBonus -= 130
+			elseif strenbuf > 180:
+				tempBodyShapeBonus -= 100
+			elseif strenbuf > 170:
+				tempBodyShapeBonus -= 75
 			elseif strenbuf > 160:
-				tempBodyShapeBonus -= 50
-			elseif strenbuf > 140:
+				tempBodyShapeBonus -= 60
+			elseif strenbuf > 150:
+				tempBodyShapeBonus -= 45
+			elseif strenbuf <= 5 or strenbuf > 140:
 				tempBodyShapeBonus -= 30
-			elseif strenbuf <= 5 or strenbuf > 120:
+			elseif strenbuf <= 10:
 				tempBodyShapeBonus -= 20
-			elseif strenbuf <= 10 or strenbuf > 100:
+			elseif strenbuf <= 15 or strenbuf > 130:
 				tempBodyShapeBonus -= 15
-			elseif strenbuf <= 15 or strenbuf > 95:
+			elseif strenbuf <= 25:
 				tempBodyShapeBonus -= 10
-			elseif strenbuf <= 25 or strenbuf > 85:
+			elseif strenbuf <= 35 or strenbuf > 120:
 				tempBodyShapeBonus -= 5
-			elseif strenbuf <= 35 or strenbuf > 75:
+			elseif strenbuf <= 50 or strenbuf > 110:
 				tempBodyShapeBonus += 0
-			elseif strenbuf <= 45 or strenbuf > 60:
+			elseif strenbuf <= 70 or strenbuf > 100:
 				tempBodyShapeBonus += 5
 			else
 				tempBodyShapeBonus += 10
@@ -336,6 +342,14 @@ if $ARGS[0] = 'CalcGroomingPenalty':
 
 	result = sweatPenalty + glassesPenalty + hairDyePenalty + buzzCutPenalty + legPenalty + lipBalmPenalty + hairPenalty + deodorantPenalty
 
+	killvar 'buzzCutPenalty'
+	killvar 'deodorantPenalty'
+	killvar 'glassesPenalty'
+	killvar 'hairDyePenalty'
+	killvar 'hairPenalty'
+	killvar 'legPenalty'
+	killvar 'lipBalmPenalty'
+	killvar 'sweatPenalty'
 end
 
 

+ 1 - 1
locations/BDsex.qsrc

@@ -506,7 +506,7 @@ if $ARGS[0] = 'end':
 		InYouHome = 0
 		'<<$boydesc>> politely says goodbye and leaves.'
 
-		act 'Leave':gt $home['entrance'], 'start'
+		act 'Leave':gt $home['entrance'], $home['entrance_arg']
 
 		exit
 	elseif GoToGuy = 1:

+ 7 - 1
locations/Cheatmenu_din.qsrc

@@ -2875,7 +2875,13 @@ $cheatmenu['vartracker'] = {
 	'hypnoDay: <<hypnoDay>>'
 	'hypnoAddict: <<hypnoAddict>>'
 	'missCum: <<missCum>>'
-	'condoms/bad condoms: <<prezik>>/<<badprezik>>'
+	if preziktype = 0:
+		'condoms: in use(normal)/damaged/bad condoms: <<prezik+prezikcount>>/<<preziksabo>>/<<badprezik>>'
+	elseif preziktype = 1:
+		'condoms: (Not in use) normal/damaged/bad condoms: <<prezikcount>>/<<preziksabo>>/<<badprezik>>'
+	else
+		'condoms: in use (damaged)/normal/bad condoms: <<prezik+preziksabo>>/<<prezikcount>>/<<badprezik>>'
+	end
 	if tabletki > 0:
 		'pack(s) of birth control pills: <<tabletki>>'
 		if tabletkiold > 0: '	<<tabletkiold>> expired pack'

+ 7 - 7
locations/FedorMisc.qsrc

@@ -72,7 +72,7 @@ if $ARGS[0] = 'Fedor Chat':
 	else
 		act 'Move away': gt 'pav_disco_classmates', 'classmates'
 	end
-	
+
 	act 'Chat':
 		*clr & cla
 		npc_rel['A5'] += rand(5,10)
@@ -552,14 +552,14 @@ if $ARGS[0] = 'Fedor Workout':
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/gym/fedor.jpg"></center>'
-	if $ARGS[1] = 'workout_date': 
+	if $ARGS[1] = 'workout_date':
 		'Fedor gives you a warm smile after he has finished his warm up. "What do you want to do?."'
 	else
 		'You can see Fedor on his phone by some of the punching bags and as you approach, he lowers his phone then he flashes you a warm smile. "<<$pcs_firstname>> It''s always good to see you. Are you here to workout? or are you waiting for someone?" You reply, "I''m just keeping fit. I wanna look good for my handsome boyfriend." Fedor gives you a warm smile as he responds, "I''ve just been doing some warm ups. You can join me for some workouts, if you like."'
 
 		act 'I can''t right now but maybe later':gt 'gdksport', 'start'
 	end
-	
+
 	act 'Build strength':
 		*clr & cla
 		FedorWorkout = 1
@@ -597,7 +597,7 @@ if $ARGS[0] = 'Fedor Workout':
 			end
 		end
 	end
-	
+
 	act 'Increase endurance':
 		*clr & cla
 		FedorWorkout = 3
@@ -841,7 +841,7 @@ if $ARGS[0] = 'Outcast Intro':
 				minut += 5
 				FedorOutcast = 1
 				fedormasha = 0
-				$npc_notes[5] = 'Ever since Fedor gave Vasily a blowjob in the school courtyard, everyone calls him Masha but to you, he will always be Fedor.'
+				$npc_notes['A5'] = 'Ever since Fedor gave Vasily a blowjob in the school courtyard, everyone calls him Masha but to you, he will always be Fedor.'
 				gs 'stat'
 				'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/Outcast/outcast2.jpg"></center>'
@@ -880,7 +880,7 @@ if $ARGS[0] = 'Outcast':
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/Outcast/outcast1.jpg"></center>'
 			'You walk up to Fedor and he immediately turns to face you with a very welcoming smile on his face. "Hello <<$pcs_firstname>>, I''ve been reflecting on what we spoke about last time and I really need to thank you for cheering me up. I really needed that." You place your hand on his shoulder. "It was the least I can do Fedor." Fedor rubs your hand on his shoulder while still keeping his welcoming smile intact as he asks "So, is there anything I can do for you?" You wrap your fingers around his as you reply, "Fedor I... I just... I can''t stop thinking of you Fyodor. I need you in my life. Will you please take me back." Fedor replies with a shocked look on his face "If we hooked up again then Viktor will tear me apart. I''m just not strong enough to deal with him. I''m sorry."'
-			
+
 			act 'Continue':
 				*clr & cla
 				gs 'stat'
@@ -907,7 +907,7 @@ if $ARGS[0] = 'Outcast':
 				end
 				act 'I need some time to think about it':gt 'pav_park', 'start'
 			end
-		end	
+		end
 	elseif fedorKozlovQW = -15:
 		act 'Ask out on a date':
 			*clr & cla

+ 7 - 7
locations/KatjaHomeTalk.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = '':
 					gt 'KatjaHomeTalk', 'random_park_sex_talk'
 			
 				elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_pussy'] > 0: 
-					!!If Katja have has had her first time wiht Marcus she will discuss this the next time the player talks to her at home
+					!!If Katja have has had her first time with Marcus she will discuss this the next time the player talks to her at home
 					gt 'KatjaHomeTalk', 'first_boy_sex_follow_up'
 			
 				elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_asked'] = 1 and katjaQW['sex_clossedness'] = 0: 
@@ -561,7 +561,7 @@ if $ARGS[0] = 'katjaknows':
 	cla
 	npc_pregtalk['A14'] = 1
 	*nl
-	if katjaQW['slut'] < 60 and $wombthfathID = 'A34' and npc_rel['A34'] > 50:
+	if katjaQW['slut'] < 60 and $wombthfathID = 'A34':
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -570,7 +570,7 @@ if $ARGS[0] = 'katjaknows':
 		'"I wouldn''t be pregnant if he wasn''t," you laugh. "I only let the best cock inside me."'
 		'Katja blushes and you give her a quick kiss before she can react.'
 
-	elseif katjaQW['slut'] < 60 and $wombthfathID = 'A28' and npc_rel['A28'] > 50:
+	elseif katjaQW['slut'] < 60 and $wombthfathID = 'A28':
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -578,7 +578,7 @@ if $ARGS[0] = 'katjaknows':
 		'"You were knocked up by your step-dad!? That''s so crazy!"'
 		'Katja blushes and you give her a quick kiss before she can react.'
 
-	elseif katjaQW['slut'] < 60 and $wombthfathID = 'A29' and npc_rel['A29'] > 50:
+	elseif katjaQW['slut'] < 60 and $wombthfathID = 'A35':
 		minut += 10
 		'"So, who''s the baby-daddy?" Katja teases.'
 		*nl
@@ -596,7 +596,7 @@ if $ARGS[0] = 'katjaknows':
 		'Katja places a hand on your shoulder "<<$pcs_nickname>>, if I can do anything to make your life a little easier, please let me know."'
 		'You blush and thank her before planting a quick kiss on her cheek.'
 
-	elseif katjaQW['slut'] >= 60 and $wombthfathID = 'A34' and npc_rel['A34'] > 50:
+	elseif katjaQW['slut'] >= 60 and $wombthfathID = 'A34':
 		minut += 10
 		'"Who''d you let dump their load into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl
@@ -606,7 +606,7 @@ if $ARGS[0] = 'katjaknows':
 		'Katja chuckles. "I appreciate honesty and I think everyone should be free to explore their passions. Even if those passions revolve around riding your brother''s dick."'
 		'You find yourself questioning what you did to deserve such a wonderful woman in your life.'
 
-	elseif katjaQW['slut'] >= 60 and $wombthfathID = 'A28' and npc_rel['A28'] > 50:
+	elseif katjaQW['slut'] >= 60 and $wombthfathID = 'A28':
 		minut += 10
 		'"Who''d you let dump their load into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl
@@ -616,7 +616,7 @@ if $ARGS[0] = 'katjaknows':
 		'Katja chuckles. "I appreciate honesty and I think everyone should be free to explore their passions. Even if those passions are part of an Electra complex."'
 		'You find yourself questioning what you did to deserve such a wonderful woman in your life.'
 
-	elseif katjaQW['slut'] >= 60 and $wombthfathID = 'A29' and npc_rel['A29'] > 50:
+	elseif katjaQW['slut'] >= 60 and $wombthfathID = 'A35':
 		minut += 10
 		'"Who''d you let dump their load into that wonderful body of yours?" Katja asks while biting her bottom lip.'
 		*nl

+ 5 - 6
locations/Komp.qsrc

@@ -9,6 +9,11 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 	'Your computer boots up, and soon you''re looking at your operating system''s main screen.'
 
+	act 'Shut your computer down': 
+		killvar '$subs'
+		killvar 'access'
+		gt 'komp', 'fin'
+	end
 	act 'Play Solitaire (0:20)': gt 'komp', 'pasians'
 	
 	if AlbinaQW['flashdrive'] = 1:
@@ -44,12 +49,6 @@ if $ARGS[0] = 'start':
 	else
 		'You don''t have internet access here, and you don''t even have mobile internet.'
 	end
-
-	act 'Shut your computer down': 
-		killvar '$subs'
-		killvar 'access'
-		gt 'komp', 'fin'
-	end
 end
 
 

+ 1 - 1
locations/MagEncounterFairy.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'fairy_chat':
 		gs 'MagEncounterFairy', 'fairychattopic'
 		if fairyday['skin_increase'] <= 10 and fairyday ! daystart and fairyshoo = 0:
 			pcs_skin += 10
-			if pcs_skin > 900: pcs_skin = 900
+			if pcs_skin > 1000: pcs_skin = 1000
 			fairyday['skin_increase'] += 1
 			fairyday = daystart
 			gs 'stat'

+ 9 - 3
locations/NikoDates.qsrc

@@ -1482,10 +1482,16 @@ if $ARGS[0] = 'Sonia Block':
 	*clr & cla
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"Sonia Ivanko">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/soniaUpset.jpg"></center>'
-	'Niko wraps his arm around your neck then leads you to the locker room. As you are both walking, you suddenly hear, "No walking in the halls until class is back in session!" You turn to see Sonia Ivanko holding a notepad. Niko responds, "What''s it to you?" Sonia replies, "I''m the school hall monitor and it''s my duty to stop students from breaking the rules. So get back to the lunch room before I report you to the principle."'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/angry.jpg"></center>'
+	'Niko wraps his arm around your neck then leads you to the locker room. As you are both walking, you suddenly hear, "No walking in the halls until class is back in session!" You turn to see Miss Raven Braakman your English and Social sciences teacher, standing in the hallway looking very unhappy to find the two of you skipping class.'
+	'Niko responds, with his best seductive smile. "Come on teach, we''re arn''t doing anything wrong."'
+	'Miss Braakman replies, "It''s we are not doing anything wrong." Correcting him makes Niko tense up, you are not sure if because his charming smile failed or because she corrected him. "You know the rules, during lunch you have to stay in the cafeteria, the open class room, or the hall way between them. We already let you hangout in the stair well, so don''t push it and get back to where you are suppose to." Then she pauses a moment. "Unless you would rather have detention."'
 	*nl
-	'Niko grunts, "Fine! You really need to lighten up sometime Sonia. Better yet, try getting laid. It will help you not being such an up tight bitch." Sonia scowls then points her pencil at Niko. "Lunch room, NOW!" You can hear Niko utter under his voice, "If only <font color=#FF00FF>Sonia wasn''t such a prude and got laid</font> then we could have had a good time." As you both walk back to the cafeteria.'
+	'Niko grunts, "Fine! You really need to lighten up." You can hear Niko utter under his voice. "Better yet, try getting laid. It will help you not being such an up tight bitch."'
+    'Miss Braakman scowls. "What was that?"'
+	'Niko starts to seeth, but puts on a sweet smile when he turns back towards her. "Nothing, we was just talking about what we wanted for lunch."'
+	'Miss Braakman points in the direction of the cafeteria. "Cafeteria, NOW!"'
+	'Niko pulls you close to him and kisses the side of your head. "Don''t worry we will have our chance to have some fun." As you both walk back to the cafeteria.'
 
 	act 'Walk away':gt 'gschool_lunch', 'break'
 end

+ 246 - 244
locations/NikoEv.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'Intro':
 		NikoIntro = 1
 		gs'stat'
 		'As you are walking out of school, you bump into one of your schoolmates Niko Volkov, who immediately gives you a warm smile. "Hello there, My name is Niko Volkov, may I ask you your name?"'
-		act 'I am <<$pcs_firstname>>':	
+		act 'I am <<$pcs_firstname>>':
 			*clr & cla
 			if npc_rel['A189'] < 50:npc_rel['A189'] = 50
 			NikoLuv += 2
@@ -26,9 +26,9 @@ if $ARGS[0] = 'Intro':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
-			'You return the smile as you reply. "Hello yourself, my name is <<$pcs_firstname>>. Nice to meet you." Niko responds "Ahh <<$pcs_firstname>> what a beautiful name, very suitable for you. I need to get going but I am always available at lunchtime and would be very grateful, if you would grace me with your presence." He then gently grabs onto your fingers then raises it to his face before giving your hand a gentlkiss. "Goodbye for now <<$pcs_firstname>>, I look forward to seeing you again." Niko then waves to you as he walks away.'		
+			'You return the smile as you reply. "Hello yourself, my name is <<$pcs_firstname>>. Nice to meet you." Niko responds "Ahh <<$pcs_firstname>> what a beautiful name, very suitable for you. I need to get going but I am always available at lunchtime and would be very grateful, if you would grace me with your presence." He then gently grabs onto your fingers then raises it to his face before giving your hand a gentlkiss. "Goodbye for now <<$pcs_firstname>>, I look forward to seeing you again." Niko then waves to you as he walks away.'
 
-			act 'Leave':gt 'gschool_grounds', 'main'	
+			act 'Leave':gt 'gschool_grounds', 'main'
 		end
 		act 'Beat it!':
 			*clr & cla
@@ -38,10 +38,10 @@ if $ARGS[0] = 'Intro':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'
-			'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. "Why was he so calm? What is it with that guy?" Before shaking your head and walking away.'	
+			'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. "Why was he so calm? What is it with that guy?" Before shaking your head and walking away.'
 			act 'Leave':gt 'gschool_grounds', 'main'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'Lunch Intro':
@@ -70,11 +70,11 @@ if $ARGS[0] = 'Lunch Intro':
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'You sit down next to Niko and you both spend the next few minutes, getting to know each other.'
-			
+
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
-		end	
+		end
 	end
-	
+
 	act 'Beat it!':
 		*clr & cla
 		if npc_rel['A189'] > 25:npc_rel['A189'] = 25
@@ -83,10 +83,10 @@ if $ARGS[0] = 'Lunch Intro':
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
-		'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. '+$OpenInnerThought+'Why was he so calm? What is it with that guy?'+$CloseInnerThought+' Before shaking your head and walking away.'	
-		
+		'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. '+$OpenInnerThought+'Why was he so calm? What is it with that guy?'+$CloseInnerThought+' Before shaking your head and walking away.'
+
 		act 'Leave':gt 'gschool_lessons', 'short_break'
-	end	
+	end
 end
 
 if $ARGS[0] = 'Lunch Chat':
@@ -95,12 +95,12 @@ if $ARGS[0] = 'Lunch Chat':
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	if NikoFightDay = daystart:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised2.jpg"></center>'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised2.jpg"></center>'
 	elseif NikoPayback > 0:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-	else	
+	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-	end	
+	end
 	'<<$npc_notes[''A189'']>>'
 	if npc_grupTipe['A189'] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#FF00FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
 	if npc_grupTipe['A189'] = 4:'Niko is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
@@ -108,20 +108,20 @@ if $ARGS[0] = 'Lunch Chat':
 	if npc_rel['A189'] >= 20 and npc_rel['A189'] < 40:'You and Niko don''t get along very well.'
 	if npc_rel['A189'] >= 40 and npc_rel['A189'] < 60:'You and Niko have a normal relationship.'
 	if npc_rel['A189'] >= 60 and npc_rel['A189'] < 80:'You and Niko have a good relationship.'
-	if npc_rel['A189'] >= 80:'You and Niko have a great relationship.'	
+	if npc_rel['A189'] >= 80:'You and Niko have a great relationship.'
 	*nl
 	if NikoPayback = 2 and NikoPayed ! daystart:
 		'You approach Niko and he turns to you with a puzzled look on his face. "Hmm, how did I not see you earlier? I thought that you might have been sick today, but here you are, so now to business. How will you be paying today?"'
-	elseif NikoPayback = 2:	
+	elseif NikoPayback = 2:
 		'You approach Niko, he looks at you with a blank stare, "You''re all payed up today, so what brings you here?"'
-	elseif NikoPayback = 3:	
+	elseif NikoPayback = 3:
 		'You approach Niko and he turns to you then says, "Leave me alone. You are nothing but trouble." You giggle as you walk away.'
 	else
 		'You approach Niko and his eyes light up. "Hello <<$pcs_firstname>>. I''m so glad to see you again. Please take a seat and chat with me."'
 	end
-	
+
 	if NikoLuv > -4 and NikoPayback = 0:
-		act 'Chat':	
+		act 'Chat':
 			*clr & cla
 			NikoLuv += 1
 			npc_rel['A189'] += rand(5,10)
@@ -134,101 +134,103 @@ if $ARGS[0] = 'Lunch Chat':
 			if npc_rel['A189'] >= 40 and npc_rel['A189'] < 60:'You and Niko have a normal relationship.'
 			if npc_rel['A189'] >= 60 and npc_rel['A189'] < 80:'You and Niko have a good relationship.'
 			if npc_rel['A189'] >= 80:'You and Niko have a great relationship.'
-			
-			
-			act 'Go to class':gt 'gschool_lessons', 'short_break'
-		end	
-	end	
-	
-	if NikoLuv > -4 and NikoVolkovQW = 0 and NikoPayback = 0:
-		act 'Insult':	
-			*clr & cla	
-			npc_rel['A189'] -= 5
-			NikoLuv -= 1
-			minut += 5
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/pc/reactions/fuckoff1.jpg"></center>'
-			'You extend your middle finger at Niko as you walk past him. "Get lost loser." Niko turns his head as he responds. "Am I not worthy?" You continue to walk past him until you reach the hallway.'
-			
+
+
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
-		end	
-	end	
-	
-	if NikoPayback = 2 and NikoPayed ! daystart:
-		act 'Money (200 <b>₽</b>)':	
-			*clr & cla
-			money -= 200
-			NikoPayed = daystart
-			minut += 5
-			gs'stat'
-			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-			'"I have your money right here." You extend your hand, giving Niko (200 <b>₽</b>). Niko quickly counts it then gives you an approving nod, "it''s all here. Good, you''re all payed up for today, you can get going now."'	
-			
-			act 'Walk away':gt 'gschool_lunch', 'break'
 		end
-		
-		act 'Sex':	
-			*clr & cla
-			NikoPayed = daystart
-			minut += 5
-			gs'stat'
-			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-			'You cast your eyes down as you reply, "You can use my body as payment." Niko''s eyes light up, "I was hoping you''d say that. Let''s not waste time." Niko grabs your ass firmly while leading you to the less used restroom.'	
+	end
 
-			act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
-		end	
-		
-	elseif NikoPayback = 2 and NikoPayed = daystart and NikoPayback_Sex ! daystart:	
-		act 'Offer Niko sex':	
-			*clr & cla
-			NikoPayback_Sex = daystart
-			minut += 5
-			gs'stat'
-			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile'+rand(2,3)+'.jpg"></center>'
-			'You walk up to Niko and place your hand on his crotch, "I know that I already payed you in money, but I want to give you another special payment." Niko''s eyes light up, "Well, there''s no way, I''d say no to that. Let''s get going." Niko gives your ass a firm smack as you both head toward the less used restroom.'	
+	if NikoIntro > -1:
+		if NikoLuv > -4 and NikoVolkovQW = 0 and NikoPayback = 0:
+			act 'Insult':
+				*clr & cla
+				npc_rel['A189'] -= 5
+				NikoLuv -= 1
+				minut += 5
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/pc/reactions/fuckoff1.jpg"></center>'
+				'You extend your middle finger at Niko as you walk past him. "Get lost loser." Niko turns his head as he responds. "Am I not worthy?" You continue to walk past him until you reach the hallway.'
 
-			act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
+			end
 		end
-	end	
-	
-	if NikoPayback = 2 and NikoPayed = daystart:
-		act 'Chat':	
-			*clr & cla
-			minut += 10
-			gs'stat'
-			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-			'You reply, "I just want to talk. Is that alright?" Niko shrugs as he replies, "Sounds fine with me, I have some spare time." You and Niko spend the next few minutes, chatting about various topics.'
 
-			act 'Go to class':gt 'gschool_lessons', 'short_break'
-		end	
-	end	
-	
-	if NikoVolkovQW = 5 and NikoEv = 9:
-		act '<font color=#FF00FF><b>Special Activity</b></font>':	
-			*clr & cla
-			gs'stat'
-			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-			'You sit down next to Niko, "Hello Niko, I remember you telling me something about a special activity that you have planned." Niko grins as he replies, "I have something special for us today. Are you ready to find out what it is?" You suddenly feel a cold chill down your spine as he says that. '+$OpenInnerThought+'Why do I feel so nervous? I can''t shake the feeling that something bad is going to happen.</font>'
-			
-			act '<font color=#FF00FF>Go with Niko</font>':
-				if soniaPS = 0:
-					gt 'NikoDates', 'Sonia Block'
-				else
-					gt 'NikoWhore', 'Locker Room'
-				end	
-			end	
+		if NikoPayback = 2 and NikoPayed ! daystart:
+			act 'Money (200 <b>₽</b>)':
+				*clr & cla
+				money -= 200
+				NikoPayed = daystart
+				minut += 5
+				gs'stat'
+				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
+				'"I have your money right here." You extend your hand, giving Niko (200 <b>₽</b>). Niko quickly counts it then gives you an approving nod, "it''s all here. Good, you''re all payed up for today, you can get going now."'
+
+				act 'Walk away':gt 'gschool_lunch', 'break'
+			end
+
+			act 'Sex':
+				*clr & cla
+				NikoPayed = daystart
+				minut += 5
+				gs'stat'
+				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
+				'You cast your eyes down as you reply, "You can use my body as payment." Niko''s eyes light up, "I was hoping you''d say that. Let''s not waste time." Niko grabs your ass firmly while leading you to the less used restroom.'
 
-			act 'Maybe later':gt 'NikoEv', 'Lunch Chat'
+				act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
+			end
+
+		elseif NikoPayback = 2 and NikoPayed = daystart and NikoPayback_Sex ! daystart:
+			act 'Offer Niko sex':
+				*clr & cla
+				NikoPayback_Sex = daystart
+				minut += 5
+				gs'stat'
+				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile'+rand(2,3)+'.jpg"></center>'
+				'You walk up to Niko and place your hand on his crotch, "I know that I already payed you in money, but I want to give you another special payment." Niko''s eyes light up, "Well, there''s no way, I''d say no to that. Let''s get going." Niko gives your ass a firm smack as you both head toward the less used restroom.'
+
+				act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
+			end
 		end
-	end	
-	
-	if NikoLuv <= -2 and NikoPayback = 0:
-		act 'Walk away':	
+
+		if (NikoPayback = 2 or NikoIntro = -1) and NikoPayed = daystart:
+			act 'Chat':
+				*clr & cla
+				minut += 10
+				gs'stat'
+				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
+				'You reply, "I just want to talk. Is that alright?" Niko shrugs as he replies, "Sounds fine with me, I have some spare time." You and Niko spend the next few minutes, chatting about various topics.'
+
+				act 'Go to class':gt 'gschool_lessons', 'short_break'
+			end
+		end
+
+		if NikoVolkovQW = 5 and NikoEv = 9:
+			act '<font color=#FF00FF><b>Special Activity</b></font>':
+				*clr & cla
+				gs'stat'
+				'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
+				'You sit down next to Niko, "Hello Niko, I remember you telling me something about a special activity that you have planned." Niko grins as he replies, "I have something special for us today. Are you ready to find out what it is?" You suddenly feel a cold chill down your spine as he says that. '+$OpenInnerThought+'Why do I feel so nervous? I can''t shake the feeling that something bad is going to happen.</font>'
+
+				act '<font color=#FF00FF>Go with Niko</font>':
+					if soniaPS = 0:
+						gt 'NikoDates', 'Sonia Block'
+					else
+						gt 'NikoWhore', 'Locker Room'
+					end
+				end
+
+				act 'Maybe later':gt 'NikoEv', 'Lunch Chat'
+			end
+		end
+	end
+
+	if NikoLuv <= -2 and NikoPayback = 0 and NikoIntro > -1:
+		act 'Walk away':
 			*clr & cla
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/wos4.jpg"></center>'
@@ -237,27 +239,27 @@ if $ARGS[0] = 'Lunch Chat':
 				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'What kind of easy lay, does he think I am?</font>'
 			elseif VK = 2:
 				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'What an annoying, little punk!</font>'
-			else	
+			else
 				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'Something about that guy, really annoys me.</font>'
 			end
-				
+
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
-		
+
 	elseif NikoPayback = 2 and NikoPayed = daystart:
 		act 'Walk away':gt 'gschool_lessons', 'short_break'
-	elseif NikoPayback = 0:
+	elseif NikoPayback = 0 and NikoIntro > -1:
 		act 'Leave':
 			*clr & cla
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'You tell Niko. "I would love to stay but I need to head to class early today." He responds "I understand <<$pcs_firstname>>. I guess I will have to wait longer for an audience with this princess." You can feel your face getting flush as you get up and walk out toward the hallway.'
-					
+
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
-	elseif NikoPayback = 3:
-		act 'Walk away':gt 'gschool_lessons', 'short_break'	
+	elseif NikoPayback = 3 or NikoIntro = -1:
+		act 'Walk away':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -270,7 +272,7 @@ if $ARGS[0] = 'Date Intro':
 	*nl
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/jewelry/necklace1.jpg"></center>'
 
-	act 'Accept the gift':	
+	act 'Accept the gift':
 		*clr & cla
 		if npc_rel['A189'] < 80:npc_rel['A189'] = 80
 		NikoDateIntro = 1
@@ -282,11 +284,11 @@ if $ARGS[0] = 'Date Intro':
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer1.jpg"></center>'
-		'You give Niko a warm smile as you take the gift from him. "Thank you Niko, This necklace is so beautiful." Niko looks at you with such loving eyes. "I''m so glad you like it, how about I pick you up after school and we can both head out together?" You reply, "I might be a bit late so just wait for me at the courtyard, okay?" Niko bows before you. "As you wish m''lady." He then backs away while keeping his head bowed until he turns the corner.'		
+		'You give Niko a warm smile as you take the gift from him. "Thank you Niko, This necklace is so beautiful." Niko looks at you with such loving eyes. "I''m so glad you like it, how about I pick you up after school and we can both head out together?" You reply, "I might be a bit late so just wait for me at the courtyard, okay?" Niko bows before you. "As you wish m''lady." He then backs away while keeping his head bowed until he turns the corner.'
 
 		act 'Go to class':gt 'gschool_lessons', 'short_break'
-	end	
-	
+	end
+
 	gs 'willpower', 'misc', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Decline the gift (<<will_cost>> Willpower)':
@@ -322,8 +324,8 @@ if $ARGS[0] = 'Niko Dates':
 		gt 'NikoEv', 'Date 4'
 	elseif NikoEv = 11:
 		gt 'NikoEv', 'New Life'
-	end	
-end	
+	end
+end
 
 if $ARGS[0] =  'Date 1':
 	*clr & cla
@@ -332,19 +334,19 @@ if $ARGS[0] =  'Date 1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko1.jpg"></center>'
 	'You walk up to Niko and his eyes light up as he sees you. "Greetings <<$pcs_firstname>>, I hope that you are ready to have a good time."'
 
-	act 'I''m ready':	
+	act 'I''m ready':
 		*clr & cla
 		NikoEv = 2
 		minut += 5
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk1.jpg"></center>'
-		'"I sure am." Niko gives you a warm smile as he responds, "I figured that we could go to an amusement park, out of town. I will pay our way of course, so come on, let''s get going." Niko takes your hand and walks you to the train station where you both board the train and get seated.'	
-		
+		'"I sure am." Niko gives you a warm smile as he responds, "I figured that we could go to an amusement park, out of town. I will pay our way of course, so come on, let''s get going." Niko takes your hand and walks you to the train station where you both board the train and get seated.'
+
 		NikoNextDate_day = daystart + 7 - week + 1
 		act 'Go with Niko':gt 'NikoDates', 'Date 1_1'
 	end
-	
-	act 'Not yet':	
+
+	act 'Not yet':
 		*clr & cla
 		minut += 5
 		gs'stat'
@@ -363,7 +365,7 @@ if $ARGS[0] =  'Date 2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko2.jpg"></center>'
 	'You walk up to Niko and he lowers his cigarette before saying, "Hello <<$pcs_firstname>> I wanted to tell you that I am sorry, for how I acted yesterday. I just wanted to you leave your shell a bit. You always seem so tense." You reply, "Tense? I guess I could try to lighten up a bit. Maybe." Niko smiles as he responds, "Good enough. So are you ready for a surprise I have for you? We could be out all afternoon."'
 
-	act 'I''m ready':	
+	act 'I''m ready':
 		*clr & cla
 		NikoEv = 3
 		minut += 5
@@ -374,8 +376,8 @@ if $ARGS[0] =  'Date 2':
 		NikoNextDate_day = daystart + 7 - week + 1
 		act 'Follow Niko''s lead':gt 'NikoDates', 'Date 2'
 	end
-	
-	act 'Not yet':	
+
+	act 'Not yet':
 		*clr & cla
 		minut += 5
 		gs'stat'
@@ -394,19 +396,19 @@ if $ARGS[0] =  'Date 3':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko3.jpg"></center>'
 	'You walk up to Niko and his eyes light up as he sees you. "Greetings <<$pcs_firstname>>, I have a surprise activity for today, we could be out all afternoon. Are you up for it?"'
 
-	act 'I''m ready':	
+	act 'I''m ready':
 		*clr & cla
 		NikoEv = 4
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk4.jpg"></center>'
-		'"I sure am." Niko''s smile widens as he replies, "Great let''s get going." Niko wraps his arm around your waist as he leads you toward the lake.'	
+		'"I sure am." Niko''s smile widens as he replies, "Great let''s get going." Niko wraps his arm around your waist as he leads you toward the lake.'
 		NikoNextDate_day = daystart + 7 - week + 1
 		act 'Follow Niko''s lead':gt 'NikoDates', 'Date 2'
 	end
-	
-	act 'Not yet':	
+
+	act 'Not yet':
 		*clr & cla
 		minut += 5
 		gs'stat'
@@ -425,26 +427,26 @@ if $ARGS[0] =  'Date 4':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'
 	'You walk up to Niko and his eyes light up as he sees you. "Ahhh <<$pcs_firstname>>, I''m so glad to see you. Are you up for a nice relaxing day at the beach?"'
 
-	act 'I''m ready':	
+	act 'I''m ready':
 		*clr & cla
 		NikoEv = 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'"I can never turn down a day at the beach." Niko chuckles as he responds, "Great I have everything we should need here." Niko then opens his bag which houses a beach towel, cigarettes and sunscreen.'	
+		'"I can never turn down a day at the beach." Niko chuckles as he responds, "Great I have everything we should need here." Niko then opens his bag which houses a beach towel, cigarettes and sunscreen.'
 		NikoNextDate_day = daystart + 7 - week + 1
-		act 'Let''s go!':	
+		act 'Let''s go!':
 			*clr & cla
 			minut += 5
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/walk4.jpg"></center>'
 			'You happily grab onto his hand then say, "What are we waiting for? Let''s go!" You then lead Niko toward the lake.'
-			
+
 			act 'Enter train station':gt 'NikoDates', 'Date 3'
 		end
-	end	
-	
-	act 'Not yet':	
+	end
+
+	act 'Not yet':
 		*clr & cla
 		minut += 5
 		gs'stat'
@@ -462,20 +464,20 @@ if $ARGS[0] =  'New Life':
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko1.jpg"></center>'
 	'As you approach Niko, he nods then motions you over, "Are you ready to head out?"'
-	
+
 	act 'Yes':
 		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 		'Niko smiles as he responds, "Great now let''s head out." Niko wraps his arm around your shoulder then walks you toward the park.'
-		
+
 		gt 'NikoEv2', 'Park'
-	end	
-	
+	end
+
 	act 'Not right now':gt 'gschool_grounds', 'main'
-end	
+end
 
 !!!!!!!!!!!
 !! Disco !!
@@ -487,7 +489,7 @@ if $ARGS[0] = 'Disco Intro':
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/brother/upset.jpg"></center>'
 	'You approach Niko and immediately notice that he is passed out. He must have have a lot to drink today.'
-	
+
 	act 'Walk away':gt 'pav_disco'
 end
 
@@ -497,35 +499,35 @@ if $ARGS[0] = 'Disco Chat':
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	if NikoFightDay = daystart:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised2.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised2.jpg"></center>'
 	elseif NikoPayback > 0:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-	else	
+	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-	end	
-	'<<$npc_notes[''189'']>>'
+	end
+	'<<$npc_notes[''A189'']>>'
 	if npc_grupTipe['A189'] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#E400FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
 	if npc_grupTipe['A189'] = 4:'Niko is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
 	if npc_rel['A189'] < 20:'You and Niko don''t get along at all.'
 	if npc_rel['A189'] >= 20 and npc_rel['A189'] < 40:'You and Niko don''t get along very well.'
 	if npc_rel['A189'] >= 40 and npc_rel['A189'] < 60:'You and Niko have a normal relationship.'
 	if npc_rel['A189'] >= 60 and npc_rel['A189'] < 80:'You and Niko have a good relationship.'
-	if npc_rel['A189'] >= 80:'You and Niko have a great relationship.'	
-	*nl	
+	if npc_rel['A189'] >= 80:'You and Niko have a great relationship.'
+	*nl
 	if NikoLuv > -4 and  NikoPayback = 0 and NikoAlko = 0:
 		'You approach Niko and he gives you a welcoming smile. "Good to see you again. Would you like a drink?"'
 	elseif NikoLuv > -4 and  NikoPayback = 0 and NikoAlko >= 2:
 		'You approach Niko and he gives you a welcoming smile. "You''re looking lovely today, Would you like to dance."'
 	elseif NikoPayback = 2 and NikoPayed ! daystart:
 		'You approach Niko and he turns to you with a puzzled look on his face. "Hmm, you didn''t show up to school today, were you sick? Bah, it doesn''t matter, you''re here now, so let''s get down to business. My dick is dry and my wallet lite, which one of those issues, will you be solving today?"'
-	elseif NikoPayback = 2:	
+	elseif NikoPayback = 2:
 		'You approach Niko and he looks at you with a blank stare, "You''re all payed up today, so why are you talking to me? Trying to mooch a free drink off me?"'
-	elseif NikoPayback = 3:	
-		'You approach Niko and he turns to you then says, "Leave me alone. You are nothing but trouble." You giggle as you walk away.'		
-	end	
-		
+	elseif NikoPayback = 3:
+		'You approach Niko and he turns to you then says, "Leave me alone. You are nothing but trouble." You giggle as you walk away.'
+	end
+
 	if NikoLuv > -4 and  NikoPayback = 0:
-		act 'Drink':	
+		act 'Drink':
 			*clr & cla
 			NikoAlko = 2
 			gs 'drugs', 'alcohol', 'vodka'
@@ -534,14 +536,14 @@ if $ARGS[0] = 'Disco Chat':
 			minut += 10
 			gs'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/resident/rekshome/party/party_rex_party_gost_2_2.mp4"></video></center>'
-			'"I would love to." Niko opens up a bottle of alcohol then hands you the bottle as he gives you a wink. You both spend the next few minutes drinking and sharing stories.'		
-			
+			'"I would love to." Niko opens up a bottle of alcohol then hands you the bottle as he gives you a wink. You both spend the next few minutes drinking and sharing stories.'
+
 			act 'Get up':gt 'pav_disco'
-		end	
-	end	
-	
+		end
+	end
+
 	if NikoLuv > -4 and  NikoPayback = 0:
-		act 'Dance':	
+		act 'Dance':
 			*clr & cla
 			gs 'exp_gain', 'danc', rand(1,3)
 			NikoLuv += 1
@@ -549,28 +551,28 @@ if $ARGS[0] = 'Disco Chat':
 			minut += 10
 			gs'stat'
 			'<center><video autoplay loop <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/disco/dance'+rand(1,2)+'.mp4"></video></center>'
-			'"I would love to." Niko takes your hand then leads you to the dance floor where you both spend the next few minutes, dancing together.'		
-			
+			'"I would love to." Niko takes your hand then leads you to the dance floor where you both spend the next few minutes, dancing together.'
+
 			act 'Finish dancing':gt 'pav_disco'
-		end	
-	end	
-	
+		end
+	end
+
 	if NikoLuv > -4 and NikoVolkovQW = 0 and  NikoPayback = 0:
-		act 'Insult':	
-			*clr & cla	
+		act 'Insult':
+			*clr & cla
 			npc_rel['A189'] -= 5
 			NikoLuv -= 1
 			minut += 5
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/pc/reactions/fuckoff2.jpg"></center>'
 			'You lift up your hands then extend your middle fingers on each hand, "I only drink with men, not boys." Niko shakes his head as he responds. "Aww, you''re no fun." You turn around then walk toward the dance floor.'
-			
+
 			act 'Walk away':gt 'pav_disco'
-		end	
-	end	
-	
+		end
+	end
+
 	if NikoPayback = 2 and NikoPayed ! daystart:
-		act 'Money (200 <b>₽</b>)':	
+		act 'Money (200 <b>₽</b>)':
 			*clr & cla
 			money -= 200
 			NikoPayed = daystart
@@ -578,12 +580,12 @@ if $ARGS[0] = 'Disco Chat':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
-			'"I have your money right here." You extend your hand, giving Niko (200 <b>₽</b>). Niko quickly counts it then gives you an approving nod, "it''s all here. Good, you''re all payed up for today, you can get going now."'	
-			
+			'"I have your money right here." You extend your hand, giving Niko (200 <b>₽</b>). Niko quickly counts it then gives you an approving nod, "it''s all here. Good, you''re all payed up for today, you can get going now."'
+
 			act 'Walk away':gt 'pav_disco'
 		end
-		
-		act 'Sex':	
+
+		act 'Sex':
 			*clr & cla
 			NikoPayed = daystart
 			NikoPayback_Sex = daystart
@@ -592,13 +594,13 @@ if $ARGS[0] = 'Disco Chat':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/disco/niko.jpg"></center>'
-			'You downcast your eyes as you reply, "You can use my body as payment." Niko''s kneels down then begins rubbing your legs as he replies,, "I was hoping you''d say that. Let''s not waste time." Niko grabs your ass firmly while leading you to the mens restroom.'	
+			'You downcast your eyes as you reply, "You can use my body as payment." Niko''s kneels down then begins rubbing your legs as he replies,, "I was hoping you''d say that. Let''s not waste time." Niko grabs your ass firmly while leading you to the mens restroom.'
 
 			act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
-		end	
-		
-	elseif NikoPayback = 2 and NikoPayed = daystart and NikoPayback_Sex ! daystart:	
-		act 'Offer Niko sex':	
+		end
+
+	elseif NikoPayback = 2 and NikoPayed = daystart and NikoPayback_Sex ! daystart:
+		act 'Offer Niko sex':
 			*clr & cla
 			NikoDiscoPay = 1
 			NikoPayback_Sex = daystart
@@ -606,14 +608,14 @@ if $ARGS[0] = 'Disco Chat':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile'+rand(2,3)+'.jpg"></center>'
-			'You walk up to Niko then place your hand on his crotch, "I know that I already payed you in money, but I want to give you another special payment." Niko''s eyes light up, "Well, there''s no way, I''d say no to that. Let''s get going." Niko gives your ass a firm smack as you both head toward the mens restroom.'	
+			'You walk up to Niko then place your hand on his crotch, "I know that I already payed you in money, but I want to give you another special payment." Niko''s eyes light up, "Well, there''s no way, I''d say no to that. Let''s get going." Niko gives your ass a firm smack as you both head toward the mens restroom.'
 
 			act 'Head to the restroom with Niko':gt 'NikoPayback', 'Payback 3'
 		end
-	end	
-	
+	end
+
 	if NikoPayback = 2 and NikoPayed = daystart:
-		act 'Chat':	
+		act 'Chat':
 			*clr & cla
 			minut += 5
 			gs'stat'
@@ -622,11 +624,11 @@ if $ARGS[0] = 'Disco Chat':
 			'You reply, "I just want to talk. Is that alright?" Niko shrugs as he replies, "Sounds fine with me, I have some spare time, but don''t think that you''re getting any free beer off of me." You and Niko spend the next few minutes, chatting about various topics.'
 
 			act 'Finish chatting':gt 'Nikoev', 'Disco Chat'
-		end	
-	end	
-	
+		end
+	end
+
 	if NikoLuv <= -2 and NikoPayback = 0:
-		act 'Walk away':	
+		act 'Walk away':
 			*clr & cla
 			NikoAlko = 0
 			gs'stat'
@@ -634,15 +636,15 @@ if $ARGS[0] = 'Disco Chat':
 			VK = rand(1,3)
 			if VK = 1:
 				'You walk away without saying a word, thinking to yourself. "What kind of easy lay, does he think I am?"'
-			elseif VK = 2:	
+			elseif VK = 2:
 				'You walk away without saying a word, thinking to yourself. "What an annoying, little punk?"'
-			else	
+			else
 				'You walk away without saying a word, thinking to yourself. "Something about that guy, really annoys me."'
-			end	
-				
+			end
+
 			act 'Step away':gt 'pav_disco'
 		end
-		
+
 	elseif NikoPayback = 2 and NikoPayed = daystart:
 		act 'Walk away':gt 'pav_disco'
 	elseif NikoPayback = 0:
@@ -653,13 +655,13 @@ if $ARGS[0] = 'Disco Chat':
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 			'You tell Niko. "I would love to stay, but I need to head home early today, or my <<$npc_nickname[''A29'']>> will freak out." He responds "I know how parents can be, I will always be around, if you ever have a few minutes to spare." You give Niko a warm smile as you wave goodbye.'
-					
+
 			act 'Step away':gt 'pav_disco'
 		end
-		
+
 	elseif NikoPayback = 3:
-		act 'Walk away':gt 'pav_disco'		
-	end	
+		act 'Walk away':gt 'pav_disco'
+	end
 end
 
 !!!!!!!!!!!!!
@@ -677,28 +679,28 @@ if $ARGS[0] =  'Lunch Breakup':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 	'You approach Niko with a stern look on your face. Niko notices you then says. "Ah there you are, you disappeared on me yesterday." You quickly reply, "I DISAPPEARED!? YOU RAN OFF AND LEFT ME TIED UP!" Niko recoils before responding, "Did I? I''m sorry I just had to..." You cut Niko off. "I DON''T WANT TO HEAR IT! I never should have trusted you. How could I have been so stupid?" Niko responds, "Hey let''s not be hasty here." You quickly reply, "NO! I want nothing to do with you. Stay away from me." '
 
 	act 'Walk away':
 		*clr & cla
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'		
-		'Niko then gets noticeably angry as he responds, "After all the time and money I spent on you? You will not leave me! I will get what I deserve!"' 
-		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
+		'Niko then gets noticeably angry as he responds, "After all the time and money I spent on you? You will not leave me! I will get what I deserve!"'
+
 		act 'Give him what he deserves':
 			*clr & cla
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/ouch.jpg"></center>'
 			'You reply, "You got that right." You then wind up your leg before ramming it in between his legs, kicking him squarely, in the balls, causing him to drop to the ground squirming in pain. You spit on Niko before walking away.'
-		
+
 			act 'Walk away':gt 'gschool_lessons', 'short_break'
-		end	
-	end	
-end		
-	
+		end
+	end
+end
+
 if $ARGS[0] =  'Disco Breakup':
 	*clr & cla
 	NikoBreakupDay = daystart
@@ -710,38 +712,38 @@ if $ARGS[0] =  'Disco Breakup':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 	'You approach Niko with a stern look on your face. Niko notices you then says. "Ah there you are, you disappeared on me yesterday." You quickly reply, "I DISAPPEARED!? YOU RAN OFF AND LEFT ME TIED UP!" Niko recoils before responding, "Did I? I''m sorry I just had to..." You cut Niko off. "I DON''T WANT TO HEAR IT! I never should have trusted you. How could I have been so stupid?" Niko responds, "Hey let''s not be hasty here." You quickly reply, "NO! I want nothing to do with you. Stay away from me." '
 
 	act 'Walk away':
 		*clr & cla
 		gs'stat'
 		'<center><b><h4><font color="red"><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'		
-		'Niko then gets noticeably angry as he responds, "After all the time and money that I spent on you? You will not leave me! I will get what I deserve!"' 
-		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/avatars/<<week>>.jpg"></center>'
+		'Niko then gets noticeably angry as he responds, "After all the time and money that I spent on you? You will not leave me! I will get what I deserve!"'
+
 		act 'Give him what he deserves':
 			*clr & cla
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'			
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/fight/down.jpg"></center>'
 			'You reply, "You got that right." You then wind up your leg before ramming it in between his legs, kicking him squarely, in the balls, causing him to drop to the ground, squirming in pain. You spit on Niko before walking away.'
-	
+
 			act 'Step away':gt 'pav_disco'
-		end	
-	end	
-end	
+		end
+	end
+end
 
 if $ARGS[0] =  'Disco Breakup 2':
 	*clr & cla
 	minut += 1
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/brother/aftermath2.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/brother/aftermath2.jpg"></center>'
 	'You see Niko on the ground, squirming in pain and can''t help but feel very satisfied, seeing Niko get what he deserved.'
 
 	act 'Step away':gt 'pav_disco'
-end	
+end
 
 !!!!!!!!!!!!!!!
 !! Jealously !!
@@ -755,24 +757,24 @@ if $ARGS[0] =  'Fyodor':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko'+rand(1,3)+'.jpg"></center>'
 	'You walk up to Niko and his eyes light up as he sees you. "Greetings <<$pcs_firstname>>, I hope you are ready to have a good time." You suddenly feel a hand gently but firmly grab onto your arm.'
 
-	act 'Turn around':	
+	act 'Turn around':
 		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
-		'You turn to see Fedor with a concerned look on his face. "<<$pcs_firstname>> what are doing over here with him? You should be careful hanging around guys like him. He is no good for you." Niko just stares on in silence with an annoyed look on his face. You turn to Fedor and say, "Don''t worry Fedor it''s not what it looks like. Niko was just..." Niko quickly continues your sentence. "<<$pcs_firstname>>''s father is planing on buying one of my brothers old bikes, so she came to me to discuss the details. That''s all." Fedor gives Niko a blank stare. "I''ve seen your brother before and I don''t think that <<$pcs_firstname>> should be dealing with him or you." Niko shrugs as he replies, "Well that''s <<$pcs_firstname>>''s call, not yours." Fedor walks right up to Niko then clenches his fists. "Well no one asked for your input."' 
+		'You turn to see Fedor with a concerned look on his face. "<<$pcs_firstname>> what are doing over here with him? You should be careful hanging around guys like him. He is no good for you." Niko just stares on in silence with an annoyed look on his face. You turn to Fedor and say, "Don''t worry Fedor it''s not what it looks like. Niko was just..." Niko quickly continues your sentence. "<<$pcs_firstname>>''s father is planing on buying one of my brothers old bikes, so she came to me to discuss the details. That''s all." Fedor gives Niko a blank stare. "I''ve seen your brother before and I don''t think that <<$pcs_firstname>> should be dealing with him or you." Niko shrugs as he replies, "Well that''s <<$pcs_firstname>>''s call, not yours." Fedor walks right up to Niko then clenches his fists. "Well no one asked for your input."'
 
-		act 'See what happens':	
+		act 'See what happens':
 			*clr & cla
-			gs'stat'		
+			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko4.jpg"></center>'				
-			'Niko doesn''t seem worried as he casually leans against the wall. "No need to get violent. I''m sure <<$pcs_firstname>> doesn''t want us fighting in front of her for no reason. That would be really rude of us, wouldn''t it?" Fedor looks back to you with a embarrassed look on his face. "Sorry <<$pcs_nickname>> I hope I''m not making you uncomfortable. Just be careful with this one okay?" You give Fedor a nod and a smile as he turns around then walks away.'			
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko4.jpg"></center>'
+			'Niko doesn''t seem worried as he casually leans against the wall. "No need to get violent. I''m sure <<$pcs_firstname>> doesn''t want us fighting in front of her for no reason. That would be really rude of us, wouldn''t it?" Fedor looks back to you with a embarrassed look on his face. "Sorry <<$pcs_nickname>> I hope I''m not making you uncomfortable. Just be careful with this one okay?" You give Fedor a nod and a smile as he turns around then walks away.'
 
 			act 'Turn back toward Niko':gt 'NikoEv', 'Niko Dates'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] =  'Viktor':
@@ -781,18 +783,18 @@ if $ARGS[0] =  'Viktor':
 	minut += 5
 	gs'stat'
 	'<center><b><h4><font color="red"><<"Viktor [Vitek] Kotov">></font></h4></b></center>'
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'	
-	'You walk up to Niko and give him a smile then you suddenly see Vitek quickly walk up to Niko and say, "What are you doing with <<$pcs_firstname>>? She is mine."' 
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
+	'You walk up to Niko and give him a smile then you suddenly see Vitek quickly walk up to Niko and say, "What are you doing with <<$pcs_firstname>>? She is mine."'
 
-	act 'See what happens':	
+	act 'See what happens':
 		*clr & cla
-		gs'stat'	
+		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko'+rand(1,3)+'.jpg"></center>'		
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/niko'+rand(1,3)+'.jpg"></center>'
 		'Niko chuckles as he raises his hands, "I was just helping <<$pcs_firstname>> with finding the person spreading mean rumors about her." Vitek responds, "What rumors?" Niko replies, "Someone said that <<$pcs_firstname>> here is dating a fat, brain dead, gopnik. I wonder who that rumor was referring to." Vitek begins seething with anger as he ask, "Who the fuck said that shit?" Niko replies, "It took some digging, but I found out that it was him." Niko points to Lesco Tsarev, causing Vitek to turn to Lesco then shout, "You fucking little bitch! I will tear your arm off!" He then charges at Lesco, who begins running for his life. While they were distracted, Niko takes your hand then leads you out of the school grounds.'
-	
+
 		act 'Follow Niko''s lead':gt 'NikoEv', 'Niko Dates'
-	end	
+	end
 end
 
 if $ARGS[0] =  'Dimka':
@@ -803,20 +805,20 @@ if $ARGS[0] =  'Dimka':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
 	'You walk up to Niko and give him a smile then see Dimka approach you before giving Niko a puzzled look. "What are you with <<$pcs_firstname>>. She is my girl." Niko gives Dimka a blank stare as he responds, "Sure she is... why don''t you just piss off before you piss me off?" Dimka then says, "Why don''t we ask her who she''s dating?" Niko replies, "Because asking a girl to kiss and tell is rude." Dimka looks shocked as he responds, "You don''t care? But would you care if I told you that <<$pcs_nickname>> here is a cocksucker?" Niko raises an eyebrow. "Well do you have proof of that, or are you just blowing smoke?"'
 
-	act 'See what Dimka does':	
+	act 'See what Dimka does':
 		*clr & cla
 		minut += 5
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, causing you to think to yourself: '+$OpenInnerThought+'Oh shit! How am I going to explain this to Niko. I''m really screwed now.'+$CloseInnerThought+' Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'		
-		
-		act 'Continue':	
+		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, causing you to think to yourself: '+$OpenInnerThought+'Oh shit! How am I going to explain this to Niko. I''m really screwed now.'+$CloseInnerThought+' Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'
+
+		act 'Continue':
 			*clr & cla
 			gs'stat'
 			'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/pissoff.mp4"></video></center>'
-			'Niko begins lighting his cigarette before Dimka suddenly shouts, "How dare you!? You fucking sack of shit! That was my video!" Niko gets off the wall then approaches Dimka, causing Dimka to immediately back up. Niko grabs Dimka''s face with one hand then brings it to his before blowing smoke in his face then saying, "I will give you one more chance to leave before I accept Lavrenti''s offer to make your life a living hell." Dimka quickly backs off as he says, "You''re insane! Whatever... keep her!" Dimka then quickly walks away.'		
-		
+			'Niko begins lighting his cigarette before Dimka suddenly shouts, "How dare you!? You fucking sack of shit! That was my video!" Niko gets off the wall then approaches Dimka, causing Dimka to immediately back up. Niko grabs Dimka''s face with one hand then brings it to his before blowing smoke in his face then saying, "I will give you one more chance to leave before I accept Lavrenti''s offer to make your life a living hell." Dimka quickly backs off as he says, "You''re insane! Whatever... keep her!" Dimka then quickly walks away.'
+
 			act 'Thank Niko':
 				*clr & cla
 				dimafilm = 0
@@ -830,10 +832,10 @@ if $ARGS[0] =  'Dimka':
 					act 'Sure thing':gt 'NikoEv2', 'Events'
 				else
 					act 'Sure thing':gt 'NikoEv', 'Niko Dates'
-				end	
+				end
 			end
-		end	
-	end	
+		end
+	end
 end
 
 --- NikoEv ---------------------------------

+ 21 - 7
locations/NikoWhore.qsrc

@@ -328,7 +328,7 @@ if $ARGS[0] = 'Exposed':
 		*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
 		if npc_grupTipe['A25'] = 5:
 			'You reach the stairwell and Vitek shouts out. "Hey boys! Look who''s decided to join Sonia as the school whore! <<$pcs_firstname>> <<$pcs_lastname>>!" The gopniks get noticeably excited as they begin talking to each other.'
-			if hotcat >= 6:
+			if hotcat > 6:
 				'"So <<$pcs_nickname>> decided to join the party? She looks good enough. Ever been with a real man before?" Radomir asks with a grin.'
 				'"She''s better looking than Sonia, I''ll give her that." Valentin adds.'
 			else
@@ -341,7 +341,7 @@ if $ARGS[0] = 'Exposed':
 				'"So <<$pcs_nickname>> decided to join the party? She looks good enough. Ever been with a real man before?" Radomir asks with a grin.'
 			else
 				'"So <<$pcs_nickname>> decided to join the party? She''s so fucking ugly I imagine the only way she can get any attention is to give it away to anyone willing to have a go." Radomir says insultingly.'
-				'"Yeah, I''ve seen better looking bitches skulking around in the city allyways." Valentin adds.'
+				'"Yeah, I''ve seen better looking bitches skulking around in the city alleyways." Valentin adds.'
 			end
 		end
 		'"Enough gawking. I''m gonna fuck this bitch!" Arkadi says while approaching you.'
@@ -406,7 +406,8 @@ if $ARGS[0] = 'Exposed':
 										'<center><b><h4><font color=#00ff6c><<"Alyona Zima">></font></h4></b></center>'
 										'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big143.jpg"></center>'
 										'Alyona pulls out a switch blade as a response to the threat. "Try it and I''ll cut your dick off, asshole!" Roman replies in a menacing tone. "Do you even know how to use that thing little girl?" Valentin quickly grabs the girls and pulls them away as Arkadi pulls Roman back, clearly trying to calm him down. You realize that if you don''t act now, then you won''t be able to, so you burst into tears and rush over to them. "I don''t want to stay!"'
-										'Dan grabs the leash attached to your collar and jerks you back. "Just where the fuck do you think you''re going?" Anushka exclaims "Let her go now!" Dan snorts and yanks on the leash again. "Make me bitch!" Valentin steps up and gets in Dan''s face. "Back off." Anushka uses the time to take the collar off your neck and when the rest notice, Roman steps forward and Valentin steps in his way. "Out of my way Val." Valentin shakes his head in repsonse.'
+										*nl
+										'Dan grabs the leash attached to your collar and jerks you back. "Just where the fuck do you think you''re going?" Anushka exclaims "Let her go now!" Dan snorts and yanks on the leash again. "Make me bitch!" Valentin steps up and gets in Dan''s face. "Back off." Anushka uses the time to take the collar off your neck and when the rest notice, Roman steps forward and Valentin steps in his way. "Out of my way Val." Valentin shakes his head in response.'
 										act 'See what happens next':
 											*clr & cla
 											gs'stat'
@@ -428,8 +429,11 @@ if $ARGS[0] = 'Exposed':
 									'Valentin puts up his hands and takes a step back. "Fucking assholes! All of you!" Anushka exclaims before giving you one final glance, her eyes begging you to come to her, but when you don''t, she just looks at you with pity and walks away, flipping Valentin off as he chases after her. "Don''t be like that Nush, come on!" He eventually turns and walks back to the group as Lena laughs. "Nobody''s coming to save you now, slut."'
 									act 'Watch them leave': gt 'NikoWhore', 'no_escape'
 								end
+							elseif npc_rel['A144'] <= 20:
+								'You can see Anushka and Alyona watching. "This is like watching a really bad porno, but it still turns me on." Anushka comments and Dan turns towards them. "Just speak up, we can give you a turn too." he says with a laugh. Alyona and Anushka both flip him off. "As if... I like to fuck, but I''m not going to be some slut who lets everyone fuck her whenever and where ever."Anushka says while glancing at you with a look of disgust on her face, before looking back to Dan." If I ever wanted to fuck you, it would be on <i>my</i> terms."'
 							else
-								'You can see Anushka and Alyona watching. "This is like watching a really bad porno, but it still turns me on." Anushka comments and Dan turns towards them. "Just speak up, we can give you a turn too." he says with a laugh. Alyona and Anushka both flip him off. "As if... I like to fuck, but I''m not going to be some slut who lets everyone fuck her whenever and where ever. If I ever wanted to fuck you, it would be on <i>my</i> terms, not yours."'
+								'You can see Anushka and Alyona watching. "This is like watching a really bad porno, you know the ones. Where the girl is a total slut and just lets everyone gangbang her because she delivered a pizza or some stupid shit like that." Anushka comments.'
+								'Dan turns towards them. "Maybe we can make a good porno, just come down here and we''ll make you a star." he says with a laugh. Alyona and Anushka both flip him off. "As if... I like to fuck, but I''m not going to be some slut who lets everyone fuck her whenever and where ever. If I ever wanted to fuck you, it would be on <i>my</i> terms."'
 							end	
 		
 							act 'See what happens next':
@@ -449,6 +453,7 @@ if $ARGS[0] = 'Exposed':
 											'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 											'You stare at Anushka, too terrified to speak. "<<$pcs_nickname>>! Say something!" You want to speak, but your body won''t let you. Taking your silence as acceptance, Anushka just sighs in a defeated tone and gives you a look of pity as Dan laughs. "See, what did I tell you? Now stop being such a buzz kill and either join in or piss off!"'
 											'"Fuck your asshole!" she replies and Dan grins. "Anywhere, anytime sweet cheeks." Valentin grabs Anushka by the arm and pulls her aside. You realize that if you don''t act now, you won''t be able to, so you burst into tears and rush over to them. "I don''t want to stay!"'
+											*nl
 											'Dan grabs the leash attached to your collar and jerks you back. "Just where the fuck do you think you''re going?" Anushka exclaims "Let her go now!" Dan snorts and yanks on the leash again. "Make me bitch!" Valentin steps up and gets in Dan''s face. "Back off." Anushka uses the time to take the collar off your neck and when the rest notice, Roman steps forward and Valentin steps in his way. "Out of my way Val." Valentin shakes his head in response.'
 											act 'See what happens next':
 												*clr & cla
@@ -456,7 +461,9 @@ if $ARGS[0] = 'Exposed':
 												'<center><b><h4><font color=#00ff6c><<"Vitek Kotov">></font></h4></b></center>'
 												'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
 												'Before things spiral even more out of control among the gopniks, Vitek finally stands up." Enough!" he loudly shouts and everyone stops, although Anushka moves you behind her so she is between you and the rest. Vitek approaches and looks at you, then to Anushka. "You sure about this? You sure you want to choose her over us?" She''s putting her reputation with the gopniks on the line by standing up for you.'
-												'She glances back over her shoulder at you. Your eyes meet and she smiles at you, then turns back to Vitek. "Fuck yeah, I''m choosing her over some wannabe rapist." Vitek eyes narrow, but you can tell she''s made several of them uncomfortable. Lena and Lera suddenly seem a lot quieter, Valentin stiffens and Lavrenti stands up. "Okay, this has gone on long enough. Just let them go if they want to go."'
+												'She glances back over her shoulder at you. Your eyes meet and she smiles at you, then turns back to Vitek. "Fuck yeah, I''m choosing her over some wannabe rapist."'
+												*nl
+												'Vitek eyes narrow, but you can tell she''s made several of them uncomfortable. Lena and Lera suddenly seem a lot quieter, Valentin stiffens and Lavrenti stands up. "Okay, this has gone on long enough. Just let them go if they want to go."'
 												'Valentin speaks up. "Fun''s fun, but this is starting to go too far." Vitek looks around and sees that everyone is turning against the idea. He looks over Anushka''s shoulder right into your eyes. "You''re lucky that someone is willing to stand up for you, bitch." He looks back at Anushka. "Take her and go."'
 												act 'Leave with them': gt 'NikoWhore', 'leave_with_nush'
 											end
@@ -472,9 +479,15 @@ if $ARGS[0] = 'Exposed':
 										'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 										'You stare at Anushka, too terrified to speak. "<<$pcs_nickname>>! Say something!" You want to speak, but your body won''t let you. Taking your silence as acceptance, Anushka just sighs in a defeated tone and gives you a look of pity as Dan laughs. "See, what did I tell you? Now stop being such a buzz kill and either join in or piss off!"'
 										'"Fuck your asshole!" she replies and Dan grins. "Anywhere, any time, sweet cheeks."'
-										'Valentin pulls Anushka away while Alyona follows, but Anushka jerks her arm away and Valentin puts his hands in the air. "Just go Nush, you can''t do anything here." She shakes her head in disgust. "Fuck you Val." She then turns and walks away while Alyona gives Roman a dirty look as she follows Anushka. Valentin calls after them. "Come on, don''t be like that Nush." Once Anushka''a gone, he starts walking back towards the group. "Fuck. She is pissed." Radomir pats him on the shoulder. "She''ll get over it. She always does."'
+										*nl
+										'Valentin pulls Anushka away while Alyona follows, but Anushka jerks her arm away and Valentin puts his hands in the air. "Just go Nush, you can''t do anything here." She shakes her head in disgust. "Fuck you Val!" She then turns and walks away while Alyona gives Roman a dirty look as she follows Anushka. Valentin calls after them. "Come on, don''t be like that Nush." Once Anushka''a gone, he starts walking back towards the group. "Fuck. She is pissed." Radomir pats him on the shoulder. "She''ll get over it. She always does."'
 										act 'Watch them leave': gt 'NikoWhore', 'no_escape'
 									end
+								elseif npc_rel['A144'] <= 20:
+									'Dan takes a step closer to them. "Yeah? I''m cool with that, just let me know. We can do that now if you want." Anushka and Alyona look at him, then to each other and back to him before laughing. "You wish. Go back to your pathetic slut, weak ass bitches like her is the only pussy you can get." The last bit she says while looking at you, she obviously still hates you and doesn''t care what is about to happen to you, or maybe thinks you deserve it. You can''t help but wonder if you do, as you think about all the choices you made that lead you to this.'
+									'Dan gets slightly embarrassed and angry. "Fuck you bitches."'
+									'"Never going to happen." They get up and walk away together laughing while an annoyed Dan turns back to you.'
+									act 'Watch them leave': gt 'NikoWhore', 'no_escape'
 								else
 									'Dan takes a step closer to them. "Yeah? I''m cool with that, just let me know. We can do that now if you want." Anushka and Alyona look at him, then to each other and back to him before laughing. "As if." They get up and walk away together laughing while an annoyed Dan turns back to you.'
 									act 'Watch them leave': gt 'NikoWhore', 'no_escape'
@@ -1099,6 +1112,7 @@ if $ARGS[0] = 'leave_with_nush':
 	'<center><b><h4><font color=#00ff6c><<"Anushka [Nush] Konstantinov">></font></h4></b></center>'
 	'<center><img src="images/characters/shared/headshots_main/big144.jpg"></center>'
 	'With you between them, Anushka and Alyona turn and lead you away. Anushka takes off her school jacket and slips it over your shoulders while Alyona tie hers around your waist. As you walk down the hall, you pass by Petka, who clearly wonders why you are dressed this way. You blush and turn your head as Anushka wraps an arm around your shoulders and Alyona walks up to Petka. "What the fuck you looking at?" You hear him stuttering. "Keep walking or I''ll cut those eyes out. Got it?" He doesn''t answer, instead choosing to simply run away in fear.'
+	*nl
     '"Where are your clothes?" Anushka asks and you tell her that they''re in the locker room. They lead you there and you find your clothes still there in a bag. You return their jackets as you get redressed. Once you''re dressed, you don''t want to leave and go back to class. Not now, maybe not ever. "I don''t want to face anyone, I can''t." you tell them through sobs. You hear one of them sigh before Anushka replies. "Alright, fuck school anyways. Let''s take you home." Alyona chimes in. "Sorry, I can''t. They said if I miss anymore classes this month, they''re going to expel me. My dad would fucking kill me if that happened." She sounds genuinely worried. "It''s cool, I got her. You get to class and I''ll call you later." They exchange goodbyes and Alyona starts to leave. "Come on, let''s go." Anushka says and places a hand on your shoulder.'
 	act 'Go with her.':
 		gs'stat'
@@ -1108,7 +1122,7 @@ if $ARGS[0] = 'leave_with_nush':
 		if npc_rel['A144'] >= 60:
 			'When you arrive at the door to your apartment, she waits for you to unlock your door. You walk inside and invite her in, but she shakes her head. "I should really get back to school. I can still catch my last two classes." You nod and call out to her as she walks away. "Thanks for helping me. I know what it cost you." She stops and smiles at you. "Fuck them, you''re my friend. I''ll always have your back." Then she frowns. "Just break the fuck up with Niko next time you see him. He doesn''t love you, not like I do, so do it for me... I''ll see you later." With that she turns and starts walking down the stairs. You close the door as her words ring in your head. You feel confused and afraid. You don''t know what to do...'
 		else
-			'When you arrive at the door to your apartment, she waits for you to unlock your door. You walk inside and invite her in, but she shakes her head. "I should really get back to school. I can still catch my last two classes." You nod and call out to her as she walks away. "Thanks for helping me. I know what it cost you." She stops and smiles at you. "I like you, and fuck them." Then she frowns. "But you need to break up with Niko next time you see him. I won''t be there to save you every time." With that she turns and starts walking down the stairs. You close the door as her words ring in your head. You feel confused and afraid. You don''t know what to do...'
+			'When you arrive at the door to your apartment, she waits for you to unlock your door. You walk inside and invite her in, but she shakes her head. "I should really get back to school. I can still catch my last two classes." You nod and call out to her as she walks away. "Thanks for helping me. I know what it cost you." She stops and smiles at you. "I like you, and fuck them." Then she frowns. "But you need to break up with Niko next time you see him. I won''t be there to save you every time." With that she turns and starts walking down the stairs. You close the door as her words ring in your head, as you feel a shot of fear run through your body at her party words. What if this happens again and no one is around to save you? You feel confused and afraid. You don''t know what to do...'
 		end
 		act 'Your apartment': gt 'korrPar'
 	end

+ 1 - 1
locations/_attributes_danilovich_coats.qsrc

@@ -45,7 +45,7 @@ elseif ARGS[1] = 8:
 elseif ARGS[1] = 9:
 	CoatQuality = 5
     CoatWarm = 3
-	$coat_description = 'Great: A very decent quality sports coat in the color bone.'
+	$coat_description = 'Great: A very decent quality, ivory coloured sports coat.'
 	
 elseif ARGS[1] = 10:
 	CoatQuality = 5

+ 4 - 2
locations/_attributes_salacious_outfits.qsrc

@@ -24,10 +24,12 @@ elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 1
-	CloPantsShortness = 1
+	CloSkirtShortness = 6
+	CloDress = 1
 	CloStyle = 4
 	CloCoverTop = 3
-	CloCoverfront = 2
+	CloCoverfront = 3
+	CloCoverBack = 3
 
 elseif ARGS[1] = 4:
 	CloQuality = 3

+ 24 - 24
locations/_attributes_school.qsrc

@@ -20,14 +20,14 @@ elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 5:
@@ -90,14 +90,14 @@ elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 15:
@@ -112,21 +112,21 @@ elseif ARGS[1] = 16:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 19:
@@ -140,14 +140,14 @@ elseif ARGS[1] = 20:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 22:
@@ -161,7 +161,7 @@ elseif ARGS[1] = 23:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 24:
@@ -189,7 +189,7 @@ elseif ARGS[1] = 27:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 28:
@@ -238,7 +238,7 @@ elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 35:
@@ -253,7 +253,7 @@ elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 37:
@@ -297,14 +297,14 @@ elseif ARGS[1] = 42:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 
 elseif ARGS[1] = 43:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 44:
@@ -339,21 +339,21 @@ elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 49:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 50:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 51:
@@ -367,7 +367,7 @@ elseif ARGS[1] = 52:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	CloStyle = 2
 	
@@ -389,14 +389,14 @@ elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 56:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	CloBimbo = 1
 	CloStyle = 4
@@ -419,21 +419,21 @@ elseif ARGS[1] = 59:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloSkirtShortness = 2
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 3
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 62:

+ 1 - 1
locations/abduction.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'abdRoomFirstChaining':
 	deodorant = 0
 
 	tabletkishot = rand(84,91)
-	shotdays = 84
+	shotdays = 93
 	tabletkicheck = 2
 	pillcon = 40000
 

+ 1 - 1
locations/abductionCustomer.qsrc

@@ -213,7 +213,7 @@ if $ARGS[0] = 'abdCustomer-buyout1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/leonid/leonid.jpg"></center>'
 	'As you look up at his face, a chill runs down your spine - you know him!'
 	'You remember this man from one of the parent-school conferences. It''s Dimka''s dad, <<$bName>>!'
-	'He recognizes you too. "Oh... what the? Who do we have here? Aren''t that missing girl, <<$pcs_firstname>> <<$pcs_lastname>>?'
+	'He recognizes you too. "Oh... what the? Who do we have here? Aren''t you that missing girl, <<$pcs_firstname>> <<$pcs_lastname>>?'
 	*nl
 	'With a trembling voice, only a few words leave your mouth. "Th... that''s me mister <<$bSurname>>..."'
 	'"You do realize that the police have already given up searching for you. As if they made any effort though..."'

+ 50 - 19
locations/albinahome.qsrc

@@ -398,7 +398,7 @@ if $ARGS[0] = 'game':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'You shake your head. "Not this time."'
-					'She is a little disappointed but turns her attention to the game. "You are so going to lose!" she laughs. You play games for a while, although things are a little awkward between you. Eventually, Albina stops. "Well, I had fun, but there is some stuff I need to take care of," she says as she turns the console off.'
+					'She''s clearly a little disappointed, but turns her attention back to the game. "You''re so going to lose!" she laughs. You play some games for a while, although things are a little awkward between you. Eventually, Albina stops. "Well, I had fun, but there''s some stuff I need to take care of," she says as she turns the console off.'
 					'Getting the hint, you get up as well. "Yeah, I should probably get going myself." You exchange a brief hug before you leave.'
 					act 'Say goodbye and go home':
 						AlbinaQW['visiting'] = 0
@@ -427,14 +427,13 @@ if $ARGS[0] = 'playgame':
 	npc_rel['A23'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
-	'The two of you keep playing video games and trash-talking, 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.'
+	'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 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.'
 		'You laugh and nod. "Sure, but you''re so going down!"'
-		'She laughs in response. "You''re that sure? So, how about we make it a bit more interesting then?"'
+		'She laughs in response. "You''re that sure? How about we make it a bit more interesting then?"'
 		'You arch your brow curiously. "What do you have in mind?"'
 		'She grins at you, gets up and walks over to her dresser. She rummages around in it before pulling out a strapon harness with a large black dildo attached. "The winner gets to use this on the loser... However. They. Want," she says with a smirk.'
-
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse the bet (<<will_cost>> Willpower)':
@@ -448,7 +447,8 @@ if $ARGS[0] = 'playgame':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'You shake your head. "Uhhh... I''m really not interested in doing that."'
-				'Albina puts the strapon away, and you can tell she is a little disappointed as she comes back over and lies down beside you again. "You are so going to lose!" she laughs. You continue to play games for a while, although things are awkward between you. Eventually, Albina stops. "Well, I had fun, but there''s some stuff I need to take care of," she says as she turns the console off.'
+				'Albina puts the strapon away, and you can tell she''s a little disappointed as she comes back over and lies down beside you again. "You''re so going to lose!" she laughs.' 
+				'You continue to play games for a while, although things are awkward between you. Eventually, Albina stops. "Well, I had fun, but there''s some stuff I need to take care of," she says as she turns the console off.'
 				'Getting the hint, you get up as well. "Yeah, I should probably get going myself." You exchange a brief hug before you leave.'
 				act 'Say goodbye and go home':
 					AlbinaQW['visiting'] = 0
@@ -479,8 +479,8 @@ if $ARGS[0] = 'game_bet':
 	npc_rel['A23'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
-	'You stare at the size of the attached dildo. It''s almost as long and thick as your forearm. "Where did you get that?!" you laugh. "Whatever, 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. "Please! You''re so going to lose."' 
+	'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.'
 	act 'Play until someone wins':
 		*clr & cla
@@ -504,10 +504,10 @@ if $ARGS[0] = 'game_bet':
 			'It''s close, but in the end, you just manage to win the game. "Yes!" you exclaim triumphantly, and she laughs as she grabs the strapon harness and hands it to you. You both undress, and you grin as you slide the harness on.'
 			act 'Continue': gt 'albinahome', 'wear_strapon'
 		elseif albplay = 1:
-			'Although you try your best, Albina proves a worthy opponent and barely defeats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
+			'Although you try your best, Albina proves a worthy opponent and barely defeats you. Laughing in a mocking and villainous tone, she slaps you on the 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 'albinahome', 'receive_strapon'
 		elseif albplay = 0:
-			'Although you try your best, Albina simply outplays you at every turn. You stand no chance, and she easily beats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
+			'Although you try your best, Albina simply outplays you at every turn. You stand no chance, and she easily beats you. Laughing in a mocking and villainous tone, she slaps you on the 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 'albinahome', 'receive_strapon'
 		end
 		killvar 'gameresult'
@@ -518,7 +518,7 @@ if $ARGS[0] = 'game_bet':
 		menu_off = 1
 		gs 'stat'
 		'<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 but smiles and smacks your ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
+		'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 'albinahome', 'receive_strapon'
 	end
 end
@@ -585,7 +585,7 @@ if $ARGS[0] = 'fuck_albina_ass':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
 		'"Come on, <<$pcs_nickname>>. Put it back in and fuck me... hard," she says while wiggling her hips. You smile at her and slide the dildo back into her hole with ease, making her moan in pleasure. Next, you grab onto her hips and start fucking her balls deep, filling her ass with the dildo as she reaches back and starts rubbing her clit. After several minutes, you feel her ass tighten around your fake cock. Finally, she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy, soaking the sheets beneath her. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
-		'After you''ve pulled out, she inserts a few fingers into her gaping hole as juices leak from her pussy. "Oh fuck yes, <<$pcs_nickname>>! That was fucking amazing!"'
+		'After you''ve pulled out, she thrusts her fingers into her gaping hole as juices leak from her pussy. "That was fucking amazing!" she says as she pulls her fingers out of her ass and sucks on them.'
 		'"Fucking such a nice-looking ass was amazing!" you reply, and you both laugh.'
 		gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 		gs 'stat'
@@ -596,13 +596,40 @@ end
 if $ARGS[0] = 'receive_strapon':
 	*clr & cla
 	menu_off = 1
-	npc_sex['A23'] += 1
 	lesbian += 1
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-	'You slide your panties off as she tightens the strapon firmly while standing next to the bed. You lie next to her, and she pulls your head down to the dildo. "Suck my dick, loser!" she says with a giggle.'
-	'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that, <<$pcs_nickname>>!" she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
-	gs 'arousal', 'foreplay', 5, 'lesbian'
+	if stat['bj'] = 0:
+		stat['bj'] += 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+		'Albina notices you staring at the dildo as she tightens the straps firmly around her hips. "You okay, <<$pcs_nickname>>?"'
+		'"Yeah, it''s just..." you start to answer.'
+		'"You''ve never sucked dick before, have you?" she interrupts with a smile. "It''s okay. I can show you what to do so you''re ready for the real thing." She sits back on the bed and spreads her legs, motioning for you to crawl between them.'
+		'"Okay, first thing''s first. You''ll want to start off with a handjob. It gets them in the mood and wanting more," she explains as she takes your hand and places it on the dildo. "Take a firm grip of the shaft, but not too tight, and start moving your hand up and down."'
+		*nl
+		'You follow her instructions and slowly run your hand up and down the dildo. "That''s it, <<$pcs_nickname>>. Just keep doing that. If you feel like it, you can also lick the shaft or suck on their balls while jerking them off. They like it when you tease them like that."'
+		'After a few minutes, Albina moves on with her lesson. "Okay <<$pcs_nickname>>, you ready?" she asks and you nod your head. "Okay. Start off with a little teasing. Run your tongue around the tip while jerking them off."'
+		'You do as she says and she makes you look up at her. "Eye contact, <<$pcs_nickname>>. They like that." You nod at her and look her in the eye as you continue jerking off her fake cock. "Good. Now some guys like taking control, but only let them do that if it''s what you want. That''s enough teasing anyway. Now I want you take as much of the shaft into your mouth as you can."' 
+		*nl
+		'You obdiently take as much of the dildo into your mouth as you can without choking. "Good," Albina says. "Now start bobbing your head up and down; imagine that you''re sucking on a popsicle while swirling your tongue around the head. And keep using your hand."'
+		'You spend the next few minutes practicing on the dildo until your arm and jaw start to ache and you stop. You pop the dildo out of your mouth and look up at Albina, who smiles. "You''re a natural, <<$pcs_nickname>>! If I had a dick, then my cum would be all over your face by now."'
+		'You smile at the compliment. "Time for me to fuck you now," Albina says with a grin.'
+		gs 'arousal', 'foreplay', 5, 'lesbian'
+		gs 'stat'
+		act 'Continue': gt 'albinahome', 'albina_fucks_you'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
+		'You slide your panties off as she tightens the strapon firmly while standing next to the bed. You lie next to her, and she pulls your head down to the dildo. "Suck my dick, loser!" she says with a giggle.'
+		'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that, <<$pcs_nickname>>..." she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
+		gs 'arousal', 'foreplay', 5, 'lesbian'
+		gs 'stat'
+		act 'Continue': gt 'albinahome', 'albina_fucks_you'
+	end
+end
+
+if $ARGS[0] = 'albina_fucks_you':
+	*clr & cla
+	menu_off = 1
 	gs 'stat'
 	if stat['think_virgin'] = 1:
 		act 'You''re a virgin':
@@ -615,6 +642,8 @@ if $ARGS[0] = 'receive_strapon':
 			act 'Just fuck my ass': gt 'albinahome', 'albina_ass_fucks_you'
 			act 'Get your cherry popped':
 				*clr & cla
+				npc_sex['A23'] += 1
+				lesbian += 1
 				gs 'boyStat', 'D3'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
@@ -638,6 +667,8 @@ if $ARGS[0] = 'receive_strapon':
 	else
 		act 'Get your pussy fucked':
 			*clr & cla
+			npc_sex['A23'] += 1
+			lesbian += 1
 			gs 'boyStat', 'D3'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
@@ -686,7 +717,7 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 				*nl
 				'Albina looks at you in what you can only describe as awe. "God damn, <<$pcs_nickname>>, even I''ve never taken a fist up my ass, and I''m the queen of butt stuff!"'
 				'"Is it weird to do that?" you ask with concern.'
-				'"No, not at all! I''ve always wanted to try it, but I''ve never found anyone interested in it. But, maybe that''s about to change..."'
+				'"No, not at all! I''ve always wanted to try it myself. Maybe I will now that I need to up my game."'
 				'She looks you over with lustful desire before continuing. "Practicing with a dildo makes your first butt fuck easier, but a whole fucking hand?! A cock or dildo would be a breeze for you!"'
 				'She then places a hand on your shoulder. "<<$pcs_nickname>>, be honest with me. Do you want me to fuck your ass? I''ll be as gentle as you want."'
 				act 'Yes': gt 'albinahome', 'first_anal1'
@@ -757,7 +788,7 @@ if $ARGS[0] = 'first_anal':
 		'You feel her start slowly pushing, and the pressure builds until the tip of the dildo suddenly pops into your ass, causing you to groan and grit your teeth while gripping the sheets even tighter. It''s a painful sensation, and you instinctively feel the urge to free yourself. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks as you feel a stinging pain shooting through you.'
 		'Remembering what she said, you fight the urge to pull away and try to relax. "No, I just need a second," you reply as you look back at her, and she nods.'
 		*nl
-		'After a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just keep your ass relaxed and tell me if it gets too painful. I don''t want you hurting yourself trying to impress me. Got it?"'
+		'After taking a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just keep your ass relaxed and tell me if it gets too painful. I don''t want you hurting yourself trying to impress me. Got it?"'
 		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass. You feel stretched out as she reaches a depth she feels you''ll be comfortable with and starts gently thrusting.'
 		'Despite the shallow depth and Albina being gentle, the pain becomes too much after a few minutes, and you ask her to pull out. You sit on your knees and clutch your ass cheeks in your hands as pain pulses through your stretched asshole.'
 		'"You lasted longer than I thought you would. Not bad for your first go, <<$pcs_nickname>>," Albina says as she hands you some wipes to clean yourself up. "Next time you lose, maybe we can go deeper and... harder," she adds with a teasing grin as she cleans the dildo and puts it away.'
@@ -814,7 +845,7 @@ if ARGS[0] = 'anal_refuse':
 	'You shake your head. "No, I don''t think I''m ready for that yet."'
 	'Albina smiles. "That''s okay, but if you want to do it with me or want some advice, then just ask. It''s best to get help from someone with... experience on the matter," she says with a grin.'
 	'You grin back. "I''ll be sure to ask the master buttslut for any of her wisdom."'
-	'She punches you in the arm. "Damn right, you will."'
+	'She punches you in the arm. "Damn right you will."'
 	act 'Do something else' :gt 'albinahome', 'bedroom'
 end
 

+ 12 - 11
locations/anush_bedroom.qsrc

@@ -660,7 +660,7 @@ if $ARGS[0] = 'guitar':
 		act 'Try to play it':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/play_guitar.jpg"></center>'
-			if instrmusic_lvl < 20:
+			if pcs_instrmusic < 20 or instrmusic_lvl < 10:
 				gs 'exp_gain', 'instrmusic', rand(0,1)
 				pcs_mood += 5
 				minut += 20
@@ -670,14 +670,14 @@ if $ARGS[0] = 'guitar':
 				'Unfortunately, playing the guitar is a lot harder than it looks. It takes you several minutes to hit the right notes and several more to play even the tiny first fraction of the song without making a mistake. The strings cut into your tender, uncalloused fingertips and you eventually decide to stop.'
 				'You realize now that learning how to play the guitar can be a frustrating, painful experience, yet you can''t help but gently stroke the guitar once more before putting it back on its stand. You look forward to trying to play again.'
 				act 'Put the guitar back':gt 'anush_bedroom','anushroom'
-			elseif instrmusic_lvl < 40:
+			elseif pcs_instrmusic < 40:
 				gs 'exp_gain', 'instrmusic', rand(0,2)
 				pcs_mood += 5
 				minut += 20
 				'You gently brush your fingers over the strings and slowly pick at them before you start playing a song you recently started learning. Unfortunately, you still have a lot to learn - it takes you several minutes to hit the right notes and several more to play even a tiny bit of the song without making a mistake. Still, you''re better than you used to be, and after about twenty minutes, you decide to stop.'
 				'<<$OpenInnerThought>>"Maybe Anushka will be willing to help me out and teach me how to play?"<<$CloseInnerThought>> you muse as you place the instrument back on its stand.'
 				act 'Put the guitar back':gt 'anush_bedroom','anushroom'
-			elseif instrmusic_lvl < 60:
+			elseif pcs_instrmusic < 60:
 				gs 'exp_gain', 'instrmusic', rand(0,3)
 				pcs_mood += 5
 				minut += 20
@@ -722,7 +722,6 @@ if $ARGS[0] = 'bed':
 	end
 end
 
-!!below this, is all new, so check the code please
 if $ARGS[0] = 'nush_guitar':
 	$menu_loc = 'anush_bedroom'
 	$menu_arg = 'nush_guitar'
@@ -1005,15 +1004,16 @@ if $ARGS[0] = 'guitar_lesson':
 	anushkaQW['knows_guitar'] = 1
 	anushkaQW['sveta_love'] += 1
 !!need the new code on gaining xp from being taught by a NPC here netuttkki
+	gs 'exp_gain', 'instrmusic', rand(1,5)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/teach_guitar1.jpg"></center>'
 	'She hands you the guitar and scoots around behind you. You sit with her legs on each side of your hips, and you can feel her inner thighs pressing against your hips. She leans close behind you, and you can feel her breasts against your back as she reaches around you to place her hands on yours. Leaning forward, her face is right next to yours, and you realize this is a very intimate feeling. You can feel the heat from her body against yours, and can smell lavender from the shampoo she uses on her hair.'
 	*nl
-	if instrmusic_lvl < 20:
-		'You try and focus on what she''s showing you and telling you, but her being this close is pretty distracting. You try to do what she says, but not to a significant effect. You can play a few notes, but stringing them together is more challenging than you thought. Her hands touch yours often, helping you with finger placement. Finally, after about half an hour, Anushka stops and slides away from you, the warmth from her body suddenly so noticeable. She takes the guitar from you. "Okay, that''s enough for today. You need to practice a lot when you get home," she says as she takes the guitar back over and hangs it on the wall, after which she comes back to sit on the bed with you.'
+	if pcs_instrmusic < 20 or instrmusic_lvl < 10:
+:		'You try and focus on what she''s showing you and telling you, but her being this close is pretty distracting. You try to do what she says, but not to a significant effect. You can play a few notes, but stringing them together is more challenging than you thought. Her hands touch yours often, helping you with finger placement. Finally, after about half an hour, Anushka stops and slides away from you, the warmth from her body suddenly so noticeable. She takes the guitar from you. "Okay, that''s enough for today. You need to practice a lot when you get home," she says as she takes the guitar back over and hangs it on the wall, after which she comes back to sit on the bed with you.'
 		act 'Get off the bed': gt 'anush_bedroom','anushroom'
 		act 'Chat to her': gt 'anushkachat', 'chat'
-	elseif instrmusic_lvl < 40:
+	elseif pcs_instrmusic < 40:
 		'You try and focus on what she''s showing you and telling you, but her being this close is pretty distracting. You can play all the chords and string them together as long as there are no sudden changes. Those still trip you up, and she will correct your hand placement. Finally, after about half an hour, Anushka stops and slides away from you, her body''s warmth suddenly so noticeable. She takes the guitar from you. "Okay, that''s enough for today. Not bad, but you have a long way to go," she says as she takes the guitar back over and hangs it on the wall, after which she comes back to sit on the bed with you.'
 		act 'Get off the bed': gt 'anush_bedroom','anushroom'
 		act 'Chat to her': gt 'anushkachat', 'chat'
@@ -1029,12 +1029,13 @@ if $ARGS[0] = 'nush_guitar_play_together':
 	$menu_arg = 'nush_guitar_play_together'
 	menu_off = 1
 	*clr & cla
+	gs 'exp_gain', 'instrmusic', rand(1,5)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/teach_guitar2.jpg"></center>'
 	'"Hey, want to play together?" you ask.'
 	'She smiles. "Yeah, sure." She gets up and gets her guitar off the wall while you sit on the bed and get yours ready. When she comes back, she sits next to you, and you discuss what to play until you find a song you both know and start playing.'
 	*nl
-	if instrmusic_lvl < 20:
+	if instrmusic_lvl < 10 or pcs_instrmusic < 20 :
 		minut += 5
 		'You can''t keep up with her and keep making mistakes, so she quickly stops playing and reaches over to stop you. "How can I put this nicely..." She pauses, then smiles at you. "You fucking suck. Do you even know how to play?"'
 		'You don''t know how to respond to that. "I''m learning," you meekly reply.'
@@ -1042,7 +1043,7 @@ if $ARGS[0] = 'nush_guitar_play_together':
 		act 'Get off the bed': gt 'anush_bedroom','anushroom'
 		act 'Chat to her': gt 'anushkachat', 'chat'
 		act 'Get a lesson': gt 'anush_bedroom','guitar_lesson'
-	elseif instrmusic_lvl < 40:
+	elseif pcs_instrmusic < 40:
 		minut += 10
 		'You can''t keep up with her and make a few mistakes. After a few minutes, she reaches over to stop you. "Stop, just stop. How can I put this nicely..." She pauses, then smiles at you. "You''re not very good. You''ve got most of the basics down, but you''re a long way from being ready to jam."'
 		'You sigh. You know you weren''t playing that well, but you were still having fun. "I''m getting better!"'
@@ -1050,7 +1051,7 @@ if $ARGS[0] = 'nush_guitar_play_together':
 		act 'Get off the bed': gt 'anush_bedroom','anushroom'
 		act 'Chat to her': gt 'anushkachat', 'chat'
 		act 'Get a lesson': gt 'anush_bedroom','guitar_lesson'
-	elseif instrmusic_lvl < 60:
+	elseif pcs_instrmusic < 60:
 		minut += 20
 		'You make the occasional mistake a few times and have a little trouble keeping up with her, but you play together for about twenty minutes before she stops. "Not bad. You still need a fair amount of polish, but you''re getting there," she says with a smile.'
 		'You return her smile. "Thanks. I''ve been working on it a lot."'
@@ -1058,7 +1059,7 @@ if $ARGS[0] = 'nush_guitar_play_together':
 		act 'Get off the bed': gt 'anush_bedroom','anushroom'
 		act 'Chat to her': gt 'anushkachat', 'chat'
 		act 'Get a lesson': gt 'anush_bedroom','guitar_lesson'
-	elseif instrmusic_lvl < 80:
+	elseif pcs_instrmusic < 80:
 		minut += 30
 		'You don''t make any mistakes and don''t have any trouble keeping up with her. She''s still better than you, but you''re not that far behind her in skill. You play together for about half an hour before she stops. "Pretty good. Before you know it, you''ll be as good as I am," she says with a smile.'
 		'You return her smile. "Thanks. I''ve been working on it a lot."'

+ 16 - 41
locations/anushapt.qsrc

@@ -13,26 +13,18 @@
 !---------------------------------------------
 
 if $ARGS[0] = 'home':
-	$menu_loc = 'anushapt'
-	$menu_arg = 'home'
 	menu_off = 0
 	$track_loop = ''
-	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$locM_arg = $ARGS[0]
-	$locM = 'anushapt'
-	$loc_arg = $ARGS[0]
-	$loc = 'anushapt'
-	$location_type = 'private'
-	clr
 	popolaini = 0
 	saunaYouRoom = 0
 	boycherdaksex = 0
 	minut += 1
 	bonusZ = 0
-	gs 'stat'
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
+	$location_type = 'private'	
 	gs 'themes', 'indoors'
-
+	gs 'stat'
 	if anushkaQW['home_day'] ! daystart:
 		anushkaQW['home_day'] = daystart
 		AnushkaLoc = 0
@@ -292,14 +284,12 @@ if $ARGS[0] = 'home':
 end
 
 if $ARGS[0] = 'hallway':
-	$menu_loc = 'anushapt'
-	$menu_arg = 'hallway'
+	*clr & cla
 	menu_off = 0
 	killvar '$locclass'
-	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$location_type = 'indoors'
-	*clr & cla
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
+	$location_type = 'indoors'	
 	minut += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
@@ -332,18 +322,13 @@ if $ARGS[0] = 'hallway':
 end
 
 if $ARGS[0] = 'bathroom':
-	CLOSE ALL
-	$menu_loc = 'anushapt'
-	$menu_arg = 'bathroom'
-	$loc_arg = 'bathroom'
-	$loc = 'anushapt'
-	$locM_arg = 'bathroom'
-	$locM = 'anushapt'
 	menu_off = 0
 	*clr & cla
 	minut += 1
-	gs 'stat'
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	$location_type = 'bathroom'
+	gs 'stat'
+	
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom.jpg"></center>'
 	'The bathroom has seen better days. It looks like it hasn''t been cleaned for quite some time, with mold growing in the corners of the walls and floor.'
@@ -430,14 +415,11 @@ end
 
 if $ARGS[0] = 'nushshower':
 	menu_off = 1
-	CLOSE ALL
 	*clr & cla
-	$loc_arg = 'bathroom'
-	$loc = 'anushapt'
-	$locM_arg = 'bathroom'
-	$locM = 'anushapt'
-	gs 'stat'
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	$location_type = 'bathroom'
+	gs 'stat'
+	
 	AnushkaLoc = 7
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/dry1.jpg"></center>'
@@ -733,16 +715,14 @@ if $ARGS[0] = 'snack':
 end
 
 if $ARGS[0] = 'livingroom':
-	$menu_loc = 'anushapt'
-	$menu_arg = 'livingroom'
 	menu_off = 0
-	CLOSE ALL
 	*clr & cla
 	if livingev_day ! daystart:
 		livingev = rand (1, 5)
 	else
 		livingev = 0
 	end
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	$locclass = 'livingr'
 	minut += 1
 	gs 'stat'
@@ -1056,12 +1036,7 @@ if $ARGS[0] = 'livingroom':
 end
 
 if $ARGS[0] = 'kitchen':
-	$loc = 'anushapt'
-	$loc_arg = 'kitchen'
-	$menu_loc = 'anushapt'
-	$menu_arg = 'kitchen'
 	menu_off = 0
-	CLOSE ALL
 	*clr & cla
 	if kitchenev_day ! daystart:
 		kitchenev = rand (1, 5)
@@ -1069,6 +1044,7 @@ if $ARGS[0] = 'kitchen':
 		kitchenev = 0
 	end
 	minut += 1
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	$locclass = 'kitr'
 	gs 'stat'
 	gs 'kit_din'
@@ -1210,11 +1186,10 @@ if $ARGS[0] = 'fridge':
 end
 
 if $ARGS[0] = 'anushparents':
-	$menu_loc = 'anushapt'
-	$menu_arg = 'anushparents'
 	menu_off = 0
-	CLOSE ALL
+
 	*clr & cla
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Anushka''s parent''s room</font></b></center>'

+ 1 - 1
locations/anushkaev1.qsrc

@@ -1590,7 +1590,7 @@ if $ARGS[0] = 'bedroom_lesbian':
 						minut += 10
 						'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/disco_bedroom6.jpg"></center>'
-						'She moves her focus back to your clit, changing her speed and motions based on your moans. She''s very talented and seems very attuned tp what pleasures you. After several minutes, you feel you should return the favor. You gently push her away from you as you get off your back and decide what to do.'
+						'She moves her focus back to your clit, changing her speed and motions based on your moans. She''s very talented and seems very attuned to what pleasures you. After several minutes, you feel you should return the favor. You gently push her away from you as you get off your back and decide what to do.'
 						gs 'arousal', 'cuni', 3, 'lesbian'
 						pcs_horny += 5
 						gs 'stat'

+ 16 - 49
locations/artemhome.qsrc

@@ -34,25 +34,21 @@
 !---------------------------------------------
 
 if $ARGS[0] = 'home':
-	$menu_loc = 'artemhome'
-	$menu_arg = 'home'
+	clr
 	menu_off = 0
 	$track_loop = ''
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$locM_arg = 'home'
-	$locM = 'artemhome'
-	$loc_arg = 'home'
-	$loc = 'artemhome'
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	$location_type = 'private'
-	clr
+	gs 'themes', 'indoors'		
 	popolaini = 0
 	saunaYouRoom = 0
 	boycherdaksex = 0
 	minut += 1
 	bonusZ = 0
 	gs 'stat'
-	gs 'themes', 'indoors'
+	
 	
 !! Artem''s location, he is out on Wednesday from 15-22
 	if week = 3 and hour >= 15 and hour < 22:
@@ -173,19 +169,13 @@ if $ARGS[0] = 'home':
 end
 
 if $ARGS[0] = 'hallway':
-	$menu_loc = 'artemhome'
-	$menu_arg = 'hallway'
 	menu_off = 0
 	killvar '$locclass'
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$location_type = 'indoors'
-	$locM_arg = 'hallway'
-	$locM = 'artemhome'
-	$loc_arg = 'hallway'
-	$loc = 'artemhome'
 	*clr & cla
 	minut += 1
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]	
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/hall.jpg"></center>'
@@ -212,18 +202,14 @@ end
 
 if $ARGS[0] = 'bathroom':
 	CLOSE ALL
-	$menu_loc = 'artemhome'
-	$menu_arg = 'bathroom'
-	$loc_arg = 'bathroom'
-	$loc = 'artemhome'
-	$locM_arg = 'bathroom'
-	$locM = 'artemhome'
+	
 	if ArtemLoc ! 3:
 		menu_off = 0
 		*clr & cla
-		minut += 1
-		gs 'stat'
+		minut += 1		
+		gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 		$location_type = 'bathroom'
+		gs 'stat'
 		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/bathroom.jpg"></center>'
 		'The first thing you notice are the god awful green tiles with matching sink in the bathroom. You don''t know who picked it, but they obviously don''t have good taste. Other than that, it''s a fairly typical bathroom.'
@@ -270,19 +256,14 @@ if $ARGS[0] = 'bathroom':
 end
 
 if $ARGS[0] = 'artemroom':
-	$menu_loc = 'artemhome'
-	$menu_arg = 'artemroom'
-	$locM_arg = 'artemroom'
-	$locM = 'artemhome'
-	$loc_arg = 'artemroom'
-	$loc = 'artemhome'
-	menu_off = 0
-	$locclass = 'bedr'
+	menu_off = 0	
 	CLOSE ALL
 	$track_loop = ''
 	music_loop = 1
 	*clr & cla
 	minut += 1
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
+	$locclass = 'bedr'
 	gs 'stat'
 	'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom.jpg"></center>'
@@ -592,12 +573,6 @@ if $ARGS[0] = 'snack':
 end
 	
 if $ARGS[0] = 'livingroom':
-	$menu_loc = 'artemhome'
-	$menu_arg = 'livingroom'
-	$locM_arg = 'livingroom'
-	$locM = 'artemhome'
-	$loc_arg = 'livingroom'
-	$loc = 'artemhome'
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
@@ -606,6 +581,7 @@ if $ARGS[0] = 'livingroom':
 	else
 		livingev = 0
 	end
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	$locclass = 'livingr'
 	minut += 1
 	gs 'stat'
@@ -871,12 +847,6 @@ if $ARGS[0] = 'livingroom':
 end
 
 if $ARGS[0] = 'kitchen':
-	$locM_arg = 'kitchen'
-	$locM = 'artemhome'
-	$loc_arg = 'kitchen'
-	$loc = 'artemhome'
-	$menu_loc = 'artemhome'
-	$menu_arg = 'kitchen'
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
@@ -886,6 +856,7 @@ if $ARGS[0] = 'kitchen':
 		kitchenev = 0
 	end
 	minut += 1
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	$locclass = 'kitr'
 	gs 'stat'
 	gs 'kit_din'
@@ -1133,17 +1104,13 @@ if $ARGS[0] = 'fridge':
 end 
 	
 if $ARGS[0] = 'artemparents':
-	$menu_loc = 'artemhome'
-	$menu_arg = 'artemparents'
-	$locM_arg = 'artemparents'
-	$locM = 'artemhome'
-	$loc_arg = 'artemparents'
-	$loc = 'artemhome'
+	
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
 	minut += 1
 	temp = rand(0,1)
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	gs 'stat'
 	'<center><b><font color = maroon>Artem''s parent''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/parroom.jpg"></center>'

+ 3 - 3
locations/autosalonF.qsrc

@@ -107,7 +107,7 @@ if $ARGS[0] = 'manager1':
 		end
 
 		if karta + bankDebtLimit >= 1097000:
-			act 'Buy a Toyota Corolla (1,097,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1097000, 'Toyaboutta Corolla', 103, 3000
+			act 'Buy a Toyota Corolla (1,097,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1097000, 'Toyota Corolla', 103, 3000
 		end
 
 		if karta + bankDebtLimit >= 1299700:
@@ -173,8 +173,8 @@ if $ARGS[0] = 'buy':
 	car = ARGS[3]
 	benz = 3
 	cardrive = 9
-	teh = ARGS[4]
-	tehcar = ARGS[4]
+	car['new_condition'] = ARGS[4]
+	car['current_condition'] = ARGS[4]
 	wrek = 0
 
 	'The manager draws up a purchasing contract, and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 

+ 5 - 5
locations/autoservisF.qsrc

@@ -18,12 +18,12 @@ if $ARGS[0] = 'start':
 	if cardrive = 7:
 		menu_off = 1
 		if wrek = 0:
-			if teh >= tehcar * 75 / 100:
+			if car['current_condition'] >= car['new_condition'] * 75 / 100:
 				'The foreman inspects your car quickly but thoroughly.' 
 				'After only a few minutes, he returns to you and announces that your car doesn''t need any repairs or maintenance.'
 			end
 
-			if teh < tehcar * 75 / 100:
+			if car['current_condition'] < car['new_condition'] * 75 / 100:
 				'The foreman inspects your car quickly but thoroughly.' 
 				'Here and there, he seems to be murmuring to himself, maybe assessing a defect. After only a few minutes, he returns to you and points out what needs to be fixed.' 
 				'It would cost you <<normrem>> <b>₽</b>.'
@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 						*clr
 						money -= normrem
 						minut += 60
-						teh = tehcar
+						car['current_condition'] = car['new_condition']
 						wrek = 0
 						'<center><img <<$set_imgh>> src="images/locations/city/industrial/CarServiceSta/autoservis2.jpg"></center>'
 						'Since he tells you that it''s not gonna take long, you go into a waiting room with couches and a TV. After about an hour of flipping through channels, the car is ready, and you pay <<normrem>> <b>₽</b>.'
@@ -53,8 +53,8 @@ if $ARGS[0] = 'start':
 					*clr
 					money -= normrem
 					minut += 60
-					tehcar = tehcar / 2
-					teh = tehcar
+					car['new_condition'] = car['new_condition'] / 2
+					car['current_condition'] = car['new_condition']
 					wrek = 0
 					'<center><img <<$set_imgh>> src="images/locations/city/industrial/CarServiceSta/autoservis2.jpg"></center>'
 					'Since he tells you that it''s not gonna take long - at first you think he is being sarcastic but then realize that his no-nonsense attitude doesn''t leave much room for humour - you go into a waiting room with couches and a TV. After about an hour of flipping through channels, you are called back to the garage and can hardly believe your eyes.'

+ 9 - 12
locations/autotraidF.qsrc

@@ -121,8 +121,8 @@ if $ARGS[0] = 'car':
 					car = 1
 					benz = 3
 					cardrive = 9
-					tehcar = 200
-					teh = rand(10, tehcar)
+					car['new_condition'] = 200
+					car['current_condition'] = rand(10, car['new_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 <<bupay>> <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.' 
@@ -138,7 +138,7 @@ if $ARGS[0] = 'car':
 		act 'Inspect a VAZ 2114':gt 'autotraidF', 'inspect', 'VAZ 2114', 4, 300, 1, 3
 		act 'Inspect a VAZ 2110':gt 'autotraidF', 'inspect', 'VAZ 2110', 5, 350, 1, 3
 		act 'Inspect a GAZ 3102':gt 'autotraidF', 'inspect', '3102 GAS', 11, 1000, 2, 5
-		act 'Inspect a 3110':gt 'autotraidF', 'inspect', '3110', 12, 800, 2, 5
+		act 'Inspect a 3110':gt 'autotraidF', 'inspect', '3110', 13, 800, 2, 5
 	end
 end
 
@@ -148,20 +148,18 @@ if $ARGS[0] = 'inspect':
 	menu_off = 1
 	$autotraidF_carname = $ARGS[1]
 	autotraidF_carnum = ARGS[2]
-	tehNT = ARGS[3]
+	car['potential_new_condition'] = ARGS[3]
 	carT = ARGS[4]
 	autotraidF_benz = ARGS[5]
 
 	'<center><b><<$autotraidF_carname>></b></center>'
-	'<center><img <<$set_imgh>> src="images/pc/items/accessories/car/car<<iif(autotraidF_carnum = 1, '''', autotraidF_carnum)>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/items/accessories/car/car<<autotraidF_carnum>>.jpg"></center>'
 
 	gs 'avt'
-	'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
+	'<<$car[''potential_current_condition'']>> The car salesman wants <<bupay>> <b>₽</b> for it.'
 
 	act 'Look around some more':
 		killvar 'bupay'
-		killvar 'tehT'
-		killvar 'tehNT'
 		killvar '$autotraidF_carname'
 		killvar 'autotraidF_carnum'
 		killvar 'autotraidF_benz'
@@ -174,16 +172,15 @@ if $ARGS[0] = 'inspect':
 			money -= bupay
 			$car = $autotraidF_carname
 			car = autotraidF_carnum
+			!!benz = fuel
 			benz = autotraidF_benz
 			cardrive = 9
-			teh = tehT
-			tehcar = tehNT
+			car['current_condition'] = car['potential_current_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 <<bupay>> <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.'
 			killvar 'bupay'
-			killvar 'tehT'
-			killvar 'tehNT'
 			killvar '$autotraidF_carname'
 			killvar 'autotraidF_carnum'
 			killvar 'autotraidF_benz'

+ 110 - 110
locations/avb.qsrc

@@ -1,189 +1,189 @@
 # avb
 if car = 1:
-	if wrek = 1 or teh <= 0:bupay = rand(10000, 20000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = rand(10000, 20000)
 
 	if wrek = 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:bupay = rand(50000, 100000)
-		if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:bupay = rand(40000, 60000)
-		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(20000, 40000)
-		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(10000, 20000)
+		if car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:bupay = rand(50000, 100000)
+		if car['current_condition'] < car['new_condition'] * 75 / 100 and car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:bupay = rand(40000, 60000)
+		if car['current_condition'] < car['new_condition'] * 50 / 100 and car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(20000, 40000)
+		if car['current_condition'] < car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(10000, 20000)
 	end
 elseif car > 1 and car < 6:
-	if wrek = 1 or teh <= 0:bupay = rand(10000, 20000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = rand(10000, 20000)
 
 	if wrek = 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:bupay = rand(100000, 200000)
-		if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:bupay = rand(80000, 120000)
-		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(60000, 90000)
-		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(50000, 70000)
+		if car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:bupay = rand(100000, 200000)
+		if car['current_condition'] < car['new_condition'] * 75 / 100 and car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:bupay = rand(80000, 120000)
+		if car['current_condition'] < car['new_condition'] * 50 / 100 and car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(60000, 90000)
+		if car['current_condition'] < car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(50000, 70000)
 	end
 elseif car >= 6 and car < 11:
-	if wrek = 1 or teh <= 0:bupay = rand(10000, 20000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = rand(10000, 20000)
 
 	if wrek = 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:bupay = rand(150000, 220000)
-		if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:bupay = rand(100000, 160000)
-		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(80000, 120000)
-		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(50000, 90000)
+		if car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:bupay = rand(150000, 220000)
+		if car['current_condition'] < car['new_condition'] * 75 / 100 and car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:bupay = rand(100000, 160000)
+		if car['current_condition'] < car['new_condition'] * 50 / 100 and car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(80000, 120000)
+		if car['current_condition'] < car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(50000, 90000)
 	end
 elseif car >= 11 and car <= 13:
-	if wrek = 1 or teh <= 0:bupay = rand(10000, 20000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = rand(10000, 20000)
 
 	if wrek = 0:
-		if teh >= tehcar * 75/100 and wrek = 0:bupay = rand(70000, 100000)
-		if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:bupay = rand(40000, 80000)
-		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(20000, 60000)
-		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(10000, 30000)
+		if car['current_condition'] >= car['new_condition'] * 75/100 and wrek = 0:bupay = rand(70000, 100000)
+		if car['current_condition'] < car['new_condition'] * 75 / 100 and car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:bupay = rand(40000, 80000)
+		if car['current_condition'] < car['new_condition'] * 50 / 100 and car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(20000, 60000)
+		if car['current_condition'] < car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(10000, 30000)
 	end
 elseif car = 95:
-	if wrek = 1 or teh <= 0:bupay = rand(20000, 60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = rand(20000, 60000)
 
 	if wrek = 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:bupay = rand(500000, 900000)
-		if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:bupay = rand(400000, 600000)
-		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(300000, 500000)
-		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(50000, 300000)
+		if car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:bupay = rand(500000, 900000)
+		if car['current_condition'] < car['new_condition'] * 75 / 100 and car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:bupay = rand(400000, 600000)
+		if car['current_condition'] < car['new_condition'] * 50 / 100 and car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(300000, 500000)
+		if car['current_condition'] < car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(50000, 300000)
 	end
 elseif car = 96:
-	if wrek = 1 or teh <= 0:bupay = rand(20000, 60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = rand(20000, 60000)
 
 	if wrek = 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:bupay = rand(3000000, 4800000)
-		if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:bupay = rand(2540000, 3200000)
-		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(1150000, 2550000)
-		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(50000, 1160000)
+		if car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:bupay = rand(3000000, 4800000)
+		if car['current_condition'] < car['new_condition'] * 75 / 100 and car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:bupay = rand(2540000, 3200000)
+		if car['current_condition'] < car['new_condition'] * 50 / 100 and car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(1150000, 2550000)
+		if car['current_condition'] < car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(50000, 1160000)
 	end
 elseif car = 97:
-	if wrek = 1 or teh <= 0:bupay = rand(20000, 60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = rand(20000, 60000)
 
 	if wrek = 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:bupay = rand(1000000, 1800000)
-		if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:bupay = rand(540000, 1200000)
-		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(150000, 550000)
-		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(50000, 160000)
+		if car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:bupay = rand(1000000, 1800000)
+		if car['current_condition'] < car['new_condition'] * 75 / 100 and car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:bupay = rand(540000, 1200000)
+		if car['current_condition'] < car['new_condition'] * 50 / 100 and car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(150000, 550000)
+		if car['current_condition'] < car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(50000, 160000)
 	end
 elseif car = 98:
-	if wrek = 1 or teh <= 0:bupay = rand(20000, 60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = rand(20000, 60000)
 
 	if wrek = 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:bupay = rand(3000000, 4800000)
-		if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:bupay = rand(2540000, 3200000)
-		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(1150000, 2550000)
-		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(50000, 1160000)
+		if car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:bupay = rand(3000000, 4800000)
+		if car['current_condition'] < car['new_condition'] * 75 / 100 and car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:bupay = rand(2540000, 3200000)
+		if car['current_condition'] < car['new_condition'] * 50 / 100 and car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(1150000, 2550000)
+		if car['current_condition'] < car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(50000, 1160000)
 	end
 elseif car = 99:
-	if wrek = 1 or teh <= 0:bupay = rand(20000, 60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = rand(20000, 60000)
 
 	if wrek = 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:bupay = rand(2000000, 3800000)
-		if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:bupay = rand(1540000, 2200000)
-		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(550000, 1550000)
-		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(50000, 560000)
+		if car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:bupay = rand(2000000, 3800000)
+		if car['current_condition'] < car['new_condition'] * 75 / 100 and car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:bupay = rand(1540000, 2200000)
+		if car['current_condition'] < car['new_condition'] * 50 / 100 and car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(550000, 1550000)
+		if car['current_condition'] < car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(50000, 560000)
 	end
 elseif car = 100:
-	if wrek = 1 or teh <= 0:bupay = rand(20000, 60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = rand(20000, 60000)
 
 	if wrek = 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:bupay = rand(3000000, 5800000)
-		if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:bupay = rand(2540000, 3200000)
-		if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:bupay = rand(1550000, 2550000)
-		if teh < tehcar * 25 / 100 and wrek = 0:bupay = rand(50000, 1560000)
+		if car['current_condition'] >= car['new_condition'] * 75 / 100 and wrek = 0:bupay = rand(3000000, 5800000)
+		if car['current_condition'] < car['new_condition'] * 75 / 100 and car['current_condition'] >= car['new_condition'] * 50 / 100 and wrek = 0:bupay = rand(2540000, 3200000)
+		if car['current_condition'] < car['new_condition'] * 50 / 100 and car['current_condition'] >= car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(1550000, 2550000)
+		if car['current_condition'] < car['new_condition'] * 25 / 100 and wrek = 0:bupay = rand(50000, 1560000)
 	end
 elseif car = 101:
-	if wrek = 1 or teh <= 0:bupay = RAND(20000,60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(20000,60000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(1500000,2700000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(810000,1800000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(225000,825000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(50000,240000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(1500000,2700000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(810000,1800000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(225000,825000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(50000,240000)
 	end
 elseif car = 102:
-	if wrek = 1 or teh <= 0:bupay = RAND(20000,60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(20000,60000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(350000,630000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(280000,420000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(210000,350000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(50000,210000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(350000,630000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(280000,420000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(210000,350000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(50000,210000)
 	end
 elseif car = 103:
-	if wrek = 1 or teh <= 0:bupay = RAND(20000,60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(20000,60000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(550000,990000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(440000,660000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(330000,550000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(50000,330000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(550000,990000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(440000,660000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(330000,550000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(50000,330000)
 	end
 elseif car = 104:
-	if wrek = 1 or teh <= 0:bupay = RAND(20000,60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(20000,60000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(500000,900000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(400000,600000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(300000,500000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(50000,300000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(500000,900000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(400000,600000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(300000,500000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(50000,300000)
 	end
 elseif car = 105:
-	if wrek = 1 or teh <= 0:bupay = RAND(20000,60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(20000,60000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(600000,1080000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(480000,720000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(360000,600000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(50000,360000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(600000,1080000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(480000,720000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(360000,600000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(50000,360000)
 	end
 elseif car = 106:
-	if wrek = 1 or teh <= 0:bupay = RAND(20000,60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(20000,60000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(900000,1600000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(700000,1100000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(550000,900000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(50000,550000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(900000,1600000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(700000,1100000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(550000,900000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(50000,550000)
 	end
 elseif car = 107:
-	if wrek = 1 or teh <= 0:bupay = RAND(20000,60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(20000,60000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(2000000,3800000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(1540000,2200000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(550000,1550000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(50000,560000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(2000000,3800000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(1540000,2200000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(550000,1550000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(50000,560000)
 	end
 elseif car = 108:
-	if wrek = 1 or teh <= 0:bupay = RAND(20000,60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(20000,60000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(3500000,6300000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(2800000,4200000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(2100000,3500000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(50000,2100000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(3500000,6300000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(2800000,4200000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(2100000,3500000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(50000,2100000)
 	end
 elseif car = 109:
-	if wrek = 1 or teh <= 0:bupay = RAND(20000,60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(20000,60000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(900000,1600000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(700000,1100000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(550000,900000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(50000,550000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(900000,1600000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(700000,1100000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(550000,900000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(50000,550000)
 	end
 elseif car = 110:
-	if wrek = 1 or teh <= 0:bupay = RAND(20000,60000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(20000,60000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(425000,765000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(340000,510000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(255000,425000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(50000,255000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(425000,765000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(340000,510000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(255000,425000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(50000,255000)
 	end
 elseif car = 111:
-	if wrek = 1 or teh <= 0:bupay = RAND(50000,200000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(50000,200000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(6000000,9600000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(5000000,6400000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(2300000,5500000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(150000,2300000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(6000000,9600000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(5000000,6400000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(2300000,5500000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(150000,2300000)
 	end
 elseif car = 112:
-	if wrek = 1 or teh <= 0:bupay = RAND(100000,400000)
+	if wrek = 1 or car['current_condition'] <= 0:bupay = RAND(100000,400000)
 	if wrek = 0:
-		if teh >= tehcar*75/100 and wrek = 0:bupay = RAND(12000000,19000000)
-		if teh < tehcar*75/100 and teh >= tehcar*50/100 and wrek = 0:bupay = RAND(10000000,12800000)
-		if teh < tehcar*50/100 and teh >= tehcar*25/100 and wrek = 0:bupay = RAND(4600000,11000000)
-		if teh < tehcar*25/100 and wrek = 0:bupay = RAND(300000,4600000)
+		if car['current_condition'] >= car['new_condition']*75/100 and wrek = 0:bupay = RAND(12000000,19000000)
+		if car['current_condition'] < car['new_condition']*75/100 and car['current_condition'] >= car['new_condition']*50/100 and wrek = 0:bupay = RAND(10000000,12800000)
+		if car['current_condition'] < car['new_condition']*50/100 and car['current_condition'] >= car['new_condition']*25/100 and wrek = 0:bupay = RAND(4600000,11000000)
+		if car['current_condition'] < car['new_condition']*25/100 and wrek = 0:bupay = RAND(300000,4600000)
 	end
 end
 

+ 3 - 4
locations/avtonorm.qsrc

@@ -14,12 +14,11 @@ if car = 13:normhour = 15
 if car >= 95:normhour = 50
 
 if wrek = 0:
-	normneed = tehcar - teh
+	normneed = 0 - (car['current_condition'] - car['new_condition'])
 	normrem = normneed * normhour
 elseif wrek = 1:
-	normneed = tehcar - teh
-	normremK = (normneed * normhour) * 70
-	normrem = (normneed * normhour) + normremK
+	normneed = 0 - (car['current_condition'] - car['new_condition'])
+	normremK = (normneed * normhour) * 8
 end
 
 --- avtonorm ---------------------------------

+ 1 - 1
locations/bass.qsrc

@@ -24,7 +24,7 @@ if $ARGS[0] = 'start':
 		gt 'bass', 'a'
 	end
 
-	act'Return to dressing room': gt 'fit', 'dressing room'
+	act'Return to dressing room': gt 'fit', 'dressing_room'
 end
 
 if $ARGS[0] = 'a':

+ 6 - 12
locations/bedr.qsrc

@@ -1,21 +1,15 @@
 # bedr
-
-CLOSE ALL
 *clr & cla
-$loc = 'bedr'
-$loc_arg = ''
-$locM = 'bedr'
-$locM_arg = ''
-$menu_loc = 'bedr'
-$menu_arg = ''
 menu_off = 0
+minut += 1
+elektro += 1
+gs 'shortgs', 'setloc', 'bedr', $ARGS[0]
 $locclass = 'bedr'
 $location_type = 'private'
+gs 'themes', 'indoors'
 
-minut += 1
-elektro += 1
 gs 'stat'
-gs 'themes', 'indoors'
+
 
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt 'tobiQW', 'start'
 
@@ -226,7 +220,7 @@ end
 gs 'subkid'
 
 act 'Relax on your bed': gt 'bed', 'start'
-
+act 'Open wardrobe': gt 'wardrobe', 'start'
 gs 'prostitution_functions', 'prostitute_outfit_at_home'
 gs 'music_actions', 'music_icon'
 --- bedr ---------------------------------

+ 132 - 121
locations/bedrPar.qsrc

@@ -1,27 +1,23 @@
 # bedrPar
 
-CLOSE ALL
 *clr & cla
 fromoutside = iif($loc = 'bedrPar',0,1)
-$loc = 'bedrPar'
-$loc_arg = ''
-$location_type = 'private'
-$locclass = 'bedr'
-$menu_loc = 'bedrPar'
-$menu_arg = ''
 menu_off = 0
 minut += 1
 !!day check so mom doesn''t think you have been out all night if you get up very early 
 motherworry[1] = daystart
-gs 'stat'
+gs 'shortgs', 'setloc', 'bedrPar', $ARGS[0]
+$location_type = 'private'
+$locclass = 'bedr'
 gs 'themes', 'indoors'
+gs 'stat'
 gs 'family_schedule'
 
 !! This is runs only once, just to make sure that Sveta can sing from the start, does not have to wait a whole day for `cikl` to run.
 if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
 
 if $ARGS[0] = '' or $ARGS[0] = 'start':
-	if locat['Mother'] = 26 and fromoutside:
+	if locat['Mother'] = 26 and fromoutside and $home['current'] = 'parents_home':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		if prezik > 0 and rand(1,3) = 1:
 			gt 'mother', 'condom_find'
@@ -38,7 +34,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 			act 'Leave': gt 'korrPar'
 		end
-	elseif ParrotQW['Level'] = 2:
+	elseif ParrotQW['Level'] = 2 and $home['current'] = 'parents_home':
 		*clr & cla
 		menu_off = 1
 		'As soon as you enter the room you rush over to <<$ParrotQW[''Name'']>>''s cage and pour the contents of the vial into his water bowl.'
@@ -47,7 +43,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		ParrotQW['Day'] = 3
 		
 		act 'Continue':gt $loc, $loc_arg
-	elseif ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
+	elseif ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1 and $home['current'] = 'parents_home':
 		*clr & cla
 		menu_off = 1
 		'When you enter the room, you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
@@ -59,13 +55,13 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		gs 'stat'
 		
 		act 'Continue':gt $loc, $loc_arg
-	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and locat['Anya_inroom'] = 0:
+	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and locat['Anya_inroom'] = 0 and $home['current'] = 'parents_home':
 		gt 'tobiQW', 'start'
 		
-	elseif locat['Anya'] = 11: 
+	elseif locat['Anya'] = 11 and $home['current'] = 'parents_home': 
 		gt 'sisterQW', 'sisboyQW_expel'
 		
-	elseif locat['Anya_inroom'] = 1 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
+	elseif locat['Anya_inroom'] = 1 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0 and $home['current'] = 'parents_home':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
@@ -85,17 +81,25 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		act 'Leave': gt 'korrPar'
 	else
-		'<center><h1><font color="maroon">Your bedroom</font></h1></center>'
+		if $home['current'] = 'parents_home':
+			'<center><h1><font color="maroon">Your bedroom</font></h1></center>'
+		else
+			'<center><h1><font color="maroon">Your old bedroom</font></h1></center>'
+		end
 		! WD: Correct Image path ~ "images/qwest/alter/<<$loc>>.jpg"
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar.jpg"></center>'
 		*nl
-		'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
-		*nl
-		'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
+		if $home['current'] = 'parents_home':
+			'This is the small bedroom you share with your sister, Anya. On one side of the room is a <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> where you can choose outfits and organise your clothing.'
+			*nl
+			'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
+		else
+			'This small bedroom you used to share with your sister, Anya. The furniture is old and basic.'
+		end
 		*nl
 		if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 
-		if ParrotQW['Owned2'] = 1:
+		if ParrotQW['Owned2'] = 1 and $home['current'] = 'parents_home':
 			'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
 			if daystart - ParrotQW['BuyDate'] <= 10: 
 				'<<$ParrotQW[''Name2'']>> starts squawking at you when you enter the room.'
@@ -131,25 +135,27 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			end
 			*nl
 		end
-		
-		'<table><tr><td valign="top">Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 
-		if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
-			'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
-		elseif tabletki > 0:
-			'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers.'
-		elseif prezik + prezikcount + preziksabo > 0:
-			'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
-		end
-		
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and SchoolAtestat = 0 and detention_warning ! daystart:
-			detention_warning = daystart
-			msg 'You have detention this morning and must be at school before 09:00.'
-		end
+		if $home['current'] = 'parents_home':
+			'<table><tr><td valign="top">Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc">ON</a>.')
 
-		if komp = 1: 'Your <a href="exec: gt ''Komp'',''start''">computer</a> is on your desk.'
+			if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
+				'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'
+			elseif tabletki > 0:
+				'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers.'
+			elseif prezik + prezikcount + preziksabo > 0:
+				'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
+			end
+			
+			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and detention_warning ! daystart:
+				detention_warning = daystart
+				msg 'You have detention this morning and must be at school before 09:00.'
+			end
 
-		if npc_QW['A33'] > 10:npc_QW['A33'] = 10
+			if komp = 1: 'Your <a href="exec: gt ''Komp'',''start''">computer</a> is on your desk.'
+
+			if npc_QW['A33'] > 10:npc_QW['A33'] = 10
+		end
 
 		if locat['Anya_Gad'] = 0:
 			if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
@@ -184,117 +190,121 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			if (locat['Anya'] = 4 or locat['Anya'] = 15) and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
 			gt 'korrPar'
 		end
-		
-		act 'Relax on your bed': gt 'bed', 'start'
 
-		act 'Open wardrobe': gt 'wardrobe', 'start'
-		
-		gs 'prostitution_functions', 'prostitute_outfit_at_home'
-		
-		if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
-		!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.
-		sis_watch = 0
+		if $home['current'] = 'parents_home':
+			act 'Relax on your bed': gt 'bed', 'start'
 
-		if locat['Anya_inroom'] = 0 or sisboytrio > 0:
-			if pornMagazine > 0:gs 'events', 'read_porn'
-			if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
-				act 'Send Rex a text message': gt 'rex_events','sms'
-			end
-			if pcs_horny >= 50:
-				act 'Masturbate':gt 'selfplay', 'start'
+			act 'Open wardrobe': gt 'wardrobe', 'start'
+			
+			gs 'prostitution_functions', 'prostitute_outfit_at_home'
+			
+			if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
+			!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.
+			sis_watch = 0
+
+			if locat['Anya_inroom'] = 0 or sisboytrio > 0:
+				if pornMagazine > 0:gs 'events', 'read_porn'
+				if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
+					act 'Send Rex a text message': gt 'rex_events','sms'
+				end
+				if pcs_horny >= 50:
+					act 'Masturbate':gt 'selfplay', 'start'
+				end
+
+				if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
+				if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
 			end
 
-			if vcard > 0: act 'View your vintage porn cards':card_deck = 0 & gt 'card'
-			if card > 0: act 'View your new porn cards':card_deck = 1 & gt 'card'
-		end
+			gs 'events', 'read'
 
-		gs 'events', 'read'
+			if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
 
-		if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
+			if locat['Anya_inroom'] = 0: dynamic $palelady
 
-		if locat['Anya_inroom'] = 0: dynamic $palelady
+			gs 'wardrobe', 'default_sport_options'
 
-		gs 'exercise', 'start'
+			gs 'exercise', 'start'
 
-		if sewing_kit = 1:
-			'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored neatly under your bed.'
-			*nl
-			if tkan <= 0:
-				'You do not have any fabric.'
-			else
-				if pcs_sewng < 40:
-					'You have <<tkan>> pieces of sewing fabric left.'
-				elseif pcs_sewng < 80:
-					'You have enough fabric for <<tkan>> lessons.'
+			if sewing_kit = 1:
+				'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored neatly under your bed.'
+				*nl
+				if tkan <= 0:
+					'You do not have any fabric.'
 				else
-					if newgobelen = 0:
-						act'Start a new tapestry':
-							*clr & cla
-							menu_off = 1
-							tkan -= 1
-							newgobelen = 1
-							minut += 15
-							gs'stat'
-							'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
+					if pcs_sewng < 40:
+						'You have <<tkan>> pieces of sewing fabric left.'
+					elseif pcs_sewng < 80:
+						'You have enough fabric for <<tkan>> lessons.'
+					else
+						if newgobelen = 0:
+							act'Start a new tapestry':
+								*clr & cla
+								menu_off = 1
+								tkan -= 1
+								newgobelen = 1
+								minut += 15
+								gs'stat'
+								'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
 
-							act'Set the tapestry aside':gt $curloc
+								act'Set the tapestry aside':gt 'bedrPar', 'start'
+							end
 						end
 					end
-				end
-			end	
-			if newgobelen>=1:
-				'Your tapestry is <<newgobelen/10>> percent finished.'
-				act'Work on the tapestry':
-					*clr & cla
-					menu_off = 1
-					minut+=60
-					gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
-					gobramax = (pcs_sewng - 70) * 6
-					gobramin = (pcs_sewng - 70) * 2
-					newgobelen += rand(gobramin,gobramax)
-					gs'stat'
-					if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
-						if newgobelen >= 1000:
-						newgobelen = 0
-						gobelen += 1
-						'Your work on the tapestry is done.'
+				end	
+				if newgobelen>=1:
+					'Your tapestry is <<newgobelen/10>> percent finished.'
+					act'Work on the tapestry':
+						*clr & cla
+						menu_off = 1
+						minut+=60
+						gs 'exp_gain', 'sewng', rand(pcs_intel/10, pcs_intel/5)
+						gobramax = (pcs_sewng - 70) * 6
+						gobramin = (pcs_sewng - 70) * 2
+						newgobelen += rand(gobramin,gobramax)
+						gs'stat'
+						if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
+							if newgobelen >= 1000:
+							newgobelen = 0
+							gobelen += 1
+							'Your work on the tapestry is done.'
+						end
+						act'Set the tapestry aside':gt 'bedrPar', 'start'
 					end
-					act'Set the tapestry aside':gt $curloc
 				end
+				if gobelen > 0: 'You have <<gobelen>> completed tapestries.'
 			end
-			if gobelen > 0: 'You have <<gobelen>> completed tapestries.'
-		end
 
-		!! Computer, music and internet use.
-		gs 'internet_mobile', 'get_access'
-		if locat['Anya_inroom'] = 1:
-			gs 'music_actions', 'not_alone'
+			!! Computer, music and internet use.
+			gs 'internet_mobile', 'get_access'
+			if locat['Anya_inroom'] = 1:
+				gs 'music_actions', 'not_alone'
 
-			if sisboytrio = 0: access['noporn'] = 1
-			access['nocamshow'] = 1
-			$access['noporn'] = 'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
-			$access['nocamshow'] ='You can''t do any webcam activities with your sister in the room!'
-		else
-			gs 'music_actions', 'clear_restrictions'
-		end
+				if sisboytrio = 0: access['noporn'] = 1
+				access['nocamshow'] = 1
+				$access['noporn'] = 'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
+				$access['nocamshow'] ='You can''t do any webcam activities with your sister in the room!'
+			else
+				gs 'music_actions', 'clear_restrictions'
+			end
 
-		if locat['Anya_inroom'] = 0 and breastpump = 1 and bp_unbox <= 0:
-			'<a hlpf="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
-		elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
-			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
-		elseif locat['Anya_inroom'] = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 40:
-			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
-		elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 30:
-			'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
+			if locat['Anya_inroom'] = 0 and breastpump = 1 and bp_unbox <= 0:
+				'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
+			elseif kid >= 1 and breastpump = 1 and bp_unbox <= 0:
+				'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
+			elseif locat['Anya_inroom'] = 0 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 40:
+				'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
+			elseif kid >= 1 and breastpump = 1 and bp_unbox = 1 and pcs_inhib > 30:
+				'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Try out</a> your breast pump'
+			end
+			gs 'lact_bp', 'massage'
 		end
-		gs 'lact_bp', 'massage'
 
 		'</td><td width = "100" valign="top"></td><td>'
-		gs 'subkid'
+		if $home['current'] = 'parents_home': gs 'subkid'
 		'</td></tr></table>'
 
 		!! NOTE: This has to go here, otherwise gs 'subkid' removes the icon. 
-		gs 'music_actions', 'music_icon'
+		if $home['current'] = 'parents_home': gs 'music_actions', 'music_icon'
 	end
 end
 
@@ -348,6 +358,7 @@ if $ARGS[0] = 'intro':
 					'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either." she warns you before making her way towards the kitchen.'
 					if stat['think_virgin'] = 1: '"Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month." she adds quickly.'
 					act 'But why do I--':
+						$loc_arg = 'start'
 						cla & *clr
 						minut += 2
 						gs 'stat'

+ 4 - 4
locations/beg.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'start':
 	*clr
 	menu_off = 1
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/activities/excercises/gym/fit1.jpg"></center>'
 	'You are stretching and warming up before your practice run. From where you are you can see your coach, Igor Yurisovich, talking to other athletes.'
 
 	act 'Do a couple of practice races':
@@ -13,11 +13,11 @@ if $ARGS[0] = 'start':
 		abonement -= 1
 		pcs_mood += 2
 		gs 'exercise', 'tier2', 30, 'run'
-		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit5.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/pc/activities/excercises/gym/fit5.jpg"></center>'
 		'You spend half an hour practising 100 meter dashes to improve your speed, as well as doing several rounds around the stadium to work on your stamina. You are sweaty all over by the end of it, obviously, but you also feel that you''re a little better than before.'
 
-		! WD: Argument is 'dressing room'
-		act 'Go to the dressing room':gt 'fit', 'dressing room'
+		! WD: Argument is 'dressing_room'
+		act 'Go to the dressing room':gt 'fit', 'dressing_room'
 	end
 end
 

+ 15 - 15
locations/beg1.qsrc

@@ -36,7 +36,7 @@ if $ARGS[0] = 'start':
 		'You were unable to qualify for the St. Petersburg Championship.'
 
 		! WD: Argument is 'dressing room'
-		act 'Go back to the dressing room':gt 'fit', 'dressing room'
+		act 'Go back to the dressing room':gt 'fit', 'dressing_room'
 	elseif razradbeg = 14 and razradbegK >= 9:
 		cla
 		razradbegK = 0
@@ -104,7 +104,7 @@ if $ARGS[0] = 'br':
 		razradbeg = 1 & goldbeg += 1 & money += 600 & 'You fought hard and managed to take 1st place! You receive a gold badge, a prize of 600 <b>₽</b> and are now part of your club''s junior squad, performing at the semi-professional level.'
 	end
 
-	act 'Leave':gt 'fit', 'dressing room'
+	act 'Leave':gt 'fit', 'dressing_room'
 end
 
 if $ARGS[0] = 'kms':
@@ -166,7 +166,7 @@ if $ARGS[0] = 'kms':
 		gs 'fame', 'city', 'running', rand(14,17)
 		razradbeg = 3 & goldbeg += 1 & money += 1000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 1,000 <b>₽</b> and are now part of your club''s veteran squad, performing at the semi-professional level.'
 	end
-	act 'Leave':gt 'fit', 'dressing room'
+	act 'Leave':gt 'fit', 'dressing_room'
 end
 
 if $ARGS[0] = 'ross':
@@ -228,7 +228,7 @@ if $ARGS[0] = 'ross':
 		gs 'fame', 'city', 'running', rand(14,18)
 		razradbeg = 3 & goldbeg += 1 & money += 1500 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 1,500 <b>₽</b> and gain entry to the professional circuit.'
 	end
-	act 'Leave':gt 'fit', 'dressing room'
+	act 'Leave':gt 'fit', 'dressing_room'
 end
 
 if $ARGS[0] = 'kval':
@@ -295,7 +295,7 @@ if $ARGS[0] = 'kval':
 		gs 'fame', 'city', 'running', rand(14,19)
 		razradbegK += 1 & goldbeg += 1 & money += 2000 & 'You fought hard and managed to take 1st place! You get a gold medal, a prize of 2,000 <b>₽</b> and are one step closer to qualifying for the St. Petersburg Championship.'
 	end
-	act 'Leave':gt 'fit', 'dressing room'
+	act 'Leave':gt 'fit', 'dressing_room'
 end
 
 if $ARGS[0] = 'evro':
@@ -330,49 +330,49 @@ if $ARGS[0] = 'evro':
 		grupvalue[2] -= 1
 		razradbeg = 2 & razradbegK = 0 & 'But you barely managed to reach the finish line, walking the last 100 meters. Of course, you came in last - but you also made of a fool of yourself. People on the ranks seem to be asking themselves how you even managed to make it this far. Maybe they are right? Your performance is so atrocious that the coach decide to return you to the semi-proffessional rank.'
 		gs 'fame', 'city', 'running', rand(14,19)
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	elseif begresult < 55:
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You didn''t manage to reach any classification.'
 		gs 'fame', 'city', 'running', rand(15,21)
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	elseif begresult < 60:
 		gs 'fame', 'city', 'running', rand(16,23)
 		'You fought hard but still have a lot of work ahead of you if you want to be better than your competition. You only came in last (8th place).'
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	elseif begresult < 65:
 		grupvalue[2] += 1
 		gs 'fame', 'city', 'running', rand(18,25)
 		'You fought hard, but managed to only take the penultimate place (7th place).'
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	elseif begresult < 70:
 		grupvalue[2] += 2
 		gs 'fame', 'city', 'running', rand(20,25)
 		'You fought hard, but only managed to take 6th place.'
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	elseif begresult < 75:
 		grupvalue[2] += 3
 		gs 'fame', 'city', 'running', rand(25,50)
 		'You fought hard, but only managed to take 5th place.'
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	elseif begresult < 80:
 		grupvalue[2] += 4
 		gs 'fame', 'city', 'running', rand(50,100)
 		'You fought hard, but only managed to take 4th place.'
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	elseif begresult < 85:
 		grupvalue[2] += 6
 		gs 'fame', 'city', 'running', 'BronzeMedal'
 		razradbegEB += 1
 		money += 10000
 		'You fought hard and managed to take 3rd place, earning a prize. You get a bronze medal and a prize of 10,000 <b>₽</b>'
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	elseif begresult < 90:
 		grupvalue[2] += 8
 		gs 'fame', 'city', 'running', 'SilverMedal'
 		razradbegES += 1
 		money += 15000
 		'You fought hard and managed to take 2nd place, earning a prize. You get a silver medal and a prize of 15,000 <b>₽</b>'
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	else
 		grupvalue[2] += 10
 		gs 'fame', 'city', 'running', 'GoldMedal'
@@ -535,7 +535,7 @@ if $ARGS[0] = 'Family extension':
 				end
 			end
 		else
-			gt 'fit', 'dressing room'
+			gt 'fit', 'dressing_room'
 		end
 	end
 end

+ 251 - 0
locations/beverage.qsrc

@@ -186,6 +186,7 @@ if $ARGS[0] = 'bev_energy_drink':
 	money -= val($_drink['<<args[1]>>,price'])
 	pcs_health += 10
 	pcs_mood += 20
+	pcs_energy += 10
 	fat += 3
 	if pcs_hydra >= 100:
 		pcs_hydra += 25
@@ -374,6 +375,31 @@ if $ARGS[0] = 'bev_bee':
 	end
 end
 
+if $ARGS[0] = 'bev_cocktail':
+	if pcs_health > 20:
+		*clr & cla
+		minut += 20
+		money -= val($_drink['<<args[1]>>,price'])
+		pcs_mood += 15
+		gs 'drugs', 'alcohol', 'rum'
+		pcs_horny += rand(10, 50)
+		gs 'beverage', 'afteralcohol'
+		'<center><img <<$set_imgh>> src="images/shared/drinks/cocktail<<rand(1,4)>>.jpg"></center>'
+		'You drink a fancy cocktail and<<$mtxt>>'
+		gs 'stat'
+		killvar '$_drink'
+
+		if food_loc = 1:
+			act 'Finish': gt 'food_menu'
+		else
+			act 'Finish':gt $loc, $loc_arg
+		end
+	else
+		msg 'You don''t feel well enough to drink alcohol.'
+		gt $loc, $loc_arg
+	end
+end
+
 if $ARGS[0] = 'bev_bbr': food_loc = 0 & gt 'brothel','password'
 
 if $ARGS[0] = 'afteralcohol':
@@ -425,6 +451,13 @@ if $ARGS[0] = 'coffee':
 	gs 'stat'
 end
 
+if $ARGS[0] = 'only_stat_bev_cocktail':
+	pcs_mood += 15
+	gs 'drugs', 'alcohol', 'rum'
+	pcs_horny += rand(10, 50)
+	gs 'beverage', 'afteralcohol'
+	gs 'stat'
+end
 
 !! ------------ just the stats, no descriptions or extra stuff with cost -----------------------
 
@@ -522,5 +555,223 @@ if $ARGS[0] = 'only_cost_esp':
 	gt 'food_menu'
 end
 
+if $ARGS[0] = 'only_cost_kva':
+	frost = 1
+	fat += 2
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 5
+	pcs_mood += 15
+	if pcs_hydra >= 100:
+		pcs_hydra += 30
+	else
+		pcs_hydra += 60
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_jui':
+	frost = 1
+	if alko > 0: alko -= 1
+	fat += 3
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 8
+	pcs_mood += 10
+	if pcs_hydra >= 100:
+		pcs_hydra += 40
+	else
+		pcs_hydra += 80
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_mil':
+	*clr & cla
+	frost = 1
+	fat += 6
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 5
+	pcs_mood += 20
+	pcs_energy += 5
+	if pcs_hydra >= 100:
+		pcs_hydra += 50
+	else
+		pcs_hydra += 100
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_wat':
+	frost = 1
+	if alko > 0: alko -= 1
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 10
+	if pcs_hydra >= 100:
+		pcs_hydra += 25
+	else
+		pcs_hydra += 50
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bev_energy_drink':
+	frost = 1
+	if alko > 0: alko -= 1
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 20
+	pcs_energy += 10
+	fat += 3
+	if pcs_hydra >= 100:
+		pcs_hydra += 25
+	else
+		pcs_hydra += 50
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bev_vod':
+	money -= val($_drink['<<args[1]>>,price'])
+	gs 'drugs', 'alcohol', 'vodka'
+	gs 'beverage', 'afteralcohol'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bev_bla':
+	pcs_mood += 10
+	money -= val($_drink['<<args[1]>>,price'])
+	gs 'drugs', 'alcohol', 'vodka'
+	gs 'beverage', 'afteralcohol'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bev_sco':
+	money -= val($_drink['<<args[1]>>,price'])
+	gs 'drugs', 'alcohol', 'scotch'
+	gs 'beverage', 'afteralcohol'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bev_win':
+	money -= val($_drink['<<args[1]>>,price'])
+	gs 'drugs', 'alcohol', 'wine'
+	gs 'beverage', 'afteralcohol'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bev_mar':
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_mood += 10
+	gs 'drugs', 'alcohol', 'vodka'
+	gs 'beverage', 'afteralcohol'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bev_cha':
+	money -= val($_drink['<<args[1]>>,price'])
+	gs 'drugs', 'alcohol', 'champagne'
+	gs 'beverage', 'afteralcohol'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bev_bee':
+	money -= val($_drink['<<args[1]>>,price'])
+	gs 'drugs', 'alcohol', 'beer'
+	gs 'beverage', 'afteralcohol'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bev_cocktail':
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_mood += 15
+	gs 'drugs', 'alcohol', 'rum'
+	pcs_horny += rand(10, 50)
+	gs 'beverage', 'afteralcohol'
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
 --- beverage ---------------------------------
 

+ 5 - 43
locations/body.qsrc

@@ -392,47 +392,9 @@ if $ARGS[0] = 'UpdateBodyMeasurement':
 	pcs_waist = (pcs_hips * wratio) / 100 + vofat
 	pcs_band = (pcs_waist * bratio) / 100 + vofat
 	pcs_bust = (pcs_waist * bratio) / 100 + nbsize + magicf2b + silicone
-	pcs_butt = (pcs_hips / 10) + silicone_butt + butt_cheat
+	pcs_butt = (pcs_hips / 10) + silicone_butt + butt_cheat + pcs_butt_tr
 	pcs_cupsize = pcs_bust - pcs_band
 
-	! Update tits size
-	if pcs_cupsize <= 5:
-		tits = 0
-		$titsize = 'AA cup'
-	elseif pcs_cupsize <= 10:
-		tits = 1
-		$titsize = 'A cup'
-	elseif pcs_cupsize <= 15:
-		tits = 2
-		$titsize = 'B cup'
-	elseif pcs_cupsize <= 20:
-		tits = 3
-		$titsize = 'C cup'
-	elseif pcs_cupsize <= 25:
-		tits = 4
-		$titsize = 'D cup'
-	elseif pcs_cupsize <= 30:
-		tits = 5
-		$titsize = 'E cup'
-	elseif pcs_cupsize <= 35:
-		tits = 6
-		$titsize = 'F cup'
-	elseif pcs_cupsize <= 40:
-		tits = 7
-		$titsize = 'G cup'
-	elseif pcs_cupsize <= 45:
-		tits = 8
-		$titsize = 'H cup'
-	elseif pcs_cupsize <= 50:
-		tits = 9
-		$titsize = 'I cup'
-	elseif pcs_cupsize <= 55:
-		tits = 10
-		$titsize = 'J cup'
-	else
-		tits = 11
-		$titsize = 'K cup'
-	end
 end
 
 if $ARGS[0] = 'CalcWeight':
@@ -457,9 +419,9 @@ if $ARGS[0] = 'UpdateBodyImage':
 		if bdsetlock = 0:
 			if (knowpreg = 1 or (preg = 1 and thinkpreg = 1) or (preg = 1 and PregChem > 3600)):
 				bodset = 3
-			elseif strenbuf >= 70:
+			elseif strenbuf >= 100 and stren_plus_lvl > 0:
 				bodset = 2
-			elseif strenbuf <= 40:
+			elseif strenbuf <= 50:
 				bodset = 0
 			else
 				bodset = 1
@@ -470,9 +432,9 @@ if $ARGS[0] = 'UpdateBodyImage':
 	elseif (knowpreg = 1 or (preg = 1 and thinkpreg = 1) or (preg = 1 and PregChem > 3600)) and bodet ! 3 and bdsetlock = 0:
 		bodset = 3
 	elseif preg = 0 and bdsetlock = 0:
-		if strenbuf >= 70:
+		if strenbuf >= 100 and stren_plus_lvl > 0:
 			bodset = 2
-		elseif strenbuf <= 40:
+		elseif strenbuf <= 50:
 			bodset = 0
 		else
 			bodset = 1

+ 1 - 1
locations/body_desc.qsrc

@@ -413,7 +413,7 @@ if $ARGS[0] = 'butt':
 		$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a>. While it''s not flat, it''s nothing special either.'
 	elseif pcs_butt <= 12:
 		$pcs_butt = 'Your tight <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a> is bigger, rounder and firmer than average. You often draw the stares of guys around you.'
-	elseif pcs_butt <= 16:
+	else
 		$pcs_butt = 'You have a large and natural bubble <a href="exec:view''images/pc/body/ass/4.jpg''">butt</a> that jiggles and sways as you walk. Guys hungrily fixate on you with their tongues hanging out and other girls are often envious of your booty.'
 	end
 

+ 9 - 5
locations/booty_call.qsrc

@@ -53,9 +53,9 @@ end
 !!				booty_call_time[$FuckBuddy[i]] = 600 + rand(0,720)
 
 if $ARGS[0] = 'set_booty_call_date':
-	if booty_call['invite_today'] = 1:
+	if sex_ev['invite_today'] = 1:
 		npc_booty_call_date[$boy] = daystart
-	elseif booty_call['invite_tomorrow'] = 1:
+	elseif sex_ev['invite_tomorrow'] = 1:
 		npc_booty_call_date[$boy] = daystart + 1
 	end
 	if npc_booty_call_time[$boy] = 0:
@@ -64,11 +64,11 @@ if $ARGS[0] = 'set_booty_call_date':
 end
 
 if $ARGS[0] = 'block_booty_calls':
-	if booty_call['invite_today'] = 1:
+	if sex_ev['invite_today'] = 1:
 		npc_booty_call_date[$boy] = 0
 		npc_no_booty_call[$boy] = daystart
 		npc_booty_call_time[$boy] = 0
-	elseif booty_call['invite_tomorrow'] = 1:
+	elseif sex_ev['invite_tomorrow'] = 1:
 		npc_no_booty_call[$boy] = daystart + 1
 	end
 end
@@ -94,9 +94,13 @@ if $ARGS[0] = 'home_links':
 	*nl
 	:loopBC_homes
 	if (npc_residence[$Fuckbuddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$Fuckbuddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$Fuckbuddy[i]] = 4 and $loc = 'city_center'):
-		dynamic(' ''<a href="exec: minut += 2 & gt ''''booty_call_start'''',''''initiate'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
+	
+!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
+		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
 		!! ''''
 	end
+	
+
 	i +=1
 	if i < arrsize('$Fuckbuddy') : jump 'loopBC_homes'
 end

+ 236 - 14
locations/bras.qsrc

@@ -33,6 +33,8 @@ if $ARGS[0] = 'view_bra_list':
 		metka_bras = 2
 	end
 
+	gs 'bras', 'filter_header', 'store'
+
 	'<center><table border=1><TH><a href="exec:gt ''bras'', ''view_bra_list'', ''wardrobe''">Draw</a></TH><TH><a href="exec:gt ''bras'', ''view_bra_list'', ''store''">Storage</a></TH><TH><a href="exec:gt ''bras'', ''view_bra_list'', ''unwanted''">Unwanted</a></TH></table></center>'
 
 	if $braworntype ! 'none':act 'Remove bra':gs 'bras', 'remove' & gt 'bras', 'view_bra_list', $ARGS[1]
@@ -41,61 +43,135 @@ if $ARGS[0] = 'view_bra_list':
 		cloc = 1
 	end
 
-	'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+	if ARRSIZE('gm_bras') > 0 and clothingfilter['quality'] = 1:'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
+
+	!!To filter just this set
+	clo_i = 0
+	:loopbraquality_filter
 
 	i = 1
 	:loopgmbras
-	if gm_brasS[i] = metka_bras and gm_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''gm'', <<i>>"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
+		if gm_brasS[i] = metka_bras and gm_bras[i] = 1:
+			gs 'underwear_attributes', 'gm_bras', i
+			gs 'bras', 'bra_filter'
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+					*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''gm'', <<i>>"><img src="images/pc/items/gm/bras/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
+		end
 	i += 1
 	if i <= ARRSIZE('gm_bras'):jump 'loopgmbras'
 
-	'<center><img src="images/locations/city/citycenter/mall/Lusso.png"></center>'
+	if ARRSIZE('lusso_bras') > 0 and clothingfilter['quality'] = 1:'<center><img src="images/locations/city/citycenter/mall/Lusso.png"></center>'
 
 	i = 1
 	:looplussobras 
-	if lusso_brasS[i] = metka_bras and lusso_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''lusso'', <<i>>"><img src="images/pc/items/lusso/bras/<<i>>.jpg" 	height="150" /></a>'
+		if lusso_brasS[i] = metka_bras and lusso_bras[i] = 1:
+			gs 'underwear_attributes', 'lusso_bras', i
+			gs 'bras', 'bra_filter'
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+					*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''lusso'', <<i>>"><img src="images/pc/items/lusso/bras/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
+		end
 	i += 1
 	if i <= ARRSIZE('lusso_bras'):jump 'looplussobras'
 
-	'<center><img src="images/locations/pushkin/exhibitshop/shop_name.png"></center>'
+	if ARRSIZE('salacious_bras') > 0 and clothingfilter['quality'] = 1:'<center><img src="images/locations/pushkin/exhibitshop/shop_name.png"></center>'
 
 	i = 1
 	:loopsalaciousbras 
-	if salacious_brasS[i] = metka_bras and salacious_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''salacious'', <<i>>"><img src="images/pc/items/salacious/bras/<<i>>.jpg" 	height="150" /></a>'
+	if salacious_brasS[i] = metka_bras and salacious_bras[i] = 1:
+			gs 'underwear_attributes', 'salacious_bras', i
+			gs 'bras', 'bra_filter'
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+					*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''salacious'', <<i>>"><img src="images/pc/items/salacious/bras/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
+		end
 	i += 1
 	if i <= ARRSIZE('salacious_bras'):jump 'loopsalaciousbras'
 
-	'<center><img src="images/locations/city/citycenter/mall/fashionista.png"></center>'
+	if ARRSIZE('fashionista_bras') > 0 and clothingfilter['quality'] = 1:'<center><img src="images/locations/city/citycenter/mall/fashionista.png"></center>'
 
 	i = 1
 	:loopfashionistabras 
-	if fashionista_brasS[i] = metka_bras and fashionista_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''fashionista'', <<i>>"><img src="images/pc/items/fashionista/bras/<<i>>.jpg" 	height="150" /></a>'
+	if fashionista_brasS[i] = metka_bras and fashionista_bras[i] = 1:
+			gs 'underwear_attributes', 'fashionista_bras', i
+			gs 'bras', 'bra_filter'
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+					*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''fashionista'', <<i>>"><img src="images/pc/items/fashionista/bras/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
+		end
 	i += 1
 	if i <= ARRSIZE('fashionista_bras'):jump 'loopfashionistabras'
 
-	'<center><img src="images/locations/city/citycenter/mall/pussycat.png"></center>'
+
+	if ARRSIZE('cats_bras') > 0 and clothingfilter['quality'] = 1:'<center><img src="images/locations/city/citycenter/mall/pussycat.png"></center>'
+	!!To filter just this set
 
 	i = 1
 	:loopcatsbras 
-	if cats_brasS[i] = metka_bras and cats_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''cats'', <<i>>"><img src="images/pc/items/cats/bras/<<i>>.jpg" 	height="150" /></a>'
+	if cats_brasS[i] = metka_bras and cats_bras[i] = 1:
+			gs 'underwear_attributes', 'cats_bras', i
+			gs 'bras', 'bra_filter'
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+					*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''cats'', <<i>>"><img src="images/pc/items/cats/bras/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
+		end
 	i += 1
 	if i <= ARRSIZE('cats_bras'):jump 'loopcatsbras'
 
-	'<center><img src="images/locations/city/redlight/erotomaniac/shop_name.png"></center>'
+	if ARRSIZE('eroto_bras') > 0 and clothingfilter['quality'] = 1:'<center><img src="images/locations/city/redlight/erotomaniac/shop_name.png"></center>'
 
 	i = 1
 	:looperotobras 
-	if eroto_brasS[i] = metka_bras and eroto_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''eroto'', <<i>>"><img src="images/pc/items/eroto/bras/<<i>>.jpg" 	height="150" /></a>'
+	if eroto_brasS[i] = metka_bras and eroto_bras[i] = 1:
+			gs 'underwear_attributes', 'eroto_bras', i
+			gs 'bras', 'bra_filter'
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+					*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''eroto'', <<i>>"><img src="images/pc/items/eroto/bras/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
+		end
 	i += 1
 	if i <= ARRSIZE('eroto_bras'):jump 'looperotobras'
 
-	'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
+	if ARRSIZE('danilovich_bras') > 0 and clothingfilter['quality'] = 1:'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
 
 	i = 1
 	:loopdanilovichbras 
-	if danilovich_brasS[i] = metka_bras and danilovich_bras[i] = 1:*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''danilovich'', <<i>>"><img src="images/pc/items/danilovich/bras/<<i>>.jpg" 	height="150" /></a>'
+	if danilovich_brasS[i] = metka_bras and danilovich_bras[i] = 1:
+			gs 'underwear_attributes', 'danilovich_bras', i
+			gs 'bras', 'bra_filter'
+			!!sort by filter
+			if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+					*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''danilovich'', <<i>>"><img src="images/pc/items/danilovich/bras/<<i>>.jpg" 	height="150" /></a>'
+				end
+			end
+		end
 	i += 1
 	if i <= ARRSIZE('danilovich_bras'):jump 'loopdanilovichbras'
+	
+	clo_i += 1
+	if clothingfilter['quality'] = 0 and clo_i <= 7:
+		jump 'loopbraquality_filter'
+	end
 end
 
 if $ARGS[0] = 'view_bra_item':
@@ -492,6 +568,152 @@ if $ARGS[0] = 'wear_last_worn':
 	gs 'bras', 'wear', $lastwornbratype, lastwornbranumber
 end
 
+if $ARGS[0] = 'filter_header':
+!!Exclude filters
+	$Headerstring = '<TD>'
+	if clothingfilter['sport'] = 0:
+		$Headerstring += '<a href="exec:clothingfilter[''sport''] = 1 & clothingfilter[''sport_only''] = 0 & gt ''bras'', ''view_bra_list'', $ward_list_store"><img src="images/system/icons/clothing/sport.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:clothingfilter[''sport''] = 0 & gt ''bras'', ''view_bra_list'',  $ward_list_store"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
+	end
+
+!!sort by filters
+	$Headerstring += '<TD>'
+	if clothingfilter['number'] = 0:
+		clothingfilter['quality'] = 1 & clothingfilter['inhibition'] = 1
+		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:clothingfilter[''number''] = 0 & clothingfilter[''quality''] = 1 & clothingfilter[''inhibition''] = 1 & gt ''bras'', ''view_bra_list'',  $ward_list_store"><img src="images/system/icons/clothing/number_off.png"></a></TD>'
+	end
+	
+	$Headerstring += '<TD>'
+	if clothingfilter['quality'] = 0:
+		$Headerstring += '<img src="images/system/icons/clothing/quality.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & clothingfilter[''number''] = 1 & clothingfilter[''inhibition''] = 1 & gt ''bras'', ''view_bra_list'',  $ward_list_store"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
+	end
+	
+!! Show only filers
+	$Headerstring[1] = '<TD>'
+	if clothingfilter['sport_only'] = 0:
+		$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 1 & clothingfilter[''sport''] = 0 & gt ''bras'', ''view_bra_list'',  $ward_list_store"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 0 & gt ''bras'', ''view_bra_list'',  $ward_list_store"><img src="images/system/icons/clothing/sport.png"></a></TD>'
+	end
+
+
+	$Headerstring[2] = ''
+	if $ARGS[1] ! 'store':
+		$Headerstring[2] += '<TH></TH>'
+	end
+	if $ward_list_file = 'clothing':
+		$Headerstring[2] += '<TH></TH>'
+	end
+	$Headerstring[2] += '<TH>Include</TH>'
+	if $ARGS[1] ! 'store':
+		$Headerstring[2] += '<TH></TH><TH></TH>'
+	end
+	$Headerstring[2] += '<TH>Sort by</TH><TH></TH>'
+
+	$Headerstring[3] = ''
+	if $ARGS[1] ! 'store':
+		$Headerstring[3] += '<TH></TH>'
+	end
+	if $ward_list_file = 'clothing':
+		$Headerstring[3] += '<TH></TH>'
+	end
+	$Headerstring[3] += '<TH>Only show</TH>'
+
+	'<center><table><<$Headerstring[2]>>'
+	'<TR><border=1><<$Headerstring>>'
+
+	'<TR><border=0><<$Headerstring[3]>>'
+	'<TR><border=1><<$Headerstring[1]>></table></center>'
+end
+
+if $ARGS[0] = 'bra_filter':
+!!Exclude filters
+	clothingfilter['inc'] = 1
+	!!filters, if inc set to 0 they will not display
+	if clothingfilter['sport'] = 1 and BraFun = 2:
+		clothingfilter['inc'] = 0
+	end
+
+!!only filters
+	clothingfilter['only'] = 0
+	!!filters, if only set to 1 they will only display those set
+	if clothingfilter['sport_only'] = 1 and BraFun = 2:
+		clothingfilter['only'] = 1
+	end
+	if clothingfilter['only'] = clothingfilter['sport_only']:
+		clothingfilter['only'] = 1
+	else
+		clothingfilter['only'] = 0
+	end
+
+end
+
+if $ARGS[0] = 'shop_filter_header':
+!! exclude filters
+	$Headerstring = '<TD>'
+	if clothingfilter['sport'] = 0:
+		$Headerstring += '<a href="exec:clothingfilter[''sport''] = 1 & clothingfilter[''sport_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport.png"></a></TD>'
+	else
+		$Headerstring += '<a href="exec:clothingfilter[''sport''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
+	end
+
+!! sort by filters
+	$Headerstring += '<TD>'
+	if clothingfilter['number'] = 0:
+		clothingfilter['quality'] = 1
+		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:clothingfilter[''number''] = 0 & clothingfilter[''quality''] = 1 & clothingfilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/number_off.png"></a></TD>'
+	end
+	
+	$Headerstring += '<TD>'
+	if clothingfilter['quality'] = 0:
+		$Headerstring += '<img src="images/system/icons/clothing/quality.png"></TD>'
+	else
+		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & clothingfilter[''number''] = 1 & clothingfilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
+	end
+
+!! Show only filers
+	$Headerstring[1] = '<TD>'
+	if clothingfilter['sport_only'] = 0:
+		$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 1 & clothingfilter[''sport''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
+	else
+		$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/sport.png"></a></TD>'
+	end
+
+
+	$Headerstring[2] = '<TH></TH><TH></TH><TH></TH><TH>Include</TH><TH></TH><TH></TH><TH></TH><TH></TH><TH></TH><TH>Sort by</TH><TH></TH>'
+
+	$Headerstring[3] = '<TH></TH><TH></TH><TH></TH><TH>Only show</TH>'
+
+	'<center><table><<$Headerstring[2]>>'
+	'<TR><border=1><<$Headerstring>>'
+
+	'<TR><border=0><<$Headerstring[3]>>'
+	'<TR><border=1><<$Headerstring[1]>></table></center>'
+end
+
+if $ARGS[0] = 'shop_filter':
+!!Exclude filters
+	clothingfilter['inc'] = 1
+	!!filters, if inc set to 0 they will not display
+	if clothingfilter['sport'] = 1 and BraFun = 2:
+		clothingfilter['inc'] = 0
+	end
+
+!!only filters
+	clothingfilter['only'] = 0
+	!!filters, if only set to 1 they will only display those set
+	if clothingfilter['sport_only'] = 1 and BraFun = 2:
+		clothingfilter['only'] += 1
+	end
+end
+
 
 --- bras ---------------------------------
 

+ 3 - 2
locations/buklinik_event.qsrc

@@ -125,11 +125,12 @@ if $ARGS[0] = 'pos9':
 	'You get close to a makeshift camp as one of the volunteers shouts, "Why did you leave?! Come with us, we''ll take you back to the shelter."'
 	'He shouts back, "Fuck off! Why would I?! I''m fine here, I see lovely ladies jog past here every day. I won''t return unless you''ve got hot girls at that shit place."'
 	'The volunteer turns to you, "We''ve been going back and forth with this old pervert for weeks. <<$pcs_nickname>>, do you have any idea how to lure him back?"'
+	'You notice the old man''s eyes dart towards your hips and back, maybe someone could distract him with a panty flash but they''d have to be pretty horny to even consider it.'
 
 	if pcs_horny > 50 and $pantyworntype ! 'none' and PCloSkirt > 1 and pcs_inhib > 20:
-		act 'I might have an idea':gt 'buklinik_event', 'pos10'
+		act 'I have an idea':gt 'buklinik_event', 'pos10'
 	end
-	act 'I have no idea':gt 'buklinik', 'olga2'
+	act 'Let me work on this, I think I have an idea':gt 'buklinik', 'olga2'
 end
 
 if $ARGS[0] = 'pos10':

+ 26 - 21
locations/carF.qsrc

@@ -75,14 +75,19 @@ 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 teh <= 0:teh = 0 & wrek = 1
-	if teh <= 0 or wrek = 1:$teh = 'The car is in need of repairs and won''t start.'
-	if teh >= tehcar * 75 / 100 and wrek = 0:$teh = 'The car is in excellent condition.'
-	if teh < tehcar * 75 / 100 and teh >= tehcar * 50 / 100 and wrek = 0:$teh = 'While driving, you occasionally hear some troubling noises.'
-	if teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:$teh = 'The car seems broken and barely drives.'
-	if teh < tehcar * 25 / 100 and wrek = 0:$teh = 'How this car still runs is a mystery, even to its designers.'
+	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
 
-	'<<$teh>>'
 
 	if cardrive = 1:'Through the windshield, you see St. Petersburg''s residential area.'
 	if cardrive = 2:'Through the windshield, you see St. Petersburg''s city center.'
@@ -116,11 +121,11 @@ if $ARGS[0] = 'salon':
 	act 'Get out of the car':dynamic $enddrive
 
 	if benz > 0 and wrek = 0 and prava > 0:
-		if teh >= tehcar * 75 / 100:
+		if car['current_condition'] >= car['new_condition'] * 75 / 100:
 			if rand(0, 1000) = 1000:wrek = 1
-		elseif teh >= tehcar * 50 / 100:
+		elseif car['current_condition'] >= car['new_condition'] * 50 / 100:
 			if rand(0, 100) = 100:wrek = 1
-		elseif teh >= tehcar * 25 / 100:
+		elseif car['current_condition'] >= car['new_condition'] * 25 / 100:
 			if rand(0, 100) >= 80:wrek = 1
 		else
 			if rand(0, 100) >= 40:wrek = 1
@@ -154,7 +159,7 @@ if $ARGS[0] = 'salon':
 					act 'In the salon':gt 'carF', 'salon'
 				end
 			elseif alko >= 10 and rand(0, 100) >= 50:
-				teh = teh/2
+				car['current_condition'] = car['current_condition']/2
 				wrek = 1
 				'Driving drunk, you crash into a tree and wreck your car.'
 
@@ -223,12 +228,12 @@ if $ARGS[0] = 'other':
 			elseif car_town ! 1:
 				minut += 60
 				benz -= 1
-				teh -= rand(1, 3)
+				car['current_condition'] -= rand(1, 3)
 				cardrive = 18
 			else
 				minut += 10
 				benz -= 1
-				teh -= rand(1, 3)
+				car['current_condition'] -= rand(1, 3)
 				cardrive = 18
 			end
 
@@ -247,12 +252,12 @@ if $ARGS[0] = 'other':
 			elseif car_town ! 1:
 				minut += 60
 				benz -= 1
-				teh -= rand(1, 3)
+				car['current_condition'] -= rand(1, 3)
 				cardrive = 28
 			else
 				minut += 10
 				benz -= 1
-				teh -= rand(1, 3)
+				car['current_condition'] -= rand(1, 3)
 				cardrive = 28
 			end
 
@@ -272,7 +277,7 @@ if $ARGS[0] = 'other':
 				'15 minutes later, you arrive at your destination.'
 			end
 			benz -= 1
-			teh -= rand(2, 5)
+			car['current_condition'] -= rand(2, 5)
 			cardrive = 12
 
 			dynamic $enddrive
@@ -290,7 +295,7 @@ if $ARGS[0] = 'other':
 				'25 minutes later, you arrive at your destination.'
 			end
 			benz -= 1
-			teh -= rand(2, 5)
+			car['current_condition'] -= rand(2, 5)
 			cardrive = 13
 
 			dynamic $enddrive
@@ -301,7 +306,7 @@ if $ARGS[0] = 'other':
 		act 'Go to the village of Gadukino':
 			cla
 			benz = benz - 1
-			teh = teh - RAND(3,6)
+			car['current_condition'] = car['current_condition'] - RAND(3,6)
 			cardrive = 23
 
 			if car_town ! 0:
@@ -320,7 +325,7 @@ if $ARGS[0] = 'other':
 		act 'Go to the gas station on M11':
 			cla
 			benz -= 1
-			teh -= rand(1,3)
+			car['current_condition'] -= rand(1,3)
 			minut += rand(25-50)
 			if cardrive = 1 or cardrive = 2 or cardrive = 8 or cardrive = 11 or cardrive =4 or cardrive = 5  or cardrive = 10 or cardrive = 28 or cardrive = 18:
 				minut += 10
@@ -334,7 +339,7 @@ if $ARGS[0] = 'other':
 		cla
 		minut += 60
 		benz -= 4
-		teh -= rand(2, 6)
+		car['current_condition'] -= rand(2, 6)
 		pcs_mood += 20
 		'You go to the track and have fun driving around before leaving.'
 
@@ -371,7 +376,7 @@ if $ARGS[0] = 'nearby':
 	cla
 	minut += 5
 	benz -= 1
-	teh -= rand(1, 3)
+	car['current_condition'] -= rand(1, 3)
 	cardrive = ARGS[1]
 	if cardrive = 8: minut += 5
 	'5 minutes later, you arrive at your destination.'

+ 2 - 2
locations/cardgame_durak.qsrc

@@ -193,7 +193,7 @@ if $ARGS[0] = 'card_game_durak_play':
 		end
 	end
 	if $cgd_clothes ! '' and $cgd_clothes['A11'] ! '' and $cgd_clothes['A10'] ! '' and $cgd_clothes['A9'] ! '':
-		if RAND(1,100) <= 60:
+		if RAND(1,100) <= 50:
 			card_game_durak_win += 1
 			pcs_horny += 5
 			pcs_mood += 5
@@ -211,7 +211,7 @@ if $ARGS[0] = 'card_game_durak_play':
 			'<img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/card3.jpg">'
 			'You have a great set of cards in your hand, and easily win the round. <<$npc_usedname[$cgd_name_npc]>> loses, and reluctantly takes off his<<$clo_str>>.'
 			act 'Deal': gt 'cardgame_durak', 'card_game_durak_play'
-		elseif RAND(1,40) < 35:
+		elseif RAND(1,40) < 30:
 			card_game_durak_loss += 1
 			if strpos($cgd_clothes,'socks')>0:
 				$clo_str = ' socks'

+ 40 - 2
locations/chessplay.qsrc

@@ -31,9 +31,42 @@ if $ARGS[0] = '':
 	gt 'chessplay', 'game'
 end
 
+
+if $ARGS[0] = 'expfame':
+	if ARGS[1] = 0:
+		chessmulti = 1
+	elseif ARGS[1] = 1:
+		chessmulti = 3
+	elseif ARGS[1] = 2:
+		chessmulti = 5
+	end
+
+	if chessV=10:
+		gs 'exp_gain', 'chess', chessmulti * 2
+		gs 'fame', 'pav', 'chess', chessmulti * 2
+		gs 'exp_gain', 'intel', rand(0,1)
+	elseif chessV=30:
+		gs 'exp_gain', 'chess', chessmulti * 4
+		gs 'fame', 'pav', 'chess', chessmulti * 4
+		gs 'exp_gain', 'intel', rand(1,2)
+	elseif chessV=50:
+		gs 'exp_gain', 'chess', chessmulti * 6
+		gs 'fame', 'pav', 'chess', chessmulti * 6
+		gs 'exp_gain', 'intel', rand(2,3)
+	elseif chessV=70:
+		gs 'exp_gain', 'chess', chessmulti * 8
+		gs 'fame', 'pav', 'chess', chessmulti * 8
+		gs 'exp_gain', 'intel', rand(2,4)
+	elseif chessV=90:
+		gs 'exp_gain', 'chess', chessmulti * 10
+		gs 'fame', 'pav', 'chess', chessmulti * 10
+		gs 'exp_gain', 'intel', rand(2,5)
+	end
+	gs 'stat'
+end
+
 if $ARGS[0] = 'game':
-	gs 'exp_gain', 'chess', rand(0,1)
-	gs 'exp_gain', 'intel', rand(0,1)
+	
 	chess_move += 1
 	chess_time = rand(1,3)
 	minut += chess_time
@@ -62,6 +95,7 @@ if $ARGS[0] = 'game':
 		*nl
 		'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:
@@ -70,6 +104,7 @@ 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
 		
 		act 'Return': gt 'kruchess'
 	elseif chess_com <= 0:
@@ -80,6 +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
 
 		act 'Return': gt 'kruchess'
 	elseif chess_moves >= chess_move_limit:
@@ -89,6 +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
 
 		act 'Return': gt 'kruchess'
 	elseif total_chess_time >= chess_time_limit:
@@ -98,6 +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
 
 		act 'Return': gt 'kruchess'
 	else

+ 3 - 2
locations/cikl.qsrc

@@ -800,11 +800,12 @@ if mid($start_type,1,2) = 'sg':
 			end
 		elseif month = 5:
 			if year = 2017:
-				if day = 25:
+				if day = 26:
 					kanikuli = 6
 					SchoolAtestat = -1
+					lernHome = 0
 					$holyday = '<b>Your graduation is today. Be there by 8:00.</b>'
-				elseif day = 24:
+				elseif day = 25:
 					$holyday = '<b>Your graduation is tomorrow. Be there by 8:00.</b>'
 				elseif day >= 19:
 					$holyday = '<b>Your graduation is in <<26-day>> days.</b>'

+ 3 - 3
locations/city_clinic.qsrc

@@ -326,7 +326,7 @@ if $ARGS[0] = 'start':
 							money -= 4500
 							minut += 60
 							glass = 2
-							gs 'body_desc'
+							gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 							gs 'stat'
 							'You buy a new, more stylish pair of glasses.'
 
@@ -339,7 +339,7 @@ if $ARGS[0] = 'start':
 							karta -= 4500
 							minut += 60
 							glass = 2
-							gs 'body_desc'
+							gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 							gs 'stat'
 							'You buy a new, more stylish pair of glasses.'
 
@@ -374,7 +374,7 @@ if $ARGS[0] = 'start':
 							minut += 60
 							blizoruk = 0
 							glass = 0
-							gs 'body_desc'
+							gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 							gs 'stat'
 							'You undergo laser eye surgery. Your eyesight is much better now.'
 							act 'Return to the entrance':gt 'city_clinic', 'start'

+ 9 - 5
locations/city_coffee_hole.qsrc

@@ -23,6 +23,7 @@ if $args[0]= 'inner':
 	$menu_arg = 'inner'
 	menu_off = 0
 	gs 'katja_meynold_schedule'
+	!!gs 'albina_uni_schedule'
 	gs 'stat'
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/inside.jpg"></center>'
@@ -33,8 +34,11 @@ if $args[0]= 'inner':
 	if locat['katja'] = 30 and (katjaQW['know_going_to_teaching_degree'] = 1 or mid($start_type,1,2) = 'sg'):
 		'You see your classmate <a href="exec:gt ''katja_chat'', ''coffee_hole''">Katja</a> sitting at a table with a pile of books, a cup of coffee and a plate of food.'
 	end
+	!!if locat['albina'] = 17 and AlbinaQW['know_albina_uni'] > 0 or mid($start_type,1,2) = 'sg'):
+		!!'You see <a href="exec:gt ''albina_uni'', ''coffee_hole''">Albina</a> sitting at a table with a woman who has her back turned to you.'
+	!!end
 	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and day = 2 and nerd_game['fixed_uni_day'] = 0 and hour >= 18:
-		'You see some familiar faces in the corner of the coffee shop. It is most of the <a href="exec:gt ''nerd_game_night'', ''crash_gamenight_uni''">nerds.</a> you went to school with back in Pavlovsk around a table. It looks like they are playing some sort of game.'
+		'You see some familiar faces sitting in one of the corners. Some of the <a href="exec:gt ''nerd_game_night'', ''crash_gamenight_uni''">nerds</a> you went to school with back in Pavlovsk are gathered around a table. It looks like they''re playing some sort of game.'
 	end
 
 	if nerd_game['game_day'] = daystart and hour = 18: act '<b>Join nerds</b>': gt 'nerd_game_night','game'
@@ -95,7 +99,7 @@ if $ARGS[0] = 'eat':
 		minut += 10
 		mood += 5
 		gs 'stat'
-		'You take your order and find an empty table. You quietly enjoy your order as you look around at the other people.	You feel your mood brighten as you enjoy the ambience of the place.'
+		'You take your order from the counter and find an empty table. You quietly enjoy the ambience of the place and feel your mood brightening as you look around.'
 	else
 		gs 'stat'
 		'You''re sitting at a table in the cafe. It''s nice here.'
@@ -115,7 +119,7 @@ if $ARGS[0] = 'post_komp':
 	mood += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/cafequiet.jpg"></center>'
-	'You''re sitting at a table in the coffee shop. You could use your laptop if you wanted, but should buy something more to eat or drink first.'
+	'You''re sitting at a table in the coffee shop. You could use your laptop if you wanted, but should buy something to eat or drink first.'
 	act 'Get up from table': gt 'city_coffee_hole', 'inner'
 end
 
@@ -312,7 +316,7 @@ if $ARGS[0] = 'photo_shoot':
 											minut +=5
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-											'You nod at her. "Sure thing, I should get going anyways. Thanks again. I''ll see you around campus, hopefully. If not, I''ll stop by sometime, and we can hang out." As she escorts you to the door, you ask; "Which room do you have over at the dorms?"'
+											'You nod at her. "Sure thing, I should get going anyway. Thanks again. I''ll see you around campus, hopefully. If not, I''ll stop by sometime, and we can hang out." As she escorts you to the door, you ask; "Which room do you have over at the dorms?"'
 											'She stops at the door without unlocking it. "I''m not. I was going to, but the boys wanted to get a place in the city, so we rented an apartment close to campus. Costs me less as I only have to pay a quarter of the bills than the dorm was going to cost. Living with three boys is a nightmare though, so I only regret it constantly," she says with a laugh.'
 											*nl
 											'"You should stop by sometime," she says and tells you where to find the place.'
@@ -473,7 +477,7 @@ if $args[0]= 'kendra':
 			npc_rel['A84'] = 45
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
-			  'You start talking with her. You tell her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo and attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
+			  'You start talking with her. You tell her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo who attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			else
 			  'You start talking with her. You tell her a bit about yourself, and she replies by saying that she''s a student from the Republic of Congo attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			end

+ 6 - 3
locations/city_house_res_misc.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'fronty':
 	end
 
 	*clr & cla
-	'<center><b><font color="maroon">Living Room</font></b></center>'
+	'<center><b><font color="maroon">Your city residential house</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_fronty.jpg"></center>'
 	'Your small two story house sits on the edge of the residential area. Despite that, your neighbors are pretty close and the sounds of the street fill the air.'
 	*nl
@@ -112,6 +112,9 @@ if $ARGS[0] = 'backy':
 			if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
 				*nl
 				'You can do some exercises here.'
+
+				gs 'wardrobe', 'default_sport_options'
+
 				act 'Exercise': gt 'exercise', 'workout'
 			else
 				*nl
@@ -183,7 +186,7 @@ if $ARGS[0] = 'livroom':
 						minut += 15
 						gs'stat'
 						'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
-						act'Set the tapestry aside':gt $curloc
+						act'Set the tapestry aside':gt 'city_house_res_misc', 'livroom'
 					end
 				end
 			end
@@ -205,7 +208,7 @@ if $ARGS[0] = 'livroom':
 					gobelen += 1
 					'Your work on the tapestry is done.'
 				end
-				act'Set the tapestry aside':gt $curloc
+				act'Set the tapestry aside':gt 'city_house_res_misc', 'livroom'
 			end
 		end
 	end

+ 1 - 1
locations/city_industrial.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = '':
 	if hour >= 4 and hour <= 23:
 		act 'Walk to the Metro': minut += 5 & gt 'metro', 'start'
 	end
-	if evt_chk = '1':
+	if evt_chk = 1:
 		!! We've got an event today, check it's location:
 		gs 'emp_functions', 'disp_evt', 3
 	end

+ 1 - 1
locations/city_jorahouse.qsrc

@@ -1450,7 +1450,7 @@ if $ARGS[0] = 'ev65':
 	gs 'panties', 'wear', $lastwornpantytype['swim'], lastwornpantynumber['swim']
 	gs 'bras', 'wear', $lastwornbratype['swim'], lastwornbranumber['swim']
 	gs 'stat'
-	act 'Return to dressing room':gt 'fit', 'dressing room'
+	act 'Return to dressing room':gt 'fit', 'dressing_room'
 end
 
 !!Jesus, what hueta, I cried tears of blood

+ 2 - 2
locations/city_mansion_residence_2.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'ylounge':
 							gs'stat'
 							'You spend 15 minutes at the embroidery frame, preparing the fabric and outlining the pattern for the tapestry.'
 
-							act'Set the tapestry aside':gt $curloc
+							act'Set the tapestry aside':gt 'city_mansion_residence_2', 'ylounge'
 						end
 					end
 				end
@@ -104,7 +104,7 @@ if $ARGS[0] = 'ylounge':
 						gobelen += 1
 						'Your work on the tapestry is done.'
 					end
-					act'Set the tapestry aside':gt $curloc
+					act'Set the tapestry aside':gt 'city_mansion_residence_2', 'ylounge'
 				end
 			end
 		end

+ 3 - 0
locations/city_mansion_residence_3.qsrc

@@ -26,6 +26,9 @@ if $ARGS[0] = 'ygym':
 
 	if ymanrem[11] = 2:
 		'Your private gym with all the necessities to live a healthy life. From here you can walk over to the pool or relax in the sauna.'
+
+		gs 'wardrobe', 'default_sport_options'
+
 		gs 'exercise', 'start'
 	end
 end

+ 117 - 60
locations/city_musicstore.qsrc

@@ -3,77 +3,132 @@
 if $ARGS[0] = 'musicshop':
 	*clr & cla	
 	if ml_musicstorevisited = 0:
-			ml_musicstorevisited = 1
-			gt 'city_musicstore', 'firstvisit'
+		ml_musicstorevisited = 1
+		gt 'city_musicstore', 'firstvisit'
 	elseif ml_didntbuyguitarthefirstvisit = 1:
 		gt 'city_musicstore', 'cameback'
 	else
-		'<center><img src="images/locations/city/citycenter/mall/musicstore/music-store-600.jpg"></center>'
-		'You enter the store, welcomed by the familiar mix of random notes and bits of songs screaming from the back.'
-		'Jimmy just nods at you, then returns his attention to the guitar laying on the counter in front of him.'
-
-		act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
-		act 'Try some guitars': 
-!!			TODO: Better scenes here			
-			if pcs_instrmusic < 30 and pcs_perform < 10:
-				'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
-			else
-				'Some texts here depending on music skill and performing skill'			
+		musicrand = rand(1,2)
+		if musicrand = 1 and yearstart >= 2 and (week > 5 and hour >= 8 and hour < 17):
+			'<center><img src="images/locations/city/citycenter/mall/musicstore/music_store.jpg"></center>'
+			'You enter the store, welcomed by the familiar mix of random notes and bits of songs screaming from the back.'
+			'At the counter you see a familiar face, Radomir. You use to go to school with him in Pavlovsk.'
+			act 'Approach the counter':
+				*clr & cla
+				gs 'npc_relationship', 'modify', 'A154', 'like'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
+				if npc_rel['A154'] >= 60:
+					if hotcat >= 6:
+						'Radomir gives you a smile. "Come to hang out with me on my break? Maybe we can have a little fun." He says with a wink.'
+						'You tell him you just came to look around and maybe do a little shopping. After a bit he tells you about a variety of instruments, he seems to really know his stuff when it comes to musical instruments.'
+					else
+						'He gives you a slight knowing smirk when he sees you. "So what can I do for one of my fans?"'
+						'You tell him you just came to look around and maybe do a little shopping. After a bit he tells you about a variety of instruments, he seems to really know his stuff when it comes to musical instruments.'
+					end
+				elseif npc_rel['A154'] <= 20:
+					'Radomir visably sighs when he see''s you. He does his best to ignore you, though he will answer questions about instruments that you ask, but only with the barest amount of information.'
+				else
+					if hotcat >= 6:
+						'Radomir is talking about the band''s latest gig as you approach. He sees you and looks your body up and down. "Nice to see all the working out is paying off. Looking good."'
+						'You tell him you just came to look around and maybe do a little shopping. After a bit he tells you about a variety of instruments, he seems to really know his stuff when it comes to musical instruments.'
+					else
+						'He smirks when he sees you. "Come to try and butter me up before I get famous?" You ignore his comment and ask him about some of the instruments.'
+						'After a bit he tells you about a variety of instruments, he seems to really know his stuff when it comes to musical instruments.'
+					end
+				end
 			end
-		end
-		act 'Leave': 
-			if ml_boughtguitar > 0 or ml_boughtamp > 0:
-				gt 'city_musicstore', 'payandtakestuff'
+			act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
+			act 'Try some guitars': 
+	!!			TODO: Better scenes here			
+				if pcs_instrmusic < 30 and pcs_perform < 10:
+					'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
+				else
+					'Some texts here depending on music skill and performing skill'			
+				end
+			end
+			act 'Leave': 
+				if ml_boughtguitar > 0 or ml_boughtamp > 0:
+					gt 'city_musicstore', 'payandtakestuff'
+				end
+				gt 'torgcentr'
+			end
+		else
+			'<center><img src="images/locations/city/citycenter/mall/musicstore/music_store.jpg"></center>'
+			'You enter the store, welcomed by the familiar mix of random notes and bits of songs screaming from the back.'
+			'Jimmy just nods at you, then returns his attention to the guitar laying on the counter in front of him.'
+			act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
+			act 'Try some guitars': 
+	!!			TODO: Better scenes here			
+				if pcs_instrmusic < 30 and pcs_perform < 10:
+					'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
+				else
+					'Some texts here depending on music skill and performing skill'			
+				end
+			end
+			act 'Leave': 
+				if ml_boughtguitar > 0 or ml_boughtamp > 0:
+					gt 'city_musicstore', 'payandtakestuff'
+				end
+				gt 'torgcentr'
 			end
-			gt 'torgcentr'
 		end
 	end
-
 end
 
 if $ARGS[0] = 'firstvisit':
-	'<center><img src="images/locations/city/citycenter/mall/musicstore/music-store-600.jpg"></center>'
-	*nl
-	'You enter the store, passing the door to be submerged in a loud, cacophonic environment. 
-	The walls are filled with guitars, and in the back three teenaged guys are trying instruments in a very loud way.'
-!!	TODO: Replace the image, Waynes world is fun but silly
-	'<center><img src="images/locations/city/citycenter/mall/musicstore/waynesworld.jpg"></center>'
-	*nl
-    'A tall, dark haired man turns to you with a bored expression that turns into a perplexed smile as he takes your sight in.'
-   	'He straightens up "Hello there, I''m Jimmy" - he greets you - "Is there anything I can help you with?"'
-	*nl
-	'<center><img src="images/locations/city/citycenter/mall/musicstore/jimmy.jpg"></center>'
-	*nl
-  	'Suddenly he turns and throws a sponge at one of the boys playing in the back "No. Stairway. To. Heaven." he growls and points at the sign on the wall before turning back to you.'
- 	'<center><img src="images/locations/city/citycenter/mall/musicstore/nostairways.jpg"></center>'
-
-	act 'Look for a guitar':
+	musicrand = rand(1,5)
+	if musicrand = 1:
+		'<center><img src="images/locations/city/citycenter/mall/musicstore/boys_rocking.jpg"></center>'
+		'You enter the store, passing the door to be submerged in a loud, cacophony environment. The walls are filled with guitars, bass, amps, drums, even keyboards fill the shop. In the back three teenage boys try and play some of the guitars loudly and not very well.'
+		'A tall, ginger haired man turns to you with a bored expression that turns into a perplexed smile as he takes your sight in.'
+	elseif musicrand = 2:
+		'<center><img src="images/locations/city/citycenter/mall/musicstore/nostairways.jpg"></center>'
+		'You enter the store, passing the door to be submerged in a loud, cacophony environment. The walls are filled with guitars, bass, amps, drums, even keyboards fill the shop.'
+		'A tall, ginger haired man turns to you with a bored expression that turns into a perplexed smile as he takes your sight in.'
+		'Suddenly he turns and throws a sponge at one of the boys playing in the back "No. Stairway. To. Heaven." he growls and points at the sign on the wall before turning back to you.'
+	else
+		'<center><img src="images/locations/city/citycenter/mall/musicstore/music_store.jpg"></center>'
+		'You enter the store, passing the door to be submerged in a loud, cacophony environment. The walls are filled with guitars, bass, amps, drums, even keyboards fill the shop.'
+		'A tall, ginger haired man turns to you with a bored expression that turns into a perplexed smile as he takes your sight in.'
+	end
+	act 'Approach the counter':
 		*clr & cla
-		'<center><img src="images/locations/city/citycenter/mall/musicstore/cheap_acoustic_1.jpg"></center>'		
-		'You start to browse the guitars in the shop, not entirely sure what you are looking for and gladly accept the help of the store clerk. After answering his questions and chatting about music and what you are looking for he finally picks up an affordable acoustic guitar as a recommendation.'
-		'After some conversation with the store owner he offers you an affordable acoustic guitar to buy'
-		'Jimmy leaves you alone with the instrument, so you sit down to try it, strumming the chords that you know, trying to play something.'
-		if money > 3400 or karta > 3400:
-			if money < 14280 and karta < 14280:
-				'While the guitar is not the best sounding one it''s comfortable and looking at the price tags, the only one you can afford.'
-			else 
-				'While the guitar is not the best sounding one it''s comfortable and looking at the price tags, you are not sure you should spend too much money until you are better at playing the guitar.'
-			end
-			if money > 3400: act 'Buy a cheap acoustic guitar (3,400 <b>P</b>) - pay with cash': gt 'city_musicstore', 'buycheapacoustic', 'money'
+		'<center><img src="images/locations/city/citycenter/mall/musicstore/jimmy.jpg"></center>'
+		'A tall, ginger haired man turns to you with a bored expression that turns into a perplexed smile as he takes your sight in.'
+		'He straightens up "Hello there, I''m Jimmy" - he greets you - "Is there anything I can help you with?"'
+		act 'Look for a guitar':
+			*clr & cla
+			'<center><img src="images/locations/city/citycenter/mall/musicstore/cheap_acoustic_1.jpg"></center>'		
+			'You start to browse the guitars in the shop, not entirely sure what you are looking for and gladly accept the help of the store clerk. After answering his questions and chatting about music and what you are looking for he finally picks up an affordable acoustic guitar as a recommendation.'
+			'After some conversation with the store owner he offers you an affordable acoustic guitar to buy'
+			'Jimmy leaves you alone with the instrument, so you sit down to try it, strumming the chords that you know, trying to play something.'
+			if money > 3400 or karta > 3400:
+				if money < 14280 and karta < 14280:
+					'While the guitar is not the best sounding one it''s comfortable and looking at the price tags, the only one you can afford.'
+				else 
+					'While the guitar is not the best sounding one it''s comfortable and looking at the price tags, you are not sure you should spend too much money until you are better at playing the guitar.'
+				end
+				if money > 3400: act 'Buy a cheap acoustic guitar (3,400 <b>P</b>) - pay with cash': gt 'city_musicstore', 'buycheapacoustic', 'money'
 
-			if karta > 3400: act 'Buy a cheap acoustic guitar (3,400 <b>P</b>) - pay with card': gt 'city_musicstore', 'buycheapacoustic', 'karta'						
-			act 'You have to think about it':
+				if karta > 3400: act 'Buy a cheap acoustic guitar (3,400 <b>P</b>) - pay with card': gt 'city_musicstore', 'buycheapacoustic', 'karta'						
+				act 'You have to think about it':
+					ml_didntbuyguitarthefirstvisit = 1
+					'You hesitate for a moment, unsure whether to buy it or not and finally decide to not do it, at least not now. "I will have to talk to my mum first" you say to Jimmy. '
+					'He just nods "Don''t worry <<$pcs_firstname>>. You know what, I will put it aside for you for a bit in case you change your mind". He scribbles something on a post-it note, and sticks it on the guitar "I will try to keep the price the same, 3,400 rubels."'
+					act 'Leave': gt 'torgcentr'
+				end
+			else
 				ml_didntbuyguitarthefirstvisit = 1
-				'You hesitate for a moment, unsure whether to buy it or not and finally decide to not do it, at least not now. "I will have to talk to my mum first" you say to Jimmy. '
-				'He just nods "Don''t worry <<$pcs_firstname>>. You know what, I will put it aside for you for a bit in case you change your mind". He scribbles something on a post-it note, and sticks it on the guitar "I will try to keep the price the same, 3,400 rubels."'
+				'While the guitar is not the best sounding one it''s comfortable. Unfortunately while it''s cheaper than the rest, it still costs more than you have. With a sigh you hand it back to Jimmy "I''m sorry, but, I can''t buy it now."'
+				'He just nods "Don''t worry, I tell you what, I will put it aside for you if you change your mind." He scribbles something on a post-it note, and sticks it on the guitar "I will try to keep the price the same, 3,400 rubels."'
 				act 'Leave': gt 'torgcentr'
-			end
-		else
-			ml_didntbuyguitarthefirstvisit = 1
-			'While the guitar is not the best sounding one it''s comfortable. Unfortunately while it''s cheaper than the rest, it still costs more than you have. With a sigh you hand it back to Jimmy "I''m sorry, but, I can''t buy it now."'
-			'He just nods "Don''t worry, I tell you what, I will put it aside for you if you change your mind. He scribbles something on a post-it note, and sticks it on the guitar "I will try to keep the price the same, 3,400 rubels."'
-			act 'Leave': gt 'torgcentr'
-		end				
+			end				
+		end
+		act 'Leave': 
+			ml_didntbuyguitarthefirstvisit = 1		
+			gt 'torgcentr'
+		end
 	end
 	act 'Leave': 
 		ml_didntbuyguitarthefirstvisit = 1		
@@ -84,12 +139,13 @@ end
 
 if $ARGS[0] = 'cameback':
 	*clr & cla
-	'<center><img src="images/locations/city/citycenter/mall/musicstore/music-store-600.jpg"></center>'
+	'<center><img src="images/locations/city/citycenter/mall/musicstore/music_store.jpg"></center>'
 	*nl
-	'You enter the store, passing the door to be submerged in a loud, cacophonic environment.'
+	'You enter the store, passing the door to be submerged in a loud, cacophony environment.'
 	if money > 3400 or karta > 3400: 
 		act 'Ask Jimmy about the guitar':
 			cla
+			'<center><img src="images/locations/city/citycenter/mall/musicstore/jimmy.jpg"></center>'
 			'You walk up to the counter where Jimmy is busy tinkering with a guitar.'
 			'"Hi Jimmy... I was wondering if you still has that guitar..."'
 			'Jimmy looks up from the guitar "Hi <<$pcs_firstname>>, sure, I have it. Let me get it for you."'
@@ -100,6 +156,7 @@ if $ARGS[0] = 'cameback':
 	end
 	act 'Shop for guitars and amps': gt 'city_musicstore_stock', 'acoustic'
 	act 'Try some guitars': 
+		'<center><img src="images/locations/city/citycenter/mall/musicstore/try_guitars.jpg"></center>'
 !!			TODO: Better scenes here			
 		if pcs_instrmusic < 30 and pcs_perform < 10:
 			'You pick up a guitar to try it, but you are too shy and after strumming a few chords you put it back on it''s stand'
@@ -130,7 +187,7 @@ if $ARGS[0] = 'buycheapacoustic':
 	gs 'city_musicstore', 'first_setup'
 	
 	if $ARGS[1] = 'money': money -= 3400
-	if $ARGS[2] = 'karta': karta -= 3400
+	if $ARGS[1] = 'karta': karta -= 3400
 	gs 'stat'
 	act 'Leave': gt 'torgcentr'
 end

Dosya farkı çok büyük olduğundan ihmal edildi
+ 275 - 281
locations/city_nightclub.qsrc


+ 1 - 1
locations/city_residential.qsrc

@@ -93,7 +93,7 @@ end
 
 act 'Walk to the central park (0:20)': minut += 20 & gt 'city_park', 'start'
 act 'Walk to the lake': minut += 40 & gt 'city_lake', 'start'
-if evt_chk = '1':
+if evt_chk = 1:
 	!! We've got an event today, check it's location:
 	gs 'emp_functions', 'disp_evt', 3
 end

+ 11 - 3
locations/clothing.qsrc

@@ -1414,16 +1414,24 @@ if $ARGS[0] = 'view_clothing_item':
 		if CloInhibit <= 10:
 			'<font color="blue">This uniform is very conservative. Only the nerds would approve of you wearing it.</font>'
 		elseif CloSkirtShortness < 5 and CloThinness < 5 and CloBra = 0:
-			if CloQuality >= 4:
+			if CloInhibit >= 30 or CloTopCut = 4:
+				'<font color="red">This uniform, despite meeting the school uniform regulations, is too risqué. Everybody in school apart from the gopniks will think that you''re a slut but they will respect you for beating the school rules.</font>'
+			elseif CloStyle = 2:
+				'<font color="blue">This uniform follows the school regulation on skirt length but is of a style that appeals to Gopniks.</font>'	
+			elseif CloQuality >= 4:
 				'<font color="blue">This uniform complies with the regulations and is of good quality. It would certainly help you with your standing with the cool kids and jocks.</font>'
 			else
 				'<font color="blue">This uniform complies with the school regulations on skirt length. Nobody in school would be offended by you wearing it.</font>'
 			end
 		elseif CloSkirtShortness = 5 and CloThinness < 5 and CloBra = 0:
-			if CloQuality >= 4:
+			if CloInhibit >= 35:
+				'<font color="red">This uniform slightly breaches the school uniform regulations and it is too risqué. Everybody in school apart from the gopniks will think that you''re a slut.</font>'
+			elseif CloStyle = 2:
+				'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'	
+			elseif CloQuality >= 4:
 				'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of good quality. Everybody apart from the nerds would approve of you wearing it.</font>'
 			else
-				'<font color="blue">This uniform slightly breaches the school regulations on skirt length. The gopnik would approve of you wearing it.</font>'
+				'<font color="blue">This uniform slightly breaches the school regulations on skirt length. The gopnik would approve of you wearing it and they will respect you for beating the school rules.</font>'
 			end
 		else
 			'<font color="red">This uniform makes a mockery of the school uniform regulations. Everybody in school apart from the gopniks will think that you''re a slut.</font>'

+ 11 - 3
locations/clothing_QV.qsrc

@@ -1286,13 +1286,21 @@ if $ARGS[0] = 'change':
 		if CloInhibit <= 10:
 			'<font color="blue">This uniform is very conservative in style. Only the nerds would approve of you for wearing it.</font>'
 		elseif CloSkirtShortness < 5 and CloThinness < 5 and CloBra = 0:
-			if CloQuality >= 4:
+			if CloInhibit >= 30 or CloTopCut = 4:
+				'<font color="red">This uniform, despite meeting the school uniform regulations, is too risqué. Everybody in school apart from the gopniks will think that you''re a slut but they will respect you for beating the school rules.</font>'
+			elseif CloStyle = 2:
+				'<font color="blue">This uniform follows the school regulation on skirt length but is of a style that appeals to Gopniks.</font>'	
+			elseif CloQuality >= 4:
 				'<font color="blue">This uniform follows the school regulations and is of good quality. You would gain approval from both the cool kids and the jocks.</font>'
 			else
 				'<font color="blue">This uniform follows the school regulations on skirt length. Every student feels indifferent to you for wearing it.</font>'
 			end
 		elseif CloSkirtShortness = 5 and CloThinness < 5 and CloBra = 0:
-			if CloQuality >= 4:
+			if CloInhibit >= 35:
+				'<font color="red">This uniform slightly breaches the school uniform regulations and it is too risqué. Everybody in school apart from the gopniks will think that you''re a slut.</font>'
+			elseif CloStyle = 2:
+				'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'	
+			elseif CloQuality >= 4:
 				'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of good quality. Students are, at least, indifferent to you for wearing it, except the disapproving looks from the nerds.</font>'
 			else
 				'<font color="blue">This uniform slightly breaches the school regulations on skirt length. The gopnik would approve of you for wearing it.</font>'
@@ -1906,7 +1914,7 @@ if $ARGS[0] = 'shop_filter':
 		clothingfilter['only'] += 1
 	end
 	if clothingfilter['too_risque_only'] = 1 and CloInhibit > pcs_inhib:
-		clothingfilter['inc'] += 1
+		clothingfilter['only'] += 1
 	end
 	if clothingfilter['loose_only'] = 1 and CloStyle = 5:
 		clothingfilter['only'] += 1

+ 15 - 6
locations/clothing_attributes.qsrc

@@ -108,6 +108,9 @@ CloStyle = 0
 CloStyle2 = 0
 CloBimbo = 0
 CloInhibit = 0
+CloCoverFront = 0
+CloCoverBack = 0
+CloCoverTop = 0
 
 if $ARGS[0] = 'gm_outfits':
 	*P FUNC('$attributes_gm_outfits', $ARGS[0], ARGS[1])
@@ -194,7 +197,13 @@ elseif $ARGS[0] = 'nerdvana_swimsuit':
 end
 
 if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! 'scandalicious_swimsuit' and $ARGS[0] ! 'scandalicious_bikinis' and $ARGS[0] ! 'danilovich_swimsuit' and $ARGS[0] ! 'nerdvana_swimsuit' and $ARGS[0] ! 'nerdvana_bikinis':
-	if CloSkirtShortness = 6:
+	if CloCoverFront = 4:
+		CloInhibit = 50
+	elseif CloCoverFront = 3 or CloCoverTop = 4:
+		CloInhibit = 45
+	elseif CloCoverFront = 2 or CloCoverTop = 3:
+		CloInhibit = 40
+	elseif CloSkirtShortness = 6 or CloCoverFront = 1 or CloCoverTop = 2:
 		CloInhibit = 35
 	elseif CloSkirtShortness = 5 or CloPantsShortness = 6:
 		if CloThinness = 6:
@@ -205,7 +214,7 @@ if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! '
 	elseif CloPanties = 1 or CloPantsShortness = 5:
 		if CloThinness = 6:
 			CloInhibit = 35
-		elseif CloBra = 1:
+		elseif CloBra = 1 or CloCoverTop = 2:
 			CloInhibit = 30
 		else
 			CloInhibit = 25
@@ -213,7 +222,7 @@ if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! '
 	elseif CloSkirtShortness = 4:
 		if CloThinness = 6:
 			CloInhibit = 35
-		elseif CloBra = 1:
+		elseif CloBra = 1 or CloCoverTop = 2:
 			CloInhibit = 30
 		elseif CloTopCut = 4 or CloThinness = 5:
 			CloInhibit = 25
@@ -223,7 +232,7 @@ if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! '
 	elseif CloSkirtShortness = 3:
 		if CloThinness = 6:
 			CloInhibit = 35
-		elseif CloBra = 1:
+		elseif CloBra = 1 or CloCoverTop = 2:
 			CloInhibit = 30
 		elseif CloTopCut = 4 or CloThinness = 5:
 			CloInhibit = 25
@@ -235,7 +244,7 @@ if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! '
 	elseif CloSkirtShortness = 2 or CloPantsShortness = 3:
 		if CloThinness = 6:
 			CloInhibit = 35
-		elseif CloBra = 1:
+		elseif CloBra = 1 or CloCoverTop = 2:
 			CloInhibit = 30
 		elseif CloTopCut = 4 or CloThinness = 5:
 			CloInhibit = 25
@@ -249,7 +258,7 @@ if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! '
 	else
 		if CloThinness = 6:
 			CloInhibit = 35
-		elseif CloBra = 1:
+		elseif CloBra = 1 or CloCoverTop = 2:
 			CloInhibit = 30
 		elseif CloTopCut = 4 or CloThinness = 5:
 			CloInhibit = 25

+ 4 - 10
locations/crossfit_north_box.qsrc

@@ -1,19 +1,13 @@
 # crossfit_north_box
-
-$loc = 'crossfit_north_box'
-$locM = 'crossfit_north_box'
+menu_off = 0
+gs 'shortgs', 'setloc', 'crossfit_north_box', $ARGS[0]
 $sexloc = 'crossfit_north_box'
 $location_type = 'public_indoors'
-$loc_arg = 'box'
-$locM_arg = 'box'
 $crossfit_north_image_dir = 'images/locations/city/citycenter/gym/crossfit/'
-$menu_loc = 'crossfit_north_box'
-$menu_arg = 'box'
-menu_off = 0
 
 if $ARGS[0] = 'box':
 	
-	act 'Leave': gt 'fit', 'dressing room'
+	act 'Leave': gt 'fit', 'dressing_room'
 	
 	if crossfit_random_choice < daystart OR $todays_crossfit_wod = '':
 		gs 'crossfit_north_wod', 'setup_wod'
@@ -84,7 +78,7 @@ if $ARGS[0] = 'box':
 					end
 					killvar 'current_wod_score'
 					act 'Finish and go to the changing room':
-						gt 'fit', 'dressing room'
+						gt 'fit', 'dressing_room'
 					end
 				end
 			end

+ 0 - 1
locations/cum_cleanup.qsrc

@@ -255,7 +255,6 @@ elseif $ARGS[0] = '':
 	if i < arrsize('$sparrnam'):
 		tmp = arrpos('deresidue', sparrloc[i])
 		if tmp ! -1 and tmp < arrsize('deresidue'): sparrslc[i] = 0 & sparrvol[i] = 0
-		if (arrsize('toclean') = 12 or cumspclnt = 2) and pcs_breath = 1: pcs_breath = 0
 
 		tmp = arrpos('toclean', sparrloc[i])
 		if tmp ! -1 and tmp < arrsize('toclean'):

+ 4 - 4
locations/danceclass.qsrc

@@ -20,7 +20,7 @@ if pcs_energy >= 10:
 		if pcs_danc < 100:'You study modern dance, which is very popular in the clubs.'
 		if pcs_danc >= 100:'The day has finally come, you''ve been working hard, and you realize that you''ve learned everything you can from this class.'
 
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	end
 
 	act 'Burlesque class (0:30)':
@@ -40,7 +40,7 @@ if pcs_energy >= 10:
 			'This class isn''t just about taking your clothes off, it''s a difficult dance style and your basics aren''t sufficent. Instead, the teacher helps you with your basic modern dance steps.'
 		end
 
-		act 'Leave':gt 'fit', 'dressing room'
+		act 'Leave':gt 'fit', 'dressing_room'
 	end
 
 	if pcs_stren >=40 or needstrength = 0:
@@ -62,7 +62,7 @@ if pcs_energy >= 10:
 				if pcs_stren < 40:'The instructor tries to be patient with you, but it is clear that you are too weak for this sort of dance.' & needstrength = 1
 			end
 
-			act 'Leave':gt 'fit', 'dressing room'
+			act 'Leave':gt 'fit', 'dressing_room'
 		end
 	else
 		act 'Modern dance class (0:30)': '<br><font color="red">You don''t have enough energy to use this action.</font>'
@@ -76,7 +76,7 @@ else
 	'You are so hungry you can''t even bring yourself to look at the activities available'
 end
 
-act 'Leave':gt 'fit', 'dressing room'
+act 'Leave':gt 'fit', 'dressing_room'
 
 
 --- danceclass ---------------------------------

+ 5 - 4
locations/dateM.qsrc

@@ -109,7 +109,8 @@ if $ARGS[0] = 'start':
 					elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 						gs 'fame', 'pav', 'sex', 2
 					end
-					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
+					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'sex_ev_start', 'hookup_npc_home_start'
+					!! act 'Go to his place':$hookup['pickup'] = 'street' & gt 'sex_ev_start', 'hookup_start'
 				end
 			end
 		end
@@ -182,7 +183,7 @@ if $ARGS[0] = 'start':
 					elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 						gs 'fame', 'pav', 'sex', 2
 					end
-					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
+					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'sex_ev_start', 'hookup_npc_home_start'
 				end
 			end
 		end
@@ -246,7 +247,7 @@ if $ARGS[0] = 'start':
 					elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 						gs 'fame', 'pav', 'sex', 2
 					end
-					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
+					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'sex_ev_start', 'hookup_npc_home_start'
 				end
 			end
 		end
@@ -320,7 +321,7 @@ if $ARGS[0] = 'start':
 				elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 					gs 'fame', 'pav', 'sex', 2
 				end
-				act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
+				act 'Go to his place':$hookup['pickup'] = 'street' & gt 'sex_ev_start', 'hookup_npc_home_start'
 			end
 		end
 	end

+ 4 - 1
locations/din_bad.qsrc

@@ -133,7 +133,10 @@ if $ARGS[0] = 'd_bag':
 		'There''s mouthwash in your purse. <b><<mouthwash>></b> uses remaining.'
 	end
 	if compact_mirror = 1: 
-		'You have a <a href="exec: gt ''mirror'', ''d_bag_mirror''">compact mirror</a> in your purse'+iif(kosmetitka > 0, ' and some portable makeup.', '.')
+		'You have a <a href="exec: cla & gt ''mirror'', ''d_bag_mirror''">compact mirror</a> in your purse'+iif(kosmetitka > 0, ' and some portable makeup.', '.')
+		if lipbalm > 0 and pcs_lipbalm <= 0:
+			'You can apply some <a href="exec: cls & gs ''mirror'', ''applyLipbalm'' & act ''Return'':gs ''din_bad'', ''d_bag''">lip balm</a>'			
+		end
 	elseif compact_mirror = 0 and kosmetitka > 0:
 		'You have some portable makeup in your purse, but you need a compact mirror to apply it.'
 	end

+ 6 - 5
locations/din_van.qsrc

@@ -1026,7 +1026,9 @@ if $ARGS[0] = 'private':
 	end
 
 	if mosolmaz > 0: 'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'
-
+	if item_moisturizer > 0: 
+		'You look at your moisturiser and think you have about <<item_moisturizer>> applications left.'
+	end
 	if tampon = 0 and sanpad = 0:
 		'<b><font color="red">You have no feminine hygiene products left.</font></b>'
 	elseif tampon = 1 and tampon['warning'] ! daystart:
@@ -1034,7 +1036,7 @@ if $ARGS[0] = 'private':
 		msg'<font color="red">You only have <b><<tampon>></b> tampon left!</font>'
 	elseif tampon = 1:
 		msg'<font color="red">You only have <b><<tampon>></b> tampon left.</font>'
-	else
+	elseif tampon > 0:
 		'You have <b><<tampon>></b> tampons.'
 	end
 	
@@ -1043,7 +1045,7 @@ if $ARGS[0] = 'private':
 		msg'<font color="red">You only have <b><<sanpad>></b> pad left!</font>'
 	elseif sanpad = 1:
 		'<font color="red">You have only <b><<sanpad>></b> pads left.</font>'
-	else
+	elseif sanpad > 0:
 		'You have <b><<sanpad>></b> pads.'
 	end
 
@@ -1327,7 +1329,7 @@ end
 
 if $ARGS[0] = 'buffpick':
 	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit2.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/pc/activities/excercises/gym/fit2.jpg"></center>'
 	*nl
 	'While drying off and getting dressed, you examine the sleek muscles that are showing through your skin.'
 	'As you do so, you think about how you look and decide:'
@@ -1768,7 +1770,6 @@ if $ARGS[0] = 'shave_options':
 		'Rectangle'
 	end
 	
-	
 	'</center></TD><TR><center>'
 	'Your razor will last for <b><<stanok>></b> more shaves.'
 	*nl

+ 2 - 2
locations/dina.qsrc

@@ -117,7 +117,7 @@ $rexpot = {
 $hypnoDaychange = {
 	!!if for some reason hypnoTime is too high
 	if hypnoTime > 15:hypnoTime = 15
-	timeTresh = 76 - 4*hypnoType
+	timeTresh = 76 - 4*hypnoTime
 	!!Withdrawal effect begings if too strong influence and no visitation
 	if daystart-hypnoDay > 7:
 		if hypnoAddict = 1:
@@ -142,7 +142,7 @@ $hypnoDaychange = {
 			if rand(0,4) = 0:
 				hypnoStrength = 19
 				hypnoTime -= 1
-				if hypnoTime < 10:hypnoAddict = 1 & hypnoBlock = 0 & hypnoWithdrawal = 1
+				if hypnoTime < 10:hypnoAddict = 1 & hypnoWithdrawal = 1
 			end
 		end
 	end

+ 4 - 0
locations/dreams.qsrc

@@ -8,6 +8,10 @@ if $ARGS[0] = 'start':
 		'Today you had a very strange dream: You were blindfolded, having sex with a stranger. After the two of you are done you remove the blindfold and recognize the stranger to be your stepfather.'
 		pcs_horny = 100
 		stepdadqw += 1
+	elseif canBraidHair = 0 and mid($start_type,1,2) ! 'sg' and pcs_hairlng > 80:
+		canBraidHair = 1
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/braid.jpg"></center>'
+		'You dream about the time your sister taught you how to braid your hair. She was happy to help you out and teach you how to do it, it was one of your more memorable sister bonding moments the two of you had not long before you moved out.'
 	elseif succubusQW = 1 or succubusQW = 2:
 		!this is for initial dream and a reoccuring dream if the feeling was ignored
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/succubdream.jpg"></center>'

+ 15 - 13
locations/emp_functions.qsrc

@@ -7,8 +7,8 @@
 !! v.01 - Initial code base
 !! v.02 - Event generator partially integrated
 !! v.03 - Job management system integrated
-!! v. 04 - Start of event generation code integration
-!! 
+!! v.04 - Start of event generation code integration
+!! v.05 - Date suffix modification
 
 !! --------------------- UI Interface for Journal
 
@@ -164,7 +164,7 @@ if $ARGS[0] = 'job_info':
 	$msg_body +=  '<p>Job Title: ' + $emp_job_title[j_id] + '</p>'
 	$msg_body += '<p>Location: ' + $emp_job_loc[j_id] + '</p>'
 	$msg_body += '<p>Notes: ' + $emp_job_notes[j_id]+ '</p>'
-	$msg_body += '<p>Wages: ' +emp_job_wages[j_id] + '<b>₽</b></p>'
+	$msg_body += '<p>Wages: ' + func('agentned', 'format_price_string', emp_job_wages[j_id]) + '<b>₽</b></p>'
 	
 	msg '<<$msg_body>>'
 end
@@ -192,7 +192,7 @@ if $ARGS[0] = 'disp_evt':
 		*nl
 		'Event Scheduled for: ' + transient_evt_day + $evt_suffix + ', '+ $monthName[transient_evt_month] +' '+ '20' + transient_evt_year
 		'Job: ' + $evt_job[transient_evt_type]  			
-		'Pay: ' + transient_evt_wages
+		'Pay: ' + func('agentned', 'format_price_string', transient_evt_wages)
 		'Time: ' + transient_evt_hour + ':' +  iif(transient_evt_minutes  >= 0 and transient_evt_minutes <= 4, '00',  '30')
 		'Duration: ' + transient_evt_duration  + iif(transient_evt_duration  = 1, ' hour',  ' hours')
 		'Location reminder: ' + $transient_mc_locat
@@ -214,7 +214,7 @@ if $ARGS[0] = 'disp_evt':
 			:jmp_list_create
 				!!if evt_silent[job_idx] = 1:
 					$evtbody += '<tr><td>' +$week[evt_dow[job_idx]]+' '+ evt_day[job_idx] + $evt_suffix + ', '+ $monthName[evt_month[job_idx]] +' 20'+ evt_year[job_idx] + '</td><td>' + $evt_job[evt_event[job_idx]] + '</td>' 
-					$evtbody += '<td>' + evt_wages[job_idx] + '₽</td><td>' + evt_hour[job_idx] + ':' +  iif(evt_minutes[job_idx] >= 0 and evt_minutes[job_idx] <= 4, '00', '30') + '</td>'
+					$evtbody += '<td>' + func('agentned', 'format_price_string', evt_wages[job_idx]) + '₽</td><td>' + evt_hour[job_idx] + ':' +  iif(evt_minutes[job_idx] >= 0 and evt_minutes[job_idx] <= 4, '00', '30') + '</td>'
 					$evtbody += '<td>' + evt_duration[job_idx] + iif(evt_duration[job_idx]  = 1, ' hour',  ' hours') + '</td><td>' + $evt_mc_locat[job_idx] + '</td>'
 					$evtbody += '<td><a  href="exec: gs ''emp_functions'',''del_evt'', 2, <<job_idx>>"><img src="images\system\icons\evt_del.png"></a></a></td></tr>'
 				!!end
@@ -231,9 +231,9 @@ if $ARGS[0] = 'disp_evt':
 				'You haven''t taken on any jobs yet.'
 			end
 	end
-
+	
 	!! Display the location acts
-	if ARGS[1] = 3 and evt_chk = '1':
+	if ARGS[1] = 3 and evt_chk = 1:
 		act_idx = 0
 		act_tracker = 0
 		act_found = 0
@@ -243,7 +243,9 @@ if $ARGS[0] = 'disp_evt':
 				act_idx = act_tracker 				
 			 end
 			 act_tracker +=1 
-		if act_tracker < arrsize('evt_event') or act_found = 0: jump 'jmp_act_create'
+		if act_found = 0:
+			if act_tracker < arrsize('evt_event'): jump 'jmp_act_create'
+		end
 		if ((evt_hour[act_idx] = hour and evt_minutes[act_idx] <= minut) or evt_hour[act_idx] = (hour - 1)) and $loc = $evt_loc[act_idx]:
 			act 'Attend your ' + $evt_job[evt_event[act_idx]] + ' event':
 				gs 'emp_functions', 'array_init'
@@ -398,8 +400,8 @@ if $ARGS[0] = 'cat_evt':
 		act 'Return': gt 'emp_functions', 'evt_init'
 	end
 end
-!! delete event after firing or cancelled
 
+!! delete event after firing or cancelled
 if $ARGS[0] = 'del_evt':
 	!! Delete transients
 	if ARGS[1] = 1:
@@ -477,11 +479,11 @@ if $ARGS[0] = 'evt_day_suffix':
 		test_day = query_day
 	end
 
-	if test_day => 4 and test_day <= 10:
+	if (test_day => 4 and test_day <= 10) or (day => 4 and day <=10):
 		$evt_suffix = 'th'
-	elseif test_day = 1 or test_day = 31:
+	elseif (test_day = 1 or test_day = 31) or (day = 1 or day = 21 or day = 31):
 		$evt_suffix = 'st'
-	elseif test_day = 2:
+	elseif (test_day = 2) or (day = 2 or day = 22):
 		$evt_suffix = 'nd'    
 	elseif test_day= 3: 
 		$evt_suffix = 'rd'
@@ -500,7 +502,7 @@ if $ARGS[0] = 'evt_day_chk':
 		evt_daily_chk = daystart
 		job_idx = 0
 		:evt_day_chk		
-			if month = evt_month and day = evt_day: evt_chk = '1'
+			if month = evt_month and day = evt_day: evt_chk = 1
 			job_idx += 1
 		if job_idx < arrsize('evt_event') : jump 'evt_day_chk'
 	end

+ 2 - 2
locations/ender.qsrc

@@ -1081,9 +1081,9 @@ if $ARGS[0] = 'surrender':
 			'"You''re fucking pathetic! You deserve what''s coming next for being such a fucking wimp!"'
 		elseif fightPStats['Health'] > pcs_health/2:
 			'You immediately feel blood running from your nose when Lena jabs you in the face, causing you to panic. "You win, you win! Just don''t hit me again! Please!" you plead and Lena laughs.'
-			'"Look''s like our little bunny isn''t as tough as she likes to think. Maybe she needs to learn from her mistake?" she says and the two gopniks smile at you cruelly.' 
+			'"Looks like our little bunny isn''t as tough as she likes to think. Maybe she needs to learn from her mistake?" she says and the two gopniks smile at you cruelly.' 
 		else
-			'You''re barely able to defend yourself from the dirty tactics the two gopniks employ. Dodging one of Lena''s blows causes you to stumble; they catch you, only to then throw you towards the sink. You''re winded and collpase on the floor when you hit your stomach off the edge of the sink. "I- I give up..." you whisper while trying not to throw up.'
+			'You''re barely able to defend yourself from the dirty tactics the two gopniks employ. Dodging one of Lena''s blows causes you to stumble; they catch you, only to then throw you towards the sink. You''re winded and collapse on the floor when you hit your stomach off the edge of the sink. "I- I give up..." you whisper while trying not to throw up.'
 		end
 		'Lera heads into one of the stalls as Lena pins you to the floor by pressing her knee into your back, causing you to cry out in pain. "Not so tough now, are you bitch?" she smirks.' 
 		'Lera returns a few seconds later and you loudly protest as they haul into a stall and lean you over the toilet. The smell hits you immediately - the bowl is full of urine, likely Lera''s. You know exactly what they''re going to do and grip the toilet seat firmly to stop them, but they pull you back and pin your arms behind your back before pushing you back down. They laugh loudly as they dunk your head into the foul water multiple times before holding you under and flushing. When they pull you up and finally let you go, you splutter and gasp for air.'

+ 5 - 5
locations/enderKik.qsrc

@@ -53,7 +53,7 @@ if profi = 1:
 		end
 
 	! WD: Argument is 'dressing room'
-	act 'Leave the ring':gt 'fit', 'dressing room'
+	act 'Leave the ring':gt 'fit', 'dressing_room'
 	end
 
 
@@ -149,8 +149,8 @@ elseif kickbox['amateur'] = 1:
 			kickbox['amateurDraw'] += 1
 		end
 
-		! WD: Argument is 'dressing room'
-		act 'Leave the ring':gt 'fit', 'dressing room'
+		! WD: Argument is 'dressing_room'
+		act 'Leave the ring':gt 'fit', 'dressing_room'
 	end
 
 
@@ -195,8 +195,8 @@ elseif sparing = 1:
 		'You nod and she turns around and heads to the dressing room.'
 	end
 
-	! WD: Argument is 'dressing room'
-	act 'Leave the ring':gt 'fit', 'dressing room'
+	! WD: Argument is 'dressing_room'
+	act 'Leave the ring':gt 'fit', 'dressing_room'
 
 end
 

+ 80 - 35
locations/exercise.qsrc

@@ -66,6 +66,8 @@ if $ARGS[0] = 'auto':
 		timemult = exer_rout3[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'yoga'
 	elseif exer_rout4[exercisex] > 0:
 		timemult = exer_rout4[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'hula'
+	elseif exer_rout5[exercisex] > 0:
+		timemult = exer_rout5[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
 	end
 end
 
@@ -78,6 +80,8 @@ if $ARGS[0] = 'auto1':
 		timemult = exer_rout3[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'yoga'
 	elseif exer_rout4[exercisex] > 0:
 		timemult = exer_rout4[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'hula'
+	elseif exer_rout5[exercisex] > 0:
+		timemult = exer_rout5[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
 	else
 		gt 'exercise', 'auto_end'
 	end
@@ -90,6 +94,8 @@ if $ARGS[0] = 'auto2':
 		timemult = exer_rout3[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'yoga'
 	elseif exer_rout4[exercisex] > 0:
 		timemult = exer_rout4[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'hula'
+	elseif exer_rout5[exercisex] > 0:
+		timemult = exer_rout5[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
 	else
 		gt 'exercise', 'auto_end'
 	end
@@ -100,6 +106,8 @@ if $ARGS[0] = 'auto3':
 		timemult = exer_rout3[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'yoga'
 	elseif exer_rout4[exercisex] > 0:
 		timemult = exer_rout4[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'hula'
+	elseif exer_rout5[exercisex] > 0:
+		timemult = exer_rout5[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
 	else
 		gt 'exercise', 'auto_end'
 	end
@@ -108,6 +116,16 @@ end
 if $ARGS[0] = 'auto4':
 	if exer_rout4[exercisex] > 0:
 		timemult = exer_rout4[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'hula'
+	elseif exer_rout5[exercisex] > 0:
+		timemult = exer_rout5[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
+	else
+		gt 'exercise', 'auto_end'
+	end
+end
+
+if $ARGS[0] = 'auto5':
+	if exer_rout5[exercisex] > 0:
+		timemult = exer_rout5[exercisex] & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
 	else
 		gt 'exercise', 'auto_end'
 	end
@@ -125,63 +143,67 @@ if $ARGS[0] = 'manual':
 	cla
 	act 'Return':gt 'exercise', 'workout'
 	if pcs_stam >= 15:
-		Act 'Do pushups for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'push'
-		Act 'Do crunches for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'press'
+		act 'Do pushups for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'push'
+		act 'Do crunches for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'press'
+		act 'Do squats for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
 		if skak > 0 and $loc ! 'meadow':
-			Act 'Jump rope for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'rope'
+			act 'Jump rope for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'rope'
 		end
 	end
 	if pcs_stam >= 10:
 		if bookYog > 0:
-			Act 'Do yoga for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'yoga'
+			act 'Do yoga for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'yoga'
 		end
 		if obruch > 0 and $loc ! 'meadow':
-			Act 'Use your hula hoop for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'hula'
+			act 'Use your hula hoop for 15 minutes': timemult = 1 & gs 'exercise', 'timestring' & gt 'exercise', 'hula'
 		end
 	end
 	if pcs_stam >= 30:
-		Act 'Do pushups for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'push'
-		Act 'Do crunches for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'press'
+		act 'Do pushups for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'push'
+		act 'Do crunches for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'press'
+		act 'Do squats for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
 		if skak > 0 and $loc ! 'meadow':
-			Act 'Jump rope for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'rope'
+			act 'Jump rope for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'rope'
 		end
 	end
 	if pcs_stam >= 20:
 		if bookYog > 0:
-			Act 'Do yoga for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'yoga'
+			act 'Do yoga for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'yoga'
 		end
 		if obruch > 0 and $loc ! 'meadow':
-			Act 'Use your hula hoop for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'hula'
+			act 'Use your hula hoop for 30 minutes': timemult = 2 & gs 'exercise', 'timestring' & gt  'exercise', 'hula'
 		end
 	end
 	if pcs_stam >= 45:
-		Act 'Do pushups for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'push'
-		Act 'Do crunches for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'press'
+		act 'Do pushups for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'push'
+		act 'Do crunches for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'press'
+		act 'Do squats for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
 		if skak > 0 and $loc ! 'meadow':
-			Act 'Jump rope for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'rope'
+			act 'Jump rope for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'rope'
 		end
 	end
 	if pcs_stam >= 30:
 		if bookYog > 0:
-			Act 'Do yoga for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'yoga'
+			act 'Do yoga for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'yoga'
 		end
 		if obruch > 0 and $loc ! 'meadow':
-			Act 'Use your hula hoop for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'hula'
+			act 'Use your hula hoop for 45 minutes': timemult = 3 & gs 'exercise', 'timestring' & gt  'exercise', 'hula'
 		end
 	end
 	if pcs_stam >= 60:
-		Act 'Do pushups for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'push'
-		Act 'Do crunches for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'press'
+		act 'Do pushups for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'push'
+		act 'Do crunches for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'press'
+		act 'Do squats for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt 'exercise', 'butt'
 		if skak > 0 and $loc ! 'meadow':
-			Act 'Jump rope for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'rope'
+			act 'Jump rope for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'rope'
 		end
 	end
 	if pcs_stam >= 40:
 		if bookYog > 0:
-			Act 'Do yoga for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'yoga'
+			act 'Do yoga for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'yoga'
 		end
 		if obruch > 0 and $loc ! 'meadow':
-			Act 'Use your hula hoop for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'hula'
+			act 'Use your hula hoop for 60 minutes': timemult = 4 & gs 'exercise', 'timestring' & gt  'exercise', 'hula'
 		end
 	end
 	if pcs_stam < 10 or pcs_stam < 15 and bookYog + obruch = 0:
@@ -194,12 +216,12 @@ if $ARGS[0] = 'routines':
 	'<center><h2>Exercise Routines</h2></center>'
 	*nl
 	'<center><table>'
-	'<TD><b>Routine</b></TD><TD><b>Push ups</b></TD><TD><b>Crunches</b></TD><TD><b>Jump rope</b></TD><TD><b>Yoga</TD><TD><b>Hula hoop</b></TD>'
-	'<TR><TD width="100" cellspacing="2" align="left">'+iif(exer_menu = 1,'<a href="exec:$excer_name[1] = input (''<center>Enter name for exercise routine 1<br>Leave blank to restore default name.</center>'') & gs ''exercise'', ''rename'' & gt ''exercise'', ''setup''"><<$excer_name[1]>>:</a> ','<<$excer_name[1]>>:</a> ')+'</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout0[1]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout1[1]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout2[1]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout3[1]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout4[1]*15>></b> minutes</TD>'
-	'<TR><TD width="100" cellspacing="2" align="left">'+iif(exer_menu = 1,'<a href="exec:$excer_name[2] = input (''<center>Enter name for exercise routine 2<br>Leave blank to restore default name.</center>'') & gs ''exercise'', ''rename'' & gt ''exercise'', ''setup''"><<$excer_name[2]>>:</a> ','<<$excer_name[2]>>:</a> ')+'</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout0[2]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout1[2]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout2[2]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout3[2]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout4[2]*15>></b> minutes</TD>'
-	'<TR><TD width="100" cellspacing="2" align="left">'+iif(exer_menu = 1,'<a href="exec:$excer_name[3] = input (''<center>Enter name for exercise routine 3<br>Leave blank to restore default name.</center>'') & gs ''exercise'', ''rename'' & gt ''exercise'', ''setup''"><<$excer_name[3]>>:</a> ','<<$excer_name[3]>>:</a> ')+'</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout0[3]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout1[3]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout2[3]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout3[3]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout4[3]*15>></b> minutes</TD>'
-	'<TR><TD width="100" cellspacing="2" align="left">'+iif(exer_menu = 1,'<a href="exec:$excer_name[4] = input (''<center>Enter name for exercise routine 4<br>Leave blank to restore default name.</center>'') & gs ''exercise'', ''rename'' & gt ''exercise'', ''setup''"><<$excer_name[4]>>:</a> ','<<$excer_name[4]>>:</a> ')+'</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout0[4]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout1[4]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout2[4]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout3[4]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout4[4]*15>></b> minutes</TD>'
-	'<TR><TD width="100" cellspacing="2" align="left">'+iif(exer_menu = 1,'<a href="exec:$excer_name[5] = input (''<center>Enter name for exercise routine 5<br>Leave blank to restore default name.</center>'') & gs ''exercise'', ''rename'' & gt ''exercise'', ''setup''"><<$excer_name[5]>>:</a> ','<<$excer_name[5]>>:</a> ')+'</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout0[5]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout1[5]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout2[5]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout3[5]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout4[5]*15>></b> minutes</TD>'
+	'<TD><b>Routine</b></TD><TD><b>Push ups</b></TD><TD><b>Crunches</b></TD><TD><b>Jump rope</b></TD><TD><b>Yoga</TD><TD><b>Hula hoop</b></TD><TD><b>Squats</b></TD>'
+	'<TR><TD width="100" cellspacing="2" align="left">'+iif(exer_menu = 1,'<a href="exec:$excer_name[1] = input (''<center>Enter name for exercise routine 1<br>Leave blank to restore default name.</center>'') & gs ''exercise'', ''rename'' & gt ''exercise'', ''setup''"><<$excer_name[1]>>:</a> ','<<$excer_name[1]>>:</a> ')+'</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout0[1]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout1[1]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout2[1]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout3[1]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout4[1]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout5[1]*15>></b> minutes</TD>'
+	'<TR><TD width="100" cellspacing="2" align="left">'+iif(exer_menu = 1,'<a href="exec:$excer_name[2] = input (''<center>Enter name for exercise routine 2<br>Leave blank to restore default name.</center>'') & gs ''exercise'', ''rename'' & gt ''exercise'', ''setup''"><<$excer_name[2]>>:</a> ','<<$excer_name[2]>>:</a> ')+'</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout0[2]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout1[2]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout2[2]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout3[2]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout4[2]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout5[2]*15>></b> minutes</TD>'
+	'<TR><TD width="100" cellspacing="2" align="left">'+iif(exer_menu = 1,'<a href="exec:$excer_name[3] = input (''<center>Enter name for exercise routine 3<br>Leave blank to restore default name.</center>'') & gs ''exercise'', ''rename'' & gt ''exercise'', ''setup''"><<$excer_name[3]>>:</a> ','<<$excer_name[3]>>:</a> ')+'</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout0[3]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout1[3]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout2[3]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout3[3]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout4[3]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout5[3]*15>></b> minutes</TD>'
+	'<TR><TD width="100" cellspacing="2" align="left">'+iif(exer_menu = 1,'<a href="exec:$excer_name[4] = input (''<center>Enter name for exercise routine 4<br>Leave blank to restore default name.</center>'') & gs ''exercise'', ''rename'' & gt ''exercise'', ''setup''"><<$excer_name[4]>>:</a> ','<<$excer_name[4]>>:</a> ')+'</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout0[4]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout1[4]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout2[4]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout3[4]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout4[4]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout5[4]*15>></b> minutes</TD>'
+	'<TR><TD width="100" cellspacing="2" align="left">'+iif(exer_menu = 1,'<a href="exec:$excer_name[5] = input (''<center>Enter name for exercise routine 5<br>Leave blank to restore default name.</center>'') & gs ''exercise'', ''rename'' & gt ''exercise'', ''setup''"><<$excer_name[5]>>:</a> ','<<$excer_name[5]>>:</a> ')+'</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout0[5]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout1[5]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout2[5]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout3[5]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout4[5]*15>></b> minutes</TD><TD width="100" cellspacing="2" align="left"><b><<exer_rout5[5]*15>></b> minutes</TD>'
 	'<TR><TD colspan="7"><br><br><center><a href="exec:gt ''exercise'', ''setup''">Define up to 5 automated exercise routines.</a></center></TD></TR>'
 	'</table></center>'
 	*nl
@@ -268,6 +290,7 @@ if $ARGS[0] = 'matrix':
 	if skak > 0 and $loc ! 'meadow': gs 'exercise', 'matrixdata', 2, 'Jump rope'
 	if bookYog > 0: gs 'exercise', 'matrixdata', 3, 'Yoga'
 	if obruch > 0 and $loc ! 'meadow': gs 'exercise', 'matrixdata', 4, 'Hula hoop'
+	gs 'exercise', 'matrixdata', 5, 'Squats'
 
 	'</center></table>'
 	*nl
@@ -332,6 +355,28 @@ if $ARGS[0] = 'matrixdata':
 	exer_stam[i] = exer_stam0[i] + exer_stam1[i] + exer_stam2[i] + exer_stam3[i] + exer_stam4[i]
 end
 
+if $ARGS[0] = 'butt':
+	cla
+	*clr
+	gs 'exercise', 'tier2', (15*timemult), 'stren', 'butt_tr'
+	timemult = 0
+
+	if $clothingworntype ! 'nude':
+		'<center><img <<$set_imgh>> src="images/pc/activities/excercises/butt_home_dressed.jpg"></center>'
+	elseif $pantyworntype ! 'none':
+		'<center><img <<$set_imgh>> src="images/pc/activities/exercises/butt_home_underwear.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/pc/activities/exercises/butt_home_nude.jpg"></center>'
+	end
+	'You do squats for <<$timestring>> minutes, strengthening your thighs and scupting your butt.'
+	gs 'stat'
+	if exer_auto = 1:
+		act 'Continue': gt 'exercise', 'auto_end'
+	else
+		act 'Continue': gt 'exercise', 'manual'
+	end
+end
+
 if $ARGS[0] = 'hula':
 	cla
 	*clr
@@ -355,7 +400,7 @@ if $ARGS[0] = 'hula':
 	'You improve your dexterity by using your hula hoop for <<$timestring>> minutes.'
 	gs 'stat'
 	if exer_auto = 1:
-		act 'Continue': gt 'exercise', 'auto_end'
+		act 'Continue': gt 'exercise', 'auto5'
 	else
 		act 'Continue': gt 'exercise', 'manual'
 	end
@@ -493,7 +538,7 @@ if $ARGS[0] = 'tier1':
 	mcnt = 0
 	:timeexploop1
 	if $ARGS[3] = '':
-		gs 'exp_gain', $ARGS[2], 1
+		gs 'exp_gain', $ARGS[2], 1, steroid_dose
 		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
 			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
@@ -502,7 +547,7 @@ if $ARGS[0] = 'tier1':
 		i = 2
 		:exploop1
 		if $ARGS[i] ! '':
-			gs 'exp_gain', $ARGS[i], rand(0,1)
+			gs 'exp_gain', $ARGS[i], rand(0,1), steroid_dose
 			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
 				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
 				steroidcheck = 1
@@ -541,7 +586,7 @@ if $ARGS[0] = 'tier2':
 	mcnt = 0
 	:timeexploop2
 	if $ARGS[3] = '':
-		gs 'exp_gain', $ARGS[2], rand(2,3)
+		gs 'exp_gain', $ARGS[2], rand(2,3), steroid_dose
 		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
 			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
@@ -550,7 +595,7 @@ if $ARGS[0] = 'tier2':
 		i = 2
 		:exploop2
 		if $ARGS[i] ! '':
-			gs 'exp_gain', $ARGS[i], rand(1,2)
+			gs 'exp_gain', $ARGS[i], rand(1,2), steroid_dose
 			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
 				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
 				steroidcheck = 1
@@ -589,7 +634,7 @@ if $ARGS[0] = 'tier3':
 	mcnt = 0
 	:timeexploop3
 	if $ARGS[3] = '':
-		gs 'exp_gain', $ARGS[2], rand(3,5)
+		gs 'exp_gain', $ARGS[2], rand(3,5), steroid_dose
 		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
 			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
@@ -598,7 +643,7 @@ if $ARGS[0] = 'tier3':
 		i = 2
 		:exploop3
 		if $ARGS[i] ! '':
-			gs 'exp_gain', $ARGS[i], rand(2,3)
+			gs 'exp_gain', $ARGS[i], rand(2,3), steroid_dose
 			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
 				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
 				steroidcheck = 1
@@ -637,7 +682,7 @@ if $ARGS[0] = 'tier4':
 	mcnt = 0
 	:timeexploop4
 	if $ARGS[3] = '':
-		gs 'exp_gain', $ARGS[2], rand(7,10)
+		gs 'exp_gain', $ARGS[2], rand(7,10), steroid_dose
 		if $ARGS[2] = 'vital' or $ARGS[2] = 'stren':
 			gs 'exp_gain', $ARGS[2], rand(0,steroid_dose)
 			if steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1)
@@ -646,7 +691,7 @@ if $ARGS[0] = 'tier4':
 		i = 2
 		:exploop4
 		if $ARGS[i] ! '':
-			gs 'exp_gain', $ARGS[i], rand(3,5)
+			gs 'exp_gain', $ARGS[i], rand(3,5), steroid_dose
 			if $ARGS[i] = 'vital' or $ARGS[i] = 'stren': 
 				gs 'exp_gain', $ARGS[i], rand(0,steroid_dose)
 				steroidcheck = 1

+ 13 - 9
locations/exp_gain.qsrc

@@ -5,16 +5,20 @@
 
 !Modify exp gain if Sveta does not get enough sleep.
 if ARGS[1] > 0:
-	if pcs_condition['lack_of_sleep'] >= 20:
-		dynamic "<<$ARGS[0]>>_exp += <<ARGS[1]>>/4"
-	elseif pcs_condition['lack_of_sleep'] >= 10:
-		dynamic "<<$ARGS[0]>>_exp += <<ARGS[1]>>/2"
-	elseif pcs_condition['lack_of_sleep'] >= 5:
-		dynamic "<<$ARGS[0]>>_exp += (<<ARGS[1]>>*3)/4"
-	elseif pcs_condition['lack_of_sleep'] >= 2 and ARGS[1] > 1:
-		dynamic "<<$ARGS[0]>>_exp += (<<ARGS[1]>>*9)/10"
+	if $ARGS[0] = 'stren_plus' and ARGS[2] = 0 and stren_plus_lvl > 50:
+		!!This is so that exp only is awarded to additional strength if it is high when you use steroids
 	else
-		dynamic "<<$ARGS[0]>>_exp += <<ARGS[1]>>"
+		if pcs_condition['lack_of_sleep'] >= 20:
+			dynamic "<<$ARGS[0]>>_exp += <<ARGS[1]>>/4"
+		elseif pcs_condition['lack_of_sleep'] >= 10:
+			dynamic "<<$ARGS[0]>>_exp += <<ARGS[1]>>/2"
+		elseif pcs_condition['lack_of_sleep'] >= 5:
+			dynamic "<<$ARGS[0]>>_exp += (<<ARGS[1]>>*3)/4"
+		elseif pcs_condition['lack_of_sleep'] >= 2 and ARGS[1] > 1:
+			dynamic "<<$ARGS[0]>>_exp += (<<ARGS[1]>>*9)/10"
+		else
+			dynamic "<<$ARGS[0]>>_exp += <<ARGS[1]>>"
+		end
 	end
 end
 

+ 5 - 3
locations/fame.qsrc

@@ -593,9 +593,10 @@ if $ARGS[0] = 'calculate':
 
 	if dyneval('RESULT = fame[''pav_<<$ARGS[1]>>'']') < 0: dynamic 'fame[''pav_<<$ARGS[1]>>''] = 0'
 
+	if dyneval('RESULT = fame[''pav_<<$ARGS[1]>>'']') > 1200: dynamic 'fame[''pav_<<$ARGS[1]>>''] = 1200'
 
 	!!This calculates fame city.
-		if dyneval ('RESULT = fame[''city_<<$ARGS[1]>>_core'']') >= 1000:
+	if dyneval ('RESULT = fame[''city_<<$ARGS[1]>>_core'']') >= 1000:
 		dynamic 'fame[''city_<<$ARGS[1]>>''] = fame[''city_<<$ARGS[1]>>_core'']+ fame[''city_<<$ARGS[1]>>_local'']/1000'
 	else
 		dynamic 'fame[''city_<<$ARGS[1]>>''] = (1000*fame[''city_<<$ARGS[1]>>_core'']+ (1000-fame[''city_<<$ARGS[1]>>_core''])*fame[''city_<<$ARGS[1]>>_local''])/1000'
@@ -621,6 +622,7 @@ if $ARGS[0] = 'calculate':
 	
 	if dyneval('RESULT = fame[''city_<<$ARGS[1]>>'']') < 0: dynamic 'fame[''city_<<$ARGS[1]>>''] = 0'
 
+	if dyneval('RESULT = fame[''city_<<$ARGS[1]>>'']') > 1200: dynamic 'fame[''ctiy_<<$ARGS[1]>>''] = 1200'
 
 	!!This calculates fame in Old Town.
 	if dyneval ('RESULT = fame[''pushkin_<<$ARGS[1]>>_core'']') >= 1000:
@@ -649,8 +651,7 @@ if $ARGS[0] = 'calculate':
 	
 	if dyneval('RESULT = fame[''pushkin_<<$ARGS[1]>>'']') < 0: dynamic 'fame[''pushkin_<<$ARGS[1]>>''] = 0'
 
-
-
+	if dyneval('RESULT = fame[''pushkin_<<$ARGS[1]>>'']') > 1200: dynamic 'fame[''pushkin_<<$ARGS[1]>>''] = 1200'
 
 	!!This calculates fame in Gadukino.
 	if dyneval ('RESULT = fame[''village_<<$ARGS[1]>>_core'']') >= 1000:
@@ -679,6 +680,7 @@ if $ARGS[0] = 'calculate':
 
 	if dyneval('RESULT = fame[''village_<<$ARGS[1]>>'']') < 0: dynamic 'fame[''village_<<$ARGS[1]>>''] = 0'
 
+	if dyneval('RESULT = fame[''village_<<$ARGS[1]>>'']') > 1200: dynamic 'fame[''village_<<$ARGS[1]>>''] = 1200'
 
 
 	!!Next we calculate the fame in the large fame groups.

+ 76 - 74
locations/father.qsrc

@@ -52,7 +52,7 @@ if hcolfatherremember ! pcs_haircol:
         $texthcol = 'So you decided to become a blonde?'
     end
     
-    'Your stepfather does a doulbe take of you as he notices your hair. "Oh <<$pcs_nickname>>, I see you dyed your hair! <<$texthcol>>" It looks good on you. He takes one last look at your new hair and goes back to watching T.V.'
+    'Your stepfather does a double take of you as he notices your hair. "Oh <<$pcs_nickname>>, I see you dyed your hair! <<$texthcol>>" It looks good on you. He takes one last look at your new hair and goes back to watching T.V.'
     hcolfatherremember = pcs_haircol
 end
 
@@ -197,78 +197,80 @@ act 'Chat':
 end
 
 if (hour > 10 and week < 6) or week >= 6:
-    act 'Ask for money':
-        *clr & cla
-        minut += 5
-        gs 'stat'
-        '<center><b><font color="maroon">Your stepfather, Vladimir Mikhailovich Scriabin</font></b></center>'
-        '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-        'Your stepfather is sitting on the couch, watching some boring TV show. You sit down next to him.'
-        dynamic $fatherRep
-        act 'Move away':gt 'father'
-
-        if fatherPayDay = daystart:
-            'Trying your cutest face on your stepfather, you ask him for some money. He just shakes his head wearily: "No, <<$pcs_nickname>>. I''ve already given you some money today, don''t be greedy."'
-        else
-            if (npc_rel['A28'] <= 40 or (pcs_apprnc + (npc_rel['A28']/10)) <= 60) and TouchedByFather = 0:
-                'You ask your stepfather for some money, but he shakes his head in response: "I already gave my salary to your mother, go ask her."'
-            else
-                'You ask your stepfather for some money, but he shakes his head in response: "I already gave my salary to your mother, go ask her."'
-                if npc_rel['A28'] >= 40 and npc_rel['A28'] < 60 and fatherPayDay ! daystart:FatherMolest = rand(1,4)
-                if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80 and fatherPayDay ! daystart:FatherMolest = rand(1,2)
-                if npc_rel['A28'] >=80 and fatherPayDay ! daystart:FatherMolest = 1
-                if FatherMolest = 1:
-                    'While you''re talking with him, you notice your stepfather is in a good mood today. Perhaps you can persuade him...'
-                    act '"Oh please?"':
-                        cla
-						menu_off = 1
-                        minut += 5
-                        gs 'stat'
-                        pcs_horny += rand(1,5)
-                        '"Oh come on, please Daddy?" you beg him, batting your eyelids and trying to look as cute as possible.'
-                        if pcs_apprnc + (npc_rel['A28']/10) >= 200:
-                            fatherLust = 1
-                        elseif pcs_apprnc + (npc_rel['A28']/10) >= 120:
-                            fatherLust = rand(1,2)
-                        elseif pcs_apprnc + (npc_rel['A28']/10) >= 60:
-                            fatherLust = rand(1,4)
-                        else
-                            fatherLust = 2
-                        end
-
-                        if fatherLust >= 2:
-                            '"Sorry <<$pcs_nickname>>, like I said, I have no money. Go ask your mother."'
-                        else
-                            money += rand(200,300)
-                            gs 'exp_gain', 'persuas', rand(0,2)
-                            fatherPayDay = daystart
-                            gs 'stat'
-                            '"Oh, alright then. Just don''t tell your mother!" he says in a tired voice, keeping his eyes on the doorway as he gives you the money. You act genuinely happy as you take the money from him, giving him a kiss on the cheek as you go.'
-                        end
-
-                        act 'Move away':gt $loc, $loc_arg
-                    end
-
-                    if npc_sex['A28']!0:
-                        act 'Blackmail him':
-                            cla
+	if SchoolAtestat = 0:
+		act 'Ask for money':
+			*clr & cla
+			minut += 5
+			gs 'stat'
+			'<center><b><font color="maroon">Your stepfather, Vladimir Mikhailovich Scriabin</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
+			'Your stepfather is sitting on the couch, watching some boring TV show. You sit down next to him.'
+			dynamic $fatherRep
+			act 'Move away':gt 'father'
+
+			if fatherPayDay = daystart:
+				'Trying your cutest face on your stepfather, you ask him for some money. He just shakes his head wearily: "No, <<$pcs_nickname>>. I''ve already given you some money today, don''t be greedy."'
+			else
+				if (npc_rel['A28'] <= 40 or (pcs_apprnc + (npc_rel['A28']/10)) <= 60) and TouchedByFather = 0:
+					'You ask your stepfather for some money, but he shakes his head in response: "I already gave my salary to your mother, go ask her."'
+				else
+					'You ask your stepfather for some money, but he shakes his head in response: "I already gave my salary to your mother, go ask her."'
+					if npc_rel['A28'] >= 40 and npc_rel['A28'] < 60 and fatherPayDay ! daystart:FatherMolest = rand(1,4)
+					if npc_rel['A28'] >= 60 and npc_rel['A28'] < 80 and fatherPayDay ! daystart:FatherMolest = rand(1,2)
+					if npc_rel['A28'] >=80 and fatherPayDay ! daystart:FatherMolest = 1
+					if FatherMolest = 1:
+						'While you''re talking with him, you notice your stepfather is in a good mood today. Perhaps you can persuade him...'
+						act '"Oh please?"':
+							cla
 							menu_off = 1
-                            minut += 5
-                            money += rand(300,500)
-                            fatherPayDay = daystart
-                            gs 'stat'
-                            '"Aren''t you forgetting something?" you say in a serious voice, referring to your recent intimate moments with him.'
-                            'Your stepfather is clearly embarrassed by this, and surprised at you for bringing it up. He clears his throat loudly, and the following silence makes you feel slightly uncomfortable. Nevertheless, he reaches for his wallet.'
-                            '"Here you go, you leech! You know you shouldn''t be taking advantage of me like that! Here, take your money and get out of here. Just keep your mouth shut!" You nod and pocket the money, feeling slightly worse for blackmailing him for it.'
-                            act 'Move away':gt $loc, $loc_arg
-                        end
-                    end
-                end
-
-                if FatherMolest > 1:'"<<$pcs_nickname>>, I already said no."'
-            end
-        end
-    end
+							minut += 5
+							gs 'stat'
+							pcs_horny += rand(1,5)
+							'"Oh come on, please Daddy?" you beg him, batting your eyelids and trying to look as cute as possible.'
+							if pcs_apprnc + (npc_rel['A28']/10) >= 200:
+								fatherLust = 1
+							elseif pcs_apprnc + (npc_rel['A28']/10) >= 120:
+								fatherLust = rand(1,2)
+							elseif pcs_apprnc + (npc_rel['A28']/10) >= 60:
+								fatherLust = rand(1,4)
+							else
+								fatherLust = 2
+							end
+
+							if fatherLust >= 2:
+								'"Sorry <<$pcs_nickname>>, like I said, I have no money. Go ask your mother."'
+							else
+								money += rand(200,300)
+								gs 'exp_gain', 'persuas', rand(0,2)
+								fatherPayDay = daystart
+								gs 'stat'
+								'"Oh, alright then. Just don''t tell your mother!" he says in a tired voice, keeping his eyes on the doorway as he gives you the money. You act genuinely happy as you take the money from him, giving him a kiss on the cheek as you go.'
+							end
+
+							act 'Move away':gt $loc, $loc_arg
+						end
+
+						if npc_sex['A28']!0:
+							act 'Blackmail him':
+								cla
+								menu_off = 1
+								minut += 5
+								money += rand(300,500)
+								fatherPayDay = daystart
+								gs 'stat'
+								'"Aren''t you forgetting something?" you say in a serious voice, referring to your recent intimate moments with him.'
+								'Your stepfather is clearly embarrassed by this, and surprised at you for bringing it up. He clears his throat loudly, and the following silence makes you feel slightly uncomfortable. Nevertheless, he reaches for his wallet.'
+								'"Here you go, you leech! You know you shouldn''t be taking advantage of me like that! Here, take your money and get out of here. Just keep your mouth shut!" You nod and pocket the money, feeling slightly worse for blackmailing him for it.'
+								act 'Move away':gt $loc, $loc_arg
+							end
+						end
+					end
+
+					if FatherMolest > 1:'"<<$pcs_nickname>>, I already said no."'
+				end
+			end
+		end
+	end
 
     act 'Ask about him and your mother':
         *clr & cla
@@ -294,7 +296,7 @@ if (hour > 10 and week < 6) or week >= 6:
         act 'Move away':gt 'father'
     end
 
-    if motherKnowSpravka = 1 and npc_sex['A28']=0:
+    if motherKnowSpravka = 1 and npc_sex['A28']=0 and SchoolAtestat = 0:
         cla
 		menu_off = 1
         npc_rel['A28'] = 0
@@ -311,7 +313,7 @@ if (hour > 10 and week < 6) or week >= 6:
         'Your stepfather notices the sharp smell of booze on you and looks disappointed. "<<$pcs_nickname>>, you smell like alcohol, what are you getting yourself into? You''re too young to drink that!"'
     end
 
-    if TorgVokzalTimes>0 and YouCanGar = 0:
+    if TorgVokzalTimes>0 and YouCanGar = 0 and SchoolAtestat = 0:
         act 'Ask him permission to store things in his garage':
             *clr & cla
 			menu_off = 1

+ 7 - 18
locations/fertility.qsrc

@@ -47,32 +47,21 @@ if $ARGS[0] = 'birth_control':
 			pillcon2 -= 29000
 			if tabletkishot < 0: tabletkishot = 0
 		end
-		if shotdays = -8:
+		if shotdays < 2:
 			tabletkicheck = 0
-			shotdue = 0
-			if  birth_control['implant_status'] > 0:
-				'Your birth control shot is no longer protecting you.'
-			end
-		elseif shotdays <= 0:
-			if shotdays = 0:
-				shotdue = 7
-			else
-				shotdue -= 1
-			end
-			if  birth_control['implant_status'] > 0:
-				'The chemicals regulating your fertility cycle are wearing off, you need to get your shot in <<shotdue>> days.'
-			end
-		elseif shotdays > 1 and shotdays < 5 and birth_control['implant_status'] = 0:
+			'Your birth control shot is no longer protecting you.'
+		elseif shotdays < 10:
+			'Your birth control shot is past due for renewal. The chemicals regulating your fertility cycle are wearing off.'
+		elseif shotdays > 10 and shotdays < 14:
 			'You are due for a birth control shot soon if you do not get one, you might get pregnant.'
-		elseif shotdays = 1 and birth_control['implant_status'] = 0:
+		elseif shotdays = 10:
 			'Your birth control shot is due for renewal tomorrow.'
 		end
-
-		if shotdays > -100:shotdays -=1
 	end
 	!! dropped the decrement out of the above if-statement so that players on pill would still run out of BC shot
 	!! as in for example the case of the therapist forcing you on the pill while you already had the shot.
 	if tabletkishot > 0:tabletkishot -= 1
+	if shotdays > 0:shotdays -=1
 
 	!! birth_control['implant_status']
 	!! 0: No implant

+ 86 - 49
locations/fit.qsrc

@@ -1,12 +1,8 @@
 # fit
 
-CLOSE ALL
 if $ARGS[0] = 'start':
 	*clr & cla
-	$loc = 'fit'
-	$loc_arg = 'start'
-	$menu_loc = 'fit'
-	$menu_arg = 'start'
+	gs 'shortgs', 'setloc', 'fit', $ARGS[0]
 	killvar '$locclass'
 	menu_off = 0
 	minut += 5
@@ -41,12 +37,14 @@ if $ARGS[0] = 'start':
 	act 'Leave': killvar 'epayments' & minut += 5 & gt 'city_center'
 	
 	if abonement > 0:
-		act 'Go to the dressing room': gt 'fit', 'dressing room'
+		act 'Go to the dressing room': gt 'fit', 'dressing_room'
+
 	elseif money > 100:
 		act 'Use the pool (100 <b>₽</b>)':
 			money -= 100
 			gs 'stat'
-			gt 'fit', 'dressing room'
+			gt 'fit', 'dressing_room'
+
 		end
 	end
 
@@ -80,15 +78,10 @@ if $ARGS[0] = 'start':
 
 end
 
-if $ARGS[0] = 'dressing room':
-	$locM = 'fit'
-	$locM_arg = 'dressing room'
-	$sexloc = 'fit'
-	$loc = 'fit'
-	$loc_arg = 'dressing room'
-	$menu_loc = 'fit'
-	$menu_arg = 'dressing room'
+if $ARGS[0] = 'dressing_room':
+	gs 'shortgs', 'setloc', 'fit', $ARGS[0]
 	menu_off = 0
+	$sexloc = 'fit'
 	$location_type = 'private'
 	$locclass = 'changingroom'
 	*clr & cla
@@ -114,7 +107,8 @@ if $ARGS[0] = 'dressing room':
         else
             cla
             msg'<b><font color = red>You need to get dressed.</font></b>'
-            act 'Return': gt 'fit', 'dressing room'
+            act 'Return': gt 'fit', 'dressing_room'
+
         end
     end
 
@@ -133,7 +127,8 @@ if $ARGS[0] = 'dressing room':
 			'You go into the bathroom and turn on the shower. You lather your body and wash in the shower.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
-			act 'Get out of the shower':gt 'fit', 'dressing room'
+			act 'Get out of the shower':gt 'fit', 'dressing_room'
+
 		end
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
@@ -149,6 +144,8 @@ if $ARGS[0] = 'dressing room':
 		gt 'wardrobe', 'start'
 	end
 
+	gs 'wardrobe', 'default_sport_options'
+
 	if PCloswimwear = 1:
 		act 'Use the pool': gt 'bass', 'start'
 	else
@@ -181,7 +178,8 @@ if $ARGS[0] = 'dressing room':
 				begsec = 1
 				'You signed up for the track team.'
 
-				act 'Leave':gt 'fit', 'dressing room'
+				act 'Leave':gt 'fit', 'dressing_room'
+
 			end
 		elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= 40 and pcs_energy >= 20:
 			act 'Go to team practice':gt 'beg', 'start'
@@ -209,6 +207,7 @@ if $ARGS[0] = 'dressing room':
 			act 'Continue': menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
+	dynamic $tampon
 end
 
 if $ARGS[0] = 'fitgirl':
@@ -216,7 +215,7 @@ if $ARGS[0] = 'fitgirl':
 	'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/idle0.jpg"></center>'
 	'The girl notices you looking and returns the smile. She undresses and taking some toiletries goes into the shower.'
 
-	act 'Turn away':gt 'fit', 'dressing room'
+	act 'Turn away':gt 'fit', 'dressing_room'
 
 	act 'Follow her':
 		*clr & cla
@@ -229,7 +228,7 @@ if $ARGS[0] = 'fitgirl':
 		'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower0.jpg"></center>'
 		'There''s no one in the shower, except this girl. The girl looks around and seeing you smiles again then turns away.'
 
-		act 'Leave the shower':gt 'fit', 'dressing room'
+		act 'Leave the shower':gt 'fit', 'dressing_room'
 
 		gs 'willpower', 'misc', 'force'
 		if will_cost <= pcs_willpwr:
@@ -246,7 +245,8 @@ if $ARGS[0] = 'fitgirl':
 				if pcs_apprnc < 80:
 					'The girl pushes you off, and shouts something very rude about you and each and everyone of your relatives, you run out to the locker room.'
 
-					act 'Go':gt 'fit', 'dressing room'
+					act 'Go':gt 'fit', 'dressing_room'
+
 				elseif pcs_apprnc >= 80:
 					'The girl quickly turns around. She looks a little bit puzzled as she realizes that it was you who grabbed her. She probably expected to see a guy and isn''t sure what to do.'
 
@@ -272,7 +272,8 @@ if $ARGS[0] = 'fitgirl':
 							gs 'arousal', 'end'
 							'The girl smiles at you, but removes your hand and leaves, blowing you a kiss.'
 
-							act 'Continue':gt 'fit', 'dressing room'
+							act 'Continue':gt 'fit', 'dressing_room'
+
 						elseif pcs_apprnc >= 100:
 							cla
 							*clr
@@ -318,7 +319,8 @@ if $ARGS[0] = 'tanyaIntroduction':
 	'"Nope. You seduced me. I have never been with a girl before and I think I earned this as a memento." With these words, Tanya slips your panties in her pocket.'
 	'"My name is Tanya by the way. I live only a short distance from here with my parents. You might come over if you like. Usually I''m home in the late afternoon. We could continue were we left off." she winks at you and leaves.'
 	'<i>You can now visit Tanya at her parents home in the Downtown area once a day after 16:00.</i>'
-	act 'Back':gt 'fit', 'dressing room'
+	act 'Back':gt 'fit', 'dressing_room'
+
 end
 
 if $ARGS[0] = 'gym':
@@ -340,7 +342,7 @@ if $ARGS[0] = 'gym':
 		if hour >= 10 and hour < 12 and week = 7 and centr = 2 and ricewine < 2: 'In the hall you see <a href="exec:gt ''VolleyTrenCentr''">Guang</a>'
 	end
 
-	gs 'fit', 'exercise end'
+	gs 'fit', 'exercise_end'
 
 	if pcs_energy >= 15:
 		act 'Aerobics (Burn fat)':
@@ -351,31 +353,67 @@ if $ARGS[0] = 'gym':
 			fat -= rand(0,4)
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
 
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit11.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/excercises/gym/fit11.jpg"></center>'
 			'You do very vigorous exercises to the music, and burn some fat.'
 
 			if pcs_stam < 30:
 				*nl
 				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-				gs 'fit', 'exercise end'
+				gs 'fit', 'exercise_end'
 			else
 				act'Continue': gt 'fit', 'gym'
 			end
 		end
 
-		act 'Free weights (Build muscle)':
+		act 'Light weights (Build strength)':
 			cla
 			*clr
 			abonement -= 1
 			gs 'exercise', 'tier3', 30, 'stren'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit2.jpg"></center>'
-			'You pump iron, building strength.'
+			'<center><img <<$set_imgh>> src="images/pc/activities/excercises/gym/fit2.jpg"></center>'
+			'You pump dumbells doing reps at fairly low total weight, building strength.'
+
+			if pcs_stam < 30:
+				*nl
+				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
+				gs 'fit', 'exercise_end'
+			else
+				act'Continue': gt 'fit', 'gym'
+			end
+		end
+
+		act 'Heavy weights (Build muscle <font color=red>This can lead to extreme strength at a cost to appearance</font>)':
+			cla
+			*clr
+			abonement -= 1
+			gs 'exercise', 'tier3', 30, 'stren_plus'
+			if pcs_inhib < 30:inhib_exp += rand(1,2)
+			'<center><img <<$set_imgh>> src="images/pc/activities/excercises/gym/fit6.jpg"></center>'
+			'You pump the heavy weights doing low reps with high total weight, building muscle.'
 
 			if pcs_stam < 30:
 				*nl
 				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-				gs 'fit', 'exercise end'
+				gs 'fit', 'exercise_end'
+			else
+				act'Continue': gt 'fit', 'gym'
+			end
+		end
+
+		act 'Squats (Tone your butt)':
+			cla
+			*clr
+			abonement -= 1
+			gs 'exercise', 'tier2', 30, 'stren', 'butt_tr'
+			if pcs_inhib < 30:inhib_exp += rand(1,2)
+			'<center><img <<$set_imgh>> src="images/pc/activities/excercises/butt_gym.jpg"></center>'
+			'You do various squats to tone your thighs and glutes, it also helps with building strength.'
+
+			if pcs_stam < 30:
+				*nl
+				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
+				gs 'fit', 'exercise_end'
 			else
 				act'Continue': gt 'fit', 'gym'
 			end
@@ -386,13 +424,13 @@ if $ARGS[0] = 'gym':
 			abonement -= 1
 			gs 'exercise', 'tier3', 30, 'vital'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit3.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/excercises/gym/fit3.jpg"></center>'
 			'You spend a half hour doing reps on the cross trainer developing your endurance.'
 
 			if pcs_stam < 30:
 				*nl
 				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-				gs 'fit', 'exercise end'
+				gs 'fit', 'exercise_end'
 			else
 				act'Continue': gt 'fit', 'gym'
 			end
@@ -404,13 +442,13 @@ if $ARGS[0] = 'gym':
 			abonement -= 1
 			gs 'exercise', 'tier3', 30, 'agil'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/excercises/gym/fit4.jpg"></center>'
 			'You run tennis exercises, concentrating on defensive drills.'
 
 			if pcs_stam < 30:
 				*nl
 				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-				gs 'fit', 'exercise end'
+				gs 'fit', 'exercise_end'
 			else
 				act'Continue': gt 'fit', 'gym'
 			end
@@ -422,13 +460,13 @@ if $ARGS[0] = 'gym':
 			abonement -= 1
 			gs 'exercise', 'tier3', 30, 'react'
 			if pcs_inhib < 30:inhib_exp += rand(1,2)
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit4.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/pc/activities/excercises/gym/fit4.jpg"></center>'
 			'You run tennis exercises, concentrating on court reactions.'
 
 			if pcs_stam < 30:
 				*nl
 				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-				gs 'fit', 'exercise end'
+				gs 'fit', 'exercise_end'
 			else
 				act'Continue': gt 'fit', 'gym'
 			end
@@ -444,7 +482,7 @@ if $ARGS[0] = 'gym':
 	end
 end
 
-if $ARGS[0] = 'exercise end':
+if $ARGS[0] = 'exercise_end':
 	menu_off = 1
 	RESULT = rand(0, 19)
 
@@ -455,7 +493,8 @@ if $ARGS[0] = 'exercise end':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/sex/zal1.jpg"></center>'
 			'You see a nice guy on the weight machine.'
 
-			act 'Continue':gt 'fit', 'dressing room'
+			act 'Continue':gt 'fit', 'dressing_room'
+
 			act 'Flirt':
 				cla
 				*clr
@@ -483,8 +522,8 @@ if $ARGS[0] = 'exercise end':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					gt 'fit', 'dressing room'
-					
+					gt 'fit', 'dressing_room'
+
 					'Event text'
 					
 					act 'Next action': gt 'farawayistan'
@@ -512,7 +551,7 @@ if $ARGS[0] = 'exercise end':
 			cla
 			'As you finish training, a fit girl offers to play a little squash with her as she waits for her boyfriend to came.'
 
-			act 'Refuse':gt 'fit', 'dressing room'
+			act 'Refuse':gt 'fit', 'dressing_room'
 
 			act 'Agree':
 				cla
@@ -523,8 +562,7 @@ if $ARGS[0] = 'exercise end':
 				'He stands just behind you and puts one hand on your hand, guiding your racket and showing you how to strike the ball. The other hand starts stroking your hips gradually approaching your crotch.'
 				'You feel his cock resting against your back and looking at the girl, you know that she understands what is going on and that the man is her boyfriend.'
 
-				act 'Escape from these perverts':gt 'fit', 'dressing room'
-
+				act 'Escape from these perverts':gt 'fit', 'dressing_room'
 				act 'Enjoy':
 					guy += 1
 					girl += 1
@@ -541,7 +579,7 @@ if $ARGS[0] = 'exercise end':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/sex/zal6.jpg"></center>'
 			'You train near to a girl and engage in conversation, two guys obviously take you for girlfriends and try to chat you up.'
 
-			act 'Continue':gt 'fit', 'dressing room'
+			act 'Continue':gt 'fit', 'dressing_room'
 
 			act 'Flirt back':
 				cla
@@ -550,8 +588,7 @@ if $ARGS[0] = 'exercise end':
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/sex/zal7.jpg"></center>'
 				'You flirt with a guy, and notice that he is getting very excited and constantly glancing behind you. Turning, you see that the girl is already on her haunches and sucking the second guy with gusto.'
 
-				act 'Leave':gt 'fit', 'dressing room'
-
+				act 'Leave':gt 'fit', 'dressing_room'
 				act 'Suck':
 					guy += 2
 					girl += 1
@@ -567,7 +604,7 @@ if $ARGS[0] = 'exercise end':
 				end
 			end
 		else
-			gt 'fit', 'dressing room'
+			gt 'fit', 'dressing_room'
 		end
 	end
 end
@@ -587,7 +624,7 @@ if $ARGS[0] = 'kickboxing':
 	'Around it there are various punching bags of different sizes and weights and a couple of coaches with practice pads.'
 	'You can try your luck in a fight here on Saturdays but safety concerns limit everyone to a maximum of 1 bout per week.'
 
-	act 'Return to dressing room': gt 'fit', 'dressing room'
+	act 'Return to dressing room': gt 'fit', 'dressing_room'
 
 	act 'Work on your jabs':
 		cla
@@ -637,7 +674,7 @@ if $ARGS[0] = 'kickboxing':
 		act 'Leave':gt 'fit', 'kickboxing'
 	end
 
-	act 'Sparing (training bout in the ring)':
+	act 'Sparring (training bout in the ring)':
 		cla
 		*clr
 		'You need to choose a partner for sparring'

+ 121 - 0
locations/food.qsrc

@@ -1050,5 +1050,126 @@ if $ARGS[0] = 'only_stats_healthy_meal':
 	pcs_breath = 0
 end
 
+if $ARGS[0] = 'only_cost_pirosh':
+	*clr & cla
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += pcs_health/10
+	pcs_mood += 5
+	fat += 4
+	pcs_energy += 40
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_golub':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 5
+	fat += 8
+	pcs_energy += 60
+	if pcs_hydra >= 100:
+		pcs_hydra += 10
+	else
+		pcs_hydra += 20
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_pozhar':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 15
+	pcs_mood += 10
+	fat += 6
+	pcs_energy += 70
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_reuben':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 20
+	pcs_mood += 25
+	fat += 12
+	pcs_energy += 110
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_bliny':
+	frost = 0
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 5
+	fat += 8
+	pcs_energy += 50
+	if pcs_hydra >= 100:
+		pcs_hydra -= 5
+	else
+		pcs_hydra -= 10
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	killvar '$_eat'
+	if $loc = 'uni_cafe': uni_lunch_bought = 1
+	
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
 --- food ---------------------------------
 

+ 83 - 11
locations/food_menu.qsrc

@@ -441,38 +441,38 @@ elseif $loc = 'uni_cafe':
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
 	$_eat['0,name'] = 'Vegetarian Piroshki'
-	$_eat['0,type'] = 'pirosh'
+	$_eat['0,type'] = 'only_cost_pirosh'
 	$_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
-	$_eat['1,type'] = 'bliny'
+	$_eat['1,type'] = 'only_cost_bliny'
 	$_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
-	$_eat['2,type'] = 'golub'
+	$_eat['2,type'] = 'only_cost_golub'
 	$_eat['2,price'] = 210
 	$_eat['3,name'] = 'Pozharsky Cutlets'
-	$_eat['3,type'] = 'pozhar'
+	$_eat['3,type'] = 'only_cost_pozhar'
 	$_eat['3,price'] = 290
 	$_eat['4,name'] = 'Rueben Sandwich'
-	$_eat['4,type'] = 'reuben'
+	$_eat['4,type'] = 'only_cost_reuben'
 	$_eat['4,price'] = 340
 
 	$_drink['0,name'] = 'Water'
-	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,type'] = 'only_cost_wat'
 	$_drink['0,price'] = 'Free'
 	$_drink['1,name'] = 'Kvass'
-	$_drink['1,type'] = 'bev_kva'
+	$_drink['1,type'] = 'only_cost_kva'
 	$_drink['1,price'] = 60
 	$_drink['2,name'] = 'Juice'
-	$_drink['2,type'] = 'bev_jui'
+	$_drink['2,type'] = 'only_cost_jui'
 	$_drink['2,price'] = 80
 	$_drink['3,name'] = 'Spiced Tea'
-	$_drink['3,type'] = 'bev_tea'
+	$_drink['0,type'] = 'only_cost_tea'
 	$_drink['3,price'] = 120
 	$_drink['4,name'] = 'Black Coffee'
-	$_drink['4,type'] = 'bev_cof'
+	$_drink['2,type'] = 'only_cost_bco'
 	$_drink['4,price'] = 130
 	$_drink['5,name'] = 'Milkshake'
-	$_drink['5,type'] = 'bev_mil'
+	$_drink['5,type'] = 'only_cost_mil'
 	$_drink['5,price'] = 200
 elseif $loc = 'city_coffee_hole':
 	$loc_arg = 'eat'
@@ -525,6 +525,78 @@ elseif $loc = 'city_coffee_hole':
 	$_drink['5,name'] = 'Iced Latte'
 	$_drink['5,type'] = 'only_cost_cof'
 	$_drink['5,price'] = 150
+elseif $loc = 'city_nightclub':
+	'<center><b><font color="maroon">Bar "Nightclub"</font></b></center>'
+	*nl
+	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
+	$_eat['0,name'] = 'Toasted rye snacks'
+	$_eat['0,type'] = 'ryesna'
+	$_eat['0,price'] = 30
+
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Energy Drink'
+	$_drink['1,type'] = 'bev_energy_drink'
+	$_drink['1,price'] = 60
+	$_drink['2,name'] = 'Beer on tap'
+	$_drink['2,type'] = 'bev_bee'
+	$_drink['2,price'] = 60
+	$_drink['3,name'] = 'Vodka'
+	$_drink['3,type'] = 'bev_vod'
+	$_drink['3,price'] = 120
+	$_drink['4,name'] = 'Scotch'
+	$_drink['4,type'] = 'bev_sco'
+	$_drink['4,price'] = 140
+	$_drink['5,name'] = 'Glass of Wine'
+	$_drink['5,type'] = 'bev_win'
+	$_drink['5,price'] = 160
+	$_drink['6,name'] = 'Black Russian'
+	$_drink['6,type'] = 'bev_bla'
+	$_drink['6,price'] = 250
+	$_drink['7,name'] = 'Champagne'
+	$_drink['7,type'] = 'bev_cha'
+	$_drink['7,price'] = 220
+	$_drink['8,name'] = 'Vodka Martini'
+	$_drink['8,type'] = 'bev_mar'
+	$_drink['8,price'] = 250
+	$_drink['9,name'] = 'Fancy cocktail'
+	$_drink['9,type'] = 'bev_cocktail'
+	$_drink['9,price'] = 300
+elseif $loc = 'katja_nightclub':
+	'<center><b><font color="maroon">Bar "Nightclub"</font></b></center>'
+	*nl
+	'<center><img <<$set_imgh>> src="images/shared/drinks/bardrinks.jpg"</center><br>'
+	$_drink['0,name'] = 'Water'
+	$_drink['0,type'] = 'only_cost_bev_wat'
+	$_drink['0,price'] = 'Free'
+	$_drink['1,name'] = 'Energy Drink'
+	$_drink['1,type'] = 'only_cost_bev_energy_drink'
+	$_drink['1,price'] = 60
+	$_drink['2,name'] = 'Beer on tap'
+	$_drink['2,type'] = 'only_cost_bev_bee'
+	$_drink['2,price'] = 60
+	$_drink['3,name'] = 'Vodka'
+	$_drink['3,type'] = 'only_cost_bev_vod'
+	$_drink['3,price'] = 120
+	$_drink['4,name'] = 'Scotch'
+	$_drink['4,type'] = 'only_cost_bev_sco'
+	$_drink['4,price'] = 140
+	$_drink['5,name'] = 'Glass of Wine'
+	$_drink['5,type'] = 'only_cost_bev_win'
+	$_drink['5,price'] = 160
+	$_drink['6,name'] = 'Black Russian'
+	$_drink['6,type'] = 'only_cost_bev_bla'
+	$_drink['6,price'] = 250
+	$_drink['7,name'] = 'Champagne'
+	$_drink['7,type'] = 'only_cost_bev_cha'
+	$_drink['7,price'] = 220
+	$_drink['8,name'] = 'Vodka Martini'
+	$_drink['8,type'] = 'only_cost_bev_mar'
+	$_drink['8,price'] = 250
+	$_drink['9,name'] = 'Fancy cocktail'
+	$_drink['9,type'] = 'only_cost_bev_cocktail'
+	$_drink['9,price'] = 300
 end
 
 $_str = '<center><table border="0" width="800" cellpadding="0" cellspacing="1">'

+ 11 - 11
locations/foto_albums.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'sveta':
 	'You open up the first album and browse through some of the pictures placed inside.'
 	'"These are pictures of me!'
 	act 'Go back': gt 'foto_albums', 'model_portraits'
-	act 'Presenting: <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>':
+	act 'Presenting: <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>':
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/sveta_l/1.jpg"></center>'
 		act 'Waiting For You':
@@ -418,7 +418,7 @@ if $ARGS[0] = 'sveta_10':
 	'<a href="exec:gt ''foto_albums'',''mila''">7. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">8. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">9. Anushka K.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">10. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">10. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	act'Move away':gt'foto','studio'
 end	
 	
@@ -434,7 +434,7 @@ if $ARGS[0] = 'sveta_9':
 	'<a href="exec:gt ''foto_albums'',''lily''">6. Lily I.</a>'
 	'<a href="exec:gt ''foto_albums'',''mila''">7. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">8. Mari E.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">9. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">9. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
 	
 	act'Move away':gt'foto','studio'
@@ -452,7 +452,7 @@ if $ARGS[0] = 'sveta_8':
 	'<a href="exec:gt ''foto_albums'',''miranda''">5. Miranda K.</a>'
 	'<a href="exec:gt ''foto_albums'',''lily''">6. Lily I.</a>'
 	'<a href="exec:gt ''foto_albums'',''mila''">7. Mila A.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">8. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">8. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
 	act'Move away':gt'foto','studio'
@@ -468,7 +468,7 @@ if $ARGS[0] = 'sveta_7':
 	'<a href="exec:gt ''foto_albums'',''jeff''">4. Jeff M.</a>'
 	'<a href="exec:gt ''foto_albums'',''miranda''">5. Miranda K.</a>'
 	'<a href="exec:gt ''foto_albums'',''lily''">6. Lily I.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">7. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">7. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
@@ -484,7 +484,7 @@ if $ARGS[0] = 'sveta_6':
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
 	'<a href="exec:gt ''foto_albums'',''jeff''">4. Jeff M.</a>'
 	'<a href="exec:gt ''foto_albums'',''miranda''">5. Miranda K.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">6. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">6. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''lily''">7. Lily I.</a>'
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
@@ -500,7 +500,7 @@ if $ARGS[0] = 'sveta_5':
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
 	'<a href="exec:gt ''foto_albums'',''jeff''">4. Jeff M.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">5. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">5. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''miranda''">6. Miranda K.</a>'
 	'<a href="exec:gt ''foto_albums'',''lily''">7. Lily I.</a>'
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
@@ -516,7 +516,7 @@ if $ARGS[0] = 'sveta_4':
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">3. Emily R.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">4. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">4. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''jeff''">5. Jeff M.</a>'
 	'<a href="exec:gt ''foto_albums'',''miranda''">6. Miranda K.</a>'
 	'<a href="exec:gt ''foto_albums'',''lily''">7. Lily I.</a>'
@@ -532,7 +532,7 @@ if $ARGS[0] = 'sveta_3':
 	'Here is the shelf that has the albums of the top 10 models. As you read from left to right, you see that your name is now third. You finally took Emily''s spot! She isn''t very happy about it, but who cares? You''ve broken the barrier into being famous!'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">3. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">3. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">4. Emily R.</a>'
 	'<a href="exec:gt ''foto_albums'',''jeff''">5. Jeff M.</a>'
 	'<a href="exec:gt ''foto_albums'',''miranda''">6. Miranda K.</a>'
@@ -549,7 +549,7 @@ if $ARGS[0] = 'sveta_2':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
 	'Here is the shelf that has the albums of the top 10 models. You look and you see your name is second, right before Anastasia''s. Are you really this close? Could you take the number one spot all for yourself?'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
-	'<a href="exec:gt ''foto_albums'',''sveta''">2. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">2. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">3. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">4. Emily R.</a>'
 	'<a href="exec:gt ''foto_albums'',''jeff''">5. Jeff M.</a>'
@@ -568,7 +568,7 @@ if $ARGS[0] = 'sveta_1':
 	
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
 	'Here is the shelf that has the albums of the top 10 models. You finally did it! Listed at the very front of all of the albums is your name. Women wish they were you, men want to fuck you, and you''re likely to start getting offers in other parts of the entertainment industry. You''re the top model!'
-	'<a href="exec:gt ''foto_albums'',''sveta''">1. <<$pcs_firstname>> <<mid($pcs_lastname,1,1)>>.</a>'
+	'<a href="exec:gt ''foto_albums'',''sveta''">1. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">2. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">3. Katherine A.</a>'
 	'<a href="exec:gt ''foto_albums'',''emily''">4. Emily R.</a>'

+ 2 - 2
locations/foto_events.qsrc

@@ -1010,8 +1010,8 @@ if $ARGS[0] = 'list':
 	if specialjob4 > 95:'<a href="exec:gt ''foto_events'',''aphrodite_advert''">	Aphrodite Advert</a>'
 	if specialjob5 > 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
 	if specialjob6 > 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
-	if specialjob7 > 95 and city_kickboxing >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events2'',''kickboxing_documentary''">   Kickboxing documentary</a>'
-    if specialjob8 > 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8:'<a href="exec:gt ''foto_events2'',''track_&_field_documentary''">   Track & Field documentary</a>'
+	if specialjob7 > 95 and fame['city_kickboxing'] >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events2'',''kickboxing_documentary''">   Kickboxing documentary</a>'
+    if specialjob8 > 95 and fame['city_running'] >=30 and pcs_inhib >= 50 and month >= 3 and month <=8:'<a href="exec:gt ''foto_events2'',''track_&_field_documentary''">   Track & Field documentary</a>'
 !!		if specialjob9 >= 95:'<a href="exec:gt ''foto_events'',''model_portraits''">photo albums</a>'
 !!	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''documentary''">	Documentary</a>'
 end

+ 1 - 1
locations/foto_nude_debut.qsrc

@@ -148,7 +148,7 @@ if $ARGS[0] = 'nude_debut1':
 	else
 		'The crew move to prepare the set.'
 		*nl
-		'This is your modelling shoot ever but no one seems surprised or even find it remarkable that you''re jumping straight into it. It seems to them that you''re just one of the many desperate girls who come into the studio, willing to bare it all for easy money.'
+		'This is your first modelling shoot ever but no one seems surprised or even find it remarkable that you''re jumping straight into it. It seems to them that you''re just one of the many desperate girls who come into the studio, willing to bare it all for easy money.'
 	end
 	gs'foto_nude_debut', 'nude_debut2'
 end

+ 1 - 1
locations/foto_shoot.qsrc

@@ -653,7 +653,7 @@ if $ARGS[0] = 'transparent':
 	minut += 120
 	modelpayfin = 600 + (modelpay) + (pcs_apprnc) + (15*rand(0,5))
 	modelfoto['glamour'] += 1
-	modelfoto['sexy'] 
+	modelfoto['sexy'] +=1
 	modelfoto['transparent'] += 1
 	modelfoto['nip'] += 1
 	gs 'exp_gain', 'mdlng', rand(6,10)

+ 2 - 0
locations/gdksport.qsrc

@@ -64,6 +64,8 @@ if $ARGS[0] = 'start':
 		gt 'wardrobe', 'start'
 	end
 
+	gs 'wardrobe', 'default_sport_options'
+
 	if shampoo > 0 or (mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0)):
 		act 'Take a shower': gt 'gdksport', 'shower'
 	else

+ 3 - 0
locations/gopskver.qsrc

@@ -270,6 +270,9 @@ if $ARGS[0] = '':
 					act 'Drink beer with the guys':
 						*clr & cla
 						minut += 15
+						npc_rel['A9'] += 1
+						npc_rel['A10'] += 1
+						npc_rel['A11'] += 1
 						gs 'drugs', 'alcohol', 'beer'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'

+ 4 - 0
locations/gschool_chats.qsrc

@@ -143,6 +143,10 @@ if $ARGS[0] = 'gopniks':
 				else
 					'You head to the stairwell that the gopniks like to gather in and find them leaning against the wall or sitting on the stairs engaged in a variety of conversations.'
 				end
+				if CloStyle = 2:
+					grupvalue[4] += 5
+					'There are some nods of approval and positive comments made about your rebelious uniform style.'
+				end
 				'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
 				gs 'gschool_groups', 'gopniks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'

+ 26 - 20
locations/gschool_cheerleading.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'tryouts':
 		'Albina and the other girls grow silent and just stare at you as you enter. You feel very awkward and self-concious as Albina walks up to you with a puzzled glare. "What are <i>you</i> doing here?"'
 		'Christina laughs as she walks up to you. "Oh my god, does this '+iif(hotcat < 6,'hidious hag','social reject')+' actually think she can become a cheerleader? Everyone would be too busy laughing to focus on the game!"'
 		'"It''s best if you just leave. Nobody wants you hanging around making things awkward," Albina says.' 
-		'"You better hope that I''m still too busy laughing at your dumb ass that I forget to punish you for embarrassing me." Christina adds.'
+		'"You better hope that I''m still too busy laughing at your dumb ass that I forget to punish you for embarrassing me," Christina adds.'
 		'It''s clear that you''re not wanted here and all the girls present are pointing and laughing at you as Albina just shakes her head dismissively. Tears well up in your eyes as you run out the door, the vicious sound of mocking laughter following you down the corrider.'
 		act 'Flee': gt 'gschool_grounds', 'main'
 	elseif grupTipe = 4:
@@ -158,22 +158,14 @@ if $ARGS[0] = 'tryouts':
 			!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
 			gs 'exercise', 'tier2', 30, 'agil', 'vital', 'cheer', 'cheer', 'danc'
 			!! Success calculation - Contributing factors: social group, cool kids standing, Albina friendship, agility, endurance, dance skill, natural cheerleading talent
-			!!  New game character comparison:
 			!!  Cool kids would just about pass								~250 (100 cool + 55 friendship + 30 agi + 30 end + 20 dance + 15 talent)
 			!!  Any jock start would easily pass (especially dancers)		~280+(100 jock + 30 friendship + 50 agi + 50 end + 25 dance + 25 talent)
 			!!  Nerds would need a lot of work 								~112 (0 rep + 20 friendship + 30 agi + 30 end + 15 dance + 15 talent)
-			!!  Gopniks suffer from bias and stand little chance			~-20 (-125 rep + 0 friendship + 35 agi + 35 end + 17 dance + 17 talent)
-			!!  Outcasts stand no chance									~-90 (-200 outcast + 20 friendship + 30 agi + 30 end + 15 dance + 15 talent)
 			cheerleadingQW['try_physical'] = pcs_agil + pcs_vital + pcs_danc + pcs_cheer
 			cheerleadingQW['try_social'] = npc_rel['A23']
 			if grupTipe = 1 or grupTipe = 2:
 				cheerleadingQW['try_social'] += 100
-			elseif grupTipe = 5:
-				cheerleadingQW['try_social'] -= 200
-			elseif grupTipe = 4:
-				cheerleadingQW['try_social'] -= 150
 			else
-				!! If not jock or cool kid, adds half of your rep with Albina''s group
 				cheerleadingQW['try_social'] += grupvalue[npc_grupTipe['A23']]/2
 			end
 
@@ -285,6 +277,7 @@ if $ARGS[0] = 'afterschool_game':
 		act 'Skip the game (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	
+	act 'Quit the cheerleading squad': gt 'gschool_cheerleading', 'quit'
 end
 
 if $ARGS[0] = 'practice':
@@ -629,7 +622,7 @@ if $ARGS[0] = 'shower':
 				end
 			end
 		
-		elseif rand(0,4) = 0 and cheerleadingQW['practice_count'] <= 3 and (christinaQW['blackmail'] = 0 or christinaQW['fight'] ! 1):
+		elseif rand(0,4) = 0 and cheerleadingQW['practice_count'] <= 3 and christinaQW['blackmail'] = 0 and christinaQW['fight'] ! 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/christina_ambush.jpg"></center>'
 			'The locker room is quiet as you enter and head to your locker, but panic when you can''t find your '+iif(cheerleadingQW['quest_stage'] = 3,'cheerleading uniform','clothes')+' inside. "Looking for something?"'
 			'Before you can react to the voice, your towel is ripped away from you. You turn to see a naked Christina sitting on the bench with your '+iif(cheerleadingQW['quest_stage'] = 3,'uniform in her hand','clothes in a crumpled pile at her feet')+', smiling at you mockingly.'
@@ -1193,17 +1186,30 @@ if $ARGS[0] = 'quit':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/changing.jpg"></center>'
 	'You enter the locker room and look around for Albina, spotting her as she finishes getting ready. You walk over to her and she gives you a puzzled stare. "Hurry up and get dressed <<$pcs_nickname>>, we haven''t got all day to wait for you!" she barks. You meekly smile at her in response. "Well? Hurry up and spit it out." she says while motioning for you to hurry up.'
-	'"I... I don''t want to be a part of this anymore. I''ve thought it over and this just isn''t for me."' 
-	*nl
-	if cheerleadingQW['quest_stage'] = 2:
-		'Albina just rolls her eyes at you. "Whatever <<$pcs_firstname>>. I don''t really care if you want to be here or not. I have <i>actual</i> cheerleaders to lead, so if you want to go, then fuck off and don''t come back." She then pushes you aside and walks out of the room. The other girls then follow her out, leaving you alone.'
-	else
-		'Albina gives you an even bigger puzzled stare. "What? Why? Never mind. If you want to leave, then I won''t stop you. Just know that I thought you had some real potential here <<$pcs_nickname>>. And thanks for telling me and not just disappearing like <i>some other people</i> have." she adds. You breathe a sigh of relief as she gathers the girls and leaves, letting you go on your way.'
-	end
-	minut += 2
-	gs 'stat'
+	act 'Tell her you want to quit the cheerleading team':
+		cla
+		*nl
+		'"I... I don''t want to be a part of this anymore. I''ve thought it over and this just isn''t for me."' 
+		if cheerleadingQW['quest_stage'] = 2:
+			'Albina just rolls her eyes at you. "Whatever, <<$pcs_nickname>>. I don''t really care if you want to be here or not. I have <i>actual</i> cheerleaders to lead, so if you want to go, then fuck off and don''t come back." She then pushes you aside and walks out of the room. The other girls then follow her out, leaving you alone.'
+		else
+			'Albina gives you an even bigger puzzled stare. "What? Why? Never mind. If you want to leave, then I won''t stop you. Just know that I thought you had some real potential here <<$pcs_nickname>>. And thanks for telling me and not just disappearing like <i>some other people</i> have." she adds. You breathe a sigh of relief as she gathers the girls and leaves, letting you go on your way.'
+		end
+		minut += 2
+		gs 'stat'
 
-	act 'Leave':cheerleadingQW['quest_stage'] = 0 & gt 'gschool_grounds', 'main'
+		act 'Leave':cheerleadingQW['quest_stage'] = 0 & gt 'gschool_grounds', 'main'
+	end
+	act 'Change your mind':
+		cla
+		*nl
+		'"Err.. It''s nothing. Sorry."'
+		'Albina looks at you in confusion. "Are you okay, <<$pcs_nickname>>?"'
+		'You look at the floor as you try and stutter out an answer.'
+		'Albina stops you. "Just take today off. There''s clearly something bothering you and you obviously don''t feel like telling me what it is. Come back when you deal with it."'
+		'You just nod as Albina dismisses you.'
+		act 'Leave': gt 'gschool_grounds', 'main'
+	end
 end
 
 

+ 88 - 88
locations/gschool_coolkid_chats.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'dimka':
 		else
 			if (dimaRevenge = 6 and (dimaRevChoice = 3 or dimaRevChoice = 5 or dimaRevChoice = 6)) or (dimaRevenge = 7 and dimaRevChoice = 2) or (dimaRevenge = 8 and (dimaRevChoice = 1 or dimaRevChoice = 4)):
 				'Dimka glares at as you approach. "What the fuck do you want, slut?"'
-				'You sigh. "Look, I know a lot has happened between us, but I thought we could leave it in the past and just be friends or something."'
+				'You sigh. "Look, I know a lot has happened between us, but I thought we could leave it in the past and just be friends or something?"'
 				'He stares at you blankly before shrugging. "Whatever." The two of you make small talk, but you get the feeling he''s planning something.'
 			else
 				if fame['pav_slut'] > 200:
@@ -60,11 +60,11 @@ if $ARGS[0] = 'dimka':
 							'"You seem to have the wrong idea about me <<$pcs_nickname>>." Dimka holds out his hand to keep you from getting any closer. "Just because we run in the same social circle doesn''t mean we''re friends."'
 							'You can''t help but scoff and roll your eyes. "Who said I want to be friends? You just looked lonely standing over here by yourself. I was just trying to be nice." You trade a few more barbs back and forth.'
 						else
-							'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking. "Hey, Bella!" he calls as he spots her walking by. "Sorry, I hope you don''t mind." He follows after her before you can even reply. At least he let you talk to him.'
+							'Dimka is willing to entertain you for a few minutes, occasionally taking part in the conversation but letting you do most of the talking. "Hey, Bella!" he calls as he spots her walking by. "Sorry, I hope you don''t mind." He follows after her before you can even reply. At least he let you talk to him.'
 						end
 					elseif grupTipe = 2:
 						if npc_rel['A1'] >= 50:
-							'"Have I shown you my photos from my last trip?" he smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would''ve loved it out there. It really made me realize we''re wasting away out here in a place like this." You then chat about the other places he has visited.'
+							'"Have I shown you my photos from my last trip?" he smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would''ve loved it out there. It really made me realize we''re wasting away out here in a place like this." You then chat about the other places he''s visited.'
 							if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
 						elseif npc_rel['A1'] <= 20:
 							'Dimka looks down at you with a condescending smile. "What do you want?" he asks, maintaining his "friendly" appearance in front of everyone.'
@@ -75,7 +75,7 @@ if $ARGS[0] = 'dimka':
 						end
 					elseif grupTipe = 3:
 						if npc_rel['A1'] >= 60:
-							'Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students. Some of them give you an odd look, obviously not sure why you''re here, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague," he playfully chides everyone and you are soon engaged in a conversation with Dimka.'
+							'Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students. Some of them give you an odd look, obviously not sure why you''re here, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague," he playfully chides everyone and you''re soon engaged in a conversation with Dimka.'
 							if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
 						elseif npc_rel['A1'] <= 20:
 							'Dimka looks down at you with a condescending smile. "You get lost loser? Shouldn''t you be off pretending to be an elf or something?" he asks with a charming smile on his face.'
@@ -88,7 +88,7 @@ if $ARGS[0] = 'dimka':
 						end
 					elseif grupTipe = 4:
 						if npc_rel['A1'] >= 60:
-							'Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students. Some of them give you an odd look, obviously not sure why you''re here, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague," he playfully chides everyone and you are soon engaged in a conversation with Dimka.'
+							'Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students. Some of them give you an odd look, obviously not sure why you''re here, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague," he playfully chides everyone and you''re soon engaged in a conversation with Dimka.'
 							if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_coolkid_chats', 'dim_drugs'
 						elseif npc_rel['A1'] <= 20:
 							'Dimka looks down at you with a condescending smile. "What do you want? We don''t have any drugs and none of us want whatever it is you''re selling," he remarks, maintaining his "friendly" appearance in front of everyone.'
@@ -154,7 +154,7 @@ if $ARGS[0] = 'dimka_pay':
 		*clr & cla
 		gs 'drugs', 'cocaine'
 		'<center><img <<$set_imgh>> src="images/shared/drugs/lineschool.jpg"></center>'
-		'You walk down the hall, looking into classrooms until you spot one that is empty. You glance around and when no one is looking, you duck inside and rush over to the teacher''s desk. You pour out a few lines and quickly snort them up. You feel the sensation of relief and pleasure rush through your body and spend the next few seconds in a stupor before the bell for the next class rings.'
+		'You walk down the hall, looking into classrooms until you spot one that''s empty. You glance around and when no one is looking, you duck inside and rush over to the teacher''s desk. You pour out a few lines and quickly snort them up. You feel the sensation of relief and pleasure rush through your body and spend the next few seconds in a stupor before the bell for the next class rings.'
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
 end
@@ -588,7 +588,7 @@ if $ARGS[0] = 'katja':
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You approach Katja and thank her for taking you home from the disco when you were drunk and she gives you a knowing smile. "Don''t mention it <<$pcs_nickname>>! You really shouldn''t get that drunk again though. It could end badly. Some of the guys there are real pigs..." she says. "Do you want to hang out after school? We could do our homework together?"'
+				'You approach Katja and thank her for taking you home from the disco when you were drunk and she gives you a knowing smile. "Don''t mention it, <<$pcs_nickname>>! You really shouldn''t get that drunk again though. It could end badly. Some of the guys there are real pigs..." she says. "Do you want to hang out after school? We could do our homework together?"'
 				'"Sure, why not?" you reply.'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
@@ -704,26 +704,26 @@ if $ARGS[0] = 'katja':
 		end
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		if mesec > 0 and isprok = 0 and isprokp = 0:
-			act'Ask for a tampon':
-				$temp['tampon_ask'] = '"Katja," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+			act 'Ask for a tampon':
+				$temp['tampon_ask'] = '"Katja," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'katja_tampon'
 			end
 			
 			if $pantyworntype ! 'none':
-				act'Ask for a pad':
-					$temp['tampon_ask'] = '"Katja," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+				act 'Ask for a pad':
+					$temp['tampon_ask'] = '"Katja," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 					gs 'gschool_coolkid_chats', 'katja_tampon'
 				end
 			end
 		elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-			act'Ask for a tampon':
+			act 'Ask for a tampon':
 				$temp['tampon_ask'] = '"Katja," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'katja_tampon'
 			end
 			
 			if $pantyworntype ! 'none':
-				act'Ask for a pad':
-					$temp['tampon_ask'] = '"Katja," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+				act 'Ask for a pad':
+					$temp['tampon_ask'] = '"Katja," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 					gs 'gschool_coolkid_chats', 'katja_tampon'
 				end
 			end
@@ -735,27 +735,27 @@ if $ARGS[0] = 'katja_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	
-	if $temp['tampon_ask'] = '"Katja," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Katja," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Katja," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Katja," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if katjaQW['pantiesQWstage'] = 5:
-			'"Oh!" Katja squeaks, her eyes going wide. "Yes of course!"'
-			'She quickly digs into her purse and comes up with a tampon for you'
-			'"Thanks Katja."'
+			'"Oh!" Katja squeaks, her eyes going wide. "Yes, of course!"'
+			'She quickly digs into her purse and comes up with a tampon for you.'
+			'"Thanks, Katja."'
 			'"You''re welcome," she smiles back.'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 			isprok = 1
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		else
 			if npc_rel['A14'] > 20:
-				'"Oh!" Katja squeaks, her eyes going wide and starts digging through her purse. "Yes of course! Uhm... I only have pads, is that okay?"'
+				'"Oh!" Katja squeaks, her eyes going wide and starts digging through her purse. "Yes, of course! Uhm... I only have pads, is that okay?"'
 				if $pantyworntype ! 'none':
-					'"That''s fine, it''s an emergency after all. Thanks Katja."'
+					'"That''s fine, it''s an emergency after all. Thanks, Katja."'
 					'"You''re welcome," she smiles as she hands you the pad.'
 					'You thank her again and run off to the bathroom to go put it on.'
 				end
 			else
 				'"Oh!" Katja squeaks, her eyes going wide. A faint blush colors her cheeks as she seems both surprised you''re talking to her and embarrassed about what you''re asking but starts digging through her purse anyways. "I, uhm... I only have pads, is that okay?"'
 				if $pantyworntype ! 'none':
-					'"That''s fine, it''s an emergency after all. Thanks Katja."'
+					'"That''s fine, it''s an emergency after all. Thanks, Katja."'
 					'"You''re welcome," she mumbles, looking away as she hands you the pad.'
 					'You thank her again and run off to the bathroom to go put it on.'
 				end
@@ -764,7 +764,7 @@ if $ARGS[0] = 'katja_tampon':
 				isprokp = 1
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			else
-				act'Uh...':
+				act 'Uh...':
 					cla & *nl
 					'"Uh..."'
 					*nl
@@ -777,7 +777,7 @@ if $ARGS[0] = 'katja_tampon':
 					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				end
 				
-				act'That''s not going to work':
+				act 'That''s not going to work':
 					katjaQW['no_panties_day'] = daystart
 					cla & *nl
 					'"Uhm... A pad''s not going to work for me," you say.'
@@ -785,7 +785,7 @@ if $ARGS[0] = 'katja_tampon':
 					'"Yeah..." you reply with a wry smirk.'
 					'"Uh... Uhm..." Her cheeks go bright red as she looks around nervously.'
 					'"Maybe you can ask my sister. I know she uses tampons... I have to go!"'
-					'With that she runs off to her next class and unfortunately you need to go too so there is no time to find Vicky.'
+					'She runs off to her next class and unfortunately you need to go too, so there''s no time to find Vicky.'
 					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				end
 			end
@@ -794,17 +794,17 @@ if $ARGS[0] = 'katja_tampon':
 		if katjaQW['pantiesQWstage'] = 5:
 			'"A pad?" Katja raises an eyebrow before fishing through her purse. "What''s wrong with you? Did you start wearing panties again? You know I don''t."'
 			'She hands a tampon over to you with a wry smirk.'
-			'"Right. I forgot about that," you smile back. "Thanks Katja."'
+			'"Right. I forgot about that," you smile back. "Thanks, Katja."'
 			'"You''re welcome," she winks.'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 			isprok = 1
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		else
 			'"Oh!" Katja squeaks, her eyes going wide. "Yes of course!"'
 			'She quickly digs into her purse and comes up with a pad for you'
-			'"Thanks Katja."'
+			'"Thanks, Katja."'
 			'"You''re welcome," she smiles back.'
-			'Then you run off to the bathroom to go put the pad on before class starts.'
+			'You run off to the bathroom to go put the pad on before class starts.'
 			isprokp = 1
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
@@ -916,7 +916,7 @@ if $ARGS[0] = 'bella':
 			'"Umm... No... It''s a Star Wars game, silly!" you explain enthusiastically.'
 			'"Babe, two things: You don''t call me silly. And no, that would be social suicide." she scoffs.'
 			'You try to talk to her a bit more, but she mostly ignores you. When the bell rings and you both go your own ways, she taps your shoulder. "The Phantom Menace is the best."'
-			'"Wait, how do you... Did you just play me?" You only get a sly wink as an answer.'
+			'"Wait, how do you...?" You only get a sly wink as an answer.'
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A22'] >= 70:
@@ -948,26 +948,26 @@ if $ARGS[0] = 'bella':
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Bella," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Bella," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'bella_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Bella," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Bella," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'bella_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Bella," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'bella_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Bella," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Bella," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'bella_tampon'
 			end
 		end
@@ -978,7 +978,7 @@ if $ARGS[0] = 'bella_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big22.jpg"></center>'
 	'<<$temp[''tampon_ask'']>>'
-	if $temp['tampon_ask'] = '"Bella," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Bella," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Bella," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Bella," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A22'] >= 70:
 			'Bella gives you one look and immediately digs through her purse, coming out with a tampon.'
 			'"Here," she says handing it over. "Hurry! Before class starts!"'
@@ -1055,7 +1055,7 @@ if $ARGS[0] = 'cherleading_notice':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/bella/notice/bella_stasya1.jpg"></center>'
 			'"Hey, we were just by Albina''s table and..."'
 			'Bella trails off when she notices Natasha walking towards the table and flutters her eyelashes as she turns towards her. "Oh my god, I love your shirt! Where did you get it?"'
-			'Natasha isn''t sure how to react. "I-It was my mom''s... From the ''90s." she awkwardly mumbles.'
+			'Natasha isn''t sure how to react. "I-It was my mom''s... From the 90s..." she awkwardly mumbles.'
 			'Bella smiles sweetly. "Vintage, how adorable."'
 			act 'Nod in agreement':
 				gs 'npc_relationship', 'modify', 'A22', 'like'
@@ -1178,26 +1178,26 @@ if $ARGS[0] = 'lizaveta':
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Lizaveta," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Lizaveta," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'lizaveta_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Lizaveta," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Lizaveta," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'lizaveta_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Lizaveta," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'lizaveta_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Lizaveta," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Lizaveta," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'lizaveta_tampon'
 			end
 		end
@@ -1208,7 +1208,7 @@ if $ARGS[0] = 'lizaveta_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big140.jpg"></center>'
 	'<<$temp[''tampon_ask'']>>'
-	if $temp['tampon_ask'] = '"Lizaveta," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Lizaveta," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Lizaveta," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Lizaveta," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A140'] >= 60:
 			'"Sure, sure," Lizaveta says, eyes sparkling as she starts going through her purse and pulls one out. "Here you go!"'
 			'"Thanks Lizaveta."'
@@ -1580,26 +1580,26 @@ if $ARGS[0] = 'vicky':
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Vicky," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Vicky," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'vicky_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Vicky," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Vicky," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'vicky_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Vicky," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'vicky_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Vicky," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Vicky," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'vicky_tampon'
 			end
 		end
@@ -1610,29 +1610,29 @@ if $ARGS[0] = 'vicky_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big15.jpg"></center>'
 	'<<$temp[''tampon_ask'']>>'
-	if $temp['tampon_ask'] = '"Vicky," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Vicky," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Vicky," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Vicky," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A15'] >= 70:
 			'"Of course you can," Vicky says without hesitation. It takes her barely any time at all to produce one from her purse. "Here you go!"'
 			'"Thanks Vicky, you''re a lifesaver."'
 			'"What are friends for?" she smiles warmly.'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		else
 			'"Of course you can," Vicky says without hesitation. It takes her barely any time at all to produce one from her purse. "Here."'
 			'"Thanks Vicky, you''re a lifesaver."'
 			'"Just be sure to return the favor if I forget," she winks back.'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		end
 	else
 		if npc_rel['A15'] >= 70:
 			'"You still use pads? You''re just like my sister," Vicky giggles, taking barely any time at all to produce a tampon from her purse. "I don''t have any pads, but here''s a tampon."'
 			'"Thanks Vicky, you''re a lifesaver."'
 			'"What are friends for?" she smiles warmly.'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		else
 			'"You still use pads? You''re just like my sister," Vicky giggles, taking barely any time at all to produce a tampon from her purse. "I don''t have any pads, but here''s a tampon."'
 			'"Thanks Vicky, you''re a lifesaver."'
 			'"Pack an emergency tampon with my name on it in your purse and we''ll call it even," she winks back.'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		end
 	end
 	isprok = 1
@@ -1682,7 +1682,7 @@ if $ARGS[0] = 'stasya':
 			'You smile at her. "I just wanted to talk."'
 			'She rolls her eyes and starts talking to Bella and Irina. They mostly ignore you, but do respond to a few of your questions and comments as they talk about boys and fashion.'
 		else
-			'She stares at you approaching. "What do you want? Never mind I don''t want to know." She turns and ignores you, talking with Bella and Irina instead, who also ignore you. At least they don''t chase you off.'
+			'She stares at you approaching. "What do you want? Never mind, I don''t want to know." She turns and ignores you, talking with Bella and Irina instead, who also ignore you. At least they don''t chase you off.'
 		end
 	else
 		gs 'npc_relationship', 'modify', 'A139', 'dislike'
@@ -1691,13 +1691,13 @@ if $ARGS[0] = 'stasya':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Stasya," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+			$temp['tampon_ask'] = '"Stasya," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'stasya_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
 			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Stasya," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+				$temp['tampon_ask'] = '"Stasya," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'stasya_tampon'
 			end
 		end
@@ -1709,7 +1709,7 @@ if $ARGS[0] = 'stasya':
 		
 		if $pantyworntype ! 'none':
 			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Stasya," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+				$temp['tampon_ask'] = '"Stasya," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'stasya_tampon'
 			end
 		end
@@ -1720,7 +1720,7 @@ if $ARGS[0] = 'stasya_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big139.jpg"></center>'
 	'<<$temp[''tampon_ask'']>>'
-	if $temp['tampon_ask'] = '"Stasya," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Stasya," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Stasya," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Stasya," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A139'] >= 70:
 			'"Yeah, of course!" she says hurriedly, immediately digging into her purse to produce one.'
 			'"Thanks Stasya, you''re a lifesaver."'
@@ -1765,12 +1765,12 @@ if $ARGS[0] = 'irina':
 		if npc_rel['A17'] >= 90:
 			'"<<$pcs_nickname>>, what did the virgin say after her first blowjob?" Irina asks, taking a sip of water as you respond.'
 			'"I don''t know, what did she say?"'
-			'"<i>Ah lurb yuuhh~!</i>" she replies without swallowing, grinning at you as it spills all down her chin and throat.' 
+			'"<i>Ah lurb yuuhh~!</i>" she replies without swallowing, grinning at you as it spills down her chin.' 
 		elseif npc_rel['A17'] <= 20:
-			'"I would rather have Petia stare at my tits until he creams himself than to talk to you, slut!" Irina hisses with disgust. "Keep your legs together, cunt! This isn''t a whorehouse, it''s a fucking school! You''re a fucking embarrassment, you know that?" Irina taunts you before she spits in front of your legs. "Use this as lube to go and fuck yourself!"'
+			'"I would rather have Petia stare at my tits until he creams himself than to talk to you, slut!" she hisses with disgust. "Keep your legs together, cunt! This isn''t a whorehouse, it''s a fucking school! You''re a fucking embarrassment, you know that?" Irina taunts you before she spits in front of your legs. "Use this as lube to go and fuck yourself!"'
 			'You let her finish her rant before putting your hand under your skirt and letting your fingers slide over your clit. "When there''s an itch, you''ve got to scratch it!" Irina stands silently, shocked at your actions.'
 		else
-			'"I would rather have Petia stare at my tits until he creams himself than to talk to you, slut!" Irina hisses with disgust.'
+			'"I would rather have Petia stare at my tits until he creams himself than to talk to you, slut!" she hisses with disgust.'
 		end
 	elseif grupTipe = 1:
 		if npc_rel['A17'] >= 60:
@@ -1815,10 +1815,10 @@ if $ARGS[0] = 'irina':
 			'"I''m more into Luke myself..." you reply while keeping your cool.'
 			'"Who? You mean the old man who trained Rey?" she asks in surprise while mimicking a cock getting soft with her finger.'
 			'"He was young and cute in the originals! You know, A New Hope, Empire Strikes Back?" you explain.'
-			'"I don''t watch old movies. They''re... old." she shrugs.'  
+			'"I don''t watch old movies. They''re... old," she shrugs.'  
 		end
 	elseif grupTipe = 4:
-		if npc_rel['A17'] >= 70:
+		if npc_rel['A17'] >= 80:
 			'"You know that, I think it was in 9th grade, we girls had Lavrenti over because we wanted to borrow his camera for new shots for our social media and when he arrived, Bella suggested we kill the lights and see which one of us would dare get naked in front of him as a thank you. Of course, we were joking, so when the light were switched back on none of us were naked, but he had the biggest boner I''d ever seen!" she giggles.'
 			'"Wow, you girls really surprise me sometimes..." you reply with a hint of disappointment, hoping for something more juicy.' 
 			'"I know, right?!" She giggles while mimicking the size of Lavrenti''s cock with her hands like a fisherman describing his catch.' 
@@ -1829,7 +1829,7 @@ if $ARGS[0] = 'irina':
 			'"Fuck you bitch, you''re getting it now!" You storm towards her before Lavrenti and Lena grab hold of you. "We''re in school, <<$pcs_nickname>>! You can kick her smug ass later, so calm down before the teachers hear you!"'  
 		else
 			'"Psst, you know where to get some, you know... green?" Irina whispers at you.'
-			'"What, you think just because I''m a gopnik I know every fucking drug dealer in town? Is that what you''re saying?" you angrily reply.'
+			'"What, you think just because I''m a gopnik I know every fucking drug dealer in town? Is that what you''re saying?!" you angrily reply.'
 			'"God no, of course not!" she says trying to explain herself.' 
 			'"There''s a guy in front of the Five-Eight in the evening. Your pretty face and those nice lips might get you a discount, if you know what I mean..." you laugh.'
 			'"Eeeww, gross! What''s wrong with you?! Thanks anyway, <<$pcs_nickname>>." As you''re parting ways, you give her an air gesture of a blowjob while holding an imaginary bag of weed in the other hand.'
@@ -1839,7 +1839,7 @@ if $ARGS[0] = 'irina':
 			'It''s easy to please Irina since she likes to talk about herself. So long as you ask her about herself and don''t interrupt her, she''s more than happy to talk with you.'
 		elseif npc_rel['A17'] <= 20:
 			'"Hey Irina, about the next class.." you try to inquire.'	
-			'If you ever try talking to me again, I''ll make sure the second hand blow up doll Lesco and Petia use in their threesome is more popular than you! God, I can''t have even five minutes to myself without some loser trying to talk to me!" she mumbles in an angry tone as she walks away.'
+			'"If you ever try talking to me again, I''ll make sure the second hand blow up doll Lesco and Petia use in their threesome is more popular than you! God, I can''t have even five minutes to myself without some loser trying to talk to me!" she mumbles in an angry tone as she walks away.'
 		else	
 			'"You don’t have any friends, do you?" Irina asks with a stern, unimpressed look. "And you won''t ever find any either." She then turns around and ignores you.'
 		end
@@ -1847,13 +1847,13 @@ if $ARGS[0] = 'irina':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
 		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Irina," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+			$temp['tampon_ask'] = '"Irina," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'irina_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
 			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Irina," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+				$temp['tampon_ask'] = '"Irina," you whisper. "My period just started and I don''t have a pad Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'irina_tampon'
 			end
 		end
@@ -1865,7 +1865,7 @@ if $ARGS[0] = 'irina':
 		
 		if $pantyworntype ! 'none':
 			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Irina," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+				$temp['tampon_ask'] = '"Irina," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'irina_tampon'
 			end
 		end
@@ -1876,20 +1876,20 @@ if $ARGS[0] = 'irina_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big17.jpg"></center>'
 	'<<$temp[''tampon_ask'']>>'
-	if $temp['tampon_ask'] = '"Irina," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Irina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Irina," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Irina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A17'] >= 70:
 			'"Yeah sure," she nods and digs into her purse to produce one.'
 			'"Thanks Irina, you''re a lifesaver."'
-			'"Don''t worry about it," she smiles you run to the bathroom to put the tampon in.'
+			'"Don''t worry about it," she smiles before you run to the bathroom to put the tampon in.'
 		elseif npc_rel['A17'] > 20:
 			'"If you really need one," she nods and digs into her purse to produce a tampon.'
 			'"Thanks Irina, you''re a lifesaver."'
-			'"Don''t worry about it," she shrugs you run to the bathroom to put the tampon in.'
+			'"Don''t worry about it," she shrugs before you run to the bathroom to put the tampon in.'
 		else
 			'She stares at you for a few moments before sighing deeply.'
 			'"If you really need one," she says a little begrudgingly and digs into her purse to produce a tampon.'
 			'"Thanks Irina, you''re a lifesaver."'
-			'"You. Owe. Me." She pokes you in the chest before turning away to Bella and you run to the bathroom to put the tampon in.'
+			'"You. Owe. Me." She pokes you in the chest before turning away to Bella as you run to the bathroom to put the tampon in.'
 		end
 	else
 		if npc_rel['A17'] >= 70:
@@ -1920,7 +1920,7 @@ if $ARGS[0] = 'sonia':
 	if fame['pav_slut'] > 200:
 		if npc_rel['A25'] >= 50:
 			'"Hey Sonia!" you greet her with a smile and she gives you a friendly smile in return.'
-			'"Hey..." Her smile fades as she notices the looks everyone else is giving you. You try talking to her and at times she is very animated, only to catch herself and be a lot more reserved. You can tell she is worried about being seen talking to you, but at least she''s nice about it.'
+			'"Hey..." Her smile fades as she notices the looks everyone else is giving you. You try talking to her and at times she is very animated, only to catch herself and be a lot more reserved. You can tell she''s worried about being seen talking to you, but at least she''s nice about it.'
 		elseif npc_rel['A25'] <= 20:
 			'"Hey Sonia!" you greet her with a smile.'
 			'She looks around thinking you''re talking to someone else before realizing you mean her. "Why would you even talk to me? We''re not friends and I don''t want anyone to see me talking to you. Please just go away!" She then moves away to talk to Katja.'
@@ -1985,7 +1985,7 @@ if $ARGS[0] = 'sonia':
 	elseif grupTipe = 4:
 		if npc_rel['A25'] >= 50:
 			'"Hey Sonia!" you greet her with a smile and she gives you a friendly little wave.'
-			'"What''s up? Mind if I ask you some questions?" she asks and you shrug. She launches into a barrage of questions about partying with your fellow gopniks. What they''re like, what it''s like to run wild, etc. She seems very interested in what you and the other gopniks do for fun and you talk for a while, mostly sharing some of your favorite stories.'
+			'"What''s up? Mind if I ask you some questions?" she asks and you shrug, causing her to launch into a barrage of questions about partying with your fellow gopniks. She seems very interested in what you and the other gopniks do for fun and you end up talking for a while, mostly sharing some of your favorite stories.'
 !!want to add this so it triggers once the first time Sonias rel hits 50
 			if soniaQW['homeinvite'] = 0:
 				soniaQW['homeinvite'] = 1
@@ -2012,26 +2012,26 @@ if $ARGS[0] = 'sonia':
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'sonia_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'sonia_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_coolkid_chats', 'sonia_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_coolkid_chats', 'sonia_tampon'
 			end
 		end
@@ -2042,7 +2042,7 @@ if $ARGS[0] = 'sonia_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 	'<<$temp[''tampon_ask'']>>'
-	if $temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A25'] >= 70:
 			'"Don''t worry <<$pcs_nickname>>, I''ve got your back," she says, immediately digging into her purse to produce one.'
 			'"Thanks Sonia, you''re a lifesaver."'

+ 1 - 1
locations/gschool_events.qsrc

@@ -1039,7 +1039,7 @@ if $ARGS[0] = 'break_events':
 		end
 	elseif break_rand = 23:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/hellokitty.jpg"></center>'
-		'As you walk down the hallway, you overhear a girl asking one of the boys if he would like to see her kitty. He does a double take and grins while nodding to her. She smiles and pulls up her skirt to show off a pair of boyshorts with Hello Kitty on them. The boy looks disappointed whle the girl laughs.'
+		'As you walk down the hallway, you overhear a girl asking one of the boys if he would like to see her kitty. He does a double take and grins while nodding to her. She smiles and pulls up her skirt to show off a pair of boyshorts with Hello Kitty on them. The boy looks disappointed while the girl laughs.'
 		gs 'arousal', 'erotic', 1
 		gs 'arousal', 'end'
 		gs 'stat'

+ 31 - 31
locations/gschool_gopnik_chats.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'vitek':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
 	if kotovLoveQW > 0 and fame['pav_slut'] > 200:
-		'Vitek scowls. "<<$pcs_nickname>>, what''s this garbage I hear about what you and <<$gnikname>> did? The whole town already knows and the guys have been telling me all about it. You fucking slut!"'
+		'Vitek scowls. "What''s this garbage I hear about what you and <<$gnikname>> did? The whole town already knows and the guys have been telling me all about it. You fucking slut!"'
 		act 'Accuse him of sleeping around':
 			*clr & cla
 			gs 'npc_relationship', 'set', 'A9', 0
@@ -38,7 +38,7 @@ if $ARGS[0] = 'vitek':
 		end
 	elseif fame['pav_slut'] > 250:
 		if npc_rel['A9'] >= 70:
-			'"Yo, Vitek, what did the virgin say after her first blowjob?"'
+			'"Hey Vitek, what did the virgin say after her first blowjob?"'
 			'"I don''t know, what did she say?" Vitek shrugs while you use the opportunity to take a mouthful of water.'
 			'"I love you..." you reply, pretending that the water dripping out of your mouth is cum while you talk. This gets laughs from a few others, and you manage to get him to talk about a variety of things the group is up to. He only insults you every so often, but in an almost friendly way.'
 		elseif npc_rel['A9'] <= 20:
@@ -311,7 +311,7 @@ if $ARGS[0] = 'dan':
 	elseif npc_rel['A10'] >= 50 and fame['pav_slut'] < 300:
 		if grupTipe = 4:
 			'"Hey Dan!" you greet him.'
-			'"What''s up <<$pcs_nickname>>?" he replies and the two of you engage in a friendly conversation.'
+			'"What''s up, <<$pcs_nickname>>?" he replies and the two of you engage in a friendly conversation.'
 		else
 			'"Hey Dan!" you greet him. As usual, Dan is his arrogant self and barely pays any attention to you.'
 			'"Oh, come on Dan! Don''t act that way. I know you like it when I talk to you."'
@@ -349,12 +349,12 @@ if $ARGS[0] = 'valentin':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if grupTipe = 4 and gopnik_slut = 1:
-		'He smiles as you approach. "What''s up <<$pcs_nickname>>?"'
+		'He smiles as you approach. "What''s up, <<$pcs_nickname>>?"'
 		'You smile back. "Nothing much, just wanted to hang out and talk."'
 		'The two of you talk about a few things. He gets a little hands on with you at times, but you''re used to it. As you''re about to leave, he stops you. "Stop by the garage some time. I can always use a break and a quick fuck."'
 	elseif fame['pav_slut'] > 300:
 		if npc_rel['A158'] >= 60:
-			'He smiles as you approach. "What''s up <<$pcs_nickname>>?"'
+			'He smiles as you approach. "What''s up, <<$pcs_nickname>>?"'
 			'You smile back. "Nothing much, just wanted to hang out and talk."'
 			'The two of you talk about a few things. He gets a little hands on with you at times, but you''re used to it. As you''re about to leave, he stops you. "Stop by the garage some time, I can always use a break and a quick fuck."'
 		elseif npc_rel['A158'] <= 20:
@@ -488,7 +488,7 @@ if $ARGS[0] = 'shulga':
 	elseif npc_rel['A11'] >= 50 and fame['pav_slut'] < 300:
 		if grupTipe = 4:
 			'Vasily calls out to you as you approach. "Hey <<$pcs_nickname>>, what''s up?"'
-			'You smile at him. "Not much. I thought I''d just come by and hang out with you for a bit."'
+			'You smile at him. "Not much. I thought I''d just come by and hang out with you."'
 			'The two of you engage in a friendly conversation about what''s been going on.'
 		else
 			'Vasily calls out to you as you approach. "Hey <<$pcs_nickname>>, what''s up?"'
@@ -757,7 +757,7 @@ if $ARGS[0] = 'niko':
 		gt 'NikoEv', 'Lunch Breakup'
 	elseif NikoIntro = 0:
 		gt 'NikoEv', 'Lunch Intro'
-	elseif NikoIntro = 1:
+	elseif NikoIntro = 1 or NikoIntro = -1:
 		gt 'NikoEv', 'Lunch Chat'
 	end
 end
@@ -1003,26 +1003,26 @@ if $ARGS[0] = 'alyona':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Alyona," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Alyona," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_gopnik_chats', 'alyona_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Alyona," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Alyona," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_gopnik_chats', 'alyona_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Alyona," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_gopnik_chats', 'alyona_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Alyona," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Alyona," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_gopnik_chats', 'alyona_tampon'
 			end
 		end
@@ -1033,7 +1033,7 @@ if $ARGS[0] = 'alyona_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big143.jpg"></center>'
 	
-	if $temp['tampon_ask'] = '"Alyona," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Alyona," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Alyona," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Alyona," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A143'] >= 60:
 			if rand(1,2) = 1:
 				'"Ah fuck," she mumbles, fumbling around in her bag. "I think I- no wait. Here."'
@@ -1047,16 +1047,16 @@ if $ARGS[0] = 'alyona_tampon':
 				'She shrugs apologetically, seeming a little embarrassed too.'
 			end
 		else
-			'"Just take one," she waves dismissively at her bag on the floor, taking another drink from her flask.'
+			'"Just take one," she waves dismissively at her bag on the floor before taking another drink from her flask.'
 			if rand(1,2) = 1:
 				'Not knowing what else to do, you start opening random zippers looking for a tampon. You find one jammed into a cramped pocket sandwiched between several blunts.'
 				'"Thanks," you say, raising it up to show her you found it.'
-				'"Yeah whatever," Alyona shrugs and you run off to the bathroom to put the tampon in before class starts.'
+				'"Yeah whatever," she shrugs and you run off to the bathroom to put the tampon in before class starts.'
 				isprok = 1
 			else
 				'Not knowing what else to do, you start opening random zippers looking for a tampon. You search every single pocket but don''t find a tampon anywhere.'
 				'"I can''t find any," you say.'
-				'"Then I don''t have any," Alyona shrugs. "Sorry."'
+				'"Then I don''t have any," she shrugs. "Sorry."'
 				'She picks the bag up with all the pockets still open and trudges off to class.'
 			end
 		end
@@ -1074,16 +1074,16 @@ if $ARGS[0] = 'alyona_tampon':
 				'She shrugs apologetically, seeming a little embarrassed too.'
 			end
 		else
-			'"Just take one," she waves dismissively at her bag on the floor, taking another drink from her flask.'
+			'"Just take one," she waves dismissively at her bag on the floor before taking another drink from her flask.'
 			if rand(1,2) = 1:
 				'Not knowing what else to do, you start opening random zippers looking for a pad. Instead you find a tampon jammed into a cramped pocket sandwiched between several blunts.'
 				'"Can I take this?" you say, raising it up to show her.'
-				'"Yeah whatever," Alyona shrugs and you run off to the bathroom to put the tampon in before class starts.'
+				'"Yeah whatever," she shrugs and you run off to the bathroom to put the tampon in before class starts.'
 				isprok = 1
 			else
 				'Not knowing what else to do, you start opening random zippers looking for a tampon. You search every single pocket but don''t find a pad anywhere.'
 				'"I can''t find any," you say.'
-				'"Then I don''t have any," Alyona shrugs. "Sorry."'
+				'"Then I don''t have any," she shrugs. "Sorry."'
 				'She picks the bag up with all the pockets still open and trudges off to class.'
 			end
 		end
@@ -1267,7 +1267,7 @@ if $ARGS[0] = 'anushka':
 			'You sigh, unsure if she''s just teasing you or not. It''s hard to tell with Anushka. "No, I don''t want any steroids. I just wanted to hang out and talk is all."'
 			*nl
 			'She smirks. "Oh... So what flavor protein drink is best? I don''t like that powdered crap. I tried it once and it was nasty as Petia''s breath. I prefer liquid protein right from the tap if you know what I mean..." she says with a wink.'
-			'You shake your head, knowing exactly what she means and the two of you are soon talking about a variety of subjects. The two of you talk and laugh until the bell rings.' 
+			'You shake your head, knowing exactly what she means and the two of you are soon talking about a variety of subjects. You talk and laugh until the bell rings.' 
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A144'] >= 50:
@@ -1373,26 +1373,26 @@ if $ARGS[0] = 'anushka':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Anushka," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Anushka," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_gopnik_chats', 'anushka_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Anushka," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Anushka," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_gopnik_chats', 'anushka_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Anushka," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_gopnik_chats', 'anushka_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Anushka," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Anushka," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_gopnik_chats', 'anushka_tampon'
 			end
 		end
@@ -1428,7 +1428,7 @@ if $ARGS[0] = 'anushka_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
 	
-	if $temp['tampon_ask'] = '"Anushka," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Anushka," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Anushka," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Anushka," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A144'] >= 50:
 			'"Yeah no problem," she says casually and reaches into her bag to pull one out.'
 			'"Thanks," you sigh in relief.'
@@ -1448,7 +1448,7 @@ if $ARGS[0] = 'anushka_tampon':
 			'"Happy to help," she smiles.'
 			'You smile back and run off to go put the tampon in before class starts.'
 		else
-			'"Pads huh?" she smirks teasingly as she reaches into her bag. "Didn''t know you were that kind of girl. Here, take a tampon."'
+			'"Pads, huh?" she smirks teasingly as she reaches into her bag. "Didn''t know you were that kind of girl. Here, take a tampon."'
 			'She holds one out for you.'
 			'"Thanks," you sigh in relief.'
 			'"Don''t worry about it," she smiles. "Wouldn''t wish this kind of thing on my worst enemy."'

+ 5 - 5
locations/gschool_gossip.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'gossip':
 		fuckornot = 2
 		fuckornot_day = daystart
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girls_gossip.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girls_gossip2.jpg"></center>'
 		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
 		*nl
 		'A group of girls is clustered around a laptop. "Oh my god that''s disgusting! Boys are such pigs!" the first one says.'
@@ -87,7 +87,7 @@ if $ARGS[0] = 'gossip':
 		hotornot = 1
 		fuckornot_day = daystart
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girls_gossip.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girls_gossip2.jpg"></center>'
 		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
 		*nl
 		'A group of girls are looking at their phones. "Can you believe these ratings?" one of them asks.'
@@ -97,7 +97,7 @@ if $ARGS[0] = 'gossip':
 		hotornot = 2
 		fuckornot_day = daystart
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girls_gossip.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/girls_gossip1.jpg"></center>'
 		'Walking down the halls, you barely notice the poor state of the school anymore, having grown used to it. Approaching your locker, you see several of your classmates who you wave to. As you do, you overhear some of them talking about a variety of things, including some juicy gossip.'
 		*nl
 		'Several of the cool girls are talking to Zinaida. At first you think they might be bullying her, but it instead sounds like they''re asking her a bunch of questions. Whatever they''re talking about, they seem to come to an agreement.'
@@ -774,7 +774,7 @@ if $ARGS[0] = 'boys':
 	elseif chat_rand = 45:
 	    'As you walk down the hallway, you see a group of boys from another class gawking at Albina, who has her back turned to them. As you get closer, you can hear them whispering to each other.'
         '"Come on, you know you want it!" you hear one of them say.'
-        '"I don''t know. Is worth it?"'
+        '"I don''t know. Is it worth the risk?"'
         '"An ass like that is always worth it! Just go flirt with her. She might surprise you."'
         *nl
         'His friends push him towards her. "Uh, hey. Do you wear space pants to gym class... Because your ass is out of this world..." he asks with a crack in his voice, but still making a cringy attempt to act smooth by leaning against the locker and smiling.'
@@ -982,7 +982,7 @@ if $ARGS[0] = 'girls':
 		'"Not so loud! Do you want them to hear you? Who knows what they would do to you if they found out you said that?!"'
 	elseif chat_rand = 40 and cheerleadingQW['quest_stage'] ! 0:
 		'"I''m wondering whether I should''ve tried out for the cheerleading squad or not."'
-		'"Yeah, I''m sure that they would''ve invited your unfit ass wih open arms. Besides, they''re a bunch of sluts who enjoy teasing the perverts in the stands and sucking off the football team."'
+		'"Yeah, I''m sure that they would''ve invited your unfit ass with open arms. Besides, they''re a bunch of sluts who enjoy teasing the perverts in the stands and sucking off the football team."'
 		'"Maybe I did dodge a bullet then..."'
 	elseif chat_rand = 41:
 	    '"I might work out more. I want a big butt just like Albina''s!"'

+ 3 - 0
locations/gschool_grounds.qsrc

@@ -773,6 +773,9 @@ if $ARGS[0] = 'change_room':
 		cla
 		gt 'wardrobe', 'start'
 	end
+
+	gs 'wardrobe', 'default_sport_options'
+
 	dynamic $publicpan
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh < 1: act 'Brush your hair': gt 'mirror', 'brush'

+ 194 - 224
locations/gschool_jock_chats.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = 'lazar':
 			'"Looks like the loser is lost." someone comments as you approach.' 
 			'"Nah, I bet even Lesco and Petia can''t stand being around her and, honestly, who can blame them?" Lazar replies, which gets the group laughing so hard you know it''s pointless to even try and talk to him.'
 		else
-			'You approach and try to talk to him, but he flat out ignores you and pretends you''re not there. After several minutes of this, he finally sighs loudly. "Can''t you take a fucking hint? No one wants to talk to you!" He then returns to ignoring you and you walk away.'
+			'You approach and try to talk to him, but he straight up ignores you and pretends you''re not there. After several minutes of this, he finally sighs loudly. "Can''t you take a fucking hint? No one wants to talk to you!" He then returns to ignoring you and you walk away.'
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -181,23 +181,23 @@ if $ARGS[0] = 'vanya':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
 	if npc_rel['A165'] >= 50 and fame['pav_slut'] < 225:
 		if grupTipe = 2:
-			'"Say <<$pcs_nickname>> did you hear about the prank I pulled on the football coach?" Vanya is having a hard time keeping himself from laughter.'
-			'"No, what did you do this time?" you curiously ask.'
+			'"Say <<$pcs_nickname>>, did you hear about the prank I pulled on the football coach?" Vanya is having a hard time stopping himself from laughing.'
+			'"No. What did you do this time?" you curiously ask.'
 			'"Well, during one of the training sessions, I unscrewed the top from a water bottle thinking one of the boys would drink it but here comes the coach, who grabs it. Just as he''s about to drink, the top falls off and water splashes all over him!" Vanya bursts out in laughter.'
 		else
 			'"<<$pcs_nickname>>! You need to help me hide!" Vanya is alarmingly looking around.'
 			'Feeling stressed, you ask. "What''s wrong?! Who''s after you?!"'
 			'Vanya cracks up seeing you panic. "Just kidding! I just wanted to see your reaction."'
-			'"Always the same thing Vanya. Don''t you get tired of playing games all the time?" you reprimand him.'
+			'"Always the same thing with you, Vanya. Don''t you get tired of playing games all the time?" you reprimand him.'
 		end
 	elseif npc_rel['A165'] <= 20 and fame['pav_slut'] < 225:
 		if grupTipe = 2:
-			'"What the hell Vanya!" you yell while angrily stomping towards him.'
+			'"What the hell, Vanya?!" you yell while angrily stomping towards him.'
 			'"What now?" he replies with an innocent look. "I''m getting tired of you accusing me of things I haven''t done!"'
 			'"It must''ve been you! Who else replaces talc powder with itching powder?!"'
 			'"No idea. What an amazing... I mean cruel joke though..." he replies.'
 		else
-			'"Funny joke you played on me there, dickhead." you angrily yell while pushing him.'
+			'"Funny joke you played on me there, dickhead!" you angrily yell while pushing him.'
 			'"What are you talking about? You''ve gone crazy!" he replies.'
 			'"I know it was you!" you yell in response.'
 			'"Oh yeah? Prove it then!" he yells back. You both stand in silence for a few seconds before you stomp off as Vanya grins from ear to ear.'
@@ -206,17 +206,17 @@ if $ARGS[0] = 'vanya':
 		'"Hey Vanya..." you sneakily greet him. "Want to hear a secret?" you ask.'
 		'Vanya turns towards you. "Hell yeah! I love secrets! Especially ones I can use against others as a joke."'
 		'"Well this one is special..." you snicker. "I saw you and Vicky having sex in the park..."'
-		'Vanya stops and thinks for a moment before grinning. "That''s the big secret? Well that''s nothing new. Vicky and I love to have sex outdoors." he winks.'
+		'Vanya stops and thinks for a second before grinning. "That''s the big secret? Well that''s nothing new. Vicky and I love to have sex outdoors," he winks.'
 	elseif fame['pav_slut'] >= 225:
 		gs 'npc_relationship', 'modify', 'A8', 'dislike'
 		'"Are you up for a threesome with Vicky and me?" Vanya asks.'
 		'"What?" you ask surprised.'
 		'Vanya breaks out in a mischievous smile. "Yeah, you know. We''ve heard that you''ve become such a big slut, so we wanted to try a threesome."'
-		'"Hmm..." you start to think...'
-		'"Gross, I was just kidding! Like I would share Vicky with a slut like you."'
+		'"Hmm..." you start to think.'
+		'"Gross, I was just kidding!" he scorns. "Like I would share Vicky with a slut like you!"'
 	else
 		'"Hey <<$pcs_nickname>>! Check this out!" Vanya yells out as he throws a crumbled paper ball at Vitek''s head.'
-		'He in turn quickly spins around and glares, trying to figure out who threw the crumbled paper. "Who was it?!" Vitek yells out. "Tell me who the fuck it was!"'
+		'He in turn quickly spins around and glares, trying to figure out who threw the crumbled paper. "Who did that?!" Vitek yells out. "Tell me who the fuck it was!"'
 		'"So easily agitated..." Vanya comments while you burst out in laughter over the stupid face Vitek is making.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -231,9 +231,9 @@ if $ARGS[0] = 'erast':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big150.jpg"></center>'
 	if fame['pav_slut'] > 225:
 		if npc_rel['A150'] >= 50:
-			'You approach Erast and tap his shoulder. "Oh... Hello <<$pcs_nickname>>."'
+			'You approach Erast and tap his shoulder. "Oh... Hello <<$pcs_nickname>>," he says gently.'
 			'"Hi Erast. I just wanted to talk to you," you reply with a smile.'
-			'You start talking about different things, but see him glancing at the others, as if he was worried about being seen with you.'
+			'You start talking about different things, but see him glancing at the others, as if he''s worried about being seen with you.'
 			'"Am I not worthy to look at?" you ask jokingly, but you exactly know what''s going on.'
 			*nl
 			'"What? No. I mean, yes. You look..." He starts to check you out. You can tell he likes you, but unlike the others, he isn''t undressing you with his eyes and remains a gentleman, despite your reputation.'
@@ -245,9 +245,9 @@ if $ARGS[0] = 'erast':
 			'"I just wanted to..." You would continue your sentence, but he''s already gone. It''s obvious he didn''t want to be seen with you.'
 			'There are a few minutes until the end of the break, so you decide to spend some time on your phone before going on your way.'
 		else
-			'You approach Erast and tap his shoulder. "Oh hi, <<$pcs_nickname>>. Am I in your way?"'
+			'You approach Erast and tap his shoulder. "Oh hi, <<$pcs_nickname>>. Am I in your way?" he asks.'
 			'"What do you mean?" you ask confusedly.'
-			'"I don''t know. Maybe you were looking for the toilets to retouch your makeup or something and I was in your way."'
+			'"I don''t know. Maybe you were looking for the toilets to retouch your makeup or something and I was in your way?"'
 			*nl
 			'He doesn''t want to be rude, but you understand he was referring to your reputation and the rumours about what you do in the toilets.'
 			'"Was that a hint that I should leave you alone or maybe you want me to go there?" you wink.'
@@ -401,7 +401,6 @@ if $ARGS[0] = 'christina':
 			NatbelQW['chrispaid'] = 3
 			NatbelQW['evt_day'] = daystart
 			gs 'stat'
-			
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
 			'You see Christina chatting with Lina as you approach. When she notices you, she glares at you before turning to Lina.'
 			'"Later, Lina," she says. Lina smiles at Christina and leaves before Christina turns back to you. "What do you want?"'
@@ -427,9 +426,9 @@ if $ARGS[0] = 'christina':
 		if LariskaQW['story'] = 3:
 			LariskaQW['story'] = 4
 			christinaQW['blackmail'] = 2
-			'Walking up to Christina, you quietly say "I need to talk to you."'
+			'"I need to talk to you," you quietly say as you approach Christina.'
 			'"What do you want? I''m busy," she says, not even looking at you.'
-			'Taking a deep breath, you say "Lariska. I want Lariska."'
+			'You take a deep breath. "Lariska. I want Lariska."'
 			'Suprised, she finally looks at you. "No, <<$pcs_nickname>>. She''s mine, and I don''t want you filling her head with nonsense."'
 			'"Well, the thing is you don''t really have a choice. Not a good one anyway." Pulling out your phone and checking to make sure nobody''s looking, you show her a picture of her blowing the coach.'
 			'Her face turns bright red with anger and she hisses at you. "You fucking bitch! How did you get that?! If you show anybody..."'
@@ -439,7 +438,7 @@ if $ARGS[0] = 'christina':
 			'"Oh, and if you try and punish her for this, I will know," the threat clear on your face. Turning on your heels, you head off to your next class, smiling.'
 		else
 			christinaQW['blackmail'] = 2
-			'Walking up to Christina, you quietly say "I need to talk to you."'
+			'"I need to talk to you," you quietly say as you approach Christina.'
 			'"What do you want? I''m busy," she says, not even looking at you.'
 			'"Oh, I just wanted you to know I have something you should see." Pulling out your phone and checking to make sure nobody is looking, you show her a picture of her blowing the coach.'
 			'Her face turns bright red with anger and she hisses at you. "You fucking bitch! How did you get that?! If you show anybody..."'
@@ -454,7 +453,7 @@ if $ARGS[0] = 'christina':
 		'Christina takes one look at you coming over to talk with her. "What now?"'
 		'"Nothing," you say cheerfully. "Just came over to say hi."'
 		'"Well don''t. We''re not friends. You got what you wanted, now leave me alone unless it''s important."'
-		'Giving her your best obvious fake smile you say "Now don''t be like that. I thought we were great friends!"'
+		'"Now don''t be like that. I thought we were great friends!" you say while giving her your best fake smile.'
 		'"Whatever." Giving you a dirty look, she heads off to her next class, and you do the same, chuckling to yourself.'
 	elseif christinaQW['fight'] = 1:
 		if LariskaQW['story'] = 3: LariskaQW['story'] = 4
@@ -465,11 +464,11 @@ if $ARGS[0] = 'christina':
 		if fame['pav_slut'] >= 200:
 			'"What does the biggest school slut want from me? Don''t you have a cock to suck somewhere?" Christina asks mockingly.'
 			'"Shut up Christina! I''m tired of your bullshit," you tiredly reply.'
-			'"Poor little thing. It must''ve been, what, at least a few minutes since you last spread your legs for someone?" She begins to laugh as she walks away.'
+			'"Poor little thing. It must''ve been what, five minutes since you last spread your legs for someone?" She begins to laugh as she walks away.'
 		else
 			if grupTipe = 2:
 				'"Look at the biggest joke among us. You shouldn''t even be allowed to call yourself a jock. What a joke..." Christina shakes her head.'
-				'You fiercely reply. "Oh, yeah? I could beat you in whatever you want. Just name the time and place."'
+				'"Oh yeah? I could beat you at whatever you want! Just name the time and place!" you fiercely reply.'
 				'"Hmmrph!!" Christina looks angrily at you. "You know what? I don''t have time for this right now!" She crosses her arms and refuses to say another word to you.'
 			else
 				'"Why are you trying to talk to me? I don''t speak to people like you."'
@@ -482,12 +481,12 @@ if $ARGS[0] = 'christina':
 	! Natasha quest line:
 
 	if christinaQW['fight'] = 1 and NatbelQW['FriendLover'] = 2:
-			act 'Talk to Christina':
+		act 'Talk to Christina':
 			NatbelQW['chrispaid'] = 1
-			'You see Christina chatting with Lina when as approach. When Christina notices you, she glares at you and then turns to Lina.'
+			'You see Christina chatting with Lina as you approach. When Christina notices you, she glares at you and then turns to Lina.'
 			'"Later, Lina," she says. Lina smiles at Christina and leaves before Christina turns back to you. "What do you want?"'
 			'You ignore her attitude. "I wanted to talk about how you treat Natasha."'
-			'"What about it?" she snaps. "It''s not any of your business!"'
+			'"What about it?" she snaps. "It''s not like it''s any of your business!"'
 			'"Actually, it is. She''s my friend, so I''m telling you to stop so I don''t have to beat your ass in front of everyone again."'
 			'Christina doesn''t answer, so you continue. "So we''re in agreement then? Unless you want to go another round with me? I hope not, because I won''t stop at a simple beating this time!"'
 			'She nods in agreement before storming off. With a grin on your face, you head to your next class.'
@@ -498,7 +497,7 @@ if $ARGS[0] = 'christina':
 			'You see Christina chatting with Lina when as approach. When Christina notices you, she glares at you and then turns to Lina.'
 			'"Later, Lina," she says. Lina smiles at Christina and leaves before Christina turns back to you. "What do you want?"'
 			'You ignore her attitude. "I wanted to talk about how you treat Natasha."'
-			'"What about it?" she snaps. "It''s not any of your business!"'
+			'"What about it?" she snaps. "It''s not like it''s any of your business!"'
 			'"Actually, it is. She''s my friend, so I''m asking you to stop because I don''t want to embarrass you in front of the others."'
 			'"Fucking make me," she scoffs, so you pull out your phone and show her your recording of her blowing the coach.'
 			'She balls her fists in rage. "So we''re in agreement then? Unless you want everyone to see this?" you ask smugly.'
@@ -513,25 +512,25 @@ if $ARGS[0] = 'christina':
 		act 'Think about Christina': gt 'Zvereva_events', 'christina_decide2'
 	end
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"My... my period started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'christina_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
+			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"My... my period started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_jock_chats', 'christina_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'christina_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
+			act 'Ask for a pad':
 				$temp['tampon_ask'] = '"My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_jock_chats', 'christina_tampon'
 			end
@@ -546,18 +545,18 @@ if $ARGS[0] = 'christina_tampon':
 	'"Oh this ought to be good..." She looks at you flatly.'
 	'<<$temp[''tampon_ask'']>>'
 	'She looks at you in surprise.'
-	'"You mean if I don''t give you a tampon, your panties are going to get stained and blood is going to run all down your thighs and get all over your seat and embarrass yourself in front of the whole class?"'
+	'"You mean if I don''t give you a tampon, your panties are going to get stained and blood is going to run all down your thighs, get all over your seat and embarrass you in front of the whole class?"'
 	if $pantyworntype ! 'none':
-		'"Yes!" you hiss urgently. Christina stops to stare at you for a few moments. "I really need your help."'
+		'"Yes!" you hiss urgently. Christina stops to stare at you for a few seconds. "I really need your help!"'
 	else
 		'"Not exactly," you mumble, deeply aware of your <i>lack</i> of panties and how it''s going to very quickly skip that step. "But yes, I really need your help."'
 	end
 	*nl
-	'Then she smiles.'
+	'She just smiles.'
 	if $temp['tampon_ask'] = '"My... my period started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"My period is starting soon and I don''t have a tampon. Can I borrow one?"':
-		'"Ha! That''s the best thing I''ve heard all day! Fuck you, enjoy humiliation loser!" she grins, flipping you the bird as she walking off leaving you with absolutely nothing.'
+		'"Ha! That''s the best thing I''ve heard all day! Fuck you, enjoy the humiliation loser!" she grins, flipping you the bird as she walks away and leaves you with absolutely nothing.'
 	else
-		'"Ha! That''s the best thing I''ve heard all day! Fuck you, enjoy humiliation!" she grins, flipping you the bird as she steps off, calling over her shoulder as she walks away, "And start using tampons you fucking loser! Nobody uses pads anymore!"'
+		'"Ha! That''s the best thing I''ve heard all day! Fuck you, enjoy the humiliation!" she grins, flipping you the bird as she walks away. "And start using tampons you fucking loser! Nobody uses pads anymore!" she calls back over her shoulder.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -690,26 +689,26 @@ if $ARGS[0] = 'albina':
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Albina," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Albina," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'albina_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Albina," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Albina," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_jock_chats', 'albina_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Albina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'albina_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Albina," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Albina," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_jock_chats', 'albina_tampon'
 			end
 		end
@@ -720,51 +719,25 @@ if $ARGS[0] = 'albina_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 	'<<$temp[''tampon_ask'']>>'
-	if $temp['tampon_ask'] = '"Albina," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Albina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
-		if AlbinaQW['Friends'] = 2:
-			'Your friend''s eyes go wide.'
-			'"Yes! Of course!" she says, immediately digging into her purse and coming up with a tampon. "Why are you even asking! Just take it and go before something starts spilling out!"'
-			'You nod gratefully and run off to the bathroom to go put the tampon in.'
-		elseif npc_rel['A23'] >= 70:
-			'Albina blinks.'
-			'"Oh! Shit. Yeah, let me get one," she says, immediately digging into her purse and coming up with a tampon. "Here."'
-			'"Thanks Albina."'
-			'"Don''t worry about it," she shakes her head. "Typical woman problem, am I right?"'
-			'She gives you a sympathetic look and you run off to the bathroom to go put the tampon in.'
-		elseif npc_rel['A23'] > 20:
-			'Albina blinks.'
-			'"Huh? Oh. Uh... Yeah, let me get one," she says, quickly digging into her purse and coming up with a tampon. "Here."'
-			'"Thanks Albina."'
-			'"Don''t worry about it," she shakes her head. "Typical woman problem, am I right?"'
-			'She gives you a sympathetic look and you run off to the bathroom to go put the tampon in.'
+	if $temp['tampon_ask'] = '"Albina," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Albina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+		if AlbinaQW['Friends'] = 2 or npc_rel['A23'] >= 70:
+			'She gives you a sympathetic look. "Sorry <<$pcs_nickname>>, but I don''t have any. I''m on birth control and don''t get periods..."'
+			'"Oh..." you nod understandingly.'
+			'"I''d help if I could, I really would," she says with an apologetic smile.'
 		else
-			'She gives you a look.'
-			'"Seriously? Ugh." She starts rifling through her purse and comes up with a tampon. "What kind of idiot doesn''t keep tampons in her purse? Here."'
-			'"Thanks Albina."'
-			'"Don''t mention it," she glares. "Literally. Now fuck off."'
-			'You avoid her gaze and do as she asks, running off to the bathroom to go put the tampon in.'
+			'"Suuuure, just give me a few rubles," she replies and you just stare blankly at her. "Do I look like a fucking dispenser to you?" she scorns. "What kind of idiot doesn''t keep tampons in her purse?"'
+			'"Do you have any?" you ask in a desperate plea, but she shakes her head.'
+			'"No, I''m on birth control and don''t get periods. You need to deal with this yourself, preferably before it starts running down your leg." She then walks away, leaving you to your predicament.'
 		end
 	else
-		if AlbinaQW['Friends'] = 2:
-			'Your friend''s eyes go wide.'
-			'"I don''t have any pads, only tampons, is that alright?" she says, immediately digging into her purse and coming up with a tampon. "Why are you still using pads? Never mind that! Just take it and go before something starts spilling out!"'
-		elseif npc_rel['A23'] >= 70:
-			'Albina blinks.'
-			'"Oh! Shit. I only have tampons," she says, immediately digging into her purse and coming up with one. "Here."'
-			'"Thanks Albina."'
-			'"Don''t worry about it," she shakes her head. "Typical woman problem, am I right?"'
-			'She gives you a sympathetic look and you run off to the bathroom to go put the tampon in.'
-		elseif npc_rel['A23'] > 20:
-			'Albina blinks.'
-			'"Huh? Oh. Uh... I only have tampons," she says, quickly digging into her purse and coming up with one. "Here."'
-			'"Thanks Albina."'
-			'"Don''t worry about it," she shakes her head. "Typical woman problem, am I right?"'
-			'She gives you a sympathetic look and you run off to the bathroom to go put the tampon in.'
+		if AlbinaQW['Friends'] = 2 or npc_rel['A23'] >= 70:
+			'She gives you a bewildered look. "Why are you still using pads? Sorry, but I don''t have anything like that. I''m on birth control and don''t get periods."'
+			'"Oh..." you nod understandingly.'
+			'"I''d help if I could, I really would," she says with an apologetic smile.'
 		else
-			'She gives you a look.'
-			'"Seriously? Ugh." She starts rifling through her purse and comes up with a tampon. "What kind of idiot doesn''t keep tampons in her purse? Here."'
-			'"Thanks Albina."'
-			'"Don''t mention it," she glares. "Literally. Now fuck off."'
+			'She gives you a stern look. "Do I look like a fucking dispenser to you? What kind of idiot doesn''t keep tampons in her purse? And why are you still using pads?!"'
+			'"Do you have any?" you ask in a desperate plea, but she shakes her head.'
+			'"No, I''m on birth control and don''t get periods. You need to deal with this yourself, preferably before it starts running down your leg." She then walks away, leaving you to your predicament.'
 		end
 	end
 	isprok = 1
@@ -895,7 +868,7 @@ if $ARGS[0] = 'veronika':
 			'Veronika is leaning against the wall and checking something on her phone when you decide to approach her.'
 			'"He..." you start to greet her when she looks up and notices you standing in front of her.'
 			'"Don''t even start..." she coldly replies. As she looks up and her sight meets yours, you see her piercing, cold glare that could freeze the sun.'
-			'Understand you''re not welcome, you go back to your classroom and try to kill the time until the next lesson starts.'
+			'Understanding you''re not welcome, you go back to your classroom and try to kill the time until the next lesson starts.'
 		else
 			'"Hey Veronika!" you greet her as you approach.'
 			'"Oh... Hi <<$pcs_nickname>>..." she replies indifferently.'
@@ -906,26 +879,26 @@ if $ARGS[0] = 'veronika':
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Veronika," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Veronika," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'veronika_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Veronika," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Veronika," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_jock_chats', 'veronika_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Veronika," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'veronika_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Veronika," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Veronika," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_jock_chats', 'veronika_tampon'
 			end
 		end
@@ -936,43 +909,43 @@ if $ARGS[0] = 'veronika_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big141.jpg"></center>'
 
-	if $temp['tampon_ask'] = '"Veronika," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Veronika," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Veronika," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Veronika," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A141'] >= 70:
 			'"Yeah, of course," she says calmly, immediately digging into her backpack and coming up with a tampon. "Here."'
-			'"Thanks Veronika."'
+			'"Thanks, Veronika."'
 			'"It''s fine," she shrugs. "I have a huge stash for competitions."'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		elseif npc_rel['A141'] > 20:
 			'She gives you a look.'
 			'"Sure I guess," she sighs, digging into her backpack and coming up with a tampon. "Here."'
-			'"Thanks Veronika."'
+			'"Thanks, Veronika."'
 			'"It''s fine," she shrugs. "I have a huge stash for competitions. That''s not permission to use me as a dispenser though."'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		else
 			'She gives you a look.'
-			'"... fine," she says begrudgingly and makes a big show of digging through her backpack and coming up with a tampon. "Here."'
-			'"Thanks Veronika."'
+			'"... Fine," she says begrudgingly and makes a big show of digging through her backpack and coming up with a tampon. "Here."'
+			'"Thanks, Veronika."'
 			'"Whatever," she shrugs.'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		end
 	else
 		if npc_rel['A141'] >= 70:
 			'"I''ve only got tampons," she says calmly, immediately digging into her backpack and coming up with one. "Here."'
 			'"Thanks Veronika."'
 			'"It''s fine," she shrugs. "I have a huge stash."'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		elseif npc_rel['A141'] > 20:
 			'She gives you a look.'
 			'"Sure I guess," she sighs, digging into her backpack. "But I''ve only got tampons. Here."'
 			'"Thanks Veronika."'
 			'"It''s fine," she shrugs. "I have a huge stash for competitions. That''s not permission to use me as a dispenser though."'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		else
 			'She gives you a look.'
-			'"... fine," she says begrudgingly and makes a big show of digging through her backpack and coming up with a tampon. "But I don''t have any pads. I''m an ice skater, not a nerd, remember? Here."'
-			'"Thanks Veronika."'
+			'"... Fine," she says begrudgingly and makes a big show of digging through her backpack and coming up with a tampon. "But I don''t have any pads. I''m an ice skater, not a nerd, remember? Here."'
+			'"Thanks, Veronika."'
 			'"Whatever," she shrugs.'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		end
 	end
 	isprok = 1
@@ -991,10 +964,10 @@ if $ARGS[0] = 'lina':
 			'Looking around to make sure nobody is watching, you lean in and whisper back, telling her about some of your latest sexual adventures.'
 			'When your story is done, she leans back against the wall, a dreamy look on her face.'
 		elseif npc_rel['A19'] <= 20:
-			'"Christina says that you fuck anyone." Lina says while glaring at you.'
+			'"Christina says that you fuck anyone," Lina says while glaring at you.'
 			'"Christina doesn''t know what she''s talking about it," you reply.'
 			'"I knew it! It''s true isn''t it? Christina is always correct... Go and suck someone off!" she fires back.'
-			'"Whatever, bitch. Like you know anything about me," you laugh, and walk away.'
+			'"Whatever, bitch. Like you know anything about me," you scorn as you walk away.'
 		else
 			'Lina gives you a strange look, like she has something to say but she''s afraid to be seen talking to you. Unable to help herself, she says "What''s it like?"'
 			'Confused, you ask "What is what like?"'
@@ -1007,9 +980,9 @@ if $ARGS[0] = 'lina':
 			'"Hi Lina," you reply. "What''s new with you?"'
 			'The two of you spend the break chatting about various things until it ends.'
 		elseif npc_rel['A19'] <= 20:
-			'Lina sees you coming over to her, and says "You just think you''re so cool. You will never be as cool as Christina."'
-			'You have a mental picture of Christina wearing a fancy dress with her hair done, and cannot help but laugh out loud.'
-			'Your laugh causes her face to turn bright red. "You fucking bitch. You will get yours someday."'
+			'Lina sees you coming over to her. "You just think you''re so cool. You''ll never be as cool as Christina!" she says.'
+			'You have a mental picture of Christina wearing a fancy dress with her hair done, and can''t help but laugh out loud.'
+			'Your laugh causes her face to turn bright red. "You fucking bitch! You''ll get yours someday!"'
 		else
 			'"Hey, <<$pcs_nickname>>. Did you see the last track race?"'
 			'"Sorry, Lina. I don''t really watch those."'
@@ -1019,7 +992,7 @@ if $ARGS[0] = 'lina':
 	elseif grupTipe = 2:
 		if npc_rel['A19'] >= 60:
 			'Lina sees you and proudly says "I''ve finally been improving my lap times!"'
-			'"Great news! I''m glad you''re improving." you encouragingly tell her.'
+			'"Great news! I''m glad you''re improving!" you encouragingly tell her.'
 			'Lina nods. "Yeah, the new workout plan that Christina made for me is really great. She''s really helped me out a lot."'
 			+$OpenInnerThought+'There she goes, worshipping Christina.'+$CloseInnerThought
 		elseif npc_rel['A19'] <= 20:
@@ -1028,29 +1001,29 @@ if $ARGS[0] = 'lina':
 			'Lina mockingly replies. "It''s just something me and the other girls were discussing and I just wanted you to know that."'
 			'"Come face me then and I''ll show you who''s the worse athlete!" You fire back. Deciding this conversation has lasted long enough, you walk away.'
 		else
-			'"What do you want <<$pcs_nickname>>? Christina is looking for me..." Lina says irritatingly.'
-			'"I wanted to ask you if you had the notes from the class. I need to copy it." you tell her.'
-			'"We''ll do it later. I have to find Christina right away or else she''ll get mad..." Lina excuses herself.'
+			'"What do you want, <<$pcs_nickname>>? Christina is looking for me..." Lina says irritatingly.'
+			'"I wanted to ask you if you had the notes from the class. I need to copy them," you tell her.'
+			'"We''ll do it later. I have to find Christina right away or else she''ll get mad..." She quickly excuses herself.'
 		end
 	elseif grupTipe = 3:
 		if npc_rel['A19'] >= 60:
-			'Looking up from her schoolbook and seeing you coming, she shows you her book and asks "What''s the answer to this problem."'
-			'"42. Come on, that''s an easy one."'
-			'"I wasn''t paying attention when the teacher was talking about how to do the problem, Christina was texting me. She wants to know what I''m wearing to the dance this weekend when we go."'
-			'"Why does that matter?"'
-			'Looking a bit confused, she says "I don''t know. Maybe she wants us to match or something."'
-			+$OpenInnerThought+'Yeah right. She probably wanted to make sure she is wearing something better then Lina.'+$CloseInnerThought
-			'You walk away, leaving Lina looking all dreamy-eyed thinking about her and Christina wearing the same clothes. She probbably didn''t even see you leave.'
+			'Looking up from her schoolbook and seeing you coming, she shows you her book and asks "What''s the answer to this problem?"'
+			'"42," you reply. Come on, that''s an easy one!"'
+			'"I wasn''t paying attention to the teacher because Christina was texting me. She wants to know what I''m wearing to the dance this weekend."'
+			'"Why does that matter?" you ask.'
+			'"I don''t know. Maybe she wants us to match or something?" she replies, looking a little confused.'
+			+$OpenInnerThought+'Yeah right. She probably wanted to make sure she''s wearing something better then Lina.'+$CloseInnerThought
+			'You walk away, leaving Lina looking all dreamy-eyed thinking about her and Christina wearing the same clothes. She probably didn''t even see you leaving.'
 		elseif npc_rel['A19'] <= 20:
 			'"Unless you''re here to do my homework, get lost nerd."'
 			'"What did I ever do to you, Lina?"'
 			'"Christina hates you. That''s good enough for me."'
-			'"Right... ok bye." You get out of there before things get heated.'
+			'"Right... Bye then." You get out of there before things get heated.'
 		else
-			'Seeing you come up to talk to her, Lina raises an eyebrow. "You sure you want to be seen here? I thought nerds were supposed to be smart."'
+			'Seeing you coming up to talk to her, Lina raises an eyebrow. "You sure you want to be seen here? I thought nerds were supposed to be smart."'
 			'"Don''t be mean, Lina. I''m just saying hello."'
-			'"Hi." You might want to leave before somebody runs you out.'
-			'Sighing, you say "Alright, fine. I can take the hint." You walk away before anybody starts messing with you.'
+			'"Hi," she replies. "Now leave before somebody runs you out."'
+			'You sigh. "Alright, fine. I can take the hint." You walk away before anybody starts messing with you.'
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A19'] >= 60:
@@ -1058,72 +1031,72 @@ if $ARGS[0] = 'lina':
 				'"Why don''t you have any tattoos, <<$pcs_nickname>>?"'
 				'"I don''t know," you say with a shrug.'
 				'"I''m surprised the other gopniks let you hang around without at least one. Like an initiation or something."'
-				'Laughing, you say "We aren''t a gang, Lina."'
-				'"Ok," she says, not sounding convinced.'
+				'"We aren''t a gang, Lina," you reply with a laugh.'
+				'"Okay..." she says, not sounding convinced.'
 				'"If you don''t believe me, just look after the next gym class. We don''t all have tattoos."'
-				'Starting to laugh, she says "Yeah, I''m sure the other girls wouldn''t mind me checking for tattoos. Especially Lena and Lera."'
-				'You both end up laughing harder at the thought, and gossip the rest of the break away.'
+				'She laughs. "Yeah, I''m sure the other girls wouldn''t mind me checking for tattoos. Especially Lena and Lera."'
+				'You both end up laughing at the thought, and gossip the rest of the break away.'
 			else
 				'Lina sees you coming and asks "Does getting a tattoo hurt?"'
 				'"A little. Why, are you thinking about getting one?"'
-				'"Hell no. Christina would beat my ass if I did. She says..." Lina starts to go on a tirade about Christina''s views on tattoos and the people who get them when she remembbers who she is talking to. "Err... sorry <<$pcs_nickname>>."'
+				'"Hell no. Christina would beat my ass if I did. She says..." She goes on a tirade about Christina''s views on tattoos and the people who get them when she remembers who she''s talking to. "Err... sorry <<$pcs_nickname>>."'
 				'"You should make your own mind up about things, Lina."'
 				'You spend the rest of your break trying to get her to open her mind to new ideas, but you''re pretty sure it had no effect.'
 			end
 		elseif npc_rel['A19'] <= 20:
 			'Lina sees you coming and seems to get nervous. "I don''t speak to your kind. Go away!"'
 			'"My <i>kind</i>?"'
-			'As you come closer she shrinks back. "Just go away!"'
-			'You see the other jocks starting to look your way, and decide it''s best to leave for now.'
+			'As you come closer, she shrinks back. "Just go away!"'
+			'You see the other jocks starting to look your way, and decide it''s best to leave.'
 		else
 			'"Why do you people always get tattoos? Christina says they look awful."'
 			if tatarm = 0 or tatass = 0 or tatback = 0 or tatblly = 0 or tatbrst = 0 or tatchst = 0 or tatfce = 0 or tatankle = 0 or tathand = 0 or tatleg = 0 or tatlip = 0 or tatneck = 0 or tatvag = 0 or tatlech = 0 or tatside = 0 or tatupb = 0 or tatunder = 0 or tatwrist = 0:
 				'"What are you talking about? I don''t have any tattoos."'
 				'"It''s just a matter of time then."'
-				'"Wow. Ok, bye bitch." With that said you just walk away.'
+				'"Wow. Okay, bye bitch." With that said, you just walk away.'
 			else
 				'"My body is a work of art. Don''t be jealous of that."'
-				'"I''m not jealous! Eww. Why would I want that crap on me."'
-				'"Ok, did Christina not let you eat her out today or something? You''re in a bad mood." With that said you just walk away.'
+				'"I''m not jealous! Eww. Why would I want that crap on me?"'
+				'"Okay, did Christina not let you eat her out today or something? You''re in a bad mood." With that said, you just walk away.'
 			end
 		end
 	else
 		if npc_rel['A19'] >= 60:
 			'Lina sees you walking over to her and looks uncomfortable.'
-			'Giving her your best smile, you ask "How are you Lina?"'
-			'I''m fine. Look, I like you, but I cannot be seen talking to you.'
+			'"How are you, Lina?" you ask while giving her your best smile.'
+			'"I''m fine," she replies. "Look, I like you, but I can''t be seen talking to you."'
 		elseif npc_rel['A19'] <= 20:
-			'Teasingly, you ask "So, where''s the old ball and chain?"'
-			'"Oh shut up, <<$pcs_nickname>>. Don''t you have anything better to do? At least I have a friend unlike <i>some</i> people." Lina fires back.'
+			'"So, where''s the old ball and chain?" you ask teasingly.'
+			'"Oh shut up, <<$pcs_nickname>>! Don''t you have anything better to do? At least I have a friend unlike <i>some</i> people..." she fires back.'
 		else	
 			'Lina sees you walking over to her and looks uncomfortable.'
-			'Giving her your best smile, you ask "How are you Lina?"'
-			'I''m sorry, but I cannot be seen talking to you.'
+			'"How are you, Lina?" you ask while giving her your best smile.'
+			'"I''m sorry, but I can''t be seen talking to you."'
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Lina," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Lina," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lina_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
 			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Lina," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+				$temp['tampon_ask'] = '"Lina," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_jock_chats', 'lina_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lina_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_jock_chats', 'lina_tampon'
 			end
 		end
@@ -1134,39 +1107,39 @@ if $ARGS[0] = 'lina_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big19.jpg"></center>'
 	
-	if $temp['tampon_ask'] = '"Lina," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Lina," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Lina," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A19'] >= 70:
 			'She looks around before quickly digging through her backpack for a tampon. "Here."'
-			'"Thanks Lina."'
+			'"Thanks, Lina."'
 			'"Just don''t tell Christina," she whispers. "I know how she feels about you. She''d be pissed."'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 			isprok = 1
 		elseif npc_rel['A19'] > 20:
 			'She looks around before hesitantly digging through her backpack for a tampon. "Here."'
-			'"Thanks Lina."'
+			'"Thanks, Lina."'
 			'"Just don''t tell Christina," she whispers. "I know how she feels about you. She''d be pissed."'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 			isprok = 1
 		else
-			'"No fucking way." She gives you a look. "Take care of yourself you dumb bimbo."'
-			'With that she walks away, leaving you bleeding out your snatch in the middle of the hallway.'
+			'"No fucking way!" She gives you a look. "Take care of yourself, you dumb bimbo!'
+			'She then walks away, leaving you in the middle of the hallway.'
 		end
 	else
 		if npc_rel['A19'] >= 70:
 			'She looks around before quickly digging through her backpack. "I only have tampons."'
-			'"Thanks Lina."'
+			'"Thanks, Lina."'
 			'"Just don''t tell Christina," she whispers. "I know how she feels about you. She''d be pissed."'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 			isprok = 1
 		elseif npc_rel['A19'] > 20:
 			'She looks around before hesitantly digging through her backpack. "I only have tampons."'
-			'"Thanks Lina."'
+			'"Thanks, Lina."'
 			'"Just don''t tell Christina," she whispers. "I know how she feels about you. She''d be pissed."'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 			isprok = 1
 		else
-			'"No fucking way." She gives you a look. "Take care of yourself you dumb bimbo. And who the fuck uses pads?"'
-			'With that she walks away, leaving you cramping in the middle of the hallway.'
+			'"No fucking way!" She gives you a look. "Take care of yourself, you dumb bimbo! And who the fuck uses pads?"'
+			'She then walks away, leaving you cramping in the middle of the hallway.'
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -1186,8 +1159,8 @@ if $ARGS[0] = 'lariska':
 				'When she sees the ball, her eyes grow wide and she looks around fearfully. Seeing that Christina is engrossed in her conversation with Lina, she snatches the ball and stuffs it out of sight.'
 				'"I''m sorry, <<$pcs_nickname>>. If Christina finds out I was there instead of the sports center like I told her I would be..."'
 				'"Then why were you there?" you ask her teasingly, pretty sure you already know the answer.'
-				'Her face and neck turn bright red. "I-I...uh...I..." she stammers as she tries to think of an excuse, unwilling to admit the truth.'
-				'"Relax," you say laughing. "I beat the shit out of her, so she knows better then to deny me something I want. Just ask her about it the next time you get a chance, ok?"'
+				'Her face turns bright red. "I-I...Uh...I..." she stammers as she tries to think of an excuse, unwilling to admit the truth.'
+				'"Relax," you say laughing. "I beat the shit out of her, so she knows better then to deny me something I want. Just ask her about it the next time you get a chance, okay?"'
 				'She looks at you, a bit dazed, but manages to nod.'
 				'Giving her a soft smile, you head off to your next class.'
 			elseif christinaQW['blackmail'] >= 2 or christinaQW['subpath'] >= 2:
@@ -1197,8 +1170,8 @@ if $ARGS[0] = 'lariska':
 				'When she sees the ball, her eyes grow wide and she looks around fearfully. Seeing that Christina is engrossed in her conversation with Lina, she snatches the ball and stuffs it out of sight.'
 				'"I''m sorry, <<$pcs_nickname>>. If Christina finds out I was there instead of the sports center like I told her I would be..."'
 				'"Then why were you there?" you ask her teasingly, pretty sure you already know the answer.'
-				'Her face and neck turn bright red. "I-I...uh...I..." she stammers as she tries to think of an excuse, unwilling to admit the truth.'
-				'"Relax," you say laughing. "I already talked to her and she agreed to let you hang out with me outside of school. I promise. Just ask her about it the next time you get a chance, ok?"'
+				'Her face turns bright red. "I-I...Uh...I..." she stammers as she tries to think of an excuse, unwilling to admit the truth.'
+				'"Relax," you say laughing. "I already talked to her and she agreed to let you hang out with me outside of school. I promise. Just ask her about it the next time you get a chance, okay?"'
 				'She looks at you, a bit dazed, but manages to nod.'
 				'Giving her a soft smile, you head off to your next class.'
 			else
@@ -1208,11 +1181,11 @@ if $ARGS[0] = 'lariska':
 				'When she sees the ball, her eyes go wide and she looks around fearfully. Seeing that Christina is engrossed in her conversation with Lina, she snatches the ball and stuffs it out of sight.'
 				'"I''m sorry, <<$pcs_nickname>>. If Christina finds out I was there instead of the sports center like I told her I would be..."'
 				'"Then why were you there?" you ask her teasingly, pretty sure you already know the answer.'
-				'Her face and neck turn bright red. "I-I...uh...I..." she stammers as she tries to think of an excuse, unwilling to admit the truth.'
-				'"Relax," you say laughing. "I am pretty sure I already know," you say with a twinkle in your eye.'
-				'Her face flushes again, but all she says is "Don''t tell Christina I was there. She doesn''t like me hanging around you. She hates you, always has."'
+				'Her face turns bright red. "I-I...Uh...I..." she stammers as she tries to think of an excuse, unwilling to admit the truth.'
+				'"Relax," you say laughing. "I''m pretty sure I already know," you say with a twinkle in your eye.'
+				'Her face flushes again. "Don''t tell Christina I was there! She doesn''t like me hanging around you. She hates you, always has."'
 				'"I know, though I have no idea why. But don''t worry, I''ll figure out a way for her to agree to let us hang out. Or eliminate the need for her approval."'
-				'Lariska''s eyes grow wide, but she just says, "Just be careful, <<$pcs_nickname>>. I don''t want her to hurt you because of me."'
+				'Lariska''s eyes grow wide. "Just be careful, <<$pcs_nickname>>. I don''t want her to hurt you because of me."'
 				'"I can take it, sweetie. Especially when it''s worth it." You give her a sweet smile and head off to class.'
 			end
 		elseif LariskaQW['story'] = 3:
@@ -1220,25 +1193,25 @@ if $ARGS[0] = 'lariska':
 			if christinaQW['blackmail'] >= 2 or christinaQW['subpath'] >= 2 or christinaQW['fight'] = 1:
 				LariskaQW['story'] = 5
 				gs 'npc_relationship', 'modify', 'A13', 'like'
-				'"Ok, <<$pcs_nickname>>. I guess Christina wont stop me from hanging out with you now." She smiles a bit shyly and says "Do you want to come over afterschool and work on our homework together?"'
-				'You smile in response, and say "Sure, Lariska. I will meet up with you afterschool!"'
-				'She blushes a bit and says "Good, I''m looking forward to it!"'
+				'"Okay, <<$pcs_nickname>>. I guess Christina won''t stop me from hanging out with you now." She smiles shyly. "Do you want to come over after school and work on our homework together?"'
+				'You smile in response. "Sure. I''ll meet up with you after school!"'
+				'She blushes a little. "Good, I''m looking forward to it!"'
 			else
-				'"Hey, Lariska! How is your day going?"'
-				'"I''m sorry, <<$pcs_nickname>>, but I told you, Christina doesn''t really want me hanging out with you after school."'
+				'"Hey Lariska! How''s your day going?"'
+				'"I''m sorry <<$pcs_nickname>>, but I already told you that Christina doesn''t want me hanging out with you after school."'
 				'"I know Lariska, I''m working on it. In the meantime, I was just saying hi."'
-				'"O-Oh. I''m sorry, I just keep thinking about it. Hopefully you will manage to convince her." She gives you a sad smile.'
+				'"O-Oh. I''m sorry, I just keep thinking about it. Hopefully you''ll manage to convince her." She gives you a sad smile.'
 				'"Hang in there, sweetie. I''ll convince her, I promise."'
 			end
 		elseif LariskaQW['story'] = 4:
 			LariskaQW['story'] = 5
 			gs 'npc_relationship', 'modify', 'A13', 'like'
-			'"Ok, <<$pcs_nickname>>. I guess Christina wont stop me from hanging out with you now." She smiles a bit shyly and says "Do you want to come over afterschool and work on our homework together?"'
-			'You smile in response, and say "Sure, Lariska. I will meet up with you afterschool!"'
-			'She blushes a bit and says "Good, I''m looking forward to it!"'
+			'"Okay <<$pcs_nickname>>. I guess Christina won''t stop me from hanging out with you now." She smiles shyly. "Do you want to come over after school and work on our homework together?"'
+			'You smile in response. "Sure thing, Lariska. I''ll meet up with you after school!"'
+			'She blushes a little. "Good, I''m looking forward to it!"'
 		else
 			gs 'npc_relationship', 'modify', 'A13', 'love'
-			'"Hey, cutie," you say when you see Lariska. She blushes a little, but still smiles at you. You spend the rest of the break chatting with her.'
+			'"Hey cutie," you say when you see Lariska. She blushes a little, but still smiles at you. You spend the rest of the break chatting with her.'
 		end
 	else
 		gs 'npc_relationship', 'modify', 'A13', 'like'
@@ -1249,11 +1222,11 @@ if $ARGS[0] = 'lariska':
 			elseif npc_rel['A13'] <= 20:
 				'"Aren''t you looking for a cock to suck you big slut?" Lariska says mockingly.'
 				'"Shut up Lariska! Don''t you have Christina''s tail to run after or something?" you tiredly reply.'
-				'"Poor little slut. Go chase another cock." she begins to laugh as she walks away.'
+				'"Poor little slut. Go chase another cock," she laughs as she walks away.'
 			else
-				'Seeing you in the hallway, Lariska can''t help but ask "Why are <i>you</i> here? The boys bathroom is that way, I''m sure they''re missing you right now."'
-				'Giving her you best sultry look, you respond with "I take care of girls too. Wanna try?"'
-				'She gives you a shocked look, her face turning red at the same time. "Go away, <<$pcs_nickname>>."'
+				'Seeing you in the hallway, Lariska can''t help but scowl. "Why are <i>you</i> here? The boys bathroom is that way, I''m sure they''re missing you right now."'
+				'You respond by giving her your best sultry look. "I take care of girls too. Wanna try?"'
+				'She gives you a shocked look as her face turns bright red. "Go away, <<$pcs_nickname>>!"'
 			end
 		elseif grupTipe = 1:
 			if npc_rel['A13'] >= 50:
@@ -1267,12 +1240,12 @@ if $ARGS[0] = 'lariska':
 				'"The other kids may think you''re cool, but I know better!"'
 				'"Well, that''s one way to start a conversation, I guess."'
 				'"Pass, bitch. I would rather not talk with you at all."'
-				'"Okay... who is the bitch now." You walk away before this gets heated.'
+				'"Okay... Who''s actually the bitch here?" You walk away before this gets heated.'
 			else
 				'"Hey <<$pcs_nickname>>! I need help with a thing and I think you''re the perfect person that can help me out." Lariska smiles.'
 				'Curious, you ask "What do you need help with?"'
 				'"Well... I need to impress Christina and need your help with coming up with something fitting..." she starts on a long tirade about what might impress Christina.'
-				'Feeling your braincells slowly dying, and interrupt her instead. "Well, I got to head to class, I got this thing. Bye."'
+				'Feeling your braincells slowly dying, you interrupt her instead. "Well, I''ve got to head to class. Got this thing to do. Bye!"'
 			end
 		elseif grupTipe = 2:
 			if npc_rel['A13'] >= 50:
@@ -1280,7 +1253,7 @@ if $ARGS[0] = 'lariska':
 				'"No, why?" You can sense the desperation in her demeanor.'
 				'"Well Lina was running after her and I don''t want to be left out..." She dismayingly looks at you.'
 				'"Listen Lariska." You grab hold of her. "You don''t need to run after anyone. You''re fine on your own, okay? Now stop worrying and head to class instead."'
-				'Blushing, she nods. "I''ll try."'
+				'She nods while blushing. "I''ll try."'
 				'You spend the rest of break chatting with her, trying to take her mind off Christina.'
 			elseif npc_rel['A13'] <= 20:
 				'"I sure beat your ass during gym class. You had no chance against me!" Lariska is gleefully trash-talking you.'
@@ -1291,25 +1264,25 @@ if $ARGS[0] = 'lariska':
 				'"Hey <<$pcs_nickname>>! I need help with a thing and I think you''re the perfect person that can help me out." Lariska smiles.'
 				'Curious, you ask "What do you need help with?"'
 				'"Well... I need to impress Christina and need your help with coming up with something fitting..." she starts on a long tirade about what might impress Christina.'
-				'Feeling your braincells slowly dying, and interrupt her instead. "Well, I got to head to class, I got this thing. Bye."'
+				'Feeling your braincells slowly dying, you interrupt her instead. "Well, I''ve got to head to class. Got this thing to do. Bye!"'
 			end
 		elseif grupTipe = 3:
 			if npc_rel['A13'] >= 50:
 				'"Hey <<$pcs_nickname>>. When are you going to stop staring at books and come play some sports with us?"'
 				'"No thank you, Lariska. I want to go to university, so I have to keep studying."'
-				'"There isn''t anything wrong with studying, <<$pcs_nickname>>. But you have to go outside once in awhile too."'
-				'You tell her a bit about the last book you read, but you can see her eyes glazing over. "Ok, I need to head to class," you say, letting her off the hook.'
-				'Trying to hide her relief, she responds "Ok, see you later."'
+				'"There''s nothing wrong with studying, but you have to go outside once in a while too."'
+				'You tell her a bit about the last book you read, but you can see her eyes glazing over. "Okay, I need to head to class," you say, letting her off the hook.'
+				'"Okay," she responds. "See you later." She''s trying to hide her relief.'
 			elseif npc_rel['A13'] <= 20:
 				'"You don''t belong here, nerd. You better leave before I get Christina to kick your ass!"'
-				'"My, aren''t you friendly today Lariska."'
-				'"I''m not kidding, bitch. Get lost. Now"'
+				'"My, aren''t you friendly today?"'
+				'"I''m not kidding, bitch! Get lost. Now!"'
 				'Sighing, you leave before she can start a fight.'
 			else
 				'"Hey Lariska. Why can''t you trust atoms?"'
-				'Huh? What are you talking about, <<$pcs_nickname>>?'
+				'"Huh? What are you talking about, <<$pcs_nickname>>?"'
 				'"They make up everything!"'
-				'"Right... I gotta go, Christina needs me." Standing up, she walks away before you can tell her any more jokes.'
+				'"Right... I gotta go. Christina needs me." Standing up, she walks away before you can tell her any more jokes.'
 			end
 		elseif grupTipe = 4:
 			if npc_rel['A13'] >= 50:
@@ -1317,61 +1290,61 @@ if $ARGS[0] = 'lariska':
 				'"Hey, Lariska."'
 				'"Hi, <<$pcs_nickname>>. You know Christina will throw a fit if she sees you talking to me."'
 				'"Fuck her. I''m not afraid."'
-				'Your attitude seems to embolden her a bit, as she stands a bit straighter and actually talks to you for awhile. Eventually break ends, and she waves bye at you, a secret little smile on her face just meant for you.'
+				'Your attitude seems to embolden her a bit, as she stands a bit straighter and actually talks to you for a while. Break eventually ends and she waves goodbye with a secret little smile on her face meant just for you.'
 			elseif npc_rel['A13'] <= 20:
 				'Lariska sees you in the hallway walking towards her and stands up, looking nervous.'
-				'"Hey, Lariska."'
-				'"Hi, <<$pcs_nickname>>. Sorry, can''t chat. Christina needs me." She runs off, looking for her idol.'
-				+$OpenInnerThought+'Well that bitch was rude!'+$CloseInnerThought
+				'"Hey Lariska."'
+				'"Hi <<$pcs_nickname>>. Sorry, can''t chat. Christina needs me." She then runs off, looking for her idol.'
+				+$OpenInnerThought+'Well that was rude, bitch!'+$CloseInnerThought
 			else
 				'Lariska sees you in the hallway walking towards her and stands up, looking nervous.'
-				'"Hey, Lariska."'
-				'"Hi, <<$pcs_nickname>>. Sorry, I don''t think you''re supposed to be here." She looks around, like she is afraid and needs protection.'
+				'"Hey Lariska."'
+				'"Hi <<$pcs_nickname>>. Sorry, I don''t think you''re supposed to be here." She looks around, like she''s afraid and needs protection.'
 				'"I just wanted to chat with you. I won''t bite... much."'
 				'Her face turns bright red and she starts shuffling her feet. "I''m sorry, I''ll get in trouble if Christina sees me talking to you." She gives you a pleading look.'
-				'"Ok, ok. I will just head to class then. See you around." She gives you a brief, shy smile before you walk away.'
+				'"Okay, okay. I''ll just head to class then. See you around." She gives you a brief, shy smile before you walk away.'
 			end
 		else
 			if npc_rel['A13'] >= 50:
 				'"I asked Christina if you could join our group. I was not prepared for the answer."'
-				'"Yeah, that bitch has hated me for as long as I can remember. Who knows why." Shrugging, you add "Whatever her issue is, it''s her problem."'
+				'You shrug. "Yeah, that bitch has hated me for as long as I can remember. Whatever her issue is, it''s her problem."'
 				'"I would be careful talking like that. If she hears you..."'
-				'Shrugging again, you say "I''m not afraid of her."'
-				'Changing the subject, the two of you gossip the rest of break.'
+				'You shrug again. "I''m not afraid of her."'
+				'Changing the subject, the two of you gossip for the rest of break.'
 			elseif npc_rel['A13'] <= 20:
-				'Teasingly, you ask "So where''s the old ball and chain?"'
-				'"Oh shut up <<$pcs_nickname>>. Don''t you have anything better to do? At least I have friends." Lariska fires back.'
-				'You start laughing. "Yeah, <i>friends</i>." Rolling your eyes at her, you walk off.'
+				'"So where''s the old ball and chain?" you ask teasingly.'
+				'"Oh shut up, <<$pcs_nickname>>! Don''t you have anything better to do? At least I have friends!" she fires back.'
+				'You start laughing. "Yeah, <i>friends</i>." Rolling your eyes at her, you walk away.'
 			else	
 				'"What are you doing here, <<$pcs_nickname>>? You don''t have friends here."'
-				'"Just because I''m not in your little social clubs doesn''t mean I don''t have friends."'
+				'"Just because I''m not in your little social club doesn''t mean I don''t have friends."'
 				'"That''s exactly what that means. If you actually tried to get along with people, maybe they would start accepting you."'
-				'Shrugging, you just give her a smile and walk off.'
+				'Shrugging, you just give her a smile and walk away.'
 			end
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Lariska," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Lariska," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lariska_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Lariska," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Lariska," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_jock_chats', 'lariska_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_jock_chats', 'lariska_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_jock_chats', 'lariska_tampon'
 			end
 		end
@@ -1382,7 +1355,7 @@ if $ARGS[0] = 'lariska_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
 	
-	if $temp['tampon_ask'] = '"Lariska," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Lariska," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Lariska," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A13'] >= 70:
 			'She looks around before quickly digging through her backpack for a tampon and discreetly passes it to you. "Here."'
 		else
@@ -1397,9 +1370,9 @@ if $ARGS[0] = 'lariska_tampon':
 			'"I only have tampons," she says as she discreetly passes you one.'
 		end
 	end
-	'"Thanks Lariska."'
+	'"Thanks, Lariska."'
 	'"Just don''t tell Christina," she whispers. "I don''t want to leave you hanging but she''ll kill me if she finds out."'
-	'Then you run off to the bathroom to go put the tampon in before class starts.'
+	'You run off to the bathroom to go put the tampon in before class starts.'
 	isprok = 1
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -1423,11 +1396,10 @@ if $ARGS[0] = 'ivan':
 	gs 'exp_gain', 'chrsm', rand(1,2)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
-	!!this is story arc stuff I think it is coded correct but not sure.
 	if npc_rel['A3'] >= 80 and NikoPayback = 2 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
 	if fame['pav_slut'] < 225 and IvanShowerQW = 1:
 		IvanShowerQW = 11
-		'Ivan thinks for a moment before he speaks. "<<$pcs_nickname>>, I would like to talk to you about what happened in the shower. You''re a great girl, and I had a great time, but I''m not ready for a relationship. I need to put all my energy into my athletics. I think I have a good shot at getting to the Russian National Championships this year. I really can''t afford to be distracted by girls, even girls as attractive as you. So how about we just stick to fooling around a little?"'
+		'Ivan thinks for a second before he speaks. "<<$pcs_nickname>>, I would like to talk to you about what happened in the shower. You''re a great girl, and I had a great time, but I''m not ready for a relationship. I need to put all my energy into my athletics. I think I have a good shot at getting to the Russian National Championships this year. I really can''t afford to be distracted by girls, even girls as attractive as you. So how about we just stick to fooling around a little?"'
 		act 'Discuss':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
@@ -1436,7 +1408,6 @@ if $ARGS[0] = 'ivan':
 			'You laugh at his silly antics. It''s nice to have found a fun guy to hang out with. Perhaps you will stop by his place, or maybe even take him up on his offer to make lunch break less boring. "Sure Ivan, I''ll think about it."'
 
 			if npc_rel['A3'] >= 80 and NikoPayback = 2 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
-
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			act 'Tell him you''re bored right now':gt 'gdksport', 'Ivan_bored'
 		end
@@ -1452,8 +1423,7 @@ if $ARGS[0] = 'ivan':
 		else
 			act 'Tell Ivan you''re bored':gt 'gdksport', 'Ivan_bored'
 		end
-!! Since Ivan is only asking about the current day, not indefinitely, might be good to use a daystart
-!! variable here and in the scene in gdksport IvanShowerYes guards (IvanShowerDayStart or something)
+!! Since Ivan is only asking about the current day, not indefinitely, might be good to use a daystart variable here and in the scene in gdksport IvanShowerYes guards (IvanShowerDayStart or something)
 	elseif IvanShowerYes = 0 and IvanShowerQW = 11 and ShowerIvan < 3:
 		'As you''re about to head for your next class, Ivan suddenly stops you. "<<$pcs_nickname>>, want to meet up with me in the showers after school?"'
 		act 'Decline':
@@ -1582,9 +1552,9 @@ if $ARGS[0] = 'ivan':
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A3'] >= 50:
-			'"Hi <<$pcs_nickname>>." Ivan greets you as you walk towards him.'
+			'"Hi <<$pcs_nickname>>," Ivan greets you as you walk towards him.'
 			'"What''s up, Prince of Boxers? Do you still have time to chat despite all the training and the crowds of cheerleaders?" you ask jokingly as you do shadowboxing next to him.'
-			'"I always have time for you." he replies as he winks at you. He starts to talk about everything that comes to his mind, but mostly about boxing, running, and the workouts he and Fedor have been doing together lately.'
+			'"I always have time for you," he replies as he winks at you. He starts to talk about everything that comes to his mind, but mostly about boxing, running, and the workouts he and Fedor have been doing together lately.'
 			'"You''ll end up joining us if you become such a pro at fighting. Think about it," you say with a wistful sigh before you start talking about how many adventures he could have with you and your fellow gopniks. "I''d challenge you to a fight sometime, though." you say, filled with self-confidence. "I bet I could kick your ass." you continue as you playfully smack him on the ass.'
 			*nl
 			'"You can always find me in the community center if you''d like to bet your ass," he says and you can see his eyes running down your ass.'
@@ -1610,7 +1580,7 @@ if $ARGS[0] = 'ivan':
 			'"The truth is, I was just about to..." he starts to say, and when he looks at you and sees that he has no chance of getting away, he continues. "...but anyway, we can talk."'
 			'He''s not in a great mood, and keeps looking in the direction of the others, as if expecting one of them to do something. He sighs and realizes he has no other choice than to share a thing or two about what''s been going on with him lately.'
 			*nl
-			'"Booooring." you say as you roll your eyes. "You should do more things, get some free time or you''ll miss the best time of your life." you add.'
+			'"Booooring!" you say as you roll your eyes. "You should do more things, get some free time or you''ll miss the best time of your life."'
 			'"You know, I don''t really have time for anything other than training and doing some important things at home." he says, then complains about how although he''d like to be a bit more social, he can''t afford to be distracted by anything.'
 			'"I was hoping you''d tell me something more interesting, though. I''m probably more bored now than I was before!" you say jokingly before standing up, dusting yourself off and walking away while waving at him.'
 		end

+ 23 - 2
locations/gschool_lessons.qsrc

@@ -73,7 +73,17 @@ if $ARGS[0] = 'uniform_check':
 		grupvalue[2] -= 1
 		'<font color="blue">This uniform is very conservative.</font>'
 	elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0:
-		if PCloQuality >= 4:
+		if PCloInhibit >= 30 or PCloTopCut = 4:
+			grupvalue[1] -= 1
+			grupvalue[2] -= 1
+			grupvalue[3] -= 1
+			grupvalue[4] += 1
+			grupvalue[5] -= 1
+			'<font color="red">This uniform complies with the regulations but is too risqué.</font>'
+		elseif CloStyle = 2:
+			grupvalue[4] += 1
+			'<font color="blue">This uniform follows the school regulation on skirt length but is of a style that appeals to Gopniks.</font>'	
+		elseif PCloQuality >= 4:
 			grupvalue[1] += 1
 			grupvalue[2] += 1
 			'<font color="blue">This uniform complies with the regulations and is of good quality.</font>'
@@ -81,7 +91,17 @@ if $ARGS[0] = 'uniform_check':
 			'<font color="blue">This uniform complies with the school regulations on skirt length.</font>'
 		end
 	elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
-		if PCloQuality >= 4:
+		if PCloInhibit >= 35:
+			grupvalue[1] -= 1
+			grupvalue[2] -= 1
+			grupvalue[3] -= 1
+			grupvalue[4] += 1
+			grupvalue[5] -= 1
+			'<font color="red">This uniform slightly breaches the school regulations and it is too risqué.</font>'
+		elseif CloStyle = 2:
+			grupvalue[4] += 1
+			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'	
+		elseif PCloQuality >= 4:
 			grupvalue[1] += 1
 			grupvalue[2] += 1
 			grupvalue[4] += 1
@@ -101,6 +121,7 @@ if $ARGS[0] = 'uniform_check':
 	end
 end
 
+
 if $ARGS[0] = 'short_break':
 	killvar '$breaktype'
 	killvar '$locclass'

+ 16 - 13
locations/gschool_lessons1.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'russian':
 		if will_cost <= pcs_willpwr:
 			act 'Flash your breasts at Svyatoslav (<<will_cost>> Willpower)':
 				*clr & cla
-				npc_rel['A152'] += 1
+				gs 'npc_relationship', 'modify', 'A8', 'like'
 				gs 'willpower', 'exhib', 'self', 'medium'
 				gs 'willpower', 'pay', 'self'
 				gs 'flash', 'tits', 'indoors', 1, 1
@@ -264,7 +264,7 @@ if $ARGS[0] = 'russian':
 				end
 				act 'Flash your breasts':
 					*clr & cla
-					npc_rel['A8'] += 1
+					gs 'npc_relationship', 'modify', 'A8', 'like'
 					gs 'flash', 'tits', 'indoors', 1, 1
 					gs 'fame', 'pav', 'sex', 5
 					gs 'stat'
@@ -280,6 +280,7 @@ if $ARGS[0] = 'russian':
 				if $pantyworntype ! 'none':
 					act 'Flash your panties':
 						*clr & cla
+						gs 'npc_relationship', 'modify', 'A8', 'like'
 						gs 'flash', 'panties', 'indoors', 1, 1
 						gs 'fame', 'pav', 'sex', 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teasep1.jpg"></center>'
@@ -298,7 +299,7 @@ if $ARGS[0] = 'russian':
 						end
 						act 'Raise your skirt more':
 							*clr & cla
-							npc_rel['A8'] += 1
+							gs 'npc_relationship', 'modify', 'A8', 'like'
 							gs 'fame', 'pav', 'sex', 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teasep2.jpg"></center>'
 							'You pull your skirt up so your panties are exposed and Svyatoslav grins wide. You can tell he''s hoping to see more by the way he''s looking at you.'
@@ -320,7 +321,7 @@ if $ARGS[0] = 'russian':
 								end
 								act 'Show him your pussy':
 									*clr & cla
-									npc_rel['A8'] += 1
+									gs 'npc_relationship', 'modify', 'A8', 'like'
 									gs 'fame', 'pav', 'sex', 5
 									gs 'flash', 'pussy', 'indoors', 3, 1
 									gs 'stat'
@@ -339,7 +340,7 @@ if $ARGS[0] = 'russian':
 				else
 					act 'Flash your pussy':
 						*clr & cla
-						npc_rel['A8'] += 1
+						gs 'npc_relationship', 'modify', 'A8', 'like'
 						gs 'fame', 'pav', 'sex', 5
 						gs 'arousal', 'flash', 3
 						gs 'arousal', 'end'
@@ -613,7 +614,7 @@ if $ARGS[0] = 'geography':
 		if will_cost <= pcs_willpwr:
 			act 'Flash your breasts at Artem (<<will_cost>> Willpower)':
 				*clr & cla
-				npc_rel['A152'] += 1
+				gs 'npc_relationship', 'modify', 'A2', 'like'	
 				gs 'willpower', 'exhib', 'self', 'medium'
 				gs 'willpower', 'pay', 'self'
 				gs 'flash', 'tits', 'indoors', 1, 1
@@ -819,7 +820,7 @@ if $ARGS[0] = 'geography':
 				end
 				act 'Flash your breasts':
 					*clr & cla
-					npc_rel['A9'] += 1
+					gs 'npc_relationship', 'modify', 'A9', 'like'	
 					gs 'flash', 'tits', 'indoors', 1, 1
 					gs 'fame', 'pav', 'sex', 5
 					gs 'stat'
@@ -835,6 +836,7 @@ if $ARGS[0] = 'geography':
 				if $pantyworntype ! 'none':
 					act 'Flash your panties':
 						*clr & cla
+						gs 'npc_relationship', 'modify', 'A9', 'like'	
 						gs 'flash', 'panties', 'indoors', 1, 1
 						gs 'fame', 'pav', 'sex', 1
 						gs 'stat'
@@ -854,7 +856,7 @@ if $ARGS[0] = 'geography':
 						end
 						act 'Raise your skirt more':
 							*clr & cla
-							npc_rel['A9'] += 1
+							gs 'npc_relationship', 'modify', 'A9', 'like'	
 							gs 'fame', 'pav', 'sex', 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teasep2.jpg"></center>'
 							'You pull your skirt up more so your panties are exposed. Vitek grins wide as he stares at your panty covered pussy. You can tell he''s hoping to see more by the way he''s looking at you.'
@@ -876,7 +878,7 @@ if $ARGS[0] = 'geography':
 								end
 								act 'Show him your pussy':
 									*clr & cla
-									npc_rel['A8'] += 1
+									gs 'npc_relationship', 'modify', 'A9', 'like'	
 									gs 'fame', 'pav', 'sex', 5
 									gs 'flash', 'pussy', 'indoors', 3, 1
 									gs 'stat'
@@ -1138,7 +1140,7 @@ if $ARGS[0] = 'history':
 		if will_cost <= pcs_willpwr:
 			act 'Flash your breasts at Petka (<<will_cost>> Willpower)':
 				*clr & cla
-				npc_rel['A152'] += 1
+				gs 'npc_relationship', 'modify', 'A6', 'like'	
 				gs 'willpower', 'exhib', 'self', 'medium'
 				gs 'willpower', 'pay', 'self'
 				gs 'flash', 'tits', 'indoors', 1, 1
@@ -1344,7 +1346,7 @@ if $ARGS[0] = 'history':
 				end
 				act 'Flash your breasts':
 					*clr & cla
-					npc_rel['A157'] += 1
+					gs 'npc_relationship', 'modify', 'A157', 'like'
 					gs 'flash', 'tits', 'indoors', 1, 1
 					gs 'fame', 'pav', 'sex', 5
 					gs 'stat'
@@ -1360,6 +1362,7 @@ if $ARGS[0] = 'history':
 				if $pantyworntype ! 'none':
 					act 'Flash your panties':
 						*clr & cla
+						gs 'npc_relationship', 'modify', 'A157', 'like'
 						gs 'flash', 'panties', 'indoors', 1, 1
 						gs 'fame', 'pav', 'sex', 1
 						gs 'stat'
@@ -1379,7 +1382,7 @@ if $ARGS[0] = 'history':
 						end
 						act 'Raise your skirt more':
 							*clr & cla
-							npc_rel['A157'] += 1
+							gs 'npc_relationship', 'modify', 'A157', 'like'
 							gs 'fame', 'pav', 'sex', 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teasep2.jpg"></center>'
 							'You pull your skirt up more so your panties are exposed to Roman, who grins wide as he stares at your panty covered pussy. You can tell he''s hoping to see more by the way he''s looking at you.'
@@ -1401,7 +1404,7 @@ if $ARGS[0] = 'history':
 								end
 								act 'Show him your pussy':
 									*clr & cla
-									npc_rel['A8'] += 1
+									gs 'npc_relationship', 'modify', 'A157', 'like'
 									gs 'fame', 'pav', 'sex', 5
 									gs 'flash', 'pussy', 'indoors', 3, 1
 									gs 'stat'

+ 12 - 10
locations/gschool_lessons2.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = 'computer':
 		if will_cost <= pcs_willpwr:
 			act 'Flash your breasts at Artem (<<will_cost>> Willpower)':
 				*clr & cla
-				npc_rel['A2'] += 1
+				gs 'npc_relationship', 'modify', 'A12', 'like'
 				gs 'willpower', 'exhib', 'self', 'medium'
 				gs 'willpower', 'pay', 'self'
 				gs 'flash', 'tits', 'indoors', 2, 1
@@ -274,7 +274,7 @@ if $ARGS[0] = 'computer':
 				end
 				act 'Flash your breasts':
 					*clr & cla
-					npc_rel['A11'] += 1
+					gs 'npc_relationship', 'modify', 'A11', 'like'
 					gs 'flash', 'tits', 'indoors', 2, 1
 					gs 'fame', 'pav', 'sex', 5
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teaseb2.jpg"></center>'
@@ -289,6 +289,7 @@ if $ARGS[0] = 'computer':
 				if $pantyworntype ! 'none':
 					act 'Flash your panties':
 						*clr & cla
+						gs 'npc_relationship', 'modify', 'A11', 'like'
 						gs 'flash', 'panties', 'indoors', 2, 1
 						gs 'fame', 'pav', 'sex', 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teasep1.jpg"></center>'
@@ -307,7 +308,7 @@ if $ARGS[0] = 'computer':
 						end
 						act 'Raise your skirt more':
 							*clr & cla
-							npc_rel['A11'] += 1
+							gs 'npc_relationship', 'modify', 'A11', 'like'
 							gs 'fame', 'pav', 'sex', 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teasep2.jpg"></center>'
 							'You pull your skirt up more so your panties are exposed. He grins wide as he stares at your panty covered pussy. You can tell he''s hoping to see more by the way he''s looking at you.'
@@ -329,7 +330,7 @@ if $ARGS[0] = 'computer':
 								end
 								act 'Show him your pussy':
 									*clr & cla
-									npc_rel['A11'] += 1
+									gs 'npc_relationship', 'modify', 'A11', 'like'
 									gs 'fame', 'pav', 'sex', 5
 									gs 'flash', 'pussy', 'indoors', 3, 1
 									gs 'stat'
@@ -633,7 +634,7 @@ if $ARGS[0] = 'science':
 		if will_cost <= pcs_willpwr:
 			act 'Flash your breasts at Fedor (<<will_cost>> Willpower)':
 				*clr & cla
-				npc_rel['A5'] += 1
+				gs 'npc_relationship', 'modify', 'A5', 'like'
 				gs 'willpower', 'exhib', 'self', 'medium'
 				gs 'willpower', 'pay', 'self'
 				gs 'flash', 'tits', 'indoors', 2, 1
@@ -1062,7 +1063,7 @@ if $ARGS[0] = 'music':
 		if will_cost <= pcs_willpwr:
 			act 'Flash your breasts at Petka (<<will_cost>> Willpower)':
 				*clr & cla
-				npc_rel['A6'] += 1
+				gs 'npc_relationship', 'modify', 'A6', 'like'
 				gs 'willpower', 'exhib', 'self', 'medium'
 				gs 'willpower', 'pay', 'self'
 				gs 'flash', 'tits', 'indoors', 2, 1
@@ -1268,7 +1269,7 @@ if $ARGS[0] = 'music':
 				end
 				act 'Flash your breasts':
 					*clr & cla
-					npc_rel['A155'] += 1
+					gs 'npc_relationship', 'modify', 'A155', 'like'
 					gs 'flash', 'tits', 'indoors', 2, 1
 					gs 'fame', 'pav', 'sex', 5
 					gs 'stat'
@@ -1284,6 +1285,7 @@ if $ARGS[0] = 'music':
 				if $pantyworntype ! 'none':
 					act 'Flash your panties':
 						*clr & cla
+						gs 'npc_relationship', 'modify', 'A155', 'like'
 						gs 'flash', 'panties', 'indoors', 2, 1
 						gs 'fame', 'pav', 'sex', 1
 						gs 'stat'
@@ -1303,7 +1305,7 @@ if $ARGS[0] = 'music':
 						end
 						act 'Raise your skirt more':
 							*clr & cla
-							npc_rel['A155'] += 1
+							gs 'npc_relationship', 'modify', 'A155', 'like'
 							gs 'fame', 'pav', 'sex', 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teasep2.jpg"></center>'
 							'You pull your skirt up more so your panties are exposed to Lavrenti. He grins wide as he stares at your panty covered pussy. You can tell he''s hoping to see more by the way he''s looking at you.'
@@ -1325,7 +1327,7 @@ if $ARGS[0] = 'music':
 								end
 								act 'Show him your pussy':
 									*clr & cla
-									npc_rel['A155'] += 1
+									gs 'npc_relationship', 'modify', 'A155', 'like'
 									gs 'fame', 'pav', 'sex', 5
 									gs 'flash', 'pussy', 'indoors', 3, 1
 									gs 'stat'
@@ -1586,7 +1588,7 @@ if $ARGS[0] = 'biology':
 		if will_cost <= pcs_willpwr:
 			act 'Flash your breasts at Lesco (<<will_cost>> Willpower)':
 				*clr & cla
-				npc_rel['A5'] += 1
+				gs 'npc_relationship', 'modify', 'A7', 'like'
 				gs 'willpower', 'exhib', 'self', 'medium'
 				gs 'willpower', 'pay', 'self'
 				gs 'flash', 'tits', 'indoors', 2, 1

+ 10 - 8
locations/gschool_lessons3.qsrc

@@ -489,7 +489,7 @@ if $ARGS[0] = 'art':
 			if will_cost <= pcs_willpwr:
 				act 'Flash your breasts at Feofan (<<will_cost>> Willpower)':
 					*clr & cla
-					npc_rel['A152'] += 1
+					gs 'npc_relationship', 'modify', 'A152', 'like'
 					gs 'willpower', 'exhib', 'self', 'medium'
 					gs 'willpower', 'pay', 'self'
 					gs 'flash', 'tits', 'indoors', 2, 1
@@ -690,7 +690,7 @@ if $ARGS[0] = 'art':
 					end
 					act 'Flash your breasts':
 						*clr & cla
-						npc_rel['A8'] += 1
+						gs 'npc_relationship', 'modify', 'A8', 'like'
 						gs 'flash', 'tits', 'indoors', 2, 1
 						gs 'fame', 'pav', 'sex', 5
 						gs 'stat'
@@ -706,6 +706,7 @@ if $ARGS[0] = 'art':
 					if $pantyworntype ! 'none':
 						act 'Flash your panties':
 							*clr & cla
+							gs 'npc_relationship', 'modify', 'A8', 'like'
 							gs 'flash', 'panties', 'indoors', 2, 1
 							gs 'fame', 'pav', 'sex', 1
 							gs 'stat'
@@ -725,7 +726,7 @@ if $ARGS[0] = 'art':
 							end
 							act 'Raise your skirt more':
 								*clr & cla
-								npc_rel['A8'] += 1
+								gs 'npc_relationship', 'modify', 'A8', 'like'
 								gs 'flash', 'panties', 'indoors', 2, 1
 								gs 'fame', 'pav', 'sex', 1
 								gs 'stat'
@@ -749,7 +750,7 @@ if $ARGS[0] = 'art':
 									end
 									act 'Show him your pussy':
 										*clr & cla
-										npc_rel['A8'] += 1
+										gs 'npc_relationship', 'modify', 'A8', 'like'
 										gs 'fame', 'pav', 'sex', 5
 										gs 'flash', 'pussy', 'indoors', 3, 1
 										gs 'stat'
@@ -1053,7 +1054,7 @@ if $ARGS[0] = 'shop':
 			if will_cost <= pcs_willpwr:
 				act 'Flash your breasts at Fedor (<<will_cost>> Willpower)':
 					*clr & cla
-					npc_rel['A152'] += 1
+					gs 'npc_relationship', 'modify', 'A5', 'like'
 					gs 'willpower', 'exhib', 'self', 'medium'
 					gs 'willpower', 'pay', 'self'
 					gs 'flash', 'tits', 'indoors', 2, 1
@@ -1264,7 +1265,7 @@ if $ARGS[0] = 'shop':
 					end
 					act 'Flash your breasts':
 						*clr & cla
-						npc_rel['A10'] += 1
+						gs 'npc_relationship', 'modify', 'A10', 'like'
 						gs 'flash', 'tits', 'indoors', 2, 1
 						gs 'fame', 'pav', 'sex', 5
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teaseb2.jpg"></center>'
@@ -1279,6 +1280,7 @@ if $ARGS[0] = 'shop':
 					if $pantyworntype ! 'none':
 						act 'Flash your panties':
 							*clr & cla
+							gs 'npc_relationship', 'modify', 'A10', 'like'
 							gs 'flash', 'panties', 'indoors', 2, 1
 							gs 'fame', 'pav', 'sex', 1
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teasep1.jpg"></center>'
@@ -1297,7 +1299,7 @@ if $ARGS[0] = 'shop':
 							end
 							act 'Raise your skirt more':
 								*clr & cla
-								npc_rel['A10'] += 1
+								gs 'npc_relationship', 'modify', 'A10', 'like'
 								gs 'fame', 'pav', 'sex', 1
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teasep2.jpg"></center>'
 								'You pull your skirt up more so your panties are exposed to Dan, who grins wide as he stares at your panty covered pussy. You can tell he''s hoping to see more by the way he''s looking at you.'
@@ -1319,7 +1321,7 @@ if $ARGS[0] = 'shop':
 									end
 									act 'Show him your pussy':
 										*clr & cla
-										npc_rel['A8'] += 1
+										gs 'npc_relationship', 'modify', 'A10', 'like'
 										gs 'fame', 'pav', 'sex', 5
 										gs 'flash', 'pussy', 'indoors', 3, 1
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/teasep4.jpg"></center>'

+ 1 - 1
locations/gschool_lunch.qsrc

@@ -534,7 +534,7 @@ if $ARGS[0] = 'rolan_meet':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/rolan/school/rolanmeet3.jpg"></center>'
 			'He comically falls on the floor. "Hey! What are you doing!?"'
 			'"You''re in no position to question me! Why are you drunk? You know you''re in a school, right? I should call the police!"'
-			'He starts to reach for the chair you pulled out from under him. "Hey! I''m not drunk and I''m on break!"'
+			'He starts to reach for the chair you pulled out from under him. "Hey! I''m not drunk and I''m on a break!"'
 			'"Right, like I believe that. What are you doing here? Are you... homeless?" You start feeling a little bit of remorse.'
 			'"Huh? No, I''m the janitor! <i>I</i> should be the one reporting <i>you</i>! Who do you think you are, throwing people around like this? I should have a word with Miss Volkov..."'
 			'"Wha-" you start to ask when you notice the name tag on the table. <i>Rolan Matveev: Janitor</i>. Shit! He really does work here! "Oh, uh, I''m really sorry, sir. I didn''t see your badge..."'

+ 10 - 10
locations/gschool_nerd_chats.qsrc

@@ -281,14 +281,14 @@ if $ARGS[0] = 'julia':
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Julia," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Julia," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_nerd_chats', 'julia_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
 			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Julia," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+				$temp['tampon_ask'] = '"Julia," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_nerd_chats', 'julia_tampon'
 			end
 		end
@@ -300,7 +300,7 @@ if $ARGS[0] = 'julia':
 		
 		if $pantyworntype ! 'none':
 			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Julia," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+				$temp['tampon_ask'] = '"Julia," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_nerd_chats', 'julia_tampon'
 			end
 		end
@@ -312,7 +312,7 @@ if $ARGS[0] = 'julia_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
 	
-	if $temp['tampon_ask'] = '"Julia," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Julia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Julia," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Julia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A14'] > 40:
 			'"A tampon?" Julia blushes faintly as she reaches for her purse. "I don''t have tampons, but I have some spare pads. Is that okay?"'
 			if $pantyworntype ! 'none':
@@ -332,11 +332,11 @@ if $ARGS[0] = 'julia_tampon':
 			isprokp = 1
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		else
-			act'Uh...':
+			act 'Uh...':
 				cla & *nl
 				'"Uh..."'
 				*nl
-				'You hesitate as she holds out the pad for you, very conscious of the fact that you cannot use a menstrual pad right now unless you can somehow get ahold of some underwear to go with it. Julia misinterprets your hesitation and her cheeks color with embarrassment, assuming that you''re judging her for using pads.'
+				'You hesitate as she holds out the pad for you, very conscious of the fact that you can''t use a menstrual pad right now unless you can somehow get ahold of some underwear to go with it. Julia misinterprets your hesitation and her cheeks color with embarrassment, assuming that you''re judging her for using pads.'
 				*nl
 				'"That will be fine, thanks," you say with a false smile.'
 				'"You''re welcome," she mumbles, looking away as she hands you the pad.'
@@ -345,7 +345,7 @@ if $ARGS[0] = 'julia_tampon':
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
 			
-			act'That''s not going to work':
+			act 'That''s not going to work':
 				cla & *nl
 				'"Uhm... A pad''s not going to work for me," you say.'
 				'"Huh? Why not?" Julia looks confused.'
@@ -361,10 +361,10 @@ if $ARGS[0] = 'julia_tampon':
 			'She quickly digs into her purse and comes up with a pad for you'
 			'"Thanks Julia."'
 			'"You''re welcome," she smiles back.'
-			'Then you run off to the bathroom to go put the tampon in before class starts.'
+			'You run off to the bathroom to go put the tampon in before class starts.'
 		else
 			'Julia looks startled that you''re asking her but nods hesitantly.'
-			'"Y-yeah, I have one you can use..." She digs into her purse and comes up with a pad for you'
+			'"Y-yeah, I have one you can use..." She digs into her purse and comes up with a pad for you.'
 			'"Thanks Julia."'
 			'"You''re welcome," she mumbles and you run off to the bathroom to go put the tampon in before class starts.'
 		end

+ 17 - 21
locations/gschool_outcast_chats.qsrc

@@ -67,15 +67,11 @@ if $ARGS[0] = 'petia':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big159.jpg"></center>'
 	if fame['pav_slut'] > 200:
 		if npc_rel['A159'] >= 50:
-			if soniaPS > 0:
-				'"Look everyone, the other school bike is here! We don''t have to share Sonia anymore!" The nerds awkwardly ignore him as he walks up to you with a wide grin. His filthy teeth look like they haven''t seen a toothbrush in years, if ever. "Are you here to finally give me a blowjob?" he asks with a creepy stare. Despite your reputation, even you still have standards and snort in disgust before walking away.' 
-				'Unfazed by your rejection, he walks up to Sonia and asks her the same question. You can see Sonia visibly gag and nearly throw up in her mouth in disgust.'
-			else
-				'"Look everyone, it''s the school bike!" The nerds awkwardly ignore him as he walks up to you with a wide grin. His filthy teeth look like they haven''t seen a toothbrush in years, if ever. "Are you here to finally give me a blowjob?" he asks with a creepy stare. Despite your reputation, even you still have standards and snort in disgust before walking away.'
-			end
+			'"Look everyone, the other school bike is here! We don''t have to share Sonia anymore!" The nerds awkwardly ignore him as he walks up to you with a wide grin. His filthy teeth look like they haven''t seen a toothbrush in years, if ever. "Are you here to finally give me a blowjob?" he asks with a creepy stare. Despite your reputation, even you still have standards and snort in disgust before walking away.' 
+			if soniaPS > 0: 'Unfazed by your rejection, he walks up to Sonia and asks her the same question. You can see her visibly gag in disgust.'
 		else
-			'He backs away when he sees you approaching. "Get away from me you disgusting slut!" He then stops, turns around and walks back. "Unless you want to give me a blowjob that is?" he asks hopefully, but even you have standards and snort in disgust before walking away. '
-			if soniaPS > 0: 'Unfazed by your rejection, he walks up to Sonia and asks her the same question. You can see Sonia visibly gag and nearly throw up in her mouth in disgust.'
+			'He backs away when he sees you approaching. "Get away from me you disgusting slut!" He then stops, turns around and walks back. "Unless you want to give me a blowjob that is?" he asks hopefully, but even you have standards and snort in disgust before walking away.'
+			if soniaPS > 0: 'Unfazed by your rejection, he walks up to Sonia and asks her the same question. You can see her visibly gag in disgust.'
 		end
 	elseif grupTipe = 1:
 		grupvalue[1] -= 1
@@ -85,7 +81,7 @@ if $ARGS[0] = 'petia':
 		if npc_rel['A159'] >= 50:
 			'Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. "Hey <<$pcs_nickname>>, you''re smoking hot, you know that? I might just let you date me if you ask nicely." He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever.'
 			*nl
-			'You snort in laughter. "<i>You</i>? Dating <i>me</i>?" You burst out into a fit of laughter. "Petia, I wouldn''t date you if my life depended on it. If we were the last people on Earth, I would rather jump off a cliff or be eaten alive by wild animals than have sex with you!"' 
+			'You snort in laughter. "<i>You</i>? Dating <i>me</i>?" You burst out into a fit of laughter. "Petia, I wouldn''t date you if my life depended on it. If we were the last people on Earth, I would rather jump off a cliff than have sex with you!"' 
 			if tits >= 5: 'You notice he isn''t paying attention and follow his gaze down to see that he''s staring at your breasts instead. "My eyes are up here, perv! Are you drooling? Eeeww! Go and cream your pants at your own tits, you fat loser!" you exclaim while covering your breasts with your arm. He quickly darts his eyes back up.'
 			'Disgusted, you back away, but sense his creepy gaze on the back of your head as you walk away.'
 		else
@@ -99,10 +95,10 @@ if $ARGS[0] = 'petia':
 		grupvalue[3] -= 1
 		grupvalue[4] -= 1
 		if npc_rel['A159'] >= 50:
-			'Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. "Hey <<$pcs_nickname>>, did I mention that you have an amazing looking body and look so hot when you work out in gym class? You''re too good looking for those jocks and should hook up with me instead." He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever.'
+			'Petia grins as you approach. He invades your personal space without a care as a raunchy smell hits your nostrils. "Hey <<$pcs_nickname>>, did I mention that you have an amazing looking body and look so hot when you work out in gym class? You''re too good looking for those jacked up monkeys and should hook up with me instead." He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever.'
 			*nl
-			'You snort in laughter. "<i>You</i>? Dating <i>me</i>?" You burst out into a fit of laughter. "Petia, I wouldn''t date you if my life depended on it. If we were the last people on Earth, I would rather jump off a cliff or be eaten alive by wild animals than have sex with you!"' 
-			if tits >= 5: 'You notice he isn''t paying attention and follow his gaze down to see that he''s staring at your breasts instead. "Do you drool at the sight of my tits in gym class as well, you dirty perv?" you ask sternly while covering your breasts with your arm. He quickly darts his eyes back up. '
+			'You snort in laughter. "<i>You</i>? Dating <i>me</i>?" You burst out into a fit of laughter. "Petia, I wouldn''t date you if my life depended on it. If we were the last people on Earth, I would rather jump off a cliff than have sex with you!"' 
+			if tits >= 5: 'You notice he isn''t paying attention and follow his gaze down to see that he''s staring at your breasts instead. "Those ''jacked up monkeys'' would beat your ass if they saw you drooling at my tits. Put your tongue back in your mouth, perv!" you sternly tell him while covering your breasts with your arm. He quickly darts his eyes back up.'
 			'Disgusted, you back away, but sense him staring at your ass as you walk away.'
 		else
 			'Petia looks fearful as you approach. "What do you want?" he snarls.' 
@@ -175,7 +171,7 @@ if $ARGS[0] = 'petia':
 		else
 			'Petia looks a little fearful, yet somehow confident at the time. "What do you want, loser?" you snarl while trying not to inhale his foul aroma.'
 			'He gives you a creepy smile that shows his filthy teeth, which look like they haven''t seen a toothbrush in years, if ever. "I think you''re just acting tough because you''re scared of the truth. You want to date me. Why else would you be talking to me?"'
-			'"Date <i>you</i>?!" you exclaim while balling your fist up. "I would punch your teeth out right now if I wasn''t worried about catching some filthy disease off of you. It''s called ''soap'', you smelly cunt!" He quickly backs away, but you can feel his creepy gaze on the back of your head as you walk away. You turn around and glare at him, causing him to quickly look at the floor.'
+			'"Date <i>you</i>?!" you exclaim while balling your fist up. "I would punch your rotten teeth out right now if I wasn''t worried about catching some filthy disease off of you. It''s called ''soap'', you smelly cunt!" He quickly backs away, but you can feel his creepy gaze on the back of your head as you walk away. You turn around and glare at him, causing him to quickly look at the floor.'
 			if tits >= 5: '"And I seen you staring at my tits as well, perv! Do it again and I''ll kick your balls back up inside you!" you add.'
 		end
 	else
@@ -319,26 +315,26 @@ if $ARGS[0] = 'sonia':
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if mesec > 0 and isprok = 0 and isprokp = 0:
-		act'Ask for a tampon':
-			$temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"'
+		act 'Ask for a tampon':
+			$temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_outcast_chats', 'sonia_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_outcast_chats', 'sonia_tampon'
 			end
 		end
 	elseif placebopart > 0 and LutH > 0 and knowpreg = 0:
-		act'Ask for a tampon':
+		act 'Ask for a tampon':
 			$temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"'
 			gs 'gschool_outcast_chats', 'sonia_tampon'
 		end
 		
 		if $pantyworntype ! 'none':
-			act'Ask for a pad':
-				$temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a pad, can I borrow one?"'
+			act 'Ask for a pad':
+				$temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a pad. Can I borrow one?"'
 				gs 'gschool_outcast_chats', 'sonia_tampon'
 			end
 		end
@@ -349,7 +345,7 @@ if $ARGS[0] = 'sonia_tampon':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big139.jpg"></center>'
 	'<<$temp[''tampon_ask'']>>'
-	if $temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a tampon, can I borrow one?"' or $temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
+	if $temp['tampon_ask'] = '"Sonia," you whisper. "My period just started and I don''t have a tampon. Can I borrow one?"' or $temp['tampon_ask'] = '"Sonia," you whisper. "My period is starting soon and I don''t have a tampon. Can I borrow one?"':
 		if npc_rel['A25'] >= 70:
 			'"Don''t worry <<$pcs_nickname>>, I''ve got your back," she says, immediately digging into her purse to produce one.'
 			'"Thanks Sonia, you''re a lifesaver."'

+ 1 - 0
locations/gschool_socialchg.qsrc

@@ -403,6 +403,7 @@ if $ARGS[0] = 'gopnik':
 		'You shake your head. "I like hanging out with you guys, but I''m just not in the partying mood tonight."'
 		'Vitek''s eyes darken. "What, are you too good for us all of a sudden? Well, fuck you then!" With that, he storms away. Lena looks at you with a derogatory stare before following her brother, leaving you behind to wonder if you made the right choice.'
 		grupvalue[4] = rand(600,650)
+		old_grupvalue[4] = grupvalue[4]
 		gs 'gschool_socialchg', 'group_rel_change','gopniks', -5
 		gs 'stat'
 

+ 7 - 5
locations/hookup_after.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'exit':
 	npc_hookup[$boy] += 1
 	npc_last_sex[$boy] = daystart
 	if hookup['virgin'] = 1 and hookup['fuck'] > 0: npc_virgin_take[$boy] = 1
-	if $clothingworntype = 'nude': gs 'hookup_after', 'dress'
+	gs 'hookup_after', 'dress'
 			
 	if hookup['fuckbuddy'] > 0:
 		know_virgin[$boy] = hookup['virgin']
@@ -48,10 +48,12 @@ if $ARGS[0] = 'exit':
 end
 
 if $ARGS[0] = 'dress':
-	gs'clothing', 'wear', $lastwornclothingtype['hookup'], lastwornclothingnumber['hookup']
-	gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
-	gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
-	gs 'stat'
+	if $clothingworntype = 'nude':
+		gs'clothing', 'wear', $lastwornclothingtype['hookup'], lastwornclothingnumber['hookup']
+		gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
+		gs 'bras', 'wear', $lastwornbratype['hookup'], lastwornbranumber['hookup']
+		gs 'stat'
+	end
 end
 
 !! -------------- creampie reactions -----------------------------

+ 5 - 1
locations/hookup_morning.qsrc

@@ -848,7 +848,11 @@ if $ARGS[0] = 'late_wakeup':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		'<<$npc_firstname[$boy]>> doesn''t stir in the slightest as you arise.'
-		if npc_apt_type[$boy] >= 3:act'Explore his apartment':gt'hookup_morning','explore'
+		if npc_apt_type[$boy] >= 3:
+			act'Explore his apartment':gt'hookup_morning','explore'
+		else
+			gt'hookup_morning','late_sneakout'
+		end
 	end
 end
 

+ 57 - 57
locations/hotel_anna.qsrc

@@ -232,7 +232,7 @@ if $ARGS[0] = '3a':
 		else
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna1toy2c.jpg"></center>'
 		end
-		'"We can divide the toys i''ve brought into different categories: beating, flogging, sensation play, pleasure and edgeplay. As you can imagine pain has a great role in BDSM, here we have two example of typical toys that can bring you pain: a paddle and a riding crop. You can easily find those items but without them you can use alternatives.'
+		'"We can divide the toys I''ve brought into different categories: beating, flogging, sensation play, pleasure and edgeplay. As you can imagine pain has a great role in BDSM, here we have two example of typical toys that can bring you pain: a paddle and a riding crop. You can easily find those items but without them you can use alternatives.'
 		'So paddle is typically used for spanking, but if you don''t have one you can use your bare hand or the back of a hair brush. While crop is more specialist it can be found in a sex shop of course or somewhere you''d buy horse riding equipment. They are used to whip across someone''s butt and also intimate areas.'
 		'We usually start with a warm up using some pain before intercourse as this allows the sex acts to last longer and builds the intensity, for this the riding crop is the most popular. Next we have some flogging tools, they are quite self explanatory. The martinet is the smallest whip we have with a very short handle and multiple tails, it gives great control and a spread of sensations compared to the riding crop which takes a bit of skill to use accurately and is very focused but can deliver a lot more pain."'
 		if annatoy = 3: 
@@ -279,7 +279,7 @@ if $ARGS[0] = '3b':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna1toy4cb.jpg"></center>'
 		end
 		'"Finally edgeplay, technically this refers to knife play, but it has come to mean anything ''on the edge'' or considered ''extreme''. It is common in the M/s relationship, but not exclusive to it. Here we have needles for needle play: Sterilized needles which are inserted through the top layer of the skin. Every time an item is used in edgeplay and is not disposable it has to be sterilized with the right protocol, we don''t want to be spreading diseases or causing infections.'
-		'Then something not so bad a set of Violet wands, they use electicity that can deliver a variety of sharp, cutting, or piercing type sensations. It''s not strictly edgeplay but something you could use to get an understanding of edgeplay much more safely'
+		'Then something not so bad, a set of Violet wands, they use electricity that can deliver a variety of sharp, cutting, or piercing type sensations. It''s not strictly edgeplay but something you could use to get an understanding of edgeplay much more safely'
 		'I''m sorry if some of this is a bit scary <<$pcs_nickname>>, but I think that knowledge shouldn''t be censored even when we don''t like something. It can be hard to accept that someone may like a real extreme side of BDSM, but it''s right for you to know that it exists and by understanding how it should be used you will be aware if you see it being mis-used everybody should be aware of that. One of the main things people in are community dois ensure that we are all safe. If I did something to you that you didn''t like and wanted me to stop I would of course stop but if I did not, having someone else there to ensure I did protects you and me.'
 		'That is all the toys so now I can show you how one of them works if you like.'
 		act'Choose a toy for a demonstration':
@@ -322,9 +322,9 @@ if ARGS[0] = 4:
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/anna2restr0.jpg"></center>'
 	'You knock at Anna''s room. "<<$pcs_nickname>> come in, the door is open!" You hear her shouting.'
 	'You reach the middle of the room before you see Anna playing on a swing.'
-	'"You''re lucky! A friend of mine just gave me a gift that''s semifixed furniture and can be used as a toy and a restriction." She says leaning back and swinging almost like a child if it wasn''t for her extremely revealing outfit.'
+	'"You''re lucky! A friend of mine just gave me a gift that''s semifixed furniture and can be used as a toy and a restraint." She says leaning back and swinging almost like a child if it wasn''t for her extremely revealing outfit.'
 	'"You mean the swing?"'
-	'"Exactly! It''s a  very particular swing...it''s a ''fisting sling and swing.''" She seems very proud of her new swing but you are looking at all the clips and straps and start to worry about how you will have to remember how to use them all picturing it all going wrong and Anna falling and hurting herself. "Unfortunately I cannot let use this yet, i have to test it and it''s too complex for you at this stage. As semifixed furniture it have to be assembled in place and be tested." She swings as she says this and you start to think she just doesn''t want to share her new toy with you.'
+	'"Exactly! It''s a  very particular swing...it''s a ''fisting sling and swing.''" She seems very proud of her new swing but you are looking at all the clips and straps and start to worry about how you will have to remember how to use them all picturing it all going wrong and Anna falling and hurting herself. "Unfortunately I cannot let use this yet, I have to test it and it''s too complex for you at this stage. As semifixed furniture it has to be assembled in place and be tested." She swings as she says this and you start to think she just doesn''t want to share her new toy with you.'
 	*nl
 	*nl
 	*nl
@@ -433,7 +433,7 @@ if ARGS[0] = 5:
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract00.jpg"></center>'
 	'You hear some talking from Anna''s room which you guess to be a client. Maybe Anna forgot about your encounter or perhaps her client is very early? You act like a guest and walk pst her room thinking that maybe it would be better to leave as you over hear the conversation:'
-	'"Don''t worry i''ll bring her back safe."'
+	'"Don''t worry I''ll bring her back safe."'
 	'"I''m not worried about her health, just how long it would take her to recover."'
 	'"Oh, I told you what the client wanted and I''ll make sure they stick to it, she''ll be back to you good as new sweetie, now stop worrying and get out of here." You here two kisses as they say goodbye.'
 	'As the other woman leaves you recognise her as someone you''ve seen before a friend of Anna. Seems Anna didn''t forget about your chit-chat.'
@@ -445,7 +445,7 @@ if ARGS[0] = 5:
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract01.jpg"></center>'
 		'"Hi Anna how are y....ooof." She squeeze you hard in a hug, her large breasts expanding all over your body smothering your greeting in your lungs making it impossible to finish the sentence.'
-		'"<<$pcs_nickname>> my dear! I''m totally fine now that you are here! I was waiting for you, well i wasn''t alone but my guest knew I was waiting for someone, anyway tell me all about you. I miss our chit chat."'
+		'"<<$pcs_nickname>> my dear! I''m totally fine now that you are here! I was waiting for you, well I wasn''t alone but my guest knew I was waiting for someone, anyway tell me all about you. I miss our chit chat."'
 		'"Oh well I just got here, I saw your guest but she didn''t see me as I thought it was a client and was discreet, I have missed our chit chat too."'
 		'"My dear, you are like a spy. My friend would have liked to meet you I''m sure but that can wait. I''ve got a surprise for you today, a very special one that will be great teaching you about our special lifestyle."'
 		act'???':
@@ -471,13 +471,13 @@ if ARGS[0] = 5:
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract04a.jpg"></center>'
-					'<font color = blue> "Mmmm...yes nice...i''ll take that...for later...hehehe</font> Anna doesn''t have too much clothes to disrobe, and she''s really fast wearing a sexy corset, but it seems this is not what she''s looking for. You cannot avoid staring at her breast...it seems you are wait for them to pop out...<font color = blue> "Ummm....hope you don''t mind if i will stare at you in the same way....hehehe..."</font>'
+					'<font color = blue> "Mmmm...yes nice...I''ll take that...for later...hehehe</font> Anna doesn''t have too much clothes to disrobe, and she''s really fast wearing a sexy corset, but it seems this is not what she''s looking for. You cannot avoid staring at her breast...it seems you are wait for them to pop out...<font color = blue> "Ummm....hope you don''t mind if i will stare at you in the same way....hehehe..."</font>'
 					act'...oh!...':
 						minut += 10
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05a0.jpg"></center>'
-						'<font color = #DC143C> "Sorry Anna...i didn''t want..."</font><br><font color = blue> "Hey it''s not a problem...you can look as much as you want, but if you want to try something you have to rush, we don''t have the whole...day...or night...hehehe"</font> Definitively Anna likes to tease you...you don''t know well how to react on this. You can chose to wear some dress or not...it''s not harmful afterall...you both are woman...'
+						'<font color = #DC143C> "Sorry Anna...I didn''t want..."</font><br><font color = blue> "Hey it''s not a problem...you can look as much as you want, but if you want to try something you have to rush, we don''t have the whole...day...or night...hehehe"</font> Definitively Anna likes to tease you...you don''t know well how to react on this. You can chose to wear some dress or not...it''s not harmful afterall...you both are woman...'
 						act'Leather':
 							minut += 10
 							*clr & cla
@@ -485,13 +485,13 @@ if ARGS[0] = 5:
 							IgorevnaBDSM_spectator_dressYES = 1
 							AnnaQW['trust'] += 1
 							'<center><img <<$set_imgh>> src="images/pc/items/eroto/dress/49.jpg"></center>'
-							'<font color = blue> "My My! A classic one! You look stunning! Here let me help you a bit..."</font> Anna help you adjusting some part of the clothes...it''s like to be in a dress contest; anyway her hand neve falls into an "unwanted area"<font color = #DC143C> "Thank Anna, i''m not used to wear those clothes" </font><br><font color = blue> "Perfect, now i will take those two: a nazi-dress and a skirt with an open corset.</font><br><font color = #DC143C> "Mind if i ask why?" </font>'
+							'<font color = blue> "My My! A classic one! You look stunning! Here let me help you a bit..."</font> Anna help you adjusting some part of the clothes...it''s like to be in a dress contest; anyway her hand never falls into an "unwanted area"<font color = #DC143C> "Thank you Anna, I''m not used to wear those clothes" </font><br><font color = blue> "Perfect, now I will take those two: a nazi-dress and a skirt with an open corset.</font><br><font color = #DC143C> "Mind if i ask why?" </font>'
 							act'Listen':
 								minut += 10
 								*clr & cla
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05a2.jpg"></center>'
-								'<font color = blue> "Well...this is for intimate purpose... hehehe.</font> Anna twink at you...<br><font color = #DC143C> "Oh!" </font><br><font color = blue> "You see, i need the first one to start the role play, while the second one will give me more freedom on the movements...and believe me: I will need it...hehehe."</font><br><font color = #DC143C> "Got it" </font><br><font color = blue> "We are ready, once you put back your clothes reach me in the main room."</font>'
+								'<font color = blue> "Well...this is for intimate purpose... hehehe.</font> Anna twink at you...<br><font color = #DC143C> "Oh!" </font><br><font color = blue> "You see, I need the first one to start the role play, while the second one will give me more freedom on the movements...and believe me: I will need it...hehehe."</font><br><font color = #DC143C> "Got it" </font><br><font color = blue> "We are ready, once you put back your clothes reach me in the main room."</font>'
 								act 'Reach Anna': gt'hotel_annaIntercourse','spectator'
 							end
 						end
@@ -502,13 +502,13 @@ if ARGS[0] = 5:
 							IgorevnaBDSM_spectator_dressYES = 1
 							AnnaQW['trust'] += 1
 							'<center><img <<$set_imgh>> src="images/pc/items/eroto/dress/12.jpg"></center>'
-							'<font color = blue> "You look stunning! Does the rubber bother you? Here let me help you a bit..."</font> Anna help you adjusting some part of the clothes...it''s like to be in a dress contest; anyway her hand neve falls into an "unwanted area"<font color = #DC143C> "Thanks Anna, i''m not used to wear those clothes. No it doesn''t bother me, why do you ask?" </font><br><font color = blue> "Pretty simple...some cannot tollerate ruber. Rubber comes from a different process of the latex production and this can change how the skin will fell the material....i''ll not bother you right now....ok. Perfect! now i will take those two: a nazi-dress and a skirt with an open corset.</font><br><font color = #DC143C> "Aren''t you using what are you wearing?" </font>'
+							'<font color = blue> "You look stunning! Does the rubber bother you? Here let me help you a bit..."</font> Anna help you adjusting some part of the clothes...it''s like to be in a dress contest; anyway her hand never falls into an "unwanted area"<font color = #DC143C> "Thanks Anna, I''m not used to wear those clothes. No it doesn''t bother me, why do you ask?" </font><br><font color = blue> "Pretty simple...some cannot tolerate ruber. Rubber comes from a different process of the latex production and this can change how the skin will feel the material....I''ll not bother you right now....ok. Perfect! Now i will take those two: a nazi-dress and a skirt with an open corset.</font><br><font color = #DC143C> "Aren''t you using what are you wearing?" </font>'
 							act'Listen':
 								minut += 10
 								*clr & cla
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05a2.jpg"></center>'
-								'<font color = blue> "Well...not with you in there... hehehe.</font> Anna twink at you... <br><font color = #DC143C> "Oh!" </font><br><font color = blue> Anyway...you see, i need the first one to start the role play, while the second one will give me more freedom on the movements...and believe me: I will need it...hehehe."</font><br><font color = #DC143C> "Got it" </font><br><font color = blue> "We are ready, once you put back your clothes reach me in the main room."</font>'
+								'<font color = blue> "Well...not with you in there... hehehe.</font> Anna twink at you... <br><font color = #DC143C> "Oh!" </font><br><font color = blue> Anyway...you see, I need the first one to start the role play, while the second one will give me more freedom on the movements...and believe me: I will need it...hehehe."</font><br><font color = #DC143C> "Got it" </font><br><font color = blue> "We are ready, once you put back your clothes reach me in the main room."</font>'
 								act 'Reach Anna': gt'hotel_annaIntercourse','spectator'
 							end
 						end
@@ -518,24 +518,24 @@ if ARGS[0] = 5:
 							gs 'stat'
 							IgorevnaBDSM_spectator_dressNO = 1
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05a2.jpg"></center>'
-							'<font color = blue> "Shy shy shy...awww...ok....as you wish. Will you please take those two: the nazi-dress and the skirt with the open corset?</font><br><font color = #DC143C> "Sure... ....But...Aren''t you using what are you wearing?" </font><br><font color = blue>Well...not with you in there... hehehe.</font> Anna twink at you... <br><font color = #DC143C> "Oh!" </font><br><font color = blue> Anyway...you see, i need the first one to start the role play, while the second one will give me more freedom on the movements...and believe me: I will need it...hehehe."</font><br><font color = #DC143C> "Got it" </font><br><font color = blue> "We are ready,come with me."</font>'
+							'<font color = blue> "Shy shy shy...awww...ok....as you wish. Will you please take those two: the nazi-dress and the skirt with the open corset?</font><br><font color = #DC143C> "Sure... ....But...Aren''t you using what are you wearing?" </font><br><font color = blue>Well...not with you in there... hehehe.</font> Anna twink at you... <br><font color = #DC143C> "Oh!" </font><br><font color = blue> Anyway...you see, I need the first one to start the role play, while the second one will give me more freedom on the movements...and believe me: I will need it...hehehe."</font><br><font color = #DC143C> "Got it" </font><br><font color = blue> "We are ready, come with me."</font>'
 							act'Follow Anna': gt'hotel_annaIntercourse','spectator'
 						end
 					end
 				end
 			end
-			act'I think i''ll wait for you...':
+			act'I think I''ll wait for you...':
 				*clr & cla
 				IgorevnaBDSM_spectator_JM = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract03b.jpg"></center>'
-				'<font color = blue> "Ok party pooper...as you wish... . Feel free to move around, i''ll be back in no time</font> Anna seems a little disappointed, but doesn''t seems sad; she wink at you while she move to her room...maybe she really like your company....'
+				'<font color = blue> "Ok party pooper...as you wish... . Feel free to move around, I''ll be back in no time</font> Anna seems a little disappointed, but doesn''t seem sad; she wink at you while she move to her room...maybe she really like your company....'
 
 				act'Move to the main room':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract04b.jpg"></center>'
-					'<font color = #DC143C> "OH! That''s a surprise...." </font> A middle age woman stand on the sofa bounded with ropes and with a tape that block her mouth'
+					'<font color = #DC143C> "OH! That''s a surprise...." </font> A middle age woman stands on the sofa bounded with ropes and with a tape that blocks her mouth'
 					act'Move the tape away':
 						*clr & cla
 						gs 'stat'
@@ -545,21 +545,21 @@ if ARGS[0] = 5:
 							*clr & cla
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1b.jpg"></center>'
-							'She doesn''t seems to looking for you and she carefully avoid to look directly in your eyes. After some moment she speak to you... "Ma''am...i think my arm got a cramp..."'
+							'She doesn''t seem to be looking for you and she carefully avoids to look directly in your eyes. After some moment she speaks to you... "Ma''am...I think my arm got a cramp..."'
 							act'Try to free her':
 								*clr & cla
 								gs 'stat'
 								IgorevnaBDSM_freeJM = 1
 								BDSM_Knowledge += 1
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1c.jpg"></center>'
-								'<font color = #DC143C> "Let me see what i can do...I''m <<$pcs_nickname>> anyway...who are you?" </font> You work on the ropes trying to set her free; it doesn''t seems a complicated pattern but the knots are quite tight; it will take some time for sure..."Thank you Ma''am <<$pcs_nickname>>; this slut''s name is Jeanine. this slut hope it will be no problem for Ma''am <<$pcs_nickname>>..."<br><font color = #DC143C> "....Uh??? Ahhh....ok.... . Jeanine, a beautiful name.... No...no...it seems i can handle with that; they are tight for sure but it seems a simple wrap afterall...." </font><br>"...this slut...Ma''am <<$pcs_nickname>>...means... ....M-Mistress!...."'
+								'<font color = #DC143C> "Let me see what I can do...I''m <<$pcs_nickname>> anyway...who are you?" </font> You work on the ropes trying to set her free; it doesn''t seem a complicated pattern but the knots are quite tight; it will take some time for sure..."Thank you Ma''am <<$pcs_nickname>>; this slut''s name is Jeanine. this slut hope it will be no problem for Ma''am <<$pcs_nickname>>..."<br><font color = #DC143C> "....Uh??? Ahhh....ok.... . Jeanine, a beautiful name.... No...no...it seems I can handle them; they are tight for sure but it seems to be a simple wrap afterall...." </font><br>"...this slut...Ma''am <<$pcs_nickname>>...means... ....M-Mistress!...."'
 								act 'Turn': gt'hotel_annaIntercourse','spectator'
 							end
-							act'I don''t think i should, i''m sorry':
+							act'I don''t think I should, I''m sorry':
 								*clr & cla
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1c.jpg"></center>'
-								'"...of course Ma''am..." You feel a little sorry abot her, ut probably this is the best choice for out of you...'
+								'"...of course Ma''am..." You feel a little sorry about her, but probably this is the best choice for both of you...'
 								wait 400
 								act 'Wait': gt'hotel_annaIntercourse','spectator'
 							end
@@ -567,7 +567,7 @@ if ARGS[0] = 5:
 								*clr & cla
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1a.jpg"></center>'
-								'"...Thank you Ma''am to remind this slu.... " You immediately put the tape again on her mouth...<font color = #DC143C> "....That''s it. Babushka alway tell me ''...if you find a stray dog on a leash never free it, you will never know'' ...." </font>'
+								'"...Thank you Ma''am to remind this slu.... " You immediately put the tape back on her mouth...<font color = #DC143C> "....That''s it. Babushka always tells me ''...if you find a stray dog on a leash never let it free, you will never know'' ...." </font>'
 								wait 400
 								act 'Wait': gt'hotel_annaIntercourse','spectator'
 							end
@@ -577,7 +577,7 @@ if ARGS[0] = 5:
 							gs 'stat'
 							AnnaQW['dom'] += 1
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1a.jpg"></center>'
-							'"...Thank you Ma''am to remind this slu.... " You immediately put the tape again on her mouth...<font color = #DC143C> "....That''s it. Babushka alway tell me ''...if you find a stray dog on a leash never free it, you will never know'' ...." </font>'
+							'"...Thank you Ma''am to remind this slu.... " You immediately put the tape back again on her mouth...<font color = #DC143C> "....That''s it. Babushka always tells me ''...if you find a stray dog on a leash never let it free, you will never know'' ...." </font>'
 							wait 800
 							act 'Finally': gt'hotel_annaIntercourse','spectator'
 						end
@@ -587,12 +587,12 @@ if ARGS[0] = 5:
 						gs 'stat'
 						AnnaQW['trust'] += 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b0b.jpg"></center>'
-						'You look at the woman trying to find a better position for herself...tha''s your impression at least...'
+						'You look at the woman trying to find a better position for herself...that''s your impression at least...'
 						act'...she keeps struggling...':
 							*clr & cla
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1a.jpg"></center>'
-							'<font color = #DC143C> "....Well i can see it''s quite hard for her to find some relief ...." </font>'
+							'<font color = #DC143C> "....Well I can see it''s quite hard for her to find some relief ...." </font>'
 							wait 1200
 							act 'Finally': gt'hotel_annaIntercourse','spectator'
 						end
@@ -601,7 +601,7 @@ if ARGS[0] = 5:
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05b1a.jpg"></center>'
-						'You really don''t know what to do. To find someone bounded and gagged normally means it''s a kidnappin; that''s not the case of course...'
+						'You really don''t know what to do. To find someone bounded and gagged normally means it''s a kidnapping; that''s not the case of course...'
 						wait 1800
 						act'Finally': gt'hotel_annaIntercourse','spectator'
 					end
@@ -612,21 +612,21 @@ if ARGS[0] = 5:
 				IgorevnaBDSM_spectator_drink = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract05c0.jpg"></center>'
-				'<font color = blue> "Ok party pooper...as you wish... . Feel free to move around, i''ll be back in no time</font> Anna seems a little disappointed, but doesn''t seems sad; she wink at you while she move to her room...maybe she really like your company....'
+				'<font color = blue> "Ok party pooper...as you wish... . Feel free to move around, I''ll be back in no time</font> Anna seems a little disappointed, but doesn''t seem sad; she winks at you while she move to her room...maybe she really likes your company....'
 				act'Water (The real party pooper)':
 					*clr & cla
 !						IgorevnaBDSM_partypooper = 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/voda.jpg"></center>'
-					'<font color = #DC143C>I don''t think it''s a good idea to drink some alchool; i should focus on Anna''s explanation...</font> You pour a glass of water and sit to relax a little; not knowing what to do you can only wait for Anna to arrive.'
+					'<font color = #DC143C>I don''t think it''s a good idea to drink some alcohol; I should focus on Anna''s explanation...</font> You pour a glass of water and sit to relax a little; not knowing what to do you can only wait for Anna to arrive.'
 					wait 2800
-					act'Finally Anna call for you': gt'hotel_annaIntercourse','spectator'
+					act'Finally Anna calls for you': gt'hotel_annaIntercourse','spectator'
 				end
 				act'Vodka':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka2.jpg"></center>'
-					'<font color = #DC143C>"I think i''ll need it."</font> You mind is full of question about what you are going to see; you remind Anna''s words for a moment "...we don''t play pissed or stoned...". This is enough to stop you from drink some more; but not to stop you from wondering with fantasy...<font color = #DC143C>...''...It''s not that i want to play...it''s not polite to be drunk...i think...baf....could it be this is goibng to be serious?...I don''t know; Anna told me i will be only a spectator anyway...and that''s it... . Mmmm...."pissed or stoned"...maybe she means she don play urinal game...pffff...hahaha...this should be fun...to see Anna piss ... Stop joking!...I should politely wait for Anna''...</font>'
+					'<font color = #DC143C>"I think I''ll need it."</font> Your mind is full of question about what you are going to see; you remind Anna''s words for a moment "...we don''t play pissed or stoned...". This is enough to stop you from drinking some more; but not to stop you from wondering with fantasy...<font color = #DC143C>...''...It''s not that I want to play...it''s not polite to be drunk...I think...baf....could it be this is going to be serious?...I don''t know; Anna told me I will be only a spectator anyway...and that''s it... . Mmmm...."pissed or stoned"...maybe she meant she doesn''t play urinal game...pffff...hahaha...this should be fun...to see Anna piss ... Stop joking!...I should politely wait for Anna''...</font>'
 					wait 1800
 					act'Finally Anna call for you': gt'hotel_annaIntercourse','spectator'
 				end
@@ -635,7 +635,7 @@ if ARGS[0] = 5:
 		act'Politely decline':
 			cla
 			gs 'stat'
-			'<font color = #DC143C>"I''m sorry Anna, i think i''ve made a mistake."</font> You find your best excuse to explain Anna you don''t feel comfortable; she seems to understand your apologies, and she gave you a quick overview on what you will miss today. She explay about the order of a proper intercourse, and the different way to approach at it with the same results; also she gave you some tip again about D/s relationship and the correct way to refer to the partner and the behaviour that has to be assumed within the relationship. She doesn''t forget to remind you about the warm up and the aftercare. She cut quickly telling you that this is all she can teach you with words and that a practical session would be the best; since you were not agree this end your session. Anna doesn''t lose the chance to tell you that she will miss you for this session, without letting you feel the weight of your decision: it seems this doesn''t have an impact on your session and again she reassure you telling that you have to do what you are comfortable with. You quickly exchange your greeting and both of you return to their own things to do.  '
+			'<font color = #DC143C>"I''m sorry Anna, I think I''ve made a mistake."</font> You find your best excuse to explain Anna you don''t feel comfortable; she seems to understand your apologies, and she gave you a quick overview on what you will miss today. She explains about the order of a proper intercourse, and the different way to approach at it with the same results; also she gave you some tip again about D/s relationship and the correct way to refer to the partner and the behaviour that has to be assumed within the relationship. She doesn''t forget to remind you about the warm up and the aftercare. She cut quickly telling you that this is all she can teach you with words and that a practical session would be the best; since you were not agreeing to it, this ends your session. Anna doesn''t waste the opportunity to tell you that she will miss you for this session, without letting you feel the weight of your decision: it seems this doesn''t have an impact on your session and again she reassure you telling that you have to do what you are comfortable with. You quickly exchange your greeting and both of you return to their own things to do.'
 			act 'go away': gt'pav_hotel'
 		end	
 	end
@@ -649,7 +649,7 @@ if ARGS[0] = 6:
 	AnnaQW['trust'] += 1
 	BDSM_Knowledge += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract10.jpg"></center>'
-	'You knock at Anna''s door for your weekly visit....<font color = #DC143C>"Hi Anna!..."</font><br><font color = blue>"<<$pcs_nickname>> move...move...it''s started!"</font> You have no time to realize that you are dragged by Anna in the main room.... <font color = #DC143C>"Emmmh....Hi Anna!..."</font><br><font color = blue>"Oh sorry! Hi <<$pcs_nickname>>, take a seat...i''m watching a film and i don''t want to loose a scene...but we can chit-chat of course... . Awww...she''s pretty...but...nothing more than the bush?...Awwww"</font><br><font color = #DC143C>"...Uh?..."</font> You notice on the screen that there''s a girl on the bed and a man tha slowly pull her panties down approaching her intimate; despite the scene and what is probably the genre of the film you are looking with Anna it''s seems a "normal" evening between real friends...and this is really strange with Anna.<br><font color = #DC143C>"...Is this a...porno? Anna!...He''s going to...uh? No...it''s cutted..."</font><br><font color = blue>"...Hell...I''m really disappointed too...a porno is more realistic without any bet. No it''s a "famous" American film about BDSM...and i''m quite happy i didn''t pay for it at the moment... . But i understand if you don''t want to look at it: let''s settle this way: since this is probably boring for you why don''t you look for some of my clothes? You can try what i have on the bed...I''ll take something to drink in the meantime..."</font>'
+	'You knock at Anna''s door for your weekly visit....<font color = #DC143C>"Hi Anna!..."</font><br><font color = blue>"<<$pcs_nickname>> move...move...it''s started!"</font> You have no time to realize that you are dragged by Anna in the main room.... <font color = #DC143C>"Emmmh....Hi Anna!..."</font><br><font color = blue>"Oh sorry! Hi <<$pcs_nickname>>, take a seat...I''m watching a film and I don''t want to miss a scene...but we can chit-chat of course... . Awww...she''s pretty...but...nothing more than the bush?...Awwww"</font><br><font color = #DC143C>"...Uh?..."</font> You notice on the screen that there''s a girl on the bed and a man that slowly pulls her panties down approaching her intimate zone; despite the scene and what is probably the genre of the film you are looking with Anna it''s seems a "normal" evening between real friends...and this is really strange with Anna.<br><font color = #DC143C>"...Is this a...porno? Anna!...He''s going to...uh? No...it''s cut..."</font><br><font color = blue>"...Hell...I''m really disappointed too...a porno is more realistic without any bet. No it''s a "famous" American film about BDSM...and I''m quite happy I didn''t pay for it at the moment... . But I understand if you don''t want to look at it: let''s settle this way: since this is probably boring for you why don''t you look for some of my clothes? You can try what I have on the bed...I''ll take something to drink in the meantime..."</font>'
 
 	act'Mmmm....ok let me check if something will catch my attention...':
 		*clr & cla
@@ -662,7 +662,7 @@ if ARGS[0] = 6:
 			IgorevnaBDSM_hooble_red = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/items/eroto/dress/5.jpg"></center>'
-			'<font color = #DC143C>"... ''...Ok this one...''..."</font> You try the dress as fast as you can; it''s easy to wear at the beginning, but when you have to close it it became very tight, and your legs are strictly closed together that you cannot made wide steps to walk. Despite the difficulty about wearing this dress it''s seems really classy...maybe it''s a party dress... . You decide to move toward Anna'
+			'<font color = #DC143C>"... ''...Ok this one...''..."</font> You try the dress as fast as you can; it''s easy to wear at the beginning, but when you have to close it it became very tight, and your legs are strictly closed together that you cannot made wide steps to walk. Despite the difficulty about wearing this dress it seems really classy...maybe it''s a party dress... . You decide to move towards Anna.'
 			act 'Go to the main room': gt'hotel_annaIntercourse','dresscontest'
 		end
 		act'Black hooble skirt':
@@ -670,7 +670,7 @@ if ARGS[0] = 6:
 			IgorevnaBDSM_hooble_black = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/items/eroto/dress/67.jpg"></center>'
-			'<font color = #DC143C>"... ''...Ok this one...''..."</font> You try the dress as fast as you can; it''s easy to wear at the beginning, but when you have to close it it became very tight, and your legs are strictly closed together that you cannot made wide steps to walk. Despite the difficulty about wearing this dress it''s seems really classy...maybe it''s a party dress... . You decide to move toward Anna'
+			'<font color = #DC143C>"... ''...Ok this one...''..."</font> You try the dress as fast as you can; it''s easy to wear at the beginning, but when you have to close it it became very tight, and your legs are strictly closed together that you cannot made wide steps to walk. Despite the difficulty about wearing this dress it''s seems really classy...maybe it''s a party dress... . You decide to move towards Anna'
 			act 'Go to the main room': gt'hotel_annaIntercourse','dresscontest'
 		end
 		act'On a second thought....':
@@ -678,7 +678,7 @@ if ARGS[0] = 6:
 			IgorevnaBDSM_hooble_dressNO = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapracttable.jpg"></center>'
-			'<font color = #DC143C>"... ''...Mmmm i''m not sure about that; for once she seems like an old friend and i''m the one who''s into BDSM stuff...''..."</font> You decide to return immediately to Anna'
+			'<font color = #DC143C>"... ''...Mmmm I''m not sure about that; for once she seems like an old friend and I''m the one who''s into BDSM stuff...''..."</font> You decide to return immediately to Anna'
 			act 'Go to the main room': gt'hotel_annaIntercourse','dresscontest'
 		end
 	end
@@ -687,7 +687,7 @@ if ARGS[0] = 6:
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpractice/annapract10a.jpg"></center>'
-		'<font color = blue>"Uh? Of course not...you are here for our chit-chat. Wait me for a sec i''ll bring something to drink"</font><br><font color = #DC143C>"I can go for you..."</font><br><font color = blue>"No way! You are the guest...don''t worry i''ll be here in no time, i don''t want to miss a scene...oh! Just if something happens tell me, i quite doubt about that but you never know..."</font>'
+		'<font color = blue>"Uh? Of course not...you are here for our chit-chat. Wait me for a sec I''ll bring something to drink"</font><br><font color = #DC143C>"I can go for you..."</font><br><font color = blue>"No way! You are the guest...don''t worry I''ll be here in no time, I don''t want to miss a scene...oh! Just if something happens tell me, I quite doubt about that but you never know..."</font>'
 
 		act 'Listen': gt'hotel_annaIntercourse','dresscontest'
 	end
@@ -699,30 +699,30 @@ if ARGS[0] = 7:
 !		IgorevnaBDSM += 1
 	if IgorevnaBDSM_session_librarian = 2:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/annahurt.jpg"></center>'
-		'<font color = #DC143C>"Hi Anna..."</font><br><font color = blue>"<<$pcs_nickname>>..."</font><br><font color = #DC143C>"C-can i enter? ... '' ...shit! Am i the reason of her sight? It couldn''t be something else...she''s never been that way...i think it''s worst than i thought...'' ..."</font><br>Anna slowly open the door, and make you the sign to enter...not more than: <font color = blue>"...take a seat."</font> comes out of her mouth; and you have no difficulties to understand the reason: you should be the one who speak.'
+		'<font color = #DC143C>"Hi Anna..."</font><br><font color = blue>"<<$pcs_nickname>>..."</font><br><font color = #DC143C>"C-can i enter? ... '' ...shit! Am I the reason of her sight? It couldn''t be something else...she''s never been that way...I think it''s worse than I thought...'' ..."</font><br>Anna slowly opens the door, and make you the sign to enter...not more than: <font color = blue>"...take a seat."</font> comes out of her mouth; and you have no difficulties to understand the reason: you should be the one who speaks.'
 		act'...': gt'hotel_annaIntercourse','Anna_path_choice'
 	elseif IgorevnaBDSM_session_librarian = 3:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/annahurt.jpg"></center>'
-		'<font color = #DC143C>"Hi Anna..."</font><br><font color = blue>"<<$pcs_firstname>>..."</font>Anna slowly open the door, and make you the sign to enter...'
+		'<font color = #DC143C>"Hi Anna..."</font><br><font color = blue>"<<$pcs_firstname>>..."</font>Anna slowly opens the door, and gives you the sign to enter...'
 		act'...': gt'hotel_annaIntercourse','Anna_path_choice'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/electrapack.jpg"></center>'
-		'Again, you see that woman..., you peep to see what''s happening before going near to the door. "<font color = blue> "... the litter box should be....uhmmm...ask Candy for that... " </font>... . "...that means outside relief probably. Something else?... .". <font color = blue> "...Yes...please...just don''t return me a crazy sex maniacs as you always do... " </font>"I''ll see what i can do. No promise. Mmmm...it seems she''s eating too much...she gain weight...ok then, if that''s everything, we''ll see in one or two weeks...oh and...Anna, preserve your stamina...just in case...hehehe.".<font color = blue>"I knew it..."</font> The woman, left for the hallway, you take your time to assure she''s no more on sight, then you knock at Anna''s door....<br>You hear her...<font color = blue> Coming...!</font><br><font color = #DC143C>...'' ...probably Anna let her sleep for the night, she''s going away with a bag; it seems they are close friends... '' ... </font> You are lost in your thought...finally<br><font color = blue> "<<$pcs_nickname>>...come in!" </font>'
+		'Again, you see that woman..., you peep to see what''s happening before going near to the door. "<font color = blue> "... the litter box should be....uhmmm...ask Candy for that... " </font>... . "...that means outside relief probably. Something else?... .". <font color = blue> "...Yes...please...just don''t return me a crazy sex maniacs as you always do... " </font>"I''ll see what I can do. No promise. Mmmm...it seems she''s eating too much...she gain weight...ok then, if that''s everything, we''ll see in one or two weeks...oh and...Anna, preserve your stamina...just in case...hehehe.".<font color = blue>"I knew it..."</font> The woman, left for the hallway, you take your time to assure she''s no more on sight, then you knock at Anna''s door....<br>You hear her...<font color = blue> Coming...!</font><br><font color = #DC143C>...'' ...probably Anna let her sleep for the night, she''s going away with a bag; it seems they are close friends... '' ... </font> You are lost in your thought...finally<br><font color = blue> "<<$pcs_nickname>>...come in!" </font>'
 		act'...':
 			if IgorevnaBDSM_session_slaveF = 1 or IgorevnaBDSM_session_slaveM = 1:
 				*clr & cla 
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0s.jpg"></center>'
-				'Anna lead you to the main room; she''s wearing only a fishnet without any lingerie on... it''s coming to be an habit for you to see her naked. You cannot avoid to stare at her body and you wonder if you will stay in the same shape with aging... <br><font color = blue> "Oh...there''s no need to thank poor Anna to prepare everything...really...it cost me nothing" </font><br>You realize you didn''t say neither hello to Anna ...<font color = #DC143C>"Sorry Anna...my bad... . Hi! I''m a little light head today... .  Thanks really for your efforts... i really shouldn''t forgot my manners... ."</font><br><font color = blue>"Nah...i''m joking. I hope i''m the source of your distractions...hehehe...."</font> '
+				'Anna leads you to the main room; she''s wearing only a fishnet without any lingerie on... it''s becoming a habit for you to see her naked. You cannot avoid to stare at her body and you wonder if you will stay in the same shape with aging... <br><font color = blue> "Oh...there''s no need to thank poor Anna to prepare everything...really...it cost me nothing" </font><br>You realize you didn''t say neither hello to Anna ...<font color = #DC143C>"Sorry Anna...my bad... . Hi! I''m a little light head today... .  Thanks really for your efforts... I really shouldn''t forgot my manners... ."</font><br><font color = blue>"Nah...I''m joking. I hope I''m the source of your distractions...hehehe...."</font> '
 				act'...':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start1s.jpg"></center>'
-					'<font color = #DC143C>"Well...it could reaaaly help me to make the session with you..."</font><br><font color = blue>"....Nice attempt but: Nope. Not with a semi-serious session..."</font><br><font color = #DC143C>... ''...and i cannot touch that forbidden fruit yet... '' ...</font><br><font color = blue>"Don''t make that puppy eyes...never say never..."</font>'
+					'<font color = #DC143C>"Well...it could reeaaaly help me to make the session with you..."</font><br><font color = blue>"....Nice attempt but: Nope. Not with a semi-serious session..."</font><br><font color = #DC143C>... ''...and I cannot touch that forbidden fruit yet... '' ...</font><br><font color = blue>"Don''t give me those puppy eyes...never say never..."</font>'
 					if IgorevnaBDSM_session_slaveF = 1:
-						'<font color = #DC143C>"Ok...then. Is Jeanine ready?"</font><br><font color = blue>..."...Jeanine...is...busy at the moment. But there''s nothing to be worried about: verushka will play great, i assure you. she''s ready; what about you? Shall we start?"</font>'
+						'<font color = #DC143C>"Ok...then. Is Jeanine ready?"</font><br><font color = blue>..."...Jeanine...is...busy at the moment. But there''s nothing to be worried about: Verushka will play great, I assure you. She''s ready; what about you? Shall we start?"</font>'
 						act'Let''s start': gt'hotel_annaIntercourse','slaveF'
 					elseif IgorevnaBDSM_session_slaveM = 1:
-						'<font color = #DC143C>"Ok...then. Who''s the "lucky" guy?"</font><br><font color = blue> "...Well...it''s quite useless to call it by name..."</font><br><font color = #DC143C>"It?..."</font><br><font color = blue>"Yes "it". it''s registred as maxim egorov at the mayor office (the office where name are registred when born)...but it''s more like a thing...an useless one, to be honest; that means you can do eveything to it, but not sex: that''s a condition and there will be no deal about it."</font><br><font color = #DC143C>"Never had this intention..."</font><br><font color = blue>"The we are ready...Shall we start?"</font>'
+						'<font color = #DC143C>"Ok...then. Who''s the "lucky" guy?"</font><br><font color = blue> "...Well...it''s quite useless to call it by name..."</font><br><font color = #DC143C>"It?..."</font><br><font color = blue>"Yes "it". it''s registred as Maxim Egorov at the civil registration...but it''s more like a thing...a useless one to be honest. That means you can do anything to it, but not sex: that''s a condition and there will be no deal about it."</font><br><font color = #DC143C>"Never had this intention..."</font><br><font color = blue>"The we are ready...Shall we start?"</font>'
 						act'Let''s start': gt'hotel_annaIntercourse','slaveM'
 					else
 						''
@@ -732,12 +732,12 @@ if ARGS[0] = 7:
 			elseif IgorevnaBDSM_session_librarian = 1:
 				*clr & cla 
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0l.jpg"></center>'
-				'Anna lead you to the main room; she''s wearing only a fishnet without any lingerie on... it''s coming to be an habit for you to see her naked. You cannot avoid to stare at her body and you wonder if you will stay in the same shape with aging... <font color = #DC143C>"H-hi Anna..."</font>. You suddenly remember your deal was to help Anna with her work...you don''t know where this thing will lead you, and a little cold shake run through your spine... <br><font color = blue> "Oh my dear! I''m so happy to have you here. I''ve got everything we''ll need and more! They brought me even "The apocryphal Gor"...!" </font><br>...You don''t know what''s Anna is talking about and you don''t care. Your only thoughts are focused on what will expect you now... no one word comes out from your mouth.'
+				'Anna leads you to the main room; she''s wearing only a fishnet without any lingerie on... it''s becoming a habit for you to see her naked. You cannot avoid to stare at her body and you wonder if you will stay in the same shape with aging... <font color = #DC143C>"H-hi Anna..."</font>. You suddenly remember your deal was to help Anna with her work...you don''t know where this thing will lead you, and a little cold shake runs through your spine... <br><font color = blue> "Oh my dear! I''m so happy to have you here. I''ve got everything we''ll need and more! They brought me even "The apocryphal Gor"...!" </font><br>...You don''t know what Anna is talking about and you don''t care. Your only thoughts are focused on what she will expect from you now... no word comes out from your mouth.'
 				act'...':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start1l.jpg"></center>'
-					'Anna notice your worries...<font color = blue>"...<$pcs_nickname>>...i know that sight on the eyes. That sight that cannot be seen because of your lowered head..."</font>She hit the point...<br><font color = #DC143C>"N-no...no...it''s ok..."</font><br><font color = blue>"Listen: you can stop it now if you want and make another choice. If something seems too hard to you you can always use the safe word or the safe action; honestly there''s no need to be worried: just focus on the task i will give you and things will run smooth."</font><br><font color = #DC143C>"Maybe... you are right..."</font><br>Anna starts playing with her heel....<font color = blue>"...or...you can decide to play the "bad girl" that need some correction...it''s up to you at the end."</font><br><font color = #DC143C>"..."</font> You don''t want to follow Anna''s last advice...do you?<br><font color = blue>"Ok if you decide to follow the deal we''ll go straight to change into something more appropriate for our roleplay...ready?"</font>'
+					'Anna notices your worries...<font color = blue>"...<$pcs_nickname>>...I know that sight on the eyes. That sight that cannot be seen because of your lowered head..."</font>She hit the point...<br><font color = #DC143C>"N-no...no...it''s ok..."</font><br><font color = blue>"Listen: you can stop it now if you want and make another choice. If something seems too hard to you you can always use the safe word or the safe action. Honestly there''s no need to be worried: just focus on the task I will give you and things will run smoothly."</font><br><font color = #DC143C>"Maybe... you are right..."</font><br>Anna starts playing with her heel....<font color = blue>"...or...you can decide to play the "bad girl" that need some correction...it''s up to you at the end."</font><br><font color = #DC143C>"..."</font> You don''t want to follow Anna''s last advice...do you?<br><font color = blue>"Ok if you decide to follow the deal we''ll go straight to change into something more appropriate for our roleplay...ready?"</font>'
 					act'A...deal is a deal...': gt'hotel_annaIntercourse','librarian'
 					act'I''d like to think better at my choice Anna...': gt'hotel_annaIntercourse','Anna_path_choice'
 				end	
@@ -745,15 +745,15 @@ if ARGS[0] = 7:
 			else
 				*clr & cla 
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0.jpg"></center>'
-				'Anna lead you to the main room; she''s wearing only a fishnet without any lingerie on... it''s coming to be an habit for you to see her naked. You cannot avoid to stare at her body and you wonder if you will stay in the same shape with aging... <font color = #DC143C>"Hi Anna... you look ...great... '' ...and naked...''...."</font><br><font color = blue> "Thanks sweety! But we are not here to make compliments...have you thought about today?"</font>'
+				'Anna leads you to the main room; she''s wearing only a fishnet without any lingerie on... it''s becoming a habit for you to see her naked. You cannot avoid to stare at her body and you wonder if you will stay in the same shape with aging... <font color = #DC143C>"Hi Anna... you look ...great... '' ...and naked...''...."</font><br><font color = blue> "Thanks sweety! But we are not here to make compliments...have you thought about today?"</font>'
 				act'Yes and no...could you remind me something?': gt'hotel_annaIntercourse','Anna_path_choice'
-				act'Sorry Anna, i''m not ready for this...': 
+				act'Sorry Anna, I''m not ready for this...': 
 					*clr & cla
 	!				IgorevnaBDSM -= 1
 	!				minut += 61
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/session_start0a.jpg"></center>'
-					'<font color = blue> "Understandable. Well in that case we can only talk about how things are going in the world..." </font> Both you and Anna spend an hour speaking of various thing, sometimes the arguments drop on the BDSM but mostly it''s unrelated to it... . It seems that Anna couldn''t teach you nothing more without practice... . At the end she lead you to the exit letting you know she''s avaible for further experimentation... <font color = blue> "...and...if you want to return on our steps...feel free to pass anytime."</font> Then she give you two great kisses on your cheeck and you go on your own way...'
+					'<font color = blue> "Understandable. Well in that case we can only talk about how things are going in the world..." </font> Both you and Anna spend an hour speaking of various thing, sometimes the arguments drop on the BDSM but mostly it''s unrelated to it... . It seems that Anna couldn''t teach you nothing more without practice... . At the end she leads you to the exit letting you know she''s avaible for further experimentation... <font color = blue> "...and...if you want to return on our steps...feel free to pass anytime."</font> Then she give you two great kisses on your cheeck and you go on your own way...'
 					act'Thanks Anna, see you...': gt'pav_hotel'
 				end
 			end
@@ -796,20 +796,20 @@ if $ARGS[0] = 'Anna_sub_session':
 	BDSM_Knowledge += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub0.jpg"></center>'
 	!if storyline
-	'You both go to change your dress; Anna require you to wear like a school girl... . She gave you a uniform with a short skirt, but you saw someting more daring for sure; it shouldn''t be a problem afterall. <font color = blue> "...Uhhmff!...Sometimes i feel that i could use the lingerie to restrict!"</font><br><font color = #DC143C>"...Do you need any help?"</font><font color = blue> "...No thanks my dear....Ngghh!...Ahhh...there we are. Mmmm...i should speak with the Pav G&M owner... . Anyway you could feel that today will be less than what you could expect, or even what you saw or done since today; that''s because i want you to pass through an entire session from the beginning to the end, and i don''t want any rush; we''ll see what to do as we proceed. That said: are you ready? We''ll start collaring you..."</font>'
+	'You both go to change your dress; Anna requires you to wear like a school girl... . She gave you a uniform with a short skirt, but you saw someting more daring for sure; it shouldn''t be a problem afterall. <font color = blue> "...Uhhmff!...Sometimes i feel that i could use the lingerie to restrict!"</font><br><font color = #DC143C>"...Do you need any help?"</font><font color = blue> "...No thanks my dear....Ngghh!...Ahhh...there we are. Mmmm...i should speak with the Pav G&M owner... . Anyway you could feel that today will be less than what you could expect, or even what you saw or done since today; that''s because i want you to pass through an entire session from the beginning to the end, and i don''t want any rush; we''ll see what to do as we proceed. That said: are you ready? We''ll start collaring you..."</font>'
 
 	act'...': 
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub1.jpg"></center>'
-		'You are a bit reluctantly to have a collar on your neck; but it''s part of the session and you shouldn''t come back...<font color = blue> "A little scared? Do not worry, i cannot hurt those puppy eyes...hehehe. Also, remember that there''s no real meaning if you don''t look for it."</font> Anna goes behind your back and wrap the collar on you. '
+		'You are a bit reluctantly to have a collar on your neck; but it''s part of the session and you shouldn''t come back...<font color = blue> "A little scared? Do not worry, I cannot hurt those puppy eyes...hehehe. Also, remember that there''s no real meaning if you don''t look for it."</font> Anna goes behind your back and wrap the collar on you. '
 		act'...': gt'hotel_anna','Anna_sub_session1'
 	end
 	act'Offer your neck...': 
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub1a.jpg"></center>'
-		'<font color = blue> "Good girl, i see you enter the role. Of course it stay within the session, it has no real meaning if you aren''t looking for it."</font> You offer an easy access to your neck.'
+		'<font color = blue> "Good girl, I see you enter the role. Of course it stays within the session, it has no real meaning if you aren''t looking for it."</font> You offer an easy access to your neck.'
 		act'...': gt'hotel_anna','Anna_sub_session1'
 	end
 end
@@ -818,13 +818,13 @@ if $ARGS[0] = 'Anna_sub_session1':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub2.jpg"></center>'
-	'<font color = blue> "Collaring is a great sign of obedience; today we''ll speak a little about obedience, and we''ll pass to practical mainly, if you are willing of course. I don''t have to remember that nothing has a meaning if you don''t want."</font><br><font color = #DC143C>"O-ok.."</font><br><font color = blue>"...Anyway, i want you to not being worried about not accomplished some task. Depending on yourself you could find something too much degrading, and i have no reason to let you feel some discomfort. "</font><br><font color = #DC143C>"T-thanks...i think..."</font><br><font color = blue>"...Expecially, showing obedience, that if you accept within a BDSM relationship, has a deep meaning. And we''ll start with that. Now: do you have something in mind that you could use to show me your obedience?"</font>'
+	'<font color = blue> "Collaring is a great sign of obedience; today we''ll speak a little about obedience, and we''ll pass to practical mainly, if you are willing of course. I don''t have to remember that nothing has a meaning if you don''t want."</font><br><font color = #DC143C>"O-ok.."</font><br><font color = blue>"...Anyway, I want you to not being worried about not accomplished some task. Depending on yourself you could find something too much degrading, and I have no reason to let you feel some discomfort. "</font><br><font color = #DC143C>"T-thanks...I think..."</font><br><font color = blue>"...Expecially, showing obedience, that if you accept within a BDSM relationship, has a deep meaning. And we''ll start with that. Now: do you have something in mind that you could use to show me your obedience?"</font>'
 	act'Refuse...': 
 		*clr & cla
 		gs 'stat'
 		Anna_see_asub -= 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub2.jpg"></center>'
-		'You shake your head... . <font color = blue>"...Ok. For example you could lower your body and kiss my feet. Feet have a great meaning too; subs put their life under the Dominant''s feet. You can clearly see that there''s a big meaning about subs; what you may not think as first is that it''s a great responsibility for Dominant. Life is a delicate crystal, and NEVER, i said NEVER, Dominant should think about damaging it. That''s a rule, and there''s no deal on that."</font><br><font color = #DC143C>"I see...i think..."</font><br><font color = blue>"Sssshhh!!!"</font>...Anna point her index to the ceiling...<font color = blue>"Listen! Don''t speak. That''s an hand code for silence."</font><br><font color = #DC143C>"..."</font>You nod<br><font color = blue>"Good. Now follow me."</font>'
+		'You shake your head... . <font color = blue>"...Ok. For example you could lower your body and kiss my feet. Feet have a great meaning too; subs put their life under the Dominant''s feet. You can clearly see that there''s a big meaning about subs; what you may not think as first is that it''s a great responsibility for Dominant. Life is a delicate crystal, and NEVER, I said NEVER, Dominant should think about damaging it. That''s a rule, and there''s no deal on that."</font><br><font color = #DC143C>"I see...I think..."</font><br><font color = blue>"Sssshhh!!!"</font>...Anna points her index to the ceiling...<font color = blue>"Listen! Don''t speak. That''s a hand code for silence."</font><br><font color = #DC143C>"..."</font>You nod<br><font color = blue>"Good. Now follow me."</font>'
 		act'...': gt'hotel_anna','Anna_sub_session2'
 	end
 	act'Show your obedience': 
@@ -832,7 +832,7 @@ if $ARGS[0] = 'Anna_sub_session1':
 		gs 'stat'
 		AnnaQW['sub'] += 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub2a.jpg"></center>'
-		'You had it... . <font color = blue>"You are a good girl, that''s a perfect sign of obedience. You have to know that feet have a great meaning too; subs put their life under the Dominant''s feet. You can clearly see that there''s a big meaning about subs; what you may not think as first is that it''s a great responsibility for Dominant. Life is a delicate crystal, and NEVER, i said NEVER, Dominant should think about damaging it. That''s a rule, and there''s no deal on that."</font><br><font color = #DC143C>"I see...i think..."</font><br><font color = blue>"Sssshhh!!!"</font>...Anna point her index to the ceiling...<font color = blue>"Listen! Don''t speak. That''s an hand code for silence."</font><br><font color = #DC143C>"..."</font>You nod<br><font color = blue>"Good. Now follow me."</font>'
+		'You had it... . <font color = blue>"You are a good girl, that''s a perfect sign of obedience. You have to know that feet have a great meaning too; subs put their life under the Dominant''s feet. You can clearly see that there''s a big meaning about subs; what you may not think as first is that it''s a great responsibility for Dominant. Life is a delicate crystal, and NEVER, I said NEVER, Dominant should think about damaging it. That''s a rule, and there''s no deal on that."</font><br><font color = #DC143C>"I see...I think..."</font><br><font color = blue>"Sssshhh!!!"</font>...Anna points her index to the ceiling...<font color = blue>"Listen! Don''t speak. That''s a hand code for silence."</font><br><font color = #DC143C>"..."</font>You nod<br><font color = blue>"Good. Now follow me."</font>'
 		act'...': gt'hotel_anna','Anna_sub_session2'
 	end
 end
@@ -841,24 +841,24 @@ if $ARGS[0] = 'Anna_sub_session2':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub3.jpg"></center>'
-	'Anna put her index into the ring of the collar...you have the reflex to put your hands on hers, but she scold you immediately. <font color = blue> "No!...Do not act if not asked. Put your hands, behind your back."</font> You obey the order Anna gave you, mainly because she''s joking with the collar and she''s not pulling it. <font color = blue> "The reflex you had, show me you are not willing to be dragged by your collar; that''s why i didn''t pull it: to let you get acquainted. Honestly i don''t want to pull it, i''d like you to stand up on your own."</font>You start rising yourself...<font color = blue>"...Without hands."</font><br><font color = #DC143C>"...But..how..."</font><br><font color = blue>"Bend one knee and start rise...it will be natural after that. Don''t worry...I''ll follow your movements with my finger. And don''t rush, i don''t want you to fall."</font>You nod and rise your body without your hands...it wasn''t difficult afterall. '
+	'Anna puts her index into the ring of the collar...you have the reflex to put your hands on hers, but she scolds you immediately. <font color = blue> "No!...Do not act if not asked. Put your hands, behind your back."</font> You obey the order Anna gave you, mainly because she''s joking with the collar and she''s not pulling it. <font color = blue> "The reflex you had shows me you are not willing to be dragged by your collar. That''s why I didn''t pull it: to let you get acquainted. Honestly I don''t want to pull it, I''d like you to stand up on your own."</font>You start rising yourself...<font color = blue>"...Without hands."</font><br><font color = #DC143C>"...But..how..."</font><br><font color = blue>"Bend one knee and start rising...it will be natural after that. Don''t worry...I''ll follow your movements with my finger. And don''t rush, I don''t want you to fall."</font>You nod and rise your body without your hands...it wasn''t difficult afterall. '
 	act'...': 
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub3a.jpg"></center>'
-		'Anna took a chair from the room...<font color = blue>"Now bend over."</font><br><font color = #DC143C>"..."</font><br><font color = blue>"See it wasn''t difficult...was it?"</font><br><font color = #DC143C>"...It''s the situation...i mean...i feel a little exposed."</font><br><font color = blue>"That''s great!"</font><br><font color = #DC143C>"W-what do you mean?"</font><br><font color = blue>"Exposure was the think i had to speak about, and since you felt a little exposed i can skip that part. Ok...next... ."</font>Anna move from the room and return with a flogger immediately. <font color = blue>"Again: obedience. This is a flogger as you know; another great sign of obedience is to kiss it, to kiss the Discipline tool, to kiss it show the respect subs have to have toward the Discipline and the time the Dominant spend for their education. Will you show me your obedience?"</font>'
+		'Anna took a chair from the room...<font color = blue>"Now bend over."</font><br><font color = #DC143C>"..."</font><br><font color = blue>"See it wasn''t difficult...was it?"</font><br><font color = #DC143C>"...It''s the situation...I mean...I feel a little exposed."</font><br><font color = blue>"That''s great!"</font><br><font color = #DC143C>"W-what do you mean?"</font><br><font color = blue>"Exposure was the think I had to speak about, and since you felt a little exposed I can skip that part. Ok...next... ."</font>Anna moves from the room and returns with a flogger immediately. <font color = blue>"Again: obedience. This is a flogger as you know; another great sign of obedience is to kiss it, to kiss the Discipline tool, to kiss it shows the respect subs have to have toward the Discipline and the time the Dominant spend for their education. Will you show me your obedience?"</font>'
 		act'Refuse': 
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub4.jpg"></center>'
-			'<font color = blue> "...Understandable. In that case feel the flogger..."</font><br><font color = #DC143C>"WHAT?"</font><br><font color = blue> "...that softly crawl on your back..."</font><br><font color = #DC143C>"...A-Anna...you scared me..."</font><br><font color = blue> "...sweety...i didn''t finished the sentence. Ok, now the reminder spanking."</font><br><font color = #DC143C>"WHAT??? I heard well that time."</font><br><font color = blue>"It''s symbolical <<$pcs_nickname>>, it take care of things that could have been missed."</font><br><font color = #DC143C>"...w-we didn''t spoke about spanking...."</font><br><font color = blue>"Uhhmm...let me think. What about a game?"</font> '
+			'<font color = blue> "...Understandable. In that case feel the flogger..."</font><br><font color = #DC143C>"WHAT?"</font><br><font color = blue> "...that softly crawl on your back..."</font><br><font color = #DC143C>"...A-Anna...you scared me..."</font><br><font color = blue> "...sweety...I didn''t finished the sentence. Ok, now the reminder spanking."</font><br><font color = #DC143C>"WHAT??? I heard well that time."</font><br><font color = blue>"It''s symbolic <<$pcs_nickname>>, it take care of things that could have been missed."</font><br><font color = #DC143C>"...w-we didn''t speak about spanking...."</font><br><font color = blue>"Uhhmm...let me think. What about a game?"</font> '
 			act'...?????...': gt'hotel_anna','table1'
 		end
 		act'Show your obedience': 
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionpracticend/sub/sub4a.jpg"></center>'
-			'<font color = blue> "Good girl. Ok, now the reminder spanking."</font><br><font color = #DC143C>"WHAT???"</font><br><font color = blue>"It''s symbolical <<$pcs_nickname>>, it take care of things that could have been missed."</font><br><font color = #DC143C>"...w-we didn''t spoke about spanking...."</font><br><font color = blue>"Uhhmm...let me think. What about a game?"</font>' 
+			'<font color = blue> "Good girl. Ok, now the reminder spanking."</font><br><font color = #DC143C>"WHAT???"</font><br><font color = blue>"It''s symbolic <<$pcs_nickname>>, it takes care of things that could have been missed."</font><br><font color = #DC143C>"...w-we didn''t speak about spanking...."</font><br><font color = blue>"Uhhmm...let me think. What about a game?"</font>' 
 			act'...?????...': gt'hotel_anna','table1'
 		end
 	end

+ 3 - 3
locations/igor_schedule.qsrc

@@ -77,7 +77,7 @@ if SchoolAtestat = 0 and kanikuli = 0:
 			locat['igor'] = 7
 		elseif hour < 15:
 			if temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9:
-				!!At the lake beach hanging out wiht the other cool kids and the jocks
+				!!At the lake beach hanging out with the other cool kids and the jocks
 				locat['igor'] = 10
 			else
 				!!At home in his room
@@ -107,7 +107,7 @@ else
 			locat['igor'] = 7
 		elseif hour < 15:
 			if temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9 and week mod 2 = 0:
-				!!At the lake beach hanging out wiht the other cool kids and the jocks
+				!!At the lake beach hanging out with the other cool kids and the jocks
 				locat['igor'] = 10
 			else
 				!!At home in his room
@@ -151,7 +151,7 @@ else
 			locat['igor'] = 7
 		elseif hour < 15:
 			if temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9:
-				!!At the lake beach hanging out wiht the other cool kids and the jocks
+				!!At the lake beach hanging out with the other cool kids and the jocks
 				locat['igor'] = 10
 			else
 				!!At home in his room

Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor