343 Revize 1e19980451 ... 59563951d3

Autor SHA1 Zpráva Datum
  Vengeance11 59563951d3 Merge branch 'master' of https://git.catrenelle.com/Alaratt/glife před 3 roky
  Alaratt bc7091e5f0 [Added] cutoff date for joining Starlets před 3 roky
  hornguy6 a01ceaa235 [fixed] accidental incorrect bracket před 3 roky
  hornguy6 dd9d1797e4 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  Vengeance11 ba366d7948 no message před 3 roky
  Vengeance11 a52d9c983b Ignore me. Just fixing my goof. před 3 roky
  Vengeance11 bc6921115f Fixed *clr & cla and spelling. před 3 roky
  Vengeance11 5dde5b0595 Descriptive text for being confronted when you miss Starlets training. Option to (permanently) quit Starlets added. před 3 roky
  hornguy6 0c80720cc7 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  hornguy6 a0017968b8 [changed[ more masseuse coding stuff před 3 roky
  hornguy6 6a51e3ae86 [changed] some stuff on the coding side and accounting for single digit minutes on a clock před 3 roky
  hornguy6 777286e888 [fixed] some problems with the masseuse schedule před 3 roky
  hornguy6 f6942f3159 [changed] typo před 3 roky
  hornguy6 4778c1faf9 [changed] a few text edits for consistency and better phrasing před 3 roky
  Vengeance11 5b853e08fb Merge branch 'master' of https://git.catrenelle.com/Alaratt/glife před 3 roky
  Alaratt 2304574b5b [Updated] my remote to include KS change in gschool_grounds.qsrc so I don't overide his fix před 3 roky
  Alaratt 6a231f830e [Added] Starlets now have a mandatory practice schedule and Sveta can be held accountable for missing practice před 3 roky
  hornguy6 bed8391677 [fixed] extra end před 3 roky
  hornguy6 6d340f19e6 [fixed] the special job list always being available even if there is no work před 3 roky
  hornguy6 dfd8dcc163 [added] a few additional parameters that can prevent you from working on a given day at the modelling studio před 3 roky
  hornguy6 f886d03449 [added] event for Anya finding your dildos in the shower and swiping them to protect you from mom před 3 roky
  hornguy6 c1ced547f8 [fixed] a lot of incorrect arousal calls před 3 roky
  Alaratt 5e830ed30c [Added] all kitchens in the apartments have the same options in the same order. před 3 roky
  hornguy6 3f1a467944 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  KevinSmarts 945fac4a01 [fixed] Check for school uniform not using P prefix for worn outfit which could lead to incorrect results před 3 roky
  Alaratt 47f064e4b0 [Added] Ivan to the journal hints, for those who don't play volleyball and wouldn't then see the path to take for his shower scenes. před 3 roky
  Alaratt 4207219439 [fixed] forgot to change if to elseif when I added more steps to Lariska story hints před 3 roky
  hornguy6 d37014f0a2 [fixed] typo was causing dead end před 3 roky
  Vengeance11 f8183d090c Fixed typos před 3 roky
  KevinSmarts d930860db8 Merge remote-tracking branch 'hornguy6/master' před 3 roky
  KevinSmarts 84e1af8b37 Merge remote-tracking branch 'Alaratt/master' před 3 roky
  rachels 064ea24bfc add missing brackets před 3 roky
  hornguy6 77ac0ee9cf [fixed] removed an unnecessary second option that would could loops during school lunch před 3 roky
  hornguy6 eb42342b7f [added] new volleyball coach file for work in progress, not finished or integrated into the game před 3 roky
  hornguy6 6a381d4a39 [added] new 'sleep' file for when you sleep and you're not at home před 3 roky
  hornguy6 1785dab6da [added] new volleyball code for review/viewing (not implemented) před 3 roky
  Alaratt 2db50f0d44 [Fixed] commented out all the help with homework options in Igor's hallway dialogue since he doesn't actually help with homework. Leaving it there though in case somebody else wants to add an apartment for him. před 3 roky
  Alaratt 5c80b49d3d [Added] Modernized the kitchen in the cottage a bit. před 3 roky
  Alaratt a41f487e21 [Added] Christina sub and dom paths added to the journal hints. před 3 roky
  Alaratt ed9fc906e2 [Updated] changes Vengeance made so we wouldn't overwrite each other před 3 roky
  Vengeance11 67ddda7b04 Text edits and grammar improvements. před 3 roky
  Alaratt fb18f21128 [Added] Lariska storyline to the journal quest page and fixed some variables před 3 roky
  hornguy6 22e67276c3 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  Vengeance11 af9f476454 Cleaned up and edited text and fixed a typo that let players access Albina's house too early. před 3 roky
  hornguy6 3cafefac1f [fixed] runway modelling event bug (I hope) před 3 roky
  KevinSmarts 2148a35f29 [fixed] Typo causing inititive in fights to keep raising or lowering each fight making it either too easy or impossible over time. před 3 roky
  Vengeance11 ed2a9edc6b Minor text edits před 3 roky
  hornguy6 b0e4bde0e6 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  Vengeance11 bcf7b1d4f7 Text edits for porn studio as part of revamp před 3 roky
  KevinSmarts 8b089c4e24 Merge remote-tracking branch 'slanon/master' před 3 roky
  KevinSmarts 4b155b6bad Merge remote-tracking branch 'Crux/story-loan-officer' před 3 roky
  KevinSmarts 3620438d19 Merge remote-tracking branch 'Alaratt/master' před 3 roky
  slanon 747f6c02b2 Merge https://git.catrenelle.com/Kevin_Smarts/glife into master před 3 roky
  Vengeance11 dd05ec651e [text edits] Minor text edits because I'm a perfectionist who is never happy. před 3 roky
  slonon 1ef83c284f [fixes] blank screen when working as a camgirl před 3 roky
  slonon 49ffc5ff8e [fixes] blank screen in bedroom před 3 roky
  Crux 598de73be4 [CODE] - Added code for Loan Officer event před 3 roky
  Alaratt 320f2733b1 [Added] Alternate scene for submit to Christina on the beach, if Lariska story not being done. před 3 roky
  Alaratt f3d60ec55a [Added] the revenge rape scene aded back in, in original form, will rewrite it later před 3 roky
  rachels df31a0a18b fix typo and add saveupdater which I forgot add the last time před 3 roky
  rachels b2ce9e1137 change the saveupdater according to version numbering před 3 roky
  KevinSmarts 955bd3068c Merge remote-tracking branch 'Alaratt/master' před 3 roky
  KevinSmarts c48c55c1e8 Merge remote-tracking branch 'hornguy6/master' před 3 roky
  Alaratt 6248ab0b77 [Added] Major Revamp of Christina's dom and sub paths and intro to Lariska's storyline. Races no longer contribute to outcasting, fight option removed from the beach, and and conditions for it have changed, more to be added later. Coach scene no longer has Sveta joining, for now. Array replaces most of Christina and Lariska's variables. Revenge rape scene commented out for now. Lariska still requires dealing with Christina, but can be unlocked if choosing to be dom or sub to Christina, and does not require outcasting, only blackmail, if choosing the dom route. Previous fixes by KS and text edits by Vengeance were included to not overwrite their commits. Journal hints and some more text will be needed to finish this, but bug tested most things and everything should work right. před 3 roky
  hornguy6 2a0308fbea Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  KevinSmarts f98b8fd46d [fixed] Variables accidentally renamed while changing clothing variable names před 3 roky
  hornguy6 4b2b64a06a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  hornguy6 79d3d5ecec [fixed] didn't have provisions for pubic styles 13 & 14 před 3 roky
  hornguy6 6c2516022d [changed] text edits před 3 roky
  hornguy6 959258179a [removed] references to the aphrodite manager knowing your passport is fake před 3 roky
  hornguy6 9520e34920 [fixed] pcs_pubes requirement too long před 3 roky
  Vengeance11 2911cc799a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  Vengeance11 3fcca3fe89 Text cleaned up and edited to better suit my grand master plan. před 3 roky
  rachels 516f20c3f3 fix Name Updates před 3 roky
  rachels d213924340 rename artemEV -> artem_events před 3 roky
  rachels 67ce57a41b Revert "Removal of artemEV duplicate file. It was replaced by artem_events" před 3 roky
  rachels f161956acb remove temporary file před 3 roky
  rachels ace3ab7c3a Revert "Removal of artemEV duplicate file. It was replaced by artem_events" před 3 roky
  rachels 586337596f fix the branch error that was spotted by zablay před 3 roky
  rachels 77b63e2831 fix typo před 3 roky
  rachels bd9db17994 let it flow further před 3 roky
  KevinSmarts 0507cf3598 [fixed] Removed teh remaining cats shoe links file file 'shoes' před 3 roky
  KevinSmarts 2eb0c16675 Merge remote-tracking branch 'Arcadia/master' před 3 roky
  KevinSmarts 240b7b5a25 [fixes] Clean up and variable name fixes for shoes and purses. Purses for custom start now re-done with full range of options and fixed broken images před 3 roky
  Arcadia 90d077927d Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  Arcadia a3a107fa44 Merge branch 'master' of https://git.catrenelle.com/Youshou/glife před 3 roky
  Arcadia 939575e04f Removal of artemEV duplicate file. It was replaced by artem_events před 3 roky
  Arcadia 8d9ca0d243 artemdate renamed to artem_date_events před 3 roky
  Arcadia 3bd0afc81e Removal of artemEV duplicate file. It was replaced by artem_events před 3 roky
  Arcadia 92a03b280d Merge branch 'master' of https://git.catrenelle.com/Youshou/glife před 3 roky
  Arcadia af69241e3a artemdate renamed to artem_date_events před 3 roky
  Arcadia 5b78968c52 Removal of artemEV duplicate file. It was replaced by artem_events před 3 roky
  KevinSmarts 3d74b2c69f [removed] Shoes removed from Cats, will look to add dedicated shoe shop in future as tehre is a bit of a mid-range gap před 3 roky
  KevinSmarts 96a21697d2 [fixed] disabled shoe purchase in Cats awaiting confirmation of removal or not. před 3 roky
  KevinSmarts 2926fad6a1 Merge remote-tracking branch 'Milky_boobs/master' před 3 roky
  KevinSmarts b1dc6d3480 Merge remote-tracking branch 'Alaratt/master' před 3 roky
  KevinSmarts 551ace1eea Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  KevinSmarts 5e1e4254f6 [changed] Updated the shoes to use the new attribute files and image links and updated variable names to new version inline with clothing variable naming před 3 roky
  rachels ba7582096f rest of the rex party renaming před 3 roky
  rachels b72786f899 Fix typo před 3 roky
  rachels 9488cf7cea rename rex party files před 3 roky
  sandra_schulz a2cdc9a49b [update] removed useless if else branches from pav_pharmacy před 3 roky
  Alaratt 9f4b23cff6 [Added] Cheerleader and Julia hints aded to the journal před 3 roky
  Alaratt 5f8ddc64cd [Changed] the requirement to talk about sex with Julia has been changed from player arousal to use the previously unused variable JulMilBestFrend the player gets when chatting with her in her apartment instead. před 3 roky
  Alaratt f83a810a09 [Fixed] Mostly just some text edits for Artem's father, every other sentence doesn't need to trail off like this... před 3 roky
  sandra_schulz 59c8f304c0 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  KevinSmarts c7a47e81e0 Merge remote-tracking branch 'Milky_boobs/master' před 3 roky
  sandra_schulz c238a13d04 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  sandra_schulz 5c834d65d1 [Documentation] Finished documentation on used variables in femcyc. Sorted variables from A to Z. před 3 roky
  rachels daa60d3b22 fix all the bugs před 3 roky
  KevinSmarts 05a6783a72 [fixed] Updated atrribute file links to stop errors while I work on shoe updates před 3 roky
  KevinSmarts 49cd459ab3 Merge remote-tracking branch 'Arcadia/master' před 3 roky
  KevinSmarts 1ec11eb79e [added] New attribute files for shoes and coats před 3 roky
  KevinSmarts 41d5f02d72 Merge remote-tracking branch 'Milky_boobs/master' před 3 roky
  sandra_schulz 43064e0170 [fix] additional variable fixes and killvar fixes před 3 roky
  Arcadia 9f4ed3895a artemdate renamed to artem_date_events před 3 roky
  KevinSmarts b6b5901bed Merge remote-tracking branch 'Milky_boobs/master' před 3 roky
  Arcadia 4d1cd496e1 Removal of artemEV duplicate file. It was replaced by artem_events před 3 roky
  sandra_schulz e1ff748910 [fix] streamlined some of the variables. Variables were writtin in lower case and upper case and then in full lower case again. před 3 roky
  KevinSmarts 8b59c571ec Merge remote-tracking branch 'origin/master' před 3 roky
  rachels 1a31703763 not so dynamic but it works před 3 roky
  Alaratt b35d2936ef [Added] Journal hints to become a starter in volleyball, with a lot of help from SpackledLanturn. před 3 roky
  KevinSmarts ca00290a09 [fixed] Use of old variable před 3 roky
  sandra_schulz 863b0f9a7a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  KevinSmarts fef4a2e307 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' před 3 roky
  Spackled Lanturn 82dad1a1b4 [text edit] typo in comment I just added před 3 roky
  Spackled Lanturn bf1a5c9dbe [fixed] followup to https://git.catrenelle.com/SpackledLanturn/glife/commit/daff9c213f6c394e443498fa34e1abe36396cd73 that clarifies a comment added to gdksport and simplifies the condition there to use IvanShowerQW = 2 instead of kotovVSprohorov = 2 and IvanShowerQW = 0 před 3 roky
  KevinSmarts 5855b1d178 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' před 3 roky
  Spackled Lanturn daff9c213f [fixed] dealt with some issues in the Ivan related parts of the quest line to become a starter for the volleyball team: (1) made it so that declining Ivan's request to have sex after school in the showers on the current day doesn't block him asking again (agreeing to his request is necessary for coach to spy on the two of you), (2) removed the VoltrenerVoyeur += 1 from VoluntrenerSexShower scene triggered when VoltrenerVoyeur = 2 (this line was never called as it was guarded by a check that IvanShowerYes = 2 but the gt call that triggers the scene is guarded by IvanShowerYes = 0), (3) moved the line IvanShowerQW = 1 from inside ShowerWithIvan to the code stanza that calls ShowerWithIvan (this avoids IvanShowerQW getting reset in subsequent calls of ShowerWithIvan and avoids there being paths in ShowerWithIvan that don't set this var, which there inadvertently were previously), (4) removed the IvanShowerQW = 1 lines in the cases in the scene in gdksport where the player does not shower with Ivan (the Ivan dialogue at school only makes sense if you do shower with him), and (5) made the intro Ivan shower scene repeatable until the player showers with him (this can be changed back to a one-off if alternative dialogue for the scenes in IvanEv and gschool_chats1 where the player and Ivan discuss the shower incident is added for if the player doesn't shower with Ivan) před 3 roky
  Vengeance11 7c9ca283c0 Text edit missed in last commit. před 3 roky
  Vengeance11 4392aa84a8 Cleaned up school texts and made a few minor edits to Albina dialogue. před 3 roky
  KevinSmarts dee65e0ee6 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' před 3 roky
  KevinSmarts 8025d65123 Merge remote-tracking branch 'Alaratt/master' před 3 roky
  rachels bb7effa403 show shoes even if Sveta is not dressed properly před 3 roky
  Spackled Lanturn cd1d1023b2 [text edit] clean up road před 3 roky
  Spackled Lanturn bcd63eca71 Merge remote-tracking branch 'upstream/master' into minor-fixes před 3 roky
  Spackled Lanturn 0d7725194d [text edit] clean up sbReksHome před 3 roky
  rachels 997f9711f0 Move the orgasm in the proper place před 3 roky
  Spackled Lanturn 526dca232c [text edit] clean up seeporn před 3 roky
  Spackled Lanturn df64f54538 [text edit] further clean up serpent před 3 roky
  rachels 4f1b6aed35 clear unused variable před 3 roky
  rachels 3286bbe8ba do not rename array index před 3 roky
  Spackled Lanturn 8f34ecb780 [fixed] in sergeihunter, move code present in all branches of conditional to outside conditional před 3 roky
  Spackled Lanturn a25ac1a757 [text edit] clean up sergeihunter před 3 roky
  Spackled Lanturn 683c07013c [text edit] clean up serpent před 3 roky
  Spackled Lanturn 3cb62218e0 [fixed] in sewing, (1) make it so that the too few sewing materials message properly displays when clicking the resize some of your clothes action, (2) pull out some common actions in all branches of conditionals, (3) restructure conditionals to avoid having different variables be checked in the if and elseif branches and to avoid copypasting text, (4) add text (a) saying how much space for trinkets you have left in your room when you finish one and (b) saying that you are out of space in both your room and garage when you make a trinket that fills up the last space in each před 3 roky
  Spackled Lanturn 2e15a32a4f [text edit] clean up sewing před 3 roky
  Alaratt d03c42ebf8 [text edits] cleaned up some text in the journal před 3 roky
  Spackled Lanturn 05f3dd1c9f [changed] in sex, (1) added a separate text for when the man comes while giving you oral instead of just reusing the one for when you're blowing him and (2) made it so that him giving you oral doesn't reduce his counter that counts down to him cumming unless he's already close to cumming or that's the only sex act that's enabled před 3 roky
  Spackled Lanturn 71e0b83129 Merge remote-tracking branch 'upstream/master' into minor-fixes před 3 roky
  KevinSmarts b88d2ab32b Merge remote-tracking branch 'Arcadia/master' před 3 roky
  KevinSmarts da3c324fff Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' před 3 roky
  Arcadia ee03984edc File changed AlbFatherQW to albina_election_events před 3 roky
  KevinSmarts 42a78396fd [fixed] Added check for suitable slut fame before seeing grafiti in school toilets před 3 roky
  Arcadia a6134a8c95 Replaced all instances of psiklin with city_suburbs. před 3 roky
  Arcadia 7a88f020b3 Replaced all instances of artemEv with artem_events. před 3 roky
  Spackled Lanturn 21a8c21201 [fixed] in sex, (1) delete unused sxkuni variable, (2) merge together the code for the near identical four vaginal sex options (since pos is only used to determine where cum goes and values 3 to 6 had it go to the same place (inside vagina) in previous implementation, only real differences between these was the picture displayed), and (3) kill vars when we're done with them instead of just zeroing them out or leaving them as is před 3 roky
  Spackled Lanturn b8f8fcb0f2 [text edit] clean up sex před 3 roky
  rachels 42e4737cc0 remove the third part of unused npc variables před 3 roky
  rachels 1e5429a940 rename a few npc variables před 3 roky
  rachels 02eddf24b7 remove the second part of unused npc variables před 3 roky
  Spackled Lanturn d50531ac36 [fixed] in sexdvanadva, (1) move common code outside conditional, (2) delete unused variables, and (3) kill variables that were being set to 0 when this file exited (sexvar) or are only used in this file and are randomly reset every time they are used (sexdvarand). (1) and (2) cut this file from 175 to 106 lines před 3 roky
  Spackled Lanturn c868909499 [text edit] clean up sexdvanadva před 3 roky
  Spackled Lanturn 6e8c947bfe [fixed] in sexdvoe, (1) move common code outside conditionals, (2) delete unused variables, and (3) kill variables that were being set to 0 when this file exited (sexvar, sameboy, sexstart) or are only used in this file and are randomly reset every time they are used (sexdvoeloc). (1) and (2) cut this file from 416 to 295 lines před 3 roky
  Spackled Lanturn 49537408e8 [text edit] clean up sexdvoe před 3 roky
  Spackled Lanturn c1aaf5e507 [fixed] in sexm, move action common to all branches of a conditional to outside the conditional před 3 roky
  Spackled Lanturn 10fb2b0ee4 [text edit] clean up sexm před 3 roky
  Spackled Lanturn 428cea0a11 [text edit] clean up bouling před 3 roky
  Spackled Lanturn b1acfd7f1e [fixed] in sexorg, (1) move common code outside conditional, (2) delete unused variables, and (3) kill variables that were being set to 0 when this file exited (sexvar) or are only used in this file and are randomly reset every time they are used (sexorgrand). (1) and (2) cut this file from 169 to 92 lines před 3 roky
  Spackled Lanturn efc40cc423 [text edit] clean up sexorg před 3 roky
  Spackled Lanturn e4dcb9597e [text edit] clean up sexshop před 3 roky
  rachels 16794234ef put npcbreeder in the depository před 3 roky
  Spackled Lanturn 46cd25d20c [text edit] clean up shop před 3 roky
  Spackled Lanturn 78c8bd05ee [text edit] clean up shop_dolls před 3 roky
  Spackled Lanturn 45509bd720 [text edit] clean up shop_fashionista před 3 roky
  Spackled Lanturn 26e2475b4d [text edit] clean up shopdacha před 3 roky
  Spackled Lanturn 38d5e14baf [text edit] clean up shoplifting před 3 roky
  Spackled Lanturn 589898b334 [fixed] in bordel, (1) prevent the player from continuing to wait for clients after the brothel closes, (2) block the wait for customers action from showing up when the player has hit the clients per night limit instead of the button being clickable but just looping the player back to the same place so that it looks like nothing happened, (3) add lines of text explaining why the player cannot work when the player can't, (4) add a line of text warning the player that the brothel is closing when they get a client offer so that they know they can't get another until the next night if they refuse this one před 3 roky
  KevinSmarts b6bcf4f069 [Fixed] it's bliny (блины) před 3 roky
  KevinSmarts df6dd4da70 [fixed] 2 instances of 'school' that should be 'gm_school' in 'wardrobe' spotted by Terlis2000 před 3 roky
  KevinSmarts ad02b09194 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' před 3 roky
  rachels 92a4901deb reorganize the bedroom code před 3 roky
  rachels 2db76b0cdb put the act into the proper place (reported by Sword) před 3 roky
  Spackled Lanturn 128686cffb [text edit] clean up shulgabath před 3 roky
  Spackled Lanturn dde2cd16bd [text edit] clean up shulgahall před 3 roky
  Spackled Lanturn d198c8cbe6 [text edit] clean up shulgaskuh před 3 roky
  Spackled Lanturn 61376c8a4d [text edit] clean up sister před 3 roky
  Spackled Lanturn ab88a07cf4 Merge remote-tracking branch 'upstream/master' into minor-fixes před 3 roky
  Spackled Lanturn 7793e1cf85 [text edit] clean up sister_chat před 3 roky
  Spackled Lanturn a9ad33dc2f [text edit] clean up sister_party před 3 roky
  Spackled Lanturn 7be427e62c [text edit] clean up sisterQW před 3 roky
  Spackled Lanturn ef38565374 [fixed] simplify conditional in sitr před 3 roky
  Spackled Lanturn 9009e90eac [text edit] clean up sitr před 3 roky
  Spackled Lanturn 354befdcfc [fixed] simplify conditional in sitr2x před 3 roky
  Spackled Lanturn 30ff58b05c [text edit] clean up sitr2x před 3 roky
  Spackled Lanturn 839480941f [text edit] clean up sistersleep před 3 roky
  Spackled Lanturn 766a458d92 [text edit] clean up sistersleep před 3 roky
  rachels e7c077d49a fix formating and some ends před 3 roky
  Spackled Lanturn f1d5e32c2c [fixed] correct var check před 3 roky
  Vengeance11 6bfc5244d0 - Albina stuff před 3 roky
  Spackled Lanturn 3686c5cbf4 [fixed] add in a line for when the player hasn't actually previously cautioned Sonia. this line is from the version of the code before the copypasting consolidation in my last commit, but in the old version, the "we've already been through this" version showed up the first time the player had the chance to caution Sonia about her drinking while the other version showed up all subsequent times před 3 roky
  Spackled Lanturn 28be8b75ac Merge remote-tracking branch 'upstream/master' into minor-fixes před 3 roky
  Spackled Lanturn 0deefac3f0 [fixed] in soniadisco, merge together the large amount of copypasted code in the various steps of Sonia's fall where she drinks with the gopniks outside, reducing the file from 1907 to 1197 lines. also fixed some bugs discovered while doing this: (1) the continue button for the drink more scene where Sonia is convinced to show her pussy was displaying the continue scene for the scene where Sonia is convinced to show her tits (in the tits one, the continue scene comes after Vasily says to show her butt; in the pussy one, it comes after he says to show everything), (2) if the player declines to join the gopniks to go drink outside the final time when Sonia gets gangbanged and outcasted, the vars to outcast sonia were not set (even though she was still gangbanged and shown off to everyone) and the wrong picture was displayed (it was just the normal them returning from drinking picture, not the cum on her face picture), (3) similarly if the player sticks around through the whole gangbang scene not all the outcasting vars were set, (4) the wrong picture was displayed during the start of the popsicle/blowjob scene if the player chose the decline drink or caution Sonia actions (the picture from the previous scene where she shows her pussy was shown instead), (5) the game text still said the player returned with the rest of the group if the player left early during the popsicle/blowjob scene před 3 roky
  KevinSmarts 75cdb1d974 Merge remote-tracking branch 'Alaratt/master' před 3 roky
  KevinSmarts 08ad957c56 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  rachels 16c64be67b Fix selfies for android před 3 roky
  KevinSmarts cff6528884 [fixed] missing clear screen and actions in sex scene. před 3 roky
  KevinSmarts 4bf6ec4e4c [fixed] mis-matched variables after name change breaking bimbo and putting it in withdrawal. Spotted by 69in98 před 3 roky
  Spackled Lanturn 4122d312d5 [fixed] cut out some duplicate code in soniadisco by merging together the shared parts of disco0 and disco01 před 3 roky
  Spackled Lanturn 1f9ecbade9 [text edit] clean up soniadisco před 3 roky
  Alaratt c87580e5b1 [Fixed] Old Shit, as Kevin put it. před 3 roky
  rachels 13c84969cc fix a wrong sublocation před 3 roky
  rachels 8df8669a94 fix typo před 3 roky
  rachels f7314f1efb fix functions' calls před 3 roky
  rachels 6cf30c9c12 remove unused locations from main directory před 3 roky
  Spackled Lanturn 815ec34c9a [fixed] simplified some conditions in shulgabed to remove some duplication před 3 roky
  Spackled Lanturn 4490fec8c4 [text edit] clean up shulgabed před 3 roky
  Spackled Lanturn c29ceb466a [text edit] clean up shulgahome před 3 roky
  KevinSmarts 2451cd3de2 Merge branch 'master' of https://git.catrenelle.com/GwenK2020/glife před 3 roky
  KevinSmarts ea0d6e49a7 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' před 3 roky
  KevinSmarts a6f3deab4b [fixed] Attribute change as top replaces bra před 3 roky
  Gwen 75bfd75dc5 [Changed] the value of clothing item před 3 roky
  Spackled Lanturn dd2b69215f [fixed] simplify conditional in sny před 3 roky
  Spackled Lanturn 30c7f13f9c [text edit] clean up sny před 3 roky
  Spackled Lanturn 6df559717c [text edit] clean up Snpc před 3 roky
  Spackled Lanturn 5f9f508694 [text edit] clean up sitrPar před 3 roky
  Spackled Lanturn 7adffc1516 [text edit] clean up street_event před 3 roky
  Spackled Lanturn 0e89380fed [text edit] clean up street_walker před 3 roky
  KevinSmarts 226eac5966 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' před 3 roky
  KevinSmarts 240754662a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  KevinSmarts efc8e4d76b [fixed] typo in attribute file and old links for purses in custom start spotted by kwscj před 3 roky
  rachels 25256de455 teach it *= and /= před 3 roky
  Spackled Lanturn 83ef8858bd [text edit] change line in tatiana_lab back to using simpler style code like in the version rachels reverted to when my initial commit broke the code, but with the spelling/grammar corrections from my earlier commit and with the initial line using *p so the sentence doesn't have a weird line break in the middle of it před 3 roky
  Spackled Lanturn 8958ee8bec [text edit] clean up ykuh před 3 roky
  Spackled Lanturn 1673b076ea [fixed] in webcam_site, removed some colons after elses that might have inadvertently been added back when merging před 3 roky
  Spackled Lanturn e0257a2342 Merge remote-tracking branch 'upstream/master' into minor-fixes před 3 roky
  Spackled Lanturn 32773050be [fixed] in webcam_site, fix some issues with the anal dildo conditional logic that arose from poorly copypasting from the vaginal dildo logic, remove some *clr calls that shouldn't be there as well as some colons after elses, and fix the condition for the double penetration dildo action being visible as the previous version was running into the 100 expression limit QSP has for conditional expressions před 3 roky
  Spackled Lanturn 3f34a2e879 [fixed] add missing parenthesis in tatiana_lab před 3 roky
  KevinSmarts 1f661a6371 [fixed] Cats missing from batch sell před 3 roky
  KevinSmarts 517b84e06f [changed] Updated the release name and version history for second bug fix release před 3 roky
  KevinSmarts 527b6dfe31 [fixed] Size of images when viewing underwear for sale were too small and it wasn't clear if you owned both coats in Mon Chéri před 3 roky
  KevinSmarts c40db30d7b [fixed] 2 ways to enter music store and only one reset data před 3 roky
  Alaratt caee87c14e [Fixed] Journal hints for classmates should no longer show up on New in Town or Transformation Starts. před 3 roky
  Alaratt ca7e6d7b0d [Fixed] Bugs reported on TFGS about jobs being available when they should/shouldn't and added a resign for the rest of the summer option for the tour guide job. před 3 roky
  rachels 550ca423b5 revert to simple code před 3 roky
  rachels 1b1373c37d S -> _s, H -> _h, B -> _b (beach, swimwear, coat) před 3 roky
  rachels c624de711d revert to previous version před 3 roky
  rachels 82942fb58a clean loadg and add version trigger into saveupdater před 3 roky
  Spackled Lanturn addf7bd86b [text edit] clean up succubus před 3 roky
  Spackled Lanturn 72ac397231 [text edit] clean up some text in spell před 3 roky
  slonon 2490206aa7 [fixes] disables the twin quest, see code comment for more info před 3 roky
  slonon 627ca5cbad Merge https://git.catrenelle.com/Kevin_Smarts/glife into master před 3 roky
  Spackled Lanturn 29ac4ac6dc [text edit] clean up spellList před 3 roky
  Spackled Lanturn 030adf70e9 [text edit] clean up sportShop před 3 roky
  Spackled Lanturn 9363c4c76a [text edit] clean up stallion před 3 roky
  Spackled Lanturn ad76f9649e [text edit] Goole --> Google před 3 roky
  Spackled Lanturn ba3d154b6b [text edit] clean up StasQS před 3 roky
  Spackled Lanturn df45743d01 [text edit] clean up StasSex před 3 roky
  Spackled Lanturn 0e01647540 [text edit] clean up stat před 3 roky
  Spackled Lanturn b09a815486 [text edit] clean up stat_display před 3 roky
  Spackled Lanturn 177f2c4da7 [text edit] in stol, write hour instead of hours when you only have one hour of homework left před 3 roky
  Spackled Lanturn 1c7ac485fc [text edit] clean up stripclub před 3 roky
  Spackled Lanturn 4bbb3faafa [text edit] clean up stwork před 3 roky
  Spackled Lanturn 4a84e61ec8 [text edit] clean up stwork2 před 3 roky
  Spackled Lanturn 32948d8f1c [text edit] clean up subkid před 3 roky
  Spackled Lanturn a796d9c75a [text edit] clean up svidboy před 3 roky
  Spackled Lanturn a791d08738 [text edit] clean up swamp před 3 roky
  Spackled Lanturn 20687518db [text edit] clean up gameover před 3 roky
  Spackled Lanturn 86b6666a72 [text edit] clean up swamp_woods před 3 roky
  Spackled Lanturn 9f3e410d73 [text edit] clean up swamp_yard před 3 roky
  Spackled Lanturn 14eb01ee52 [text edit] clean up swamphouse před 3 roky
  Spackled Lanturn 00ec3396d6 [fixed] cleaned up some unnecessarily duplicated code in tour_guide před 3 roky
  Spackled Lanturn 9de4c23313 [fixed] make the Vika birthday event condition in obroom file match the one in Vika file (fixes are (1) changing day to daystart like was done for the Vika file version and (2) removing the checks that bordel = 1 and slutty > 0 as I think the Vika file version without them makes more sense since the scene where you reject Vika's present (getting gangbanged) has you tell her "What do you take me for?" which wouldn't make sense if she already got you a job as a prostitute). also simplify the conditionals for accessing Vika here and make all checks against the brothel's opening and closing hours use the functions defined in the brothel file instead of the raw value před 3 roky
  Spackled Lanturn bc6af1e10b [text edit] clean up obroom před 3 roky
  Spackled Lanturn e49d3129a5 [changed] (1) rework Vika file to remove the need for an extra step where the player clicks finish before selecting a new action every time they chat or study with Vika (this includes separating the code for the top level text and actions because the page title/image should be displayed before the text from the chat and study actions but some of the actions only show up at certain times and the chat and study actions update the time), (2) add functions for checking whether the brothel Vika works at is open to bordel file and used them in places this data is checked, (3) added a check whether the brothel is open before the action to wait for customers is displayed in bordel file, (4) removed the vikaAge variable from Vika file since all it was doing was being used in a line of text in the same file and her age is just the player's age plus one (also there is another Vika in the game that uses the same variable) před 3 roky
  rachels 9fcc1d4a7d add the version number to each save před 3 roky
  Spackled Lanturn f228571e5c [fixed] correctly display the price brothel customers pay for the player to service them when the player is nude před 3 roky
  Spackled Lanturn 7ebd8d54c1 [text edit] clean up bordel and add a line to the entrance when the player's appearance is good enough to work to make it clearer what is going on that's causing an extra click there před 3 roky
  rachels 72fd7c3ea6 fix the repeated actions před 3 roky
  Spackled Lanturn a4f7411d3b [text edit] clean up autoservisF před 3 roky
  Spackled Lanturn 2e300dc045 [changed] (1) made it possible to enter the car directly from inside the car dealership and repair shop if the car is parked there, (2) added functions to the car dealership and repair shop that return their open hours, (3) used those functions to block the player from driving to those locations when they are closed, (4) replaced the other places currently guarded by those open hours with calls to this function, (5) added logic to move the car out of the dealership or repair shop if the car is not wrecked and the player comes by while they are closed (non-wrecked cars are moved to not block the player from accessing their car; wrecked cars are not moved to avoid forcing the player to pay a towing fee a second time to move the car back inside), (6) added lines of text saying the car is locked inside if the car is in the repair shop or dealership and they are closed před 3 roky
  Spackled Lanturn ce7113566b [fixed] make it so location 9 (car dealership entrance) is used instead of location 8 when the player purchases a new car and when the player drives to the car dealership. location 8 was formerly autosalonF, but this location was deleted in https://git.catrenelle.com/Kevin_Smarts/glife/commit/6fbae895776aaa7b8afb79980f45474280ff6e20 so the player cannot get out of the car if it is at location 8. also the car needs to be at location 9 for the player to sell it, so it previously being impossible to drive there meant there was no way to avoid the tow fee of 3,000 for getting the car to the lot před 3 roky
  Spackled Lanturn a299528e9d [fixed] (1) make it so that the text and action for the case where the player's car breaks down when the player starts it are actually displayed, (2) make it so that the case where the player drives drunk and crashes into a tree is actually reachable (it wasn't previously because if alko >= 10 then alko > 0 is always true), and (3) simplify the conditional for determining whether the car breaks down by removing unnecessary parts před 3 roky
  slonon b1a5e8b586 Merge https://git.catrenelle.com/Kevin_Smarts/glife into master před 3 roky
  rachels d10f13682d add ability to detect colon after else před 3 roky
  Kevin_Smarts 98b2e9348f Merge branch 'patch' of yanchi/glife into master před 3 roky
  Spackled Lanturn 26a4e68472 Merge remote-tracking branch 'origin/minor-fixes' into minor-fixes před 3 roky
  Spackled Lanturn 465ac7dc1d [fixed] extracted the near identical logic used by all the local pav and city driving actions to a single place (the only one that was different (aside from bugs in the text displayed to players that said drives that took five minutes took an hour) was driving to pav's old district, but I believe that's just something that was left over from when the old district wasn't part of pav), cutting the size of carF by about 1/3 před 3 roky
  Spackled Lanturn 4463bc1641 [changed] made the player's car accessible from the red light district and added five minutes passing when accessing the car in the industrial district or red light district when the car is parked somewhere that takes five minutes to walk to from where the player currently is před 3 roky
  Spackled Lanturn f6025ec327 [fixed] extracted the near identical logic used by all the local pav and city driving actions to a single place (the only one that was different (aside from bugs in the text displayed to players that said drives that took five minutes took an hour) was driving to pav's old district, but I believe that's just something that was left over from when the old district wasn't part of pav), cutting the size of carF by about 1/3 před 3 roky
  dalu98 2632b62ff9 [fixed] Update path in `build.sh` před 3 roky
  slonon f661878a12 [fixes] restores broken twin request quest you can get from Pavlin at the hotel před 3 roky
  dalu98 e0993ec75e Fix path problem when using build.sh před 3 roky
  Spackled Lanturn 072cdea5a0 [added] made the player's car accessible from the red light district and added five minutes passing when accessing the car in the industrial district or red light district when the car is parked somewhere that takes five minutes to walk to from where the player currently is před 3 roky
  Spackled Lanturn 1a09491b41 [text edit] clean up avt před 3 roky
  Spackled Lanturn 74bf55923b [fixed] extract the common car examining and buying logic to shared logic called with gt, reducing the size of autotraidF by 161 lines or a little under 50% před 3 roky
  Spackled Lanturn 0136feb664 [text edit] clean up autotraidF před 3 roky
  Spackled Lanturn b92b4561c1 [fixed] or or --> or před 3 roky
  Spackled Lanturn 49c8007f2d [fixed] extract the common car buying logic to shared logic called with gt, reducing the size of autosalonF by about 390 lines or about 2/3 před 3 roky
  Spackled Lanturn de38e79a90 [text edit] clean up autosalonF před 3 roky
  Spackled Lanturn ba41e58642 [fixed] remove the massive amount of unnecessary copypasting in carF1 and removed remaining uses of the cartraid variable, reducing the size of carF1 by over 500 lines or about 85% před 3 roky
  Spackled Lanturn f0d4c95826 [fixed] fix some bugs where it was possible to drive to the city industrial area train station (19) and the city island (25) without going on the highway but not the other way around. the city industrial train station issue looks like it was missed when the car code was cleaned up and the various locations were split into different blocks (city, pavlovsk, and other). the city island issue looks like a result of that logic being added before the island was created and before the car code was refactored so that having that guard is no longer needed před 3 roky
  Spackled Lanturn da07296f63 [fixed] remove the cartraid variable used to distinguish whether carF1 is being called from autosalonF or autotraidF as autotraidF does not actually access carF1 před 3 roky
  Spackled Lanturn 57f8b6110d [text edit] clean up carF před 3 roky
  Spackled Lanturn 031a3c2735 [text edit] changed a line in the Vika brothel intro scene to make it more clear where it is. the player can't walk from the island to the red light district, and they aren't the same neighborhood před 3 roky
  Spackled Lanturn c3b1c2d505 [fixed] the brothel Vika works at is in the red light district, not the city residential area, so the player should be in the red light district when they leave před 3 roky
  Spackled Lanturn 1e6de54f4f [fixed] simplify a few conditionals. make the code for buying 10 joints worth of weed actually show up if you have the right amount of money and make the associated text say you are buying 10, not 5 před 3 roky
  Spackled Lanturn 4339d47fcf [text edit] clean up metro před 3 roky
  KevinSmarts 5dbdc22ac4 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' před 3 roky
  KevinSmarts 417c7cb23f Merge remote-tracking branch 'slanon/master' před 3 roky
  KevinSmarts 919c2d58c9 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  KevinSmarts 39992fa7ff [fixed] duplitcate loops causing crashes před 3 roky
  Spackled Lanturn a9e10bfb04 [text edit] clean up bordelv před 3 roky
  Spackled Lanturn 22b9e6fb77 [text edit] anouncement --> announcement před 3 roky
  rachels ab873bb0db fix a few bugs realated to resizing před 3 roky
  Spackled Lanturn 470bff3980 [text edit] clean up tatiana_lab před 3 roky
  slonon 4819de7c36 Removes obsolete variables 'SiSonWork' and 'SiSgdk' před 3 roky
  Spackled Lanturn 359c56a2a0 [text edit] clean up ivanRoom před 3 roky
  slonon 29d7b88f2f [fixes] removes blank screen when visiting kendra před 3 roky
  KevinSmarts ef1c497a4b Merge remote-tracking branch 'slanon/master' před 3 roky
  KevinSmarts 2a07c50a2a [changed] Tittle change for bug fig release před 3 roky
  KevinSmarts 51d0db1cb0 [fixed] Typos and small errors in the attributes files spotted by DeusExLibris před 3 roky
  slonon 5fc670e654 [fixes] removes 'if' after 'end', removes ':' after 'else' před 3 roky
  KevinSmarts 05826d9518 [fixed] else's with colons converted to else's without colons před 3 roky
  KevinSmarts 75c4ab7d4e Merge remote-tracking branch 'Alaratt/master' před 3 roky
  KevinSmarts a9745396cf Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' před 3 roky
  Spackled Lanturn a0c476f240 [fixed] replace all the copypasted "act 'Leave':gt'talent_agency','hallway'" in all the branches of the conditional for the random interviews the player can walk in on with a single act call that's outside the conditional před 3 roky
  Spackled Lanturn 300faa76eb [fixed] cleaned up some code that had a lot of copypasting: před 3 roky
  Alaratt 2bc55dee57 [Added] Can now have a snack in the Mansion kitchen před 3 roky
  Alaratt fad8630697 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  KevinSmarts 932dceaff9 [fixed] description numbers offset před 3 roky
  Alaratt 1b605c3aaa [Changed] Updated the Mansion to use the dynamic kitchen code to keep things consistent. před 3 roky
  dalu98 cd99b3700e Fix path problem when using build.sh před 3 roky
  Spackled Lanturn 1a77d4020e [fixed] change all instances of Timothy to Timofei. previously the character referred to in these places had been called Timothy in some places and Timofei in others and it was decided that Timofei should be the name that's used https://discord.com/channels/439744316555132948/519791787158536192/790555550856249374 před 3 roky
  Spackled Lanturn 3acf4e990e [text edit] clean up swampspring před 3 roky
  Spackled Lanturn bc8ba9744d [text edit] clean up talent_ageny před 3 roky
  Spackled Lanturn e6859a65fb [text edit] change all remaining references to Juugo to Gustav (this name change mostly happened in 2016 according to blame history) and fix some spelling errors in ivanRoom před 3 roky
  Spackled Lanturn 13ca1c527b [fixed] make it so that the Gustav agility/reaction/endurance trainings actually take an hour like they say they do instead of an hour and fifteen minutes. also extract their shared code to a gs call since the logic is identical outside of what exp they give před 3 roky
  sandra_schulz 587eb20369 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  sandra_schulz 40e80655cd Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 3 roky
  sandra_schulz a095c5fce8 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 4 roky
  sandra_schulz eac8442022 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 4 roky
  sandra_schulz 9795e4d80d Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife před 4 roky
100 změnil soubory, kde provedl 4009 přidání a 3586 odebrání
  1. 4 0
      Name Updates.txt
  2. 8 8
      build.sh
  3. 3 3
      glife-notepad++
  4. 28 35
      glife.qproj
  5. 63 27
      locations/AlbStars.qsrc
  6. 1 1
      locations/BDSM_Club.qsrc
  7. 4 4
      locations/BurgerTip.qsrc
  8. 2 2
      locations/Cheatmenu_din.qsrc
  9. 39 30
      locations/HotelHole.qsrc
  10. 20 20
      locations/HotelWork.qsrc
  11. 3 1
      locations/IvanEv.qsrc
  12. 1 1
      locations/JuliaMilHome.qsrc
  13. 2 2
      locations/LariskaGo.qsrc
  14. 15 8
      locations/LariskaHome.qsrc
  15. 0 2
      locations/LariskaStart.qsrc
  16. 0 12
      locations/NPCChanger.qsrc
  17. 1 1
      locations/NikoWhore.qsrc
  18. 66 66
      locations/Snpc.qsrc
  19. 21 21
      locations/StasQW.qsrc
  20. 7 7
      locations/StasSex.qsrc
  21. 157 99
      locations/Vika.qsrc
  22. 1 1
      locations/VolleyTrenCentr.qsrc
  23. 435 0
      locations/Voltrener - WIP.qsrc
  24. 8 5
      locations/Voltrener.qsrc
  25. 3 1
      locations/VoltrenerSexShower.qsrc
  26. 108 0
      locations/_attributes_bomba_coats.qsrc
  27. 114 81
      locations/_attributes_bomba_shoes.qsrc
  28. 108 0
      locations/_attributes_cats_coats.qsrc
  29. 2 1
      locations/_attributes_coco_outfits.qsrc
  30. 108 0
      locations/_attributes_danilovich_coats.qsrc
  31. 66 24
      locations/_attributes_danilovich_shoes.qsrc
  32. 108 0
      locations/_attributes_dolls_coats.qsrc
  33. 79 96
      locations/_attributes_dolls_shoes.qsrc
  34. 8 8
      locations/_attributes_fetish.qsrc
  35. 107 0
      locations/_attributes_gm_coats.qsrc
  36. 57 144
      locations/_attributes_gm_shoes.qsrc
  37. 1 1
      locations/_attributes_moncheri.qsrc
  38. 107 0
      locations/_attributes_moncheri_coats.qsrc
  39. 86 71
      locations/_attributes_moncheri_shoes.qsrc
  40. 2 3
      locations/_attributes_swimwear.qsrc
  41. 0 2
      locations/_attributes_uniform.qsrc
  42. 1 1
      locations/_body_image.qsrc
  43. 55 55
      locations/_clothing_name.qsrc
  44. 5 5
      locations/_shoe_description.qsrc
  45. 8 8
      locations/_shoe_image.qsrc
  46. 1 1
      locations/albinaRide.qsrc
  47. 16 16
      locations/albina_election_events.qsrc
  48. 37 33
      locations/albinahome.qsrc
  49. 11 11
      locations/alexandriaEv.qsrc
  50. 8 8
      locations/andreihunter.qsrc
  51. 3 2
      locations/andrey.qsrc
  52. 57 57
      locations/anushapt.qsrc
  53. 217 218
      locations/anushkaev1.qsrc
  54. 1 1
      locations/arousal.qsrc
  55. 15 15
      locations/artem_date_events.qsrc
  56. 38 38
      locations/artem_events.qsrc
  57. 51 51
      locations/artemhome.qsrc
  58. 70 460
      locations/autosalonF.qsrc
  59. 16 10
      locations/autoservisF.qsrc
  60. 64 219
      locations/autotraidF.qsrc
  61. 4 5
      locations/avt.qsrc
  62. 2 2
      locations/backwater.qsrc
  63. 237 3
      locations/bank.qsrc
  64. 367 358
      locations/bedrPar.qsrc
  65. 72 33
      locations/bordel.qsrc
  66. 28 28
      locations/bordelv.qsrc
  67. 6 6
      locations/bouling.qsrc
  68. 1 2
      locations/brother.qsrc
  69. 13 22
      locations/budgetclothes.qsrc
  70. 94 272
      locations/carF.qsrc
  71. 49 662
      locations/carF1.qsrc
  72. 2 2
      locations/changingroom.qsrc
  73. 11 1
      locations/cikl.qsrc
  74. 24 6
      locations/city_industrial.qsrc
  75. 2 2
      locations/city_park.qsrc
  76. 14 14
      locations/city_suburbs.qsrc
  77. 6 6
      locations/cloakroom.qsrc
  78. 3 3
      locations/clothing.qsrc
  79. 1 1
      locations/clothing_QV.qsrc
  80. 0 1
      locations/clothing_attributes.qsrc
  81. 8 6
      locations/dachain.qsrc
  82. 3 3
      locations/din_van.qsrc
  83. 2 2
      locations/dorm.qsrc
  84. 33 15
      locations/ender.qsrc
  85. 3 3
      locations/etoexhib.qsrc
  86. 1 1
      locations/exercise.qsrc
  87. 1 1
      locations/fame.qsrc
  88. 284 42
      locations/femcyc.qsrc
  89. 2 2
      locations/fit.qsrc
  90. 5 11
      locations/food.qsrc
  91. 5 5
      locations/food_menu.qsrc
  92. 9 4
      locations/foto.qsrc
  93. 14 13
      locations/foto_events.qsrc
  94. 1 1
      locations/foto_shoot.qsrc
  95. 12 9
      locations/gKristinaZv.qsrc
  96. 5 5
      locations/gadforest_event.qsrc
  97. 2 2
      locations/gadroad.qsrc
  98. 16 16
      locations/gameover.qsrc
  99. 36 14
      locations/gdksport.qsrc
  100. 4 5
      locations/glake.qsrc

+ 4 - 0
Name Updates.txt

@@ -0,0 +1,4 @@
+File Name / Name Changes Made:
+artemEv to artem_events
+psoklin to city_suburbs
+AlbFatherQW to albina_election_events

+ 8 - 8
build.sh

@@ -10,26 +10,26 @@ QSPFILE=glife.qsp
 
 #######################################################################
 
-./txtmerge.py locations glife.txt
+python tools/txtmerge.py locations glife.txt
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
-	./txt2gam.linux glife.txt "${QSPFILE}" 1> /dev/null
+	./tools/txt2gam.linux glife.txt "${QSPFILE}" 1> /dev/null
 elif [[ "$OSTYPE" == "darwin"* ]]; then
-	./txt2gam.mac glife.txt "${QSPFILE}" 1> /dev/null
+	./tools/txt2gam.mac glife.txt "${QSPFILE}" 1> /dev/null
 elif [[ "$OSTYPE" == "msys" ]]; then
 	if [[ "$MSYSTEM_CARCH" == "x86_64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	else
-		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
 	fi
 elif [[ "$OSTYPE" == "cygwin" ]]; then
 	# Unsure if non-AMD CPUs give this or AMD64, tested on an actual AMD brand chip
 	# requires a python install visible to cygwin (for the txtmerge above)
 	if [[ "$PROCESSOR_ARCHITECTURE" == "x86_64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	elif [[ "$PROCESSOR_ARCHITECTURE" == "AMD64" ]]; then
-		./txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam64.exe glife.txt "${QSPFILE}" 1> /dev/null
 	else
-		./txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
+		./tools/txt2gam.exe glife.txt "${QSPFILE}" 1> /dev/null
 	fi
 fi
 if [ -d "${DESTDIR}" ]; then

+ 3 - 3
glife-notepad++

@@ -4,7 +4,7 @@
 			<File name="locations\abduction" />
 			<File name="locations\abductionCustomer" />
 			<File name="locations\agentned" />
-			<File name="locations\AlbFatherQW" />
+			<File name="locations\albina_election_events" />
 			<File name="locations\albinaEv" />
 			<File name="locations\albinahome" />
 			<File name="locations\albinaporog" />
@@ -19,7 +19,7 @@
 			<File name="locations\anekdot" />
 			<File name="locations\annafrends" />
 			<File name="locations\arousal" />
-			<File name="locations\artemEv" />
+			<File name="locations\artem_events" />
 			<File name="locations\artemev2" />
 			<File name="locations\artemEv3" />
 			<File name="locations\artemhome" />
@@ -578,7 +578,7 @@
 			<File name="locations\preTG" />
 			<File name="locations\priziv" />
 			<File name="locations\Prostitute" />
-			<File name="locations\psiklin" />
+			<File name="locations\city_suburbs" />
 			<File name="locations\ptu_dush" />
 			<File name="locations\qjob" />
 			<File name="locations\qwBarPolet" />

+ 28 - 35
glife.qproj

@@ -40,17 +40,14 @@
 		<Location name="traits"/>
 		<Location name="din_bad"/>
 		<Location name="din_van"/>
-		<Location name="statBat"/>
 		<Location name="kid"/>
 		<Location name="pattest"/>
 		<Location name="subkid"/>
-		<Location name="$statcheck"/>
 		<Location name="set_home"/>
 	</Folder>
 	<Folder name="Functions">
 		<Location name="indik"/>
 		<Location name="indiktab"/>
-		<Location name="location_settings"/>
 		<Location name="shortgs"/>
 		<Location name="show_table"/>
 		<Location name="femcyc"/>
@@ -58,7 +55,7 @@
 		<Location name="food"/>
 		<Location name="beverage"/>
 		<Location name="food_menu"/>
-		<Location name="virginity_call"/>
+		<Location name="sleep"/>
 		<Location name="willpower"/>
 		<Location name="drugs"/>
 		<Location name="npc_relationship"/>
@@ -96,7 +93,6 @@
 		<Location name="clothing"/>
 		<Location name="clothing_QV"/>
 		<Location name="changingroom"/>
-		<Location name="cloakroom"/>
 		<Location name="$clothing_name"/>
 		<Location name="$clothing_image"/>
 		<Location name="clothing_attributes"/>
@@ -137,12 +133,21 @@
 		<Location name="$shoe_description"/>
 		<Location name="shoe_attributes"/>
 		<Location name="shoe_description2"/>
-		<Location name="$attrib_shoe_boutique"/>
-		<Location name="$attrib_shoe_pussy"/>
-		<Location name="$attrib_shoe_dolls"/>
+		<Location name="$attributes_bomba_shoes"/>
+		<Location name="$attributes_danilovich_shoes"/>
+		<Location name="$attributes_gm_shoes"/>
+		<Location name="$attributes_dolls_shoes"/>
+		<Location name="$attributes_moncheri_shoes"/>
 		<Location name="$attrib_shoe_fetish"/>
-		<Location name="$attrib_shoe_gandm"/>
-		<Location name="$attrib_shoe_trainers"/>
+	</Folder>
+	<Folder name="coats">
+		<Location name="cloakroom"/>
+		<Location name="$attributes_bomba_coats"/>
+		<Location name="$attributes_cats_coats"/>
+		<Location name="$attributes_danilovich_coats"/>
+		<Location name="$attributes_dolls_coats"/>
+		<Location name="$attributes_gm_coats"/>
+		<Location name="$attributes_moncheri_coats"/>
 	</Folder>
 	<Folder name="underwear">
 		<Location name="underwear"/>
@@ -200,7 +205,6 @@
 		<Location name="npcgenext"/>
 		<Location name="npcpreservec"/>
 		<Location name="npcrnamefile"/>
-		<Location name="npcbreeder"/>
 		<Location name="npcstaticdefaults"/>
 		<Location name="npcstatic1"/>
 		<Location name="npcstatic2"/>
@@ -209,16 +213,11 @@
 		<Location name="npcstatic5"/>
 		<Location name="fight_npcdata"/>
 		<Location name="npc_intro"/>
-		<Location name="npc_age"/>
 		<Location name="saveupdater"/>
 		<Location name="NPCChanger"/>
-		<Location name="randAnpc"/>
 	</Folder>
 	<Folder name="Combat">
 		<Location name="fight"/>
-		<Location name="before"/>
-		<Location name="init"/>
-		<Location name="magik"/>
 		<Location name="ender"/>
 		<Location name="nill"/>
 		<Location name="test"/>
@@ -239,7 +238,6 @@
 		<Location name="kompMFCtwo"/>
 		<Location name="kompMFCanal"/>
 		<Location name="kompMFCoral"/>
-		<Location name="webcam_site"/>
 		<Location name="mirror"/>
 		<Location name="stol"/>
 		<Location name="kit_din"/>
@@ -438,18 +436,14 @@
 		<Location name="brother_voyeur"/>
 		<Location name="brother_lessons"/>
 		<Location name="seeporn"/>
-		<Location name="brosh"/>
-		<Location name="porn_view"/>
-		<Location name="porn_view_strings"/>
-		<Location name="porn_view_construct"/>
-	</Folder>
-	<Folder name="Reks">
-		<Location name="reks"/>
-		<Location name="sbReksHome"/>
-		<Location name="dinParty"/>
-		<Location name="party_boys"/>
-		<Location name="party_girls"/>
-		<Location name="sister_party"/>
+	</Folder>
+	<Folder name="Rex">
+		<Location name="rex_events"/>
+		<Location name="rex_party_home"/>
+		<Location name="rex_party_events"/>
+		<Location name="rex_party_boys_events"/>
+		<Location name="rex_party_girls_events"/>
+		<Location name="rex_party_sister_events"/>
 	</Folder>
 	<Folder name="Dima Nosov">
 		<Location name="dimaEv"/>
@@ -460,9 +454,9 @@
 		<Location name="krutishi"/>
 	</Folder>
 	<Folder name="Artem Chebotarev">
-		<Location name="artemEv"/>
+		<Location name="artem_events"/>
 		<Location name="artemhome"/>
-		<Location name="artemdate"/>
+		<Location name="artem_date_events"/>
 		<Location name="artgar"/>
 	</Folder>
 	<Folder name="Igor Kruglov">
@@ -727,7 +721,7 @@
 		<Location name="albinaRide"/>
 		<Location name="albinahome"/>
 		<Location name="albinaporog"/>
-		<Location name="AlbFatherQW"/>
+		<Location name="albina_election_events"/>
 		<Location name="AlbStars"/>
 	</Folder>
 	<Folder name="Lariska">
@@ -735,6 +729,7 @@
 		<Location name="LariskaGo"/>
 		<Location name="LariskaHome"/>
 		<Location name="lariska_schedule"/>
+		<Location name="lariska_storyline"/>
 	</Folder>
 	<Folder name="Pets">
 		<Location name="krol"/>
@@ -836,7 +831,6 @@
 		<Location name="pirsingsalon"/>
 		<Location name="obekt"/>
 		<Location name="obekt2"/>
-		<Location name="dangeon"/>
 	</Folder>
 	<Folder name="Red Light">
 		<Location name="sexshop"/>
@@ -956,7 +950,6 @@
 		<Location name="FSstart"/>
 		<Location name="FSgame"/>
 		<Location name="FSstat"/>
-		<Location name="FSfight"/>
 		<Location name="FSroom"/>
 	</Folder>
 	<Folder name="Youth Shop">
@@ -1108,7 +1101,7 @@
 		<Location name="parks"/>
 		<Location name="lug"/>
 		<Location name="dibodi"/>
-		<Location name="psiklin"/>
+		<Location name="city_suburbs"/>
 		<Location name="din_pav"/>
 		<Location name="shop_fancy_pancy"/>
 		<Location name="shop_skuas"/>

+ 63 - 27
locations/AlbStars.qsrc

@@ -1,11 +1,7 @@
 # AlbStars
 !2020/11/16
-!! Replacement file that merges the AlbStarsWhore file and the Starlets section in "gdksport". Deletion of both (as well as AlbinaEv and AlbStarsEnd) and updating triggers in "gdksport" to redirect to this file is required.
-!! If possible, a virginty check when Sveta joins since one of these guys popping her cherry isn't going to be pleasant and Albina cares too much to allow it to happen. (i.e, a virgin Sveta can't do the whoring part)
-!! Simplify Sveta cleaning herself up when she is finished with a client to a "clean all" command (except for event 6)
-!! Pain coded for anal and orgasm denial coded into whore event 6.
 
-! If Sveta is not a cool kid or jock
+!! If Sveta is not a cool kid or jock
 if $ARGS[0] = 'albina1':
 	menu_off = 1
 	*clr & cla
@@ -199,7 +195,6 @@ if $ARGS[0] = 'albina4':
 	end
 end
 
-!! Check that I have not broken anything creating this new act. 	
 if $ARGS[0] = 'albina5':
 	menu_off = 1
 	*clr & cla
@@ -275,7 +270,7 @@ if $ARGS[0] = 'starlets':
 	elseif pcs_dancero < 30:
 		'You sometimes manage to get the moves right, but most of the time you are out of sync or make the wrong move. Albina constantly yells at you and calls you "a bowlegged cow."'
 	elseif pcs_dancero < 45:
-		'You manage to get into the general rhythm and move well with the other girls, but Albina is still not happy. "<<$pcs_nickname>>, you are very sluggish! You need to put more life into it!"'
+		'You manage to get into the general rhythm and move well with the other girls, but Albina is still not happy. "You''re too sluggish, <<$pcs_nickname>>! Put more life into it!"'
 	elseif pcs_dancero < 55:
 		'You perform the routine with no mistakes, but Albina still nags at you. "You''re not at a funeral, <<$pcs_nickname>>! Raise your head and smile!"'
 	else
@@ -440,7 +435,7 @@ if $ARGS[0] = 'cab_home':
 	if $ARGS[1] <> 'no_clean':
 		cumspclnt = 20
 		gs 'cum_cleanup'
-		'Before the taxi arrives, you enter the bathroom and clean yourself up before getting dressed.'
+		'While waiting for the taxi, you gather up your clothes and enter the bathroom. You clean yourself up at the sink as best as you can before getting dressed. You feel incredibily dirty and the only thing you want right now is a thorough shower when you get home.'
 	end
 
 	act 'Leave': gt 'pav_residential'
@@ -448,7 +443,7 @@ end
 
 if $ARGS[0] = 'whore1':
 	menu_off = 1
-	minut += 5
+	minut += 70
 	gs 'npcgeneratec', 0, 'the Armenian', rand(18,32)
 	$AlbinaQW['Cust'] = $npclastgenerated
 	gs 'boyStat', $AlbinaQW['Cust']
@@ -475,7 +470,7 @@ if $ARGS[0] = 'whore1':
 				cls
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/oral1.mp4"></video></center>'
 				'The man begins to very roughly fuck your mouth, his tip continually slamming into your throat.'
-				'He holds a tight grip on your head and you are forced to endure it. Drool is running from your mouth and tears run from your eyes as you gag and splutter on his cock.'
+				'He holds a tight grip on your head and you are forced to endure it. Drool is dripping from your mouth and tears run from your eyes as you gag and splutter on his cock.'
 				'Your distress doesn''t concern the man but appears to arouse him even further, which just makes him go even faster.'
 				gs 'arousal', 'bj', 10, 'sub', 'deepthroat', 'rough'
 				gs 'stat'
@@ -492,7 +487,7 @@ if $ARGS[0] = 'whore1':
 						'He pulls out of your mouth and roughly pulls your head up by your hair, forcing you to look up at him. "Now swallow it like the good little cum whore that you are."'
 						*nl
 						'You do as you''re told and show him your empty mouth. You make out his perverted and sadistic grin through your tear filled eyes before he suddenly thrusts his cock back into your mouth and starts deepthroating you again, not caring as you choke and gag once more on his dick.'
-						'After a few minutes of this, he is seemingly finished with you and throws you to the floor. You lay there catching your breath as the man goes to the bathroom.'
+						'After a few minutes of this, he is seemingly finished with you and throws you to the floor. You lay there catching your breath as the man walks off, no longer interested in you.'
 						gs 'arousal', 'bj', -1, 'sub', 'humiliation', 'rough'
 						gs 'cum_call', 'mouth_swallow', $AlbinaQW['Cust']
 						gs 'arousal', 'end'
@@ -524,12 +519,13 @@ if $ARGS[0] = 'whore1':
 				cls
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/dog1.mp4"></video></center>'
 				'The man climbs in behind you. He spreads your ass and you feel him spit on your anus before pressing his cock against it.'
-                'You let out a pained squeal and thrash your legs as he pushes his entire length deep into your unprepared ass. As he roughly and painfully grinds in and out of your hole, he reaches forward and starts pulling on your mouth with his fingers. He leans in close to your ear.'
-                '"Yeah, keep squirming like that bitch! It just makes you tighter!" You whimper in distress at the pain he is inflicting on you, but he just laughs and fucks you even harder.'
+                'You let out a pained squeal and thrash your legs as he pushes his entire length deep into your unprepared ass. As he roughly and painfully grinds in and out of your hole, he reaches forward and starts pulling on your mouth with his fingers. After a few minutes, he removes his fingers, only to stuff your panties into your mouth and use his tie to tightly bind your arms behind your back, leaving you at his mercy. He then leans in close to your ear.'
+                '"Yeah, keep squirming like that bitch! It just makes you tighter!" Muffled by your panties, you whimper in distress at the pain he is inflicting on you, but he just laughs and fucks you even harder.'
                 *nl				
-				'After what feels like an eternity, you feel his cock twitching inside you and a warmth floods your ass. He pulls out and a sticky mix of cum and saliva trickles from your ravaged anus, which throbs in immense pain.'
-				'"Only that cute little head dancer has ever taken it in the ass better than you, whore. All the other bitches just cry." You let out a loud yelp as he finishes with a stinging smack on your ass that echoes into the room.'
-				'To your despair and disgust, he drags you up next to him and forces you to lie on your side next to him with your ass hanging out, his sweaty, flabby arm wrapped around your back as he squeezes and slaps your ass while bragging on his phone to his friend about "some of the best anal" he''s ever had. This post sex torture finally ends 10 minutes later.'
+				'After what feels like an eternity, he pulls out and you think he''s done, but you whimper when he drags you to the side of the bed and pushes your legs up to your chest, giving him better access to the asshole. You let out a muffled yelp as he painfully thrusts back into your hole and resumes the merciless ass fucking, sadistic grin on his face. Tears start streaming from your eyes as you are forced to lie there and take it. You again lose track of time before you feel him pull out again and flip you onto your stomach, forcing you to bend over onto the bed. You relax your anus as best as you can, but it''s still incredibily painful when he penetrates you and resumes fucking you.'  
+				'You''re wondering how long this is going to last when you suddenly feel him twitching inside you and a warmth floods your ass as he groans loudly in pleasure. He pulls out and a sticky mix of cum and saliva trickles from your ravaged anus, which throbs in immense pain.'
+				'"Only that cute little head dancer has ever taken it in the ass better than you, whore. All the other bitches just cry." You let out a muffled scream and sob as he finishes with a stinging smack on your ass that echoes into the room. You glance back and see a bright red handprint imprinted on your ass cheek.'
+				'He unties your sore wrists and you spit out your saliva drenched panties, but to your despair and disgust, he drags you up next to him and forces you to lie on your side next to him with your ass hanging out, his sweaty, flabby arm wrapped around your back as he squeezes and slaps your ass while bragging on his phone to his friend about "the best anal he''s ever had." This post sex torture finally ends 10 minutes later.'
 				gs 'arousal', 'anal', 30, 'sub', 'humiliation', 'rough'
 				gs 'pain', 2, 'mouth', 'pull' 
 				gs 'pain', 2, 'asshole', 'stretch'
@@ -548,11 +544,11 @@ if $ARGS[0] = 'whore1':
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/miss1.mp4"></video></center>'
 				'The man moves in, roughly flips you on your back and spreads your legs. "This pussy looks like it will be worth every ruble!" You feel the tip of his cock spread your labia apart as he pushes into you.'
 				'He grabs your throat and pins you to the bed as he starts to very roughly pound your pussy. He occasionally uses his other hand to very tightly squeeze and twist your nipple, making you squeal in pain. He seems to enjoy treating you this roughly.'
-                'You panic when he stops thrusting and tightens his grip around your neck. You choke as you thrash your arms and legs in distress, but he just smiles and doesn''t loosen his grip until you are on the verge of blacking out. He then resumes fucking you, faster and seemingly closer to climax.'  
+                'You panic when he stops thrusting and tightens his grip around your neck. You choke as you thrash your arms and legs in distress, but he just smiles and doesn''t loosen his grip until you are on the verge of blacking out. He then resumes fucking you, faster and seemingly closer to climax, as you clutch your neck and gasp for air.'  
 				*nl
-				'You endure the remainder of the rough sex for what feels like an eternity, but he eventually lets go of you and pulls out. He starts jerking his cock and you feel his cum splattering onto your labia.'
-                'He is annoyed at not being able to finish inside you. "A waste of a good fucking pussy if you can''t cum inside it I say, especially when it''s hot little numbers like you." he crudly remarks before climbing off of you. "That cute little head dancer is just begging for me to fill her smooth, tight as a vice fuck hole again, but he almost killed me for doing it once already." he adds.'
-				'To your despair and disgust, he drags you up next to him and forces you into his now sweaty embrace, his flabby arm wrapped around your neck as he fondles and squeezes your breast while bragging on his phone to his friend about "the fine little pussy" he just fucked. This post sex torture finally ends 10 minutes later.'				
+				'After a few more minutes, he pulls out and flips you over before pulling you up onto your knees, your ass in the air. He slides back inside your pussy and starts pounding you doggystyle as he slaps and squeezes your ass. You are forced to endure this for what feels like an eternity before he suddenly pulls out and you feel his cum splattering onto your labia and asshole.'
+                'He is annoyed at not being able to finish inside you. "A waste of a good fucking pussy if you can''t cum inside it I say, especially when it''s hot little numbers like you." he crudly remarks. "That cute little head dancer is just begging for me to fill her smooth, tight as a vice fuck hole again, but he almost killed me for doing it once already." he adds.'
+				'To your despair and disgust, he drags you up next to him and forces you into his now sweaty embrace, his flabby arm wrapped around your neck as he fondles and squeezes your breast while bragging on his phone to his friend about "the fine little pussy" he just fucked and he "should come and sample it." This post sex torture finally ends 10 minutes later.'				
 				gs 'pain', 2, 'throat', 'choke'
 				gs 'arousal', 'vaginal', 30, 'sub', 'humiliation', 'rough'
 				gs 'cum_call', 'precum', $AlbinaQW['Cust']
@@ -569,7 +565,7 @@ if $ARGS[0] = 'whore1':
 end
 
 if $ARGS[0] = 'whore2':
-	minut += 5
+	minut += 30
 	gs 'npcgeneratec', 0, 'the Armenian', rand(18,32)
 	$AlbinaQW['Cust'] = $npclastgenerated
 	gs 'boyStat', $AlbinaQW['Cust']
@@ -715,7 +711,7 @@ if $ARGS[0] = 'whore2':
 end
 
 if $ARGS[0] = 'whore3':
-	minut += 5
+	minut += 30
 	gs 'npcgeneratec', 0, 'the man', rand(18,23)
 	$AlbinaQW['Cust'] = $npclastgenerated
 	gs 'boyStat', $AlbinaQW['Cust']
@@ -846,7 +842,7 @@ if $ARGS[0] = 'whore3':
 end
 
 if $ARGS[0] = 'whore4':
-	minut += 5
+	minut += 40
 	gs 'npcgeneratec', 0, 'the man', rand(18,32)
 	$AlbinaQW['Cust'] = $npclastgenerated
 	$npc_thdick[$AlbinaQW['Cust']] = 'massive'
@@ -978,7 +974,7 @@ if $ARGS[0] = 'whore4':
 end
 
 if $ARGS[0] = 'whore5':
-	minut += 5
+	minut += 40
 	gs 'npcgeneratec', 0, 'the man', rand(18,32)
 	$AlbinaQW['Cust'] = $npclastgenerated
 	$npc_thdick[$AlbinaQW['Cust']] = 'massive'
@@ -1135,7 +1131,7 @@ if $ARGS[0] = 'whore5':
 end
 
 if $ARGS[0] = 'whore6':
-	minut += 5
+	minut += 30
 	gs 'npcgeneratec', 0, 'the man', rand(24,40)
 	$AlbinaQW['Cust'] = $npclastgenerated
 	gs 'boyStat', $AlbinaQW['Cust']
@@ -1230,7 +1226,7 @@ if $ARGS[0] = 'parkrally':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting3.jpg"></center>'
 
-		'You arrive at the park and gather behind the stage as Albina''s father gives an awkward speech to what is left of his supporters. He clears his throat and calls you up onto the stage as music starts playing. You reluctantly walk out onto the stage with the other girls, the crowd reacting to your skimpy clothing. The men whistle and holler while the women watch in disgust and whisper among themselves. '
+		'You arrive at the park and gather behind the stage as Albina''s father gives an awkward speech to what is left of his supporters. He clears his throat and calls you up onto the stage as music starts playing. You reluctantly walk out onto the stage with the other girls, the crowd reacting to your skimpy clothing. Some men whistle and holler and others avert their gaze while the women watch in disgust and whisper among themselves. '
 		'You and the girls start your routine, but the crowd''s reactions at your outfits makes you all feel very uncomfortable and you see Albina glaring at her father a few times. You finally finish the awkward performance and Albina motions for you all to return to the car as her father makes desperate pleas to the diminishing crowd.'
 		'You return to the community center locker room, where Albina practically rips her leotard off and storms off into the showers. You remove your own outfit and go for a shower yourself. '
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
@@ -1255,7 +1251,47 @@ if $ARGS[0] = 'StarletsEnd':
 	minut += 2
 	gs 'stat'
 	
-	act 'Leave':AlbinaQW['StarletsJoined'] = 0 & gt 'pav_commcenter'
+	act 'Leave':AlbinaQW['StarletsJoined'] = -1 & gt 'pav_commcenter'
+end
+
+if $ARGS[0] = 'StarletsPracticeMissed':
+	*clr & cla
+	menu_off = 1
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/pc/characters/shared/photos/big23.jpg"></center>'
+	
+	if starlet_practice_skipped = 1:
+	   gs 'npc_relationship', 'modify', 'A23', -10
+		'You walk in and see an annoyed Albina waiting for you, her arms crossed as she glares at you. "Where the fuck were you <<$pcs_nickname>>?! And don''t fucking lie to me!"'
+		'"Sorry, Albina. I... had a family thing I had to deal with and I didn''t have time to tell you." you meekly reply.'
+		'She doesn''t look completely convinced. "Right... Well if you care about your place on the team, then you''ll be at the next training session on time. No excuses."'
+		'You nod at her and she gives you a pat on the head before walking away. It looks like you got off lightly this time.'
+		act 'Train with Starlets': gt 'AlbStars', 'starlets'
+	elseif starlet_practice_skipped = 2:
+		gs 'npc_relationship', 'modify', 'A23', -20
+		'You walk into the hall and gulp when you see Albina heading your way. "Skipping training <i>again</i>, <<$pcs_nickname>>?! I thought I told you that you were to be here on time <b>no excuses</b>?! I don''t care about what miserable story you have to defend yourself with. You either commit to the team or you''re out. This is your final warning <<$pcs_nickname>>, don''t fucking test me!"'
+		'You don''t have a chance to speak before she walks off. Maybe it''s best for both of you if you stopped pissing her off?'
+		act 'Train with Starlets': gt 'AlbStars', 'starlets'
+	else
+	  gs 'npc_relationship', 'set', 'A23', 10
+		'You are walk into the hall and freeze when you clock a furious Albina heading straight for you. You barely have time to react before she grabs your shirt and pulls you up close, silencing the hall as everyone looks at you.'
+		'Albina glares directly into your eyes. "ARE YOU DOING THIS TO MOCK ME YOU FUCKING BITCH?! I GAVE YOU ONE. LAST. FUCKING. CHANCE AND YOU THROW IT BACK IN MY FUCKING FACE?!" She releases you, but still gets up in your face. "You''re done. Get the fuck out of here and don''t let me catch you here again, you hear me?!"'
+		'She then crosses her arms and glares at you until you leave. With the other girls staring at you, you shamefully walk out of the hall.'
+		act 'Leave':AlbinaQW['StarletsJoined'] = -1 & gt 'pav_commcenter'
+	end
+end
+
+if $ARGS[0] = 'Quit':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big23.jpg"></center>'
+	'You enter the hall and look around for Albina, spotting her as she''s doing some stretching exercises. 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."' 
+	'Albina looks disheartened, but still gives you a weak smile. "I understand... 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 on me." she adds. You breathe a sigh of relief as she gathers the girls up for the session, letting you go on your way.'
+	minut += 2
+	gs 'stat'
+
+	act 'Leave':AlbinaQW['StarletsJoined'] = -2 & gt 'pav_commcenter'
 end
 
 --- AlbStars ---------------------------------

+ 1 - 1
locations/BDSM_Club.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'start':
 	end
 
 	gs 'taxi'
-	act 'Elite settlement':gt 'psiklin', 'start'
+	act 'Elite settlement':gt 'city_suburbs', 'start'
 end
 
 if $ARGS[0] = 'in':

+ 4 - 4
locations/BurgerTip.qsrc

@@ -226,10 +226,10 @@ if $ARGS[0] = 'work':
 						'A tall young man shows up, with a big bag of gear. He asks you whats broken, and you show him the boss''s computer. He soon gets it working again, after fiddling around it''s insides.'
 					elseif sosedQW > 0 and sosedKnowWork > 0:
 						sosedKnowWork = 1
-						'Your neighbor Timothy shows up to repair the computer. You give him a friendly hello, and show his to the boss''s PC. It doesn''t take him long to figure out that it was just unplugged.'
+						'Your neighbor Timofei shows up to repair the computer. You give him a friendly hello, and show his to the boss''s PC. It doesn''t take him long to figure out that it was just unplugged.'
 					elseif sosedQW > 0 and sosedKnowWork = 0:
 						sosedKnowWork = 1
-						'Your neighbor Timothy shows up to repair the computer. He is pleasantly surprised to see you. You chat cheerfully, while Timothy works on the boss''s PC. He soon fixes whatever was wrong with it, and you send him on his way with hug.'
+						'Your neighbor Timofei shows up to repair the computer. He is pleasantly surprised to see you. You chat cheerfully, while Timofei works on the boss''s PC. He soon fixes whatever was wrong with it, and you send him on his way with hug.'
 					end
 
 					if BurgerQW['WorkShift'] = 1:
@@ -470,10 +470,10 @@ if $ARGS[0] = 'work':
 						'A tall young man shows up, with a big bag of gear. He asks you whats broken, and you show him the boss''s computer. He soon gets it working again, after fiddling around it''s insides.'
 					elseif sosedQW > 0 and sosedKnowWork > 0:
 						sosedKnowWork = 1
-						'Your neighbor Timothy shows up to repair the computer. You give him a friendly hello, and show his to the boss''s PC. It doesn''t take him long to figure out that it was just unplugged.'
+						'Your neighbor Timofei shows up to repair the computer. You give him a friendly hello, and show his to the boss''s PC. It doesn''t take him long to figure out that it was just unplugged.'
 					elseif sosedQW > 0 and sosedKnowWork = 0:
 						sosedKnowWork = 1
-						'Your neighbor Timothy shows up to repair the computer. He is pleasantly surprised to see you. You chat cheerfully, while Timothy works on the boss''s PC. He soon fixes whatever was wrong with it, and you send him on his way with hug'
+						'Your neighbor Timofei shows up to repair the computer. He is pleasantly surprised to see you. You chat cheerfully, while Timofei works on the boss''s PC. He soon fixes whatever was wrong with it, and you send him on his way with hug'
 					end
 
 					if BurgerQW['WorkShift'] = 1:

+ 2 - 2
locations/Cheatmenu_din.qsrc

@@ -1209,7 +1209,7 @@ $cheatmenu['reputation'] = {
 			if fedormasha = 0:	'<<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>>: <<npc_rel[''A5'']>>	<a href="exec:npc_rel[''A5''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A5''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A8'']>> <<$npc_lastname[''A8'']>>: <<npc_rel[''A8'']>>	<a href="exec:npc_rel[''A8''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A8''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A13'']>> <<$npc_lastname[''A13'']>>: <<npc_rel[''A13'']>>	<a href="exec:npc_rel[''A13''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A13''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
-			if zverRageQW = 0 or zverRageQW = 10:  '<<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>>: <<npc_rel[''A18'']>>	<a href="exec:npc_rel[''A18''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A18''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
+			if christinaQW['dompath'] <= 5:  '<<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>>: <<npc_rel[''A18'']>>	<a href="exec:npc_rel[''A18''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A18''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A19'']>> <<$npc_lastname[''A19'']>>: <<npc_rel[''A19'']>>	<a href="exec:npc_rel[''A19''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A19''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>>: <<npc_rel[''A23'']>>	<a href="exec:npc_rel[''A23''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A23''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A149'']>> <<$npc_lastname[''A149'']>>: <<npc_rel[''A149'']>>  <a href="exec:npc_rel[''A149''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A149''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
@@ -1264,7 +1264,7 @@ $cheatmenu['reputation'] = {
 			'<a href="exec:Enable_reputation_outcasts = 0 & dynamic $cheatmenu[''reputation'']">Hide details</a>'
 			'<<$npc_firstname[''A7'']>> <<$npc_lastname[''A7'']>>: <<npc_rel[''A7'']>>	<a href="exec:npc_rel[''A7''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A7''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			if soniaPS > 0:	'<<$npc_firstname[''A25'']>> <<$npc_lastname[''A25'']>>: <<npc_rel[''A25'']>>	<a href="exec:npc_rel[''A25''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A25''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
-			if zverRageQW > 1 and zverRageQW < 10:	'<<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>>: <<npc_rel[''A18'']>>  <a href="exec:npc_rel[''A18''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A18''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
+			if christinaQW['dompath'] >= 6:	'<<$npc_firstname[''A18'']>> <<$npc_lastname[''A18'']>>: <<npc_rel[''A18'']>>  <a href="exec:npc_rel[''A18''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A18''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			if fedormasha = 1:	'<<$npc_firstname[''A5'']>> <<$npc_lastname[''A5'']>>: <<npc_rel[''A5'']>>	<a href="exec:npc_rel[''A5''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A5''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 			'<<$npc_firstname[''A159'']>> <<$npc_lastname[''A159'']>>: <<npc_rel[''A159'']>>  <a href="exec:npc_rel[''A159''] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:npc_rel[''A159''] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
 		end

+ 39 - 30
locations/HotelHole.qsrc

@@ -179,7 +179,7 @@ if maidtime > 0: act'Collect your salary': hotelcollect = 1 & gt'hotel_resep'
 if hotelcouple = 2 and week=4 and hour >=20 and hour <23 and hcday ! daystart: act 'Go visit the couple in room 207': gt 'HotelWork','hotcouple'
 
 !!if hour = 20 and IgorevnaBDSM >= 5 and IgorevnaBDSM < 20 and week < 3:
-!!	if lariskaMotherKnown = 1:
+!!	if LariskaQW['metAnna'] = 1:
 !!		act 'Look for Anna': gt 'HotelAnna', 'AnnaRoad'
 !!	else
 !!		act 'Look for the woman': gt 'HotelAnna', 'AnnaRoad'
@@ -349,30 +349,35 @@ if $ARGS[0] = 'Pavlin' :
 			act 'Move away':gt'HotelHole','skip_resepevent'
 		end
 	end
-	if npc_rel['A217'] > 19 and proshotelday ! daystart and storyline = 1 and TwinQW ! 3:
-		act 'Fake Twins Request':
-			*clr & cla
-			minut += 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/pavlin/pavlin.jpg"></center>'
-			'"<<$pcs_firstname>>, I got a guy who is willing to pay a LOT of money for a threesome with a set of twins. Do you happen to know a pair of twins who''d be down to make some quick cash?" <<$npc_nickname[''A217'']>> asks, looking hopeful.'
-			'You think for a moment before responding. "No I don''t. However, a lot of people say my sister and I look alike. Maybe if I wear my hair like hers and we put on enough make up we could pass as twins."'
-			'"That''s a great idea! Do you think she would be willing to do this?" <<$npc_nickname[''A217'']>> asks, suddenly very excited at the prospect.'
-			if sisterLesb < 5:
-				'"What? No, I was just saying we look alike, I wouldn''t dare propose an idea like this to her."'
-				'"THEN WHY BRING HER UP, YOU STUPID CUNT?" <<$npc_nickname[''A217'']>>''s excitement quickly dissolves to rage as he raises his hand up, ready to strike.'
-				'You brace for the hit, closing your eyes tightly. The slap never comes however, and you open your eyes to see <<$npc_nickname[''A217'']>> has backed off. You''re confused at first, but notice that the people in the lobby are looking at the two of your after his little outburst.'
-				'You quickly stand up and leave him be.'
-				*nl
-				'You probably shouldn''t bring up this topic anymore... unless you have a more positive response to this request.'
-				TwinJourQW = 1
-				act 'Back to lobby': gt 'HotelHole'
-			elseif sisterLesb => 5:
-				'You feel a tingling in your loins just thinking about your sister and, without thinking, you blurt out: "Of course she will!"'
-				'"That''s fantastic <<$pcs_firstname>>, Once you are ready bring her over and I''ll introduce you to the client."'
-				'Realizing the commitment you just made, worry begins to seep into you. You hope your sister is really up for it, because you fear how <<$npc_nickname[''A217'']>> will react if you can''t deliver.'
-				TwinQW = 1
-				TwinJourQW = 2
+	if npc_rel['A217'] > 19 and proshotelday ! daystart and storyline = 1 and TwinQW < 0:
+		!!! TwinQW: 0 quest not started; > 0: quest started; < 5: talking with sis; 5: sis agreed; 6: finished
+		!!! changing 'TwinQW < 0' in the above if statement to 'TwinQW < 1' reenables the quest line
+		!!! Kevin Smarts:
+		!!! The twin event is meant to be disabled as it doesn't fit Anya's personality. It is waiting to be redone with a more suitable "twin".
+		if tmp_TwinQW_AskedToday < daystart: 
+			act 'Fake Twins Request':
+				*clr & cla
+				tmp_TwinQW_AskedToday = daystart
+				minut += 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/pavlin/pavlin.jpg"></center>'
+				'"<<$pcs_firstname>>, I got a guy who is willing to pay a LOT of money for a threesome with a set of twins. Do you happen to know a pair of twins who''d be down to make some quick cash?" <<$npc_nickname[''A217'']>> asks, looking hopeful.'
+				'You think for a moment before responding. "No I don''t. However, a lot of people say my sister and I look alike. Maybe if I wear my hair like hers and we put on enough make up we could pass as twins."'
+				'"That''s a great idea! Do you think she would be willing to do this?" <<$npc_nickname[''A217'']>> asks, suddenly very excited at the prospect.'
+				if sisterLesb < 5:
+					'"What? No, I was just saying we look alike, I wouldn''t dare propose an idea like this to her."'
+					'"THEN WHY BRING HER UP, YOU STUPID CUNT?" <<$npc_nickname[''A217'']>>''s excitement quickly dissolves to rage as he raises his hand up, ready to strike.'
+					'You brace for the hit, closing your eyes tightly. The slap never comes however, and you open your eyes to see <<$npc_nickname[''A217'']>> has backed off. You''re confused at first, but notice that the people in the lobby are looking at the two of your after his little outburst.'
+					'You quickly stand up and leave him be.'
+					*nl
+					'You probably shouldn''t bring up this topic anymore... unless you have a more positive response to this request.'
+				else
+					'You feel a tingling in your loins just thinking about your sister and, without thinking, you blurt out: "Of course she will!"'
+					'"That''s fantastic <<$pcs_firstname>>, Once you are ready bring her over and I''ll introduce you to the client."'
+					'Realizing the commitment you just made, worry begins to seep into you. You hope your sister is really up for it, because you fear how <<$npc_nickname[''A217'']>> will react if you can''t deliver.'
+					TwinQW = 1
+					killvar 'tmp_TwinQW_AskedToday'
+				end
 				act 'Back to lobby': gt 'HotelHole'
 			end
 		end
@@ -438,7 +443,9 @@ if $ARGS[0] = 'Pavlin' :
 	end
 end
 
-if $ARGS[0] = 'Twins' :
+if $ARGS[0] = 'Twins':
+	!!! <summary>meet pavlin and have some twin fun with the client</summary>
+	!!! <continues>with 'twinhome'</continues>
 	*clr & cla
 	minut += 20
 	gs 'stat'
@@ -598,7 +605,7 @@ if $ARGS[0] = 'Twins' :
 								'Anya tries to protest but it''s too late; the dick enters her mouth before any words leave it. She resigns herself to the task and uses her tongue to thoroughly clean the cock, whimpering in disapproval. You can''t help but snicker at the idea of her being forced to taste your ass on this stranger''s rod. Anya shoots you an angry look from the side.'
 								'Suddenly you hear someone honking a horn outside. You look at the clock and realize the whole hour has passed and <<$npc_nickname[''A217'']>> has arrived.'
 								'Not wanting to keep <<$npc_nickname[''A217'']>> waiting, you and your sister quickly put on your clothes, say goodbye to <<$boydesc>>, and leave the house.'
-								act 'Pavlin drives you home':gt 'HotelHole','twinhome'
+								act 'Pavlin drives you home': gt 'HotelHole','twinhome'
 							end
 						end
 						gs 'willpower', 'anal', 'force', 'hard'
@@ -638,7 +645,7 @@ if $ARGS[0] = 'Twins' :
 									*nl
 									'Suddenly, you hear someone honking a horn outside. You look at the clock and realize the whole hour has passed and <<$npc_nickname[''A217'']>> has arrived.'
 									'Not wanting to keep <<$npc_nickname[''A217'']>> waiting, you and your sister quickly put on your clothes, say goodbye to <<$boydesc>>, and leave the house.'
-									act 'Pavlin drives you home':gt 'HotelHole','twinhome'
+									act 'Pavlin drives you home': gt 'HotelHole','twinhome'
 								end
 							end
 						else
@@ -652,6 +659,8 @@ if $ARGS[0] = 'Twins' :
 end
 
 if $ARGS[0] = 'twinhome':
+	!!! <summary>pavlin drives you and your sis home</summary>
+	!!! <continues>gt 'korrPar'</continues>
 	*clr & cla
 	gs 'cum_call','face', $npclastgenerated
 	'You both jump in the car and <<$npc_nickname[''A217'']>> drives away.'
@@ -664,14 +673,14 @@ if $ARGS[0] = 'twinhome':
 	'You leave the car, face burning red in embarrassment, and go inside to your room.'
 	'You were planning to divide the money evenly with your sister, but now that you know what she really thinks of you, you hand her 1,000 <b>₽</b>. "Well, since you''re not a whore, I guess you don''t deserve a whore''s pay." you say snidely. You head back out of the room quickly before Anya has a chance to respond.'
 	gs 'arousal','end'
-	TwinQW = 3
+	TwinQW = 6
 	guy += 1
 	slutty += 1
 	gs 'fame', 'pav', 'prostitute', rand(2,4)
 	npc_rel['A217'] += 10
 	money += 9000
 	gs 'stat'
-	act 'Back to the corridor':gt 'korrPar'
+	act 'Back to the corridor': gt 'korrPar'
 end
 
 if $ARGS[0] = 'clown':

+ 20 - 20
locations/HotelWork.qsrc

@@ -902,7 +902,7 @@ if $ARGS[0] = 'maid':
 
 				if IgorevnaBDSM = 0:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/1.jpg"></center>'
-					if lariskaMotherKnown = 1:
+					if LariskaQW['metAnna'] = 1:
 						'You are taken aback to see Lariska''s mom, Anna Igorevna. You gasp in surprise.'
 					else
 						'You see a middle age woman, brunette, about the same age of your mother and a younger blonde woman. You gasp in surprise.'
@@ -916,13 +916,13 @@ if $ARGS[0] = 'maid':
 						*clr & cla
 						IgorevnaBDSM += 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/2.jpg"></center>'
-						if lariskaMotherKnown = 1:
+						if LariskaQW['metAnna'] = 1:
 							'The blonde girl drops on the floor clearly exhausted. Anna is softly hitting and teasing the blonde''s pussy with the crop. She seems pleased by this as she''s moaning, begging for more.'
 						else
 							'The blonde girl drops on the floor clearly exhausted. The brunette woman is softly hitting and teasing the blonde''s pussy with the crop. She seems pleased by this as she''s moaning, begging for more.'
 						end
 						'The blonde is loudly moaning. While the other woman is yelling at her;'
-						'"Do you want your reward? Beg for it!"'+iif(lariskaMotherKnown = 1, ' Anna says.', ' the brunette says.')
+						'"Do you want your reward? Beg for it!"'+iif(LariskaQW['metAnna'] = 1, ' Anna says.', ' the brunette says.')
 						'The other woman only manages to let out some muffled cries...'
 						gs 'arousal', 'voyeur', 10
 						gs 'stat'
@@ -930,7 +930,7 @@ if $ARGS[0] = 'maid':
 						act 'Keep watching':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/3.jpg"></center>'
-							if lariskaMotherKnown = 1:
+							if LariskaQW['metAnna'] = 1:
 								'Anna removes the bite from the girl and commands her to stand up, "Clean my boots, slut!"' 
 								'The blonde eagerly starts licking the boots.'
 								'Anna is encouraging her, "Good girl. Good girl. Now something better..."'
@@ -945,7 +945,7 @@ if $ARGS[0] = 'maid':
 							act 'What''s next':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/4.jpg"></center>'
-								if lariskaMotherKnown = 1:
+								if LariskaQW['metAnna'] = 1:
 									'Anna yanks the blonde''s chain leash to follow after her while she lays on the table.'
 									'The blonde is blissfully following closely after, obeying the mistress.'
 									'Anna spreads her legs and tells her slave, "Here''s your reward slut..." You decide it''s time to leave. It''s not professional, and you don''t want to get caught.'
@@ -965,7 +965,7 @@ if $ARGS[0] = 'maid':
 				elseif IgorevnaBDSM = 1:				
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/5.jpg"></center>'
 					'After the previous experience with this room, you carefully approach it as you''re expecting to see another act, but this blows your expectations away...'
-					if lariskaMotherKnown = 1:
+					if LariskaQW['metAnna'] = 1:
 						'Anna is on her knees completely naked, collared and leashed by a woman you''ve never seen before.'
 					else
 						'The brunette is on her knees completely naked, collared and leashed by a woman you''ve never seen before.'
@@ -979,7 +979,7 @@ if $ARGS[0] = 'maid':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/6.jpg"></center>'
 						'Her nipples are pinched with nipple clamps and all of her limbs are cuffed...'
-						if lariskaMotherKnown = 1:
+						if LariskaQW['metAnna'] = 1:
 							'The other woman gently taps Anna between her legs with a whip, and she seems to enjoy it! You remember the last time, the woman being subjective this time was dominating a woman last time... It''s making you quite confused... and aroused.'
 						else
 							'The other woman gently taps the brunette between her legs with a whip, and she seems to enjoy it! You remember the last time, the woman being subjective this time was dominating a woman last time... It''s making you quite confused... and aroused.'
@@ -990,7 +990,7 @@ if $ARGS[0] = 'maid':
 						act 'Keep watching':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/7.jpg"></center>'
-							if lariskaMotherKnown = 1:
+							if LariskaQW['metAnna'] = 1:
 								'"Crawl to me and start licking my boots!" The woman commands. Without objecting, Anna crawls to the woman and starts licking her boots.'
 								'<i>Is she willingly letting her have this control over her?</i> You wonder.'
 								'"Good girl, and now is the time for your reward. Here, put this on. You will need it." Says the other woman as she hands over a bite and a leather strap to Anna.'
@@ -1005,7 +1005,7 @@ if $ARGS[0] = 'maid':
 							act 'What happens next':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/8.jpg"></center>'
-								if lariskaMotherKnown = 1:
+								if LariskaQW['metAnna'] = 1:
 									'Anna quietly obeys and puts the bite and the straps on herself. Then she places herself on some kind of gym bench spreading herself to the unknown woman.' 
 									'The woman chains her arms and legs to the bench, "Take it bitch! I''ll teach you your place." she yells as she starts whipping Anna.'
 									'You watch them for some time flabbergasted by what you''re seeing, and after a while you feel you''ve seen enough as you decide to leave.'
@@ -1024,7 +1024,7 @@ if $ARGS[0] = 'maid':
 					end
 				elseif IgorevnaBDSM = 2:				
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/9.jpg"></center>'
-					if lariskaMotherKnown = 1:
+					if LariskaQW['metAnna'] = 1:
 						'While passing by the room where you''ve seen Lariska''s mom, you hear a male voice. Curious as you are, you decide to take a peek to still your curiosity.'
 						'As you gently open the door you see Anna completely naked wearing only a pair of gloves and pantyhose. You''ve missed most of the initial encounter between them, but from what you were able to pick up is that she''s not in danger.'
 						'Instead they seem to agree on something, "Now I''ll put the gag back. You can start to moan when I tell you. Are we clear?" the man says pulling her hair and groping her marvelous boobs.' 
@@ -1054,7 +1054,7 @@ if $ARGS[0] = 'maid':
 						act 'Keep watching':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/11.jpg"></center>'
-							if lariskaMotherKnown = 1:
+							if LariskaQW['metAnna'] = 1:
 								'The man completely strips Anna naked as he takes out a blindfold and covers her eyes. Then he binds her arms and ankles to a wooden pillar in the middle of the room with a rope, while another rope links together her tiptoe and the blindfold...'
 								'"Now for your reward." the man take out a vibrator from the bag laying on the floor and puts it between Anna''s legs, teasing her clit...'
 							else
@@ -1067,7 +1067,7 @@ if $ARGS[0] = 'maid':
 							act 'Keep watching':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/12.jpg"></center>'
-								if lariskaMotherKnown = 1:
+								if LariskaQW['metAnna'] = 1:
 									'As the vibrator is pleasing Anna, the man closes the bag and takes a seat on a chair admiring his work; "Now to start the show..." he snickers.'
 									'He takes the controller and uses it to turn on the vibrator. You can hear the buzz and immediately she starts to moan. You can''t take your eyes off Anna. She''s clearly liking this. You can tell by her constant moves in search of the head of the vibrator.'
 									'Getting too aroused, she looses control and pushes the vibrator too far away and struggles to reach it again. The man quickly jumps up from the chair and immediately push it towards her dripping wet pussy as if he doesn''t want anything but to see her climax.'
@@ -1088,7 +1088,7 @@ if $ARGS[0] = 'maid':
 					end
 				elseif IgorevnaBDSM = 3:				
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/13.jpg"></center>'
-					if lariskaMotherKnown = 1:
+					if LariskaQW['metAnna'] = 1:
 						'You pass near the room that Lariska''s mother usually rents... <font color = #DC143C>Maybe she''s some kind of whore that likes to be dominated</font> you wonder as you hear some voices come from the room. Someone is definitely in there. You decide to look in and open the door slightly...'
 						'Anna is standing next to a buff young man wearing nothing but a necktie...'
 						'<font color = #DC143C>''He''s probably a male stripper, she probably pays for him, not only being paid for...''</font> is your first thought. But then your attention focuses on something shiny... <font color = #DC143C>''What the hell, are those nipple clamps...?''</font>'
@@ -1105,7 +1105,7 @@ if $ARGS[0] = 'maid':
 						*clr & cla
 						IgorevnaBDSM += 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/14.jpg"></center>'
-						if lariskaMotherKnown = 1:
+						if LariskaQW['metAnna'] = 1:
 							'You are having a hard time processing what is happening as Anna suddenly slaps his face few times, "You have been behaving really bad... really really bad."'
 							'"I-I''m sorry... I''ll do better..." the man pleads with her...'
 							'"All I hear are promises... Is that all I get to hear from you?"'
@@ -1126,7 +1126,7 @@ if $ARGS[0] = 'maid':
 						act 'Keep watching':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/15.jpg"></center>'
-							if lariskaMotherKnown = 1:
+							if LariskaQW['metAnna'] = 1:
 								'The young man pulls down his boxers and steps into the middle of the room. In the meantime, Anna starts to undress herself, and in no time she''s in her underwear. Before you know it, she starts to spank his butt with two paddles.'
 								'Despite the beating the guy stays in his place... His ass is getting red as a lobster, but he isn''t trying to escape the punishment.'
 								'"Say you like it... say you did it on purpose." Before he''s able to answer, she continues to beat him. Satisfied with her work, she commands him to lay on the table, then she approaches the table and starts binding him.'
@@ -1141,7 +1141,7 @@ if $ARGS[0] = 'maid':
 							act 'Keep watching':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/16.jpg"></center>'
-								if lariskaMotherKnown = 1:
+								if LariskaQW['metAnna'] = 1:
 									'Anna takes a seat on a chair and all of a sudden pulls out a strap-on from the dresser and puts it on. She starts to tap the man''s chest again while she starts playing around with a vibrator.'
 									'"We''ll see if you didn''t do it on purpose." she sternly looks at him sternly.'
 									'"Y-yes Mistress..." he mumbles as he knows what is about to happen...'
@@ -1180,7 +1180,7 @@ if $ARGS[0] = 'maid':
 						*clr & cla
 						IgorevnaBDSM += 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/18.jpg"></center>'
-						if lariskaMotherKnown = 1:
+						if LariskaQW['metAnna'] = 1:
 							'"See... I told you, she obey''s whatever you command." says a woman you''ve never seen before.'
 							'"You''re right..." you hear another voice, a familiar one, "Take care of our guest!"' 
 							'The gagged girl obediently follows the command. She crawls toward the other girl and starts caressing her. You finally get a clear view and see that Anna was the one giving out the commands.'
@@ -1204,7 +1204,7 @@ if $ARGS[0] = 'maid':
 						act 'Keep quiet':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/19.jpg"></center>'
-							if lariskaMotherKnown = 1:
+							if LariskaQW['metAnna'] = 1:
 								'"Well it''s time for me to leave. You know that I cannot leave my place for more than two hours... If Uslada is left wandering around the mansion alone for more than two hours, I''ll come back to a hot mess!" both the women start laughing, then the unknown woman pulls on the leash of one of the girls, "See how easy it is to control..."'
 								'Suddenly the mood shifts, and the unknown woman becomes serious, "That''s exactly what led me to our discussion. How are you able to not become influenced by switching back and forth? I can understand that some people want to switch it up every once in a while. But you, you switch easily as day and night. It''s not so simple, and you should know it better than anyone. Be upfront with me, are you sick? Have you started abusing drugs?"'
 								'Anna begins to laugh, "Don''t be silly! There''s nothing wrong, I just let the weather influence me." she teasingly sticks out her tongue.'
@@ -1225,7 +1225,7 @@ if $ARGS[0] = 'maid':
 							act 'Go back':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/20.jpg"></center>'
-								if lariskaMotherKnown = 1:
+								if LariskaQW['metAnna'] = 1:
 									'You turn around and go back. Anna is sitting in the chair, and she''s slapping the girl''s butt, "You are a good girl you know? I''m in a good mood today so I''ll let you choose, pain or pleasure? But before that I think we should say hello to our guest, don''t you agree?"'
 									'Caught, you start to panic as Anna pushes away the girl and starts walking toward the door...'
 								else
@@ -1238,7 +1238,7 @@ if $ARGS[0] = 'maid':
 								act 'Run away':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/peeping/a.jpg"></center>'
-									if lariskaMotherKnown = 1:
+									if LariskaQW['metAnna'] = 1:
 										'You weren''t fast enough, "Got you, <<$pcs_nickname>>!" You are quite embarrassed, as you were found out, "Did you like the show?" Anna asks.'
 										'Not able to say anything to your defense and being afraid she might get you fired, you remain silent.'
 										'"Come on, cheer up, I''m not angry. I know you have been spying on me for some time" Anna smiles.'

+ 3 - 1
locations/IvanEv.qsrc

@@ -143,10 +143,12 @@ if $ARGS[0] = 'School Chat':
 				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
+			!! (like IvanShowerDayStart or something)
 			elseif IvanShowerYes = 0 and IvanShowerQW = 11 and ShowerIvan < 3:
 				'When you''re about to head for your next class, Ivan suddenly stops you and asks: "<<$pcs_nickname>>, want to meet up with me in the showers after school?"'
 				act 'Decline':
-					IvanShowerYes = 2
 					cla
 					'You give it some thought, but have to decline. You shake your head apologetically and say: "Sorry Ivan, I can''t make it today."'
 					act 'Continue': gt 'gschool_lessons', 'short_break'

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -78,7 +78,7 @@ elseif lernHome = 0:
 
 				act 'Relax in Julia''s room':gt $curloc
 
-				if pcs_horny >= 50:
+				if JulMilBestFrend >= 5:
 					act 'Talk about sex':
 						cls
 						minut += 5

+ 2 - 2
locations/LariskaGo.qsrc

@@ -17,12 +17,12 @@ act 'Go with Lariska':
 	act 'Enter her apartment':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/home_1.jpg"></center>'
-		if LariskaHomeIn = 1:
+		if LariskaQW['story'] = 5:
 			'Entering the apartment, you see that it is decorated in a Japanese style.'
 			'"You have a nice apartment, Lariska," you say, looking around with interest.'
 			'"Thank you. Mother makes a good living, although she is usually only home on the weekends," she says a bit sadly.'
 			'You follow Lariska to her room.'
-			LariskaHomeIn = 2
+			LariskaQW['story'] = 6
 		else
 			'You go into the japanese styled apartment, then follow Lariska to her room.'
 		end

+ 15 - 8
locations/LariskaHome.qsrc

@@ -38,13 +38,13 @@ if $ARGS[0] = 'front_door':
 			end
 			'You knock on Lariska''s apartment door.'
 			*nl
-			if lariskaMotherKnown = 0:
+			if LariskaQW['metAnna'] = 0:
 				'You knock on Lariska''s apartment door and a smart looking brunette opens the door. You look helplessly into her impressive cleavage and let out an involuntary sigh.'
 				'"Hello, are you looking for Lariska?" the woman asks with a smile.'
 				'"Yes, I''m <<$pcs_nickname>>." you reply tearing your eyes away from her nearly exposed breasts.'
 				'"Ah, <<$pcs_nickname>>, Lariska has told me all about you. I''m Anna, Lariska''s mother. My bunny has been so joyous lately, I am so glad she has found such a good friend! She needed someone to help get her back on her feet."'
 				'"<<$text_home>>"'
-				lariskaMotherKnown = 1
+				LariskaQW['metAnna'] = 1
 			else
 				'Lariska''s mother opens the door. "Hello, <<$pcs_nickname>>. Come inside, <<$text_home>>"'
 			end
@@ -72,13 +72,13 @@ if $ARGS[0] = 'front_door':
 		end
 		if week >= 6:
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariskamother.jpg"></center>'
-			if lariskaMotherKnown = 0:
+			if LariskaQW['metAnna'] = 0:
 				'You knock on Lariska''s apartment door and a smart looking brunette opens the door. You look helplessly into her impressive cleavage and let out an involuntary sigh.'
 				'"Hello, are you looking for Lariska?" the woman asks with a smile.'
 				'"Yes, I''m <<$pcs_nickname>>." you reply tearing your eyes away from her nearly exposed breasts.'
 				'"Ah, <<$pcs_nickname>>, Lariska has told me all about you. I''m Anna, Lariska''s mother. My bunny has been so joyous lately, I am so glad she has found such a good friend! She needed someone to help get her back on her feet."'
 				'"<<$text_home>>"'
-				lariskaMotherKnown = 1
+				LariskaQW['metAnna'] = 1
 			else
 				'Lariska''s mother opens the door. "Hello, <<$pcs_nickname>>. <<$text_home>>"'
 			end
@@ -127,7 +127,7 @@ if $ARGS[0] = 'hallway':
 	act 'Kitchen':gt 'LariskaHome', 'kitchen'
 	act 'Bathroom':gt 'LariskaHome', 'bathroom'
 	act 'Lariska''s Bedroom':gt 'LariskaHome', 'lariska_bedroom'
-	if lariskaMotherKnown >= 1: act 'Anna''s Bedroom':gt 'LariskaHome', 'anna_bedroom'
+	if LariskaQW['metAnna'] >= 1: act 'Anna''s Bedroom':gt 'LariskaHome', 'anna_bedroom'
 end
 
 if $ARGS[0] = 'livingroom':
@@ -524,7 +524,7 @@ if $ARGS[0] = 'lariska_bedroom':
 	if lernHome ! 0:
 		act 'Do homework':gt 'LariskaHome','homework'
 	end
-	if lariskaTrain > 5 and LariskaProfi = 0 and (lariloc = 8 or (lariloc = 22 and hour < 16 and week <= 5)):
+	if lariskaTrain > 5 and LariskaQW['volleyball'] = 0 and (lariloc = 8 or (lariloc = 22 and hour < 16 and week <= 5)):
 		act 'Talk to Lariska about becoming a pro volleyball player':
 			cls
 			minut += 5
@@ -551,10 +551,11 @@ if $ARGS[0] = 'lariska_bedroom':
 			end
 		end
 	end
-	if lariskaroomfun ! daystart and npc_rel['A13'] >= 80 and (lariloc = 2 or lariloc = 8 or lariloc = 22 or lariloc = 15 or lariloc = 17):
+	if lariskaroomfun ! daystart and LariskaQW['story'] >= 7 and npc_rel['A13'] >= 80 and (lariloc = 2 or lariloc = 8 or lariloc = 22 or lariloc = 15 or lariloc = 17):
 		act 'Flirt with her':
 			*clr & cla
 			menu_off = 1
+			LariskaQW['story'] = 7: LariskaQW['story'] = 8
 			lariskaroomfun = daystart
 			pcs_horny += 5
 			gs 'stat'
@@ -639,6 +640,8 @@ if $ARGS[0] = 'homework':
 	menu_off = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
+	npc_rel['A13'] += 2
+	if LariskaQW['story'] = 6: LariskaQW['story'] = 7
 	lernHome = 0
 	lern += 1
 	minut += 30
@@ -722,8 +725,12 @@ if $ARGS[0] = 'community_center_invite':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
 	'Lariska looks at her watch and says, "It''s time to go to the sports club."'
-	act 'Go with Lariska':lariskaTrain += 1 & minut += 10 & gt 'gdksport', 'start'
 	act 'Say goodbye and leave':gt'pav_residential'
+	act 'Go with Lariska':
+		if lariskaTrain < 6 and LariskaQW['volleyball'] = 0: lariskaTrain += 1
+		minut += 10
+		gt 'gdksport', 'start'
+	end
 end
 
 if $ARGS[0] = 'undressed1':

+ 0 - 2
locations/LariskaStart.qsrc

@@ -327,7 +327,6 @@ if $ARGS[0] = 'end':
 					'"Are you okay?"'
 					'"Yes, thank you. You saved me!"'
 					'"Looks like we came just in time! Ivan saw you and told us where to look! We broke some of that crackhead''s bones and captured Lina and Christina, so don''t worry."'
-					act 'Keep silent':LinaSlut = 1 & gt'kotovSex'
 					act 'Don''t be too harsh on Lina':gt'kotovSex'
 				end
 			else
@@ -419,7 +418,6 @@ if $ARGS[0] = 'end':
 											act 'Wake':
 												cls
 												minut += 5
-												zverSlutQW = 0
 												gs 'clothing', 'strip'
 												i = rand(4,10)
 												:lariskarapeloop

+ 0 - 12
locations/NPCChanger.qsrc

@@ -106,18 +106,6 @@ if $ARGS[0] = 'selection2':
 	else
 		'NPC gender: Female'
 	end
-	if $npc_dad['A<<s>>'] = 'U':
-		'NPC father: Unknown'
-	else
-		$npcf = $npc_dad['A<<s>>']
-		'NPC father: <<$npc_firstname[''<<$npcf>>'']>>'
-	end
-	if $npc_mom['A<<s>>'] = 'U':
-		'NPC mother: Unknown'
-	else
-		$npcm = $npc_mom['A<<s>>']
-		'NPC mother: <<$npc_firstname[''<<$npcm>>'']>>'
-	end
 	act 'Done':
 		n = (o - 10)
 		gt 'NPCChanger', 'NPCLoop'

+ 1 - 1
locations/NikoWhore.qsrc

@@ -227,7 +227,7 @@ if $ARGS[0] = 'Locker Room':
 																				'Vitek looks around him as he spends a few seconds in silence before finally saying, "Oh well, I have better things to do anyway. Let''s get going boys." Vitek turns around then walks away as the jocks move out of their way, letting them go. Fedor turns to you then gives you a wink before being helped up by Ivan. You quickly run back to the locker room and find the bag with your clothes which you put on before returning to the hallway.'
 																			end
 
-																			act 'Hallway':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'afternoon'
+																			act 'Hallway':gs 'clothing', 'wear_last_worn' & gt 'gschool_lessons', 'short_break'
 																		end
 
 																		act 'Remain silent [<font color=#FF00FF>Lose Fedor</font>]':

+ 66 - 66
locations/Snpc.qsrc

@@ -8,23 +8,23 @@ $static_num = 'A<<numnpc>>'
 '<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
 '<<$npc_notes[''A<<numnpc>>'']>>'
 
-if npc_grupTipe['A<<numnpc>>'] = 5:'<<$npc_firstname[''A<<numnpc>>'']>> is an outcast in school, and often gets picked on at school.'
+if npc_grupTipe['A<<numnpc>>'] = 5:'<<$npc_firstname[''A<<numnpc>>'']>> is an outcast in school and often gets picked on at school.'
 if npc_grupTipe['A<<numnpc>>'] = 6:''
-if npc_grupTipe['A<<numnpc>>'] = 3:'<<$npc_firstname[''A<<numnpc>>'']>> is a nerd, and is often found around the rest of the nerds doing homework or a their game night.'
+if npc_grupTipe['A<<numnpc>>'] = 3:'<<$npc_firstname[''A<<numnpc>>'']>> is a nerd and is often found around the rest of the nerds doing homework or at their game night.'
 if npc_grupTipe['A<<numnpc>>'] = 2:'<<$npc_firstname[''A<<numnpc>>'']>> is part of the athletic clique in your school.'
-if npc_grupTipe['A<<numnpc>>'] = 1:'<<$npc_firstname[''A<<numnpc>>'']>> is popular, and spends time with the other popular kids usually.'
-if npc_grupTipe['A<<numnpc>>'] = 4:'<<$npc_firstname[''A<<numnpc>>'']>> is a Gopnik, and spends a lot of time doing what Gopniks usually do: be loud, and drink beer.'
+if npc_grupTipe['A<<numnpc>>'] = 1:'<<$npc_firstname[''A<<numnpc>>'']>> is popular and spends time with the other popular kids usually.'
+if npc_grupTipe['A<<numnpc>>'] = 4:'<<$npc_firstname[''A<<numnpc>>'']>> is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
 if npc_rel['A<<numnpc>>'] < 20:'They really don''t like you.'
 if npc_rel['A<<numnpc>>'] >= 20 and npc_rel['A<<numnpc>>'] < 40:'They are fairly indifferent to you.'
-if npc_rel['A<<numnpc>>'] >= 40 and npc_rel['A<<numnpc>>'] < 60:'The two of you get along together fairly well together, more of casual friends.'
-if npc_rel['A<<numnpc>>'] >= 60 and npc_rel['A<<numnpc>>'] < 80:'You get along great with them, they are one of your friends.'
+if npc_rel['A<<numnpc>>'] >= 40 and npc_rel['A<<numnpc>>'] < 60:'The two of you get along together fairly well, more of casual friends.'
+if npc_rel['A<<numnpc>>'] >= 60 and npc_rel['A<<numnpc>>'] < 80:'You get along great with them. They are one of your friends.'
 if npc_rel['A<<numnpc>>'] >= 80:'They are one of your best friends.'
 
 if numnpc = 14 and KatjaOTN > 0:
 	if KatjaHorny < 20:'Katja looks calm and stoic.'
 	if KatjaHorny >= 20 and KatjaHorny < 40:'You see a naughty twinkle in Katja''s eyes.'
-	if KatjaHorny >= 40 and KatjaHorny < 60:'Katja has a faint blush on her cheeks and she looks at you mischievously.'
-	if KatjaHorny >= 60 and KatjaHorny < 80:'Katja is blushing fairly obviously, and looks at you longingly.'
+	if KatjaHorny >= 40 and KatjaHorny < 60:'Katja has a faint blush on her cheeks, and she looks at you mischievously.'
+	if KatjaHorny >= 60 and KatjaHorny < 80:'Katja is blushing fairly obviously and looks at you longingly.'
 	if KatjaHorny >= 80:'Katja is as red as a lobster, and her chest is heaving from her heavy breaths. She''s idly rubbing her thighs against one another while you talk.'
 end
 ''
@@ -45,7 +45,7 @@ if npc_grupTipe['A<<numnpc>>'] = 5 and grupTipe ! 5:
 				menu_off = 1
 				npc_rel[$static_num] -= 5
 				gs 'stat'
-				'You mocked the school outcast, as the other students laugh at them.'
+				'You mock the school outcast as the other students laugh at them.'
 
 				if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
 				if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
@@ -55,7 +55,7 @@ if npc_grupTipe['A<<numnpc>>'] = 5 and grupTipe ! 5:
 				cls
 				menu_off = 1
 				gs 'stat'
-				'You began to mock them, but <<$npc_firstname[$static_num]>> answered you. "You''re one to talk cocksucker, everyone knows your the easiest fuck in town." Everyone started laughing at you. You were shocked and confused by everyone turning on you, you hurry away as the others start to talk about you.'
+				'You begin to mock them, but <<$npc_firstname[$static_num]>> answers you. "You''re one to talk cocksucker, everyone knows you''re the easiest fuck in town." Everyone starts laughing at you. You are shocked and confused by everyone turning on you, and you hurry away as the others start to talk about you.'
 
 				if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
 				if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
@@ -111,16 +111,16 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 					npc_rel['A<<numnpc>>'] += 5
 					gs 'drugs', 'alcohol', 'beer', 1
 					gs 'stat'
-					'You happily take the beer, and drink it in <<$npc_firstname[''A<<numnpc>>'']>>''s company.'
+					'You happily take the beer and drink it in <<$npc_firstname[''A<<numnpc>>'']>>''s company.'
 
 					act 'Move away':gt $loc, $loc_arg
 				end
 			end
 		elseif pav_slut >= 300:
 			if npc_gender['A<<numnpc>>'] = 0:
-				'<<$npc_firstname[''A<<numnpc>>'']>> looks at you wearily: "What do you want? Looking for a dick to suck on or something?"'
+				'<<$npc_firstname[''A<<numnpc>>'']>> looks at you warily. "What do you want? Looking for a dick to suck on or something?"'
 			else
-				'<<$npc_firstname[''A<<numnpc>>'']>> wrinkles her nose as she looks at you: "Hey cocksucker, get away from me! I don''t want to be seen talking to you."'
+				'<<$npc_firstname[''A<<numnpc>>'']>> wrinkles her nose as she looks at you. "Hey cocksucker, get away from me! I don''t want to be seen talking to you."'
 			end
 
 			act 'Move away':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $loc_arg
@@ -136,23 +136,23 @@ if numnpc = 144:
 			*clr & cla
 			if Anush_lunch = 0:
 				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
-				'"Hey Anush you feeling ok? You kinda look flush, is something wrong? Would you like to talk about it?"'
+				'"Hey Anush, you feeling ok? You kinda look flush, is something wrong? Would you like to talk about it?"'
 				'She leans in close and tries to kiss you, while one hand reaches down and squeezes your butt. You turn your head and pull away. "What are you doing? I was only seeing if you were ok."'
 				'She crowds you a bit and leans in close. "You talk too much, I can think of better things you can do with that tongue of yours."'
 				gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
 				minut -= 5
 				gs 'stat'
 				act 'Um that''s not what I meant': gt 'Snpc', 'anushnottoday'
-				act 'Kiss her back.': gt 'Snpc', 'kissback'
+				act 'Kiss her back': gt 'Snpc', 'kissback'
 			else
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
-				'Noticing she is looking fairly turned on today, well more so than usual, you say to her. "You ok? You are looking pretty flush again today."'
-				'You barely even have time to get the words out when she is leaning in and kissing you, her hands reach around to squeeze your butt.'
+				'Noticing she is looking fairly turned on today, well more so than usual, you say to her, "You ok? You are looking pretty flush again today."'
+				'You barely even have time to get the words out when she is leaning in and kissing you, her hands reaching around to squeeze your butt.'
 				gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
 				minut -= 5
 				gs 'stat'
 				act 'Not today': gt 'Snpc', 'anushnottoday'
-				act 'Kiss her back.': gt 'Snpc', 'kissback'
+				act 'Kiss her back': gt 'Snpc', 'kissback'
 			end
 		end
 	end
@@ -165,7 +165,7 @@ if $ARGS[0] = 'kissback':
 	pav_sex +=1
 	gs 'stat'
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
-	'You kiss her back. Your hands are roaming each others bodies, several of the other gopniks are checking the two of you out, especially the guys. Several of them starting hooting, hollering or whistling as the two of you make out hard right in front of them. After a couple of minutes she grabs you by the hands and says "Come on lets go some place more private to continue this.'
+	'You kiss her back. Your hands roam over each other''s bodies. Several of the other gopniks check the two of you out, especially the guys. Several of them start hooting, hollering or whistling as the two of you make out hard right in front of them. After a couple of minutes, she grabs you by the hands and says, "Come on, let''s go someplace more private to continue this."'
 	gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
 	minut -= 5
 	gs 'stat'
@@ -179,8 +179,8 @@ if $ARGS[0] = 'kissback':
 		pav_sex +=1
 		gs 'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
-		'You breath heavily feeling yourself turned on. "Ok, where?"'
-		'Her hand slides up your skirt and rubs your clit. "Come with me, I know just the place." With that she takes you by the hand and the two of your head off, with the whistles and cat calls of the other gopniks behind you.'
+		'You breath heavily, feeling yourself turned on. "Ok, where?"'
+		'Her hand slides up your skirt and rubs your clit. "Come with me, I know just the place." With that, she takes you by the hand, and the two of you head off, with the whistles and catcalls of the other gopniks behind you.'
 		gs 'arousal', 'foreplay', 5, 'lesbian', 'exhibitionism'
 		minut -= 5
 		gs 'stat'
@@ -192,8 +192,8 @@ if $ARGS[0] = 'anushnottoday':
 	*clr & cla
 	npc_rel['A144'] -= 2
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nomake.jpg"></center>'
-	'You place your hand on her shoulders and gentle push her away. "No I don''t want to."'
-	'She rolls her eyes. "Fine what ever, if you don''t want to have a little fun, I will find someone that does." With that she turns and walks off, leaving you unsure what just happened.'
+	'You place your hand on her shoulders and gently push her away. "No, I don''t want to."'
+	'She rolls her eyes. "Fine whatever, if you don''t want to have a little fun, I will find someone that does." With that, she turns and walks off, leaving you unsure what just happened.'
 	act 'Continue': gt 'gschool_lessons', 'short_break'
 end
 
@@ -203,7 +203,7 @@ end
 
 if numnpc = 23:
 	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:
-		'Albina offers you a friendly smile and says: "<<$pcs_nickname>>, you''re progressing very well in your training. Don''t forget to keep attending!"'
+		'Albina offers you a friendly smile and says, "<<$pcs_nickname>>, you''re progressing very well in your training. Don''t forget to keep attending!"'
 
 		if pav_slut >= 250:'By the way, some people are telling some pretty disgusting rumours about you.'
 	end
@@ -212,7 +212,7 @@ if numnpc = 23:
 		act 'Ask about a tiny camera':
 			minut += 5
 			artemIzdev = 2
-			'You ask Albina if she knows where you could get a tiny camera, saying it''s for a prank you''re pulling on your parents. Albina smiles and nods: "There''s a photo studio in the city, they''ll have that you need!"'
+			'You ask Albina if she knows where you could get a tiny camera, saying it''s for a prank you''re pulling on your parents. Albina smiles and nods. "There''s a photo studio in the city, they''ll have that you need!"'
 			'You thank her for the help. Maybe now you''ll finally be able to get out of this hell.'
 
 			if $loc ! 'gdkin':
@@ -236,11 +236,11 @@ end
 
 !!Chat
 if narkoman = 1 and numnpc = 1 and npc_rel['A1'] >= 100:
-	'You don''t want to but the you feel miserable and everything hurts, you crave the rush that you''ve come to enjoy so much'
+	'You don''t want to, but you feel miserable and everything hurts. You crave the rush that you''ve come to enjoy so much.'
 	'"Please Dimka, can I have some pale lady?"'
 	if dimaRevenge = 0:
-		'Dimka grins. Sure, why don''t we go somewhere queieter...'
-		'Resolved to do anything to make the pain go away and feel happy again, you mentally sigh and follow him'
+		'Dimka grins. Sure, why don''t we go somewhere quieter...'
+		'Resolved to do anything to make the pain go away and feel happy again, you mentally sigh and follow him.'
 	end
 end
 
@@ -262,7 +262,7 @@ act 'Chat':
 
 	if numnpc = 1 and npc_rel['A<<numnpc>>'] = 0:
 		cla
-		'Dimka doesn''t try to hide his disdain for you: "Get away from me, you pimply pig."'
+		'Dimka doesn''t try to hide his disdain for you. "Get away from me, you pimply pig."'
 
 		if $loc ! 'gdkin':
 			act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -288,7 +288,7 @@ end
 
 !!Lariska
 if numnpc = 13 and lariskaHelp = -1:
-	'She looks at you rejectedly, and softly says: "Leave me alone, <<$pcs_nickname>>. I want nothing to do with you any more."'
+	'She looks at you rejectingly and softly says, "Leave me alone, <<$pcs_nickname>>. I want nothing to do with you any more."'
 
 	if $loc ! 'gdkin':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -313,8 +313,8 @@ if numnpc = 2:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 250:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised: "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
-			if pav_slut >= 250:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged: "Bah... the school whore needs my help? I don''t think so."'
+			if pav_slut < 250:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is a bit surprised. "What... you want my help? Well, okay I guess. Come meet me at my place if you want to do homework together."'
+			if pav_slut >= 250:'You approach Artem and explain how you''re struggling in school and could really use his help studying. Artem is outraged. "Bah... the school whore needs my help? I don''t think so."'
 
 			if $loc ! 'gdkin':
 				act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -352,8 +352,8 @@ if numnpc = 12:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 250:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
-			if pav_slut >= 250:'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
+			if pav_slut < 250:'You approach Julia and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees. "Sure <<$pcs_nickname>>, that could be fun!"'
+			if pav_slut >= 250:'You approach Julia and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway as long as you don''t tell anyone.'
 			if $loc ! 'gdkin':
 				act' Leave': xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -376,7 +376,7 @@ if numnpc = 14:
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
-			'You approach Katja and thank her for taking you home from the disco when you were drunk, the other night. Katja gives you a knowing smile and says: "Don''t mention it, <<$pcs_nickname>>! You really shouldn''t get that drunk at the disco though, that could end badly. Some of the guys there are real pigs..."'
+			'You approach Katja and thank her for taking you home from the disco when you were drunk the other night. Katja gives you a knowing smile and says, "Don''t mention it, <<$pcs_nickname>>! You really shouldn''t get that drunk at the disco though, that could end badly. Some of the guys there are real pigs..."'
 
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
@@ -400,7 +400,7 @@ if numnpc = 14:
 		'Katja slowly leans in towards you, almost closing her eyes and slowly opening her mouth. Unable to resist, you lean in and meet her with a kiss.'
 		gs 'katjaEv', 'kiss_events'
 	elseif meynoldQW > 1 and pcs_makeup <= 1:
-		'Katja looks at you with a smile: "<<$pcs_nickname>>, I bet you would look great with a little make-up on you! What do you say?"'
+		'Katja looks at you with a smile. "<<$pcs_nickname>>, I bet you would look great with a little make-up on you! What do you say?"'
 
 		act 'Let her put makeup on you':
 			*clr & cla
@@ -411,14 +411,14 @@ if numnpc = 14:
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
-			'Katja happily grins as she quickly straightens your hair: "What do you want? A light touch-up, some normal make-up or shall I just shovel it on?"'
+			'Katja happily grins as she quickly straightens your hair. "What do you want? A light touch-up, some normal make-up or shall I just shovel it on?"'
 
 			act 'Light touch-up':
 				cla
 				pcs_makeup = 2
 				'Katja subtly applies some neutral tones, with a light application of makeup to bring out your natural beauty.'
 
-				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes, and blushes.'
+				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
@@ -429,9 +429,9 @@ if numnpc = 14:
 			act 'Normal make-up':
 				cla
 				pcs_makeup = 3
-				'Katja applies some mildly vibrate tones and colors of makeup to cover your minor imperfections and enhance your best features.'
+				'Katja applies some mildly vibrant tones and colors of makeup to cover your minor imperfections and enhance your best features.'
 
-				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes, and blushes.'
+				if KatjaOTN > 0:KatjaHorny += 10 & 'Katja suddenly becomes aware that she is staring into your eyes and blushes.'
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
@@ -467,7 +467,7 @@ if numnpc = 14:
 			gs'stat'
 			'You lean in to kiss Katja'
 			if Katjahorny < 30:
-				'She pulls away from you as you try and kiss her, she looks around to see if anyone seen. "Not here and not now."'
+				'She pulls away from you as you try to kiss her. She looks around to see if anyone saw. "Not here and not now."'
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
@@ -493,8 +493,8 @@ if numnpc = 14:
 
 			'<center><b><font color = maroon><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
-			'You make sure no one else is paying attention, and tell Katja about what Artem and Petka are doing to you on Mondays. At first she doesn''t believe you. After a while, all of the nasty details you''re sharing convince her that there is no way you''re making this up. Katja is shocked!'
-			'You tell her that the only way you have thought of to get rid of their blackmailing, is to get blackmailing material of your own. Katja nods and says: "That makes sense, actually... if you could somehow make it look violent, I bet it would work even better! I don''t know where you would be able to find a tiny camera though... maybe Albina can help you?"'
+			'You make sure no one else is paying attention and tell Katja about what Artem and Petka are doing to you on Mondays. At first, she doesn''t believe you. After a while, all of the nasty details you''re sharing convince her that there is no way you''re making this up. Katja is shocked!'
+			'You tell her that the only way you have thought of to get rid of their blackmailing is to get blackmailing material of your own. Katja nods and says, "That makes sense, actually... if you could somehow make it look violent, I bet it would work even better! I don''t know where you would be able to find a tiny camera though... maybe Albina can help you?"'
 
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
@@ -533,8 +533,8 @@ if numnpc = 16:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
 
-			if pav_slut < 250:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
-			if pav_slut >= 250:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
+			if pav_slut < 250:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees. "Sure <<$pcs_nickname>>, that could be fun!"'
+			if pav_slut >= 250:'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway as long as you don''t tell anyone.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -549,8 +549,8 @@ if numnpc = 16:
 			gs 'stat'
 			'<center><b><font color="maroon">Girls Bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
-			'You grab Natasha by the hand and pull her along with you as you tell her. "Come to the bathroom with me."'
-			'She looks at you questioningly but doesn''t protest, as you pull her into the bathroom, past a few girls using the mirrors. You take her into a stall with you. You sit down on the toilet and pull down your panties, then spread you legs and tell her. "Down on your knees, time to pay off a little debt."'
+			'You grab Natasha by the hand and pull her along with you as you tell her, "Come to the bathroom with me."'
+			'She looks at you questioningly but doesn''t protest as you pull her into the bathroom past a few girls using the mirrors. You take her into a stall with you. You sit down on the toilet and pull down your panties, then spread you legs and tell her, "Down on your knees, time to pay off a little debt."'
 			'She looks a little shocked at first but then gets down on her knees and lowers her face to your crotch.'
 			act 'Further':
 				*clr & cla
@@ -563,9 +563,9 @@ if numnpc = 16:
 				orgasm += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/school/natschoolowe.jpg"></center>'
-				'Her tongue starts to lick your clit, you bite your lip to try and keep from moaning to loudly. You lean back and relax, as you let Natasha pleasure you with her tongue. She is getting a lot better at this and if you''re not mistaken she is starting to like it a lot.'
-				'She starts using her fingers on you as well and is really getting into it, you start to pant and moan. Clamping a hand over your own mouth to keep yourself from crying out, it doesn''t her long to bring you to a climax.'
-				'Your whole body shudders as the orgasm rocks your body, you grind your pussy against her face as it does. Once the sensation has passed you look down and see Natasha smiling up at you, obviously pleased with herself. You lean down and give her a long slow passionate kiss, tasting your own pussy juices. A few moments later the bell rings and you both hurry to class.'
+				'Her tongue starts to lick your clit. You bite your lip to try and keep from moaning too loudly. You lean back and relax as you let Natasha pleasure you with her tongue. She is getting a lot better at this, and if you''re not mistaken, she is starting to like it a lot.'
+				'She starts using her fingers on you as well and is really getting into it. You start to pant and moan, clamping a hand over your own mouth to keep yourself from crying out. It doesn''t take her long to bring you to a climax.'
+				'Your whole body shudders as the orgasm rocks your body. You grind your pussy against her face as it does. Once the sensation has passed, you look down and see Natasha smiling up at you, obviously pleased with herself. You lean down and give her a long, slow, passionate kiss, tasting your own pussy juices. A few moments later, the bell rings, and you both hurry to class.'
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
@@ -583,8 +583,8 @@ if numnpc = 31:
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
-		'"So Lizaveta hear any good gossip of late?"'
-		'As you ask that her face lights up and she leans in close like she has the best secret in the world to share with you. "Oh my god yes! I was... well it doesn''t matter what I was doing but I overheard some others talking and they said..."'
+		'"So Lizaveta, hear any good gossip of late?"'
+		'As you ask that, her face lights up, and she leans in close like she has the best secret in the world to share with you. "Oh my god yes! I was... well it doesn''t matter what I was doing, but I overheard some others talking, and they said..."'
 		gs 'gschool_gossip', 'Lizaveta'
 		if $loc ! 'gdkin':
 			xgt 'gschool_lessons', 'short_break', 'nopict'
@@ -604,10 +604,10 @@ if numnpc = 231:
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
-			'"Hi <<$npc_nickname[''A<<numnpc>>'']>>! I just finished my last book at home and I''m not sure what I should read next. Can I join you at the library this afternoon so that you can help me find another good one to read?"'
-			'<<$npc_firstname[''A<<numnpc>>'']>>''s face quickly shifts from a smile to confusion. You can tell she''s not sure how to respond and there is a long pause as a result. Finally after about 30 seconds of thought she responds "Sure, that should be alright. Do you mind going home with me first so that I can change out of our uniform?"'
-			'"That is no problem at all" you reply. "I''ll meet you outside of school after our last period, and then we can head to your house together."'
-			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''A<<numnpc>>'']>> replies as she heads off.'
+			'"Hi <<$npc_nickname[''A<<numnpc>>'']>>! I just finished my last book at home, and I''m not sure what I should read next. Can I join you at the library this afternoon so that you can help me find another good one to read?"'
+			'<<$npc_firstname[''A<<numnpc>>'']>>''s face quickly shifts from a smile to confusion. You can tell she''s not sure how to respond, and there is a long pause as a result. Finally after about 30 seconds of thought, she responds, "Sure, that should be alright. Do you mind going home with me first so that I can change out of our uniform?"'
+			'"That is no problem at all," you reply. "I''ll meet you outside of school after our last period, and then we can head to your house together."'
+			'"Sounds good <<$pcs_nickname>>. See you then," <<$npc_firstname[''A<<numnpc>>'']>> replies as she heads off.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -623,9 +623,9 @@ if numnpc = 231:
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
 			'"Hi <<$npc_nickname[''A<<numnpc>>'']>>! I ended up missing school the other day because I was sick. Would it be alright with you if we went to your house after school so that you can help me catch up?"'
-			'<<$npc_firstname[''A<<numnpc>>'']>> replies "Sure <<$pcs_nickname>>, just as long as you aren''t sick anymore. I don''t want to get sick with whatever you had and miss school as well."'
-			'You giggle a little bit and reply "Nah, I got over my sickness so you should be fine. I''ll meet you outside of school after our last period, and then we can head to your house together."'
-			'"Sounds good <<$pcs_nickname>>. See you then" <<$npc_firstname[''A<<numnpc>>'']>> replies as she heads off.'
+			'<<$npc_firstname[''A<<numnpc>>'']>> replies, "Sure <<$pcs_nickname>>, just as long as you aren''t sick anymore. I don''t want to get whatever you had and miss school as well."'
+			'You giggle a little bit and reply, "Nah, I got over my sickness, so you should be fine. I''ll meet you outside of school after our last period, and then we can head to your house together."'
+			'"Sounds good <<$pcs_nickname>>. See you then," <<$npc_firstname[''A<<numnpc>>'']>> replies as she heads off.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -640,14 +640,14 @@ if numnpc = 231:
 			npc_QW['A231'] = 5
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big<<numnpc>>.jpg"></center>'
-			'As you walk to up <<$npc_firstname[''A<<numnpc>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. However you''re not about to let what happened end your friendship without at least clearing the air.'
+			'As you walk up to <<$npc_firstname[''A<<numnpc>>'']>>, you feel your stomach drop to the floor due to how awkward the situation is. However, you''re not about to let what happened end your friendship without at least clearing the air.'
 			'After about a minute or so of eye contact, you finally develop enough courage to speak first.'
-			'"Hi <<$npc_nickname[''A<<numnpc>>'']>>..." You say in a nervous and defeated voice.'
+			'"Hi <<$npc_nickname[''A<<numnpc>>'']>>..." you say in a nervous and defeated voice.'
 			'"Hi <<$pcs_nickname>>..." she replies in an equally nervous voice.'
-			'After taking a couple more seconds to fully collect your thoughs, you say "Look, I think we need to talk about what happened last time at your house. Given the subject, it would be best to do so privately. Can we meet after school to talk about it?"'
-			'<<$npc_nickname[''A<<numnpc>>'']>> doesn''t respond, and almost looks like she''s about to start crying. She finally wimpers "Are you mad at me or are you sickened by me?"'
+			'After taking a couple more seconds to fully collect your thoughts, you say, "Look, I think we need to talk about what happened last time at your house. Given the subject, it would be best to do so privately. Can we meet after school to talk about it?"'
+			'<<$npc_nickname[''A<<numnpc>>'']>> doesn''t respond and almost looks like she''s about to start crying. She finally whimpers, "Are you mad at me, or are you sickened by me?"'
 			'Not completely surprised by what she said, you hold firm in making sure to wait until the two of you are alone. "I don''t wan''t to discuss things here. Meet me after school so we can talk about this more. I promise I''m not going to hurt you if that is what you''re afraid of."'
-			'Looking a little releaved, <<$npc_firstname[''A<<numnpc>>'']>> nods her head in a slow manner and sheds a couple of tears. You walk away without either of you saying another word."'
+			'Looking a little relieved, <<$npc_firstname[''A<<numnpc>>'']>> nods her head in a slow manner and sheds a couple of tears. You walk away without either of you saying another word."'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
@@ -679,8 +679,8 @@ if numnpc = 231:
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A<<numnpc>>'']>> <<$npc_lastname[''A<<numnpc>>'']>></font></b></center>'
 !!Image needed			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/aleksandra/school_kiss.jpg"></center>'
-			'You lean in to kiss <<$npc_firstname[''A<<numnpc>>'']>> and you both close your eyes as your lips meet. You don''t really care what anyone else thinks, you both just enjoy the moment.' 
-			'You eventually break off the kiss and say "See you later cutie" and head on your way.'
+			'You lean in to kiss <<$npc_firstname[''A<<numnpc>>'']>>, and you both close your eyes as your lips meet. You don''t really care what anyone else thinks. You both just enjoy the moment.' 
+			'You eventually break off the kiss and say, "See you later cutie," and head on your way.'
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else

+ 21 - 21
locations/StasQW.qsrc

@@ -3,27 +3,27 @@ gs 'stat'
 
 if StasKafe = 2:
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe2.jpg"></center>'
-	'After the dance, Stas took you by the hand to the table. Sitting down in a chair, he grabs you by the waist and pulls you into his lap. He immediately began to kiss you and you felt his hand slide up your skirt between your legs and began to caress your clitoris. Stas whispered in your ear, "Come to you or can have fun in the toilet?"'
+	'After the dance, Stas takes you by the hand to the table. Sitting down in a chair, he grabs you by the waist and pulls you into his lap. He immediately begins to kiss you, and you feel his hand slide up your skirt between your legs and begin to caress your clitoris. Stas whispers in your ear, "Come to you or can have fun in the toilet?"'
 
 	act 'Let''s go!':
 		cls
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe2.jpg"></center>'
-		'With a sweeping gesture, Stas threw the money to the waitress, and then stood up, taking you by the hand. Leaning on his arm the two of you leave the cafe and walk down the streets in the direction of your home.'
+		'With a sweeping gesture, Stas throws the money to the waitress and then stands up, taking you by the hand. Leaning on his arm, the two of you leave the cafe and walk down the street in the direction of your home.'
 
 		act 'Home':
 			cls
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/stas/go.jpg"></center>'
-			'A bit tipsy you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly caught and picked you up. He carried you in his arms the rest of the way to your house, while you wrapped your arms around his neck and nuzzled his ear. He ends up carrying you inside.'
+			'A bit tipsy, you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly catches you and picks you up. He carries you in his arms the rest of the way to your house while you wrap your arms around his neck and nuzzle his ear. He ends up carrying you inside.'
 
 			act 'Further':SStip = 0 & gt 'StasSex'
 		end
 	end
 elseif StasKafe = 1:
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
-	'After the dance, you sat down again at the table, the waitress brought the bill over. You took a look at the bill and are slightly stunned, by the total. Five thousand! Stas took the bill out of your hands and said "Do not worry, I''ll pay."'
+	'After the dance, you sit down again at the table. The waitress brings the bill over. You take a look at the bill and are slightly stunned by the total. Five thousand! Stas takes the bill out of your hands and says, "Do not worry, I''ll pay."'
 
 	if money >= 5000:
 		act 'No thank you, I''ll pay':
@@ -31,14 +31,14 @@ elseif StasKafe = 1:
 			money -= 5000
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
-			'You shook your head. "That is sweet, but I can pay my share." You got out the money and paid the waitress. Stas stood up and gave you a hand. Leaning on his arm you walked together with Stas, arm and arm as you left the cafe.'
+			'You shake your head. "That is sweet, but I can pay my share." You get out the money and pay the waitress. Stas stands up and gives you a hand. Leaning on his arm, you walk together with Stas, arm and arm as you leave the cafe.'
 
 			act 'Home':
 				cls
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/stas/go.jpg"></center>'
-				'A bit tipsy you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly caught and helps steady you. Making sure you are alright, he helps support you the rest of the walk home. Once you get to your home, he waits at the door expectantly, he clearly expects you to invite him in.'
+				'A bit tipsy, you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly catches you and helps steady you. Making sure you are alright, he helps support you the rest of the walk home. Once you get to your home, he waits at the door expectantly. He clearly expects you to invite him in.'
 
 				gs 'willpower', 'sex', 'self', 'easy'
 				if will_cost <= pcs_willpwr:
@@ -55,7 +55,7 @@ elseif StasKafe = 1:
 				act 'Say goodbye':
 					cls
 					gs 'stat'
-					'You said goodbye to Stas and kissed him on the cheek. He was obviously disappointed that you did not invite him in, but he didn''t protest and left.'
+					'You say goodbye to Stas and kiss him on the cheek. He is obviously disappointed that you did not invite him in, but he doesn''t protest and leaves.'
 
 					act 'Close the door':gt 'korr'
 				end
@@ -63,18 +63,18 @@ elseif StasKafe = 1:
 		end
 	end
 
-	act 'Oh it''s so cute!':
+	act 'Oh that''s so cute!':
 		cls
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
-		'You are glad that you will not have to pay for the cafe and Stas made a sweeping gesture and threw the money to the waitress. Then stood up and gave you a hand. Leaning on his arm you walk out of the cafe arm and arm.'
+		'You are glad that you will not have to pay for the cafe. Stas makes a sweeping gesture and throws the money to the waitress, then stands up and gives you a hand. Leaning on him, you walk out of the cafe arm and arm.'
 
 		act 'Home':
 			cls
 			minut += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/stas/go.jpg"></center>'
-			'A bit tipsy you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly caught and helps steady you. Making sure you are alright, he helps support you the rest of the walk home. Once you get to your home, he waits at the door expectantly, he clearly expects you to invite him in. You debate inviting him in but feel it would snub him, after what he just spent and you are feeling a little indebted to him, he found you a job, he forked over the cafe, you smile and open the door wide to let him in.'
+			'A bit tipsy, you are unsteady on your feet. You stumble and nearly fall, but Stas gallantly catches you and helps steady you. Making sure you are alright, he helps support you the rest of the walk home. Once you get to your home, he waits at the door expectantly. He clearly expects you to invite him in. You debate inviting him in but feel it would snub him after what he just spent, and you are feeling a little indebted to him, especially since he already found you a job. You smile and open the door wide to let him in.'
 
 			act 'Invite him in':SStip = 0 & gt 'StasSex'
 		end
@@ -82,7 +82,7 @@ elseif StasKafe = 1:
 elseif StasKafe = 0:
 	'<center><b><font color="maroon">Cafe</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-	'You sat on a chair across the table from Stas, he waved over a waitress. When the waitress arrived, he ordered champagne and fruit. Order was brought over to your table quickly, Stas poured champagne in glasses and handed you one. "A toast to friendship."'
+	'You sit on a chair across the table from Stas. He waves over a waitress. When the waitress arrives, he orders champagne and fruit. The order is brought over to your table quickly. Stas pours champagne in glasses and hands you one. "A toast to friendship."'
 
 	act 'Drink for friendship':
 		cls
@@ -90,7 +90,7 @@ elseif StasKafe = 0:
 		pcs_horny += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
-		'You drink champagne and Stas started telling funny stories, while he kept refilling the glasses with champagne.'
+		'You drink champagne, and Stas starts telling funny stories, while he keeps refilling the glasses with champagne.'
 
 		act 'Drink and chat':
 			cls
@@ -101,7 +101,7 @@ elseif StasKafe = 0:
 			fat += 4
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
-			'You feel relaxed in Stas companing, drinking champagne you listen Stas regale you with tales. You were so caught up in the moment, you do not even notice Stas ordered another bottle. Finally you realize that you are already well on your way to being drunk. The music starts up in the cafe and Stas rises from his chair and gallantly offered you a hand.'
+			'You feel relaxed in Stas company. Drinking champagne, you listen to Stas regale you with tales. You are so caught up in the moment, you do not even notice Stas order another bottle. Finally, you realize that you are already well on your way to being drunk. The music starts up in the cafe, and Stas rises from his chair and gallantly offers you a hand.'
 
 			act 'Dance':
 				cls
@@ -109,7 +109,7 @@ elseif StasKafe = 0:
 				pcs_horny += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/activities/dance.jpg"></center>'
-				'You took his hand and he lead you to the dance floor. One hand on the small of your back and another grabbing you around the back of your thigh just below you butt. Slowly his hands creep down till he is squeezing your butt.'
+				'You take his hand, and he leads you to the dance floor, one hand on the small of your back and another grabbing you around the back of your thigh just below you butt. Slowly, his hands creep down till he is squeezing your butt.'
 
 				if pcs_horny < 100:
 					act 'Raise his hands up':
@@ -121,13 +121,13 @@ elseif StasKafe = 0:
 						'You reach down and pull both his hands up till they are on the small of your back as you dance with him.'
 
 						if pcs_horny < 100:
-							act 'Again raise his hands above':
+							act 'Again raise his hands up':
 								cls
 								minut += 1
 								pcs_horny += 10
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/pc/activities/dance.jpg"></center>'
-								'Once again you reach down and pull both his hands up till they are on the small of your back as you dance with him. Stas apparently is feeling a bit randy. With his hands on your back he began to gently stroking gently down your back to your ass again. Finally the dance is over.'
+								'Once again, you reach down and pull both his hands up till they are on the small of your back as you dance with him. Stas apparently is feeling a bit randy. With his hands on your back, he begins to gently stroke down your back to your ass again. Finally, the dance is over.'
 
 								act 'Sit at the table':StasKafe = 1 & gt $curloc
 							end
@@ -140,7 +140,7 @@ elseif StasKafe = 0:
 							gs 'stat'
 							
 							'<center><img <<$set_imgh>> src="images/characters/city/stas/event/dance2.jpg"></center>'
-							'You continued to dance and let him squeeze your butt. Soon one of his hands slips around in front of your thigh and between your legs. He raises his hand up and starts rubbing your clit. Suddenly, the dance was over and Stas leads you back to your table.'
+							'You continue to dance and let him squeeze your butt. Soon, one of his hands slips around in front of your thigh and between your legs. He raises his hand up and starts rubbing your clit. Suddenly, the dance is over, and Stas leads you back to your table.'
 
 							act 'Sit at the table':StasKafe = 2 & gt $curloc
 						end
@@ -154,16 +154,16 @@ elseif StasKafe = 0:
 					gs 'stat'
 					
 					'<center><img <<$set_imgh>> src="images/characters/city/stas/event/dance2.jpg"></center>'
-					'You continued to dance and let him squeeze your butt. Soon one of his hands slips around in front of your thigh and between your legs. He raises his hand up and starts rubbing your clit. Suddenly, the dance was over and Stas leads you back to your table.'
+					'You continue to dance and let him squeeze your butt. Soon, one of his hands slips around in front of your thigh and between your legs. He raises his hand up and starts rubbing your clit.'
 
 					if pcs_horny < 100:
-						act 'Raise his hands above':
+						act 'Raise his hands up':
 							cls
 							minut += 1
 							pcs_horny += 10
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/pc/activities/dance.jpg"></center>'
-							'Once again you reach down and pull both his hands up till they are on the small of your back as you dance with him. Stas apparently is feeling a bit randy. With his hands on your back he began to gently stroking gently down your back to your ass again. Finally the dance is over.'
+							'You reach down and pull both his hands up till they are on the small of your back as you dance with him. Stas apparently is feeling a bit randy. With his hands on your back, he begins to gently stroke down your back to your ass again. Finally, the dance is over.'
 
 							act 'Sit at the table':StasKafe = 2 & gt $curloc
 						end
@@ -176,7 +176,7 @@ elseif StasKafe = 0:
 						gs 'stat'
 						
 						'<center><img <<$set_imgh>> src="images/characters/city/stas/event/dance2.jpg"></center>'
-						'You continued to dance and let him squeeze your butt. Soon one of his hands slips around in front of your thigh and between your legs. He raises his hand up and starts rubbing your clit, after a moment he slips his hands inside of your panties and slips a finger inside of you. You moan gentle into his ear as he finger bangs you right out on the dance floor. Suddenly, the dance was over and Stas leads you back to your table.'
+						'You continue to dance and let him rub your clit. After a moment, he slips his hands inside of your panties and slips a finger inside of you. You moan gently into his ear as he finger bangs you right out on the dance floor. Suddenly, the dance is over, and Stas leads you back to your table.'
 
 						act 'Sit at the table':StasKafe = 2 & gt $curloc
 					end

+ 7 - 7
locations/StasSex.qsrc

@@ -1,7 +1,7 @@
 # StasSex
 if SStip = 0:
 	'<center><img <<$set_imgh>> src="images/characters/city/stas/sex/stas.jpg"></center>'
-	'You entered your apartment and immediately the two of you started kissing. He pulled down your top to expose your breasts, he began to fondle them as the two of you continued to kiss. He slowly pulled you into the bedroom as you continued to kiss.'
+	'You enter your apartment and immediately the two of you start kissing. He pulls down your top to expose your breasts, beginning to fondle them as the two of you continue to kiss, and slowly pulls you into the bedroom.'
 	gs 'boyStat', 'A50'
 
 	gs 'arousal', 'kiss', 5
@@ -10,20 +10,20 @@ if SStip = 0:
 	act 'Go into the bedroom':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/city/stas/sex/pov.jpg"></center>'
-		'On the way to the bedroom he manage to take off most of your clothes, he pushes you down on the bed and begins to undress himself while he keeps kissing you.'
+		'On the way to the bedroom, he manages to take off most of your clothes. He pushes you down on the bed and begins to undress himself while he keeps kissing you.'
 		gs 'stat'
 
 		act 'Next':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/stas/sex/sex.jpg"></center>'
-			'During the kissing he manages to get all your clothes off, as well as his own. He pushes your legs up, till your knees are pulled up against your chest. He rubs the tip of his dick against your pussy, which is already wet with desire. You moan in desire and try and lift yourself up to take him inside of you, but he keeps teasing you by just rubbing the tip against your pussy.'
+			'During the kissing, he manages to get all your clothes off, as well as his own. He pushes your legs up till your knees are pulled up against your chest. He rubs the tip of his dick against your pussy, which is already wet with desire. You moan and try to lift yourself up to take him inside of you, but he keeps teasing you by just rubbing the tip against your pussy.'
 			gs 'shortgs','undress'
 			npc_sex[$boy] += 1
 
-			'You feel like you almost can''t take the teasing anymore when he fully pushing himself inside of you, his <<dick>>cm <<$dick_girth>> dick fills your pussy up. He gentle fucks you, slowly working himself deeper into you, while he continues to kiss you and kneed your breasts, you moan in deep pleasure as the two of you make love.'
+			'You feel like you almost can''t take the teasing anymore when he fully pushes himself inside of you, his <<dick>>cm <<$dick_girth>> dick filling your pussy up. He gently fucks you, slowly working himself deeper into you while he continues to kiss you and kneed your breasts. You moan in deep pleasure as the two of you make love.'
 			gs 'dinsex','vaginal_sex',15,'sub'
 			$orgasm_or = 'yes'
-			$orgasm_txt = '<<$boydesc>> groans and you feel a jet of sperm spurt inside of your body, followed by several more.'
+			$orgasm_txt = '<<$boydesc>> groans, and you feel a jet of sperm spurt inside of your body, followed by several more.'
 			gs 'cum_call','',$boy,1
 			gs 'cuminsidereact',$boydesc
 			gs 'stat'
@@ -31,12 +31,12 @@ if SStip = 0:
 				*clr & cla
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/characters/city/stas/sex/aftersex.jpg"></center>'
-				'Stas rolls off you, you roll onto your side to rest your head on his chest. You can feel his sperm leaking out of your pussy. He gives you a one armed hug, while his other hand strokes your hair, while he looks deep into your eyes with love in his.  Stas say apologetically, "I''m sorry, I came inside of you, couldn''t resist." Then he rolled out of bed, getting up and starting to get dressed. "Well, I gotta go <<$pcs_nickname>>. I''ll see you later, ok." With that he gathers the rest of his stuff and heads out, you follow him to the door to see him out.'
+				'Stas rolls off you, and you roll onto your side to rest your head on his chest. You can feel his sperm leaking out of your pussy. He gives you a one armed hug while his other hand strokes your hair, and he looks deep into your eyes with love in his.  Stas say apologetically, "I''m sorry, I came inside of you, couldn''t resist." Then he rolls out of bed, getting up and starting to get dressed. "Well, I gotta go <<$pcs_nickname>>. I''ll see you later, ok." With that, he gathers the rest of his stuff and heads out. You follow him to the door to see him out.'
 
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Hold up the door':gt 'korr'
+				act 'Close the door':gt 'korr'
 			end
 		end
 	end

+ 157 - 99
locations/Vika.qsrc

@@ -2,24 +2,66 @@
 !2020/10/16/Gwen
 
 if $ARGS[0] = '':
-	vikaAge = age + 1
 	gs'stat'
-	'<center><B><font color=maroon>Vika Kirilova</font></B></center>'
 	if vika_sleep = 1:
-		gs 'Vika', 'asleep'
+		gs 'Vika', 'text', 'asleep'
+		gs 'Vika', 'actions', 'asleep'
+	else
+		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
+			b_vika_present_Day = daystart
+			gs 'Vika', 'text', 'awake', 'birthday'
+			gs 'Vika', 'actions', 'awake', 'birthday'
+		else
+			gs 'Vika', 'text', 'awake'
+			gs 'Vika', 'actions', 'awake'
+		end
+	end
+end
+
+if $ARGS[0] = 'text':
+	*clr
+	gs'stat'
+	'<center><B><font color=maroon>Vika Kirilova</font></B></center>'
+	if $ARGS[1] = 'asleep':
+		gs 'Vika', 'asleep_text'
+	elseif $ARGS[1] = 'awake':
+		gs 'Vika', 'awake_text', $ARGS[2]
+	end
+end
+
+if $ARGS[0] = 'actions':
+	cla
+	gs'stat'
+	if $ARGS[1] = 'asleep':
+		gs 'Vika', 'asleep_actions'
+	elseif $ARGS[1] = 'awake':
+		gs 'Vika', 'awake_actions', $ARGS[2]
+	end
+end
+
+if $ARGS[0] = 'asleep_text':
+	minut += 5
+	if vikaslut = 1:
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep_b.jpg" ></center>'
+		'Vika is sleeping in her bed, naked. You wonder what she did in the brothel tonight to pay for her tuition.'
 	else
-		gs 'Vika', 'awake'
+		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep.jpg" ></center>'
+		'Vika is sleeping in her bed after a night of adventures. While watching her, you wonder what all she got up to tonight.'
 	end
 end
 
-if $ARGS[0] = 'awake':
+if $ARGS[0] = 'asleep_actions':
+	act '<B>Move away</B>':gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'awake_text':
 	!! Display different image during birthday event.
-	if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
+	if $ARGS[1] = 'birthday':
 		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika1.jpg" ></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big220.jpg" ></center>'
 	end
-	'Your university roommate is Vika Kirilova. She is <<vikaAge>> years old. She comes from a town much further away than yours, and like you, she comes from a poor family.'
+	'Your university roommate is Vika Kirilova. She is <<age + 1>> years old. She comes from a town much further away than yours, and like you, she comes from a poor family.'
 	if vikaslut = 1:
 		'You know Vika works as a whore in a brothel in the red light district.'
 	else
@@ -39,87 +81,117 @@ if $ARGS[0] = 'awake':
 	end
 	''
 
-	if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
-		gs 'Vika', 'birthday'
-	else
-		gs 'Vika', 'normal_day'
+	if $ARGS[1] = 'birthday':
+		'You don''t have time to say a word before Vika practically pounces on you.'
+		'"There is my favorite birthday girl, happy birthday!" she screeches as she hugs and kisses you on the cheek.'
+		'"Wow! This is so unexpected," you reply.'
+		'"Here''s a present for you." Vika gives you a box. Inside is a silk pale blue sheer teddy.'
+		'"Oh, Vika, this is too much. It''s way too expensive of a gift." You are flattered she would give you such a nice gift.'
+		'"Relax and put it on, come on. The least you could do is model it for me," Vika says in a commanding voice, winking at you.'
+		'You''re a little embarrassed, but you quickly strip off your clothes until you are naked and put the teddy on. It looks even more sheer on your body. It hides absolutely nothing, your nipples, even your pussy lips are clearly visible. You turn and model it for Vika, a nice gift but definitely not for everyday life gift.'
+		'"You look great, it fits nice, good! I was worried it wouldn''t fit as I had to guess your size. Here put this on. We need to go to your other present." Vika throws you a bathrobe and grabs you by the arm and drags you out of the room as you struggle to get the robe on in time.'
 	end
-end
 
-if $ARGS[0] = 'asleep':
-	minut += 5
-	if vikaslut = 1:
-		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep_b.jpg" ></center>'
-		'Vika is sleeping in her bed, naked. You wonder what she did in the brothel tonight to pay for her tuition.'
-	else
-		'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep.jpg" ></center>'
-		'Vika is sleeping in her bed after a night of adventures. While watching her, you wonder what all she got up to tonight.'
-	end
-	act '<B>Move away</B>':gt $loc, $loc_arg
+	gs 'Vika', 'leave_for_night'
 end
 
-if $ARGS[0] = 'normal_day':
-	act '<B>Move away</B>':gt $loc, $loc_arg
+if $ARGS[0] = 'awake_actions':
+	if $ARGS[1] = 'birthday':
+		act 'Where are we heading?': gt 'univer_din', 'b_vika_present_start'
+	else
+		act '<B>Move away</B>':gt $loc, $loc_arg
 
-	if hour < 20:
-		act 'Chat with Vika (00:15)':
-			cla
-			minut += 15
-			if vikachatday ! daystart: npc_rel['A220'] += 3
-			vikachatday = daystart
-			talkrand = RAND(0,10)
-			if talkrand = 0:
-				'You start talking with Vika. She tells you about the boys she''s met, about parties, about cosmetics.'
-			elseif talkrand = 1:
-				'Vika says she was in this cafe and got invited to dance by a guy who then paid her bill.'
-			elseif talkrand = 2:
-				'Vika says that working as a stripper in the strip club is a rather profitable job for students, although clients are very grabby.'
-			elseif talkrand = 3:
-				'Vika tells you that a few girls from the track team at the university go to the European level sports competitions and earn big money, though of course Vika admits that she is too lazy to put in the effort to make the team.'
-			elseif talkrand = 4:
-				'Vika says that one of her friends who''s a guy did not pull out in time and came inside of her. But Vika is smarter than that. She buys birth control pills at the pharmacy control. Then it doesn''t matter if the guy pulls out or wears a condom.'
-			elseif talkrand = 5:
-				'Vika says in the park, she accidentally went to an area and was offered money for sex.'
-			elseif talkrand = 6:
-				'Vika tells how she did a nude photo shoot at the photography studio, but it is bad for your reputation to do.'
-			elseif talkrand = 7:
-				'Vika tells a horror story about how a nice girl did not wash or shave, then she began to smell so terrible and got a vaginal infection.'
-			elseif talkrand = 8:
-				'Vika says that she buys tampons and always keeps a reserve of them even if she is on the birth control shot.'
-			elseif talkrand = 9:
-				'Vika tells how one of her guys likes anal sex, but she didn''t have any lube, but let him fuck her anyways. She tells you how it hurt a lot at first but then she started to like it anyways.'
+		if func('bordel', 'is_open') = 0:
+			if $ARGS[1] = 'chat':
+				act 'Continue chatting (0:15)':gs 'Vika', 'talk', 'chat'
 			else
-				'Vika tells how she was sunbathing in the summer on the beach and that she needed to buy a new swimsuit. Having one is useful in winter too for using the pool, which is a great way to keep yourself in good shape.'
+				act 'Chat with Vika (0:15)':gs 'Vika', 'talk', 'chat'
 			end
 
-			act 'Finish': gt 'Vika'
-		end
-		act 'Study with Vika (1:00)':
-			cla
-			minut += 60
-			intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
-			npc_rel['A220'] += 1
-			'You get out your textbooks and notes, while you and Vika sit down together on the bed to study. You help each other with your classwork, making it much easier and more fun to study.'
-
-			act 'Finish':gt'Vika'
-		end
+			if $ARGS[1] = 'study':
+				act 'Continue studying (1:00)':gs 'Vika', 'talk', 'study', 'continue'
+			else
+				act 'Study with Vika (1:00)':gs 'Vika', 'talk', 'study'
+			end
 
-		if vikasex > 0 and npc_rel['A220'] > 40:
-			gs 'willpower', 'cuni', 'self', 'easy'
-			if will_cost <= pcs_willpwr:
-				act 'Suggest you do something fun (<<will_cost>> Willpower)':
-					gs 'willpower', 'pay', 'self'
-					minut += 60
-					npc_rel['A220'] += 5
-					$sexloc = 'obroom'
-					gt'lezbsex','start'
+			if vikasex > 0 and npc_rel['A220'] > 40:
+				gs 'willpower', 'cuni', 'self', 'easy'
+				if will_cost <= pcs_willpwr:
+					act 'Suggest you do something fun (<<will_cost>> Willpower)':
+						gs 'willpower', 'pay', 'self'
+						minut += 60
+						npc_rel['A220'] += 5
+						$sexloc = 'obroom'
+						gt'lezbsex','start'
+					end
+				else
+					act 'Suggest you do something fun (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-			else
-				act 'Suggest you do something fun (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 
-		if npc_rel['A220'] > 80 and vikaslut = 0:
+		gs 'Vika', 'brothel_questions'
+	end
+end
+
+if $ARGS[0] = 'talk':
+	gs 'Vika', 'text', 'awake', $ARGS[1]
+	if $ARGS[1] = 'chat':
+		gs 'Vika', 'chat', RAND(0,10)
+	elseif $ARGS[1] = 'study':
+		gs 'Vika', 'study', $ARGS[2]
+	end
+	gs 'Vika', 'actions', 'awake', $ARGS[1]
+	gs 'Vika', 'leave_for_night'
+end
+
+if $ARGS[0] = 'chat':
+	minut += 15
+	if vikachatday ! daystart: npc_rel['A220'] += 3
+	vikachatday = daystart
+	gs 'stat'
+
+	if ARGS[1] = 0:
+		'You start talking with Vika. She tells you about the boys she''s met, about parties, about cosmetics.'
+	elseif ARGS[1] = 1:
+		'Vika says she was in this cafe and got invited to dance by a guy who then paid her bill.'
+	elseif ARGS[1] = 2:
+		'Vika says that working as a stripper in the strip club is a rather profitable job for students, although clients are very grabby.'
+	elseif ARGS[1] = 3:
+		'Vika tells you that a few girls from the track team at the university go to the European level sports competitions and earn big money, though of course Vika admits that she is too lazy to put in the effort to make the team.'
+	elseif ARGS[1] = 4:
+		'Vika says that one of her friends who''s a guy did not pull out in time and came inside of her. But Vika is smarter than that. She buys birth control pills at the pharmacy control. Then it doesn''t matter if the guy pulls out or wears a condom.'
+	elseif ARGS[1] = 5:
+		'Vika says in the park, she accidentally went to an area and was offered money for sex.'
+	elseif ARGS[1] = 6:
+		'Vika tells how she did a nude photo shoot at the photography studio, but it is bad for your reputation to do.'
+	elseif ARGS[1] = 7:
+		'Vika tells a horror story about how a nice girl did not wash or shave, then she began to smell so terrible and got a vaginal infection.'
+	elseif ARGS[1] = 8:
+		'Vika says that she buys tampons and always keeps a reserve of them even if she is on the birth control shot.'
+	elseif ARGS[1] = 9:
+		'Vika tells how one of her guys likes anal sex, but she didn''t have any lube, but let him fuck her anyways. She tells you how it hurt a lot at first but then she started to like it anyways.'
+	else
+		'Vika tells how she was sunbathing in the summer on the beach and that she needed to buy a new swimsuit. Having one is useful in winter too for using the pool, which is a great way to keep yourself in good shape.'
+	end
+end
+
+if $ARGS[0] = 'study':
+	minut += 60
+	intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
+	npc_rel['A220'] += 1
+	gs 'stat'
+
+	iif($ARGS[1] = 'continue', 'You and Vika continue studying together.', 'You get out your textbooks and notes, while you and Vika sit down together on the bed to study.') + ' You help each other with your classwork, making it much easier and more fun to study.'
+end
+
+if $ARGS[0] = 'leave_for_night':
+	if func('bordel', 'is_open'):'Vika tells you she needs to ' + iif(vikaslut = 1, 'leave for work at the brothel.', 'get going.')
+end
+
+if $ARGS[0] = 'brothel_questions':
+	if npc_rel['A220'] > 80:
+		if vikaslut = 0:
 			act 'Ask where she goes at night':
 				cla
 				minut += 30
@@ -135,35 +207,21 @@ if $ARGS[0] = 'normal_day':
 
 				act 'Follow Vika': gt 'bordelv', 'start'
 			end
-		elseif npc_rel['A220'] > 80 and vikaslut = 1 and bordel = 0:
-			act 'Ask about work':
-				cla
-				npc_rel['A220'] += 5
-				bordel = 1
-				odkomp = 0
-
-				'"Do you think you could get me a job at the brothel?" you ask.'
-				'"Well I can ask the manager, but I can''t guarantee anything. Come by after 20:00, and I''ll see what I can do."'
+		elseif vikaslut = 1:
+			if bordel = 0:
+				act 'Ask if she can get you a job at the brothel':
+					delact 'Ask if she can get you a job at the brothel'
+					npc_rel['A220'] += 5
+					bordel = 1
+					odkomp = 0
 
-				act 'Finish': gt 'Vika'
+					'"Do you think you could get me a job at the brothel?" you ask.'
+					'"Well I can ask the manager, but I can''t guarantee anything. Come by' + iif(hour < 20, ' after 20:00', '') + ', and I''ll see what I can do."'
+				end
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'birthday':
-	b_vika_present_Day = daystart
-	'You don''t have time to say a word before Vika practically pounces on you.'
-	'"There is my favorite birthday girl, happy birthday!" she screeches as she hugs and kisses you on the cheek.'
-	'"Wow! This is so unexpected," you reply.'
-	'"Here''s a present for you." Vika gives you a box. Inside is a silk pale blue sheer teddy.'
-	'"Oh, Vika, this is too much. It''s way too expensive of a gift." You are flattered she would give you such a nice gift.'
-	'"Relax and put it on, come on. The least you could do is model it for me," Vika says in a commanding voice, winking at you.'
-	'You''re a little embarrassed, but you quickly strip off your clothes until you are naked and put the teddy on. It looks even more sheer on your body. It hides absolutely nothing, your nipples, even your pussy lips are clearly visible. You turn and model it for Vika, a nice gift but definitely not for everyday life gift.'
-	'"You look great, it fits nice, good! I was worried it wouldn''t fit as I had to guess your size. Here put this on. We need to go to your other present." Vika throws you a bathrobe and grabs you by the arm and drags you out of the room as you struggle to get the robe on in time.'
-
-	act 'Where are we heading?': gt 'univer_din', 'b_vika_present_start'
-end
-
 --- Vika ---------------------------------
 

+ 1 - 1
locations/VolleyTrenCentr.qsrc

@@ -75,7 +75,7 @@ elseif ShowerIvan = 5 and centr = 2:
 								cla & *clr
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak17.jpg"></center>'
 								'"He almost ended up in jail, but the officials decided to avoid a scandal and just kicked Mikhail off of the team," Guang concluded his story.'
-								'"Now I understand why coach shies away from me whenever we start to get close," you think to yourself.'
+								+$OpenInnerThought+'"Now I understand why coach shies away from me whenever we start to get close,"'+$CloseInnerThought+'you think to yourself.'
 								act 'Move away':gt 'fit', 'start'
 							end
 						end

+ 435 - 0
locations/Voltrener - WIP.qsrc

@@ -0,0 +1,435 @@
+# Voltrener
+
+!! vball['coachsex'] = 1 - He has given you massages
+!! vball['coachsex'] = 2 - He has given you naked massages
+!! vball['coachsex'] = 3 - You have given him a handjob
+!! vball['coachsex'] = 4 - You have given him a blowjob
+!! vball['coachsex'] = 5 - You''ve done anal
+!! vball['coachsex'] = 6 - You''ve fucked
+!! vball['coachsex'] = 7 - You''ve slept over at his place
+!! vball['coachsex'] = 8 - You are in a relationship with him
+
+CLOSE ALL
+gs 'stat'
+
+if $ARGS[0] = 'start':
+	gs 'boyStat', 'A69'
+	if $npc_nickname['A29'] = '':$npc_nickname['A29'] = 'Coach Mikhail'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+	*nl
+	'You enter the coach''s office in which there are cups, balls, sports equipment, a massage table, and a desk where the coach sometimes sits and does paperwork. <<$npc_nickname[''A29'']>> Vlasov does not only teach amateur volleyball but he also coaches a professional volleyball team.'
+	*nl
+	'The coach looks up as you come in.'
+	if npc_rel['A69'] < 80:
+		'"Yes?"'
+	else
+		'"<<$pcs_nickname>>! What''s up?"'
+	end
+
+	act 'Leave':gt 'gdksport', 'start'
+	act 'Talk with the coach':gt'Voltrener', 'talk'
+end
+
+
+if $ARGS[0] = 'talk':
+	*clr & cla
+	gs 'stat'
+	npc_rel['A69'] += rand(0,1)
+	if pcs_apprnc >= 60: vball['coach_lust'] += rand(0,1)
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+	*nl
+	if vball['team'] = 0:
+		if npc_rel['A69'] <= 0:
+			'"Ugh, what do you want <<$pcs_lastname>>?"'
+		elseif npc_rel['A69'] < 20:
+			'"Do you need to talk to me right now <<$pcs_lastname>>? I''m very busy with the team."'
+		elseif npc_rel['A69'] < 40:
+			'"Yes, <<$pcs_lastname>>? Did you need something?"'
+		elseif npc_rel['A69'] < 60:
+			'"Yes, <<$pcs_lastname>>? Can I help you with something?"'
+		elseif npc_rel['A69'] < 80:
+			'"Of course, <<$pcs_lastname>>. I always have time for you. Need help with anything?"'
+		else
+			'"Of course, <<$pcs_nickname>>! I always have time for you."'
+		end
+	elseif vball['team'] > 1:
+		if vball['coachsex'] > 0:
+			if vball['coachsex'] = 1:
+				'"Of course, <<$pcs_lastname>>.'
+			elseif vball['coachsex'] = 2:
+			
+			elseif vball['coachsex'] = 3:
+			
+			elseif vball['coachsex'] = 4:
+			
+			end
+		else
+			if vball['coach_lust'] >= 80:
+				'Coach can''t take his eyes of you and he keeps making sexual references in your presence.'
+			elseif vball['coach_lust'] >= 60:
+				'Coach sometimes makes lewd comments around you and you often catch him ogling your body.'
+			elseif vball['coach_lust'] >= 40:
+				'Coach seems more interested in watching you practice than the other girls.'
+			elseif vball['coach_lust'] >= 20:
+				'Sometimes you can see Coach Mikhail looking your body up and down.'
+			elseif vball['coach_lust'] > 0:
+				'You occasionally catch Coach looking at you a second longer than he should.'
+			end
+		end
+		if npc_rel['A69'] < 80:
+			'"What is it <<$pcs_lastname>>? Did you need help with something?"'
+		else
+			'"<<$pcs_nickname>>! What''s up?"'
+		end
+		
+	end
+	act 'Leave':gt 'gdksport', 'start'
+	act'Check on your stats':
+		*nl
+		if vball['coachsex'] = 0:
+			vball['coach_lust'] += 1
+			'Coach looks at you, "<<$pcs_lastname>>. Here''s your stats, now go out there and work harder."'
+			'"Your volleyball skill is <<pcs_vball>>, the team has played <<volsesongame>> games: Won - <<volsesonwin>>, lost - <<volsesonloss>>."'
+		else
+			'Coach looks at you "Hey <<$pcs_nickname>>. Checking up on your stats?."'
+			'"Your volleyball skill is <<pcs_vball>>, the team has played <<volsesongame>> games: Won - <<volsesonwin>>, lost - <<volsesonloss>>."'
+		end
+	end
+	if npc_rel['A69'] < 80:
+		act'Ask him about his personal life':
+			*nl
+			'"I don''t think that''s any of your business <<$pcs_lastname>>."'
+		end
+	else
+		act'Ask him what he loves about volleyball':
+		
+		if vball['coach_wife'] = 0:
+			act'Ask him if he has a girlfriend':
+			
+		elseif vball['coach_wife'] = 1:
+			act'Ask him about his wife':
+		
+		elseif vball['coach_wife'] >= 2:
+			act'Ask him more about his wife':
+			
+		end
+		
+		act'Ask about where he lives':
+		
+		act'Ask him what he loves about volleyball':
+	end
+	act'Flirt with him':
+		cla & *clr
+		!! IMAGE LINK
+		vball['coach_lust'] += rand(1,3)
+		'Placeholder text'
+	end
+	act'Ask him for a masssage':
+		cla & *clr
+		!! IMAGE LINK
+		if vball['coachsex'] < 1:
+			'"Hey Coach, I''m feeling kind of stiff after practice. Could you maybe... give me a massage? Help work out the kinks in my muscles?"'
+			if vball['coach_lust'] >= 60:
+				'A hungry glint appears in his eyes and you can see him imagining his hands all over your body.'
+				'"Yes... muscular health is... important... Why don''t you come into the back here?" he says, gesturing towards a door at the back of his office. "I have a massage table back there. It''ll be much more effective than in a chair."'
+				act'Chicken out':
+					cla & *clr
+					!! IMAGE LINK
+					'You take a step towards him and suddenly hesitate.'
+					*nl
+					'<i>Are you really going to do this?</i>'
+					*nl
+					'"ActuallyIthinkI''mfineI''llseeyouatpracticeCoach!"'
+					*nl
+					'Spewing out a torrent of words, you rush out the door and slam it shut behind you.'
+					*nl
+					'<i>What were you thinking?</i>'
+					act'Continue':gt'gdksport','start'
+				end
+				
+				act'Follow him':gt'Voltrener','massage'
+			elseif vball['coach_lust'] >= 30
+				'You see his gaze roam up and down your body and for a moment, you think he might be considering it before he suddenly looks away.'
+				'"No, you just need... rest. Don''t bother me right now <<$pcs_lastname>>."'
+				'He immediately turns back towards whatever he was working on on his desk.'
+				*nl
+				'<i>Tch. So close.</i>'
+				act'Continue':gt'gdksport','start'
+			else
+				'"No <<$pcs_lastname>>, you just need rest. Go home. Don''t bother me with this."'
+				'He doesn''t even give you another look as he continues looking at his stats.'
+				act'Continue':gt'gdksport','start'
+			end
+		elseif vball['coachsex'] >= 1:
+	end
+	if vball['coachsex'] > 0:
+		act'Ask him if he''d like some "relief"':
+		
+		end
+		
+		
+		act'Ask him for some "relief"':
+		
+		end
+	end
+end
+
+
+if $ARGS[0] = 'massage':
+	!! IMAGE LINK
+	'You follow <<$npc_nickname[''A29'']>> into the back of his office. It has a massage table on it as well as a multitude of medical supplies for various kinds of sports injuries.'
+	'"Lay down on the table <<$pcs_lastname>>," he says, turning away for a moment to get something.'
+	act'Lay down':
+		cla & *clr
+		!! IMAGE LINK
+		'You do as he says, laying face down on the table.'
+		*nl
+		'He comes up behind you and you can feel his hands on your shoulders.'
+		*nl
+		'"Just try and relax..."'
+		act'Continue':
+			vball['coach_massage'] += 1
+			cla & *clr
+			!! IMAGE LINK
+			if vball['coach_massage'] = 1:
+				'The next half hour is spent under the coach''s ministrations.'
+				*nl
+				'Involuntary gasps are drawn from you as he kneads his hands into your muscles. He knows exactly where to apply pressure, how to run his hand along your aching muscles. Your breath can''t help but hitch from his touch, and you feel a deep warmth spreading from between your legs.'
+				*nl
+				$orgasm_txt = 'Despite the fact that it''s just a massage you can''t help but be aroused. Arousal builds to excitement, and before you know it you find yourself quivering in orgasm, biting hard on your lip to keep from crying out. "Are you feeling okay <<$pcs_lastname>>? Something wrong?" You simply shake your head in response, not trusting yourself to speak.'
+				gs 'arousal','massage', 30
+				act'Finish':gt'Voltrener','massage_end'
+			elseif vball['coach_massage'] <= 4:
+				'It''s just as good as last time. You groan in pleasure as the coach''s hands work through your sore muscles, gasping when he hits those perfect spots that can''t help but turn you on.'
+				*nl
+				'Through the process, you can''t help but notice moments when <<$npc_nickname[''A29'']>> takes advantage of the situation. When massaging your sides, his fingers press into your breasts. In addition to when he works his perfect pressure points, a gasp is elicited when he grabs a handful of ass on the way down to your legs. And this time he spends a lot more time massaging your thighs, especially on the inside. Makes you wonder if he notices your spreading wetness in return.'
+				*nl
+				$orgasm_txt = 'Eventually you can''t take it anymore, and you find yourself climaxing under his touch. Even as every muscle in your body tenses up again, he doesn''t let up. "You''re <i>very</i> tight <<$pcs_lastname>>. You need to loosen up some more." Breathing slowly, you choose not to respond.'
+				gs 'arousal','massage', 25
+				gs 'arousal','foreplay', 5
+				act'Finish':gt'Voltrener','massage_end'
+			elseif vball['coach_massage'] = 5:
+				'He''s starting to get bolder now.'
+				*nl
+				'<<$npc_nickname[''A29'']>>''s hands roam your body freely, openly and brazenly copping a feel of you wherever he pleases. You swear, half this "massage" is spent groping you instead. Not that it matters to you. It feels good.'
+				*nl
+				'When he squeezes your breasts. When his hands spread your ass cheeks. When his fingers run up and down your snatch.'
+				*nl
+				'You allow your eyes to roll back as you relax into sensual bliss.'
+				*nl
+				$orgasm_txt = 'When your climax comes, you don''t even try to hide it. It starts as soft grunts before becoming loud moans and then a gasping cry as you cum hard, your clit fingered through your pants as you ride out your orgasm.'
+				gs 'arousal','massage', 15
+				gs 'arousal','foreplay', 15
+				act'Finish':gt'Voltrener','massage_end'
+			else
+				'<<$npc_nickname[''A29'']>>''s hands roam your body freely and you moan in response to his touch. Half massage, half foreplay, you enjoy yourself while <<$npc_nickname[''A29'']>> enjoys your body. Sore muscles are worked loose and erogenous zones are teased and played with. Through one way or another, you find yourself supremely relaxed.'
+				*nl
+				'You allow your eyes to roll back as you relax into sensual bliss.'
+				*nl
+				$orgasm_txt = 'Under <<$npc_nickname[''A29'']>>''s magic touch, you find yourself gasping in orgasm in no time at all.'
+				gs 'arousal','massage', 15
+				gs 'arousal','foreplay', 15
+				act'Finish':gt'Voltrener','massage_end'
+			end
+		end
+	end
+	
+	act'Take off your clothes first':
+		cla & *clr
+		!! IMAGE LINK
+		
+	end
+end
+
+!! gs 'arousal','end'
+
+if $ARGS[0] = 'massage_end':
+	pcs_stam += 20
+	pcs_mood += 20
+	!! IMAGE LINK
+	'"There, all done," <<$npc_nickname[''A29'']>> says, drawing his hands back.'
+	if vball['coach_massage'] = 1:
+		'You roll your shoulders and stretch, sighing in relief at your loosened muscles.'
+	elseif vball['coach_massage'] <= 4:
+		'You roll your shoulders and stretch, sighing in relief at your loosened muscles, rolling your hips in relaxed arousal.'
+	else
+		'You roll your shoulders and stretch, sighing in relief at your loosened muscles, making eye contact with him as you adjust your clothes around your breasts and tug on your waistband around your hips.'
+	end
+	'"Feel better now?"'
+	act'Much better':
+		cla & *clr
+		!! IMAGE LINK
+		'"Much better," you say, stretching your arms behind your back so your breasts push out against your top, heavily emphasizing your stiff nipples. "Thanks for the massage Coach."'
+		'"You''re welcome <<$pcs_lastname>>. Now hit the showers."'
+		act'Yes Coach':gt'gdksport','start'
+		
+		act'Gonna join me?':
+			cla & *clr
+			!! IMAGE LINK
+			'"Gonna join me?" you smirk heading towards the door.'
+			*nl
+			if vball['coachsex'] >= 3:
+				'You yelp when you feel a hand fiercely slap across your ass, jumping on contact. You glare back at <<$npc_nickname[''A29'']>>. His expression is neutral but for a childish glint in his eye.'
+				'"I can play games too, <<$pcs_lastname>>." You shrug and give a wistful smile before exiting out the door.'
+			else
+				'Looking back over your shoulder you can see his gaze roaming your body, obviously tempted by your offer.'
+				'"Nobody likes a tease, <<$pcs_lastname>>," he sighs.'
+				'"You know you love it," you say, slipping out the door.'
+			end
+			act'Continue':gt'gdksport','start'
+		end
+	end
+	
+	act'Offer him some relief in return':
+		cla & *clr
+		!! IMAGE LINK
+		'"I feel great <<$npc_nickname[''A29'']>>. Maybe I could..." you step in close to him, putting your hands on his chest. "... do something for you now...?"'
+		if vball['coachsex'] = 3:
+			
+		elseif vball['coachsex'] >= 4:
+			
+		elseif vball['coach_lust'] >= 60 and npc_rel['A69'] >= 80:
+			'"Like what?"'
+		elseif vball['coach_lust'] >= 40 and npc_rel['A69'] >= 80:
+			'You see him hesitate, seriously considering doing something with you. A moment later, he puts his hands on your shoulders and gently pushes you away.'
+			'"<<$pcs_nickname>>. We can''t do this."'
+			'"Why not?"'
+			'"We just... can''t." He takes a further step away from you. "You need to go. Now."'
+			'You sigh in dejection, moving out the door without another word.'
+			act'Leave':gt'gdksport','start'
+		else
+			'"What are you doing <<$pcs_lastname>>?"'
+			act'Nothing':
+				cla & *clr
+				!! IMAGE LINK
+				'"Nothing," you say innocently. "I just wondered if-"'
+				'You''re cut off when <<$npc_nickname[''A29'']>> abruptly pushes you back.'
+				'"Enough <<$pcs_lastname>>. Get out."'
+				'"But-"'
+				'"<b>Out.</b>'
+				'You sigh in dejection, moving out the door without another word.'
+				act'Leave':gt'gdksport','start'
+			end
+			
+			act'Paying you back for your massage':
+				cla & *clr
+				!! IMAGE LINK
+				'"I just really appreciated the massage," you say. "I want to pay you back for it. Maybe with-"'
+				'You''re cut off when <<$npc_nickname[''A29'']>> abruptly pushes you back.'
+				'"Enough <<$pcs_lastname>>. Get out."'
+				'"But-"'
+				'"<b>Out.</b>'
+				'You sigh in dejection, moving out the door without another word.'
+				act'Leave':gt'gdksport','start'
+			end
+			
+			act'Seducing you':
+				cla & *clr
+				!! IMAGE LINK
+				vball['coach_lust'] += 20
+				'"Seducing you of course."'
+				'You run your hands down his chest, biting your lip as you stare into his eyes, just before swiftly grabbing his crotch.'
+				if vball['coach_lust'] < 60 or npc_rel['A69'] < 80:
+					npc_rel['A69'] -= 15
+					'He immediately jerks back, shoving you away.'
+					'"What the hell <<$pcs_lastname>>!"'
+					'"I told you what I was doing," you smile back. "I''m sedu-"'
+					'"ENOUGH!" he shouts, shocking you backwards.'
+					'"You don''t know what you''re starting here. I''m a married man. You''re <<age>>. You can''t do this. Now get out."'
+					'"But-"'
+					'"OUT!"'
+					'Taken aback by his anger, you shrink away and leave his office. You can only hope this hasn''t damaged your relationship with him too much.'
+					act'Leave':gt'gdksport','start'
+				else
+					'Mikhail''s body tenses up but he doesn''t move. It gives you a great opportunity to feel his rock hard erection beneath his clothes.'
+					'"I want you," you whisper under your breath. "Don''t you want me too?"'
+					'"I... This is..." He hesitates.'
+					act'Pull out his cock':
+						if vball['coachsex'] < 3:vball['coachsex'] = 3
+						gs 'arousal','kiss',3
+						gs 'arousal','hj',rand(3,5)
+						cla & *clr
+						!! IMAGE LINK
+						'You slip your hand into his waistband and draw out his <<dick>>cm cock. At the same time, you lean into him, drawing a kiss from his lips. You slowly jerk up and down the length of his manhood while your tongues explore each other''s mouths.'
+						*nl
+						'After a few minutes, you feel him begin to tense up and you sense he''s about to cum.'
+						act'Keep jerking him off':
+							gs 'cum_call','hands','A69',1
+							cla & *clr
+							!! IMAGE LINK
+							'You keep jerking him off until you feel hot liquid spill all over your fingers, never for a moment breaking the kiss.'
+							*nl
+							'Eventually his cock stops pulsing and you finally end the kiss, looking down at your sticky cum covered hand and the mess on the floor.'
+							*nl
+							'"Feel better now?" you smile at <<$npc_nickname[''A29'']>>.'
+							'"Much better..." he says, leaning down to kiss you one more time. Then he grabs your ass without warning, eliciting a gasp from you. "Now clean that up and get out of my office before somebody finds us like this."'
+							act'Clean up':
+								cumspclnt = 9
+								gs 'cum_cleanup'
+								gs 'arousal','end'
+								cla & *clr
+								!! IMAGE LINK
+								'"Yes Coach," you grin.'
+								*nl
+								'You quickly clean the cum up off the floor, wiping your hand with a tissue while you''re at it. Once that''s done, you move over to him and share one more kiss before quietly leaving his office.'
+								*nl
+								'<i>Maybe this will be the start of something else...</i>'
+								act'Leave':gt'gdksport','start'
+							end
+							
+							act'Lick your hand clean':
+								cla & *clr
+								!! IMAGE LINK
+								cumspclnt = 9
+								gs 'cum_cleanup'
+								swallow += 1
+								gs 'arousal','end'
+								cla & *clr
+								!! IMAGE LINK
+								'"Yes Coach," you grin, staring at him while you lick the cum from your fingers. You don''t break eye contact until every drop is gone. Afterwards, you take a nearby tissue and clean up the mess you made on the floor as well.'
+								*nl
+								'Finally, you move over to <<$npc_nickname[''A69'']>> and give him one more gentle kiss before departing his office.'
+								*nl
+								'<i>Maybe this will be the start of something else...</i>'
+								act'Leave':gt'gdksport','start'
+							end
+						end
+					end
+					act'Kneel down':
+						if vball['coachsex'] < 4:vball['coachsex'] = 4
+						cla & *clr
+						'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj2.mp4"></video></center>'
+						'You kneel in front of <<$npc_nickname[''A69'']>>, pulling his pants with you on your way down to reveal a fully erect <<dick>>cm cock.'
+						act'Suck his cock':
+							gs 'arousal','bj',rand(3,10)
+							cla & *clr
+							'<center><video autoplay loop src="images/shared/sex/blowjob/bj45.mp4"></video></center>'
+							'You quickly get to work, working his shaft with your hand and mouth. The initial rigidity of his body begins to fade, as if you were sucking his tension and apprehension out through his cock. After several minutes of gently blowing him, he tenses up again, though you can imagine this time it''s for different reasons.'
+							act'Jerk him onto your face':
+							
+							end
+							
+							act'Keep sucking':
+							
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+	
+	act'I need more (seduce him)':
+		cla & *clr
+		!! IMAGE LINK
+		
+	end	
+end
+
+if $ARGS[0] = 'naked_massage':
+
+
+
+end
+--- Voltrener ---------------------------------
+

+ 8 - 5
locations/Voltrener.qsrc

@@ -60,8 +60,9 @@ if $ARGS[0] = 'Lariska':
 		if will_cost <= pcs_willpwr:
 			act 'Convince Mikhail to let Lariska play (<<will_cost>> Willpower)':
 				cla
-				LariskaProfi = 1
+				LariskaQW['volleyball'] = 1
 				lariskalove += 1
+				killvar 'lariskaTrain'
 				npc_rel['A13'] += 20
 				gs 'willpower', 'pay', 'force'
 				gs'stat'
@@ -80,8 +81,9 @@ if $ARGS[0] = 'Lariska':
 			act 'Convince Mikhail to let both of you join the team (<<will_cost>> Willpower)':
 				cla
 				volleysostav = 1
-				LariskaProfi = 1
+				LariskaQW['volleyball'] = 1
 				lariskalove += 1
+				killvar 'lariskaTrain'
 				npc_rel['A13'] += 20
 				if npc_rel['A69'] > 30:npc_rel['A69'] = 30
 				gs 'willpower', 'pay', 'force'
@@ -100,8 +102,9 @@ if $ARGS[0] = 'Lariska':
 		if will_cost <= pcs_willpwr:
 			act 'Convince Mikhail to let Lariska play (<<will_cost>> Willpower)':
 				cla
-				LariskaProfi = 1
+				LariskaQW['volleyball'] = 1
 				lariskalove += 1
+				killvar 'lariskaTrain'
 				npc_rel['A13'] += 20
 				gs 'willpower', 'pay', 'force'
 				gs 'stat'
@@ -421,7 +424,7 @@ if $ARGS[0] = 'trener_speak':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak20.jpg"></center>'
 			'"<<$pcs_lastname>>, I will not be drawn into talking about the championship. And no, coaches don''t get paid a lot. I spend my Sunday mornings training rich women in the fitness center. One lesson there pays more than a month working as a coach in our town."'
-			+$OpenInnerThought+'"Didn''t get anything out of him there, <<$pcs_lastname>>. Although, the classes in the fitness center should be worth investigating."'+$CloseInnerThought
+			+$OpenInnerThought+'"Didn''t get anything out of him there, <<$pcs_lastname>>. Although, the classes in the fitness center should be worth investigating."'+$CloseInnerThought 
 			npc_rel['A69'] += 3
 			'Seeing Mikhail a little upset by your questions, you decide to cheer him up.'
 			!! the flag on the emergence of Turner in the centre
@@ -522,7 +525,7 @@ if $ARGS[0] = 'trener_speak':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener5.jpg"></center>'
 		'Mikhail smiles at you, gives a thumbs up, and says, "<<$pcs_nickname>>, I want to congratulate you, I think. I''ve decided to make you a first string regular. From now on, you''ll be starting."'
 		'"But," he adds, shaking his finger at you admonishingly. "You still need to keep practicing, and less drinking!"'
-		'You squeal happily and threw your arms around the Mikhail''s neck. "Now we have them... I always... Yes we like..." The excitement of the unexpected anouncement left you unable to speak and Mikhail just smiles at you and says "Go."'
+		'You squeal happily and threw your arms around the Mikhail''s neck. "Now we have them... I always... Yes we like..." The excitement of the unexpected announcement left you unable to speak and Mikhail just smiles at you and says "Go."'
 		volleysostav = 2
 	else
 		npc_rel['A69'] += 1

+ 3 - 1
locations/VoltrenerSexShower.qsrc

@@ -60,6 +60,9 @@ if $ARGS[0] = '1':
 	end
 end
 
+!! Note, this scene does not increase VoltrenerVoyeur unlike the other VoltrenerSexShower scenes.
+!! This is intentional. The way to raise VoltrenerVoyeur from 2 to 3 is to talk to the coach about
+!! him spying on the player in the shower.
 if $ARGS[0] = '2':
 	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower1.jpg"></center>'
@@ -74,7 +77,6 @@ if $ARGS[0] = '2':
 	if (pcs_horny >= 70 or pav_slut > 50) and will_cost <= pcs_willpwr:
 		act 'Masturbate (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'self'
-			if IvanShowerYes = 2: VoltrenerVoyeur += 1
 			npc_rel['A69'] += 1
 			trenerlust += 4
 			minut += 10

+ 108 - 0
locations/_attributes_bomba_coats.qsrc

@@ -0,0 +1,108 @@
+# $attributes_bomba_coats
+!2020/12/28
+!Price ranges from 4 to 7, please avoid adding too many 7s
+
+if ARGS[1] = 1:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style coat with flared, pointed sleeves and decorative D-rings.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 6
+    CloWarm = 3
+	$coat_description = 'Great: A gothic style coat made from suede in the color black.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 5
+    CloWarm = 3
+	$coat_description = 'Great: A gothic style coat with faux fur and hood. It has decorative metal rivets.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A belted gothic style coat with faux fur and faux leather.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style Parka jacket with oversized hood and front zipper.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style duffle coat with oversized hood and front zipper with bat toggles.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A high waist gothic style trench coat with puff shoulders and a turn down collar'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 6
+    CloWarm = 3
+	$coat_description = 'Great: A gothic style hooded Parka coat with faux fur and belt.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style, hooded coat with faux fur.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style long coat.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style short coat.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A gothic style cape.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A gothic style hooded jersey with bondage straps.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A crop top jacket with faux fur and an oversized hood.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A gothic style medium length cape.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A gothic style long coat.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: An alternative style tailcoat in black and purple.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A gothic style jacket in relaxed fit.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A dark velvet lace fringed shawl.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A punk style long coat in the color black.'
+	
+end
+
+--- $attributes_bomba_coats ---------------------------------
+

+ 114 - 81
locations/_attrib_shoe_pussy.qsrc → locations/_attributes_bomba_shoes.qsrc

@@ -1,164 +1,197 @@
-# $attrib_shoe_pussy
+# $attributes_bomba_shoes
+!2020/12/14
+!price range from 3 to 5 but please avoid adding too many 5s
 
 if ARGS[1] = 1:
-	ShoQuality = 4
-	ShoHeels = 3
+	ShoQuality = 3
+	ShoHeels = 2
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 2:
-	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 2
+	ShoQuality = 3
+	ShoHeels = 2
+	ShoCut = 1
 elseif ARGS[1] = 3:
 	ShoQuality = 3
-	ShoHeels = 4
+	ShoHeels = 2
 	ShoCut = 1
-	ShoStyle = 1
 elseif ARGS[1] = 4:
-	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 5:
 	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 1
-	ShoStyle = 1
-elseif ARGS[1] = 6:
+	ShoHeels = 2
+	ShoCut = 2
+	ShoStyle = 3
+elseif ARGS[1] = 5:
 	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 1
-	ShoStyle = 2
+	ShoHeels = 2
+	ShoCut = 3
+elseif ARGS[1] = 6:
+	ShoQuality = 3
+	ShoHeels = 2
+	ShoCut = 4
 elseif ARGS[1] = 7:
-	ShoQuality = 4
-	ShoHeels = 4
+	ShoQuality = 3
+	ShoHeels = 3
 	ShoCut = 1
 elseif ARGS[1] = 8:
-	ShoQuality = 4
-	ShoHeels = 4
+	ShoQuality = 3
+	ShoHeels = 3
 	ShoCut = 1
 elseif ARGS[1] = 9:
-	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 3
+	ShoHeels = 3
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 10:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 3
+	ShoHeels = 3
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 11:
 	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 2
+	ShoHeels = 3
+	ShoCut = 3
+	ShoStyle = 3
 elseif ARGS[1] = 12:
 	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 5
-	ShoStyle = 1
+	ShoHeels = 3
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 13:
-	ShoQuality = 5
-	ShoHeels = 1
-	ShoCut = 2
+	ShoQuality = 4
+	ShoHeels = 3
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 14:
 	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 2
+	ShoHeels = 3
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 15:
-	ShoQuality = 3
-	ShoHeels = 1
+	ShoQuality = 4
+	ShoHeels = 4
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 16:
 	ShoQuality = 3
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 17:
-	ShoQuality = 5
-	ShoHeels = 1
+	ShoQuality = 4
+	ShoHeels = 4
 	ShoCut = 2
-	ShoStyle = 3
 elseif ARGS[1] = 18:
 	ShoQuality = 3
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 19:
-	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 1
+	ShoQuality = 3
+	ShoHeels = 4
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 20:
 	ShoQuality = 4
 	ShoHeels = 4
 	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 21:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 4
 	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 22:
 	ShoQuality = 3
 	ShoHeels = 4
 	ShoCut = 2
 elseif ARGS[1] = 23:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 3
 	ShoStyle = 3
 elseif ARGS[1] = 24:
 	ShoQuality = 4
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 25:
 	ShoQuality = 4
-	ShoHeels = 3
-	ShoCut = 2
+	ShoHeels = 4
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 26:
-	ShoQuality = 3
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 27:
 	ShoQuality = 4
 	ShoHeels = 4
-	ShoCut = 5
+	ShoCut = 4
+	ShoStyle = 3
+elseif ARGS[1] = 27:
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 28:
 	ShoQuality = 3
-	ShoHeels = 2
+	ShoHeels = 5
 	ShoCut = 1
 elseif ARGS[1] = 29:
-	ShoQuality = 3
-	ShoHeels = 4
+	ShoQuality = 4
+	ShoHeels = 5
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 30:
-	ShoQuality = 4
-	ShoHeels = 4
+	ShoQuality = 3
+	ShoHeels = 5
 	ShoCut = 1
+	ShoStyle = 3
 elseif ARGS[1] = 31:
 	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 5
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 32:
 	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 5
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 33:
 	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 5
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 34:
-	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 35:
 	ShoQuality = 4
-	ShoHeels = 3
+	ShoHeels = 5
 	ShoCut = 2
+	ShoStyle = 3
+elseif ARGS[1] = 35:
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 2
+	ShoStyle = 3
 elseif ARGS[1] = 36:
 	ShoQuality = 4
-	ShoHeels = 2
-	ShoCut = 2
+	ShoHeels = 5
+	ShoCut = 3
+	ShoStyle = 3
 elseif ARGS[1] = 37:
-	ShoQuality = 3
-	ShoHeels = 3
-	ShoCut = 2
+	ShoQuality = 4
+	ShoHeels = 5
+	ShoCut = 4
+	ShoStyle = 3
 elseif ARGS[1] = 38:
 	ShoQuality = 4
-	ShoHeels = 4
+	ShoHeels = 5
+	ShoCut = 5
+	ShoStyle = 3
+elseif ARGS[1] = 39:
+	ShoQuality = 4
+	ShoHeels = 6
 	ShoCut = 2
+	ShoStyle = 3
+elseif ARGS[1] = 40:
+	ShoQuality = 5
+	ShoHeels = 6
+	ShoCut = 4
+	ShoStyle = 3
 end
 
---- $attrib_shoe_pussy ---------------------------------
+--- $attributes_bomba_shoes ---------------------------------
 

+ 108 - 0
locations/_attributes_cats_coats.qsrc

@@ -0,0 +1,108 @@
+# $attributes_cats_coats
+!2020/12/28
+!Price ranges from 2 to 4, please avoid adding too many 5s
+
+if ARGS[1] = 1:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A fleece sweater jacket with full-zip in evening blue.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 4
+    CloWarm = 3
+	$coat_description = 'Great: A mountain Parka jacket in light hickory.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A navy blue jacket that is wind-and water-resistant.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A fleece full zip jacket with silver blue triangular print.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A raincoat in khaki color.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: An ultralight Down jacket in royal plum.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A colorblock pullover in gunmetal gray and light rosewood.'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A raw indigo light jacket that is water- and wind-resistant.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A fleece pullover with hood with platinum geo multistripe.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A water- and wind-resistant jacket in gunmetal gray mountain geo.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: An ultralight Down jacket in ocean teal.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 4
+    CloWarm = 3
+	$coat_description = 'Great: A wool coat in the deep shade of Kelp green.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A duffel coat in the color of camel.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A puffer coat in the color of carbon navy.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A waterproof long coat in the color of deep navy.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A light gray peacoat made of wool.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A multicolor jacket with a Kangaroo pocket.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A water- and wind-resistant coat in cactus leaf print.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A sweater fleece coat in the color of dark cinder.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A red currant pullover coat.'
+	
+end
+
+--- $attributes_cats_coats ---------------------------------
+

+ 2 - 1
locations/_attributes_coco_outfits.qsrc

@@ -297,6 +297,7 @@ elseif ARGS[1] = 59:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
+	CloPantsShortness = 1
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 5
@@ -451,7 +452,7 @@ elseif ARGS[1] = 87:
 elseif ARGS[1] = 88:
 	CloQuality = 2
 	CloThinness = 5
-	CloTopCut = 4
+	CloBra = 1
 	CloPantsShortness = 4
 	CloStyle = 4
 elseif ARGS[1] = 89:

+ 108 - 0
locations/_attributes_danilovich_coats.qsrc

@@ -0,0 +1,108 @@
+# $attributes_danilovich_coats
+!2020/12/28
+!Price ranges from 3 to 6, please avoid adding too many 5s and 6s
+
+if ARGS[1] = 1:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A light sports coat that offers decent insulation.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 6
+    CloWarm = 3
+	$coat_description = 'Great: A light sports coat that offers great insulation.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 5
+    CloWarm = 3
+	$coat_description = 'Great: A sports coat that offers great insulation.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A stylish sports coat that is both water- and wind-resistant.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A sports coat designed for runners.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A winter sports coat.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A light sports coat that is both water- and wind-resistant.'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A water- and wind-resistant sports coat in the color rose.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 5
+    CloWarm = 3
+	$coat_description = 'Great: A very decent quality sports coat in the color bone.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 5
+    CloWarm = 3
+	$coat_description = 'Great: A great quality winter sports coat in the color resin gold.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A light sports jacket designed for hiking in the color of ballet slipper.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A thin and trendy sports coat in stripe prints.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 6
+    CloWarm = 3
+	$coat_description = 'Great: A thick sports coat in the color black.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 5
+    CloWarm = 1
+	$coat_description = 'Low: A thin and trendy sports coat in the color off-white.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 5
+    CloWarm = 3
+	$coat_description = 'Great: A inner wind proof winter sports jacket in rose color.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A sports jacket for running in the color celery.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A multicolor runner''s sports coat.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A waterproof running jacket in the color Maya.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A waterproof and windproof sports coat with multicolor dotted print.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A waterproof and windproof sports coat in the color black.'
+	
+end
+
+--- $attributes_danilovich_coats ---------------------------------
+

+ 66 - 24
locations/_attrib_shoe_trainers.qsrc → locations/_attributes_danilovich_shoes.qsrc

@@ -1,7 +1,9 @@
-# $attrib_shoe_trainers
+# $attributes_danilovich_shoes
+!2020/12/07
+!price range from 2 to 5 but please avoid adding too many 5s
 
 if ARGS[1] = 1:
-	ShoQuality = 3
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 2:
@@ -9,47 +11,47 @@ elseif ARGS[1] = 2:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 3:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 4:
-	ShoQuality = 4
+	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 5:
-	ShoQuality = 5
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 6:
-	ShoQuality = 5
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 7:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 8:
-	ShoQuality = 5
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 9:
-	ShoQuality = 3
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 10:
-	ShoQuality = 4
+	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 11:
-	ShoQuality = 5
+	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 12:
-	ShoQuality = 5
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 13:
-	ShoQuality = 5
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 14:
@@ -57,7 +59,7 @@ elseif ARGS[1] = 14:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 15:
-	ShoQuality = 3
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 16:
@@ -65,15 +67,15 @@ elseif ARGS[1] = 16:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 17:
-	ShoQuality = 5
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 18:
-	ShoQuality = 5
+	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 19:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 20:
@@ -81,7 +83,7 @@ elseif ARGS[1] = 20:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 21:
-	ShoQuality = 3
+	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 22:
@@ -89,7 +91,7 @@ elseif ARGS[1] = 22:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 23:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 24:
@@ -97,19 +99,19 @@ elseif ARGS[1] = 24:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 25:
-	ShoQuality = 5
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 26:
-	ShoQuality = 5
+	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 27:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 28:
-	ShoQuality = 3
+	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 29:
@@ -117,10 +119,50 @@ elseif ARGS[1] = 29:
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 30:
+	ShoQuality = 4
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 31:
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 32:
+	ShoQuality = 2
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 33:
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 34:
+	ShoQuality = 2
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 35:
+	ShoQuality = 5
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 36:
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 37:
+	ShoQuality = 2
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 38:
+	ShoQuality = 2
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 39:
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 1
+elseif ARGS[1] = 40:
 	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 1
 end
 
---- $attrib_shoe_trainers ---------------------------------
+--- $attributes_danilovich_shoes ---------------------------------
 

+ 108 - 0
locations/_attributes_dolls_coats.qsrc

@@ -0,0 +1,108 @@
+# $attributes_dolls_coats
+!2020/12/28
+!Price ranges from 3 to 5, please avoid adding too many 5s
+
+if ARGS[1] = 1:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A hooded, plain and button tap coat with faux fur.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 4
+    CloWarm = 3
+	$coat_description = 'Great: A long winter coat with 2-way zip.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A 40s style long coat in the olive color.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A stylized army coat for women in deep red.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A black and white dotted coat with faux fur from Hell BUNNY.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A khaki Parka jacket with faux fur collar and decorative stitching.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A red jacket with embroidery with button tap.'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A plain long coat in the color grey.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A hooded winter coat in red wine color.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A hooded Parka coat with sand cameo and ribbed cuffs.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A checkered wool coat with button tap.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 3
+    CloWarm = 3
+	$coat_description = 'Great: A thick coat with leopard pattern.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A short multicolor coat with button tap.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A plaid faux fur coat in the color green.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 4
+    CloWarm = 3
+	$coat_description = 'Great: A hooded short coat in dusty pink.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 3
+    CloWarm = 3
+	$coat_description = 'Great: A trendy black winter coat with hook buttons.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A denim jacket with sweat sleeves and hood.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 4
+    CloWarm = 2
+	$coat_description = 'Moderate: A flo flocked floral wide collar flare coat.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 4
+    CloWarm = 1
+	$coat_description = 'Low: A short coat with cherry pattern print in black.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A Marjorie floral belted trench coat.'
+	
+end
+
+--- $attributes_dolls_coats ---------------------------------
+

+ 79 - 96
locations/_attrib_shoe_dolls.qsrc → locations/_attributes_dolls_shoes.qsrc

@@ -1,145 +1,128 @@
-# $attrib_shoe_dolls
+# $attributes_dolls_shoes
+!2020/12/14
+!price range from 3 to 5 but please avoid adding too many 5s
 
 if ARGS[1] = 1:
-	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 2
+	ShoCut = 1
 elseif ARGS[1] = 2:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 2
 	ShoCut = 2
-	ShoStyle = 3
 elseif ARGS[1] = 3:
 	ShoQuality = 3
-	ShoHeels = 1
-	ShoCut = 3
-	ShoStyle = 3
+	ShoHeels = 3
+	ShoCut = 1
 elseif ARGS[1] = 4:
-	ShoQuality = 5
-	ShoHeels = 2
-	ShoCut = 2
-	ShoStyle = 3
-	ShoStyle = 2
-elseif ARGS[1] = 5:
 	ShoQuality = 3
-	ShoHeels = 1
+	ShoHeels = 3
 	ShoCut = 1
-	ShoStyle = 3
+elseif ARGS[1] = 5:
+	ShoQuality = 3
+	ShoHeels = 3
+	ShoCut = 2
 elseif ARGS[1] = 6:
-	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 1
-	ShoStyle = 3
-elseif ARGS[1] = 7:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 3
+	ShoCut = 2
+elseif ARGS[1] = 7:
+	ShoQuality = 3
+	ShoHeels = 4
 	ShoCut = 1
-	ShoStyle = 3
 elseif ARGS[1] = 8:
-	ShoQuality = 5
-	ShoHeels = 3
+	ShoQuality = 3
+	ShoHeels = 4
 	ShoCut = 1
-	ShoStyle = 3
-	ShoStyle = 2
 elseif ARGS[1] = 9:
-	ShoQuality = 3
-	ShoHeels = 2
+	ShoQuality = 4
+	ShoHeels = 4
 	ShoCut = 1
-	ShoStyle = 3
 elseif ARGS[1] = 10:
-	ShoQuality = 4
-	ShoHeels = 3
-	ShoCut = 2
-	ShoStyle = 3
-	ShoStyle = 2
+	ShoQuality = 3
+	ShoHeels = 4
+	ShoCut = 1
 elseif ARGS[1] = 11:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 4
-	ShoCut = 3
-	ShoStyle = 3
+	ShoCut = 1
 elseif ARGS[1] = 12:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 2
-	ShoStyle = 3
-elseif ARGS[1] = 13:
-	ShoQuality = 4
+	ShoQuality = 3
 	ShoHeels = 4
 	ShoCut = 3
-	ShoStyle = 3
+elseif ARGS[1] = 13:
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 14:
 	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 15:
-	ShoQuality = 3
-	ShoHeels = 1
+	ShoQuality = 4
+	ShoHeels = 5
 	ShoCut = 1
-	ShoStyle = 3
 elseif ARGS[1] = 16:
 	ShoQuality = 3
-	ShoHeels = 1
+	ShoHeels = 5
 	ShoCut = 1
-	ShoStyle = 3
 elseif ARGS[1] = 17:
-	ShoQuality = 4
-	ShoHeels = 3
-	ShoCut = 2
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 18:
-	ShoQuality = 5
-	ShoHeels = 1
-	ShoCut = 3
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 19:
-	ShoQuality = 4
-	ShoHeels = 4
-	ShoCut = 5
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 20:
-	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 21:
-	ShoQuality = 4
-	ShoHeels = 2
-	ShoCut = 3
-	ShoStyle = 3
-	ShoStyle = 2
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 22:
-	ShoQuality = 5
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoQuality = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 23:
 	ShoQuality = 4
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 24:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 2
-	ShoStyle = 3
+	ShoQuality = 4
+	ShoHeels = 5
+	ShoCut = 1
 elseif ARGS[1] = 25:
-	ShoQuality = 5
-	ShoHeels = 3
+	ShoQuality = 4
+	ShoHeels = 5
 	ShoCut = 2
-	ShoStyle = 3
 elseif ARGS[1] = 26:
 	ShoQuality = 5
-	ShoHeels = 4
+	ShoHeels = 5
 	ShoCut = 2
-	ShoStyle = 3
 elseif ARGS[1] = 27:
-	ShoQuality = 3
-	ShoHeels = 3
+	ShoQuality = 4
+	ShoHeels = 5
 	ShoCut = 2
-	ShoStyle = 3
+elseif ARGS[1] = 28:
+	ShoQuality = 4
+	ShoHeels = 5
+	ShoCut = 3
+elseif ARGS[1] = 29:
+	ShoQuality = 4
+	ShoHeels = 5
+	ShoCut = 5
+elseif ARGS[1] = 30:
+	ShoQuality = 4
+	ShoHeels = 6
+	ShoCut = 1
 end
 
---- $attrib_shoe_dolls ---------------------------------
+--- $attributes_dolls_shoes ---------------------------------
 

+ 8 - 8
locations/_attributes_fetish.qsrc

@@ -270,27 +270,27 @@ elseif ARGS[1] = 44:
 elseif ARGS[1] = 45:
 	CloQuality = 5
 	CloThinness = 4
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 46:
 	CloQuality = 5
 	CloThinness = 4
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 47:
 	CloQuality = 4
 	CloThinness = 4
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 48:
 	CloQuality = 5
 	CloThinness = 5
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 49:
 	CloQuality = 5
 	CloThinness = 4
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 50:
 	CloQuality = 5
@@ -305,13 +305,13 @@ elseif ARGS[1] = 51:
 elseif ARGS[1] = 52:
 	CloQuality = 3
 	CloThinness = 6
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 4
 elseif ARGS[1] = 53:
 	CloQuality = 5
 	CloThinness = 4
-	loTopCut = 1
+	CloTopCut = 1
 	CloPantsShortness = 1
 elseif ARGS[1] = 54:
 	CloQuality = 4
@@ -541,7 +541,7 @@ elseif ARGS[1] = 91:
 	CloTopCut = 3
 	CloSkirtShortness = 2
 elseif ARGS[1] = 92:
-	CloQuality = 44
+	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 2

+ 107 - 0
locations/_attributes_gm_coats.qsrc

@@ -0,0 +1,107 @@
+# $attributes_gm_coats
+!Price ranges from 1 to 3
+
+if ARGS[1] = 1:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A gigh shine faux fur trim fitted puffer jacket.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: An oversized teddy faux fur bomber jacket.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: A faux fur trim parka jacket.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A plus blurred check longline shacket.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 1
+    CloWarm = 1
+	$coat_description = 'Low: A collarless blazer.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: A plus hounds tooth check frayed hem blazer.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 1
+    CloWarm = 1
+	$coat_description = 'Low: A tailored tie sleeve pocket blazer.'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A stitch detail oversized wool look coat.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A belted wool look trench coat.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A tailored wool look coat.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 3
+    CloWarm = 2
+	$coat_description = 'Moderate: A wool look belted cuff detail trench coat.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: A La embroidered varsity jacket.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: A plus pu oversized boyfriend shacket.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 3
+    CloWarm = 1
+	$coat_description = 'Low: A boyfriend belted utility blazer.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 2
+    CloWarm = 3
+	$coat_description = 'Great: A hooded faux fur coat.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A petite teddy faux fur oversized bomber jacket.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A funnel neck puffer jacket.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 2
+    CloWarm = 2
+	$coat_description = 'Moderate: A faux fur hooded panelled Parka jacket.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 3
+    CloWarm = 3
+	$coat_description = 'Great: A tall faux fur coat.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 2
+    CloWarm = 1
+	$coat_description = 'Low: A plus lapel detail ruched sleeve blazer.'
+	
+end
+
+--- $attributes_gm_coats ---------------------------------
+

+ 57 - 144
locations/_attrib_shoe_gandm.qsrc → locations/_attributes_gm_shoes.qsrc

@@ -1,214 +1,127 @@
-# $attrib_shoe_gandm
-
+# $attributes_gm_shoes
+!2020/12/19
+!price range from 1 to 3 but please avoid adding too many 3s
 if ARGS[1] = 1:
 	ShoQuality = 2
-	ShoHeels = 4
+	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 2:
 	ShoQuality = 2
-	ShoHeels = 4
+	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 3:
 	ShoQuality = 2
-	ShoHeels = 3
-	ShoCut = 3
+	ShoHeels = 1
+	ShoCut = 1
 elseif ARGS[1] = 4:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 5
+	ShoQuality = 1
+	ShoHeels = 1
+	ShoCut = 1
 elseif ARGS[1] = 5:
-	ShoQuality = 3
-	ShoHeels = 4
+	ShoQuality = 1
+	ShoHeels = 1
 	ShoCut = 1
-	ShoStyle = 2
 elseif ARGS[1] = 6:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 7:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 4
+	ShoQuality = 1
+	ShoHeels = 1
+	ShoCut = 1
 elseif ARGS[1] = 8:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 3
+	ShoQuality = 1
+	ShoHeels = 1
+	ShoCut = 1
 elseif ARGS[1] = 9:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 10:
-	ShoQuality = 2
+	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 11:
-	ShoQuality = 2
-	ShoHeels = 4
+	ShoQuality = 1
+	ShoHeels = 1
 	ShoCut = 1
-	ShoStyle = 2
 elseif ARGS[1] = 12:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 13:
-	ShoQuality = 3
+	ShoQuality = 2
 	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
+	ShoCut = 1
 elseif ARGS[1] = 14:
-	ShoQuality = 3
+	ShoQuality = 2
 	ShoHeels = 1
-	ShoCut = 1
+	ShoCut = 2
 elseif ARGS[1] = 15:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 1
+	ShoCut = 2
 elseif ARGS[1] = 16:
 	ShoQuality = 2
-	ShoHeels = 3
+	ShoHeels = 1
 	ShoCut = 2
 elseif ARGS[1] = 17:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 3
+	ShoHeels = 1
+	ShoCut = 3
 elseif ARGS[1] = 18:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 19:
 	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 5
+	ShoHeels = 1
+	ShoCut = 3
+elseif ARGS[1] = 19:
+	ShoQuality = 2
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 20:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 5
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 21:
-	ShoQuality = 3
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 2
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 22:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 23:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 24:
 	ShoQuality = 2
-	ShoHeels = 1
-	ShoCut = 1
+	ShoHeels = 2
+	ShoCut = 3
 elseif ARGS[1] = 25:
-	ShoQuality = 1
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 26:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 27:
-	ShoQuality = 1
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 28:
-	ShoQuality = 1
-	ShoHeels = 4
+	ShoHeels = 2
 	ShoCut = 4
-elseif ARGS[1] = 29:
-	ShoQuality = 1
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 30:
-	ShoQuality = 3
-	ShoHeels = 1
-	ShoCut = 2
-	ShoStyle = 3
-elseif ARGS[1] = 31:
-	ShoQuality = 1
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 32:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 33:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 34:
+elseif ARGS[1] = 26:
 	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 35:
-	ShoQuality = 1
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 36:
+	ShoHeels = 2
+	ShoCut = 4
+elseif ARGS[1] = 27:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 1
-elseif ARGS[1] = 37:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 38:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 39:
-	ShoQuality = 1
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 40:
+elseif ARGS[1] = 28:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 1
-elseif ARGS[1] = 41:
-	ShoQuality = 1
-	ShoHeels = 4
-	ShoCut = 2
-elseif ARGS[1] = 42:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 43:
-	ShoQuality = 1
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 44:
-	ShoQuality = 1
-	ShoHeels = 2
-	ShoCut = 2
-elseif ARGS[1] = 45:
-	ShoQuality = 1
-	ShoHeels = 1
-	ShoCut = 1
-elseif ARGS[1] = 46:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 2
-elseif ARGS[1] = 47:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 48:
+elseif ARGS[1] = 29:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 2
-elseif ARGS[1] = 49:
-	ShoQuality = 2
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 50:
-	ShoQuality = 1
-	ShoHeels = 4
-	ShoCut = 1
-elseif ARGS[1] = 51:
+elseif ARGS[1] = 30:
 	ShoQuality = 2
 	ShoHeels = 4
 	ShoCut = 1
 end
 
---- $attrib_shoe_gandm ---------------------------------
+--- $attributes_gm_shoes ---------------------------------
 

+ 1 - 1
locations/_attributes_moncheri.qsrc

@@ -930,7 +930,7 @@ elseif ARGS[1] = 151:
 elseif ARGS[1] = 152:
 	CloQuality = 5
 	CloThinness = 4
-	CloTopCut =12
+	CloTopCut = 2
 	CloSkirtShortness = 1
 	CloDress = 1
 elseif ARGS[1] = 153:

+ 107 - 0
locations/_attributes_moncheri_coats.qsrc

@@ -0,0 +1,107 @@
+# $attributes_moncheri_coats
+!Price ranges from 5 to 7, please avoid adding too many 7s.
+
+if ARGS[1] = 1:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A waterproof cotton Gabardine trench coat from RED VALENTINO.'
+	
+elseif ARGS[1] = 2:
+	CloQuality = 7
+    CloWarm = 2
+	$coat_description = 'Moderate: A logo felted wool jacquard cape from GUCCI.'
+	
+elseif ARGS[1] = 3:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A messi belted virgin wool wrap coat from MAX MARA.'
+	
+elseif ARGS[1] = 4:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A check wool tweed coat from GUCCI.'
+	
+elseif ARGS[1] = 5:
+	CloQuality = 6
+    CloWarm = 3
+	$coat_description = 'Great: A techno waterproof coat with hood from MAX MARA.'
+	
+elseif ARGS[1] = 6:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A Pirello leather trench coat from REMAIN.'
+	
+elseif ARGS[1] = 7:
+	CloQuality = 7
+    CloWarm = 3
+	$coat_description = 'Great: A wool crepe double breast long coat from DOLCE & GABBANA.'
+	
+elseif ARGS[1] = 8:
+	CloQuality = 7
+    CloWarm = 3
+	$coat_description = 'Great: A Pirella leather trench coat from REMAIN.'
+	
+elseif ARGS[1] = 9:
+	CloQuality = 5
+    CloWarm = 2
+	$coat_description = 'Moderate: A reversible faux leather and sequins coat from ANOUKI.'
+	
+elseif ARGS[1] = 10:
+	CloQuality = 7
+    CloWarm = 3
+	$coat_description = 'Great: A hooded alpaca and silk teddy coat from MAX MARA.'
+	
+elseif ARGS[1] = 11:
+	CloQuality = 7
+    CloWarm = 3
+	$coat_description = 'Great: A wool coat with leather harness from JUNYA WATANABE.'
+	
+elseif ARGS[1] = 12:
+	CloQuality = 7
+    CloWarm = 2
+	$coat_description = 'Moderate: A wool check cape with leather details from BURBERRY.'
+	
+elseif ARGS[1] = 13:
+	CloQuality = 7
+    CloWarm = 2
+	$coat_description = 'Moderate: A wrap velvet long dust coat with belt from ANN DEMEULEMEESTER.'
+	
+elseif ARGS[1] = 14:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A patent leather trench coat with belt from BOTTEGA VENETA.'
+	
+elseif ARGS[1] = 15:
+	CloQuality = 7
+    CloWarm = 2
+	$coat_description = 'Moderate: A chevron wool belted coat from SPORTMAX.'
+	
+elseif ARGS[1] = 16:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A pleated Gabardine Trench Coat from RED VALENTINO.'
+	
+elseif ARGS[1] = 17:
+	CloQuality = 7
+    CloWarm = 1
+	$coat_description = 'Low: A cotton blend long coat from GUCCI.'
+	
+elseif ARGS[1] = 18:
+	CloQuality = 6
+    CloWarm = 2
+	$coat_description = 'Moderate: A waterproof cotton blend zip coat with hood from MAX MARA.'
+	
+elseif ARGS[1] = 19:
+	CloQuality = 7
+    CloWarm = 3
+	$coat_description = 'Great: A leather coat with fox fur from SAKS POTTS.'
+	
+elseif ARGS[1] = 20:
+	CloQuality = 7
+    CloWarm = 2
+	$coat_description = 'Moderate: A printed compact wool long coat from PACO RABANNE.'
+	
+end
+
+--- $attributes_moncheri_coats ---------------------------------
+

+ 86 - 71
locations/_attrib_shoe_boutique.qsrc → locations/_attributes_moncheri_shoes.qsrc

@@ -1,156 +1,171 @@
-# $attrib_shoe_boutique
+# $attributes_moncheri_shoes
+!2020/12/17
+!price range from 6 to 7 but please avoid adding too many 7s
 
 if ARGS[1] = 1:
-	ShoQuality = 5
-	ShoHeels = 3
-	ShoCut = 2
+	ShoQuality = 6
+	ShoHeels = 1
+	ShoCut = 1
+	ShoStyle = 2
 elseif ARGS[1] = 2:
-	ShoQuality = 5
-	ShoHeels = 4
+	ShoQuality = 6
+	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 3:
 	ShoQuality = 6
-	ShoHeels = 4
+	ShoHeels = 1
 	ShoCut = 1
 elseif ARGS[1] = 4:
-	ShoQuality = 7
-	ShoHeels = 3
-	ShoCut = 3
-	ShoStyle = 2
+	ShoQuality = 6
+	ShoHeels = 1
+	ShoCut = 1
 elseif ARGS[1] = 5:
 	ShoQuality = 6
-	ShoHeels = 4
+	ShoHeels = 2
 	ShoCut = 1
+	ShoStyle = 2
 elseif ARGS[1] = 6:
-	ShoQuality = 5
-	ShoHeels = 4
+	ShoQuality = 6
+	ShoHeels = 2
 	ShoCut = 1
 elseif ARGS[1] = 7:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 1
+	ShoHeels = 2
+	ShoCut = 2
 elseif ARGS[1] = 8:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 6
+	ShoHeels = 2
+	ShoCut = 4
 elseif ARGS[1] = 9:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 3
+	ShoHeels = 3
+	ShoCut = 1
 elseif ARGS[1] = 10:
-	ShoQuality = 4
-	ShoHeels = 4
+	ShoQuality = 6
+	ShoHeels = 3
 	ShoCut = 1
 elseif ARGS[1] = 11:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 3
+	ShoHeels = 3
+	ShoCut = 1
 elseif ARGS[1] = 12:
-	ShoQuality = 5
-	ShoHeels = 4
+	ShoQuality = 6
+	ShoHeels = 3
 	ShoCut = 1
 elseif ARGS[1] = 13:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 2
+	ShoQuality = 6
+	ShoHeels = 3
+	ShoCut = 1
 elseif ARGS[1] = 14:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 3
+	ShoHeels = 3
+	ShoCut = 2
 elseif ARGS[1] = 15:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 6
+	ShoHeels = 3
+	ShoCut = 2
 elseif ARGS[1] = 16:
-	ShoQuality = 5
-	ShoHeels = 4
-	ShoCut = 1
+	ShoQuality = 6
+	ShoHeels = 3
+	ShoCut = 2
 elseif ARGS[1] = 17:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 1
-	ShoStyle = 1
+	ShoHeels = 3
+	ShoCut = 3
 elseif ARGS[1] = 18:
 	ShoQuality = 6
-	ShoHeels = 4
+	ShoHeels = 3
 	ShoCut = 4
 elseif ARGS[1] = 19:
 	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 20:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 21:
 	ShoQuality = 6
-	ShoHeels = 3
-	ShoCut = 2
+	ShoHeels = 4
+	ShoCut = 1
 elseif ARGS[1] = 22:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 23:
-	ShoQuality = 5
+	ShoQuality = 7
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 24:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 2
+	ShoCut = 1
 elseif ARGS[1] = 25:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
 	ShoCut = 1
 elseif ARGS[1] = 26:
-	ShoQuality = 6
+	ShoQuality = 7
 	ShoHeels = 4
 	ShoCut = 2
 elseif ARGS[1] = 27:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 2
 elseif ARGS[1] = 28:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 2
 elseif ARGS[1] = 29:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 4
 elseif ARGS[1] = 30:
 	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 4
 elseif ARGS[1] = 31:
-	ShoQuality = 5
+	ShoQuality = 6
 	ShoHeels = 4
-	ShoCut = 3
+	ShoCut = 4
 elseif ARGS[1] = 32:
-	ShoQuality = 6
+	ShoQuality = 7
 	ShoHeels = 4
-	ShoCut = 1
+	ShoCut = 5
 elseif ARGS[1] = 33:
-	ShoQuality = 5
-	ShoHeels = 4
+	ShoQuality = 6
+	ShoHeels = 5
 	ShoCut = 1
 elseif ARGS[1] = 34:
-	ShoQuality = 5
-	ShoHeels = 4
+	ShoQuality = 7
+	ShoHeels = 5
 	ShoCut = 1
 elseif ARGS[1] = 35:
 	ShoQuality = 6
-	ShoHeels = 4
+	ShoHeels = 5
 	ShoCut = 1
 elseif ARGS[1] = 36:
 	ShoQuality = 6
-	ShoHeels = 4
-	ShoCut = 4
+	ShoHeels = 5
+	ShoCut = 2
 elseif ARGS[1] = 37:
-	ShoQuality = 6
-	ShoHeels = 4
+	ShoQuality = 7
+	ShoHeels = 5
 	ShoCut = 2
+	ShoStyle = 2
+elseif ARGS[1] = 38:
+	ShoQuality = 6
+	ShoHeels = 5
+	ShoCut = 4
+elseif ARGS[1] = 39:
+	ShoQuality = 7
+	ShoHeels = 5
+	ShoCut = 5
+elseif ARGS[1] = 40:
+	ShoQuality = 7
+	ShoHeels = 6
+	ShoCut = 1
 end
 
---- $attrib_shoe_boutique ---------------------------------
+--- $attributes_moncheri_shoes ---------------------------------
 

+ 2 - 3
locations/_attributes_swimwear.qsrc

@@ -296,7 +296,7 @@ elseif ARGS[1] = 44:
 elseif ARGS[1] = 45:
 	CloQuality = 6
 	CloThinness = 4
-	CloTopCut = 4
+	CloTopCut = 1
 	CloPanties = 1
 	CloOnePiece = 1
 	CloInhibit = 0
@@ -306,13 +306,12 @@ elseif ARGS[1] = 46:
 	CloQuality = 2
 	CloThinness = 3
 	CloTopCut = 2
-	CloTopCut = 3
 elseif ARGS[1] = 47:
 	CloOnePiece = 1
 	CloInhibit = 0
 	CloQuality = 2
 	CloThinness = 3
-	CloTopCut = 1
+	CloTopCut = 2
 	CloPanties = 1
 elseif ARGS[1] = 48:
 	CloOnePiece = 1

+ 0 - 2
locations/_attributes_uniform.qsrc

@@ -413,9 +413,7 @@ elseif ARGS[1] = 59:
 elseif ARGS[1] = 60:
 	CloQuality = 5
 	CloThinness = 5
-	CloStyle2 = 1
 	CloStyle2 = 2
-	CloStyle2 = 3	
 	CloBra = 1
 	CloSkirtShortness = 5
 	CloBimbo = 1

+ 1 - 1
locations/_body_image.qsrc

@@ -122,7 +122,7 @@ if $ARGS[0] = 'bra':
 end
 
 if $ARGS[0] = 'shoes':
-	if $clothingworntype = 'nude' or $shoeworntype = 'none':
+	if $shoeworntype = 'none':
 		$RESULT = 'images/pc/body/feet.jpg'
 	else
 		$RESULT = FUNC('$shoe_image', $shoeworntype, shoewornnumber)

+ 55 - 55
locations/_clothing_name.qsrc

@@ -162,61 +162,61 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 156:$RESULT = 'A bikini set with a bralette top and a cheeky Brazilian bottom, it''s blue if worn normally but black if worn reversed.'
 	if ARGS[1] = 157:$RESULT = 'A bikini set with a twist Bandeau top and a string bikini bottom, it has decorative gold stripes.'
 	if ARGS[1] = 158:$RESULT = 'A bikini set with a small triangle top and a g-string bottom that leaves very little to the imagination.' 
-	if ARGS[1] = 160:$RESULT = 'A black bikini set with a triangle top and a little thong bottom that shows off your booty quite nicely.'
-	if ARGS[1] = 161:$RESULT = 'A bikini set in black, it has a cross-string top and a Brazilian bottom. It hugs your curves quite nicely.' 
-	if ARGS[1] = 162:$RESULT = 'A bikini set in purple, it has a v plunge bralette top and a thong bottom. It shows your booty nicely.'
-	if ARGS[1] = 163:$RESULT = 'A bikini set in azure, it has a Bandeau top and a string bikini bottom.'
-	if ARGS[1] = 164:$RESULT = 'A bikini set in the color fuchsia, it has a triangle top and a tiny thong bottom that provide little back coverage.'
-	if ARGS[1] = 165:$RESULT = 'A bikini set with a triangle top and a thong bottom in color fuchsia with floral prints.' 
-	if ARGS[1] = 166:$RESULT = 'A blue bikini set with a triangle top and a thong bottom, it has white floral print and looks fun and flirty.' 
-	if ARGS[1] = 167:$RESULT = 'A bikini set with a triangle top and a Brazilian bottom in Tiffany Blue, it''s both functional and fashionable.'
-	if ARGS[1] = 168:$RESULT = 'A red bikini set with a triangle top and a Brazilian bottom that gives plenty of coverage yet remains flirty!'
-	if ARGS[1] = 169:$RESULT = 'A bikini set with a triangle tie-back top and a Brazilian bottom in the color Taffy, it looks fun and flirty.'
-	if ARGS[1] = 170:$RESULT = 'A bikini set that has a rather revealing halter top and a small string bottom in the color Thunder.'
-	if ARGS[1] = 171:$RESULT = 'A bikini set in the color scarlet, it has a triangle tie-back top and a side-string bottom, classy and flirty.'
-	if ARGS[1] = 172:$RESULT = 'A black bikini set with a bralette top and a full bottom, it has supportive-cup, highly comfortable yet still classy.'
-	if ARGS[1] = 173:$RESULT = 'A black bikini set with a bralette top and a full bottom, it has the classy vibe to it.' 
-	if ARGS[1] = 174:$RESULT = 'A bikini set in the Cerulean color, it has a classic bottom as well as a tie-back top that reveal part of the cleavage.' 
-	if ARGS[1] = 175:$RESULT = 'A bikini in Sky blue color, it has a fashionable halter-top top and a classic bikini bottom.' 
-	if ARGS[1] = 176:$RESULT = 'A black bikini set with a strapless Bandeau top and a Brazilian bottom, it''s fun and flirty.'
-	if ARGS[1] = 177:$RESULT = 'A bikini in the color Laure, it has a front-tie top and a multi-string bikini bottom.'
-	if ARGS[1] = 178:$RESULT = 'A Triangle grey bikini top with rings and a scrunch Brazilian bottom, it''s both fashionable and functional.'
-	if ARGS[1] = 179:$RESULT = 'A Triangle bikini top with a Brazilian bottom in multi-floral print.'
-	if ARGS[1] = 180:$RESULT = 'A pink ruffled bikini with a triangle top and a thong bottom, it''s both playful and flirty'
-	if ARGS[1] = 181:$RESULT = 'A black bikini set with a triangle top and a g-string bottom.' 
-	if ARGS[1] = 182:$RESULT = 'A red bikini set with a triangle top and a sexy thong bottom.'
-	if ARGS[1] = 183:$RESULT = 'A bikini set with a triangle top and a g-string bottom, its design reveals much of your body.'
-	if ARGS[1] = 184:$RESULT = 'A red bikini with a tie-back top and a cheeky bottom, it''s sassy with class.'
-	if ARGS[1] = 185:$RESULT = 'A black bikini with a a multi-colored top and a classic bikini bottom.'
-	if ARGS[1] = 186:$RESULT = 'A red bikini top with a deep plunge that shows off your cleavage and a small classic bottom.' 
-	if ARGS[1] = 187:$RESULT = 'A black bikini with a deep-plunge top and a thong that shows your body off with minimum decency.'
-	if ARGS[1] = 188:$RESULT = 'A Navy blue bikini with a tie-back top and a classic bikini bottom.' 
-	if ARGS[1] = 189:$RESULT = 'A bikini with a banded halter-top and a classic bikini bottom, it has stripes of shimmery gold.' 
-	if ARGS[1] = 190:$RESULT = 'A blue bikini with a medium-size triangle top and a string bikini bottom that provides coverage.'
-	if ARGS[1] = 191:$RESULT = 'A green bikini with snake-skin print, with a triangle top and a classic g-string.' 
-	if ARGS[1] = 192:$RESULT = 'A red bikini set with a deep-plunge top and a thong bottom, it has two Navy blue stripes.' 
-	if ARGS[1] = 193:$RESULT = 'A white bikini with blue hen, it has a bralette top and a Brazilian bottom.'
-	if ARGS[1] = 194:$RESULT = 'A black bikini with a tie-back triangle top and a classic bikini bottom.'
-	if ARGS[1] = 195:$RESULT = 'A bikini with a tie-back triangle top and a side-tie classic bikini bottom, it has floral print.'
-	if ARGS[1] = 196:$RESULT = 'A two-piece swimsuit in Indian red, it has a wrap front-tie top and a classic full bottom.'
-	if ARGS[1] = 197:$RESULT = 'A bikini set in assorted pink color, it has a fashionable halter top and a g-string bottom.'
-	if ARGS[1] = 198:$RESULT = 'A red bikini with a triangle top and g-string bottom.'
-	if ARGS[1] = 199:$RESULT = 'A coral bikini set with a fashionable small triangle top and a thong bottom.' 
-	if ARGS[1] = 200:$RESULT = 'A red ruffled bikini with a small triangle top and a thong bikini bottom.' 
-	if ARGS[1] = 201:$RESULT = 'A yellow bikini with white polka dots, it has a small triangle top with a deep plunge and a side-string thong bottom.'
-	if ARGS[1] = 202:$RESULT = 'A blue bikini set with decorative black flourishing, it has a triangle top and a side-string bottom.' 
-	if ARGS[1] = 203:$RESULT = 'A pink bikini set with white polka dots, it has a plunged triangle top and a side-tie bikini bottom.'
-	if ARGS[1] = 204:$RESULT = 'A micro monochrome stripes bikini with a bralette top and a thong bottom.'
-	if ARGS[1] = 205:$RESULT = 'A coral bikini set with a deep-plunge bralette top and a thong bottom.'
-	if ARGS[1] = 206:$RESULT = 'A bikini set in medium Pearwood color, it has a scoop plunge top and a classic full bikini bottom.'
-	if ARGS[1] = 207:$RESULT = 'A bikini set with blush tone print, it has a bralette top and a classic full bikini bottom.'
-	if ARGS[1] = 208:$RESULT = 'A bikini set with a smocked triangle top and a cheeky bikini bottom.'
-	if ARGS[1] = 209:$RESULT = 'A string bikini set with red palette print, it has a small triangle top and a cheeky string bikini.' 
-	if ARGS[1] = 210:$RESULT = 'A bikini in baby blue color, it has a wrap top and a classic bikini bottom.'
-	if ARGS[1] = 211:$RESULT = 'A bikini set with floral print, it has a triangle top and a Brazilian bottom.'
-	if ARGS[1] = 212:$RESULT = 'A two-piece swimsuit in the color pine green, it has a full coverage top and a thong bikini bottom.'
-	if ARGS[1] = 213:$RESULT = 'A two-piece swimsuit in the color black, it has a halter top with transparent mesh and a double-strap thong bottom.'
-	if ARGS[1] = 214:$RESULT = 'A two-piece swimsuit that looks like one-piece. It has a tankini top and a classic full bikini bottom.' 
+	if ARGS[1] = 159:$RESULT = 'A black bikini set with a triangle top and a little thong bottom that shows off your booty quite nicely.'
+	if ARGS[1] = 160:$RESULT = 'A bikini set in black, it has a cross-string top and a Brazilian bottom. It hugs your curves quite nicely.' 
+	if ARGS[1] = 161:$RESULT = 'A bikini set in purple, it has a v plunge bralette top and a thong bottom. It shows your booty nicely.'
+	if ARGS[1] = 162:$RESULT = 'A bikini set in azure, it has a Bandeau top and a string bikini bottom.'
+	if ARGS[1] = 163:$RESULT = 'A bikini set in the color fuchsia, it has a triangle top and a tiny thong bottom that provide little back coverage.'
+	if ARGS[1] = 164:$RESULT = 'A bikini set with a triangle top and a thong bottom in color fuchsia with floral prints.' 
+	if ARGS[1] = 165:$RESULT = 'A blue bikini set with a triangle top and a thong bottom, it has white floral print and looks fun and flirty.' 
+	if ARGS[1] = 166:$RESULT = 'A bikini set with a triangle top and a Brazilian bottom in Tiffany Blue, it''s both functional and fashionable.'
+	if ARGS[1] = 167:$RESULT = 'A red bikini set with a triangle top and a Brazilian bottom that gives plenty of coverage yet remains flirty!'
+	if ARGS[1] = 168:$RESULT = 'A bikini set with a triangle tie-back top and a Brazilian bottom in the color Taffy, it looks fun and flirty.'
+	if ARGS[1] = 169:$RESULT = 'A bikini set that has a rather revealing halter top and a small string bottom in the color Thunder.'
+	if ARGS[1] = 170:$RESULT = 'A bikini set in the color scarlet, it has a triangle tie-back top and a side-string bottom, classy and flirty.'
+	if ARGS[1] = 171:$RESULT = 'A black bikini set with a bralette top and a full bottom, it has supportive-cup, highly comfortable yet still classy.'
+	if ARGS[1] = 172:$RESULT = 'A black bikini set with a bralette top and a full bottom, it has the classy vibe to it.' 
+	if ARGS[1] = 173:$RESULT = 'A bikini set in the Cerulean color, it has a classic bottom as well as a tie-back top that reveal part of the cleavage.' 
+	if ARGS[1] = 174:$RESULT = 'A bikini in Sky blue color, it has a fashionable halter-top top and a classic bikini bottom.' 
+	if ARGS[1] = 175:$RESULT = 'A black bikini set with a strapless Bandeau top and a Brazilian bottom, it''s fun and flirty.'
+	if ARGS[1] = 176:$RESULT = 'A bikini in the color Laure, it has a front-tie top and a multi-string bikini bottom.'
+	if ARGS[1] = 177:$RESULT = 'A Triangle grey bikini top with rings and a scrunch Brazilian bottom, it''s both fashionable and functional.'
+	if ARGS[1] = 178:$RESULT = 'A Triangle bikini top with a Brazilian bottom in multi-floral print.'
+	if ARGS[1] = 179:$RESULT = 'A pink ruffled bikini with a triangle top and a thong bottom, it''s both playful and flirty'
+	if ARGS[1] = 180:$RESULT = 'A black bikini set with a triangle top and a g-string bottom.' 
+	if ARGS[1] = 181:$RESULT = 'A red bikini set with a triangle top and a sexy thong bottom.'
+	if ARGS[1] = 182:$RESULT = 'A bikini set with a triangle top and a g-string bottom, its design reveals much of your body.'
+	if ARGS[1] = 183:$RESULT = 'A red bikini with a tie-back top and a cheeky bottom, it''s sassy with class.'
+	if ARGS[1] = 184:$RESULT = 'A black bikini with a a multi-colored top and a classic bikini bottom.'
+	if ARGS[1] = 185:$RESULT = 'A red bikini top with a deep plunge that shows off your cleavage and a small classic bottom.' 
+	if ARGS[1] = 186:$RESULT = 'A black bikini with a deep-plunge top and a thong that shows your body off with minimum decency.'
+	if ARGS[1] = 187:$RESULT = 'A Navy blue bikini with a tie-back top and a classic bikini bottom.' 
+	if ARGS[1] = 188:$RESULT = 'A bikini with a banded halter-top and a classic bikini bottom, it has stripes of shimmery gold.' 
+	if ARGS[1] = 189:$RESULT = 'A blue bikini with a medium-size triangle top and a string bikini bottom that provides coverage.'
+	if ARGS[1] = 190:$RESULT = 'A green bikini with snake-skin print, with a triangle top and a classic g-string.' 
+	if ARGS[1] = 191:$RESULT = 'A red bikini set with a deep-plunge top and a thong bottom, it has two Navy blue stripes.' 
+	if ARGS[1] = 192:$RESULT = 'A white bikini with blue hen, it has a bralette top and a Brazilian bottom.'
+	if ARGS[1] = 193:$RESULT = 'A black bikini with a tie-back triangle top and a classic bikini bottom.'
+	if ARGS[1] = 194:$RESULT = 'A bikini with a tie-back triangle top and a side-tie classic bikini bottom, it has floral print.'
+	if ARGS[1] = 195:$RESULT = 'A two-piece swimsuit in Indian red, it has a wrap front-tie top and a classic full bottom.'
+	if ARGS[1] = 196:$RESULT = 'A bikini set in assorted pink color, it has a fashionable halter top and a g-string bottom.'
+	if ARGS[1] = 197:$RESULT = 'A red bikini with a triangle top and g-string bottom.'
+	if ARGS[1] = 198:$RESULT = 'A coral bikini set with a fashionable small triangle top and a thong bottom.' 
+	if ARGS[1] = 199:$RESULT = 'A red ruffled bikini with a small triangle top and a thong bikini bottom.' 
+	if ARGS[1] = 200:$RESULT = 'A yellow bikini with white polka dots, it has a small triangle top with a deep plunge and a side-string thong bottom.'
+	if ARGS[1] = 201:$RESULT = 'A blue bikini set with decorative black flourishing, it has a triangle top and a side-string bottom.' 
+	if ARGS[1] = 202:$RESULT = 'A pink bikini set with white polka dots, it has a plunged triangle top and a side-tie bikini bottom.'
+	if ARGS[1] = 203:$RESULT = 'A micro monochrome stripes bikini with a bralette top and a thong bottom.'
+	if ARGS[1] = 204:$RESULT = 'A coral bikini set with a deep-plunge bralette top and a thong bottom.'
+	if ARGS[1] = 205:$RESULT = 'A bikini set in medium Pearwood color, it has a scoop plunge top and a classic full bikini bottom.'
+	if ARGS[1] = 206:$RESULT = 'A bikini set with blush tone print, it has a bralette top and a classic full bikini bottom.'
+	if ARGS[1] = 207:$RESULT = 'A bikini set with a smocked triangle top and a cheeky bikini bottom.'
+	if ARGS[1] = 208:$RESULT = 'A string bikini set with red palette print, it has a small triangle top and a cheeky string bikini.' 
+	if ARGS[1] = 209:$RESULT = 'A bikini in baby blue color, it has a wrap top and a classic bikini bottom.'
+	if ARGS[1] = 210:$RESULT = 'A bikini set with floral print, it has a triangle top and a Brazilian bottom.'
+	if ARGS[1] = 211:$RESULT = 'A two-piece swimsuit in the color pine green, it has a full coverage top and a thong bikini bottom.'
+	if ARGS[1] = 212:$RESULT = 'A two-piece swimsuit in the color black, it has a halter top with transparent mesh and a double-strap thong bottom.'
+	if ARGS[1] = 213:$RESULT = 'A two-piece swimsuit that looks like one-piece. It has a tankini top and a classic full bikini bottom.' 
 
 
 elseif $ARGS[0] = 'beach':

+ 5 - 5
locations/_shoe_description.qsrc

@@ -1,16 +1,16 @@
 # $shoe_description
 
-if $ARGS[0] = 'boutique':
+if $ARGS[0] = 'moncheri':
 	$RESULT = 'Mon Chéri shoe number '
-elseif $ARGS[0] = 'pussy':
-	$RESULT = 'Pussy-Cats shoe number '
+elseif $ARGS[0] = 'bomba':
+	$RESULT = 'Tsar Bomba shoe number '
 elseif $ARGS[0] = 'dolls':
 	$RESULT = 'Patchwork Dolls shoe number '
 elseif $ARGS[0] = 'fetish':
 	$RESULT = 'Fetish shoe number '
-elseif $ARGS[0] = 'gandm':
+elseif $ARGS[0] = 'gm':
 	$RESULT = 'G&M shoe number '
-elseif $ARGS[0] = 'trainers':
+elseif $ARGS[0] = 'danilovich':
 	$RESULT = 'Training shoe number '
 end
 

+ 8 - 8
locations/_shoe_image.qsrc

@@ -3,18 +3,18 @@
 !! ARGS 0 - clothing group name
 !! ARGS 1 - clothing index
 
-if $ARGS[0] = 'boutique':
-	$RESULT = 'images/pc/shoes/boutique/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'pussy':
-	$RESULT = 'images/pc/shoes/cats/<<ARGS[1]>>.jpg'
+if $ARGS[0] = 'moncheri':
+	$RESULT = 'images/pc/items/moncheri/shoes/<<ARGS[1]>>.jpg'
+elseif $ARGS[0] = 'bomba':
+	$RESULT = 'images/pc/items/bomba/shoes/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'dolls':
-	$RESULT = 'images/pc/shoes/dolls/<<ARGS[1]>>.jpg'
+	$RESULT = 'images/pc/items/dolls/shoes/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'fetish':
 	$RESULT = 'images/pc/shoes/fetish/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'gandm':
-	$RESULT = 'images/pc/shoes/g&m/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'trainers':
-	$RESULT = 'images/pc/shoes/trainers/<<ARGS[1]>>.jpg'
+	$RESULT = 'images/pc/items/gm/shoes/<<ARGS[1]>>.jpg'
+elseif $ARGS[0] = 'danilovich':
+	$RESULT = 'images/pc/items/danilovich/shoes/<<ARGS[1]>>.jpg'
 end
 
 --- $shoe_image ---------------------------------

+ 1 - 1
locations/albinaRide.qsrc

@@ -30,7 +30,7 @@ act 'Get in':
 		*nl
 		'Yes, because I wanted him to expose us. I gave him the evidence he needed to take down the ringleader."'
 		'"Wait a second. <i>You''re</i> the ''anonymous source''? Why?" you ask in confusion. "I have my reasons." is all she says in reply and continues driving in silence.' 
-		'After driving for a while, you reach her house. She drives through the gate and stops outside the front door. She tells you to follow her and exits the car.'
+		'After driving for a while, you reach her house. She drives up the driveway and stops outside the front door. She tells you to follow her and exits the car.'
 	end
 
     act 'Go with Albina':gt 'albinahome', 'start' 

+ 16 - 16
locations/AlbFatherQW.qsrc → locations/albina_election_events.qsrc

@@ -1,4 +1,4 @@
-# AlbFatherQW
+# albina_election_events
 !!This is intended to happen during the election run, so should fire around the time that the "Vote Boris!" posters start appearing.
 !!Add trigger depending on whether or not Sveta gave a statement so Albina can talk about her choice later.
 
@@ -6,15 +6,15 @@ AlbinaQW['RideDaystart'] = daystart + rand(2,5)
 
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
-'A car pulls up next to you. A man wearing a nice suit steps out and introduces himself. "Captain Chernov, State Security Service." he says and pulls out his badge. "Why are you here? What did I do? Am I under arrest?" you ask in panicked surprise. He ignores you and continues.' 
-'"You are <<$pcs_firstname>> <<$pcs_lastname>>, correct? Let''s step aside and have a chat."'
+'A car suddenly pulls up next to you and a man wearing a nice suit and hat steps out and introduces himself. "Captain Chernov, State Security Service." he says and pulls out his badge. "Why are you here? What did I do? Am I under arrest?" you ask in panicked surprise. He ignores you and continues.' 
+'"You are <<$pcs_firstname>> <<$pcs_lastname>>, correct? Please come and sit in my car. We need to have a little chat."'
 act 'Speak with Chernov':
 	*clr & cla
 	menu_off = 1
 	minut += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
-	'Chernov pulls you aside. Upon closer examination, you notice he is holstering a gun under his left armpit. "Miss <<$pcs_lastname>>, I know that you are a member of Barlovskaya''s entourage. I also know that this is just a front. Their criminal activities are about to be put on hold, with or without your collaboration."
+	'He opens the back door and motions for you to step inside. Upon closer examination, you notice he is holstering a gun under his left armpit and so decide to listen to him. You step inside and he closes the door before sitting in the front passenger seat. A second man sits silently behind the wheel. "Miss <<$pcs_lastname>>, I know that you are a member of Barlovskaya''s entourage. I also know that this is just a front. Their criminal activities are about to be put on hold, with or without your collaboration."
 	"Our little talk here is quite important. When this case starts getting coverage, the whole town will know about the Starlets'' secret. We''ll have to inform your parents and your school that you were an illegal prostitute for Barlovskaya. You can testify anonymously like the other girls and keep your name out of it if you wish."'
 
 	act 'Ask him what he means':
@@ -22,10 +22,10 @@ act 'Speak with Chernov':
 		minut += 1
 		gs 'stat'
         '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
-		if age < 18:'"Albina didn''t whore me out!" you protest. Chernov smiles. "I never said it was Albina, did I? All you have to do is give me your testimony stating that you are underage and were forced into an illegal prostitution ring. You don''t have to worry about Albina. We''ll keep her safe from any consequences of her actions."'
-		if age >= 18:'"Albina didn''t whore me out!" you protest. Chernov smiles. "I never said it was Albina, did I? All you have to do is give me your testimony stating that you were forced into an illegal prostitution ring. You don''t have to worry about Albina. We''ll keep her safe from any consequences of her actions."'
+		if age < 18:'"Albina didn''t whore me out!" you protest, Chernov just smiles. "I never said it was Albina, did I? All you have to do is give me your testimony stating that you are underage and were forced into an illegal prostitution ring. You don''t have to worry about Albina. We''ll keep her safe from any consequences of her actions."'
+		if age >= 18:'"Albina didn''t whore me out!" you protest, but Chernov just smiles. "I never said it was Albina, did I? All you have to do is give me your testimony stating that you were forced into an illegal prostitution ring. You don''t have to worry about Albina. We''ll keep her safe from any consequences of her actions."'
 
-		'He pauses and gives you time to think before continuing. "We already have enough evidence through an anonymous source and statements from your fellow dancers to take down these activities, but your testimony will help solidfy the prosecution. Your name will be kept from the media, of course."'
+		'He pauses and gives you time to think before continuing. "We already have enough evidence through an anonymous source and statements from your fellow dancers to take down these activities, but your testimony will help solidfy the prosecution. Your name will be kept secret, of course."'
 
 		if pcs_intel >= 70:
 			act 'Ask why the Security Service is involved':
@@ -33,7 +33,7 @@ act 'Speak with Chernov':
 				minut += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
-				'"What is so important about Albina that the Security Service are involved?" you ask. Chernov raises a brow. "You''re a smart girl, huh? You know Boris Barlovskaya, her father? He''s a retired police officer who served as the chief of police for years. In his retirement, we believe he has formed connections with the local criminal syndicate and is bribing his successor to block any investigations."'
+				'"What''s so important about Albina that the Security Service are involved?" you ask and Chernov raises a brow. "You''re a smart girl, huh? You know Boris Barlovskay, her father? He''s a retired police officer who served as the chief of police for years. In his retirement, we believe he has formed connections with the local criminal syndicate and is bribing his successor to block any investigations."'
                 '"Your friend is our way in. All we need to do is prove that Albina''s dance troupe is actually a front for illegal prostitution. We need your statement Miss <<$pcs_lastname>>."'
 				if pcs_intel >= 75:
 					act 'Ask about Albina''s involvement':
@@ -42,7 +42,7 @@ act 'Speak with Chernov':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
 						'"How could Albina''s affairs affect her father?" you ask.'
-						'"It''s very simple really." he replies. "Barlovskaya wishes to become the mayor. We don''t want him running the town and so exposing the family affairs is how we are going to prevent that from happening."'
+						'"It''s very simple really." he replies. "Barlovskay wishes to become the mayor. We don''t want him running the town and so exposing the family affairs is how we are going to prevent that from happening."'
 						dynamic $din_zajava_albfather
 						dynamic $din_zajava_albfather_no
 					end
@@ -67,14 +67,14 @@ $din_zajava_albfather = {
 		AlbinaQW['Chernov'] = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
-		'You agree to write a statement and Chernov nods. "You''re a smart girl. Come to the car, I have everything there to take down your statement."'
+		'You agree to write a statement and Chernov nods. "You''re a smart girl. Just write your statement here and sign it." he says as he hands you a pen and paper.'
 
 		act 'Go with Chernov':
 			*clr & cla
 			minut += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
-			'You write your statement and he lets you go without a fuss. "You''ve really helped us here Miss <<$pcs_lastname>>. Thank you." He gets in the car and it drives away.'
+			'You write your statement and he lets you go without a fuss. "You''ve really helped us here Miss <<$pcs_lastname>>. Thank you." He motions for you to leave the car and it drives away as soon as you close the door.'
 
 			act 'Call Albina':
 				*clr & cla
@@ -83,7 +83,7 @@ $din_zajava_albfather = {
 				AlbinaQW['StarletsShutDown'] = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/activities/calling_outdoor.jpg"></center>'
-				'You quickly dial Albina''s number and, in a panic, tell her what happened. She calms you down and asks if you told them anything. She sounds pleased when you tell her that you did. She thanks you and hangs up...'
+				'You quickly dial Albina''s number and, in a panic, tell her what happened. She calms you down and asks if you told them anything. She sounds pleased when you tell her that you did. She thanks you and hangs up without another word, leaving you a little confused.'
 
 				act 'Leave':gt 'pav_commercial'
 			end
@@ -100,7 +100,7 @@ $din_zajava_albfather_no = {
 		minut += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
-		'You are reluctant to write a statement, but the captain keeps trying. "Look, I know you''re scared right now, but do you really not want to help stop this illegal exploitation of you and your friends? I promise you, nothing will happen to Albina."'
+		'You are reluctant to write a statement, but Chernov keeps trying. "Look, I know you''re scared right now, but do you really not want to help stop this illegal exploitation of you and your friends? I promise you, nothing will happen to Albina."'
 
 		if pcs_intel >= 80:
 			act 'Why should you give him information?':
@@ -108,7 +108,7 @@ $din_zajava_albfather_no = {
 				minut += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
-				'"If you have everything you need, then why do you need my testimony?" you ask. He sighs. "To be honest, we don''t. Like I said, we got more than enough from the other girls, but a statement from you would still help us out and hopefully guarantee our success."'
+				'"If you already have everything you need, then why do you need my testimony?" you ask and he sighs. "To be honest, we don''t. Like I said, we got more than enough from the other girls, but a statement from you would still help us out and hopefully guarantee our success."'
 				'"What about Albina? Have you questioned her? I doubt she would act against her father." you ask. "We have other arrangements for her." is all he says in reply.'
 				dynamic $din_zajava_albfather
 				dynamic $din_zajava_albfather_no2
@@ -129,7 +129,7 @@ $din_zajava_albfather_no2 = {
 		AlbinaQW['Chernov'] = 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/chernov.jpg"></center>'
-		'While a part of you wants to help, you don''t trust him and refuse to help. He sighs in resignation. "If that''s how it''s going to be, but just remember... you could have made that one bit of difference." He gets back in the car and it drives away.'
+		'While a part of you wants to help, you don''t trust him and refuse to help. He sighs in resignation. "If that''s how it''s going to be, but just remember... you could have made that one bit of difference." He motions for you to get out of the car and it drives away as soon as you close the door.'
 
 		act 'Call Albina':
 			*clr & cla
@@ -145,4 +145,4 @@ $din_zajava_albfather_no2 = {
 	end
 }
 
---- AlbFatherQW ---------------------------------
+--- albina_election_events ---------------------------------

+ 37 - 33
locations/albinahome.qsrc

@@ -15,16 +15,16 @@ if $ARGS[0] = 'start':
 	if AlbinaQW['albride'] = 1:
 		AlbinaQW['albride'] = 2
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
-		'Albina leads you to the sitting room and disappears into the kitchen. While she is gone, her phone vibrates on the table. You look and see that "Mother" is trying to call her. "Strange. She''s never mentioned her mother." you think to yourself.'
-		'The phone rings out as Albina returns with a bottle of wine and two glasses. She places them on the table and notices her missed call. She frantically picks her phone up and types a message before stuffing it in her pocket, giving you a weak smile. "Don''t worry about who that was <<$pcs_firstname>>. I have a bottle of fine wine for us to drink!"'
+		'Albina leads you to the rather well furnished and decorated sitting room. "You''ll have to excuse the mess. The maid was...loyal to my father, so she had to go." She then disappears into the kitchen. While she is gone, her phone vibrates on the table. You look and see that "Mama" is trying to call her. "Strange. She''s never mentioned her mother. Hell, she barely talks about her father." you think to yourself.'
+		'The phone rings out as Albina returns with a bottle of wine and two glasses. She places them on the table and notices her missed call. She frantically picks her phone up and types a message before stuffing it in her pocket, giving you a weak smile. "Don''t worry about who that was <<$pcs_firstname>>."'
 		act 'Drink':
 			*clr & cla
 			minut += 15
 			gs 'drugs', 'alcohol', 'wine'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
-			'She pours wine into the glasses and hands you one, sitting down next to you.'
-			'You drink together with Albina. A smile beams across her face. "He''s gone! He''s finally gone!"'
+			'"This is, <i>was</i>, one of my father''s favourite things. A bottle of stupidly expensive wine that he always refused to open. So let''s fucking open it!" she says as she pours the contents into the glasses and hands you one before sitting down next to you.'
+			'She raises her glass as a wide smile beams across her face. "He''s gone! He''s finally gone!"'
 			'She swiftly drinks all of her wine. "He was going down hard. I''ve been gathering evidence for years. All his emails, text messages, phone calls and witnesses all proving what a scumbag he is. I finally gathered enough to take him down!"'
 			act 'Ask how her father reacted':
 				*clr & cla
@@ -33,23 +33,23 @@ if $ARGS[0] = 'start':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/drink_wine.jpg"></center>'
 				'"And how did he react when he found out about you going behind his back?" you ask.'
-				'Albina scoffs and tops up her glass with more wine. "Why does it matter? He''s gone and will be gone for a long time."'
+				'She scoffs and tops up her glass with more wine. "Why does it matter? He''s gone and will be gone for a long time."'
 				'"Hate him that much?" you ask as you take a sip from your glass.'
-				'Albina just glares at you. "Let''s just drink." she scorns.'
+				'She just glares at you in repsonse. "Let''s just drink." she scorns.'
 				'You sit quietly for a while, sipping your wine while Albina again gulps down the contents of her glass. She sits in silence before suddenly screaming and throwing the glass in frustration, shattering it as it hits the wall.'
-				'"FUCKING BASTARD!! If there is a hell, there is a special place reserved just for you to suffer for what you''ve done you fucking creep!!"'
+				'"FUCKING BASTARD!! If there is a hell, there is a special place reserved just for you to suffer for what you''ve done you fucking creep!!" she screams before burying her head in her knees.'
 				act 'Ask what she''s talking about':
 					*clr & cla
 					minut += 15
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
-					'"What are you talking about?" you ask, startled by her outburst. Albina looks at you meekly as tears well up in her eyes.'
-					'"<<$pcs_nickname>>, my father has abused me from such an early age, I don''t even remember when it all began. I''ve spent my entire life being his plaything." she tearfully admits.'
-					'"When my mother found out, he used his connections to stop her taking me with her when she left him."'
+					'"What are you talking about?" you ask, startled by her outburst. Albina looks up at you meekly as tears well up in her eyes.'
+					'"<<$pcs_nickname>>, my father has abused me since my mother left when I was young. My father never wanted a child and made no effort to bond with me, but he''s an asshole and used his connections to stop my mother taking me away with her when she divorced him." she tearfully admits.'
+					'It was his fault she left him, but he blamed me and made sure I suffered for it with years of bullying and emotional abuse."'
 					*nl
-					'But now that he''s going down, she''s come back to live with and look after me. Get me counselling if I need it, you know? That''s why she''s always checking up on me. She''s on edge about what my father can do, even in prison."'
-					'She continues. "The truth is his political campaign never took off. He loved abusing his position as a cop to bully others, including me, but when he retired, he didn''t have that power anymore. A political career was his chance to get that back."'
-					'"Nobody was willing to back him however." She stops talking for a few seconds and you can clearly see her hands shaking. "That''s when... that''s when he decided to... whore me out to his friends. For ''a bit of fun'' with me, they would ''donate'' to his campaign fund.". She is on the verge of bursting into tears in front of you.'
+					'Now that he''s going down, she''s finally come back to look after me and help me deal with everything. She''s always checking up on me since she''s on edge about what my father can do, even in prison."'
+					'She continues. "The truth is his political campaign never took off. He loved abusing his position as a cop to bully others, especially me, but when he retired, he didn''t have that power anymore. A political career was his chance to get that back."'
+					'"Nobody was willing to back him however, and that''s when his abuse went beyond simply being emotional." She stops talking for a few seconds and you can clearly see her entire body shaking. "That''s when... that''s when he decided to... whore me out to his friends. For ''a bit of fun'' with me, they would ''donate'' to his campaign fund.". She is on the verge of bursting into tears in front of you.'
 
 					act 'Your father did what?':
 						*clr & cla
@@ -57,13 +57,15 @@ if $ARGS[0] = 'start':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
 						'"Your own father sold your body to fund his election? That''s horrible!" you exclaim in shock.'
-						'Albina sits in silence before quietly nodding. "However, I wasn''t earning enough for him. That''s when he discovered my dance troupe and forced me to start selling my friends instead. I had to <<$pcs_nickname>>! I had to!" she tearfully exclaims.'
-						'"I was forced to let those fucking perverts do whatever they pleased with my friends <<$pcs_nickname>>! They were humiliated, abused and degraded for some fucking rubles! Rubles that the fucking bastard spent on his own whores that he mistreated instead of his campaign!"'
+						'She sits in silence before quietly nodding. "However, I wasn''t earning enough for him. That''s when he discovered my dance troupe and forced me to start selling my friends instead. I had to <<$pcs_nickname>>! I had to!" she tearfully exclaims.'
+						'"I was forced to let those fucking perverts do whatever they pleased with my friends <<$pcs_nickname>>! They were humiliated, abused and degraded for some fucking rubles! Rubles that the fucking bastard spent on his own whores that he mistreated instead of his campaign!' 
+						*nl
+						'The creep even hired the youngest and most attractive maid he could find just so he could fulfill his fantasy of having sex with one. The worst thing about it? She fucking enjoyed it and even encouraged him! I still have nightmares of when I was 9 and I stumbled into his room when they were having sex..." She shudders heavily before continuing. "I grew up having to listen to them fuck like rabbits, so the first thing Mama did when she got here was fire that disgusting fucking whore. I gave her an ''honest'' reference as a parting gift."'
                         !! if virgin or not
 						if pcs_vag = 0 and stat['vaginal'] = 0: 
-						'"That''s why I didn''t get you involved. Too many girls have to hide the fact that those bastards were their first time. I wasn''t going to let it happen again. But what he did to me..." Tears are streaming down her cheeks at this point.'
+						'"Anyway, that''s why I didn''t get you involved in any of this. Too many of my friends have to hide the fact that those bastards were their first time and I wasn''t going to let it happen again with you. What he did to me though..." Tears are streaming down her cheeks at this point.'
 						else 
-						'"Then you joined and my father forced me to put you to work as well. Of course, all those nasty creeps jumped at the chance to try out the ''new girl'' once they found out about you. But what he did to me..." Tears are streaming down her cheeks at this point.'
+						'"Anyway, when you joined the group, my father forced me to put you to work as well, despite my best efforts. Of course, all those nasty creeps jumped at the chance to try out the ''new girl'' once they found out about you. What he did to me though..." Tears are streaming down her cheeks at this point.'
 						end
 						
 						act 'What did he do?':
@@ -71,11 +73,13 @@ if $ARGS[0] = 'start':
 							minut += 15
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
-							'"What did he do?" you ask.'
+							'"What did he do?" you ask softly and place a hand on her shoulder.'
 							'"It was bad enough being forced to whore out my friends to abusive creeps who almost choked them to death, but... but..."'
-							'"But what?" you ask softly. She steels herself before answering you. "If I didn''t get the girl the guys wanted, my father said it was perfectly fine for them to take me and do what they wanted, even rape me." she cries.'
-							'"They would take their anger at not getting the girl they wanted out on me. I would be choked, slapped, even spat on! Some nights, I''d come home and he would berate me for not ''helping his donors'' and I would be subjected to his abuse as well. Other times, he would bring his friends home and let them have their way with me. One guy or four, he didn''t care what they done to me so long as they paid.'
-							'"My dad abusing me my entire life while running a prostitution ring where my friends were subjected to abusive sexual exploitation... and I... I couldn''t do anything about it!" The words barely make it out of her mouth before she bursts into a flood of tears.'
+							'"But what?" you ask softly and she steels herself before answering. "If I didn''t get the girl the guys wanted, my father said it was perfectly fine for them to take me and do what they wanted, even rape me." she cries.'
+							'"Some would take their anger at not getting the girl they wanted out on me. I would be choked, slapped, even spat on! Some nights, I''d come home and he would berate me for not ''helping his donors'' and I would be subjected to his abuse as well. Other times, he would bring his friends home and let them have their way with me. One guy or four, he didn''t care what they done to me so long as they paid.' 
+							'"That fat and disgusting Armenian pervert visited often. One time, he choked me unconscious so he could cum inside me, and when I awoke and realised what he had done, I started panicking about getting pregnant. That''s when I heard my asshole father downstairs arguing with him about what effect a pregnant teenage daughter would have on his campaign! My wellbeing was of no concern to him, but luckily, I was on the pill for this sort of thing happening. It did spook him into making a strict rule to pull out if they weren''t using a condom though."'
+							*nl
+							'She turns and looks directly into your eyes, tears now running down her cheeks. "So yeah, my father abused me while running an underage prostitution ring where me and my friends were subjected to abusive sexual exploitation... and I... I couldn''t do anything about it!" The words barely make it out of her mouth before she bursts into a flood of tears.'
 
 							act 'Comfort her':
 								*clr & cla
@@ -83,8 +87,8 @@ if $ARGS[0] = 'start':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissingattempt.jpg"></center>'
 								'You cradle her head against your chest as she sobs away, her tears soaking into your top. "Hey, hey. But you did do something about it. He''s going to prison for what he done!" you reassure her while softly stroking her hair.'
-								'She sits up, her eyes puffy from crying and wipes away her tears. "Yeah, yeah you''re right <<$pcs_nickname>>. I just got tired of watching my friends suffer when they didn''t deserve any of this. So I exposed him as what he is. A vile fucking creep!"'
-								'"I just wanted to live my life without fearing what my own father, or any other man for that matter, would do to me. For the longest time, I was just too fucking submissive. I done what I should have years ago. Got what I wanted, when I wanted." she says before looking intently into your eyes.'
+								'She sits up, her eyes puffy from crying and wipes away her tears. "Yeah, yeah you''re right <<$pcs_nickname>>. I just got tired of watching my friends suffer when they didn''t deserve any of this. So I exposed him for what he is. A vile fucking sex creep!"'
+								'"I just wanted to live my life without fearing what my own father would do to me. For the longest time, I was just too fucking submissive. I done what I should have years ago. Got what I wanted, when I wanted." she says before looking intently into your eyes.'
 								'You smile at her and are about to reply when she suddenly leans in and tries to kiss you.'
 								gs 'willpower', 'cuni', 'resist', 'medium'
 								if will_cost <= pcs_willpwr:
@@ -96,10 +100,10 @@ if $ARGS[0] = 'start':
 										gs 'drugs', 'alcohol', 'wine'
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort1.jpg"></center>'
-										'You pull away from her, not wanting to kiss her. "Sorry I just..." She jumps back from you, almost falling from the sofa.'
-										'"Sorry <<$pcs_nickname>>! I don''t know what came over me! It''s just... I''ve suffered a lot from all the men in my life... so I enjoy seeking... comfort from girls, if you know what I mean..." You don''t want to kiss her, but she clearly needs reassurance. You place her head on your shoulder and gently stroke her hair for the next few minutes.'
-										'She seems to appreciate this and sits up. "I should really get going." you say and Albina nods her head in understanding. "I will see you later OK?" you reassure her.'
-										'She smiles at you. "Of course and... thank you <<$pcs_nickname>>. It was nice to just let this all out and talk about it to someone. I''m glad it was you and that I can call you my friend." You smile at her and start leaving when she runs up and embraces you in a tight hug before walking you to the door.'
+										'You pull away from her, not wanting to kiss her. "Sorry I just..."' 
+										'She jumps back from you, almost falling from the sofa. "Sorry <<$pcs_nickname>>, I don''t know what came over me! It''s just... I''ve suffered a lot at the hands of men, so I enjoy seeking... female comfort at times, if you know what I mean..." You don''t want to kiss her, but she clearly needs reassurance. You place her head on your shoulder and gently stroke her hair for the next few minutes.'
+										'She seems to appreciate this and sits up. "I should really get going." you say and Albina nods her head in understanding. "I''ll see you later, okay?" you reassure her.'
+										'She smiles at you. "Of course and... thanks <<$pcs_nickname>>. It was nice to just let this all out. I''m glad I can call you my friend." You smile at her and start leaving when she runs up and embraces you in a tight hug that''s entirely uncharacteristic of her before walking you to the door.'
 
 										act 'Continue':gt 'pav_residential'
 									end
@@ -153,7 +157,7 @@ if $ARGS[0] = 'start':
 												'Albina lets out a pleasured scream as her pussy twitches and sprays a huge amount of her juices across your face. You buckle as your own orgasm overwhelms you and you scream loudly. You both collapse in ecstasy.'
 												'Albina pulls her herself up and turns back around, cuddling into you. "I didn''t take you for a squirter!" you laugh. She smirks. "I''ve been with a few girls <<$pcs_nickname>>, but you gave me the greatest orgasm I''ve ever had! I think that was the biggest squirt I''ve ever done!"'
 												'She leans over and grabs some tissues from a box on a nearby table, handing you some to clean your face. She runs her hand over her still twitching pussy. "I think I''m still cumming!" she says. You both lie on the sofa, your powerful orgasms pulsing through the both of you. You eventually recover and manage to get dressed.'
-                                                'Albina remains on the sofa, pussy juices still trickling from her. "Thanks <<$pcs_nickname>>. It was nice to let it all out and just talk about it... among other things." she smirks. "Thanks for being a good friend." You smile at her and start leaving when she suddenly embraces you in a tight hug, her breasts squeezing against you, before walking you to the door.' 
+                                                'Albina remains on the sofa, pussy juices still trickling from her. "Thanks <<$pcs_nickname>>. It was nice to let it all out... and I''m not just talking about my feelings." she smirks. "Thanks for being a good friend." You smile at her and start leaving when she suddenly embraces you in a tight hug, her breasts squeezing against you, before walking you to the door.' 
 												gs 'arousal', 'kiss', 30
 												$orgasm_or = 'yes'
 												gs 'arousal', 'cuni', 30
@@ -179,7 +183,7 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/train.jpg"></center>'
 			'Albina is training in her room, doing some stretching exercises.'
-			'She is wearing a pair of skin tight yoga pants that show off her toned body quite well.'
+			'She''s wearing a pair of skin tight yoga pants that show off her toned body quite well.'
 			act 'Ask why she doesn''t train at the gym':
 				*clr & cla
 				AlbinaQW['SportHome']  = 1
@@ -275,7 +279,7 @@ if $ARGS[0] = 'poledancing':
 		act 'Rest':gt 'albinahome', 'start'
 	elseif pcs_stren < 40 and pcs_dancero > 50:
 		'You try your best to follow Albina''s instructions, but you end up smacking your head on the pole instead and fall to the floor.'
-		'You are flat on your back and see Albina kneeling over you. "Are you okay <<$pcs_nickname>>? It looks like you''re still too weak for poledancing. We can practice developing your strength instead."'
+		'You are flat on your back and see Albina kneeling over you. "Are you okay <<$pcs_nickname>>? It looks like you''re still too weak for poledancing, so we need to develop your strength instead."'
 		'You nod at her and she pulls you to your feet, checking your head. "It might bruise, but otherwise you look fine." she says.'
 		act 'Develop strength (2:00)':
 			*clr & cla
@@ -433,7 +437,7 @@ if $ARGS[0] = 'playgame':
 		'You laugh and nod. "Sure, but you are so going down."'
 		'She laughs in response. "You''re that sure? Then 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 goes over to her dresser. She rummages around in it for a moment before pulling out a strapon harness with a large black dildo attached. "I bought this the other day, just for fun. The winner gets to use it on the loser how ever they want." she says with a smirk.'
+		'She grins at you, gets up and goes over to her dresser. She rummages around in it for a moment before pulling out a strapon harness with a large black dildo attached. "I bought this the other day, just for fun. The winner gets to use it on the loser... how ever they want." she says with a smirk.'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -448,7 +452,7 @@ 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. 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 is some stuff I need to take care of." she says as she turns the consloe off.'
+				'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 is 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':gt 'pav_residential'
 			end
@@ -565,7 +569,7 @@ if $ARGS[0] = 'fuck_albina_ass':
 		*clr & cla
 		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. You grab onto her hips and start fucking her balls deep, filling her ass with the entire dildo. After several minutes, you feel her ass tighten around your fake cock and she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
+		'"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. You grab onto her hips and start fucking her balls deep, filling her ass with the entire dildo as she reaches back and starts rubbing her clit. After several minutes, you feel her ass tighten around your fake cock and she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy. 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 continue leaking from her pussy. "Oh fuck yes <<$pcs_nickname>>! That was fucking amazing!"'
 		'"Fucking such a nice looking ass was amazing!" you reply and you both laugh.'
 		gs 'arousal', 'anal_strap_give', 5, 'lesbian'

+ 11 - 11
locations/alexandriaEv.qsrc

@@ -160,7 +160,7 @@ if $ARGS[0] = 'interview2':
 				'"Well... basically she told me that your magic was somewhat altered on your quest for the Talisman''s power and that a simple scare turned your hair white, but if you ask me, it suits your style, I can''t blame the photographer for thinking that you... were... a model?"'
 				'Is like looking a train wreck, as Alexandria''s face goes darker at your dialogue. Finally, you shut up as she grit her teeth and with words full of contempt.'
 				'"I can assure you, that I have total control over my magic, hmpf... More importantly than that, my hair didn''t turned white because like some simpleton, I was scared by a toad in the dark. I''m a natural blonde, and I take good care of my hair, it''s one of the few things that Rikudo''s curse hasn''t altered, because... surprise! that trickster seemed to have forgotten to say you something important... I am a man!'
-			end if
+			end
 			minut += 2
 			gs 'stat'
 
@@ -202,7 +202,7 @@ if $ARGS[0] = 'interview2':
 			act '"A man?"':gt'alexandriaEv','interview3'
 		end
 	end
-end if
+end
 
 if $ARGS[0] = 'interview3':
 	'<center><b><font color="maroon">Aleksei?</font></b></center>'
@@ -217,8 +217,8 @@ if $ARGS[0] = 'interview3':
 			'"Yes Mr. Ivanov... I am another victim of Rikudo''s games, that is the reason for my interest in you."'
 		else
 			'"Yes... Cursed by Rikudo, the being that created The Talisman of Power, and the reason for my interest in you."'
-		end if
-	end if
+		end
+	end
 	'After this little revelation, he exhales a big puff of smoke, and continue with his explanation.'
 	'"As I remember telling you the last time we meet, my name is Aleksei, and the hows and whys of my curse it''s better to leave them for another time, suffice is to say, that is my understanding, that you and your relation with the powers that have been transferred to your persona, holds the key to break my current predicament. As you can see from our early confrontation, the powers that be, wanted the monopoly over your attention, so I looked for an alternative, that is the reason after the... convoluted way we meet in Aphrodite, hm... as an afterthought, if you want to know, I took care of that little parasite, banishing it."'
 	'As he gives you this explanation, the pieces of the puzzle click in your head, and begin to explain his conduct, but there is a thing to explain.'
@@ -292,7 +292,7 @@ if $ARGS[0] = 'interview3':
 					'"<<$pcs_lastname>>, is that your answer? Do you question my decision without knowing if it was the only solution?" He exhales another puff and you can see how he clenches his teeth "let''s be clear <<$pcs_lastname>>, Reinhold and I did oaths to protect the inhabitants of this world from beings like <i>It</i>, and at-risk to offend your morality, this was necessary."'
 					'Aleksei say this as a matter of fact, before tilting his head like he was hearing something.'
 					'"Hm... Interesting. <<$pcs_lastname>> we have company."'
-				end if
+				end
 				minut += 2
 				gs 'stat'
 
@@ -312,9 +312,9 @@ if $ARGS[0] = 'interview3':
 
 				act 'End the interview':gt'alexandriaEv','interview4'
 			end
-		end if
-	end if
-end if
+		end
+	end
+end
 
 if $ARGS[0] = 'interview4':
 	AlexandriaQW = 7
@@ -339,7 +339,7 @@ if $ARGS[0] = 'interview4':
 		'"I must admit, that this has ended better than I expected <<$pcs_lastname>>, is my impression that you have the potential to master the high arts, and... even taking into consideration, my personal interest on you, I''m tempted to offer you something."'
 		'Aleksei put out the cigarette in an ashtray, the next words exiting somewhat excited from his mouth.'
 		'"I offer you the possibility of an apprenticeship under my wing. This will protect you, partially from The Council and Reinhold interests, but, I expect respect and diligence, so... until the next time and remember, my door is open only on daily hours."'
-	end if
+	end
 	minut += 4
 	gs 'stat'
 
@@ -357,9 +357,9 @@ if $ARGS[0] = 'interview4':
 		'"You told her that? And she confirmed it? Because I don''t have much information about..." You blink surprised at her lack of concern, which prompts her to sigh and change the theme. "<<$pcs_nickname>>, when I talked about Reinhold and The Council, I was... well, <i>having fun at your expense</i>. But the truth is that you must be a little wary of their intentions. I wanted to win some time before talking to Reinhold and prevent, that some red-lipped succubus charmed you away to some gilded cage, and for Alexandria... Look, is my fault ok? I wasn''t expecting for you to run after her, but <<$pcs_nickname>>, you must understand that she is the equivalent of a walking magical WMD. She can impose terms at The Council, and ending on her grasp... Well, that can trigger all sort of bad scenarios with you in the middle, something that Reinhold is trying to prevent."'
 		'After this explanation, that you don''t know if belive, Tatiana turn back and return to her hideout, leaving you alone to digest the new situation.'
 
-		act 'Continue':gt'psiklin','start'
+		act 'Continue':gt'city_suburbs','start'
 	end
-end if
+end
 
 --- alexandriaEv ---------------------------------
 

+ 8 - 8
locations/andreihunter.qsrc

@@ -133,7 +133,7 @@ else
 
 										act'Continue':gt $loc, $loc_arg
 									end
-								end if
+								end
 							end
 							act 'Push away':
 								*clr & cla
@@ -147,7 +147,7 @@ else
 								act'Leave':gt $loc, $loc_arg
 							end
 						end
-					end if
+					end
 					act'Leave':gt $loc, $loc_arg
 				end
 			else
@@ -178,7 +178,7 @@ else
 
 						act 'Go':gt 'hunterLoveSex','Andrei'
 					end
-				end if
+				end
 				if rand(0,9) = 0:
 					act 'Break up with Andrei':
 						*clr & cla
@@ -191,11 +191,11 @@ else
 
 						act 'Leave':gt $loc, $loc_arg
 					end
-				end if
-			end if
-		end if
+				end
+			end
+		end
 		act'Leave':gt $loc, $loc_arg
-	end if
-end if
+	end
+end
 
 --- andreihunter ---------------------------------

+ 3 - 2
locations/andrey.qsrc

@@ -65,6 +65,7 @@ if $ARGS[0] = 'apply':
 			end
 			act 'Take the weekend job':
 				cla
+				work = 1
 				young_shop_work1 = 1
 				minut += 5
 				*nl
@@ -362,7 +363,7 @@ if $ARGS[0] = 'beg':
 			!!if it is possible Sveta never even gave the manager a blowjob previously
 			if young_shop_fired <= 1:
 				'"That''s not fair! You know how much I need this job, just let me give you a blowjob or something like that." You say trying to convince Mr. Sobulyagin to let you have your job back without doing this.'
-			else:
+			else
 				'"That''s not fair! You know how much I need this job, just let me give you a blowjob like usual." You say trying to convince Mr. Sobulyagin to let you have your job back without doing this.'
 			end
 			'"Listen I''m doing you a favor here. It''s well within my rights not to hire back someone who missed work, but I''m not a bad guy. I can see you really want this job," he says while standing up from his chair. "So I''m willing to help you, but you need to prove to me how much you want this job."'
@@ -376,7 +377,7 @@ if $ARGS[0] = 'beg':
 				*nl
 				if young_shop_fired <= 6:
 					'Your face immediately turns beet-red as you try to comprehend what you''ve just heard. "You want me to give you a blowjob... then have anal sex?" You don''t understand what the hell he''s thinking. "There''s no way I''ll do that!"'
-				else:
+				else
 					'"I know I let you do that when I worked for you before" you tell him, "but I''m not going to start doing that again.'
 				end
 				'"Fine then there''s the door," Mr. Sobulyagin snaps clearly upset with your answer.'

+ 57 - 57
locations/anushapt.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'home':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/valeria.jpg"></center>'
 		'You stand outside the Konstantinov household knocking on the door. It takes quite a while before someone actually does come to answer it. In the end, it turns out to be Anushka''s mother.'
-		'Her mother just stands there glaring at you for a while, "Well now, don''t just stand there. What do you want? Oh wait, let me guess you want to see Anushka? Well, the little slut isn''t here, and I don''t know when she''ll be back, so why don''t you just go bother someone else?" Before you can even get a word in, she slams the door in your face, and you hear all the locks click into place. You turn to leave because you don''t have any other option.'
+		'Her mother just stands there, glaring at you for a while. "Well now, don''t just stand there. What do you want? Oh wait, let me guess you want to see Anushka? Well, the little slut isn''t here, and I don''t know when she''ll be back, so why don''t you just go bother someone else?" Before you can even get a word in, she slams the door in your face, and you hear all the locks click into place. You turn to leave because you don''t have any other option.'
 		act 'Move away from the door':gt'pav_complex', 'start'
 	elseif (hour >= 15 and hour < 22) or (week > 5 and hour >= 8 and hour < 22):
 		*clr & cla
@@ -74,8 +74,8 @@ if $ARGS[0] = 'home':
 			act 'Ask how he knows that':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-				'You smile a bit. "How do you know she is taking a shower?"'
-				'He blushes a little bit and sputters "I can hear the water."'
+				'You smile a little. "How do you know she''s taking a shower?"'
+				'He blushes a little and sputters "I can hear the water."'
 				act 'Leave': gt 'pav_complex','start'
 				act 'Enter': gt 'anushapt','hallway'
 				act 'Tease him':
@@ -92,8 +92,8 @@ if $ARGS[0] = 'home':
 			*clr & cla
 			AnushkaLoc = 2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-			'You stand outside the Konstantinov household and wait for Anushka to come open the door.'
-			'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
+			'You stand outside the Konstantinov household and wait for Anushka to come open the door, but Maksim answers instead.'
+			'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring and ask "Is Anushka home?"'
 			'He hooks his thumb over his shoulder to point down the hall. "She''s in her room, likely getting stoned or masturbating to porn or something."'
 			'You ignore his comments and step around to enter the apartment. He closes the door and heads back to his room.'
@@ -103,8 +103,8 @@ if $ARGS[0] = 'home':
 			*clr & cla
 			AnushkaLoc = 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big144.jpg"></center>'
-			'You stand outside the Konstantinov household and hope that Anushka will be the one to come open the door.'
-			'To your relief, Anushka opens the door smiling. "Hi <<$pcs_nickname>>. Come in."'
+			'You stand outside the Konstantinov household and hope that Anushka will be the one to open the door.'
+			'To your relief, she opens the door, smiling. "Hey <<$pcs_nickname>>. Come on in."'
 			act 'Leave': gt 'pav_complex','start'
 			act 'Enter': gt 'anushapt','hallway'
 		elseif nushdoor <= 12 and anushka_tv_day ! daystart:
@@ -113,31 +113,31 @@ if $ARGS[0] = 'home':
 			anushka_tv_day = daystart
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big144.jpg"></center>'
 			'You stand outside the Konstantinov household and hope that Anushka will be the one to come open the door.'
-			'To your relief, Anushka opens the door smiling. "Hi <<$pcs_nickname>>. Come in, I was just watching some TV." As you go inside, she closes the door and heads for the living room where some action movie is playing on the TV. She practically falls down on the couch as she takes a seat.'
+			'To your relief, she opens the door, smiling. "Hey <<$pcs_nickname>>. Come in, I was just watching some TV." As you go inside, she closes the door and heads for the living room where some action movie is playing on the TV. She practically falls down on the couch as she takes a seat.'
 			act 'Take a seat next to her': gt 'anushapt','nushlivroom'
 		elseif nushdoor <= 13:
 			*clr & cla
 			AnushkaLoc = 2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-			'You stand outside the Konstantinov household and wait for Anushka to come open the door.'
-			'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
+			'You stand outside the Konstantinov household and wait for Anushka to open the door, but Maksim answers instead.'
+			'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring and ask "Is Anushka home?"'
-			'With a smug look on his face, he hooks his thumb over his shoulder to point down the hall. "She''s in her room getting pounded like the slut she is by Rad."'
+			'With a smug look on his face, he hooks his thumb over his shoulder to point down the hall. "She''s in her room getting pounded like the slut she is by Radomir."'
 			act 'Leave': gt 'pav_complex','start'
 			act 'Enter':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big154.jpg"></center>'
-				'You ignore his comment and step around to enter the apartment. Just then, you see Radomir walking up the hall towards the door. He''s buckling his belt back in place. He gives you a huge grin and a wink. "Hey <<$pcs_nickname>>, bad timing because you just missed out. Nush is in her room recovering from the ass fucking I just gave her."'
+				'You ignore his comment and step around to enter the apartment. Just then, you see Radomir walking up the hall towards the door, buckling his belt back in place. He gives you a huge grin and a wink. "Hey <<$pcs_nickname>>, bad timing because you just missed out. Nush is in her room recovering from the ass fucking I just gave her."'
 				'He then reaches over and ruffles Maksim''s hair with his hand. "Your sister has a real nice tight ass, or at least she did." With that, he walks past both of you and leaves the apartment.'
-				'Maksim gives you an <i>I told you so</i> look and sneers. "See?" He walks back to his room.'
+				'"See?" he sneers before walking back to his room.'
 				act 'Walk past him': gt 'anushapt','hallway'
 			end
 			act 'Go to her room':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/listen.jpg"></center>'
-				'As you reach Anushka''s bedroom door, you hear voices inside. One of them is Anushka, and the other is obviously a guy, probably Radomir if Maksim is to be believed. You can''t quite make out what they are saying, so you lean against the door to hear better. You hear the guy say "Turn around and let me see that fine ass of yours."'
+				'As you reach Anushka''s bedroom door, you hear voices inside. One of them is Anushka, and the other is obviously a guy, probably Radomir if Maksim is to be believed. You can''t quite make out what they''re saying, so you lean against the door to hear better. You hear the guy say "Turn around and let me see that fine ass of yours."'
 				act 'Leave them in peace and leave the apartment': gt 'pav_complex','start'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
@@ -158,8 +158,8 @@ if $ARGS[0] = 'home':
 			*clr & cla
 			AnushkaLoc = 2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-			'You stand outside the Konstantinov household and wait for Anushka to come open the door.'
-			'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
+			'You stand outside the Konstantinov household and wait for Anushka to open the door, but Maksim answers the door instead.'
+			'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring and ask "Is Anushka home?"'
 			'With a smug look on his face, he hooks his thumb over his shoulder to point down the hall. "She''s in her room getting fucked by Val."'
 			act 'Leave': gt 'pav_complex','start'
@@ -167,18 +167,18 @@ if $ARGS[0] = 'home':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big158.jpg"></center>'
-				'You ignore his comments and step around to enter the apartment. Just then, you see Valentin walking up the hall towards the door zipping his pants up. He gives you a huge grin and a wink. "Hey <<$pcs_nickname>>, what''s up?"'
+				'You ignore his comments and step around to enter the apartment. Just then, you see Valentin walking up the hall towards the door, zipping his pants up. He gives you a huge grin and a wink. "Hey <<$pcs_nickname>>, what''s up?"'
 				'You look at him and say "What were you two doing?"'
-				'He grins a bit. It''s the kind of grin guys get after getting laid. "Oh you know, just hanging out and having fun." He then turns to Maksim. "Are you going to come by later and help me work on my bike?"'
-				'Maksim responds to Valentin. "If my dad lets me, because he is on my ass about my homework." Val just nods to him. "Gotcha." He gives both of you a slight wave and walks out.'
-				'Maksim gives you an <i>I told you so</i> look and sneers. "See?" It''s all he says before he walks back to his room'
+				'He just grins a little. "Oh you know, just hanging out and having fun." He then turns to Maksim. "Are you going to come by later and help me work on my bike?"'
+				'Maksim responds to Valentin. "If my dad lets me. He''s on my ass about my homework." Val just nods at him. "Gotcha." He gives both of you a slight wave and walks out.'
+				'"See?" is all Maksim says before he walks back to his room.'
 				act 'Walk past him': gt 'anushapt','hallway'
 			end
 			act 'Go to her room':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/listen.jpg"></center>'
-				'As you reach Anushka''s bedroom door, you hear voices inside. One of them is Anushka, and the other is obviously a guy, probably Valentin if Maksim is to be believed. You can''t quite make out what they are saying. You lean against the door to hear better, and you hear the guy ask "You wanna fuck?"'
+				'As you reach Anushka''s bedroom door, you hear voices inside. One of them is Anushka, and the other is obviously a guy, probably Valentin if Maksim is to be believed. You can''t quite make out what they''re saying. You lean against the door to hear better, and you hear the guy ask "You wanna fuck?"'
 				act 'Leave them in peace and leave the apartment': gt 'pav_complex','start'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
@@ -199,8 +199,8 @@ if $ARGS[0] = 'home':
 			*clr & cla
 			AnushkaLoc = 2
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-			'You stand outside the Konstantinov household and wait for Anushka to come open the door.'
-			'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
+			'You stand outside the Konstantinov household and wait for Anushka to open the door, but Maksim asnwers instead.'
+			'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 			'You ignore his staring to ask "Is Anushka home?"'
 			'He hooks his thumb over his shoulder to point down the hall. "She''s in her room taking some black guy''s dick up her ass." he says with disgust.'
 			act 'Leave': gt 'pav_complex','start'
@@ -208,8 +208,8 @@ if $ARGS[0] = 'home':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big146.jpg"></center>'
-				'You ignore his comments and step around to enter the apartment. Just then, you see Marcus walking up the hall towards the door. He freezes in place, looking obviously embarrassed. He looks down to not meet your eyes. "Hey <<$pcs_nickname>>, I was just hanging out... anyways I need to get going... see you at school yeah?" Without waiting for a reply, he hurries out of the apartment.'
-				'Maksim gives him a disgusted look as he walks by, then looks to you with an <i>I told you so</i> look and sneers. "See?" It''s all he says before he walks back to his room'
+				'You ignore his comments and step around him to enter the apartment. Just then, you see Marcus walking up the hall towards the door. He freezes in place, looking very embarrassed. He looks down to avoid eye contact. "Hey <<$pcs_nickname>>, I was just hanging out... anyways I need to get going... see you at school, yeah?" Without waiting for a reply, he hurries out of the apartment.'
+				'Maksim gives him a disgusted look as he walks by, then looks at you. "See?" he sneers before he walks back to his room.'
 				
 				act 'Walk past him': gt 'anushapt','hallway'
 			end
@@ -217,7 +217,7 @@ if $ARGS[0] = 'home':
 				*clr & cla
 				AnushkaLoc = 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/listen.jpg"></center>'
-				'As you reach Anushka''s bedroom door, you hear voices inside. One of them is Anushka, and the other is obviously a guy. You can''t quite make out what they are saying. You lean against the door to hear better, and you hear the guy say "God, you''re so beautiful."'
+				'As you reach Anushka''s bedroom door, you hear voices inside. One of them is Anushka, and the other is obviously a guy. You can''t quite make out what they''re saying. You lean against the door to hear better, and you hear the guy say "God, you''re so beautiful."'
 				act 'Leave them in peace and leave the apartment': gt 'pav_complex','start'
 				gs 'willpower', 'voyeur', 'self'
 				if will_cost <= pcs_willpwr:
@@ -240,25 +240,25 @@ if $ARGS[0] = 'home':
 				*clr & cla
 				maksimQW = 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-				'You stand outside the Konstantinov household and wait for Anushka to come open the door.'
-				'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
+				'You stand outside the Konstantinov household and wait for Anushka to open the door, but Maksim answers instead.'
+				'He looks you over from head to toe, obviously trying to imagine you naked. "What?" he asks.'
 				'You ignore his staring and ask, "Is Anushka home?"'
-				'"No, she''s not home right now. She''s probably out sucking some guy''s dick or something, but if you want, you can go wait for her in her room."' 
+				'"No, she''s not here right now. She''s probably out sucking some guy''s dick or something, but you can go wait for her in her room if you want."' 
 				act 'Leave': gt 'pav_complex','start'
 				act 'Enter': gt 'anushapt','hallway'
 				act 'Why would you say that?':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
 					'You are aghast that her brother would say such a thing about her. "Why would you tell people something like that?"'
-					'At first, he looks a bit confused, as if he''s not sure what you mean, then just shrugs. "That''s what my mother always says when I ask where Anushka is."'
+					'At first, he looks a little confused, as if he''s not sure what you mean, then just shrugs. "That''s what my mother always says when I ask where Anushka is."'
 					'You shake your head, unsure what to think about this. Should you go in and wait for her or just go? Maksim just stands there staring at your tits, and you can actually feel him undressing you with his eyes.'
 					act 'Leave': gt 'pav_complex','start'
 					act 'Enter': gt 'anushapt','hallway' 
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksim.jpg"></center>'
-				'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "Anushka''s not home right now. She''s probably out sucking some guy''s dick or something, but if you want you can go wait for her in her room."'
-				'You shake your head a bit, but there is nothing you can do about it. Should you go in and wait for her or just go? As you decide, you can feel Maksim undressing you with his eyes while staring straight at your tits.'
+				'Maksim answers the door instead. He looks you over from head to toe, obviously trying to imagine you naked. "Anushka''s not here right now. She''s probably out sucking some guy''s dick or something, but you can wait for her in her room if you want."'
+				'You shake your head, but there is nothing you can do about it. Should you go in and wait for her or just go? As you decide, you can feel Maksim undressing you with his eyes as he stares straight at your tits.'
 			end 
 			act 'Leave': gt 'pav_complex','start'
 			act 'Enter': gt 'anushapt','hallway'
@@ -285,12 +285,12 @@ if $ARGS[0] = 'hallway':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/hall.jpg"></center>'
 	if anushkaFirstvisit < 2:
 		anushkaFirstvisit = 2
-		'As you enter the Konstantinov''s hallway, you notice there is something that''s not quite right... the place is somewhat depressing to be in. The whole apartment feels strange and foreign. You don''t get the loving, homey feeling that your mother strives to keep at home. All the doors are closed, but from one you can hear the noise of a TV and from another you can hear someone yelling.'
+		'As you enter the Konstantinov''s hallway, you notice there is something that''s not quite right... the place is somewhat depressing to be in. The whole apartment feels strange and foreign and you don''t get the loving, homey feeling that your mother strives to keep at home. All the doors are closed, but you can hear the noise of a TV blaring from one and can hear someone yelling in another.'
 	else
-		'This is the entrance hall of Anushka''s apartment. It''s devoid of any furniture, with shoes and some toys pushed against one wall leaving just enough room for a person to walk through. On the surface, things seem fine, but you can feel that there is something very off about this place. You''re not exactly sure what it is, though. From here, you can reach all the other rooms in the house.'
+		'This is the entrance hall of Anushka''s apartment. It''s devoid of any furniture, but has shoes and some toys pushed against one wall, leaving just enough room for a person to walk through. On the surface, things seem fine, but you can feel that there is something very off about this place. You''re not exactly sure what it is, though. From here, you can reach all the other rooms in the house.'
 	end
 	if rand(0,9) = 0 and AnushkaLoc ! 1:
-		'As you walk through the dark hallway, you suddenly get the feeling that you''re being watched. You turn around quickly, but you can''t see anyone there.'
+		'As you walk through the dark hallway, you suddenly get the feeling that you''re being watched. You quickly turn around, but you can''t see anyone.'
 		'"Is anyone there?" you ask. You were hoping for a response, so once again you call out. "I know you''re there, come on out!"'
 		'You stand still for a little while longer, listening for something, but nothing happens. After a while, you decide to move on, but you''re pretty sure that it was just Anushka''s younger brother, Maksim, spying on you.'
 	end
@@ -368,7 +368,7 @@ if $ARGS[0] = 'bathroom':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/showergetout.jpg"></center>'
 				'You pull the shower curtain tight against your body to make sure there is nothing for him to see other than your head. "Get out of here you little pervert!"'
-				'He laughs then quickly ducks away before you hear Anushka yelling at him. "What the hell were you doing?" As you continue your shower, you hear a lot more yelling from behind the door, and there is even a loud crash. Suddenly, silence descends upon the apartment.'
+				'He laughs, then quickly ducks away before you hear Anushka yelling at him. "What the hell are you doing?" As you continue your shower, you hear a lot more yelling from behind the door, and there is even a loud crash. Suddenly, silence descends upon the apartment.'
 				act 'Get out of the shower': gt 'anushapt','bathroom'
 			end
 			if pcs_inhib >= 50:
@@ -413,8 +413,8 @@ if $ARGS[0] = 'nushshower':
 	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>'
-	'As you approach the bathroom, you hear the water running. Checking the latch, you find it still broken and push the door open. As you walk in, the water turns off. You look around and see that the bathroom has seen better days, with mold growing in the corners of the walls and floors. The place probably hasn''t been cleaned for quite some time.' 
-	'The toilet sits along the far wall. There''s also a bathtub with an old plastic shower curtain hanging from a rod above it. Anushka peeks out from around the curtain. When she see''s it''s you, she pushes it aside and grabs a towel. "Oh hey <<$pcs_nickname>>, what''s up?"'
+	'As you approach the bathroom, you hear the water running. Checking the latch, you find it is still broken and push the door open. As you walk in, the water turns off. You look around and see that the bathroom has seen better days, with mold growing in the corners of the walls and floors. The place probably hasn''t been cleaned for quite some time.' 
+	'The toilet sits along the far wall. There''s also a bathtub with an old plastic shower curtain hanging from a rod above it. Anushka peeks out from around the curtain. When she sees that it''s you, she pushes it aside and grabs a towel. "Oh hey <<$pcs_nickname>>, what''s up?"'
 	gs 'arousal', 'voyeur', 2
 	act 'Just came over to hangout':
 		*clr & cla
@@ -422,7 +422,7 @@ if $ARGS[0] = 'nushshower':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/dry2.jpg"></center>'
 		'"Just came over to see what you were up to." you reply.'
-		'She nods a bit as she keeps drying off and seems not to care in the least that you are in there with her. "I was debating if I wanted to do something tonight myself."'
+		'She nods as she dries off, seemingly not caring that you are in here with her. "I was debating if I wanted to do something tonight myself."'
 		'"Well, now we can do something together." you tell her.'
 		'"Sure, sounds good to me. What do you want to do?"'
 		act 'We can think of something':
@@ -430,7 +430,7 @@ if $ARGS[0] = 'nushshower':
 			minut += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/dry3.jpg"></center>'
-			'You think about it for a moment. "I don''t know, but I am sure we can come up with something to do."'
+			'You think about it for a moment. "I don''t know, but I''m sure we can come up with something to do."'
 			'"Sounds good, so give me a few minutes to get dried off, and I will join you in my room." she tells you.'
 			act 'Go wait for her': showerphotos = 0 & gt 'anushapt', 'shower_wait'
 			act 'Take her picture with your phone':
@@ -439,11 +439,11 @@ if $ARGS[0] = 'nushshower':
 				anushkaphoto[1] = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/1.jpg"></center>'
-				'While she is drying off, you pull out your smartphone. You hold it up to get a good image of her drying off and take her picture.'
-				'She notices you taking her picture and pulls the towel in place. "Hey you little perv."'
+				'While she is drying off, you pull out your phone. You hold it up to get a good image of her drying off and take her picture.'
+				'She notices you taking her picture and pulls the towel in place. "Hey, you little perv!"'
 				*nl
-				'You giggle at her reaction. "Oh please... like you don''t like showing your body off all the time."'
-				'"Yes, when I want to. Now go on, get out of here!" she says while making a shooing motion with one of her hands.'
+				'You giggle at her reaction. "Oh please! Like you don''t like showing your body off <i>all</i> the time."'
+				'"Yes, when I want to. Now go on and get out of here!" she says while making a shooing motion with one of her hands.'
 				'You know deep down she really doesn''t care. She loves showing off her body too much, but maybe you should give her some privacy.'
 				act 'Go wait for her': gt 'anushapt', 'shower_wait'
 				gs 'willpower', 'exhib', 'force'
@@ -471,7 +471,7 @@ if $ARGS[0] = 'nushshower':
 							act 'More':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/4.jpg"></center>'
-								'She giggles a bit and turns her side to you. The towel is slowly opened to tease you a bit with her nudity while striking a sexy pose.'
+								'She giggles a bit and turns her side to you. She slowly opens her towel to tease you while striking a sexy pose.'
 								'"Yeah, that''s it. Give me a little more. Let''s see that hot little body of yours!"'
 								gs 'arousal', 'erotic_nudity', 2
 								gs 'stat'
@@ -526,9 +526,9 @@ if $ARGS[0] = 'shower_wait':
 	'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 	if showerphotos = 0:
-		'While Anushka dries off, you go into her room to wait for her. The room is surprisingly clean, except for a little dust here and there. Her walls are covered with pictures and posters while the rest of the room is skillfully decorated with various strings of coloured lights. You take a seat on her bed as you wait for her to come join you. A couple of minutes later, she walks in completely naked and quickly gets dressed before jumping on the bed next to you.'
+		'While Anushka dries off, you go into her room to wait for her. The room is surprisingly clean, except for a little dust here and there. Her walls are covered with pictures and posters while the rest of the room is skillfully decorated with various strings of coloured lights. You take a seat on her bed as you wait for her to join you. A few minutes later, she walks in completely naked and quickly gets dressed before jumping on the bed next to you.'
 	elseif showerphotos = 1:
-		'Having messed around a bit taking her picture while she dried off, you decide to give her some privacy and go wait in her room. The room is surprisingly clean, even if it''s somewhat dusty. The walls are covered with pictures and posters, and the room is skillfully decorated with various strings of coloured lights. You take a seat on the bed as you wait for her to come join you. A couple of minutes later, she walks in completely naked and quickly gets dressed before jumping on the bed next to you.'
+		'Having messed around a bit taking her picture while she dried off, you decide to give her some privacy and go wait in her room. The room is surprisingly clean, even if it''s somewhat dusty. The walls are covered with pictures and posters, and the room is skillfully decorated with various strings of coloured lights. You take a seat on the bed as you wait for her to come join you. A few minutes later, she walks in completely naked and quickly gets dressed before jumping on the bed next to you.'
 	elseif showerphotos = 2:
 		'With the impromptu photo shoot and selfies done, the two of you head to her room, Anushka still completely naked. Once inside, she quickly gets dressed while you take a seat on her bed. Once she is fully dressed, she flops down on the bed next to you.'
 	end
@@ -595,7 +595,7 @@ if $ARGS[0] = 'nushcloset':
 				pcs_mood += 10
 				minut += 10
 				'"Wow, you have so many outfits. Can I try some on?" you ask her.'
-				'Anushka smiles and nods. "Sure... let''s do it." She gets up to join you at the closet and starts pulling out different outfits. She picks the ones that she apparently thinks will work best for you. Her clothes don''t fit perfectly, but they fit well enough, and they do look good on you. As you check yourself out in the mirror on the door, she says "Looking nice, <<$pcs_nickname>>.'
+				'Anushka smiles and nods. "Sure, let''s do it." She gets up to join you at the closet and starts pulling out different outfits. She picks the ones that she apparently thinks will work best for you. Her clothes don''t fit perfectly, but they fit well enough, and they do look good on you. As you check yourself out in the mirror on the door, she says "Looking nice, <<$pcs_nickname>>.'
 				act 'Try on more clothes':
 					*clr & cla
 					minut += 10
@@ -620,7 +620,7 @@ if $ARGS[0] = 'nushcloset':
 							minut += 10
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/maksimspy4.jpg"></center>'
-							'Anushka suddenly yells "Oh my god you little pervert!" and covers herself quickly. You turn to see Maksim peeking in through the door and instinctively cover yourself also. Anushka then grabs a shoe and throws it at the door. Maksim takes off running just before it hits.'
+							'Anushka suddenly yells "Oh my god, you little pervert!" and covers herself quickly. You turn to see Maksim peeking in through the door and instinctively cover yourself as well. Anushka then grabs a shoe and throws it at the door. Maksim takes off running just before it hits.'
 							'Anushka takes off after him and runs out of her room stark naked. You grab the loose dress you had just been wearing and throw it on quickly before chasing after them.'
 							act 'Chase':
 								*clr & cla
@@ -629,10 +629,10 @@ if $ARGS[0] = 'nushcloset':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/maksimspy5.jpg"></center>'
 								'You can hear Maksim yelling as he runs away. "Help! She''s going to kill me!"'
 								'You come out into the hallway just in time to see Maksim run into the living room, closely followed by a naked Anushka. "Come back here you little pervert!" she screams loudly.'
-								'Just as they both disappear into the living room, you hear Eduard''s voice. "What the hell is going on?" You arrive just in time. You see Maksim in the corner with his dad staring at him while Anushka is standing just behind her dad completely naked.'
+								'Just as they both disappear into the living room, you hear Eduard''s voice. "What the hell is going on?" You arrive just in time to see Maksim cowering in the corner with his dad staring at him while Anushka is standing just behind her dad, completely naked.'
 								'"She''s trying to kill me!" a panicking Maksim says in reply.'
-								'He then turns towards his daughter and starts to say "Just what the hel..." but he never finishes that sentence. Instead, he immediately turns his head away and puts his hand in front of his eyes. "God dammit Anushka, put some clothes on!" he bellows.'
-								act 'Put on some clothes Nush':
+								'Eduard turns to Anushka and starts to say "Just what the hel..." but he never finishes his sentence. Instead, he immediately turns his head away and puts his hand in front of his eyes. "God dammit Anushka, put some clothes on!" he bellows.'
+								act 'Put on some clothes':
 									*clr & cla
 									minut += 10
 									gs 'stat'
@@ -641,11 +641,11 @@ if $ARGS[0] = 'nushcloset':
 									'Maksim squeaks a lie out. "No."'
 									'Anushka starts to say something, then Eduard turns towards you. "Was he spying on you girls?"'
 									'You nod your head. "Yes, we were trying on clothes and we noticed him spying on us."'
-									'Ed visibly shakes with what you think is anger and embarrassment. "I am sorry <<$pcs_firstname>>. I thought I taught these boys better than this."'
+									'Eduard visibly shakes with what you think is anger and embarrassment. "I am sorry <<$pcs_firstname>>. I thought I taught these boys better than this."'
 									'Anushka chimes in. "See? I told you!"'
 									*nl
-									'He turns towards her and instantly regrets it as his daughter is still standing there completely naked. "God dammit Anushka, go to your room and put some clothes on!"'
-									'He turns back towards Maksim. "Come on boy, we are going to go for a walk." Maksim visibly swallows and looks scared. He doesn''t move at first until his dad stops and glares at him. He quickly catches up to his dad, and they walk out of the apartment together.'
+									'He turns towards her and instantly regrets it as she is still standing there completely naked. "God dammit Anushka, go to your room and put some clothes on for crying out loud!"'
+									'He turns back towards Maksim. "Come on boy, we are going for a walk." Maksim visibly swallows and looks scared. He doesn''t move at first until his dad stops and glares at him. He then quickly catches up, and they walk out of the apartment together.'
 									'Anushka turns and heads back to her room. "Fucking little pervert. I''m sorry that you had to deal with that <<$pcs_nickname>>."'
 									'You follow her back to her room, and you both get dressed again. "It''s not your fault. Boys will be boys."'
 									act 'Get dressed':gt 'anushapt','anushroom'
@@ -696,7 +696,7 @@ if $ARGS[0] = 'night_stand':
 		npc_rel['A144'] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/snoop.jpg"></center>'
-		'You decide to snoop, so you open the night stand''s drawer to peek inside. There are a variety of medicines, some that are legal and some, like pot, that aren''t.  You also notice a pair of scissors, razor blades, rolling papers, a lighter, a pack of cigarettes, condoms, lotion, lube, a vibrator, a dildo, a butt plug, and even a strap-on harness.'
+		'You decide to snoop, so you open the night stand''s drawer to peek inside. There are a variety of medicines, some that are legal and some, like pot, that aren''t.  You also notice a pair of scissors, razor blades, rolling papers, a lighter, a pack of cigarettes, condoms, lotion, lube, a vibrator, a dildo, a butt plug and even a strap-on harness.'
 		'"See anything you like?" Anushka asks you in a teasing tone.'
 		act 'Uh no':
 			*clr & cla
@@ -711,7 +711,7 @@ if $ARGS[0] = 'night_stand':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushdrawer.jpg"></center>'
-		'You decide to snoop, so you open the night stand''s drawer to peek inside. There are a variety of medicines, some that are legal and some, like pot that aren''t. You also notice a pair of scissors, razor blades, rolling papers, a lighter, a pack of cigarettes, condoms, lotion, lube, a vibrator, a dildo, a butt plug, and even a strap-on harness.'
+		'You decide to snoop, so you open the night stand''s drawer to peek inside. There are a variety of medicines, some that are legal and some, like pot that aren''t. You also notice a pair of scissors, razor blades, rolling papers, a lighter, a pack of cigarettes, condoms, lotion, lube, a vibrator, a dildo, a butt plug and even a strap-on harness.'
 		'You''re not really surprised by the amount of sex toys Anushka has considering her relaxed attitude towards sex and sexuality. However, you decide it would be rude of you to play with them without her permission, so you close the drawer.'
 		act 'Close the drawer':gt 'anushapt','anushroom'
 	end

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 217 - 218
locations/anushkaev1.qsrc


+ 1 - 1
locations/arousal.qsrc

@@ -724,7 +724,7 @@ end
 
 !!This calculates the various sex stats and includes a small cooldown of stimulation so only use it once per event
 if $ARGS[0] = 'end':
-	if bimbo_flag = 1:
+	if bimbosex_flag = 1:
 		bimbo_tracker += 1
 		bimbosex_flag = 0
 	end

+ 15 - 15
locations/artemdate.qsrc → locations/artem_date_events.qsrc

@@ -1,4 +1,4 @@
-# artemdate
+# artem_date_events
 
 if $ARGS[0] = 'firstdate':
 	*clr & cla
@@ -23,7 +23,7 @@ if $ARGS[0] = 'firstdate':
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
 			if rand(1,5) = 1 and hour >= 20:
 				'When the movie ends, you and Artem leave the theater and he offers to walk you home. The two of you head back through the park as you walk. After the two of you walk for awhile, you see a group of older gopniks hanging out around a bench just ahead. They are drinking and you can hear them from where you are, they are obviously already a bit drunk.'
-				act 'Just walk past them': gt 'artemdate','artemGopSkver'
+				act 'Just walk past them': gt 'artem_date_events','artemGopSkver'
 			else
 				'When the movie ends, you and Artem leave the theater and he offers to walk you home. The two of you head back through the park as you walk.'
 				'Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>."'
@@ -44,7 +44,7 @@ if $ARGS[0] = 'firstdate':
 		'You don''t really feel like going the cinema, and tell him: "Nah, let''s just enjoy the walk we''re on."'
 		if rand(1,5) = 1 and hour >= 20:
 			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After the two of you walk for awhile, you see a group of older gopniks hanging out around a bench just ahead. They are drinking and you can hear them from here, they are obviously already a bit drunk.'
-			act 'Just walk past them': gt 'artemdate','artemGopSkver'
+			act 'Just walk past them': gt 'artem_date_events','artemGopSkver'
 		else
 			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After the two of you walk for a while talking, he checks his watch and says, "We should be getting back, I will walk you to your door."'
 			'Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>."'
@@ -62,7 +62,7 @@ if $ARGS[0] = 'artem_date':
 	*clr & cla
 	npc_rel['A2'] += 1
 	menu_off = 1
-	gt 'artemdate', 'firstdate'
+	gt 'artem_date_events', 'firstdate'
 !{this is what it will look like when batman finishes the dates, 3 special dates that each happen once and then three repeatable dates. For now can we just temporarily have it repeat the first date above so we can get the artem revamp in the dev builds to bug hunt and then we can add the others when he finishes them.
 	if artem_date = 1:
 	
@@ -103,7 +103,7 @@ if $ARGS[0] = 'artemGopSkver':
 			'His smiles widely. "Great, I''m glad you had fun, maybe we can do it again some time?"'
 			'You nod a bit. "Sure, maybe. We''ll see."'
 			'He smiles and nods. "Ok, well. I better get home, talk to you later."'
-			'"Bye Artem, I have a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
+			'"Bye Artem, I had a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
 			act 'Go home': gt 'pod_ezd', 'etaj_2'
 		end
 	else
@@ -132,7 +132,7 @@ if $ARGS[0] = 'artemGopSkver':
 				if will_cost <= pcs_willpwr:
 					act 'Stand up to them (<<will_cost>> Willpower)':
 						gs 'willpower', 'pay', 'self'
-						gt 'artemdate', 'stand_up'
+						gt 'artem_date_events', 'stand_up'
 					end
 				else
 					act 'Stand up to them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -153,7 +153,7 @@ if $ARGS[0] = 'artemGopSkver':
 	if will_cost <= pcs_willpwr:
 		act 'Stand up to them (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'self'
-			gt 'artemdate', 'stand_up'
+			gt 'artem_date_events', 'stand_up'
 		end
 	else
 		act 'Stand up to them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -253,13 +253,13 @@ if $ARGS[0] = 'stand_up':
 					act 'Leave': gt 'pod_ezd', 'etaj_1'
 				else
 					'You slowly remove all of your clothes until you are completely naked in front of them, with that they turn off the music. All of the Gopniks gather around you and their leader grins and gives you a choice: "Not bad <<$pcs_nickname>>, nice tits. It''s a shame you''re wasting them on him. And now, you''re going to suck all us off. If you do a good job, we''ll let you go." You know you have no chance to run away, so you either have to do what they ask or you could try your luck at fighting them, but betting against six men? Most likely all that good that would do is getting the shit beat out of you and then raped. Maybe if you distract them you could run away.'
-					act 'Get down on your knees': gt 'artemdate', 'blow_bang'
+					act 'Get down on your knees': gt 'artem_date_events', 'blow_bang'
 					gs 'willpower', 'misc', 'self', 'hard'
 					if will_cost <= pcs_willpwr:
 						act 'Fight them (<<will_cost>> Willpower)':
 							gs 'willpower', 'misc', 'self', 'hard'
 							gs 'willpower', 'pay', 'self'
-							gt 'artemdate', 'fight_gang'
+							gt 'artem_date_events', 'fight_gang'
 						end
 					else
 						act 'Fight them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -344,12 +344,12 @@ if $ARGS[0] = 'stand_up':
 										'By now the other gopniks have caught up and now you are surrounded again, except now they are pissed off as well.'
 										'The leader drops to his knees and grabs you by the hair while you lie flat on your stomach: "We warned you, <<$pcs_nickname>>. Since you made us work for it, we are just going to take what we want."'
 										'You know your choices are limited, get raped or fight back and likely get the shit beat out of you and raped anyways.'
-										act 'Get raped': gt 'artemdate', 'gang_rape'
+										act 'Get raped': gt 'artem_date_events', 'gang_rape'
 										gs 'willpower', 'misc', 'self', 'hard'
 										if will_cost <= pcs_willpwr:
 											act 'Fight them (<<will_cost>> Willpower)':
 												gs 'willpower', 'pay', 'self'
-												gt 'artemdate', 'fight_gang'
+												gt 'artem_date_events', 'fight_gang'
 											end
 										else
 											act 'Fight them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -368,7 +368,7 @@ if $ARGS[0] = 'stand_up':
 end
 
 if $ARGS[0] = 'blow_bang':
-	gs 'artemdate', 'generatgopniks'
+	gs 'artem_date_events', 'generatgopniks'
 	*clr & cla
 	gs 'fame', 'pav', 'sex', 20
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/ggbj1.jpg"></center>'
@@ -482,7 +482,7 @@ if $ARGS[0] = 'fight_gang':
 		'You do your best, but their are too many of them. The blows start coming and never stop, and soon you feel yourself dazed and unable to fight anymore. With the fight now over, you find yourself laying naked on the ground, flat on your stomach. The leader drops to his knees and grabs you by the hair while. "We warned you, <<$pcs_nickname>>. You''re all ours now."'
 		'Several of them start to take off their pants as one of them threatens: "Open up whore, or we''ll be spilling your guts all over the ground."'
 		'Two of them go stand watch, while the other four gather around you, you know they are going to rape you but their is nothing more you can do about it. You silent pray someone would come by and save you as you start to cry.'
-		act 'Get raped': gt 'artemdate', 'gang_rape'
+		act 'Get raped': gt 'artem_date_events', 'gang_rape'
 	end
 end
 
@@ -504,7 +504,7 @@ if $ARGS[0] = 'gang_rape':
 		gs 'bras', 'dispose'
 	end
 	
-	gs 'artemdate', 'generatgopniks'
+	gs 'artem_date_events', 'generatgopniks'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/stripped.jpg"></center>'
 	'They grab you and lift you off the ground, one covering your mouth as some others carry you. They drag you off deeper into the park into the woods far away from any of the paths. You see two others are dragging the unconscious Artem along. When they get to a place they seem to like, where there is some old dirty mattress laying on the ground, they start ripping your clothes off. It hurts as they do and you can hear your clothes ripping and tearing, they seem to be intentionally destroying your clothes at this point. They keep ripping and tearing at your clothes until you are completely naked. Two of them drop Artem nearby and then go stand watch.' 
@@ -638,5 +638,5 @@ if $ARGS[0] = 'generatgopniks':
 	gs 'boyStat', $npclastgenerated, 'f'
 end
 
---- artemdate ---------------------------------
+--- artem_date_events ---------------------------------
 

+ 38 - 38
locations/artemEv.qsrc → locations/artem_events.qsrc

@@ -1,4 +1,4 @@
-# artemEv
+# artem_events
 !2020/10/16
 !! list of triggers
 !! artembj = number of blowjobs
@@ -130,13 +130,13 @@ if $ARGS[0] = 'learn':
 							'You decline. "I am not a whore that earns her way with sex."'
 							'"Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me when I need it? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
 							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
-							act 'Refuse': gt 'artemEv', 'finalrefuse'
-							act 'Agree to suck him off': gt 'artemEv', 'slut_bj'
+							act 'Refuse': gt 'artem_events', 'finalrefuse'
+							act 'Agree to suck him off': gt 'artem_events', 'slut_bj'
 						end
 					else
 						act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Suck him off': gt 'artemEv', 'slut_bj'
+					act 'Suck him off': gt 'artem_events', 'slut_bj'
 				elseif artemslut <= 4:
 					'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
 					'He looks at you expectantly: "If you still want my help, I want more, I want to fuck you."'
@@ -151,13 +151,13 @@ if $ARGS[0] = 'learn':
 							'You decline. "I am not a whore that earns her way with sex."'
 							'"Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me when I need it? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
 							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
-							act 'Refuse': gt 'artemEv', 'finalrefuse'
-							act 'Let him fuck you': gt 'artemEv', 'slut_fuck'
+							act 'Refuse': gt 'artem_events', 'finalrefuse'
+							act 'Let him fuck you': gt 'artem_events', 'slut_fuck'
 						end
 					else
 						act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Let him fuck you': gt 'artemEv', 'slut_fuck'
+					act 'Let him fuck you': gt 'artem_events', 'slut_fuck'
 				else
 					'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
 					'He looks at you expectantly: "I seen something in a porno I want to try, I want to stick it in your ass now."'
@@ -172,13 +172,13 @@ if $ARGS[0] = 'learn':
 							'You decline. "I am not a whore that earns her way with sex."'
 							'"Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me when I need it? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
 							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
-							act 'Refuse': gt 'artemEv', 'finalrefuse'
-							act 'Let him fuck your ass': gt 'artemEv', 'slut_anal'
+							act 'Refuse': gt 'artem_events', 'finalrefuse'
+							act 'Let him fuck your ass': gt 'artem_events', 'slut_anal'
 						end
 					else
 						act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Let him fuck your ass': gt 'artemEv', 'slut_anal'
+					act 'Let him fuck your ass': gt 'artem_events', 'slut_anal'
 				end
 			elseif artemsex >= 5:
 				*clr & cla
@@ -195,13 +195,13 @@ if $ARGS[0] = 'learn':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
 						'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, you''ve already let me fuck you. Meanwhile, you... fuck pretty much everyone who asks! But now I can''t fuck your ass and you turn into a prude? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
 						'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
-						act 'Refuse': gt 'artemEv', 'finalrefuse'
-						act 'Let him fuck your ass': gt 'artemEv', 'slut_anal'
+						act 'Refuse': gt 'artem_events', 'finalrefuse'
+						act 'Let him fuck your ass': gt 'artem_events', 'slut_anal'
 					end
 				else
 					act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				act 'Let him fuck your ass': gt 'artemEv', 'slut_anal'
+				act 'Let him fuck your ass': gt 'artem_events', 'slut_anal'
 			elseif artembj >= 5:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'learn':
 					'You shake your head and quickly tell him: "Sorry Artem... it''s that time of the month, we can''t."'
 					'He blushes a moment and then smiles a little. "That''s ok I can just fuck your ass then <<$pcs_nickname>>."'
 					gs 'stat'
-					act 'Agree to have anal sex instead': gt 'artemEv', 'slut_anal'
+					act 'Agree to have anal sex instead': gt 'artem_events', 'slut_anal'
 					gs 'willpower', 'exhib', 'resist'
 					if will_cost <= pcs_willpwr:
 						act '"No way!" (<<will_cost>> Willpower)':
@@ -222,8 +222,8 @@ if $ARGS[0] = 'learn':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
 							'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, you''ve already sucked my dick. Meanwhile, you... fuck pretty much everyone who asks! But now I can''t fuck you? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
 							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
-							act 'Refuse': gt 'artemEv', 'finalrefuse'
-							act 'Let him butt fuck you': gt 'artemEv', 'slut_anal'
+							act 'Refuse': gt 'artem_events', 'finalrefuse'
+							act 'Let him butt fuck you': gt 'artem_events', 'slut_anal'
 						end
 					else
 						act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -239,13 +239,13 @@ if $ARGS[0] = 'learn':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
 							'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, you''ve already sucked my dick. Meanwhile, you... fuck pretty much everyone who asks! But now I can''t fuck you? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
 							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
-							act 'Refuse': gt 'artemEv', 'finalrefuse'
-							act 'Let him fuck you': gt 'artemEv', 'slut_fuck'
+							act 'Refuse': gt 'artem_events', 'finalrefuse'
+							act 'Let him fuck you': gt 'artem_events', 'slut_fuck'
 						end
 					else
 						act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Let him fuck you': gt 'artemEv', 'slut_fuck'
+					act 'Let him fuck you': gt 'artem_events', 'slut_fuck'
 				end
 			elseif artemStripSee < 3:
 				cla
@@ -265,7 +265,7 @@ if $ARGS[0] = 'learn':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 						'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
 						'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
-						act 'Refuse': gt 'artemEv', 'finalrefuse'
+						act 'Refuse': gt 'artem_events', 'finalrefuse'
 						act 'Agree to strip':
 							*clr & cla
 							artemStripSee += 1
@@ -276,7 +276,7 @@ if $ARGS[0] = 'learn':
 							'You give him a serious look when you say. "Ok ok, you want me to get naked for you that badly?"'
 							'He blushes but then he nods. "Yes I do, I think it is the least you can do for me."'
 							'You think it over for a moment and then figure why not, it isn''t like a boy has never seen you naked before. "Ok fine." With those words he grins hugely. You start stripping out of your clothes slowly teasing him as you do, you might as well have some fun with this.'
-							act 'Start stripping': gt 'artemEv', 'striptease'
+							act 'Start stripping': gt 'artem_events', 'striptease'
 						end
 					end
 				else
@@ -291,7 +291,7 @@ if $ARGS[0] = 'learn':
 					'You give him a serious look when you say. "You want me to get naked for you?"'
 					'You see him visible swallow but then he nods. "Yes I do, I think it is the least you can do for me."'
 					'You think it over for a moment and then figure why not, it isn''t like a boy has never seen you naked before. "Ok fine." With those words he grins hugely. You start stripping out of your clothes slowly teasing him as you do, you might as well have some fun with this.'
-					act 'Start stripping': gt 'artemEv', 'striptease'
+					act 'Start stripping': gt 'artem_events', 'striptease'
 				end
 			else
 				cla
@@ -308,13 +308,13 @@ if $ARGS[0] = 'learn':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
 						'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
 						'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
-						act 'Refuse': gt 'artemEv', 'finalrefuse'
-						act 'Agree to suck him off': gt 'artemEv', 'slut_bj'
+						act 'Refuse': gt 'artem_events', 'finalrefuse'
+						act 'Agree to suck him off': gt 'artem_events', 'slut_bj'
 					end
 				else
 					act '"No way!" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-				act 'Suck him off': gt 'artemEv', 'slut_bj'
+				act 'Suck him off': gt 'artem_events', 'slut_bj'
 			end
 		end
 	else
@@ -606,7 +606,7 @@ if $ARGS[0] = 'sex':
 							else
 								'He immediately replies: "How about your ass again then, <<$pcs_nickname>>?"'
 							end
-							act 'Agree to have anal sex instead': gt 'artemEv', 'anal'
+							act 'Agree to have anal sex instead': gt 'artem_events', 'anal'
 							if analplugin = 1:
 								gs 'willpower', 'action', 'resist', 'hard'
 							else
@@ -622,7 +622,7 @@ if $ARGS[0] = 'sex':
 									'Artem apologizes: "I''m sorry <<$pcs_nickname>>... I shouldn''t have tried to talk you into it."'
 									'You take his hand in yours and reassure him: "It''s okay, babe. Just... don''t pressure me for anal, okay? I will let you know when I''m ready and in the mood for it."'
 									'He nods hopefully, very happy with the fact that you still going to give him a blowjob after his blunder and that you''re still open to the prospect of having anal sex with him some day.'
-									act 'Just keep sucking': gt 'artemEv', 'bj'
+									act 'Just keep sucking': gt 'artem_events', 'bj'
 								end
 							else
 								act 'Reject and finish him with your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -638,7 +638,7 @@ if $ARGS[0] = 'sex':
 							else
 								'Artem blushes, but presses on and asks: "Maybe I can try your ass then? I heard it would feel really good, for both of us..."'
 							end
-							act 'Agree to have anal sex instead': gt 'artemEv', 'anal'
+							act 'Agree to have anal sex instead': gt 'artem_events', 'anal'
 							if analplugin = 1:
 								gs 'willpower', 'action', 'resist', 'hard'
 							else
@@ -654,7 +654,7 @@ if $ARGS[0] = 'sex':
 									'Artem apologizes: "I''m sorry <<$pcs_nickname>>... I shouldn''t have tried to talk you into it."'
 									'You take his hand in yours and reassure him: "It''s okay, babe. Just... don''t pressure me for anal, okay? I will let you know when I''m ready and in the mood for it."'
 									'He nods hopefully, very happy with the fact that you still going to give him a blowjob after his blunder and that you''re still open to the prospect of having anal sex with him some day.'
-									act 'Just keep sucking': gt 'artemEv', 'bj'
+									act 'Just keep sucking': gt 'artem_events', 'bj'
 								end
 							else
 								act 'Reject and finish him with your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -695,7 +695,7 @@ if $ARGS[0] = 'sex':
 							'You take hold of his penis and guide it as you lower yourself even more until it slides back inside of your pussy. You start eagerly riding him, controlling the action, as you do he starts to grunt more and more, you can tell he is going to cum before too much longer.'
 							gs 'arousal', 'vaginal', 5
 							gs 'stat'
-							act 'cum surprise': gt 'artemEv', 'cum_surprise'
+							act 'cum surprise': gt 'artem_events', 'cum_surprise'
 						end
 					end
 					act 'No':
@@ -705,8 +705,8 @@ if $ARGS[0] = 'sex':
 						'He sighs a little and nods in understanding for a moment and then he blushes and says. "Maybe I can try your ass then? I heard it would feel really good, for both of us..."'
 						gs 'arousal', 'hj', 1
 						gs 'stat'
-						act 'Agree to have anal sex instead': gt 'artemEv', 'anal'
-						act 'Just keep sucking': gt 'artemEv', 'bj'
+						act 'Agree to have anal sex instead': gt 'artem_events', 'anal'
+						act 'Just keep sucking': gt 'artem_events', 'bj'
 					end
 				else
 					act 'How about anal instead': 
@@ -719,11 +719,11 @@ if $ARGS[0] = 'sex':
 								'He immediately grabs your buttplug and slowly pulls it out of your ass.'
 							end
 							'With his encouragement you get into a doggy style position.'
-							act 'Get butt fucked':gt 'artemEv', 'anal'
+							act 'Get butt fucked':gt 'artem_events', 'anal'
 						else
 							'You take his dick out of your mouth for a second and quickly ask him: "Would you like to fuck me in the ass?"'
 							'He immediately replies: "Uh, yeah sure, Ok <<$pcs_nickname>> that sounds great." He seems a bit surprised at your suggestion but quickly seems to like the idea and with his encouragement you get into a doggy style position.'
-							act 'Get butt fucked':gt 'artemEv', 'anal'
+							act 'Get butt fucked':gt 'artem_events', 'anal'
 						end
 					end
 					act 'Have sex':
@@ -761,7 +761,7 @@ if $ARGS[0] = 'sex':
 								'You crawl over to him, straddling him as you lower yourself down. You take hold of his penis and guide it as you lower yourself even more until it slides back inside of your pussy. You start eagerly riding him, controlling the action, as you do he starts to grunt more and more, you can tell he is going to cum before too much longer.'
 								gs 'arousal', 'vaginal', 5
 								gs 'stat'
-								act 'cum surprise': gt 'artemEv', 'cum_surprise'
+								act 'cum surprise': gt 'artem_events', 'cum_surprise'
 							end
 						end
 					end
@@ -778,12 +778,12 @@ if $ARGS[0] = 'cum_surprise':
 		'As you are riding him, getting lost in your own pleasure you glance down at his face and see him tense up and you realize that he is cumming too late. You can feel his cum shooting into you. As you lift yourself up, you can feel his cum oozing out of your pussy.'
 		'Then it hits him and he suddenly looks alarmed as he realizes he just came inside of you. "Oh my god, I am so sorry <<$pcs_nickname>>, I didn''t mean to do that."'
 		'You smile to him as you get off him. "It''s ok, don''t worry about it." He looks relieved obviously thinking you are on birth control.'
-		act 'Continue': gs 'artemEv', 'after_sex', 'cp'
+		act 'Continue': gs 'artem_events', 'after_sex', 'cp'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/firstfacial.jpg"></center>'
 		'As you are riding him, getting lost in your own pleasure you glance down at his face and see him tenses up, before he warns you: "<<$pcs_nickname>>... I''m going to cum..."'
 		'You quickly climb off him and he rolls up to his knees. You start jerking his cock, with it pointed right at your face. Just as a stream of his sperm hits you in the face, you keep jerking him off. Causing several more streams of cum to land on your face, once the last of his cum has been drained you stop jerking him off and open your eyes.'
-		act 'Continue': gs 'artemEv', 'after_sex', 'facial'
+		act 'Continue': gs 'artem_events', 'after_sex', 'facial'
 	end
 end
 
@@ -1008,5 +1008,5 @@ if $ARGS[0] = 'slut_anal':
 	end
 end
 
---- artemEv ---------------------------------
+--- artem_events ---------------------------------
 

+ 51 - 51
locations/artemhome.qsrc

@@ -318,7 +318,7 @@ if $ARGS[0] = 'artemroom':
 			act 'Let''s go to the livingroom': ArtemLoc = 5 & gt 'artemhome', 'livingroom'
 			act 'Talk to Artem': ArtemLoc = 2 & gt 'artemhome', 'chat'
 			if lernHome ! 0:
-				act 'Do homework with Artem': gt 'artemEv','learn'
+				act 'Do homework with Artem': gt 'artem_events','learn'
 			end
 !! Nutluck needs to say at which point this should be enabled, set it to artfall > 5 for now		
 			if artfall > 5 and artkissing ! daystart:
@@ -360,32 +360,32 @@ if $ARGS[0] = 'artemroom':
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
 								if artdryhump = 0:
 									'Artem trips over his words when he tries to suggest something: "<<$pcs_nickname>>, maybe we could... maybe I... I really want you... can I touch your ass? Please?"'
-									act 'Let him caress your ass': gt 'artemEv','artdryhump'
+									act 'Let him caress your ass': gt 'artem_events','artdryhump'
 								elseif artdryhump <= 1:
 									if $pantyworntype ! 'none':
 										'Artem looks at you with embarrassment, but gathers the courage to ask: "<<$pcs_nickname>>, you''re the best thing that''s ever happened to me. I enjoyed last time so much... but could you strip down to your underwear?"'
-										act 'Strip to your panties': gt 'artemEv','artdryhump1'
+										act 'Strip to your panties': gt 'artem_events','artdryhump1'
 										gs 'willpower', 'exhib', 'resist'
 										if will_cost <= pcs_willpwr:
 											act 'Refuse to strip (<<will_cost>> Willpower)': 
 												gs 'willpower', 'pay', 'resist'
-												gt 'artemEv','artdryhump'
+												gt 'artem_events','artdryhump'
 											end
 										else
 											act 'Refuse to strip (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 										end
 									else
 										'Artem trips over his words when he tries to suggest something: "<<$pcs_nickname>>, maybe we could... I really want you... can I touch your ass again? Please?"'
-										act 'Let him caress your ass': gt 'artemEv','artdryhump'
+										act 'Let him caress your ass': gt 'artem_events','artdryhump'
 									end
 								elseif artdryhump <= 2 and artemStripSee = 1:
 									'Artem looks at you with embarrassment, but gathers the courage to ask: "<<$pcs_nickname>>, last time you let me rub your ass it was great, but now that I have seen you naked... could you strip naked first?"'
-									act 'Strip': gt 'artemEv','artdryhump2'
+									act 'Strip': gt 'artem_events','artdryhump2'
 									gs 'willpower', 'exhib', 'resist'
 									if will_cost <= pcs_willpwr:
 										act 'Refuse to strip (<<will_cost>> Willpower)': 
 											gs 'willpower', 'pay', 'resist'
-											gt 'artemEv','artdryhump'
+											gt 'artem_events','artdryhump'
 										end
 									else
 										act 'Refuse to strip (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -395,13 +395,13 @@ if $ARGS[0] = 'artemroom':
 									gs 'arousal', 'kiss', 5
 									gs 'stat'
 									if artemhj > 0 or artembf = 1:
-										act 'Give him a handjob': gt 'artemEv', 'hj'
+										act 'Give him a handjob': gt 'artem_events', 'hj'
 									end
 									if artembj > 0 or artembf = 1:
-										act 'Give him a blowjob': gt 'artemEv', 'bj'
+										act 'Give him a blowjob': gt 'artem_events', 'bj'
 									end
 									if artemsex > 0 or artembf = 1:
-										act 'Have sex with him': gt 'artemEv', 'sex'
+										act 'Have sex with him': gt 'artem_events', 'sex'
 									end
 									gs 'willpower', 'bj', 'resist', 'medium'
 									if will_cost <= pcs_willpwr:
@@ -606,7 +606,7 @@ if $ARGS[0] = 'livingroom':
 	gs 'stat'
 	'<center><b><font color = maroon>Living room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
-	'The living room is clean and neat. A couch rests against one wall, with a throw rug between it and the TV stand. On the throw rug is a nice coffee table. On the TV stand sits a nice but not too big flat screen tv, while in the bottom of the stand is a neatly stored playstation. Along one side of the tv is a stand with several dozen movies.'
+	'The living room is clean and neat. A couch rests against one wall, with a throw rug between it, and the TV stand. On the throw rug is a nice coffee table. On the TV stand sits a nice but not too big flat screen tv, while in the bottom of the stand is a neatly stored playstation. Along one side of the tv is a stand with several dozen movies.'
 	if hour < 6:
 		gt 'artemhome', 'timecheck'
 	elseif hour > 22:
@@ -621,15 +621,15 @@ if $ARGS[0] = 'livingroom':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 			if pav_slut >= 200 or grupTipe = 4:
 				'As the two of you walk into the living room he turns towards you, looking a bit appalled at you, "So <<$pcs_firstname>> how did you and my boy become friends?"'
-				'Stretching out your clothes so they cover you up a little, "I don'' really remember. We kinda just connected and started hanging out... It doesn''t hurt that Artem is really hot so that made it much easier." Artem blushes at the comment.'
-				'Masharin squirms a little by your answer, clears his throat and asks, "My boy is very ambitious and we''re very proud of him, we want him to succeed in school. I really hope that he will be able to continue to pursue that because you know, he''s not used to girls like you..."'
+				'Stretching out your clothes so they cover you up a little, "I don''t really remember. We kinda just connected and started hanging out... It doesn''t hurt that Artem is really hot, so that made it much easier." Artem blushes at the comment.'
+				'Masharin squirms a little by your answer, clears his throat and asks, "My boy is very ambitious and we''re very proud of him, we want him to succeed in school. I really hope that he will be able to continue to pursue that because, you know, he''s not used to girls like you..."'
 				act 'What do you mean?':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					'You tilt your head and start playing with your hair, "Girls like me...?"'
-					'Masharin starts squirming even more, "You know... Experienced..."'
+					'Masharin starts squirming even more, "You know... experienced..."'
 					'Artem sighs really loud, "Dad, stop embarrassing me..."'
-					'You keep prodding some more, "I don''t really follow what you mean... Experienced, in what way?"'
+					'You keep prodding some more, "I don''t really follow what you mean... experienced, in what way?"'
 					'He''s now looking around avoiding eye-contact, "Ehm, you know sexually..."'
 					act 'Did you just assume something?':
 						*clr & cla
@@ -637,27 +637,27 @@ if $ARGS[0] = 'livingroom':
 						'You start shaking your head, "Did you just assume that I''m a slut just because of what clothes I''m wearing?"'
 						'"N-No, <<$pcs_firstname>>, I d-didn''t assume anything..." you can see Masharin sweat a little.'
 						'You stand in silence for a few seconds as you finally start laughing, "Don''t worry about Artem, I''ll make sure that he keeps his head straight..."'
-						'Masharin sighs, "Well, I think Artem and I will have a talk later..." as he looks sternly at Artem'
+						'Masharin sighs, "Well, I think Artem and I will have to have a talk later..." as he looks sternly at Artem'
 						'You smile, "You do that..." as you and Artem turn around, you show off a bit of your behind as you leave the room without Artem noticing at first, then he turns to hurry to catch up to you and walk you to his room.'
 						act 'Leave': ArtemLoc = 2 & gt 'artemhome','artemroom'
 					end
 				end
 			else 
-				'As the two of you walk into the living room Artem''s father turns around, it seems like you''ve startled him a bit, "Oh, I''m sorry... we didn''t mean to startle you..."'
+				'As the two of you walk into the living room Artem''s father turns around, it seems like you''ve startled him a bit. "Oh, I''m sorry... we didn''t mean to startle you..."'
 				'He waves your fears away, "Don''t worry about it, I''m just happy to see Artem spending time with a nice girl like yourself..."'
 				act 'Thank you':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					'You nod and give a subtle smile, "You''re making me blush. You''re giving me way too much credit..."'
-					'Masharin shakes his head, "Not at all. Artem has been talking about you quite a lot and he''s really excited when he talks about you so I''m glad that he found someone nice to be friends with."'
+					'Masharin shakes his head, "Not at all. Artem has been talking about you quite a lot and he''s really excited when he talks about you, so I''m glad that he found someone nice to be friends with."'
 					'Artem cries out in embarrassment, "Dad, that was supposed to be a private thing between us two. You weren''t supposed to say that to <<$pcs_nickname>>..." he starts blushing.'
 					act 'Smile':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-						'Masharin looks worrying at Artem as you decide to ease the tension a bit, you playfully push Artem a little, "Ease up a little, your dad was just looking out for you is all."'
-						'"Still he shouldn''t have talked about it... I said all of that in confidence." Artem is still upset.'
-						'"Artem, I-I''m..." Masharin begins but is cut off by Artem, "Let''s go <<$pcs_nickname>>, that''s enough embarrassment for one day..."'
-						'"Don''t worry, Mr. Chebotarev. I''m sure it''s not a big thing, Artem will be over it soon enough..." you say a couple of encouraging words before leaving the living room and going to Artems room.'
+						'Masharin looks worrying at Artem, so you decide to ease the tension a bit by playfully pushing Artem a little. "Ease up a little, your dad was just looking out for you is all."'
+						'"Still, he shouldn''t have talked about it... I said all of that in confidence." Artem is still upset.'
+						'"Artem, I-I''m..." Masharin begins but is cut off by Artem, "Let''s go <<$pcs_nickname>>, that''s enough embarrassment for one day."'
+						'"Don''t worry, Mr. Chebotarev. I''m sure it''s not a big thing, Artem will be over it soon enough." you say encouragingly before going to Artems room.'
 						act 'Leave': ArtemLoc = 2 & gt 'artemhome','artemroom'
 					end
 				end
@@ -672,22 +672,22 @@ if $ARGS[0] = 'livingroom':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 					if pav_slut >= 200 or grupTipe = 4:
-						'"Didn''t think Artem would still be socializing with you after our talk..." Masharin reacts to seeing you once again...'
-						'"Yeah, well you know how it goes." you nonchalantly answer.'
+						'"Didn''t think Artem would still be socializing with you after our talk..." Masharin reacts to seeing you once again.'
+						'"Yeah, well, you know how it goes." you nonchalantly answer.'
 						'All of a sudden his posture changes and he slouches back in his chair, "<<$pcs_firstname>>, can''t you find some other boy to toy with, other than my son?"'
 						act 'Toy with?':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'You look confusingly at Masharin, "Toy with him?"'
-							'"Like I told you the last time my Artem is a smart and a bright boy and he''s doing great in school..." Masharin starts explaining, "And since this is his last year in school I would like him to be able to keep up his grades..."'
+							'"Like I told you the last time, my Artem is a smart and bright boy, and he''s doing great in school." Masharin starts explaining, "Since this is his last year in school I would like him to be able to keep up his grades."'
 							'"So what does this have to do with me?" you cross your arms, looking impatiently at him.'
-							'"We both know the kind of girl you are, you enjoy toying with boys for your own amusement..." he tries to reason, "Can you just leave him alone and I''ll owe you one."'
+							'"We both know the kind of girl you are, you enjoy toying with boys for your own amusement." he tries to reason, "Can you just leave him alone and I''ll owe you one?"'
 							act 'Talk is cheap':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-								'"Just because you think I''m acting like this, you think I could only be toying with him, just because of how I dress and act?!" you start raising your voice, "You don''t think Artem and I could just be friends?! Aren''t you really judgmental?! And to think Artem was telling me about his non-judgmental parents..."'
-								'"N-No not at all," Masharin starts trembling in his voice, "Y-You may behave however you want..."'
-								'"But I can''t be friends with your son, that''s what you''re saying?!" you continue confronting him...'
+								'"You think I am only be toying with him, just because of how I dress and act?!" you start raising your voice, "You don''t think Artem and I could just be friends?! Aren''t you really judgmental?! And to think Artem was telling me about his non-judgmental parents."'
+								'"N-No not at all," Masharin voice starts trembling, "Y-You may behave however you want..."'
+								'"But I can''t be friends with your son, that''s what you''re saying?!" you continue confronting him.'
 								'Masharin curls up slightly and then sighs and goes almost limp, in apparent defeat, at least for now. "I... just don''t hurt him please?"'
 								'With that your roll your eyes and leave.'
 								act 'Leave':gt 'artemhome','hallway'
@@ -701,15 +701,15 @@ if $ARGS[0] = 'livingroom':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'You nod your head, "It''s going good, Artem and I make a great team. If there''s something he doesn''t know, I try to help him out and the same goes when it comes to me."'
-							'"I''m glad to hear that it''s going well. Academics are important, you can get a good job and don''t have to rely on going to a work that you don''t like everyday." Masharin starts in like he is about to start preaching the values of education.'
-							'He continues, "When I was younger I used to spend my days focused on school and got teased for it, but if you look it at it now I have a great job and family, we go on vacations every year. I don''t have to worry about anything."'
+							'"I''m glad to hear that it''s going well. Academics are important, you can get a good job and don''t have to rely on going to a job you don''t like everyday." Masharin starts in like he is about to start preaching the values of education.'
+							'He continues, "When I was younger I used to spend my days focused on school and got teased for it, but if you look it at it now I have a great job and family, we even go on vacations every year. I don''t have to worry about anything."'
 							act 'Listen politely':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 								'You keep quiet and listen to him while he goes on a rant about life and how you should keep a straight head and avoid all the evil stuff that happen around this town.'
-								'All of a sudden he stops, "Oh, sorry. I must be boring you... Sometimes I get way ahead of myself, and then I have to remind myself that no one wants to listen to a boring tale about nothing..."'
-								'You shake your head and reply politely, "Not at all, it''s always good hearing a positive opinion about studying as it''s not always seen in a keen light around here..."'
-								'Masharin sighs, "Well, don''t pay too much attention to it and you''ll see it''ll be easier for you later in life..."'
+								'All of a sudden he stops, "Oh, sorry. I must be boring you... Sometimes I get way ahead of myself, and then I have to remind myself that no one wants to listen to a boring tale about nothing."'
+								'You shake your head and reply politely, "Not at all, it''s always good hearing a positive opinion about studying, as it''s not always seen in a keen light around here."'
+								'Masharin sighs, "Well, don''t pay too much attention to it, and you''ll see how much better life is as time goes by."'
 								act 'Leave':gt 'artemhome','hallway'
 							end
 						end
@@ -721,11 +721,11 @@ if $ARGS[0] = 'livingroom':
 							act 'What is it?':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-								'Yours eyes widen, "What was it?"'
+								'Your eyes widen, "What was it?"'
 								'Masharin tries to excuse himself, "It worked for me but it doesn''t mean it will work for anyone else. We all have our own quirks that helps us when it comes to that stuff, you have your breaks and I have mine."'
 								'"Well, I would love to hear what you did, it would be of great help." you tell him.'
-								'Masharin smiles, "Fine, fine, I''ll tell you then. I used to close my eyes and think that I''m in the middle of a forest, only hearing those unusual sounds that you can hear in a silent forest. This always cleared my mind and it helped me re-focus."'
-								'Hmm maybe but what does a forest have to do with math or science? "I might try this some time, thanks a lot for the advice but it''s probably best that I head back."'
+								'Masharin smiles, "Fine, fine, I''ll tell you then. I used to close my eyes and think that I''m in the middle of a forest, only hearing those unusual sounds that you can hear in a silent forest. This always cleared my mind and it helped me regain my focus."'
+								'Hmm maybe, but what does a forest have to do with math or science? "I might try this some time, thanks a lot for the advice, but it''s probably best that I head back."'
 								act 'Leave':gt 'artemhome','hallway'
 							end
 						end
@@ -759,21 +759,21 @@ if $ARGS[0] = 'livingroom':
 							minut += 10
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/glinina.jpg"></center>'
-							'"As a matter of fact you can." You continue further inside living room, taking a seat next to Glinina, "I just need to see the first part of that scandalous show they''re showing right now."'
+							'"As a matter of fact you can." You continue further inside living room, taking a seat next to Glinina. "I just need to see the first part of that scandalous show they''re showing right now."'
 							'You grab the controller off the coffee table and switch the channel, "Oh, here it is." The show goes on showing the contestants fight, having sex and other morally questionable actions.'
 							'"I can''t believe he picked that slut," you shout out, "She''s clearly just playing with him to win the whole thing." you tell Glinina.'
 							'"Shouldn''t you head back to Artem?" Masharin asks.'
-							'"Hmm?" and just as you''re about to answer the commercials come on and you let out a sigh, "I guess it''s time to head back. Thanks for letting me watch the first part." You quickly get up and leave them still stunned not really understanding what just happened.'
+							'"Hmm?" and just as you''re about to answer the commercials come on and you let out a sigh, "I guess it''s time to head back. Thanks for letting me watch the first part." You quickly get up and leave them still stunned, not really understanding what just happened.'
 							act 'Leave':gt 'artemhome','hallway'
 						end
 						act 'No':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 							'"No, just needed to get away for a while... You know school work is boring as hell and your son is super serious about that stuff, which is no fun." you reply.'
-							'Masharin looking away from the TV, "Well, school work is important. You''re about to head to the university and you need to be ready for what is waiting there..."'
+							'Masharin looking away from the TV, "Well, school work is important. You''re about to head to the university and you need to be ready for what is waiting there."'
 							'"I don''t know if I''ll end up there, I''m already tired of it and I don''t want to spend more time in school when I could be making money." you explain.'
 							'"Oh, and what would you be doing without a degree?" Masharin asks.'
-							'"Well you know, some odd jobs here and there. I''m sure I''ll get by fine. After all I''m still young and vigorous, so I''ll manage." you confidently reply, "Well, time to head back. Don''t want to keep Artem waiting..." you stretch showing off your curves a little before turning around leaving the Chebotarev''s looking in disbelief.'
+							'"Well you know, some odd jobs here and there. I''m sure I''ll get by fine. After all I''m still young and vigorous, so I''ll manage." you confidently reply, "Well, time to head back. Don''t want to keep Artem waiting..." you stretch showing off your curves a little before turning around leaving the Chebotarev''s looking at you in disbelief.'
 							act 'Leave':gt 'artemhome','hallway'
 						end
 					else 
@@ -1318,7 +1318,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile back: "Sure Artem, we could go for a walk, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him, heading for the park.'
-			act 'Walk in the park': gt 'artemdate','firstdate'
+			act 'Walk in the park': gt 'artem_date_events','firstdate'
 		end
 	elseif artdate > 0 and artdate <= 3 and pav_slut < 150 and artemQW['dateask'] ! daystart:
 		*clr & cla
@@ -1341,7 +1341,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artemdate','artem_date'
+			act 'Go on a date': gt 'artem_date_events','artem_date'
 		end
 	elseif artdate = 4 and pav_slut < 200 and artemQW['dateask'] ! daystart:
 		*clr & cla
@@ -1391,8 +1391,8 @@ if $ARGS[0] = 'chat':
 				'You return his kiss, his hands keep awkwardly groping at your <<$titsize>> boobs. He sits with his back against the wall and pulls you on top of him his lap. Once you straddles his lap, you can feel quite the hard bulge in his pants. As you keep making out after a bit he takes one of your hands in his and pulls it down to the bulge in his pants, obviously wanting you to get him off.'
 				gs 'arousal', 'kiss', 5
 				gs 'stat'
-				act 'Give him a handjob': gt 'artemEv', 'hj'
-				act 'Give him a blowjob': gt 'artemEv', 'artem_bj'
+				act 'Give him a handjob': gt 'artem_events', 'hj'
+				act 'Give him a blowjob': gt 'artem_events', 'artem_bj'
 				gs 'willpower', 'bj', 'resist', 'medium'
 				if will_cost <= pcs_willpwr:
 					act 'Pull away and stop (<<will_cost>> Willpower)':
@@ -1449,7 +1449,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artemdate','artem_date'
+			act 'Go on a date': gt 'artem_date_events','artem_date'
 		end
 	elseif artdate = 9 and artemQW['dateask'] ! daystart:
 		*clr & cla
@@ -1534,7 +1534,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile back: "Sure Artem, we can go out on a date, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artemdate','artem_date'
+			act 'Go on a date': gt 'artem_date_events','artem_date'
 		end
 	else
 		act 'Make small talk':
@@ -1706,7 +1706,7 @@ if $ARGS[0] = 'stripagree':
 	end
 	'You see him visible swallow, as he blushes but then he nods. "Yes I do, I would really love it if you did."'
 	'You think it over for a moment and then figure why not, you like Artem and it sounds thrilling, plus it will make him happy. "Ok fine, sit back and enjoy the show." With those words he grins hugely. You start stripping out of your clothes slowly teasing him as you do, you might as well have some fun with this.'
-	act 'Start stripping': gt 'artemEv', 'striptease'
+	act 'Start stripping': gt 'artem_events', 'striptease'
 end
 
 if $ARGS[0] = 'artemgirlfriend':
@@ -1726,9 +1726,9 @@ if $ARGS[0] = 'artemgirlfriend':
 		'You return his kiss, his hands keep roaming all over you body but especially pay attention to your boobs and butt. He walks backwards pulling you along with him until he sits with his back against the wall, on the bed and pulls you on top of his lap. Once you straddle his lap, you can feel quite the hard bulge in his pants. As you keep making out after a bit he takes one of your hands in his and pulls it down to the bulge in his pants, obviously wanting you to get him off. "<<$pcs_nickname>> can we have sex?"'
 		gs 'arousal', 'kiss', 5
 		gs 'stat'
-		act 'Give him a handjob': gt 'artemEv', 'hj'
-		act 'Give him a blowjob': gt 'artemEv', 'bj'
-		act 'Have sex with him': gt 'artemEv', 'sex'
+		act 'Give him a handjob': gt 'artem_events', 'hj'
+		act 'Give him a blowjob': gt 'artem_events', 'bj'
+		act 'Have sex with him': gt 'artem_events', 'sex'
 		gs 'willpower', 'bj', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Pull away and stop (<<will_cost>> Willpower)':

+ 70 - 460
locations/autosalonF.qsrc

@@ -7,7 +7,6 @@ if $ARGS[0] = 'start':
 	cla
 	*clr
 	minut += 5
-	cartraid = 1
 	gs 'stat'
 	'<center><b>Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/cardealer/manager.jpg"></center>'
@@ -15,30 +14,30 @@ if $ARGS[0] = 'start':
 	'<b><center>List of vehicles for sale</center></b>'
 	nl
 	'<center><table border=0><TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car6''">Kalina VAZ</a>.</TD><TD> - </TD><TD> New. Price: 400 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car7''">WHA PRIORA</a>.</TD><TD> - </TD><TD> New. Price: 450 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car8''">Chevrolet NIVA</a>.</TD><TD> - </TD><TD> New. Price: 500 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car9''">UAZ HUNTER</a>.</TD><TD> - </TD><TD> New. Price: 500 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car10''">UAZ Patriot</a>.</TD><TD> - </TD><TD> New. Price: 600 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car13''">Ford Focus 2</a>.</TD><TD> - </TD><TD> New. Price: 500 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car102''">Renault LOGAN</a>.</TD><TD> - </TD><TD> New. Price: 700 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car110''">Ford Mondeo</a>.</TD><TD> - </TD><TD> New. Price: 850 th.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car104''">Toyota Celica</a>.</TD><TD> - </TD><TD> New. Price: 1 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car95''">Mitsubishi l200</a>.</TD><TD> - </TD><TD> New. Price: 1 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car103''">Toyota Corolla</a>.</TD><TD> - </TD><TD> New. Price: 1,1 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car105''">Mazda 6</a>.</TD><TD> - </TD><TD> New. Price: 1,2 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car106''">Mercedes-Benz E 212</a>.</TD><TD> - </TD><TD> New. Price: 1,7 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car109''">Audi A6</a>.</TD><TD> - </TD><TD> New. Price: 1,9 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car97''">Cadillac Escalade</a>.</TD><TD> - </TD><TD> New. Price: 2 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car101''">BMW Z4</a>.</TD><TD> - </TD><TD> New. Price: 3 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car107''">BMW M5</a>.</TD><TD> - </TD><TD> New. Price: 4,5 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car99''">BMW X6</a>.</TD><TD> - </TD><TD> New. Price: 4,5 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car96''">Audi Q7</a>.</TD><TD> - </TD><TD> New. Price: 5 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> New. Price: 5 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car108''">Jaguar XKR-S</a>.</TD><TD> - </TD><TD> New. Price: 7 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car100''">Mercedes-Benz S 600</a>.</TD><TD> - </TD><TD> New. Price: 8 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car111''">Bentley Continental gt</a>.</TD><TD> - </TD><TD> New. Price: 10 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> New. Price: 20 million.RUB</TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''6''">Kalina VAZ</a>.</TD><TD> - </TD><TD> New. Price: 400,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''7''">WHA PRIORA</a>.</TD><TD> - </TD><TD> New. Price: 450,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''8''">Chevrolet NIVA</a>.</TD><TD> - </TD><TD> New. Price: 500,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''9''">UAZ HUNTER</a>.</TD><TD> - </TD><TD> New. Price: 500,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''10''">UAZ Patriot</a>.</TD><TD> - </TD><TD> New. Price: 600,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''13''">Ford Focus 2</a>.</TD><TD> - </TD><TD> New. Price: 500,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''102''">Renault LOGAN</a>.</TD><TD> - </TD><TD> New. Price: 700,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''110''">Ford Mondeo</a>.</TD><TD> - </TD><TD> New. Price: 850,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''104''">Toyota Celica</a>.</TD><TD> - </TD><TD> New. Price: 1,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''95''">Mitsubishi l200</a>.</TD><TD> - </TD><TD> New. Price: 1,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''103''">Toyota Corolla</a>.</TD><TD> - </TD><TD> New. Price: 1,100,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''105''">Mazda 6</a>.</TD><TD> - </TD><TD> New. Price: 1,200,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''106''">Mercedes-Benz E 212</a>.</TD><TD> - </TD><TD> New. Price: 1,700,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''109''">Audi A6</a>.</TD><TD> - </TD><TD> New. Price: 1,900,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''97''">Cadillac Escalade</a>.</TD><TD> - </TD><TD> New. Price: 2,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''101''">BMW Z4</a>.</TD><TD> - </TD><TD> New. Price: 3,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''107''">BMW M5</a>.</TD><TD> - </TD><TD> New. Price: 4,500,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''99''">BMW X6</a>.</TD><TD> - </TD><TD> New. Price: 4,500,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''96''">Audi Q7</a>.</TD><TD> - </TD><TD> New. Price: 5,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> New. Price: 5,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''108''">Jaguar XKR-S</a>.</TD><TD> - </TD><TD> New. Price: 7,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''100''">Mercedes-Benz S 600</a>.</TD><TD> - </TD><TD> New. Price: 8,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''111''">Bentley Continental gt</a>.</TD><TD> - </TD><TD> New. Price: 10,000,000 <b>₽</b></TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> New. Price: 20,000,000 <b>₽</b></TD></TR>'
 	'</TR></table>'
 
 	act 'Talk to the manager': gt 'autosalonF', 'manager1'
@@ -57,518 +56,129 @@ if $ARGS[0] = 'manager1':
 	minut += 5
 	'<center><b>Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/cardealer/manager.jpg"></center>'
-	'You have <<karta>> <b>₽</b> on your bank account.'
-	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, on your bank account.' 
-	'"With how the economy is right now, we can''t accept payment by installments at this time I''m afraid." he apologizes. "A few new laws have also been passed too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
+	'You have <<karta>> <b>₽</b> in your bank account.'
+	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, in your bank account.' 
+	'"With how the economy is right now, we can''t accept payment by installments at this time I''m afraid," he apologizes. "A few new laws have also been passed too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
 
 	act 'Leave':gt 'city_industrial'
 
 	if prava = 1:
 		if karta + bankDebtLimit >= 400000:
-			act 'Buy a Kalina VAZ (400 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 400000
-				$car = 'Kalina VAZ'
-				car = 6
-				benz = 3
-				cardrive = 8
-				teh = 400
-				tehcar = 400
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Kalina VAZ (400,000 <b>₽</b>)':gt 'autosalonF', 'buy', 400000, 'Kalina VAZ', 6, 400
 		end
 
 		if karta + bankDebtLimit >= 450000:
-			act 'Buy a VAZ Priora (450 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 450000
-				$car = 'WHA PRIORA'
-				car = 7
-				benz = 3
-				cardrive = 8
-				teh = 450
-				tehcar = 450
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a VAZ Priora (450,000 <b>₽</b>)':gt 'autosalonF', 'buy', 450000, 'WHA PRIORA', 7, 450
 		end
 
 		if karta + bankDebtLimit >= 500000:
-			act 'Buy a Chevrolet Niva (500 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 500000
-				$car = 'Chevrolet NIVA'
-				car = 8
-				benz = 3
-				cardrive = 8
-				teh = 500
-				tehcar = 500
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Chevrolet Niva (500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 500000, 'Chevrolet NIVA', 8, 500
 		end
 
 		if karta + bankDebtLimit >= 500000:
-			act 'Buy a UAZ Hunter (500 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 500000
-				$car = 'UAZ HUNTER'
-				car = 9
-				benz = 3
-				cardrive = 8
-				teh = 300
-				tehcar = 300
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a UAZ Hunter (500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 500000, 'UAZ HUNTER', 9, 300
 		end
 
 		if karta + bankDebtLimit >= 600000:
-			act 'Buy a UAZ Patriot (600 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 600000
-				$car = 'UAZ Patriot'
-				car = 10
-				benz = 3
-				cardrive = 8
-				teh = 400
-				tehcar = 400
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a UAZ Patriot (600,000 <b>₽</b>)':gt 'autosalonF', 'buy', 600000, 'UAZ Patriot', 10, 400
 		end
 
 		if karta + bankDebtLimit >= 500000:
-			act 'Buy a Ford Focus 2 (500 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 500000
-				$car = 'Ford Focus 2'
-				car = 13
-				benz = 3
-				cardrive = 8
-				teh = 800
-				tehcar = 800
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Ford Focus 2 (500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 500000, 'Ford Focus 2', 13, 800
 		end
 
 		if karta + bankDebtLimit >= 700000:
-			act 'Buy a Renault LOGAN (700 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 700000
-				$car = 'Renault LOGAN'
-				car = 102
-				benz = 3
-				cardrive = 8
-				teh = 1000
-				tehcar = 1000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Renault LOGAN (700,000 <b>₽</b>)':gt 'autosalonF', 'buy', 700000, 'Renault LOGAN', 102, 1000
 		end
 
 		if karta + bankDebtLimit >= 850000:
-			act 'Buy a Ford Mondeo (850 th.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 850000
-				$car = 'Ford Mondeo'
-				car = 110
-				benz = 3
-				cardrive = 8
-				teh = 2000
-				tehcar = 2000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Ford Mondeo (850,000 <b>₽</b>)':gt 'autosalonF', 'buy', 850000, 'Ford Mondeo', 110, 2000
 		end
 
 		if karta + bankDebtLimit >= 1000000:
-			act 'Buy a Toyota Celica (1 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1000000
-				$car = 'Toyota Celica'
-				car = 104
-				benz = 3
-				cardrive = 8
-				teh = 3000
-				tehcar = 3000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Toyota Celica (1,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1000000, 'Toyota Celica', 104, 3000
 		end
 
 		if karta + bankDebtLimit >= 1000000:
-			act 'Buy a Mitsubishi l200 (1 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1000000
-				$car = 'Mitsubishi l200'
-				car = 95
-				benz = 3
-				cardrive = 8
-				teh = 2000
-				tehcar = 2000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Mitsubishi l200 (1,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1000000, 'Mitsubishi l200', 95, 2000
 		end
 
 		if karta + bankDebtLimit >= 1100000:
-			act 'Buy a Toyota Corolla (1,1 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1100000
-				$car = 'Toyaboutta Corolla'
-				car = 103
-				benz = 3
-				cardrive = 8
-				teh = 3000
-				tehcar = 3000
-				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.' 
-				'"It''s waiting for you outside." she says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Toyota Corolla (1,100,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1100000, 'Toyaboutta Corolla', 103, 3000
 		end
 
 		if karta + bankDebtLimit >= 1200000:
-			act 'Buy a Mazda 6 (1,2 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1200000
-				$car = 'Mazda 6'
-				car = 105
-				benz = 3
-				cardrive = 8
-				teh = 3000
-				tehcar = 3000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Mazda 6 (1,200,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1200000, 'Mazda 6', 105, 3000
 		end
 
 		if karta + bankDebtLimit >= 1700000:
-			act 'Buy a Mercedes-Benz E 212 (1,7 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1700000
-				$car = 'Mercedes-Benz E 212'
-				car = 106
-				benz = 3
-				cardrive = 8
-				teh = 5000
-				tehcar = 5000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Mercedes-Benz E 212 (1,700,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1700000, 'Mercedes-Benz E 212', 106, 5000
 		end
 
 		if karta + bankDebtLimit >= 1900000:
-			act 'Buy an Audi A6 (1,9 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 1900000
-				$car = 'Audi A6'
-				car = 109
-				benz = 3
-				cardrive = 8
-				teh = 5000
-				tehcar = 5000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy an Audi A6 (1,900,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1900000, 'Audi A6', 109, 5000
 		end
 
 		if karta + bankDebtLimit >= 2000000:
-			act 'Buy a Cadillac Escalade (2 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 2000000
-				$car = 'Cadillac Escalade'
-				car = 97
-				benz = 3
-				cardrive = 8
-				teh = 4000
-				tehcar = 4000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Cadillac Escalade (2,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2000000, 'Cadillac Escalade', 97, 4000
 		end
 
 		if karta + bankDebtLimit >= 3000000:
-			act 'Buy a BMW Z4 (3 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 3000000
-				$car = 'BMW Z4'
-				car = 101
-				benz = 3
-				cardrive = 8
-				teh = 4000
-				tehcar = 4000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a BMW Z4 (3,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 3000000, 'BMW Z4', 101, 4000
 		end
 
 		if karta + bankDebtLimit >= 4500000:
-			act 'Buy a BMW M5 (4,5 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 4500000
-				$car = 'BMW M5'
-				car = 107
-				benz = 3
-				cardrive = 8
-				teh = 6000
-				tehcar = 6000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a BMW M5 (4,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 4500000, 'BMW M5', 107, 6000
 		end
 
 		if karta + bankDebtLimit >= 4500000:
-			act 'Buy a BMW X6 (4,5 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 4500000
-				$car = 'BMW X6'
-				car = 99
-				benz = 3
-				cardrive = 8
-				teh = 4000
-				tehcar = 4000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a BMW X6 (4,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 4500000, 'BMW X6', 99, 4000
 		end
 
 		if karta + bankDebtLimit >= 5000000:
-			act 'Buy an Audi Q7 (5 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 5000000
-				$car = 'Audi Q7'
-				car = 96
-				benz = 3
-				cardrive = 8
-				teh = 5000
-				tehcar = 5000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy an Audi Q7 (5,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5000000, 'Audi Q7', 96, 5000
 		end
 
 		if karta + bankDebtLimit >= 5000000:
-			act 'Buy a Porsche Cayenne (5 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 5000000
-				$car = 'Porsche Cayenne'
-				car = 98
-				benz = 3
-				cardrive = 8
-				teh = 3000
-				tehcar = 3000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Porsche Cayenne (5,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5000000, 'Porsche Cayenne', 98, 3000
 		end
 
 		if karta + bankDebtLimit >= 7000000:
-			act 'Buy a Jaguar XKR-S (7 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 7000000
-				$car = 'Jaguar XKR-S'
-				car = 108
-				benz = 3
-				cardrive = 8
-				teh = 4000
-				tehcar = 4000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Jaguar XKR-S (7,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 7000000, 'Jaguar XKR-S', 108, 4000
 		end
 
 		if karta + bankDebtLimit >= 8000000:
-			act 'Buy a Mercedes-Benz S 600 (8 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 8000000
-				$car = 'Mercedes-Benz S 600'
-				car = 100
-				benz = 3
-				cardrive = 8
-				teh = 8000
-				tehcar = 8000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Mercedes-Benz S 600 (8,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 8000000, 'Mercedes-Benz S 600', 100, 8000
 		end
 
 		if karta + bankDebtLimit >= 10000000:
-			act 'Buy a Bentley Continental GT (10 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 10000000
-				$car = 'Bentley Continental GT'
-				car = 111
-				benz = 3
-				cardrive = 8
-				teh = 8000
-				tehcar = 8000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Bentley Continental GT (10,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 10000000, 'Bentley Continental GT', 111, 8000
 		end
 
 		if karta + bankDebtLimit >= 20000000:
-			act 'Buy a Ferrari 458 Italia (10 million.RUB)':
-				cla
-				*clr
-				menu_off = 1
-				karta -= 20000000
-				$car = 'Ferrari 458 Italia'
-				car = 112
-				benz = 3
-				cardrive = 8
-				teh = 10000
-				tehcar = 10000
-				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.' 
-				'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
-
-				act 'Leave':gt'city_industrial'
-			end
+			act 'Buy a Ferrari 458 Italia (10,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 20000000, 'Ferrari 458 Italia', 112, 10000
 		end
 	end
 end
 
+if $ARGS[0] = 'buy':
+	cla
+	*clr
+	menu_off = 1
+	karta -= ARGS[1]
+	$car = $ARGS[2]
+	car = ARGS[3]
+	benz = 3
+	cardrive = 9
+	teh = ARGS[4]
+	tehcar = 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.' 
+	'"It''s waiting for you outside," he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
+
+	act 'Leave':gt'city_industrial'
+end
+
 --- autosalonF ---------------------------------
 

+ 16 - 10
locations/autoservisF.qsrc

@@ -13,6 +13,8 @@ if $ARGS[0] = 'start':
 	'<center><b>Car Service Center</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/carservicesta/autoservis1.jpg"></center>'
 
+	if car > 0 and cardrive = 7:'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked just inside.'
+
 	if cardrive = 7:
 		menu_off = 1
 		if wrek = 0:
@@ -23,7 +25,7 @@ if $ARGS[0] = 'start':
 
 			if teh < tehcar * 75 / 100:
 				'The foreman inspects your car quickly but thoroughly.' 
-				'Here and there, he seems to be murmurring to himself, maybe assessing a defect. After only a few minutes, he returns to you, points out what needs to be fixed.' 
+				'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>.'
 
 				if money >= normrem:
@@ -35,15 +37,15 @@ if $ARGS[0] = 'start':
 						teh = tehcar
 						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 or recreation room, with couches and a TV. After about an our of flipping through channels, the car is ready and you pay <<normrem>> <b>₽</b>.'
+						'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>.'
 
 						act 'Leave': minut += 5 & gt 'city_industrial'
 					end
 				end
 			end
 		elseif wrek = 1:
-			'The foreman looks onto your car, if this wreckage even qualifies as one, with a professional boredom that tells you he''s seen vehicles in similar or worse states a million times over.' 
-			'He quickly but thoroughly inspects it, murmurring all the while to take mental notes on what needs to be done and, when he returns to you, simply states that it would cost <<normrem>> <b>₽</b> to repair the damage.'
+			'The foreman looks at your car, if this wreckage even qualifies as one, with a professional boredom that tells you he''s seen vehicles in similar or worse states a million times over.' 
+			'He quickly but thoroughly inspects it, murmuring all the while to take mental notes on what needs to be done, and, when he returns to you, simply states that it would cost <<normrem>> <b>₽</b> to repair the damage.'
 
 			if money >= normrem:
 				act 'Pay and wait while they repair the car':
@@ -55,9 +57,9 @@ if $ARGS[0] = 'start':
 					teh = tehcar
 					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 thought he was being sarcastic but then realized that his no-nonsense attitude didn''t leave much room for humour - you go into a waiting or recreation room, with couches and a TV. After about an our of flipping through channels, you are called back to the garage and can hardly believe your eyes.'
-					'The car looks brandnew! Not a single dent, not one scratch, and when you start the engine to make sure it''s working, it sounds better than ever before. You ask the foreman how he and his crew managed to repair the car, and that quickly, but his only response is a shrug.'
-					'Before he sends you back into the office to pay the <<normrem>> <b>₽</b>, he asks you to not bring them cars in this pitiable state anymore - you''re not sure whether he was joking or not.'
+					'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.'
+					'The car looks brand new! Not a single dent, not one scratch, and when you start the engine to make sure it''s working, it sounds better than ever before. You ask the foreman how he and his crew managed to repair the car, and that quickly, but his only response is a shrug.'
+					'Before he sends you back into the office to pay the <<normrem>> <b>₽</b>, he asks you to not bring them cars in this pitiable state anymore - you''re not sure whether he is joking or not.'
 
 					act 'Leave': minut += 5 & gt 'city_industrial'
 				end
@@ -65,10 +67,10 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if cardrive ! 7:'The foreman sighs. "Where is your car, girl? I need to look at your car to see if and what is wrong with it. Bring your car and I''ll examine it."'
+	if cardrive ! 7:'The foreman sighs. "Where is your car, girl? I need to look at your car to see if and what is wrong with it. Bring your car, and I''ll examine it."'
 
 	if wrek = 1 and cardrive ! 7 and car > 0:
-		'The garage offers a towing service for damaged cars, to bring them to this service centers. The price: 2500 <b>₽</b>'
+		'The garage offers a towing service for damaged cars to bring them to this service center. The price: 2500 <b>₽</b>'
 
 		if money >= 2500:
 			act 'Pay for the towing service (2,500 <b>₽</b>) (1:00)':
@@ -79,7 +81,7 @@ if $ARGS[0] = 'start':
 				cardrive = 7
 				minut += 60
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/carservicesta/autoservis2.jpg"></center>'
-				'You sit down and wait at the service station. It takes about an hour until your car arrives, but when it does, it is almost immediately moved into the garage and it looks like the foreman is about ready to inspect it.'
+				'You sit down and wait at the service station. It takes about an hour until your car arrives, but when it does, it is almost immediately moved into the garage, and it looks like the foreman is about ready to inspect it.'
 
 				act 'See what the foreman has to say':gt 'autoservisF', 'start'
 			end
@@ -89,5 +91,9 @@ if $ARGS[0] = 'start':
 	act 'Leave': minut += 5 & gt 'city_industrial'
 end
 
+if $ARGS[0] = 'is_open':
+	RESULT = hour >= 9 and hour <= 20 and week < 7
+end
+
 --- autoservisF ---------------------------------
 

+ 64 - 219
locations/autotraidF.qsrc

@@ -15,9 +15,11 @@ if $ARGS[0] = 'start':
 	'- We only sell to people with valid driver''s licenses.'
 	'- New State law: No sale if you already own a car.'
 
+	if car > 0 and cardrive = 9:'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked just inside.'
+
 	act 'Leave': minut += 5 & gt 'city_industrial'
 	
-	if hour <= 17:
+	if func('autotraidF', 'is_open'):
 		if car > 0:act 'Ask about selling your car':gt 'autotraidF', 'manager1'
 
 		act 'Look at the new cars for sale': gt 'autosalonF', 'start'
@@ -25,6 +27,10 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'is_open':
+	RESULT = hour >= 9 and hour < 18 and week > 1
+end
+
 if $ARGS[0] = 'manager1':
 	$loc_arg = $ARGS[0]
 	$loc = 'autotraidF'
@@ -40,7 +46,7 @@ if $ARGS[0] = 'manager1':
 	act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 	
 	if cardrive = 9 and car > 0:
-		'The shifty-looking salesman circles around your car a couple of times, making exaggerated displeased noises all the while and pointing out practically every speck of dust as if it was a huge damage. When he turns to you, he states that the best he can do is <<bupay>> <b>₽</b> - while he claims that he''s taking a risk with that price, you''re pretty sure he''s ripping you off.'
+		'The shifty-looking salesman circles around your car a couple of times, making exaggerated displeased noises all the while and pointing out practically every speck of dust as if it is major damage. When he turns to you, he states that the best he can do is <<bupay>> <b>₽</b> - while he claims that he''s taking a risk with that price, you''re pretty sure he''s ripping you off.'
 
 		act 'No way, not at that price - Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 		
@@ -50,7 +56,7 @@ if $ARGS[0] = 'manager1':
 			minut += 60
 			money += bupay
 			car = 0
-			'While you are almost certain that he''s offering less than the car is actually worth, you doubt that you''re going find somebody who''s going to offer you more for it and your attempts at haggling with the fence fall flat - he''s just too experienced at this.'
+			'While you are almost certain that he''s offering less than the car is actually worth, you doubt that you''re going to find somebody who''s going to offer you more for it, and your attempts at haggling with the fence fall flat - he''s just too experienced at this.'
 			'So, as much as you hate it, you give your car one last look before you shake hands with him and follow him into the tiny shed he calls his "office" to sign the papers. He hands you the money in cash and, with a nasty grin, suggests that you look around the yard.' 
 			'"Maybe you''ll see something you like?"'
 
@@ -86,44 +92,14 @@ if $ARGS[0] = 'car':
 	gs 'stat'
 	'<center><b>Used Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
-	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. According to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on though: Several of the cars are visibly damaged or make awful sounds when they are started.' 
+	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. According to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on though: several of the cars are visibly damaged or make awful sounds when they are started.' 
 	*nl
 	'It''s obvious that most, if not all of them have sustained some visible or invisible damage. Buying a car here could be a fantastic bargain... or a complete waste of money. If you are to buy any of them, you know that the first place to visit should be a service center.'
 
 	act 'Return': killvar 'carT' & killvar 'bupay' & gt 'autotraidF', 'start'
 	
 	if hour <= 17:
-		act 'Inspect a 2107':
-			cla
-			*clr
-			menu_off = 1
-			'<center><b>2107</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car.jpg"></center>'
-			tehNT = 200
-			carT = 1
-			gs 'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt 'autotraidF', 'car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy the car (<<bupay>> <b>₽</b>)':
-					cla
-					money -= bupay
-					$car = '2107'
-					car = 1
-					benz = 3
-					cardrive = 9
-					teh = tehT
-					tehcar = 200
-					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'
-					act 'Leave': minut += 5 & gt 'city_industrial'
-				end
-			end
-		end
+		act 'Inspect a 2107':gt 'autotraidF', 'inspect', '2107', 1, 200, 1, 3
 
 		act 'Inspect another 2107 (Broken Engine)':
 			cla
@@ -147,7 +123,7 @@ if $ARGS[0] = 'car':
 					tehcar = 200
 					teh = rand(10, tehcar)
 					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.' 
+					'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.' 
 					'If you want to get the car to a garage, you''ll have to go there and have it towed.'
 					killvar 'bupay'
@@ -155,193 +131,62 @@ if $ARGS[0] = 'car':
 				end
 			end
 		end
-		act 'Inspect a VAZ 2115':
-			cla
-			*clr
-			menu_off = 1
-			tehNT = 300
-			carT = 1
-			'<center><b>VAZ 2115</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car2.jpg"></center>'
-			gs'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt'autotraidF','car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy for <<bupay>> <b>₽</b>':
-					cla
-					money = money - bupay
-					$car = 'VAZ 2115'
-					car = 2
-					benz = 3
-					cardrive = 9
-					teh = tehT
-					tehcar = 300
-					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'
-					act 'Leave': minut += 5 & gt'city_industrial'
-				end
-			end
-		end
-		act 'Inspect a VAZ 2113':
-			cla
-			*clr
-			menu_off = 1
-			tehNT = 290
-			carT = 1
-			'<center><b>VAZ 2113</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car3.jpg"></center>'
-			gs'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt'autotraidF','car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy for <<bupay>> <b>₽</b>':
-					cla
-					money = money - bupay
-					$car = 'VAZ 2113'
-					car = 3
-					benz = 3
-					cardrive = 9
-					teh = tehT
-					tehcar = 290
-					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'
-					act 'Leave': minut += 5 & gt'city_industrial'
-				end
-			end
-		end
-		act 'Inspect a VAZ 2114':
-			cla
-			*clr
-			menu_off = 1
-			tehNT = 300
-			carT = 1
-			'<center><b>VAZ 2114</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car4.jpg"></center>'
-			gs'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
 
-			act 'Look around some more':gt'autotraidF','car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy for <<bupay>> <b>₽</b>':
-					cla
-					money = money - bupay
-					$car = 'VAZ 2114'
-					car = 4
-					benz = 3
-					cardrive = 9
-					teh = tehT
-					tehcar = 300
-					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'
-					act 'Leave': minut += 5 & gt'city_industrial'
-				end
-			end
-		end
-		act 'Inspect a VAZ 2110':
-			cla
-			*clr
-			menu_off = 1
-			tehNT = 350
-			carT = 1
-			'<center><b>VAZ 2110</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car5.jpg"></center>'
-			gs'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt'autotraidF','car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy for <<bupay>> <b>₽</b>':
-					cla
-					money = money - bupay
-					$car = 'VAZ 2110'
-					car = 5
-					benz = 3
-					cardrive = 9
-					teh = tehT
-					tehcar = 350
-					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'
-					act 'Leave': minut += 5 & gt'city_industrial'
-				end
-			end
-		end
-
-		act 'Inspect a GAZ 3102':
-			cla
-			*clr
-			menu_off = 1
-			'<center><b>3102 GAS</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car11.jpg"></center>'
-			tehNT = 1000
-			carT = 2
-			gs 'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt 'autotraidf', 'car'
+		act 'Inspect a VAZ 2115':gt 'autotraidF', 'inspect', 'VAZ 2115', 2, 300, 1, 3
+		act 'Inspect a VAZ 2113':gt 'autotraidF', 'inspect', 'VAZ 2113', 3, 290, 1, 3
+		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
+	end
+end
 
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy <<bupay>><b>₽</b>':
-					cla
-					money -= bupay
-					$car = 'GAZ 3102'
-					car = 11
-					benz = 5
-					cardrive = 9
-					teh = tehT
-					tehcar = 1000
-					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'
-					act 'Leave': minut += 5 & gt 'city_industrial'
-				end
-			end
-		end
+if $ARGS[0] = 'inspect':
+	cla
+	*clr
+	menu_off = 1
+	$autotraidF_carname = $ARGS[1]
+	autotraidF_carnum = ARGS[2]
+	tehNT = ARGS[3]
+	carT = ARGS[4]
+	autotraidF_benz = ARGS[5]
+
+	'<center><b><<$autotraidF_carname>></b></center>'
+	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car<<iif(autotraidF_carnum = 1, '''', autotraidF_carnum)>>.jpg"></center>'
+
+	gs 'avt'
+	'<<$tehT>> 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'
+		gt 'autotraidF', 'car'
+	end
 
-		act 'Inspect a 3110':
+	if car = 0 and prava = 1 and money >= bupay:
+		act 'Buy (<<bupay>> <b>₽</b>)':
 			cla
-			*clr
-			menu_off = 1
-			'<center><b>3110</b></center>'
-			'<center><img <<$set_imgh>> src="images/shared/accessories/car/car12.jpg"></center>'
-			tehNT = 800
-			carT = 2
-			gs 'avt'
-			'<<$tehT>> The car salesman wants <<bupay>> <b>₽</b> for it.'
-
-			act 'Look around some more':gt 'autotraidF', 'car'
-
-			if car = 0 and prava = 1 and money >= bupay:
-				act 'Buy (<<bupay>> <b>₽</b>)':
-					cla
-					money -= bupay
-					$car = '3110'
-					car = 12
-					benz = 5
-					cardrive = 9
-					teh = tehT
-					tehcar = 800
-					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'
-					act 'Leave': minut += 5 & gt 'city_industrial'
-				end
-			end
+			money -= bupay
+			$car = $autotraidF_carname
+			car = autotraidF_carnum
+			benz = autotraidF_benz
+			cardrive = 9
+			teh = tehT
+			tehcar = tehNT
+			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'
+			act 'Leave': minut += 5 & gt 'city_industrial'
 		end
 	end
 end

+ 4 - 5
locations/avt.qsrc

@@ -2,10 +2,10 @@
 if tehNT = 0: tehNT = 200
 tehT = rand(10, tehNT)
 
-if tehT >= tehNT * 75 / 100:$tehT = 'Machine in excellent condition.'
-if tehT < tehNT * 75 / 100 and tehT >= tehNT * 50 / 100:$tehT = 'When the engine has what is background noise'
-if tehT < tehNT * 50 / 100 and tehT >= tehNT * 25 / 100:$tehT = 'Machine rumbles and smokes.'
-if tehT < tehNT * 25 / 100:$tehT = 'As this bowl was able to be got is not clear.'
+if tehT >= tehNT * 75 / 100:$tehT = 'The car looks like it''s in excellent condition.'
+if tehT < tehNT * 75 / 100 and tehT >= tehNT * 50 / 100:$tehT = 'When you turn on the car, the engine makes some noise.'
+if tehT < tehNT * 50 / 100 and tehT >= tehNT * 25 / 100:$tehT = 'When you turn on the car, the engine rumbles and smokes.'
+if tehT < tehNT * 25 / 100:$tehT = 'You''re not sure how someone managed to get this piece of junk here.'
 
 if carT = 1:
 	if tehT >= tehNT * 75 / 100:bupay = rand(100000, 180000)
@@ -18,7 +18,6 @@ elseif carT = 2:
 	if tehT < tehNT * 50 / 100 and tehT >= tehNT * 25 / 100:bupay = rand(30000, 60000)
 	if tehT < tehNT * 25 / 100:bupay = rand(15000, 40000)
 end
-killvar 'tehNT'
 killvar 'carT'
 
 --- avt ---------------------------------

+ 2 - 2
locations/backwater.qsrc

@@ -22,8 +22,8 @@ if $ARGS[0] = '':
 		act 'Further':gt 'hunters', 'start'
 	else
 		if $clothingworntype = 'nude' and igor_away = 'no' or (hunters_outside = 1 and hunters_available = 1) and rand(1,10) = 1: gt 'backwater','hunter' else gt 'backwater','alone'
-	end if
-end if
+	end
+end
 
 if $ARGS[0] = 'alone':
 	'<center><B>Backwater</B></center>'

+ 237 - 3
locations/bank.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/bank.jpg"></center>'
 
 	if week <= 5 and hour = 16 and minut >= 30 and mey_vika['mey_vika_qw'] >= 32: 'Seems like <a href="exec:gs''mey_tamara_events'',''tamara''">Tamara Mikhailovna</a> is heading home.'
-	
+
 	if bankAccount = 0:
 		'Do you want to open an account?'
 		if money > 50:
@@ -42,7 +42,7 @@ if $ARGS[0] = 'start':
 				else
 					karta += kartaIN
 					money -= kartaIN
-					
+
 					'<br>You deposited <<kartaIN>> <b>₽</b>, your account balance is now ' + iif(karta >= 0,'<<karta>>','<font color="red"><<karta>></font>') + ' <b>₽</b>.'
 				end
 				killvar 'kartaIN'
@@ -72,6 +72,10 @@ if $ARGS[0] = 'start':
 				killvar 'kartaOUT'
 				act 'Walk away':gt 'bank', 'start'
 			end
+
+			if bankDebtLimitRaised = 0 and bankloc = 1 and karta >= 10000:
+				act 'See about increasing your credit limit': gt 'bank', 'loan_officer', 'start'
+			end
 		end
 		if karta >= 0:
 			'You have <<karta>> <b>₽</b> in your account.'
@@ -90,7 +94,7 @@ if $ARGS[0] = 'start':
 			gt 'pav_commercial'
 		end
 	end
-	
+
 	if BurgerQW['BankTask'] = 1 and BurgerQW['BankTaskDay'] = daystart:
 		act 'Show documents':
 			*clr & cla
@@ -112,5 +116,235 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'loan_officer':
+	if $ARGS[1] = 'start':
+	   *clr & cla
+		menu_off = 1
+		minut += 15
+		gs 'stat'
+
+		'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/001.jpg"></center>'
+		'You speak to the teller, who tells you to have a seat in the waiting room.'
+		'After waiting about 15 minutes, you are called back to an office, where a handsome young executive awaits.'
+		'Standing, he extends his hand and says, "Hello, Miss <<$pcs_lastname>>, my name is Filip Karpenko. I''m the Loan Officer here at VTB Bank. How can I help you today?"'
+
+		act 'I''d like to talk about increasing my credit limit, please.':
+			*clr & cla
+			'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/002.jpg"></center>'
+			'Karpenko nods and asks, "How large a loan were you thinking of taking out?"'
+			'Marshaling your nerve and trying to appear confident, you say, "I was thinking of maybe... 50.000 rubles?"'
+			*nl
+			'"Let me just review your information for a moment," Karpenko says, typing into his computer.'
+			'He reads what appears on his monitor, a ghost of a frown appearing on his face. Suddenly you feel rather foolish for asking for so much money when you''re a young girl not even established in the world yet!'
+			*nl
+			'You shift in your chair, and the next couple of minutes seem very long indeed before Karpenko finally looks up from his screen and says, "I''m sorry, but you seem to have very little in the way of assets or collateral, and you''re very young to be taking out such a significant loan. I''m afraid the bank can''t take a risk on this proposition at this time."'
+
+			act 'Isn''t there some way you could reconsider, Mr. Karpenko?':
+				*clr & cla
+				'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/003.jpg"></center>'
+				'"I''m sorry, Miss <<$pcs_lastname>>, but my decision is final," Karpenko says firmly.'
+				*nl
+				'You rise from your chair, but you don''t turn and walk away. Instead you approach the loan officer and lean in, giving him an excellent view of your cleavage.'
+				'"It''s true I don''t have any real collateral" you tell him in a soft, sultry voice, "but that doesn''t mean I don''t have something you want. I think if we put our minds to it, we can come up with conditions that benefit us both."'
+				*nl
+				'Karpenko stares at your breasts as they strain against your top, then looks into your eyes. "I suppose there may be some way we can work out a deal, if you''re willing to be... cooperative."'
+
+				gs 'bank', 'loan_officer', 'sex_start'
+			end
+
+			act 'Sadly rise and head for the door':
+				*clr & cla
+				'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/004.jpg"></center>'
+				'"Wait, Miss <<$pcs_lastname>>," Karpenko says as you turn away. "You seem like a trustworthy young lady. There may be a way I can arrange this loan if you''re willing to be... cooperative."'
+				*nl
+				'You''re young, but even so there''s little doubt about what sort of cooperation he''s talking about – the way his eyes are undressing you as you stand before him makes his intentions quite plain.'
+				'He wants you to use your body as collateral! Is that really something you would consider? Is the loan really worth that much to you?'
+
+				gs 'bank', 'loan_officer', 'sex_start'
+			end
+		end
+
+		act 'Actually, I''ve changed my mind. Sorry to bother you.':
+			minut += 3
+			gt 'bank', 'start'
+		end
+
+	elseif $ARGS[1] = 'sex_start':
+		menu_off = 1
+		gs 'stat'
+		if pcs_inhib >= 75:
+			if stat['vaginal'] = 0:
+				gs 'willpower', 'sex', 'self', 'hard'
+			else
+				gs 'willpower', 'sex', 'self', 'easy'
+			end
+			if will_cost <= pcs_willpwr:
+				act 'I think you''ll find that I can be very cooperative, Mr. Karpenko..." (<<will_cost>> Willpower)':
+					*clr & cla
+					gs 'willpower', 'pay', 'self'
+					gs 'stat'
+					gs 'npcgeneratec', 0, 'Mr. Karpenko, Loan Officer for VTB Bank', rand(21,27)
+					$npc_thdick[$npclastgenerated] = 'thick'
+					npc_dick[$npclastgenerated] = 21
+					$npc_firstname[$npclastgenerated] = 'Filip'
+					$npc_nickname[$npclastgenerated] = 'Mr. Karpenko'
+					$npc_lastname[$npclastgenerated] = 'Karpenko'
+					$npc_notes[$npclastgenerated] = 'A young Loan Officer for VTB Bank'
+					gs 'npcpreservec', $npclastgenerated
+					$boy = $npclastsaved
+
+					'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/005.jpg"></center>'
+					'"Time to put your mouth where my money is, girl," Karpenko says with a grin that''s just a little unnerving. You start to get the sense that you might just be in for more than you bargained for with this man, but it''s too late to back out now.'
+					*nl
+					'Affecting your sultriest walk and your hungriest gaze, you approach him as he rises from his chair. You open your mouth to say some sophisticated-sounding banter, but Karpenko cuts you off by grabbing your waist and pulling you toward him, stopping your speech by filling your mouth with his probing tongue.'
+					*nl
+					'You gasp involuntarily at his forceful approach, but after a moment you regain some sense of composure. You know what you have to do, so you might as well do it. And who knows? You might actually like it too. You begin kissing him back, alternately probing his mouth and sucking his tongue like a miniature cock.'
+					*nl
+
+					gs 'arousal', 'kiss', 10, 'sub'
+					gs 'stat'
+
+					act 'Get his cock ready to fuck you':
+						*clr & cla
+						'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/007.jpg"></center>'
+						'After a few moments of tangling tongues, Karpenko sits down in his chair with a nasty grin and says, "You came in here to beg for a loan, didn''t you? I think sluts beg best on their knees with their mouths full."'
+						*nl
+						'"Yes, sir," you murmur as you sink to your knees and crawl under the table to go between his legs. Fifty thousand rubles is a lot of money, and if Karpenko wants you to perform like a submissive whore for it, then that''s exactly what you''ll do. And if your pussy is getting a little wet at this treatment, well, you can''t be blamed for that. It is rather thrilling!'
+						*nl
+						'His cock is already hard in his pants as you undo his zipper and fish it out. You pause only for a moment to admire the tool – at 21 thick, glorious centimeters, it is worthy of a little admiration – before putting your skilled mouth to work. You run your tongue up the thick vein on the underside, feeling his heat and tasting his salty flavor, until you come to his flaring mushroom head. Your eyes lock with his as you swirl your tongue around the glans before you swallow him into your throat. You spend the next several minutes on your knees and he spends the next several minutes loving your attentions.'
+						*nl
+						'Finally your efforts bear fruit as Karpenko says, "Let''s move over to the sofa. Time to put that pussy of yours to work!"'
+
+						gs 'arousal', 'bj', 15, 'sub'
+						gs 'stat'
+
+						act 'Lie on your side':
+							*clr & cla
+							'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/008.jpg"></center>'
+							'Karpenko leads you to the leather-covered sofa in his room and lies down on it, pulling you in to spoon with him. You barely get settled before he turns your head and puts his mouth on yours, and you''re still kissing him when, a few moments later, he pushes his cock into your tight, hungry pussy. In a single, swift movement he has buried himself into you up to the balls, its thick length making you gasp into his mouth. Without a pause he begins to fuck you, his hips pushing forward into your ass as he plunders your depths, and before long you lose yourself in the pleasure and find yourself pushing back into him to take every millimeter into you.'
+							*nl
+
+							gs 'arousal', 'kiss', -5, 'sub'
+							gs 'arousal', 'vaginal', 15, 'sub'
+							gs 'stat'
+
+							act 'Climb on top and ride him':
+								*clr & cla
+								'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/009.jpg"></center>'
+								'With a growled, “I want you on top, you sweet little whore,” Karpenko pulls his dick out of you and rolls to his back. You swing atop him, and he holds your hips as you reach between your legs and grasp his cock to hold it upright, and both of you gasp in unison as you settle down on it and feel it fill your hungry cunt. You take it all the way down until you''re sitting on his balls and then, eyes closed begin to ride him.'
+								*nl
+								'"You''re a dirty little slut, Miss <<$pcs_lastname>>," Karpenko muses as you bounce on him, and you can''t really argue the point since you''re fucking him to get a bank loan. And damn but it feels good, with his thick cock stretching you and finding wonderful depths to your pussy. You grind your hips against him putting friction on your clit, then start riding him again, making yourself gasp every time you take him to the hilt.'
+								*nl
+
+								gs 'arousal', 'vaginal', 15, 'sub'
+								gs 'stat'
+
+								act 'Taking it like a bitch': gt 'bank', 'loan_officer', 'sex_finish'
+							end
+						end
+
+						act 'Get on top':
+							*clr & cla
+							'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/009.jpg"></center>'
+							'Karpenko leads you to the plush leather sofa and lies down on his back, and you waste no time climbing atop him. He holds your hips as you reach between your legs and grasp his cock to hold it upright, and both of you gasp in unison as you settle down on it and feel it fill your hungry cunt. You take it all the way down until you''re sitting on his balls and then, eyes closed begin to ride him.'
+							*nl
+							'"You''re a dirty little slut, Miss <<$pcs_lastname>>," Karpenko muses as you bounce on him, and you can''t really argue the point since you''re fucking him to get a bank loan. And damn but it feels good, with his thick cock stretching you and finding wonderful depths to your pussy. You grind your hips against him putting friction on your clit, then start riding him again, making yourself gasp every time you take him to the hilt.'
+							*nl
+
+							gs 'arousal', 'vaginal', 15, 'sub'
+							gs 'stat'
+
+							act 'Spoon-fucking':
+								*clr & cla
+								'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/008.jpg"></center>'
+								'"On your side now," Karpenko tells you gruffly. You clamber off and let him adjust himself against the back of the sofa before moving to join him. He grabs you roughly, pulling you in to spoon with him. You barely get settled before he turns your head and puts his mouth on yours, and you''re still kissing him when, a few moments later, he pushes his cock into your tight, hungry pussy. In a single, swift movement he has buried himself into you up to the balls, its thick length making you gasp into his mouth. Without a pause he begins to fuck you, his hips pushing forward into your ass as he plunders your depths, and before long you find yourself pushing back into him to take every millimeter into you.'
+								*nl
+
+								gs 'arousal', 'kissing', -5
+								gs 'arousal', 'vaginal', 15, 'sub'
+								gs 'stat'
+
+								act 'Taking it like a bitch': gt 'bank', 'loan_officer', 'sex_finish'
+							end
+						end
+					end
+				end
+			else
+				act 'I think you''ll find that I can be very cooperative, Mr. Karpenko..." (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+		end
+
+		act 'No, sleeping with a man for money is not something you''re willing to do!':
+			*clr & cla
+			'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/006.jpg"></center>'
+			'"I''m sorry, Mr. Karpenko," you say as you pull away, "but I really can''t do this after all I''m just not that sort of girl. I''m sorry to waste your time."'
+			'You turn and head for the door, but Karpenko''s voice stops you before you reach it. "Wait a moment, Miss <<$pcs_lastname>>. Before you go, I want you to know that this offer remains open. If you change your mind, you can return at any time and we can arrange the loan you desire."'
+			'"I... will keep that in mind," you mutter as you throw open the door and run back to the safety of the lobby.'
+			*nl
+			gs 'stat'
+
+			act 'Flee the room':
+				minut += 10
+				gt 'bank', 'start'
+			end
+		end
+
+	elseif $ARGS[1] = 'sex_finish':
+		*clr & cla
+		'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/010.jpg"></center>'
+		'After several long, wonderful minutes of railing you hard, Karpenko swats your ass loudly and says, "I want to fuck you from behind now. Bend over the table."'
+		*nl
+		'He''s ordering you around like a whore he paid for, but the whole thing is quite thrilling – and he really knows how to use that big dick he''s swinging! You almost jump off the couch and run to the table, bending over and swinging one leg up onto the surface to brace yourself. An instant later Karepenko''s hands are on your upturned ass and then his cock is back inside you – and this time he''s not holding back a bit! He thrusts so fiercely that your whole body shakes every time his hips collide with your ass, and your pussy sucks fiercely at his rod as it hammers in and out.'
+		*nl
+		'You''re trying to be quiet – it would be mortifying if anyone outside this room heard you being screwed like a cheap prostitute! – but he is too forceful and too skilled, and soon you are giving a loud, moaning gasp with every thrust, too lost in the bliss he is giving you to care a damn what happens after he''s done with you. You don''t even know how long that state lasts, lost in pleasure as you are, but you suddenly become aware that he has given you one last particularly deep thrust and is now still as his cock leaps and jumps inside you.'
+		*nl
+
+		gs 'arousal', 'vaginal', 15, 'sub'
+		gs 'stat'
+
+		act 'What did you do?!':
+			*clr & cla
+			'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/011.jpg"></center>'
+			'Sudden panic surges in you chest and dispels the pleasure-cobwebs in an instant as you demand, "Did you just come inside me?!?"'
+			*nl
+			'Karpenko steps back and a flood of his spunk pours out of your pussy to run down your thighs, but you have no delusions that all of it came out. With a smug grin he grabs a tissue from his desk and starts wiping his dick off, saying, "You just got a loan of 50.000 rubles. Did you really think I would authorize that sort of loan to a girl like you and not finish inside?"'
+			*nl
+			'"But I could get pregnant!" you object.'
+			*nl
+			'"You can afford a hell of a lot of morning after pills," he says with a shrug as he tucks his cock away and sits back at his desk. "Remember, you will need to pay this loan back like any other, and don''t think you can come back for another loan like it in the future. Now, if you''ll excuse me, I have work to do. I trust you can see yourself out."'
+			*nl
+			'Feeling humiliated but richer, you adjust your clothing and open the office door to step out into the hallway. The first thing you see is a cluster of three female bank employees looking at you, and you can see from their smirks and how they whisper to each other that they know exactly what you were up to with the loan officer. Cheeks burning with shame, you hurry away.'
+			*nl
+
+			gs 'cum_call', '', $boy, 1, '', '', 110
+			gs 'cuminsidereact', 'Mr. Karpenko'
+			gs 'fame', 'city', 'sex', 3
+			gs 'arousal', 'end'
+
+			bankDebtLimit = 50000
+			money += karta + bankDebtLimit
+			karta = -bankDebtLimit
+			bankDebtLimitRaised = 1
+			minut += 30
+			gs 'stat'
+
+			act 'Head back to the lobby': gt 'bank', 'start'
+		end
+	end
+end
+
 --- bank ---------------------------------
 

+ 367 - 358
locations/bedrPar.qsrc

@@ -2,6 +2,7 @@
 
 CLOSE ALL
 *clr & cla
+fromoutside = iif($loc = 'bedrPar',0,1)
 $loc = 'bedrPar'
 $loc_arg = ''
 $location_type = 'private'
@@ -14,420 +15,428 @@ gs 'stat'
 gs 'themes', 'indoors'
 gs 'family_schedule'
 
-if momloc = 26:
-	'<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'
-	elseif dildo > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
-		gt 'mother', 'dildo_find'
-	elseif analplug = 1 and analplugin = 0 and motherQW['seen_plug'] ! 1 and rand(1,3) = 1:
-		gt 'mother', 'plug_find'
-	else
-		'As you walk into your bedroom you find your <<$npc_nickname[''A29'']>> cleaning the room. Sweeping, folding clothes and putting them away, dusting, making the beds and just generally cleaning everything.'
-		act 'Leave': gt $loc, $loc_arg
-	end
-end
-
-if ParrotQW['Level'] = 2:
-	*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 in to his water bowl.'
-	'You really hope this will work and keep him from spilling yours and your sister''s bedroom secrets.'
-	ParrotQW['Level'] = 3
-	ParrotQW['Day'] = 3
-	act 'Continue':gt $loc, $loc_arg
-	exit
-end
-if ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
-	*clr & cla
-	menu_off = 1
-	'When you enter the room you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
-	'Your sister must have released him since you were not able to find a solution in time.'
-	ParrotQW['Owned2'] = 0
-	ParrotQW['Level'] = 0
-	ParrotQW['Day'] = 2
-	ParrotQW['Failed'] = 0
-	act 'Continue':gt $loc, $loc_arg
-	exit
-end
-
-if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:gt 'tobiQW', 'start'
-
-if anyaloc = 11: gt 'sisterQW', 'sisboyQW_expel'
-
-if sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
-	*clr & cla
-	menu_off = 1
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-	'"What is that?" your sister asks while pointing at <<$ParrotQW[''Name2'']>> in his cage.'
-	'"I went to the shopping center and bought this bird. Isn''t he the cutest?"'
-	if npc_rel['A33'] > 50:
-		'"Not really, but I can see this is something you really want. As long as he doesn''t make too much noise, I don''t really care."'
-		ParrotQW['SisKeepParrot'] = 1
-	end
-	if npc_rel['A33']  <= 50:
-		'"No he isn''t cute, and I suggest you get it out of here. I am not sharing my room with a bird!"'
-		'You are somewhat upset, but you understand. You should have asked her before buying it.'
-		'You go to the window, open it and release the bird.'
+if $ARGS[0] = '' or $ARGS[0] = 'start':
+	if momloc = 26 and fromoutside:
+		'<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'
+		elseif dildo > 0 and motherQW['seen_dildos'] ! 1 and rand(1,3) = 1:
+			gt 'mother', 'dildo_find'
+		elseif analplug = 1 and analplugin = 0 and motherQW['seen_plug'] ! 1 and rand(1,3) = 1:
+			gt 'mother', 'plug_find'
+		else
+			'As you walk into your bedroom you find your <<$npc_nickname[''A29'']>> cleaning the room. Sweeping, folding clothes and putting them away, dusting, making the beds and just generally cleaning everything.'
+			act 'Leave': gt 'korrPar'
+		end
+	elseif ParrotQW['Level'] = 2:
+		*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 in to his water bowl.'
+		'You really hope this will work and keep him from spilling yours and your sister''s bedroom secrets.'
+		ParrotQW['Level'] = 3
+		ParrotQW['Day'] = 3
+		
+		act 'Continue':gt $loc, $loc_arg
+	elseif ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
+		*clr & cla
+		menu_off = 1
+		'When you enter the room you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
+		'Your sister must have released him since you were not able to find a solution in time.'
 		ParrotQW['Owned2'] = 0
-	end
-
-	act 'Leave':gt $loc, $loc_arg
-	exit
-end
-
-'<center><h1><font color="maroon">Your bedroom</font></h1></center>'
-! 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.'
-*nl
-'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
-*nl
-if ParrotQW['Owned2'] = 1:
-	'<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.'
-	if daystart - ParrotQW['BuyDate'] > 10 and daystart - ParrotQW['BuyDate'] <= 20: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. It sounds almost like he is saying "<b>Hello <<$pcs_nickname>>!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 20 and daystart - ParrotQW['BuyDate'] <= 30: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is clearly saying "<b>Hello <<$pcs_nickname>>!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 30 and daystart - ParrotQW['BuyDate'] <= 35: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 35 and daystart - ParrotQW['BuyDate'] <= 40: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 40 and daystart - ParrotQW['BuyDate'] <= 50: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>>, you''re the best!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 50 and daystart - ParrotQW['BuyDate'] <= 55: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, swallow it all!</b>"'
-	if daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Level'] < 3: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, your pussy tastes great!</b>"'
-	if ParrotQW['Level'] = 3:
-		parfixrand = rand(0,9)
-		if parfixrand = 0:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you say to me?</b>"'
-		if parfixrand = 1:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>3.1415926535897932384...</b>"'
-		if parfixrand = 2:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Come closer, my friend.</b>"'
-		if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Here kitty, kitty!</b>"'
-		if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>I just met you, and this is crazy!</b>"'
-		if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Bow before me!</b>"'
-		if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>He’s just a friend, honest!</b>"'
-		if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you do to my socks?</b>"'
-		if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>That''s what she said!</b>"'
-		if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Help! They''ve turned me into a parrot!</b>"'
-		killvar 'parfixrand'
-	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 sewing_kit = 1:
-	'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored neatly under your bed.'
-	*nl
-	'You have <<tkan>> pieces of sewing fabric left.'
-end
-
-if komp = 1:'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on your desk.'
-
-gad = 0
-
-if npc_QW['A33'] > 10:npc_QW['A33'] = 10
-!!Default is Anya not being here or being asleep, can be overwritten in next block
-sisterHere = 0
-
-if sister_indorf = 0:
-	if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
+		ParrotQW['Level'] = 0
+		ParrotQW['Day'] = 2
+		ParrotQW['Failed'] = 0
+		gs 'stat'
+		
+		act 'Continue':gt $loc, $loc_arg
+	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:
+		gt 'tobiQW', 'start'
+		
+	elseif anyaloc = 11: 
+		gt 'sisterQW', 'sisboyQW_expel'
+		
+	elseif sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
 		*clr & cla
 		menu_off = 1
-		minut += 5
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
+		'"What is that?" your sister asks while pointing at <<$ParrotQW[''Name2'']>> in his cage.'
+		'"I went to the shopping center and bought this bird. Isn''t he the cutest?"'
+		if npc_rel['A33'] > 50:
+			'"Not really, but I can see this is something you really want. As long as he doesn''t make too much noise, I don''t really care."'
+			ParrotQW['SisKeepParrot'] = 1
+		end
+		if npc_rel['A33']  <= 50:
+			'"No he isn''t cute, and I suggest you get it out of here. I am not sharing my room with a bird!"'
+			'You are somewhat upset, but you understand. You should have asked her before buying it.'
+			'You go to the window, open it and release the bird.'
+			ParrotQW['Owned2'] = 0
+		end
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_6_<<rand(1,7)>>.jpg"></center>'
-		'Drunk and disheveled, Anya bursts into the room.'
-		'You notice that her hair, and all her clothes are smeared in sticky sperm.'
-		'In this state, she falls on the bed and instantly falls asleep.'
-		sisboyparty = 1
-		act 'Move away': gt $loc
+
+		act 'Leave': gt 'korrPar'
 	else
-		sisterdialog = 1
-
-		if anyaloc = 1:
-			'Your sister <a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
-		elseif anyaloc = 4:
-			sisterdialog = 3
-			sisterHere = 1
-			'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go out.'
-		elseif anyaloc = 15:
-			sisterHere = 1
-			'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
-		elseif anyaloc = 26:
-			if sisboypartyQW = 1: sisboypartyQW = 2
-			if sisboyparty = -1: sisboyparty = 1
-			'A drunken Anya is sound asleep in her bed.'
+		'<center><h1><font color="maroon">Your bedroom</font></h1></center>'
+		! 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.'
+		*nl
+		'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+		*nl
+		if ParrotQW['Owned2'] = 1:
+			'<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.'
+			elseif daystart - ParrotQW['BuyDate'] <= 20: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. It sounds almost like he is saying "<b>Hello <<$pcs_nickname>>!</b>"'
+			elseif daystart - ParrotQW['BuyDate'] <= 30: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is clearly saying "<b>Hello <<$pcs_nickname>>!</b>"'
+			elseif daystart - ParrotQW['BuyDate'] <= 35: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty!</b>"'
+			elseif daystart - ParrotQW['BuyDate'] <= 40: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body!</b>"'
+			elseif daystart - ParrotQW['BuyDate'] <= 50: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>>, you''re the best!</b>"'
+			elseif daystart - ParrotQW['BuyDate'] <= 55: 
+				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, swallow it all!</b>"'
+			else
+				if ParrotQW['Level'] < 3: 
+					'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, your pussy tastes great!</b>"'
+				else
+					parfixrand = rand(0,9)
+					if parfixrand = 0:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you say to me?</b>"'
+					if parfixrand = 1:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>3.1415926535897932384...</b>"'
+					if parfixrand = 2:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Come closer, my friend.</b>"'
+					if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Here kitty, kitty!</b>"'
+					if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>I just met you, and this is crazy!</b>"'
+					if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Bow before me!</b>"'
+					if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>He’s just a friend, honest!</b>"'
+					if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you do to my socks?</b>"'
+					if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>That''s what she said!</b>"'
+					if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Help! They''ve turned me into a parrot!</b>"'
+					killvar 'parfixrand'
+				end
+			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
-	end
-end
-
-act 'Exit the room':
-	if (anyaloc = 4 or anyaloc = 15) and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
-	gt'korrPar'
-end
 
-gs 'unicoursework', 'start', $curloc
 
-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 komp = 1:'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on your desk.'
 
-if sisterHere = 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 'reks','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 npc_QW['A33'] > 10:npc_QW['A33'] = 10
+		!!Default is Anya not being here or being asleep, can be overwritten in next block
+		sisterHere = 0
 
-gs 'events', 'read'
+		if sister_indorf = 0:
+			if sisboyparty_day + 1 = daystart and sisboyparty = -1 and hour = 22:
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_6_<<rand(1,7)>>.jpg"></center>'
+				'Drunk and disheveled, Anya bursts into the room.'
+				'You notice that her hair, and all her clothes are smeared in sticky sperm.'
+				'In this state, she falls on the bed and instantly falls asleep.'
+				sisboyparty = 1
+				act 'Move away': gt $loc
+			else
+				sisterdialog = 1
+
+				if anyaloc = 1:
+					'Your sister <a href="exec:gt ''sistersleep'', ''sister_sleep''">Anya</a> is asleep in her bed.'
+				elseif anyaloc = 4:
+					sisterdialog = 3
+					sisterHere = 1
+					'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is getting ready to go out.'
+				elseif anyaloc = 15:
+					sisterHere = 1
+					'Your sister <a href="exec:gt ''sister_chat'', ''sister_chat''">Anya</a> is sitting on her bed, reading a book.'
+				elseif anyaloc = 26:
+					if sisboypartyQW = 1: sisboypartyQW = 2
+					if sisboyparty = -1: sisboyparty = 1
+					'A drunken Anya is sound asleep in her bed.'
+				end
+			end
+		end
 
-if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
+		act 'Exit the room':
+			if (anyaloc = 4 or anyaloc = 15) and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
+			gt 'korrPar'
+		end
 
-if sisterHere = 0: dynamic $palelady
+		gs 'unicoursework', 'start', $curloc
 
-gs 'exercise', 'start'
+		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 gobelen>0:'You have <<gobelen>> completed tapestries.'
-if pcs_sewng >= 40 and tkan > 0:'You have enough fabric for <<tkan>> lessons.'
-if pcs_sewng >= 40 and tkan <= 0:'You do not have any fabric.'
-if pcs_sewng >= 80:
-	if newgobelen = 0 and tkan > 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
-		end
-	end
-	if newgobelen>=1:
-		'Your tapestry is <<newgobelen/10>> percent finished.'
-		act'Work on the tapestry for an hour':
-			*clr & cla
-			menu_off = 1
-			minut+=60
-			sewng_exp += 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.'
+		if sisterHere = 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
-			act'Set the tapestry aside':gt $curloc
+
+			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
-	end
-end
 
-if ml_guitar['carried'] = 1:
-	act 'Place the guitar next to your desk': 
-		ml_guitar['carried'] = 0
-		$ml_guitar['location'] = $curloc
-		gt 'bedrPar', 'start'
-	end
-elseif ml_guitar['hasguitar'] and ml_guitar['carried'] = 0:
-	act 'Pick up the guitar':
-		ml_guitar['carried'] = 1
-		$ml_guitar['location'] = ''
-		gt 'bedrPar', 'start'
-	end
-end
+		gs 'events', 'read'
 
-			
-if ml_online['account'] = 0 and internet > 0: 
-	act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
-end
+		if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
 
-!!Uploading recorded music if there are any not uploaded yet
-if ml_uploadablemusic > 0 and internet > 0 and ml_online['account'] = 1:
-	if pcs_inhib < 30:
-		if pcs_inhib < 10: 
-			$diff = 'hard'
-		elseif pcs_inhib < 20: 
-			$diff = 'medium'
-		else 
-			$diff = 'easy'
-		end
-		gs 'willpower', 'skill', 'self', $diff
+		if sisterHere = 0: dynamic $palelady
 
-		will_cost = (will_cost * 2) - (pcs_perform)
-		if will_cost <= pcs_willpwr:
-			act 'Upload music (<<will_cost>> Willpower)': gt 'music_onlinemusic', 'uploadmusic'
-		else	
-			act 'Upload music (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		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.'
+				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
+						end
+					end
+				end
+			end	
+			if newgobelen>=1:
+				'Your tapestry is <<newgobelen/10>> percent finished.'
+				act'Work on the tapestry for an hour':
+					*clr & cla
+					menu_off = 1
+					minut+=60
+					sewng_exp += 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 $curloc
+				end
+			end
+			if gobelen > 0: 'You have <<gobelen>> completed tapestries.'
 		end
-	end
-	act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
-end
 
-if ml_uploadablemusic > 0:
-	act 'Delete old recordings': gt 'music_onlinemusic', 'deleteoldmusic'
-end
+		if ml_guitar['carried'] = 1:
+			act 'Place the guitar next to your desk':
+				ml_guitar['carried'] = 0
+				$ml_guitar['location'] = $curloc
+				gt $loc, $loc_arg
+			end
+		elseif $ml_guitar['location'] = $curloc:
+			act 'Pick up the guitar':
+				ml_guitar['carried'] = 1
+				$ml_guitar['location'] = ''
+				gt $loc, $loc_arg
+			end
+		end
 
-if hour > 8 and hour < 22:
 
-	if ml_guitar['hasguitar'] = 1:
-		act 'Play something on the guitar (10 minutes)':
-			pcs_mood += 10
-			minut += 10
-			gs 'stat'
-			'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
-			'You hum along the tune, relaxing into the music, just enjoying it. When you look up about 10 minutes has passed and you are in a much better mood.'
+		if ml_online['account'] = 0 and internet > 0:
+			act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
 		end
-	end
 
-	if ml_guitar['hasguitar'] = 1 and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
-		if sisterHere = 1 and pcs_inhib < 30:
-			if pcs_inhib < 10: 
-				$diff = 'hard'
-			elseif pcs_inhib < 20: 
-				$diff = 'medium'
-			else 
-				$diff = 'easy'
-			end
-			gs 'willpower', 'skill', 'self', $diff
-			will_cost = (will_cost * 3) - (pcs_perform)
-			if will_cost <= pcs_willpwr:
-				act 'Practice guitar (0:30) (<<will_cost>> Willpower)': 
-					inhib_exp += rand(1,2)
-					gs 'willpower', 'pay', 'self'
-					gs 'stat'
-					gt 'music_bedroomPractice', 'guitar'
+		!!Uploading recorded music if there are any not uploaded yet
+		if ml_uploadablemusic > 0 and internet > 0 and ml_online['account'] = 1:
+			if pcs_inhib < 30:
+				if pcs_inhib < 10:
+					$diff = 'hard'
+				elseif pcs_inhib < 20:
+					$diff = 'medium'
+				else
+					$diff = 'easy'
+				end
+				gs 'willpower', 'skill', 'self', $diff
+
+				will_cost = (will_cost * 2) - (pcs_perform)
+				if will_cost <= pcs_willpwr:
+					act 'Upload music (<<will_cost>> Willpower)': gt 'music_onlinemusic', 'uploadmusic'
+				else
+					act 'Upload music (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
-			else
-				act 'Practice guitar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
 			end
-		else
-			act 'Practice guitar (0:30)': gt 'music_bedroomPractice', 'guitar'
+			act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
 		end
-	end
 
-	!! Streaming music 
-	if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
-		ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
-
-		if pcs_inhib < 30:
-			if pcs_inhib < 10: 
-				$diff = 'hard'
-			elseif pcs_inhib < 20: 
-				$diff = 'medium'
-			else 
-				$diff = 'easy'
-			end
-			gs 'willpower', 'skill', 'self', $diff
-			will_cost = (will_cost * 3) - (pcs_perform)
-	
-			if will_cost <= pcs_willpwr:
-				act 'Live stream (<<ml_streamtime>> minutes) (<<will_cost>> Willpower)': 
-					inhib_exp += rand(1,3)	
-					gs 'willpower', 'pay', 'self'
+		if ml_uploadablemusic > 0:
+			act 'Delete old recordings': gt 'music_onlinemusic', 'deleteoldmusic'
+		end
+
+		if hour > 8 and hour < 22:
+
+			if ml_guitar['hasguitar'] = 1:
+				act 'Play something on the guitar (10 minutes)':
+					pcs_mood += 10
+					minut += 10
 					gs 'stat'
-					gt 'music_onlinemusic', 'liveStream'
+					'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
+					'You hum along the tune, relaxing into the music, just enjoying it. When you look up about 10 minutes has passed and you are in a much better mood.'
 				end
-			else	
-				act 'Live stream (<<ml_streamtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-		else 
-			act 'Live stream (<<ml_streamtime>> minutes)': gt 'music_onlinemusic', 'liveStream'			
-		end
-	end
 
-	!! Recording music
-	if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
-		if pcs_inhib < 20:
-			if pcs_inhib < 10: 
-				$diff = 'medium'
-			elseif pcs_inhib < 20: 
-				$diff = 'easy'
+			if ml_guitar['hasguitar'] = 1 and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+				if sisterHere = 1 and pcs_inhib < 30:
+					if pcs_inhib < 10:
+						$diff = 'hard'
+					elseif pcs_inhib < 20:
+						$diff = 'medium'
+					else
+						$diff = 'easy'
+					end
+					gs 'willpower', 'skill', 'self', $diff
+					will_cost = (will_cost * 3) - (pcs_perform)
+					if will_cost <= pcs_willpwr:
+						act 'Practice guitar (0:30) (<<will_cost>> Willpower)':
+							inhib_exp += rand(1,2)
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'music_bedroomPractice', 'guitar'
+						end
+					else
+						act 'Practice guitar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
+					end
+				else
+					act 'Practice guitar (0:30)': gt 'music_bedroomPractice', 'guitar'
+				end
 			end
-			gs 'willpower', 'skill', 'self', $diff
 
-			if will_cost <= pcs_willpwr:
-				act 'Record a song with your phone (0:30) (<<will_cost>> Willpower)': 
-					inhib_exp += rand(1,2)	
-					gs 'willpower', 'pay', 'self'
-					gs 'stat'
-					gt 'music_onlinemusic', 'recordSong'
-				end							
-				if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
-					act 'Record and edit a song (2:00) (<<will_cost>> Willpower)': 
-						inhib_exp += rand(1,2)	
-						gs 'willpower', 'pay', 'self'
-						gs 'stat'
-						gt 'music_onlinemusic', 'recordAndEditSong' 
-					end						
+			!! Streaming music
+			if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
+				ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
+
+				if pcs_inhib < 30:
+					if pcs_inhib < 10:
+						$diff = 'hard'
+					elseif pcs_inhib < 20:
+						$diff = 'medium'
+					else
+						$diff = 'easy'
+					end
+					gs 'willpower', 'skill', 'self', $diff
+					will_cost = (will_cost * 3) - (pcs_perform)
+
+					if will_cost <= pcs_willpwr:
+						act 'Live stream (<<ml_streamtime>> minutes) (<<will_cost>> Willpower)':
+							inhib_exp += rand(1,3)
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'music_onlinemusic', 'liveStream'
+						end
+					else
+						act 'Live stream (<<ml_streamtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				else
+					act 'Live stream (<<ml_streamtime>> minutes)': gt 'music_onlinemusic', 'liveStream'
 				end
-			else	
-				act 'Record a song (0:30) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				act 'Record and edit a song (1:30) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'				
 			end
-		else
-			act 'Record a song with your phone (0:30)': gt 'music_onlinemusic', 'recordSong'
-			if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
-				act 'Record and edit a song (2:00)': gt 'music_onlinemusic', 'recordAndEditSong' 
+
+			!! Recording music
+			if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
+				if pcs_inhib < 20:
+					if pcs_inhib < 10:
+						$diff = 'medium'
+					elseif pcs_inhib < 20:
+						$diff = 'easy'
+					end
+					gs 'willpower', 'skill', 'self', $diff
+
+					if will_cost <= pcs_willpwr:
+						act 'Record a song with your phone (0:30) (<<will_cost>> Willpower)':
+							inhib_exp += rand(1,2)
+							gs 'willpower', 'pay', 'self'
+							gs 'stat'
+							gt 'music_onlinemusic', 'recordSong'
+						end
+						if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
+							act 'Record and edit a song (2:00) (<<will_cost>> Willpower)':
+								inhib_exp += rand(1,2)
+								gs 'willpower', 'pay', 'self'
+								gs 'stat'
+								gt 'music_onlinemusic', 'recordAndEditSong'
+							end
+						end
+					else
+						act 'Record a song (0:30) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+						act 'Record and edit a song (1:30) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+				else
+					act 'Record a song with your phone (0:30)': gt 'music_onlinemusic', 'recordSong'
+					if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
+						act 'Record and edit a song (2:00)': gt 'music_onlinemusic', 'recordAndEditSong'
+					end
+				end
 			end
 		end
-	end
 
-end
+		 !! if ml_deparcoQW > 3: act 'Rehearse for your show': gt 'music_bedroomPractice', 'rehearsing'
 
- !! if ml_deparcoQW > 3: act 'Rehearse for your show': gt 'music_bedroomPractice', 'rehearsing'
+		if sisterHere = 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 sisterHere = 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'
 
-if sisterHere = 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 sisterHere = 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'
+		'</td><td width = "100" valign="top"></td><td>'
+		gs 'subkid'
+		'</td></tr></table>'
+		
+		act 'Relax on your bed': gt 'bed', 'start'
+	end
 end
-gs 'lact_bp', 'massage'
-
-'</td><td width = "100" valign="top"></td><td>'
-gs 'subkid'
-'</td></tr></table>'
-
-act 'Relax on your bed': gt 'bed', 'start'
 
 if $ARGS[0] = 'intro':
-	cla & *clr
-	$loc_arg = ''
-	$loc = 'korrPar'
-	$temp_nickname = '<<$npc_nickname[''A29'']>>'
 	grandmaQW['last_month_paid'] = month
 	menu_off = 1
 	hour = 6
 	gs 'stat'
 	music_loop = 0
-	CLOSE ALL
 	'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
 	*nl
 	'All of a sudden, you hear a familiar voice yell out. "<<$pcs_nickname>>, time to get up! You can''t spend the whole day laying around!"'
 	wait 1000
-	$npc_nickname['A29'] = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
-	if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
+	$temp_nickname = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
+	if $temp_nickname ! '':$npc_nickname['A29'] = '<<$temp_nickname>>'
 	killvar '$temp_nickname'
 	act 'Continue':
 		cla & *clr

+ 72 - 33
locations/bordel.qsrc

@@ -7,6 +7,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'<center><b>Brothel</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/bordel.jpg"></center>'
 
+	'The brothel madam looks you over as you enter.'
+
 	if pcs_apprnc < 0:
 		'"You look half dead, get yourself treated."'
 
@@ -16,7 +18,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 		act 'Leave':gt 'city_industrial', 'redlight'
 	else
-		act 'In the room':gt 'bordel', 'brothel'
+		'"You can work tonight, head to your room and get ready."'
+
+		act 'Go to your room':gt 'bordel', 'brothel'
 	end
 end
 
@@ -34,9 +38,9 @@ if $ARGS[0] = 'brothel':
 	gs 'stat'
 	'<center><b>Your room in a brothel</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/borroom.jpg"></center>'
-	'This is your room in the brothel. In the middle is a huge bed and not much else, there is a small side door to the <a href="exec:gt ''bordel'', ''dysh''">bathroom</a>.'
+	'This is your room in the brothel. In the middle is a huge bed and not much else. There is a small side door to the <a href="exec:gt ''bordel'', ''dysh''">bathroom</a>.'
 	*nl
-	'In a brothel there is a lot of competition, in order to avoid a massacre they introduced a rule - no more than two clients per day'
+	'In a brothel there is a lot of competition. In order to avoid a massacre, they introduced a rule - no more than two clients per day.'
 
 	act 'Leave':
 		if $clothingworntype ! 'nude':
@@ -49,21 +53,32 @@ if $ARGS[0] = 'brothel':
 		end
 	end
 
-	act 'Go to the reception room and wait for customers':
-
-		if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or pcs_makeup < 2 or pcs_leghair > 3 or pcs_pubes > 3 or sweat > 25 or pcs_hairbsh = 0:
-			cla
-			'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
-
-			act 'Go to the bathroom':gt 'bordel', 'dysh'
-		elseif $clothingworntype ! 'fancy_burlesque' and PCloStyle ! 4 and $clothingworntype ! 'nude':
-			cla
-			'You need to wear an outfit that can be used for prostitution. If you haven''t got anything suitable and you are desperate, you could work naked but you will get paid less and might get treated badly.'
-			'You can change your clothes in the bathroom.'
-
-			act 'Go to the bathroom':gt 'bordel', 'dysh'
+	if func('bordel', 'is_open') = 0:
+		'The brothel is closed for the night however, so you won''t be able to work now regardless.'
+	else
+		if borsexkol >= 2:
+			!! borsexkol is reset in cikl, meaning that it is reset at midnight, not when the brothel
+			!! opens or closes. if this is not desired behavior, will need to handle resetting this var
+			!! in brothel specific code.
+			'You have already hit this limit, so you won''t be able to work again until midnight.'
 		else
-			gt 'bordel', 'var'
+			act 'Go to the reception room and wait for customers':
+
+				if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 or pcs_makeup < 2 or pcs_leghair > 3 or pcs_pubes > 3 or sweat > 25 or pcs_hairbsh = 0:
+					cla
+					'The brothel madam comes over to you and says, "Our customers expect you to be clean, shaven, made-up and with your hair looking nice. Go and sort yourself out, now!"'
+
+					act 'Go to the bathroom':gt 'bordel', 'dysh'
+				elseif $clothingworntype ! 'fancy_burlesque' and PCloStyle ! 4 and $clothingworntype ! 'nude':
+					cla
+					'You need to wear an outfit that can be used for prostitution. If you haven''t got anything suitable and you are desperate, you could work naked, but you will get paid less and might get treated badly.'
+					'You can change your clothes in the bathroom.'
+
+					act 'Go to the bathroom':gt 'bordel', 'dysh'
+				else
+					gt 'bordel', 'var'
+				end
+			end
 		end
 	end
 end
@@ -84,7 +99,7 @@ if $ARGS[0] = 'dysh':
 
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/bordysh.jpg"></center>'
 	'The bathroom is well fitted and clean as customers can access it and hygiene is very important in a brothel.'
-	'Your room is so dedicated to it purpose that your clothes are stored in here.'
+	'Your room is so dedicated to its purpose that your clothes are stored in here.'
 	*nl
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 	
@@ -106,7 +121,6 @@ end
 if $ARGS[0] = 'var':
     $location_type = 'event'
 	menu_off = 1
-	if borsexkol >= 2:gt 'bordel', 'brothel'
 	if $clothingworntype = 'nude':
 		bordelpay = 8
 	else
@@ -115,10 +129,12 @@ if $ARGS[0] = 'var':
 	gs 'npcgeneratec', 0, 'Client', rand(18,40)
 	gs 'boyStat', $npclastgenerated
 	minut += 30
+	gs 'stat'
 	borrand = rand(0, 10)
 
 	if borrand = 0:
-		'Customer orders one girl (1,000 <b>₽</b>).'
+		bordelpay *= 100
+		'A customer orders you (<<bordelpay>> <b>₽</b>).'
 		
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -134,7 +150,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 100 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -146,7 +162,8 @@ if $ARGS[0] = 'var':
 			gt 'sex', 'start'
 		end
 	elseif borrand = 1:
-		'Customer orders two girls (1,000 <b>₽</b>).'
+		bordelpay *= 100
+		'A customer orders you and another girl (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -162,7 +179,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 100 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -173,7 +190,8 @@ if $ARGS[0] = 'var':
 			gt 'podrsex', 'start'
 		end
 	elseif borrand = 2:
-		'Two clients book one girl (1,500 <b>₽</b>).'
+		bordelpay *= 150
+		'Two clients book you (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -189,7 +207,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 150 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -202,7 +220,8 @@ if $ARGS[0] = 'var':
 			gt 'sexdvoe', 'start'
 		end
 	elseif borrand = 3:
-		'Two clients book two girls (1,500 <b>₽</b>).'
+		bordelpay *= 150
+		'Two clients book you and another girl (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -218,7 +237,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 150 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -231,7 +250,8 @@ if $ARGS[0] = 'var':
 			gt 'sexdvanadva', 'start'
 		end
 	elseif borrand = 4:
-		'Group of customers order one girl, price 2,000 <b>₽</b>.'
+		bordelpay *= 200
+		'A group of customers order you (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -247,7 +267,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 200 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -265,13 +285,32 @@ if $ARGS[0] = 'var':
 			gs 'boyStat', $npclastgenerated,'2'
 			gt 'paysex', 'start'
 		end
-	elseif borrand > 4:
-		'You are not chosen.'
-
+	else
 		act 'Go to your room':gt 'bordel', 'brothel'
-		act 'Wait for another':gt 'bordel', 'var'
+		if func('bordel', 'is_open'):
+			'You are not chosen.'
+			act 'Wait for another':gt 'bordel', 'var'
+		else
+			'You are not chosen, and the brothel is now closed.'
+		end
+	end
+
+	if borrand <= 4 and func('bordel', 'is_open') = 0:
+		'The brothel is closing now, so this is your last chance to work today.'
 	end
 end
 
+if $ARGS[0] = 'is_open':
+	RESULT = hour >= func('bordel', 'open_hour') or hour <= func('bordel', 'close_hour')
+end
+
+if $ARGS[0] = 'open_hour':
+	RESULT = 20
+end
+
+if $ARGS[0] = 'close_hour':
+	RESULT = 3
+end
+
 --- bordel ---------------------------------
 

+ 28 - 28
locations/bordelv.qsrc

@@ -5,11 +5,11 @@ menu_off = 1
 minut += 30
 pcs_horny += 20
 gs 'stat'
-'<center><b><font color="maroon">room with a mirror</font></b></center>'
+'<center><b><font color="maroon">Room with a mirror</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika1.jpg"></center>'
-'Vika walks you through the neighborhood, and you end up entering through an inconspicuous door where you find a large room full of girls scurrying around in their underwear. Not letting you look around Vika drags you down the hall, you finally end up in a small room that''s empty except some chairs and a glass wall. "Sit here." she says, and leaves.'
+'Vika takes you on the metro to the city industrial area. After the two of you leave the station, she walks you through the neighborhood, and you end up entering an inconspicuous door where you find a large room full of girls scurrying around in their underwear. Not letting you look around, Vika drags you down the hall. You finally end up in a small room that''s empty except some chairs and a glass wall. "Sit here," she says and leaves.'
 'You take a seat and look through the glass only to find a room with a large bed. <i>"This is a brothel."</i> flashes in your head, <i>"I''m in the room for voyeurs."</i>'
-'While you''re pondering this information, Vika enters the room, dressed in a pink combination, and lies on the bed.'
+'While you''re processing this information, Vika enters the room, dressed in a pink combination, and lies on the bed.'
 'She looks at you through the glass and with one hand massages her pussy through her panties. Observing her is turning you on.'
 
 act 'Watch Vika work':
@@ -17,7 +17,7 @@ act 'Watch Vika work':
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika2.jpg"></center>'
 	'A few minutes later, two men enter the room. Vika jumps off the bed and kneels between them, grabs hold of their members while still looking in your direction, and begins sucking them both at once.'
-	'You look on in amazement as her mouth makes one of the cocks disappears down the throat then moves on to the other member. She diligently continues to satisfy the men not taking her eyes from the mirror. This sight has your pussy dripping wet wanting to join them.'
+	'You look on in amazement as her mouth makes one of the cocks disappear down her throat then moves on to the other member. She diligently continues to satisfy the men, not taking her eyes from the mirror. This sight has your pussy dripping wet wanting to join them.'
 
 	gs 'arousal', 'voyeur_sex', 5
 	gs 'arousal', 'masturbate', 5
@@ -45,8 +45,8 @@ if $ARGS[0] = 'sex':
 	dviksex += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika<<rand(3,7)>>.jpg"></center>'
-	'You continue to watch on as the men start to fuck Vika. They keep changing positions alternately entering her pussy, then switching her anus, and letting her taste it all. Vika moans loudly and struggles to please them, she tries her hardest to keep looking towards you behind the mirror.'
-	'Even though you knew that she could not see you, if felt she could see you right in the eyes, searching for your approval.'
+	'You continue to watch on as the men start to fuck Vika. They keep changing positions, alternately entering her pussy then switching to her anus, and letting her taste it all. Vika moans loudly and struggles to please them. She tries her hardest to keep looking towards you behind the mirror.'
+	'Even though you know that she can not see you, if feels like she''s looking you right in the eyes, searching for your approval.'
 
 	gs 'arousal', 'voyeur_sex', 10
 	gs 'arousal', 'masturbate', 10
@@ -74,8 +74,8 @@ if $ARGS[0] = 'end':
 	minut += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika8.jpg"></center>'
-	'When the men are satisfied, Vika kneels down and lets them cum all over her mouth, face and chest. Watching them cum all over Vika has your body tremble with excitement, you close your eyes and a pleasant orgasm washes over you.'
-	'When you re-open them, the men are already gone and Vika is sitting on the floor covered in sperm, she is now trying to avoid your judgmental eyes. Finally, she forces herself to get up and leaves the room.'
+	'When the men are satisfied, Vika kneels down and lets them cum all over her mouth, face and chest. Watching them cum all over Vika has your body tremble with excitement. You close your eyes, and a pleasant orgasm washes over you.'
+	'When you re-open them, the men are already gone, and Vika is sitting on the floor covered in sperm. She is now trying to avoid your judgmental eyes. Finally, she forces herself to get up and leaves the room.'
 
 	$orgasm_or = 'yes'
 	gs 'stat'
@@ -84,17 +84,17 @@ if $ARGS[0] = 'end':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika9.jpg"></center>'
-		'A few minutes later the door opens and Vika enters the room. She closes the door and you can''t really see her, only her silhouette. Not saying anything, Vika silently awaits your reaction.'
+		'A few minutes later, the door opens, and Vika enters the room. She closes the door, and you can''t really see her, only her silhouette. Not saying anything, Vika silently awaits your reaction.'
 
 		if slutty = 0:
 			act 'Call her a whore':
 				cla
-				'"Whore" is perhaps the nicest word you can say, due to the shock you reel off every swear word you can think of, some of the words you might have just made up. As you''ve finished with your barrage all quiets down and you notice a distraught Vika crying.'
+				'"Whore" is perhaps the nicest word you direct at her. Due to the shock, you reel off every swear word you can think of, some of the words you might have just made up. As you finish with your barrage, all quiets down, and you notice a distraught Vika crying.'
 
 				act 'Leave':
 					npc_rel['A220'] = 0
 					vikaend = 1
-					gt 'city_residential'
+					gt 'city_industrial', 'redlight'
 				end
 				
 				gs 'willpower', 'misc', 'self'
@@ -105,8 +105,8 @@ if $ARGS[0] = 'end':
 						gs 'willpower', 'misc', 'self'
 						gs 'willpower', 'pay', 'self'
 						gs 'stat'
-						'You begin to comfort her by saying that you did not want to hurt her and what you uttered was because it came as a shock. Vika nears you and you hug her, soon after she stops crying and says that she should get back to work, and walks you to the exit.'
-						act 'Leave':gt 'city_residential'
+						'You begin to comfort her by saying that you did not want to hurt her and what you uttered was because this came as a shock. Vika nears you, and you hug her. Soon after, she stops crying and says that she should get back to work, and walks you to the exit.'
+						act 'Leave':gt 'city_industrial', 'redlight'
 					end
 				else
 					act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -120,10 +120,10 @@ if $ARGS[0] = 'end':
 					gs 'willpower', 'misc', 'self', 'hard'
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off me. It was so hot." you say quietly.'
-					'Vika breaths out, relieved, "I was worried that you would not understand. I have to go back to work now, you should leave." Vika says as she leads you to the exit.'
+					'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off myself. It was so hot," you say quietly.'
+					'Vika breaths out, relieved. "I was worried that you would not understand. I have to go back to work now, you should leave," Vika says as she leads you to the exit.'
 
-					act 'Leave':gt 'city_residential'
+					act 'Leave':gt 'city_industrial', 'redlight'
 				end
 			else
 				act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -132,10 +132,10 @@ if $ARGS[0] = 'end':
 			act 'Comfort her':
 				cla
 				npc_rel['A220'] += 5
-				'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off me. It was so hot." you say quietly.'
-				'Vika breaths out, relieved, "I was worried that you would not understand. I have to go back to work now, you should leave." Vika says as she leads you to the exit.'
+				'"Why are you so upset? So you work in a brothel, I couldn''t keep my hands off myself. It was so hot," you say quietly.'
+				'Vika breaths out, relieved. "I was worried that you would not understand. I have to go back to work now, you should leave," Vika says as she leads you to the exit.'
 
-				act 'Leave':gt 'city_residential'
+				act 'Leave':gt 'city_industrial', 'redlight'
 			end
 			
 			gs 'willpower', 'misc', 'self', 'hard'
@@ -147,10 +147,10 @@ if $ARGS[0] = 'end':
 					gs 'willpower', 'misc', 'self', 'hard'
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					'"That was so hot! Can you talk to your boss, I want to work here?" you ask.'
-					'Vika lets out a relieving sigh, "And here I was worried that you would not understand. I''ll ask the boss, but I can not guarantee they''ll take you on. I have to go back to work, you should leave." Vika says and leads you to the exit.'
+					'"That was so hot! Can you talk to your boss? I want to work here," you ask.'
+					'Vika lets out a relieved sigh. "And here I was worried that you would not understand. I''ll ask the boss, but I can not guarantee they''ll take you on. I have to go back to work, you should leave," Vika says and leads you to the exit.'
 
-					act 'Leave':gt 'city_residential'
+					act 'Leave':gt 'city_industrial', 'redlight'
 				end
 			else
 				act 'Ask about a job at the brothel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -165,11 +165,11 @@ if $ARGS[0] = 'out':
 	minut += 20
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/bordel.jpg"></center>'
-	'Panicking you run out of the room trying to escape, you rush towards the first door you notice, as you open it you find yourself in another room where a girl is "working". The girl quickly shoos you out and slams the door, as you rush to the next room and find the same thing again. You rush through the corridors, all the doors are looking the same and you start to panic.'
-	'Just as you''re about to give up and cry all of a sudden someone pats you on the shoulder, you turn and see Vika, she has just left the room and stands in front of you naked, her face and chest covered with sperm.'
+	'Panicking, you run out of the room trying to escape. You rush towards the first door you notice, but as you open it, you find yourself in another room where a girl is "working". The girl quickly shoos you out and slams the door. You rush to the next room and find the same thing again. You rush through the corridors, but all the doors are looking the same, and you start to panic.'
+	'Just as you''re about to give up and cry, all of a sudden someone pats you on the shoulder. You turn and see Vika. She has just left the room and stands in front of you naked, her face and chest covered with sperm.'
 	'"<<$pcs_nickname>> wait and relax. You promised to keep quiet..." Vika says.'
 	'"Where''s the fucking way out, whore!" you cry out.'
-	'Vika looks at you, you noticed her lips tremble and her eyes slowly tearing up, "There." she points you to one of the doors, barely hiding the fact that she''s about to cry.'
+	'Vika looks at you. You notice her lips tremble and her eyes slowly tearing up. "There," she points you to one of the doors, barely hiding the fact that she''s about to cry.'
 	
 	act 'Leave':
 		npc_rel['A220'] = 0
@@ -178,7 +178,7 @@ if $ARGS[0] = 'out':
 		gs 'arousal', 'end'
 		gs 'stat'
 	
-		gt 'city_residential'
+		gt 'city_industrial', 'redlight'
 	end
 	
 	gs 'willpower', 'misc', 'self', 'hard'
@@ -190,8 +190,8 @@ if $ARGS[0] = 'out':
 			gs 'willpower', 'pay', 'self'
 			gs 'arousal', 'end'
 			gs 'stat'
-			'Seeing her upset, you begin to comfort her by saying that you did not want to hurt her and that you''re sorry. Vika walks up to you and you hug each other. Shortly thereafter she stops crying and says that she should get back to work, as she walks you to the exit.'
-			act 'Leave':gt 'city_residential'
+			'Seeing her upset, you begin to comfort her by saying that you did not want to hurt her and that you''re sorry. Vika walks up to you, and you hug each other. Shortly thereafter, she stops crying and says that she should get back to work, as she walks you to the exit.'
+			act 'Leave':gt 'city_industrial', 'redlight'
 		end
 	else
 		act 'Comfort her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 6 - 6
locations/bouling.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 				end
 			elseif boulrand = 1:
 				killvar 'boulrand'
-				'You meet two girls and they suggest challenging two guys to a game: Prize 5000 <b>₽</b>, lose and they have sex with you.'
+				'You meet two girls, and they suggest challenging two guys to a game: Prize 5000 <b>₽</b>, lose and they have sex with you.'
 				act 'Play':boulvar = 2 & gt 'bouling', 'randwin'
 				gs 'willpower', 'sex', 'resist', 'hard'
 				if will_cost <= pcs_willpwr:
@@ -86,22 +86,22 @@ if $ARGS[0] = 'randwin':
 
 	if boulwin > 10 and boulvar = 0:
 		money += 300
-		'You won and received 300 <b>₽</b>.'
+		'You win and receive 300 <b>₽</b>.'
 
 		act 'Leave': gt 'bouling'
 	elseif boulwin > 10 and boulvar = 1:
 		money += 2000
-		'You won and received 2,000 <b>₽</b>.'
+		'You win and receive 2,000 <b>₽</b>.'
 
 		act 'Leave': gt 'bouling'
 	elseif boulwin > 10 and boulvar = 2:
 		money += 5000
-		'You won and received 5,000 <b>₽</b>.'
+		'You win and receive 5,000 <b>₽</b>.'
 
 		act 'Leave': gt 'bouling'
 	elseif boulwin <= 10 and boulvar = 0:
 		money -= 300
-		'You lost and paid 300 <b>₽</b>.'
+		'You lose and pay 300 <b>₽</b>.'
 		act 'Leave': gt 'bouling'
 	elseif boulwin <= 10 and boulvar = 1:
 		picrand = 14
@@ -122,7 +122,7 @@ if $ARGS[0] = 'randwin':
 			end
 			act 'Pay': money -= 2000 & gt 'bouling'
 		else
-			'You lost, but you do not have money to pay, only one thing for it.'
+			'You lose, but you do not have enough money to pay. Only one thing for it.'
 
 			act 'Offer sex instead':xgt 'sexdvoe', 'var'
 		end

+ 1 - 2
locations/brother.qsrc

@@ -644,7 +644,6 @@ if $ARGS[0] = 'sleepsexcum':
 
 	pose = 0
 	if sexcontra > 0: sexcontra = 0
-	$risk_boy = ''
 
 	gs 'stat'
 
@@ -838,6 +837,7 @@ if $ARGS[0] = 'fuckvaginal':
 	gs 'dinsex','sexcum'
 
 	gs 'brother', 'brotherSexEnd'
+	killvar '$risk_boy'
 end
 
 if $ARGS[0] = 'fuckanal':
@@ -1084,7 +1084,6 @@ end
 if $ARGS[0] = 'brother_sex_end':
 	*clr & cla
 	menu_off = 1
-	$risk_boy = ''
 	gs 'stat'
 	minut += rand(2,5)
 	'<center><video autoplay loop src="images/characters/pavlovsk/resident/kolka/event/shower/shower.mp4"></center>'

+ 13 - 22
locations/budgetclothes.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'start':
 
 		act 'View exercise shoes':
 			minut += 5
-			gt 'budgetclothes', 'trainers'
+			gt 'budgetclothes', 'danilovich'
 		end
 	end
 
@@ -391,28 +391,19 @@ if $ARGS[0] = 'shoes':
 		gt 'budgetclothes', 'start'
 	end
 
-	if Clothingstock > 15:
-		i = 1
-	elseif Clothingstock > 7:
-		i = 2
-	else
-		i = 3
-	end
-
-	:loopgandm_shoes
-		if sgandm[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''budget_shoes''"><img src="images/pc/shoes/g&m/<<i>>.jpg" height="250" /></a>'
-		i += 3
-		if i = 6:i = 9
-	if i <= 51:jump 'loopgandm_shoes'
+	:loopgm_shoes
+		if sgm[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''budget_shoes''"><img src="images/pc/shoes/g&m/<<i>>.jpg" height="250" /></a>'
+		i += 1
+	if i <= 40:jump 'loopgm_shoes'
 end
 
-if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'gandm',i, 700
+if $ARGS[0] = 'budget_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'gm',i, 700
 
-if $ARGS[0] = 'trainers':
-	$loc_arg = 'trainers'
+if $ARGS[0] = 'danilovich':
+	$loc_arg = 'danilovich'
 	$loc = 'budgetclothes'
 	$menu_loc = 'budgetclothes'
-	$menu_arg = 'trainers'
+	$menu_arg = 'danilovich'
 	menu_off = 0
 	*clr & cla
 	gs'stat'
@@ -429,14 +420,14 @@ if $ARGS[0] = 'trainers':
 		i = 2
 	end
 
-	:looptrainers_shoes
-		if strainers[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''training_shoes''"><img src="images/pc/shoes/trainers/<<i>>.jpg" height="250" /></a>'
+	:loopdanilovich_shoes
+		if sdanilovich[i] = 0:*p '<a href="exec: i = <<i>> & gt ''budgetclothes'', ''danilovich_shoes''"><img src="images/pc/items/danilovich/shoes/<<i>>.jpg" height="250" /></a>'
 		i += 2
 		if i = 21:i = 23
-	if i <= 30:jump 'looptrainers_shoes'
+	if i <= 30:jump 'loopdanilovich_shoes'
 end
 
-if $ARGS[0] = 'training_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'trainers',i, 800
+if $ARGS[0] = 'danilovich_shoes': gt 'shoes', 'view_shoe_item', 'shop', 'danilovich',i, 800
 
 if $ARGS[0] = 'coats':
 	$menu_loc = 'budgetclothes'

+ 94 - 272
locations/carF.qsrc

@@ -23,6 +23,7 @@ $enddrive = {
 	if cardrive = 24:gt 'pav_commercial'
 	if cardrive = 25:gt 'city_island'
 	if cardrive = 26:gt 'pav_industrial'
+	if cardrive = 27:gt 'city_industrial', 'redlight'
 }
 
 if $ARGS[0] = 'start':
@@ -42,7 +43,7 @@ if $ARGS[0] = 'start':
 	act 'Move away from the car':dynamic $enddrive
 
 	if kanistra > 0:
-		'In the trunk there is <<kanistra>> canister/s of gasoline. Each canister contains 5 liters of gasoline.'
+		'In the trunk there ' + iif(kanistra = 1, 'is 1 cannister', 'are <<kanistra>> canisters') + ' of gasoline. Each canister contains 5 liters of gasoline.'
 
 		if benz <= 45:
 			act 'Pour gasoline into the tank':
@@ -50,7 +51,7 @@ if $ARGS[0] = 'start':
 				menu_off = 1
 				benz += 5
 				kanistra -= 1
-				'You emptied the canister of gasoline into the tank.'
+				'You empty the canister of gasoline into the tank.'
 
 				act 'Move away':gt 'carF', 'start'
 			end
@@ -69,12 +70,12 @@ if $ARGS[0] = 'salon':
 	gs 'stat'
 	'<center><b><<$car>></b></center>'
 	'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon<<car>>.jpg"></center>'
-	'Gasoline - <<benz>> liters, the fuel tank has a capacity of 40 liters.'
+	'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 * 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.'
 
@@ -102,47 +103,38 @@ if $ARGS[0] = 'salon':
 	if cardrive = 24:'Through the windshield, you can see Pavlovsk''s commercial region.'
 	if cardrive = 25:'You cross one of the bridges that leads to the island.'
 	if cardrive = 26:'Through the windshield, you can see Pavlovsk''s industrial region.'
+	if cardrive = 27:'Through the windshield, you see St. Petersburg''s red light district.'
 
 	if prava = 0:'You don''t have a driver''s license.'
 
 	act 'Get out of the car':dynamic $enddrive
 
 	if benz > 0 and wrek = 0 and prava > 0:
-		if teh >= tehcar * 75 / 100 and wrek = 0:
-			wrekrand = rand(0, 1000)
-
-			if wrekrand = 1000:wrek = 1
-		elseif teh < tehcar * 75 / 100 and teh >= tehcar * 50/100 and wrek = 0:
-			wrekrand = rand(0, 100)
-
-			if wrekrand = 100:wrek = 1
-		elseif teh < tehcar * 50 / 100 and teh >= tehcar * 25 / 100 and wrek = 0:
-			wrekrand = rand(0, 100)
-
-			if wrekrand >= 80:wrek = 1
-		elseif teh < tehcar * 25 / 100 and wrek = 0:
-			wrekrand = rand(0, 100)
+		if teh >= tehcar * 75 / 100:
+			if rand(0, 1000) = 1000:wrek = 1
+		elseif teh >= tehcar * 50 / 100:
+			if rand(0, 100) = 100:wrek = 1
+		elseif teh >= tehcar * 25 / 100:
+			if rand(0, 100) >= 80:wrek = 1
+		else
+			if rand(0, 100) >= 40:wrek = 1
+		end
 
-			if wrekrand >= 40:wrek = 1
-		elseif wrek = 1:
+		if wrek = 1:
 			'Something clatters loudly, and the engine stalls.'
 
 			act 'Fuck':gt 'carF', 'salon'
-		end
-
-		if alko > 0:
-			dpsrand = rand(0, 100)
-
-			if dpsrand <= alko:
-				'A policeman stops you, he looks at your condition and requests you breathe into a tube. You breathe and a red light brightens up on the instrument panel.'
-				'The officer snorts, and writes something down. He hands you a slip of paper with the number 50,000 on it'
+		else
+			if alko > 0 and rand(0, 100) <= alko:
+				'A policeman stops you. He looks at your condition and requests you breathe into a tube. You breathe, and a red light brightens up on the instrument panel.'
+				'The officer snorts and writes something down. He hands you a slip of paper with the number 50,000 on it'
 				'"Or I can write a report. But you will get a permanent record for driving drunk."'
 
 				if money >= 50000:
 					act 'Bribe him (50,000 <b>₽</b>)':
 						cla
 						money = money - 50000
-						'You pay and the policeman warns you that you can not keep driving in your drunken state.'
+						'You pay, and the policeman warns you that you can not keep driving in your drunken state.'
 
 						act 'In the salon':gt 'carF', 'salon'
 					end
@@ -151,74 +143,63 @@ if $ARGS[0] = 'salon':
 				act 'Come on, this is within the law':
 					cla
 					prava = 0
-					'"I can take your license, for not driving sober."'
+					'"I can take your license for not driving sober."'
 
 					act 'In the salon':gt 'carF', 'salon'
 				end
-
-				exit
-			end
-		elseif alko >= 10:
-			avarand = rand(0, 100)
-
-			if avarand >= 50:
+			elseif alko >= 10 and rand(0, 100) >= 50:
 				teh = teh/2
 				wrek = 1
-				'Driving drunken, you crash into a tree and wreck your car.'
+				'Driving drunk, you crash into a tree and wreck your car.'
 
 				act 'In the salon':gt 'carF', 'salon'
-
-				exit
-			end
-		end
-
-		if wrek = 0:
-
-			if (cardrive = 22 and nroad >= 18) or cardrive = 14 or cardrive = 20 or cardrive = 21 or cardrive = 24 or cardrive = 26:
-				car_town = 0
-				act 'Go to local destination': gs 'carF', 'pav'
-				act 'Go to the city':
-					minut += 65
-					*nl
-					'You drive for more than an hour on the highway before you get to the city.'
-					gs 'carF', 'city'
-				end
-				act 'Go to another destination':
-					minut += 30
-					*nl
-					'You drive out of Pavlovsk.'
-					gs 'carF', 'other'
-				end
-			elseif cardrive <= 11 or cardrive = 25:
-				car_town = 1
-				act 'Go to another city destination': gs 'carF', 'city'
-				act 'Go to Pavlosvsk':
-					minut += 65
-					*nl
-					'You drive for more than an hour on the highway before you get to the town of Pavlovsk.'
-					gs 'carF', 'pav'
-				end
-				act 'Go to another destination':
-					minut += 30
-					*nl
-					'You drive out of the city.'
-					gs 'carF', 'other'
-				end
 			else
-				car_town = 2
-				act 'Go to a city destination':
-					minut += 30
-					*nl
-					'You drive for half an hour on the highway before you get to the city.'
-					gs 'carF', 'city'
-				end
-				act 'Go to a Pavlosvsk destination':
-					minut += 30
-					*nl
-					'You drive for half an hour on the highway before you get to the town of Pavlovsk.'
-					gs 'carF', 'pav'
+				if (cardrive = 22 and nroad >= 18) or cardrive = 14 or cardrive = 20 or cardrive = 21 or cardrive = 24 or cardrive = 26:
+					car_town = 0
+					act 'Go to local destination': gs 'carF', 'pav'
+					act 'Go to the city':
+						minut += 65
+						*nl
+						'You drive for more than an hour on the highway before you get to the city.'
+						gs 'carF', 'city'
+					end
+					act 'Go to another destination':
+						minut += 30
+						*nl
+						'You drive out of Pavlovsk.'
+						gs 'carF', 'other'
+					end
+				elseif cardrive <= 11 or cardrive = 19 or cardrive = 25 or cardrive = 27:
+					car_town = 1
+					act 'Go to another city destination': gs 'carF', 'city'
+					act 'Go to Pavlovsk':
+						minut += 65
+						*nl
+						'You drive for more than an hour on the highway before you get to the town of Pavlovsk.'
+						gs 'carF', 'pav'
+					end
+					act 'Go to another destination':
+						minut += 30
+						*nl
+						'You drive out of the city.'
+						gs 'carF', 'other'
+					end
+				else
+					car_town = 2
+					act 'Go to a city destination':
+						minut += 30
+						*nl
+						'You drive for half an hour on the highway before you get to the city.'
+						gs 'carF', 'city'
+					end
+					act 'Go to a Pavlovsk destination':
+						minut += 30
+						*nl
+						'You drive for half an hour on the highway before you get to the town of Pavlovsk.'
+						gs 'carF', 'pav'
+					end
+					act 'Go to another destination': gs 'carF', 'other'
 				end
-				act 'Go to another destination': gs 'carF', 'other'
 			end
 		end
 	end
@@ -317,195 +298,36 @@ end
 
 if $ARGS[0] = 'pav':
 	cla
-	if cardrive ! 26:
-		act 'Go to Pavlovsk''s Industrial Region':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 26
-			'5 minutes later, you reach your destination.'
-
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 20:
-		act 'Go to Pavlovsk''s Residential Area':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 20
-			'5 minutes later, you reach your destination.'
-
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 24:
-		act 'Go to Pavlovsk''s Commercial Region':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 24
-			'5 minutes later, you reach your destination.'
-
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 14:
-		act 'Go to Old Town district of Pavlovsk':
-			cla
-			benz -= 1
-			teh -= rand(2, 5)
-			cardrive = 14
-			minut += 5
-			'5 minutes later, you reach Old Town district of Pavlovsk.'
-
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 21:
-		act 'Go to the gas station':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 21
-			'5 minutes later, you reach your destination.'
-
-			dynamic $enddrive
-		end
-	end
+	if cardrive ! 26:act 'Go to Pavlovsk''s Industrial Region':gs 'carF', 'nearby', 26
+	if cardrive ! 20:act 'Go to Pavlovsk''s Residential Area':gs 'carF', 'nearby', 20
+	if cardrive ! 24:act 'Go to Pavlovsk''s Commercial Region':gs 'carF', 'nearby', 24
+	if cardrive ! 14:act 'Go to Old Town district of Pavlovsk':gs 'carF', 'nearby', 14
+	if cardrive ! 21:act 'Go to the gas station':gs 'carF', 'nearby', 21
 end
 
 if $ARGS[0] = 'city':
 	cla
-	if cardrive ! 3:
-		act 'Go to St. Petersburg''s Industrial Region':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 3
-			'You drive for more than an hour on the highway before you get to the city.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 1:
-		act 'Go to St. Petersburg''s residential area':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 1
-			'You drive for more than an hour on the highway before you get to St. Petersburg''s residential area.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 2:
-		act 'Go to St. Petersburg city center':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 2
-			'You drive for more than an hour on the highway before you get to St. Petersburg city center.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 19 and cardrive < 20:
-		act 'Go to the city train station':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 19
-
-			'5 minutes later, you arrive at your destination.'
-
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 4 and cardrive < 20:
-		act 'Go to the city lake':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 4
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 5 and cardrive < 20:
-		act 'Go to the city park':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 5
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 6 and cardrive < 20:
-		act 'Go to the gas station':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 6
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 7 and cardrive < 20:
-		act 'Go to the auto repair shop':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 7
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
-
-	if cardrive ! 8 and cardrive < 20:
-		act 'Go to the car dealership':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 8
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
+	if cardrive ! 3:act 'Go to St. Petersburg''s Industrial Region':gs 'carF', 'nearby', 3
+	if cardrive ! 1:act 'Go to St. Petersburg''s residential area':gs 'carF', 'nearby', 1
+	if cardrive ! 2:act 'Go to St. Petersburg city center':gs 'carF', 'nearby', 2
+	if cardrive ! 19:act 'Go to the city train station':gs 'carF', 'nearby', 19
+	if cardrive ! 4:act 'Go to the city lake':gs 'carF', 'nearby', 4
+	if cardrive ! 5:act 'Go to the city park':gs 'carF', 'nearby', 5
+	if cardrive ! 6:act 'Go to the gas station':gs 'carF', 'nearby', 6
+	if cardrive ! 7 and func('autoservisF', 'is_open'):act 'Go to the auto repair shop':gs 'carF', 'nearby', 7
+	if cardrive ! 9 and func('autotraidF', 'is_open'):act 'Go to the car dealership':gs 'carF', 'nearby', 9
+	if cardrive ! 25:act 'Go to the island':gs 'carF', 'nearby', 25
+	if cardrive ! 27:act 'Go to the red light district':gs 'carF', 'nearby', 27
+end
 
-	if cardrive ! 25 and cardrive < 20:
-		act 'Go to the island':
-			cla
-			minut += 5
-			benz -= 1
-			teh -= rand(1, 3)
-			cardrive = 25
-			'5 minutes later, you arrive at your destination.'
-			dynamic $enddrive
-		end
-	end
+if $ARGS[0] = 'nearby':
+	cla
+	minut += 5
+	benz -= 1
+	teh -= rand(1, 3)
+	cardrive = ARGS[1]
+	'5 minutes later, you arrive at your destination.'
+	dynamic $enddrive
 end
 
 --- carF ---------------------------------

+ 49 - 662
locations/carF1.qsrc

@@ -1,703 +1,90 @@
 # carF1
 
 menu_off = 1
+$loc_arg = $ARGS[0]
+$loc = 'carF1'
+*clr & cla
+minut += 5
+gs'stat'
 
-if $ARGS[0] = 'car':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+if $ARGS[0] = '':
 	'<center><b>VAZ 2107</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car'
-	end
-end
-
-if $ARGS[0] = 'car2':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '2':
 	'<center><b>VAZ 2115</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car2.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon2.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car2'
-	end
-end
-
-if $ARGS[0] = 'car3':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '3':
 	'<center><b>VAZ 2113</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car3.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon3.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car3'
-	end
-end
-
-if $ARGS[0] = 'car4':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '4':
 	'<center><b>VAZ 2114</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car4.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon4.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car4'
-	end
-end
-
-if $ARGS[0] = 'car5':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '5':
 	'<center><b>VAZ 2119</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car5.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon5.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car5'
-	end
-end
-
-if $ARGS[0] = 'car6':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
-
+elseif $ARGS[0] = '6':
 	'<center><b>VAZ Kalina</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car6.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon6.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car6'
-	end
-end
-
-if $ARGS[0] = 'car7':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '7':
 	'<center><b>WHA PRIORA</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car7.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon7.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car7'
-	end
-end
-
-if $ARGS[0] = 'car8':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '8':
 	'<center><b>Chevrolet Niva</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car8.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon8.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car8'
-	end
-end
-
-if $ARGS[0] = 'car9':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '9':
 	'<center><b>UAZ HUNTER</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car9.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon9.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car9'
-	end
-end
-
-if $ARGS[0] = 'car10':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '10':
 	'<center><b>UAZ Patriot</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car10.jpg"></center>'
-
-		act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon10.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car10'
-	end
-end
-
-if $ARGS[0] = 'car13':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '13':
 	'<center><b>Ford Focus 2</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car13.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon13.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car13'
-	end
-end
-
-if $ARGS[0] = 'car95':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '95':
 	'<center><b>Mitsubishi l200</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car95.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon95.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car95'
-	end
-end
-
-if $ARGS[0] = 'car96':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
-
-
+elseif $ARGS[0] = '96':
 	'<center><b>Audi Q7</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car96.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon96.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car96'
-	end
-end
-
-if $ARGS[0] = 'car97':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '97':
 	'<center><b>Cadillac Escalade</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car97.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon97.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car97'
-	end
-end
-
-if $ARGS[0] = 'car98':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '98':
 	'<center><b>Porsche Cayenne</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car98.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon98.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car98'
-	end
-end
-
-if $ARGS[0] = 'car99':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '99':
 	'<center><b>BMW X6</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car99.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon99.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car99'
-	end
-end
-
-if $ARGS[0] = 'car100':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs 'stat'
+elseif $ARGS[0] = '100':
 	'<center><b>Mercedes-Benz S 600</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car100.jpg"></center>'
-
-	act 'Leave':
-		cla
-
-		if cartraid = 1:gt 'autosalonF', 'start'
-		if cartraid = 2:gt 'autotraidF', 'manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon100.jpg"></center>'
-
-		act 'Leave':gt 'carF1', 'car100'
-	end
-end
-
-if $ARGS[0] = 'car101':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '101':
 	'<center><b>BMW Z4</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car101.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon101.jpg"></center>'
-
-		act 'Leave':gt'carF1','car101'
-	end
-end
-
-if $ARGS[0] = 'car102':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '102':
 	'<center><b>Renault LOGAN</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car102.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon102.jpg"></center>'
-
-		act 'Leave':gt'carF1','car102'
-	end
-end
-
-if $ARGS[0] = 'car103':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
-	'<center><b>Toyaboutta Corolla</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car103.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon103.jpg"></center>'
-
-		act 'Leave':gt'carF1','car103'
-	end
-end
-
-if $ARGS[0] = 'car104':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '103':
+	'<center><b>Toyota Corolla</b></center>'
+elseif $ARGS[0] = '104':
 	'<center><b>Toyota Celica</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car104.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon104.jpg"></center>'
-
-		act 'Leave':gt'carF1','car104'
-	end
-end
-
-if $ARGS[0] = 'car105':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '105':
 	'<center><b>Mazda 6</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car105.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon105.jpg"></center>'
-
-		act 'Leave':gt'carF1','car105'
-	end
-end
-
-if $ARGS[0] = 'car106':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '106':
 	'<center><b>Mercedes-Benz E 212</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car106.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon106.jpg"></center>'
-
-		act 'Leave':gt'carF1','car106'
-	end
-end
-
-if $ARGS[0] = 'car107':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '107':
 	'<center><b>BMW M5</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car107.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon107.jpg"></center>'
-
-		act 'Leave':gt'carF1','car107'
-	end
-end
-
-if $ARGS[0] = 'car108':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '108':
 	'<center><b>Jaguar XKR-S</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car108.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon108.jpg"></center>'
-
-		act 'Leave':gt'carF1','car108'
-	end
-end
-
-if $ARGS[0] = 'car109':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '109':
 	'<center><b>Audi A6</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car109.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon109.jpg"></center>'
-
-		act 'Leave':gt'carF1','car109'
-	end
-end
-
-if $ARGS[0] = 'car110':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '110':
 	'<center><b>Ford Mondeo</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car110.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon110.jpg"></center>'
-
-		act 'Leave':gt'carF1','car110'
-	end
-end
-
-if $ARGS[0] = 'car111':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla	
-	minut += 5
-	gs'stat'
-
+elseif $ARGS[0] = '111':
 	'<center><b>Bentley Continental GT</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car111.jpg"></center>'
-
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
-	
-	act 'Sit behind the wheel':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon111.jpg"></center>'
-
-		act 'Leave':gt'carF1','car111'
-	end
+elseif $ARGS[0] = '112':
+	'<center><b>Ferrari 458 Italia</b></center>'
+else
+	$carF1_num = 'invalid'
 end
 
-if $ARGS[0] = 'car112':
-	$loc_arg = $ARGS[0]
-	$loc = 'carF1'
-	*clr & cla
-	minut += 5
-	gs'stat'
-
-	'<center><b>Ferrari 458 Italia</b></center>'
-	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car112.jpg"></center>'
+act 'Leave':
+	killvar '$carF1_num'
+	gt 'autosalonF','start'
+end
 
-	act 'Leave':
-		cla
-		if cartraid = 1:gt'autosalonF','start'
-		if cartraid = 2:gt'autotraidF','manager'
-	end
+if $carF1_num = 'invalid':
+	'It appears the car you selected does not actually exist.'
+else
+	$carF1_num = $ARGS[0]
+	'<center><img <<$set_imgh>> src="images/shared/accessories/car/car<<$carF1_num>>.jpg"></center>'
 	
 	act 'Sit behind the wheel':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon112.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/accessories/car/salon<<$carF1_num>>.jpg"></center>'
 
-		act 'Leave':gt'carF1','car112'
+		act 'Leave':gt 'carF1', $carF1_num
 	end
 end
 

+ 2 - 2
locations/changingroom.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'count_swim_item':
 	if $ARGS[1] = 'swim' or $ARGS[1] = '':
 		i = 1
 		:loopcountswimwear
-			if swimwear[i] = 1 and swimwearS[i] = 0 :h += 1
+			if swimwear[i] = 1 and swimwear_s[i] = 0 :h += 1
 			i += 1
 		if i <= ARRSIZE('swimwear'):jump 'loopcountswimwear'
 	end
@@ -112,7 +112,7 @@ if $ARGS[0] = 'count_swim_item':
 	if $ARGS[1] = 'beach' or $ARGS[1] = '':
 		i = 1
 		:loopcountbeach
-			if beach[i] = 1 and beachS[i] = 0 :h += 1
+			if beach[i] = 1 and beach_s[i] = 0 :h += 1
 			i += 1
 		if i <= ARRSIZE('beach'):jump 'loopcountbeach'
 	end

+ 11 - 1
locations/cikl.qsrc

@@ -159,7 +159,7 @@ Clothingstock[i] = rand (0,500)
 i += 1
 if i <= 147:jump 'loopprice'
 
-if coatH[defaultcoat] <= 0: defaultcoat = 0
+if coat_h[defaultcoat] <= 0: defaultcoat = 0
 
 !! Abortion and pregnancy recovery resets if finished
 
@@ -1880,6 +1880,16 @@ cheerleaders_on = iif( ( (week = 5 and odd_week = 1) or (week = 2 or week = 4) )
 
 !!------------------------------------------------------------------------------------------------------------
 
+!!---------- Starlet Practice Check --------------------------------------------------------------------------
+if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0:
+	if starlets_practice = daystart - 1: 
+		starlets_missed = 1
+		starlets_practice = 0
+	end
+	if starlets_on = 1: starlets_practice = daystart
+end
+
+!!------------------------------------------------------------------------------------------------------------
 
 !!-------------Music career related variables and calculations------------------------------------------------
 

+ 24 - 6
locations/city_industrial.qsrc

@@ -48,7 +48,15 @@ if $ARGS[0] = '':
 
 	gs 'taxi'
 
-	if car > 0 and cardrive = 3 or (cardrive >= 6 and cardrive <= 9):'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'
+	if car > 0:
+		if wrek = 0 and ((cardrive = 7 and func('autoservisF', 'is_open') = 0) or (cardrive = 9 and func('autotraidF', 'is_open') = 0)):
+			'It looks like the ' + iif(cardrive = 7, 'repair shop', 'car dealership') + ' moved your car outside before they closed.'
+			cardrive = 3
+		end
+		if cardrive = 3 or cardrive = 6 or (cardrive = 7 and func('autoservisF', 'is_open')) or (cardrive = 9 and func('autotraidF', 'is_open')) or cardrive = 27:
+			'In the parking stands your <a href="exec:' + iif(cardrive = 3, '', 'minut += 5 & ') + 'gs ''carF'', ''start''"><<$car>></a>.'
+		end
+	end
 
 	'The town''s <a href="exec:minut += 60 & gt ''city_park'', ''start''">central park</a> is a one hour walk from here.'
 
@@ -75,15 +83,15 @@ if $ARGS[0] = '':
 	else
 		'The metro station is within a 5 minute walk from here. The metro system is closed between midnight and 05:00.'
 	end
-	if hour >= 9 and hour < 18 and week > 1:
+	if func('autotraidF', 'is_open'):
 		'A <a href="exec: minut += 5 & gt ''autotraidF'', ''start''">car dealership</a> is nearby.'
 	else
-		'A car dealership is nearby'+iif(week = 1, ', but it''s closed on Mondays.', '. It''s currently closed and will open between 09:00 and 18:00.')
+		'A car dealership is nearby' + iif(week = 1, ', but it''s closed on Mondays.', '. It''s currently closed and will open between 09:00 and 18:00.') + iif(car > 0 and cardrive = 9, ' Your <<$car>> is currently locked inside.', '')
 	end
-	if hour >= 9 and hour <= 20 and week < 7:
+	if func('autoservisF', 'is_open'):
 		'Next to the car dealership is a <a href="exec: minut += 5 & gt ''autoservisF'', ''start''">repair shop</a>.'
 	else
-		'Next to the car dealership is a repair shop.'+ iif(week = 7, 'It''s closed on Sundays.', 'It will be open between 09:00 and 20:00.')
+		'Next to the car dealership is a repair shop.' + iif(week = 7, 'It''s closed on Sundays.', 'It will be open between 09:00 and 20:00.') + iif(car > 0 and cardrive = 7, ' Your <<$car>> is currently locked inside.', '')
 	end
 	if hour >= 9 and hour < 17 and week < 6:
 		'The <a href="exec: minut += 5 & gt ''dk'', ''start''">community centre</a> is currently open.'
@@ -158,7 +166,7 @@ if $ARGS[0] = 'redlight':
 	else
 		'A shop that sells sex toys. It is currently closed and will open at 11:00.'
 	end
-	if bordel > 0 and (hour >= 20 or hour <= 3):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
+	if bordel > 0 and func('bordel', 'is_open'):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 
 	act 'Return to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
 
@@ -166,6 +174,16 @@ if $ARGS[0] = 'redlight':
 	
 	gs 'taxi'
 
+	if car > 0:
+		if wrek = 0 and ((cardrive = 7 and func('autoservisF', 'is_open') = 0) or (cardrive = 9 and func('autotraidF', 'is_open') = 0)):
+			'It looks like the ' + iif(cardrive = 7, 'repair shop', 'car dealership') + ' moved your car outside before they closed.'
+			cardrive = 3
+		end
+		if cardrive = 3 or cardrive = 6 or (cardrive = 7 and func('autoservisF', 'is_open')) or (cardrive = 9 and func('autotraidF', 'is_open')) or cardrive = 27:
+			'In the parking stands your <a href="exec:' + iif(cardrive = 27, '', 'minut += 5 & ') + 'gs ''carF'', ''start''"><<$car>></a>.'
+		end
+	end
+
 	if hour >= 20 or hour <= 4:
 		*nl
 		'There are prostitutes working in places near here.'

+ 2 - 2
locations/city_park.qsrc

@@ -116,7 +116,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour > 5 and hour < 23 and parkrunday ! daystart:
+	if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and parkrunday ! daystart:
 		act 'Go for a run in the park (1:00)':
 			*clr & cla
 			menu_off = 1
@@ -176,7 +176,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-	elseif ($clothingworntype ! 'exercise' or $shoeworntype = 'trainers') and hour > 5 and hour < 23 and parkrunday ! daystart:
+	elseif ($clothingworntype ! 'exercise' or $shoeworntype = 'danilovich') and hour > 5 and hour < 23 and parkrunday ! daystart:
 		'You could go for a run in the park if you were wearing sports clothes and shoes.'
 	end
 

+ 14 - 14
locations/psiklin.qsrc → locations/city_suburbs.qsrc

@@ -1,11 +1,11 @@
-# psiklin
+# city_suburbs
 
 $location_type = 'public_outdoors'
 
 if $ARGS[0]='start':
-	$loc = 'psiklin'
+	$loc = 'city_suburbs'
 	$loc_arg = 'start'
-	$menu_loc = 'psiklin'
+	$menu_loc = 'city_suburbs'
 	$menu_arg = 'start'
 	menu_off = 0
 	gs'stat'
@@ -27,9 +27,9 @@ if $ARGS[0]='start':
 	else
 		'One of the most impressive buildings is your newly built mansion.'
 		act 'Visit your mansion': gt 'youplace'
-	end if
-	act 'View the insane asylum': minut += 2 & gt 'psiklin', 'ps1'
-	act 'View the creepy old building': minut += 2 & gt 'psiklin', 'ps2'
+	end
+	act 'View the insane asylum': minut += 2 & gt 'city_suburbs', 'ps1'
+	act 'View the creepy old building': minut += 2 & gt 'city_suburbs', 'ps2'
 
 	act 'Go to the main road':nroad = 1 & minut += 15 & gt 'road'
 
@@ -42,14 +42,14 @@ if $ARGS[0]='start':
 			end
 		else
 			act 'Look for Alexandria''s direction (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end if
-	end if
-end if
+		end
+	end
+end
 
 if $ARGS[0]='ps1':
 	cla
 	*clr
-	$menu_loc = 'psiklin'
+	$menu_loc = 'city_suburbs'
 	$menu_arg = 'ps1'
 	menu_off = 0
 	gs'stat'
@@ -58,13 +58,13 @@ if $ARGS[0]='ps1':
 	if psiklik = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/asylum0.jpg" ></center>'
 	if psiklik = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/asylum1.jpg" ></center>'
 
-	act 'Go': minut += 2 & gt'psiklin','start'
+	act 'Go': minut += 2 & gt'city_suburbs','start'
 end
 
 if $ARGS[0]='ps2':
 	cla
 	*clr
-	$menu_loc = 'psiklin'
+	$menu_loc = 'city_suburbs'
 	$menu_arg = 'ps2'
 	menu_off = 0
 	gs'stat'
@@ -72,8 +72,8 @@ if $ARGS[0]='ps2':
 	'<center><img <<$set_imgh>> src="images/locations/city/suburb/abandoned.jpg" ></center>'
 	'An abandoned building that spoils the local communities appearance and intimidates local residents.'
 
-	act 'Go': minut += 2 & gt'psiklin','start'
+	act 'Go': minut += 2 & gt'city_suburbs','start'
 end
 
---- psiklin ---------------------------------
+--- city_suburbs ---------------------------------
 

+ 6 - 6
locations/cloakroom.qsrc

@@ -18,13 +18,13 @@ $coat_list_line = {
 
 	$RESULT +='<TD><a href="exec:gt ''cloakroom'', ''view_coat_item'', <<ARGS[0]>>"><img src="<<FUNC(''$clothing_image'', ''coat'', ARGS[0])>>" width="<<clothing_temp>>"></a></TD>'
 
-	$RESULT += '<TD>Coat # <<ARGS[0]>><br>strength: ' + dyneval '$RESULT += coatH[<<ARGS[0]>>]'+'</TD>'
+	$RESULT += '<TD>Coat # <<ARGS[0]>><br>strength: ' + dyneval '$RESULT += coat_h[<<ARGS[0]>>]'+'</TD>'
 
 	$RESULT += '<TD>' + FUNC('$clothing_name', 'coat', ARGS[0]) + '</TD>'
 
 	$RESULT += '<TD><a href="exec:gt ''cloakroom'', ''view_coat_item'', <<ARGS[0]>>">View</a></TD>'
 
-	if coatH[i] > 0:
+	if coat_h[i] > 0:
 		$RESULT += '<TD><a href="exec:defaultcoat = ''<<i>>'' & gt ''cloakroom'', ''view_coat_list''">Wear</a></TD>'
 	end
 
@@ -35,19 +35,19 @@ $coat_list_line = {
 	$RESULT += '</TD>'
 
 	$RESULT += '<TD>'
-	if dyneval('RESULT = coatS[<<ARGS[0]>>]') = 0:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest'', <<ARGS[0]>>">Keep</a>'
-	if dyneval('RESULT = coatS[<<ARGS[0]>>]') = 2:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest1'', <<ARGS[0]>>">Unwanted</a>'
+	if dyneval('RESULT = coat_s[<<ARGS[0]>>]') = 0:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest'', <<ARGS[0]>>">Keep</a>'
+	if dyneval('RESULT = coat_s[<<ARGS[0]>>]') = 2:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest1'', <<ARGS[0]>>">Unwanted</a>'
 	$RESULT += '</TD>'}
 
 if $ARGS[0] = 'dest':
 	*clr
-	dynamic 'coatS[<<ARGS[1]>>] = 2'
+	dynamic 'coat_s[<<ARGS[1]>>] = 2'
 	gt 'cloakroom', 'view_coat_list'
 end
 
 if $ARGS[0] = 'dest1':
 	*clr
-	dynamic 'coatS[<<ARGS[1]>>] = 0'
+	dynamic 'coat_s[<<ARGS[1]>>] = 0'
 	gt 'cloakroom', 'view_coat_list'
 end
 

+ 3 - 3
locations/clothing.qsrc

@@ -403,7 +403,7 @@ if $ARGS[0] = 'view_clothing_list':
 			$ward_list_store = $ARGS[2]
 			i = 1
 			:loopbeach
-				if beach[i] = 1 and beachS[i] = cloc and ($clothingworntype ! 'beach' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'beach', i)
+				if beach[i] = 1 and beach_s[i] = cloc and ($clothingworntype ! 'beach' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'beach', i)
 				i += 1
 			if i <= ARRSIZE('beach'):jump 'loopbeach'
 
@@ -496,7 +496,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 			i = 1
 			:loopswimwear
-				if swimwear[i] = 1 and swimwearS[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
+				if swimwear[i] = 1 and swimwear_s[i] = cloc :*P dyneval($clothing_list_line, $ARGS[1], 'swimwear', i)
 				i += 1
 			if i <= ARRSIZE('swimwear'):jump 'loopswimwear'
 
@@ -773,7 +773,7 @@ if $ARGS[0] = 'view_clothing_item':
 
 		if $ARGS[2] ! 'coat':
 			act 'Move back to wardrobe':
-				dynamic $ARGS[2] + 'S[<<ARGS[3]>>] = 0'
+				dynamic $ARGS[2] + '_s[<<ARGS[3]>>] = 0'
 				gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 			end
 		end

+ 1 - 1
locations/clothing_QV.qsrc

@@ -626,7 +626,7 @@ if $ARGS[0] = 'cloak':
 	i = 1
 	:loopcoat
 	if coat[i] = 1:
-		if coatH[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coat'', <<i>>"><img src="images/pc/clothing/11coat/<<i>>.jpg" 	height="250" /></a>'
+		if coat_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''coat'', <<i>>"><img src="images/pc/clothing/11coat/<<i>>.jpg" 	height="250" /></a>'
 	end
 	i += 1
 	if i <= ARRSIZE('coat'):jump 'loopcoat'

+ 0 - 1
locations/clothing_attributes.qsrc

@@ -2,7 +2,6 @@
 
 !! **Clothing Organization
 !! CloCategory: based on attribute file name and usually the shop name often with _outfits or _dress as postfix
-!!		Notes: 1-3 are general purpose clothing, 4-7 are self-explanatory, 8 is fetish wear, latex and leather. 9 is extreme clothing that exposes your body and likely to get you arrested . 10 is waitress, maid and stripper uniforms. 13 is for burlesque shows or a bordello
 !! CloStyle: 1 Girlie, 2 Rebel, 3 Wealthy, 4 Prostitute, 5 is Loose fit
 !!		Notes: 1 is clothing themed to give the impression of innocence of youth. 2 is for stereotypical punks; ripped clothing, leather jackets, etc. 3 gives the impression that theyre debutanttes or rich at first glance. 4 is stuff worn by prostitutes. 5 is formless clothing that doesn''t requiring refitting.
 !! CloStyle2: 1 Maid, 2 Server, 3 Stripper, 4 School

+ 8 - 6
locations/dachain.qsrc

@@ -216,7 +216,6 @@ if $args[0] = 'dachakit':
 	end
 
 	if edaD = 0 and eda = 0:'<b><font color="red">The refrigerator is empty, you have nothing to eat.</font></b>'
-	if edahot > 0: act 'A cooked meal is on the table (0:30).': dynamic $edahotd
 
 	if husband > 0 and husbandrink ! 10:
 		if hour = 7 or hour = 17:'<a href="exec:gt ''husb'', ''start''">Your husband is eating at the table.</a>'
@@ -228,17 +227,21 @@ if $args[0] = 'dachakit':
 		else
 			'You have enough tea biscuits for <b><<pranik>></b> more snacks.'
 		end
-		dynamic $pranik
 	end
 
+	act 'Go into the main room': gt 'dachain', ''
+	if edahot > 0: act 'A cooked meal is on the table (0:30).': dynamic $edahotd
+	act 'Have a snack (0:15)':gs 'food', 'snack'
+	dynamic $sandwich
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $fill_bottle
 	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
-	dynamic $driwater
 	dynamic $lekarstvo
 	dynamic $vitamin
 
-	act 'Go into the main room': gt 'dachain', ''
-	act 'Go to the Bathroom':  gt 'dachain', 'dachavann'
 end
 
 if $args[0] = 'dachavann':
@@ -257,7 +260,6 @@ if $args[0] = 'dachavann':
 		'<center><img <<$set_imgh>> src="images/locations/suburban/cottage/dachavan1.jpg"></center>'
 	end
 	gs 'din_van', 'private'
-	act 'Go to the kitchen alcove': gt 'dachain', 'dachakit'
 	act 'Go into the main room': gt 'dachain', ''
 end
 

+ 3 - 3
locations/din_van.qsrc

@@ -291,9 +291,9 @@ $brit = {
 						$shave_txt1 = 'You lather up your legs and carefully shave them. Once finished, you spend some time cleaning up the area around your styled pubic hair, trimming back stubble and hair until it''s neat and tidy again.'
 					end
 				elseif pubestyle = 9:
-					$shave_act = 'Shave your legs and trim your bush'
+					$shave_act = 'Shave your legs and maintain your bush'
 					if pcs_pubes >= 26:
-						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time trimming back your thick bush of pubic hair, until it is a neat and tidy lawn of hair instead.'
+						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush and your bikini lines, until it is a neat and tidy lawn of hair.'
 					else
 						$shave_txt1 = 'You lather up your legs and carefully shave them. Once you''re finished, you spend some time maintaining your bush, keeping it short and neat.'
 					end
@@ -380,7 +380,7 @@ $brit = {
 				else
 					$shave_txt1 = 'You lather up your crotch, carefully shaving away the stubble growing from it. Once you''re finished you glide your hands over your smooth skin, enjoying the feeling.'
 				end
-			elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle = 12:
+			elseif (pubestyle >= 2 and pubestyle <= 8) or pubestyle >= 12:
 				if pcs_pubes >= shave_trigger + 5:
 					$shave_act = 'Shave your pussy'
 					$shave_txt1 = 'You lather up your crotch and start shaving away the edges of your pubic hair. After a few minutes, you''ve given your pussy a perfect hairdoo and rinse off the rest of the soap, admiring your new sexual fashion before deciding what to do next.'

+ 2 - 2
locations/dorm.qsrc

@@ -223,7 +223,7 @@ if $ARGS[0] = 'kendraroom':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/kendraroom/room.jpg"></center>'
 	'There are two beds, one on each side of the window. There are various pictures and posters hanging on both sides of the room. One side also has a string of large lights hanging up as well. Just down from the beds on each side are two desks, against each wall. Both are decorated with slight differences. Near the door is a small couch and two wardrobes.'
-	if kendraslave = 6:
+	if kendraslave >= 6:
 		'Kendra opens the door and invites you in. It doesn''t take long before you are both naked and excitedly touching each other.'
 		act 'Have sex':
 			*clr & cla
@@ -378,7 +378,7 @@ if $ARGS[0] = 'kendraroom':
 				act 'Leave':gt 'dorm', 'korr'
 			end
 		end
-	elseif kendraslave = 1:
+	elseif kendraslave <= 1:
 		'A pretty ebony woman opens the door, she introduces herself as Kendra and says that she knows you love black cocks. She tells you to get a proper tattoo if you want to get it on with her.'
 		act 'Leave':gt 'dorm', 'korr'
 		act 'Get a tattoo':

+ 33 - 15
locations/ender.qsrc

@@ -194,14 +194,22 @@ if $ARGS[0] = 'loss':
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
 		killvar 'autocombat_surrender'
 		fightEnding = 0
-		zverRageQW = 10
+		christinaQW['fight'] = -1
+		christinaQW['subpath'] = 2
+		christinaQW['dompath'] = 0
 		Loss += 1
+		minut += 10
+		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/shared/sex/dom/spit.jpg"></center>'
-		'Christina beats you and you fall to the ground, crying in front of the whole school. She hisses angrily to you. "Now I''ll make your life hell, slut!" She bends down to your face. "Open your mouth and stick your tongue out, bitch."'
-		'You comply and open your mouth with your tongue out. Without any hesitation, Christina spits in your mouth and yells "Swallow bitch!" The whole school watches as you swallow her spit.'
-		'Christina then spits on your face. While making fun of you, Christina kicks you a few more times in the ribs before turning around and walking away.'
-
+		'Christina beats you and you fall to the ground, crying in front of the whole school. "Now I''ll make your life hell, slut! Open your mouth and stick your tongue out, bitch."'
+		'You comply and open your mouth with your tongue out. Without any hesitation, Christina spits in your mouth and yells "Swallow, bitch!" The whole school watches as you swallow her spit.'
+		'Leaning down so only you can hear, she hisses at you angrily, "Delete the pictures, or I will break all your teeth! Now!"'
+		'Hands trembling, you pull out your phone and delete the file marked Christina. Taking the phone from your hands, she throws it pretty far away.'
+		'Spitting on your face one more time, she turns and walks away, looking pleased with herself.'
+		'You stagger to your feet, tears and spit streaking your face, and go looking for your phone. You find it about ten minutes later, deep in the grass.'
+		$npc_notes['A13'] = 'Lariska is an athletic girl with a weak personality: she''s very dependent on other people''s opinions of her. Christina controls her every move, and ever since your fight with Christina, she seems even more down than usual. Even though Mikhail Nikolayevich sees a lot of potential in her, she''s afraid to go pro.'
+		$npc_notes['A18'] = 'Christina is a tall and strong girl. She''s one of the best athletes your school has to offer. Her leadership skills, combined with her intelligence and tenacity make her a very serious threat to anyone who would challenge her. Unfortunately, you challenged her and lost, and now she owns you.'
 		act 'Leave':gs 'gschool_grounds', 'main'
 	elseif fightEnding = 13:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -416,17 +424,18 @@ if $ARGS[0] = 'win':
 		act 'Go home':	gt 'din_npc', 'go_home'
 
 	elseif fightEnding = 12:
-		zverSlutQW = 1
+		christinaQW['dompath'] = 6
 		lariskaQwestStart = daystart + 7
 		Win += 1
 		fightEnding = 0
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/school/win.jpg"></center>'
-		$npc_notes['A13'] = 'Lariska, who is very dependent on other people''s opinions. After you managed to win the fight against Christina Lariska looks more cheerful. She''s a good volleyball player, and could go pro if she keeps it up even though she doesn''t believe it herself. But with the help of Mikhail Nikolayevich, the volleyball coach, she might make it.'
-		$npc_notes['A18'] = 'After you beat Christina in front of the whole school, they started gossiping about how you managed to break her. Once known as the school bully, she is now a shell of her former self.'
+		$npc_notes['A13'] = 'Lariska is an athletic girl with a weak personality: she''s very dependent on other people''s opinions of her. Christina used to control her, but ever since you took care of Christina she has been a lot more lively. She has a spark in her eyes, and is almost always in a good mood. Even though Mikhail Nikolayevich sees a lot of potential in her, she''s afraid to go pro.'
+		$npc_notes['A18'] = 'Since your fight with Christina, she has been avoiding you. She has been humiliated ever since you told the whole school about how she sucked the P.E. teacher''s dick, and beat her up when she tried to fight you over it. Barely a shade of her former self, she stands timidly in a corner, her head still wrapped in bandages. Whenever she opens her mouth, people can see the broken teeth she hasn''t had a chance to get fixed yet.'
 		npc_grupTipe['A18'] = 5
-		'Christina falls to the ground, and you grab her by the hair. "Well bitch, tell the whole school. Did you suck his cock or not?" Christins squeals as she admits to the whole school that she sucked his cock to be allowed to go to the regional competition.'
-		'Leaning forward so nobody else can hear, you tell her "From now on, you don''t get to wear panties to school." Shaking her head, you twist her hair a little more, making her yelp, and say "For that, you will wear a buttplug everyday too. Want to keep pushing it?"'
+		'Christina falls to the ground, and you grab her by the hair. "Well bitch, tell the whole school. Did you suck his cock or not?" Christins squeals as she admits to the whole school that she sucked his cock.'
+		'Leaning forward so nobody else can hear, you tell her "From now on, you don''t get to wear panties to school." Shaking her head no, you twist her hair a little more, making her yelp, and say "For that, you will wear a buttplug everyday too. Want to keep pushing it?"'
 		'She looks at you in fear and nods. "I can''t hear you Christina!" you growl, twisting her hair again. "Yes, <<$pcs_nickname>>, no more panties, and wear a buttplug!" she gasps. Letting her go, you look down at her, and realize from now on, she is yours to do with as you please.'
+		'You pull out your phone and take a few pictures of her, and then anonymously send copies of the blowjob pictures to Coach Pavlovich along with a message that read; "Christina is no longer allowed to do school sports, or this ends up in the Principles hands." Satisfied, you walk away.'
 		act 'Leave':gs 'gschool_grounds', 'main'
 	elseif fightEnding = 13:
 		fightEnding = 0
@@ -711,8 +720,12 @@ if $ARGS[0] = 'surrender':
 	elseif fightEnding = 12:
 		killvar 'autocombat_surrender'
 		fightEnding = 0
-		zverRageQW = 10
+		christinaQW['fight'] = -1
+		christinaQW['subpath'] = 2
+		christinaQW['dompath'] = 0
 		Loss += 1
+		minut += 10
+		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/shared/sex/dom/spit.jpg"></center>'
 
@@ -723,10 +736,15 @@ if $ARGS[0] = 'surrender':
 		else
 			'You feel bruised and beaten by Christina. She is hitting you everywhere and you''re barely able to defend yourself. All of a sudden you lose your footing and land on your ass. Right there you decide that it''s not worth fighting on. "I give up..." you barely find the strength to whisper...'
 		end
-		'Christina laughs a cruel laugh, knowing she has won. She hisses angrily to you "Now I''ll make your life hell, slut!" She looks you in the eye and says "Open your mouth and stick your tongue out, bitch."'
-		'You comply and open your mouth with your tongue out. Without any hesitation, Christina spits in your mouth and yells "Swallow bitch!" The whole school watches as you swallow her spit.'
-		'Christina finishes by spitting on your face. She seems satisfied as she turns around and walks away.'
-
+		'Christina laughs a cruel laugh, knowing she has won. "Now I''ll make your life hell, slut! Open your mouth and stick your tongue out, bitch."'
+		'You comply and open your mouth with your tongue out. Without any hesitation, Christina spits in your mouth and yells "Swallow, bitch!" The whole school watches as you swallow her spit.'
+		'Leaning down so only you can hear, she hisses at you angrily, "Delete the pictures, or I will break all your teeth! Now!"'
+		'Hands trembling, you pull out your phone and delete the file marked Christina. Taking the phone from your hands, she throws it pretty far away.'
+		'Spitting on your face one more time, she turns and walks away, looking pleased with herself.'
+		'You stagger to your feet, tears and spit streaking your face, and go looking for your phone. You find it about ten minutes later, deep in the grass.'
+
+		$npc_notes['A13'] = 'Lariska is an athletic girl with a weak personality: she''s very dependent on other people''s opinions of her. Christina controls her every move, and ever since your fight with Christina, she seems even more down than usual. Even though Mikhail Nikolayevich sees a lot of potential in her, she''s afraid to go pro.'
+		$npc_notes['A18'] = 'Christina is a tall and strong girl. She''s one of the best athletes your school has to offer. Her leadership skills, combined with her intelligence and tenacity make her a very serious threat to anyone who would challenge her. Unfortunately, you challenged her and lost, and now she owns you.'
 		if pcs_health < 100: pcs_health = 100
 		act 'Leave':gs 'gschool_grounds', 'main'
 	elseif fightEnding = 13:

+ 3 - 3
locations/etoexhib.qsrc

@@ -1562,12 +1562,12 @@ if $ARGS[0] = 'pos51':
 			sosedQW = 1
 			minut += 5
 			gs 'stat'
-			'You nod, confirming that you live in apartment 69. The guy looks visibly delighted and says, <font color="#1589FF">"Wonderful. I lived there before Petrovich. He tormented the whole building. By the way I''m Timothy, and you are?"</font> '
+			'You nod, confirming that you live in apartment 69. The guy looks visibly delighted and says, <font color="#1589FF">"Wonderful. I lived there before Petrovich. He tormented the whole building. By the way I''m Timofei, and you are?"</font> '
 
 			act '<<$pcs_nickname>>':
 				*clr & cla
 				gs 'stat'
-				'<font color="magenta">"My name is <<$pcs_nickname>>,"</font> you say. He nodded his head and began to get the key to open the door of the apartment 68. "Very nice. I live in the next apartment." The guy opened the door and on the threshold appeared the curious face of an elderly woman. She pointed her sharp nose at you and began to curiously look you. Timothy entered the apartment and said irritably, "Mother, stop hanging around the front door!" and closed the door.'
+				'<font color="magenta">"My name is <<$pcs_nickname>>,"</font> you say. He nodded his head and began to get the key to open the door of the apartment 68. "Very nice. I live in the next apartment." The guy opened the door and on the threshold appeared the curious face of an elderly woman. She pointed her sharp nose at you and began to curiously look you. Timofei entered the apartment and said irritably, "Mother, stop hanging around the front door!" and closed the door.'
 
 				act 'Continue':gt 'etoexhib', 'pos51'
 			end
@@ -1577,7 +1577,7 @@ if $ARGS[0] = 'pos51':
 	elseif sosedQW > 0 and hour >= 16 and sosedDay ! daystart:
 		sosedrand = rand(0, 100)
 
-		if sosedrand >= 70:'Your neighbor, <a href="exec:Gt ''Timofei''">Timothy</a>, is in the hallway. He''s smoking a cigarette, flicking the ashes into a jar.'
+		if sosedrand >= 70:'Your neighbor, <a href="exec:Gt ''Timofei''">Timofei</a>, is in the hallway. He''s smoking a cigarette, flicking the ashes into a jar.'
 	end
 
 	act 'Leave the building':

+ 1 - 1
locations/exercise.qsrc

@@ -656,7 +656,7 @@ if $ARGS[0] = 'get_sport_clothes_exercise_bonus':
 	if $clothingworntype = 'exercise':
 		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
 	end
-	if $shoeworntype = 'trainers':
+	if $shoeworntype = 'danilovich':
 		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
 	end
 end

+ 1 - 1
locations/fame.qsrc

@@ -184,7 +184,7 @@ else
         $gnikname = 'whore'
     elseif pav_slut < 300 :
         $gnikname = 'town bicycle'
-    else :
+    else
         $gnikname = 'cum dumpster'
 	end
 end

+ 284 - 42
locations/femcyc.qsrc

@@ -1,22 +1,251 @@
 # femcyc
 
-!! important values for pillcon
-!!at 7000 pillcon sveta will begin slowing down the build up of hormone to release eggs - see cyc1
-!!at 20000 pillcon sveta will very rarely even build up hormone to release eggs but its random so it can still happen anyways - see cyc1 and cyc2
-!!at 26000 pillcon sveta only has a 1/400 chance of even releasing an egg at all even if she does build up enough hormone - see cyc2
-!!at 38000 pillcon sveta no longer has periods at all and cannot get pregnant anymore -- see cyc3
+!!
+!!	THIS IS A CORE FILE TO GAME MECHANICS. Please edit CAREFULLY, and leave as many comments as possible!!
+!!
+!!------------------------------------------------------------------------------------------------------------
+!!	femcyc documentation
+!!------------------------------------------------------------------------------------------------------------
+!!
+!!	The femcyc functions try to reproduce a realistic mentruation cycle as well as the proper
+!!	pregnancy of Sveta and the mostly realistic semen absorption/decay cycle.
+!!	The below will explain every variable in use as well as every function and the general construct.
+!!	The femcyc is a highly complex and confusing collection of calculations. So if you do not understand
+!!	it, it is best to leave it alone.
+!!
+!!------------------------------------------------------------------------------------------------------------
+!!
+!!	$ChildFath : array for names of the childs biological father
+!!	$ChildFathDNA : array for the DNA of the childs father
+!!	$ChildThFath : array for the names of the childs believed father (can be different from the biological father)
+!!	$childtype : child type. single child, fraternal twin, identical twin ...
+!!	$cumfthname : the name of the father if sveta is sure
+!!	$cycreport_txt : Text for the current menstruation cycle. e.g. In labour.
+!!	$d_cycreport_update : Dynamic variable to update cycle report
+!!	$d_pregmovement : Dynamic variable for kid movement
+!!	$kid_dna : DNA of the baby/kid
+!!	$kidname : Name of the baby/kid
+!!	$npc_dna : npc DNA
+!!	$pcs_dna : Svetas DNA
+!!	$wombDNA : sperm in womb potent enough to cause pregnancy
+!!	$wombName : the name of the NPC
+!!	$wombpotfath : the name of the potential father, if sveta is not sure
+!!	arrmodtmp : temp array used in pregnancy progression
+!!	babyembryo : used during implant phase. if the fertegg successfully nests, babyembryo is +1. BabyEmbryo is for how many unborn babies are inside Sveta.
+!!	Babyptype : pregnancy type of unborn babies. they might be unimplanted 0, healthy 1, or Ectopic 2.
+!!	broodcurse : some modifier for fertility - brood curse
+!!	can_idx : candidate index - the index for the possible father
+!!	can_sz : has array size of cumarrnam[], used to check if there is cum in the womb.
+!!	cfl_ct : cum father lotto counter. used in a loop
+!!	cfl_idx : cum father lotto index. used as index for arrays.
+!!	cfl_sz : cum father lotto size. used for the size of the array
+!!	cfw_idx : used for the sperm lotto. Index for the father
+!!	cfw_sz : used for the sperm lotto. amount of semen in womb
+!!	ChildConType : Contraceptives used during conception. e.g. condom slipped off or sveta was on a pill.
+!!	ctemp : temporay array for cum ammount
+!!	cum_total : how many amounts of cum are in svetas womb
+!!	cumarr_idx : cum array index, used to identify how much cum is stored in the cum arrays
+!!	cumarrtemp : another temp var for cum arrays
+!!	cumcondslip : Introduced in Cum_Manage.qsrc. Did the condom slip off?
+!!	cumcondslip_aware : is Sveta aware it slipped?
+!!	cumfatherDNA[] : used to figure out the DNA of the father in the sperm lotto
+!!	cumfathlotto[] : used to figure out the name of the father in the sperm lotto
+!!	cumpdrop : used for calculation of drop in cum current potential
+!!	cumsumass : sum of cum on ass
+!!	cumsumbod : sum of cum on body
+!!	cumsumvag : sum of cum on vagina
+!!	cumtime[] : array to store how many times someone came in Sveta. More cumtime means more possibility to be the father.
+!!	cyccustom : custom cycle flag variable. Either 0 or 1. Activates custom cycle reports during pregnancy.
+!!	cycle : current state of svetas cycle, can be 0 to 5. 0 to 4 are usual mentruation cycles including fertilization. 5 is for the status 'pregnant'.
+!!	daykid : Birthday of the baby/kid
+!!	daylastperiod : daylastperiod is for Svetas knowledge on when she began her last period
+!!	egg_idx : egg index. There could be more than one egg in Svetas womb, so the eggs have an index
+!!	egg_sz : var to store amount of unfertilized eggs
+!!	EggRH : The egg release counter. The level of egg release that Sveta has for her ovulation event. 150 generates a single egg, higher amounts might release more.
+!!	eyeskid : Eye color of the child
+!!	fert_thresh : the threshold of an egg to be fertilized. Modified by being on contraceptives and negative factors.
+!!	FertEgg : How many unimplanted eggs Sveta has in her. These are possible babies, but they die 330 hours after ovulation if they do not implant.
+!!	ferteggage : fertile egg age. used to check age of the egg (in hours). Time since the ovulation event. They last 330 and die if not implanted.
+!!	firstmens : The first day that Sveta bled during her last cycle. this is different than daylastperiod because this is the actual date, while daylastperiod is when Svetlana remembers it being.
+!!	FocH : FocH is for how many hours of Foccular cycle Sveta has gone through in her current fertility cycle. Focular starts at the end of her Luteal and contains the bleeding period in Svetkas cycle.
+!!	FocH_Max : maximum Follicular time (in hours)
+!!	hairkid : Hair color of the child
+!!	imp_rand : randomizer variable used during egg implantation phase
+!!	implant_day : day the egg was implanted
+!!	implant_hour : hour the egg was implanted
+!!	implant_idx : implant index used for array indexing, used in implantation phase
+!!	implant_sz : implant array size, used in implantation phase
+!!	isprok : used for menstruation bleeding flagging. can be 0 or 1.
+!!	kid : Kid counter variable
+!!	kidage : Age of the baby/child
+!!	knowpregloss : knowpregloss is for Svetas knowledge that she lost a baby. 1 is for an abortion, 2 is for a miscarrage. 
+!!	knowpregrecover : knowpregrecover is for Svetas knowledge that she just gave birth.
+!!	lactation[] : The lactation array. More on that in lact_lib
+!!	lastmens : timestamp of last menstruation. The last day that Sveta bled during her last cycle.
+!!	lastovulation : used to store the last ovulation date
+!!	lotto_idx : lotto index. Used to randomly pick a sperm.
+!!	LutH : How many hours of Luteal cycle Sveta has gone through in her current fertility cycle.
+!!	LutH_Max : maximum Luteal time (in hours)
+!!	menoage : The age Svetas will be when she goes through menopause.
+!!	mesec : variable for menstruation. How many hours of bleeding Sveta has left in her current fertility cycle.
+!!	monthkid : birth month of the kid
+!!	nextbaby : index for babies.
+!!	Ovulate : Ovulate is the amount of hours remaining in Svetas ovulation period of her current fertility cycle. 
+!!	pillcon : variable for contraceptive pills to prevent pregnancy. More on that below.
+!!	polkid : Sex of the baby/kid. 0 = female, 1 = male
+!!	preg : Pregnancy flag. 0 = not pregnant, 1 = pregnant, 2 = delivery
+!!	PregChem : Progress of the pregnancy in hours.
+!!	pregminut : total minutes + 1440 minutes. The time Sveta has from the first uterine contraction to labour. Usually Sveta dies during labour if this time is surpassed.
+!!	pregspeedcheat : Cheat variable for faster pregnancies.
+!!	rcntorgzm : determine wether Sveta had an orgasm withhin the last hour or not (1 or 0)
+!!	rcntorgzmtmp : temp variable to rewrite to rcntorgzm
+!!	RecovH : Recovery counter in hours. RecovH is the amount of recover hours before Svetas fertility cycle resets after having a baby.
+!!	rej_idx : egg rejection array index. used during luteal phase to loop through any eggs not implanted.
+!!	rej_sz : egg rejection array size. used during luteal phase to loop through any eggs not implanted.
+!!	sexnutrition : succubus sex nutrition
+!!	sparrtmpv : temp var for spatter arrays for temporary array index tracking
+!!	sterileov : sterile ovulation. used for negative effects on ovulation.
+!!	steriletu : sterilized through tubal ligation procedure. Usually smaller than 0 when sterile.
+!!	sterilewb : sterile womb. Womb damage. Used for negative impact in the womb.
+!!	sucabscum : was cum absorbed by succubus? (1 or 0)
+!!	succublvl : succubus level (obviously)
+!!	succubusflag : used for succubus story arc. If Sveta is a succubus, the sperm will be absorbed
+!!	succubxp : succubus experience
+!!	succycletmp : succubus cycle temp var. Used during sperm absorption function.
+!!	tempbabyi : temp var for baby variable removal.
+!!	tempovbonus : temp var for ovulation bonus. Fertility bonus.
+!!	temprand : used as temp var for randomizer
+!!	tempwbbonus : temp variable for womb bonus during egg implant function
+!!	totminut : total minutes variable, used by various functions
+!!	UnfertEgg : UnfertEgg is how many unfertilized eggs Sveta has in her for fertilization during her Ovulation period. Unfertilized eggs are removed at the end of her Ovulation period.
+!!	wombAmount : how potent is the sperm of a guy
+!!	x : used as temp for a loop
+!!	y : used as temp for a loop
+!!	yearkid : Birth year of the baby/kid
+!!	z : used as temp for a loop
+!!
+!!	Cum Array indices (taken from Cum_Manage.qsrc):
+!!
+!!	cumarrnam : Sperm Owner
+!!	cumarrppt : Sperm Potential Potency (max sperm delivery)
+!!	cumarrcpt : Sperm Current Potency	(current amount of sperm)
+!!	cumarrdel : Sperm "Delivery" (method of *VAGINAL ONLY* acquisition)
+!!	cumarrcon :	Contraception typ used
+!!	cumarrage : Sperm age in hours
+!!	cumarrkno : Did you know/realize who did it?
+!!	cumarrcnt : Unique identifier of the exact which time the MC has had this sperm incident occur.
+!!
+!!	Spatter Array indices (taken from Cum_Manage.qsrc):
+!!
+!!	sparrloc : Location of the sperm, as per cumarrdel
+!!	sparrnam : Spatter Owner
+!!	sparrppt : Spatter Potential Potency (Used to increase potency if you don't clean yourself out)
+!!	sparridt : Did you know/realize who did it?
+!!	sparrvol : Volume of the spatter. 40 is average.
+!!	sparrslc : Spread status of the spatter. High volume can spread the contaminant from it's starting place.
+!!	sparrcnt : Unique identifier of the exact which time the MC has had this spatter incident occur.
+!!
+!!	Values of 'cumarrdel' as defined by the cum_arr (taken from Cum_Manage.qsrc):
+!!
+!!	cumarrdel = 0 : 'Vaginal intercourse'
+!!	cumarrdel = 1 : 'From spatter on labia'
+!!	cumarrdel = 2 : 'From the anal area'
+!!	cumarrdel = 3 : 'From sperm on clothing'
+!!	cumarrdel = 4 : 'From sperm on fingers'
+!!	cumarrdel = 5 : 'From sperm on wipes'
+!!	cumarrdel = 6 : 'Unknown'
+!!
+!!	Values of 'cumarrcon' as defined by the cum_arr (taken from Cum_Manage.qsrc):
+!!
+!!	cumarrcon = 0: 'No contraception used'
+!!	cumarrcon = 1: 'You lied about being on the pill'
+!!	cumarrcon = 2: 'You were on the pill'
+!!	cumarrcon = 3: 'You used a condom'
+!!	cumarrcon = 4: 'The condom broke'
+!!	cumarrcon = 5: 'The condom slipped off inside you'
+!!	cumarrcon = 6: 'The condom was sabotaged by someone else'
+!!	cumarrcon = 7: 'You sabotaged the condom'
+!!	cumarrcon = 8: 'Precum had sperm in it'
+!!	cumarrcon = 9: 'You believe are sterile'
+!!
+!!	Values of 'cumarrkno' as defined by the cum_arr (taken from Cum_Manage.qsrc):
+!!
+!!	cumarrkno = -2 : 'You were unaware there was sperm in you'
+!!	cumarrkno = -1 : 'You do not think that any sperm has gotten into you'
+!!	cumarrkno =  0 : 'You know somebody got sperm in you, but you don''t know that person'
+!!	cumarrkno =  1 : 'You know who got sperm in you'
+!!
+!!	Setting for no STD checks
+!!
+!!	cumnostd = 1 : No risk of STD, resets at end of file so must be used for all related cum_management calls
+!!
+!!	0 = 'In your Vagina'
+!!	1 = 'On your labia'
+!!	2 = 'On your panties over your vagina'
+!!	3 = 'In your anus'
+!!	4 = 'On your butt'
+!!	5 = 'On your panties over your butt'
+!!	6 = 'On your clothes in your groin area'
+!!	7 = 'On your clothes'
+!!	8 = 'On your back'
+!!	9 = 'On your legs'
+!!	10 = 'On your arms'
+!!	11 = 'On your face'
+!!	12 = 'Inside your mouth'
+!!	13 = 'On your hands'
+!!	14 = 'On your stomach'
+!!	15 = 'On your breasts'
+!!	16 = 'In your hair'
+!!	17 = 'In a condom in your vagina'
+!!------------------------------------------------------------------------------------------------------------
+!!	important values for pillcon
+!!------------------------------------------------------------------------------------------------------------
+!!	at 7000 pillcon sveta will begin slowing down the build up of hormone to release eggs - see cyc1
+!!	at 20000 pillcon sveta will very rarely even build up hormone to release eggs but its random so it can still happen anyways - see cyc1 and cyc2
+!!	at 26000 pillcon sveta only has a 1/400 chance of even releasing an egg at all even if she does build up enough hormone - see cyc2
+!!	at 38000 pillcon sveta no longer has periods at all and cannot get pregnant anymore -- see cyc3
+!!------------------------------------------------------------------------------------------------------------
+!!	Functions
+!!------------------------------------------------------------------------------------------------------------
+!!	Default :
+!!	- Hourly reduction in semen potency and semen absorption.
+!!	- Hourly call for the breastcycle, managing lactation and changes in the breasts.
+!!	- Hourly call of Svetas cycle via cycle variable.
+!!
+!!	cyc0:
+!!	- Handles actions from Menstruation to Follicular.
+!!
+!!	cyc1:
+!!	- Handles actions from Follicular to Ovulation.
+!!
+!!	cyc2:
+!!	- Handles actions for the Fertilization.
+!!
+!!	cyc3:
+!!	- handles actions from Luteal to Menstration or Pregnancy.
+!!
+!!	cyc4:
+!!	- handles actions from (post pregnancy) Recovery to Follicular..
+!!
+!!	preg:
+!!	- handles actions for the Pregnancy Progression.
+!!------------------------------------------------------------------------------------------------------------
+
+
 
 !! I have to initialize the variables somewhere, maybe in preCUST?
 if Luth_Max = 0: LutH_Max = rand(312,360) & !! 13-15 days including ovulation
 if Foch_Max = 0: FocH_Max = rand(312,360) & !! 13-15 days including menstruation
 
 if $ARGS[0] = '':
+	!!	calling the variable error handler, fixing variables here.
+	gs 'femcyc', 'femcyc_errhdl'
 	!{Hourly reduction in semen potency}
 	!{First it sets the array index to the first index, then it checks to be sure the array tracking the age is less than 144 hours. If it is 144 hours old, it kills that index, which should shift the index up. If it is less than 144 hours old, it sets a current potency drop. The drop is 2x or 3x regularly, but during ovulation it is only 1x, to represent the better environment from fertile cervical mucus.}
 	!{144 hours was selected due to that being approximately the maximum amount of time sperm is viable in the womb (120 would be more accurate, but there is leeway). PLEASE DO NOT CHANGE IT.}
 	!{The potency drop may seem small in game-time, but is meant to be a reasonable approximation to real life. Avoid unprotected sex within 5 days of ovulation if you want to mitigate your risk.}
 	!{the 'rcntorgzm' variable is set to determine whether Sveta has orgasmed within the last hour. If she has, a small potency boost for the guys she has slept with in that hour.}
-
+	
 	if rcntorgzm = 1:
 		if rcntorgzmtmp = 1: rcntorgzm = 0 & rcntorgzmtmp = 0
 		if rcntorgzmtmp = 0: rcntorgzmtmp = 1
@@ -207,7 +436,7 @@ if $ARGS[0] = '':
 		cumsumbod = ctemp[0]
 		cumsumvag = ctemp[1]
 		cumsumass = ctemp[2]
-		KILLVAR 'ctemp'
+		killvar 'ctemp'
 	end
 	!!	Breastcycle. Every breast related change with lactation happens in here.
 	if cheat_NoLactation > 0:
@@ -272,13 +501,13 @@ if $ARGS[0] = 'cyc1':
 		!! the setting of the max_time can be here although it can be changed in the future
 		LutH_Max = rand(312,360) & !! 13-15 days including ovulation
 		!{If you are ready to ovulate, it creates a chance to double ovulate. That chance is increased by your age. Then it does the same for a triple ovulation. Then it sets the ovulation tag, ovulation hour count, and begins a ticker for the life of the eggs.}
-		Temprand = rand(0,20)
-		Temprand += age/15
-		Temprand -= pillcon/1000
+		temprand = rand(0,20)
+		temprand += age/15
+		temprand -= pillcon/1000
 		if temprand > 20:
 			EggRH += 205
-			Temprand = rand(0,20)
-			Temprand += age/15
+			temprand = rand(0,20)
+			temprand += age/15
 			if temprand > 20: EggRH += 410
 		end
 		FocH = 0
@@ -295,9 +524,9 @@ end
 if $ARGS[0] = 'cyc2':
 	can_sz = arrsize('$cumarrnam')
 	if Ovulate > 0 and can_sz > 0 and UnfertEgg > 0:
-		KILLVAR 'cumtime'
-		KILLVAR 'cumfthname'
-		KILLVAR '$wombpotfath'
+		killvar 'cumtime'
+		killvar 'cumfthname'
+		killvar '$wombpotfath'
 		$cumfthname[0] = 'unknown'
 		cumtime[0] = 0
 		can_idx = 0
@@ -360,7 +589,7 @@ if $ARGS[0] = 'cyc2':
 		end
 
 !!{Create lotto of potential fathers based on each potential fathers sperm as a percentage of the total. The higher percentage of sperm from a given father, the more lotto entries he will have.}
-		KILLVAR '$cumfathlotto'
+		killvar '$cumfathlotto'
 		cfw_idx = 0
 		cfw_sz = arrsize('wombAmount')
 		:FathLottoLoop
@@ -418,7 +647,7 @@ if $ARGS[0] = 'cyc2':
 				hairkid[nextbaby] = rand(0, 3)
 				eyeskid[nextbaby] = rand(0, 3)
 				ChildConType[nextbaby] = cumarrcon[nextbaby]
-				if fertegg > 1:
+				if FertEgg > 1:
 					$childtype[nextbaby] = 'fraternal twin'
 					$childtype[nextbaby-1] = 'fraternal twin'
 				else
@@ -435,7 +664,7 @@ if $ARGS[0] = 'cyc2':
 !!{Ovulation to Luteal. It checks to see if you are on the ovulation cycle. If you are, it checks you for your pillcon. If it is high enough, no egg is released. Under high concentrations of pill chemical, ovulation ticks away quicker. Otherwise, it checks to see if your ovulation hormone is high enough, and if it is it gives you an egg and drops a good chunk down on your ovulation hormone. if its still high, it drops another egg. Then it checks your ovulation hours. If its down to 0, it starts the Luteal phase. Otherwise, it adds an hour to the egg age and reduces the ovulation window by an hour.}
 	if pillcon > 26000 and rand(0,400) ! 0: EggRH = 0
 	:OviLoop
-	If EggRH > ((UnfertEgg + FertEgg) * 150):
+	if EggRH > ((UnfertEgg + FertEgg) * 150):
 		UnfertEgg += 1
 		EggRH -= (200 * UnfertEgg)
 		jump 'OviLoop'
@@ -444,9 +673,9 @@ if $ARGS[0] = 'cyc2':
 		cycle = 3
 		UnfertEgg = 0
 	end
-	if fertegg = 1 and ferteggage < 330:
+	if FertEgg = 1 and ferteggage < 330:
 		if rand(0,(2000 - age*20)) = 0:
-			fertegg += 1
+			FertEgg += 1
 			nextbaby = arrsize('$ChildFath')
 			polkid[nextbaby] = polkid[nextbaby-1]
 			$kidname[nextbaby] = 'unborn'
@@ -476,9 +705,9 @@ end
 !{Otherwise, it adds your womb sterility factor to the imp_rand. Then it checks if your imp_rand crosses a threshold for implantation. Younger women implant easier. It then sets the next baby to the next unimplanted baby in your kid array. It registers the kid as a normal pregnancy, removes a fertilized egg and adds an embryo. Then it adds some pregnancy hormone if you arent already pregnant, and calls you officially pregnant.}
 
 if $ARGS[0] = 'cyc3':
-	if fertegg = 1 and ferteggage < 330:
+	if FertEgg = 1 and ferteggage < 330:
 		if rand(0,(2000 - age*20)) = 0:
-			fertegg += 1
+			FertEgg += 1
 			nextbaby = arrsize('$ChildFath')
 			polkid[nextbaby] = polkid[nextbaby-1]
 			$kidname[nextbaby] = 'unborn'
@@ -556,18 +785,18 @@ if $ARGS[0] = 'cyc3':
 		:lutcycloop
 		if rej_idx < rej_sz:
 			if Babyptype[rej_idx] = 0:
-				KILLVAR 'polkid',tempbabyi
-				KILLVAR '$kidname',tempbabyi
-				KILLVAR 'kidage',tempbabyi
-				KILLVAR 'daykid',tempbabyi
-				KILLVAR 'monthkid',tempbabyi
-				KILLVAR 'yearkid',tempbabyi
-				KILLVAR 'Babyptype',tempbabyi
-				KILLVAR '$ChildFath',tempbabyi
-				KILLVAR '$ChildThFath',tempbabyi
-				KILLVAR 'hairkid',tempbabyi
-				KILLVAR 'eyeskid',tempbabyi
-				KILLVAR 'cumarrcon',tempbabyi
+				killvar 'polkid',tempbabyi
+				killvar '$kidname',tempbabyi
+				killvar 'kidage',tempbabyi
+				killvar 'daykid',tempbabyi
+				killvar 'monthkid',tempbabyi
+				killvar 'yearkid',tempbabyi
+				killvar 'Babyptype',tempbabyi
+				killvar '$ChildFath',tempbabyi
+				killvar '$ChildThFath',tempbabyi
+				killvar 'hairkid',tempbabyi
+				killvar 'eyeskid',tempbabyi
+				killvar 'cumarrcon',tempbabyi
 				FertEgg -= 1
 			end
 			rej_idx += 1
@@ -577,13 +806,13 @@ if $ARGS[0] = 'cyc3':
 		if preg = 1:
 			cycle = 5
 		elseif menoage <= age:
-			KILLVAR '$wombpotfath'
+			killvar '$wombpotfath'
 			killvar '$cumfthname'
 			killvar '$cumfthusedname'
 			killvar 'cumtime'
 			cycle = 6
 		else
-			KILLVAR '$wombpotfath'
+			killvar '$wombpotfath'
 			killvar '$cumfthname'
 			killvar '$cumfthusedname'
 			killvar 'cumtime'
@@ -612,7 +841,7 @@ if $ARGS[0] = 'cyc3':
 			end
 		end
 	else
-		if preg = 1:PregChem += 1+pregspeedcheat
+		if preg = 1:PregChem += 1 + pregspeedcheat
 		if rand(0,100) < 100: LutH += 1
 	end
 end
@@ -642,7 +871,7 @@ end
 !{Pregnancy Progression. It checks to see if you are in the pregnancy phase of a cycle. If you are, it progresses your pregnancy chemical. Then it gives a fluxuation of possible due dates. If you cross the due date threshold, you enter labor, marked by preg = 2. Other milestones will also be placed in here, including body deformations. Right now this is mostly an empty placeholder.}
 
 if $ARGS[0] = 'preg':
-	if fertegg = 1 and ferteggage < 330:
+	if FertEgg = 1 and ferteggage < 330:
 		if rand(0,(2000 - age*20)) = 0:
 			babyembryo += 1
 			PregChem += rand(10,30)
@@ -670,7 +899,7 @@ if $ARGS[0] = 'preg':
 		!!	switch on lactation if not already active.
 		if lactation['active'] < 1: func('lact_lib','lact_switch')
 		$cycreport_txt = 'In labour'
-		arrmodtmp =arrsize('$ChildFath')
+		arrmodtmp = arrsize('$ChildFath')
 		arrmodtmp -= (babyembryo+1)
 		:babyfinalpreploop
 		if arrmodtmp < arrsize('$ChildFath') and daykid[arrmodtmp] = 0:
@@ -679,8 +908,8 @@ if $ARGS[0] = 'preg':
 			arrmodtmp += 1
 			jump 'babyfinalpreploop'
 		end
-		KILLVAR '$wombpotfath'
-		KILLVAR '$wombthfath'
+		killvar '$wombpotfath'
+		killvar '$wombthfath'
 		preg = 2
 		pregminut = totminut + 1440
 		if babyembryo > 1:
@@ -702,7 +931,7 @@ if $ARGS[0] = 'preg':
 		'You need to get to a clinic.'
 	end
 	if PregChem > 2203:
-		if pregchem > 2853 or kid > 0:
+		if PregChem > 2853 or kid > 0:
 			if rand(0,7) = 0: dynamic $d_pregmovement
 		else
 			if rand(0,500) = 0: dynamic $d_pregmovement
@@ -710,5 +939,18 @@ if $ARGS[0] = 'preg':
 	end
 end
 
+!!	Variable error handler for femcyc. Checking if variables are out of range and resets them.
+if $ARGS[0] = 'femcyc_errhdl':
+	if cycle < 0 or cycle > 6: cycle = 0
+	if rcntorgzmtmp < 0 or rcntorgzmtmp > 1: rcntorgzmtmp = 0
+	if rcntorgzm < 0 or rcntorgzm > 1: rcntorgzm = 0
+	if PregChem < 0: PregChem = 0
+	if preg < 0 or preg > 2: preg = 0
+	if ferteggage < 0: ferteggage = 0
+	if EggRH < 0: EggRH = 0
+	if FocH < 0: FocH = 0
+	if FertEgg < 0: FertEgg = 0
+end
+
 --- femcyc ---------------------------------
 

+ 2 - 2
locations/fit.qsrc

@@ -157,7 +157,7 @@ if $ARGS[0] = 'dressing room':
 	gs 'wardrobe', 'sports_outfit'
 
 	if abonement > 0:
-		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and pcs_stam >= 40:
+		if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
 			act 'Go to the gym':
 				cla
 				gt 'fit', 'gym'
@@ -184,7 +184,7 @@ if $ARGS[0] = 'dressing room':
 
 				act 'Leave':gt 'fit', 'dressing room'
 			end
-		elseif $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and pcs_stam >= 40:
+		elseif $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
 			act 'Go to team practice':gt 'beg', 'start'
 			if week = 6 and pcs_run >= 20 and run_comp_day ! daystart:
 				act '<b>Enter competition race</b>':run_comp_day = daystart & gt 'beg1', 'start'

+ 5 - 11
locations/food.qsrc

@@ -129,7 +129,7 @@ if $ARGS[0] = 'reuben':
 	end
 end
 
-if $ARGS[0] = 'blini':
+if $ARGS[0] = 'bliny':
 	*clr & cla
 	frost = 0
 	minut += 15
@@ -147,8 +147,8 @@ if $ARGS[0] = 'blini':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	gs 'food', 'aftermeal'
-	'<center><img <<$set_imgh>> src="images/shared/food/blini.jpg"></center>'
-	'You eat some blini. The portions are fairly small and<<$mtxt>>'
+	'<center><img <<$set_imgh>> src="images/shared/food/bliny.jpg"></center>'
+	'You eat some bliny. The portions are fairly small and<<$mtxt>>'
 	gs 'stat'
 	killvar '$_eat'
 
@@ -296,8 +296,8 @@ if $ARGS[0] = 'blifan':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	gs 'food', 'aftermeal'
-	'<center><img <<$set_imgh>> src="images/shared/food/blinifancy.jpg"></center>'
-	'You eat a petite caviar blini appetiser. The portions are fairly small and<<$mtxt>>'
+	'<center><img <<$set_imgh>> src="images/shared/food/blinyfancy.jpg"></center>'
+	'You eat a petite caviar bliny appetiser. The portions are fairly small and<<$mtxt>>'
 	gs 'stat'
 	killvar '$_eat'
 
@@ -681,12 +681,6 @@ if $ARGS[0] = 'bag_lunch':
 	'You eat the lunch you packed from home. There was nothing fancy about it and<<$mtxt>>'
 	gs 'stat'
 	killvar '$_eat'
-
-	if food_loc = 1:
-		act 'Finish': gt 'food_menu'
-	else
-		act 'Finish':gt $loc, $loc_arg
-	end
 end
 
 if $ARGS[0] = 'h_food':

+ 5 - 5
locations/food_menu.qsrc

@@ -76,7 +76,7 @@ elseif $loc = 'gkafe':
 		$_eat['0,type'] = 'pirosh'
 		$_eat['0,price'] = 'Free'
 		$_eat['1,name'] = 'Herring Blini'
-		$_eat['1,type'] = 'blini'
+		$_eat['1,type'] = 'bliny'
 		$_eat['1,price'] = 'Free'
 		$_eat['2,name'] = 'Golubtsy'
 		$_eat['2,type'] = 'golub'
@@ -111,7 +111,7 @@ elseif $loc = 'gkafe':
 		$_eat['0,type'] = 'pirosh'
 		$_eat['0,price'] = 100
 		$_eat['1,name'] = 'Herring Blini'
-		$_eat['1,type'] = 'blini'
+		$_eat['1,type'] = 'bliny'
 		$_eat['1,price'] = 190
 		$_eat['2,name'] = 'Golubtsy'
 		$_eat['2,type'] = 'golub'
@@ -185,7 +185,7 @@ elseif $loc = 'cafe_parco':
 	$_eat['0,type'] = 'pirosh'
 	$_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
-	$_eat['1,type'] = 'blini'
+	$_eat['1,type'] = 'bliny'
 	$_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'
@@ -262,7 +262,7 @@ elseif $loc = 'lakecafe':
 	$_eat['0,type'] = 'pirosh'
 	$_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
-	$_eat['1,type'] = 'blini'
+	$_eat['1,type'] = 'bliny'
 	$_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'
@@ -338,7 +338,7 @@ elseif $loc = 'ParkKafe':
 	$_eat['0,type'] = 'pirosh'
 	$_eat['0,price'] = 100
 	$_eat['1,name'] = 'Herring Blini'
-	$_eat['1,type'] = 'blini'
+	$_eat['1,type'] = 'bliny'
 	$_eat['1,price'] = 190
 	$_eat['2,name'] = 'Golubtsy'
 	$_eat['2,type'] = 'golub'

+ 9 - 4
locations/foto.qsrc

@@ -328,7 +328,7 @@ if $ARGS[0] = 'studio':
 					end
 				else
 					'"Yup, I''ve got it right here."'
-					'You hand over your fake passport and he inspects it, comparing it to something on his screen and occasionally clacking on his keyboard. You feel nervous that he might be looking for discrepancies and find out it''s fake before you realize he''s looking back and forth because he''s copying the information into the computer. Probably for employee records or something like that. Then he smirks at you, chuckling to himself as he continues to type. You pale when you realize that he knows the passport is fake. Despite this, he doesn''t make any remarks and finishes his typing.'
+					'You hand over your fake passport and he inspects it, comparing it to something on his screen and occasionally clacking on his keyboard. You feel nervous that he might be looking for discrepancies and find out it''s fake before you realize he''s looking back and forth because he''s copying the information into the computer. Probably for employee records or something like that.'
 					*nl
 					'"Alright, your info''s in the database and you''re now registered as one of our models. Head to the back to undress. When you''re ready, speak to a photographer about work. We work on freelance basis. For our lower level models, we can really only afford to pay you for two shoots a week, but you can still come in any time if you want to get some practice to work on your modelling skills. Those photos will be ours to keep and use, but it will help you to build your portfolio. If your popularity increases, we might have some special work and extra jobs for you so it''s not just twice a week."'
 					'He hands you back your fake passport, smiling.'
@@ -378,21 +378,27 @@ if $ARGS[0] = 'studio':
 			if pcs_apprnc < 80:
 				*clr & cla
 				menu_off = 1
-				'<center><b><font color="maroon">Photographer</font></b></center>'
+				'<center><b><font color="maroon">Floor Manager</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'"I''m sorry but you are going to have to work on your appearance if you want to do a shoot."'
 				act 'Leave':gt'foto','studio'
 			elseif pcs_sweat >= 20:
 				'"You''re all sweaty. Go take a shower before asking for work. And don''t forget to do your makeup after."'
 				act'Go to the showers':gt'foto','showers'
+			elseif $stat_cum_msg ! '':
+				'"Ugh, <<$pcs_lastname>>, what the hell is that?" he looks at you and the visible cum on you with disgust. "We don''t care what your sexual habits are outside of work, but we''re not shooting Japanese porn here. At least take a shower before a shoot."'
+				act'Go to the showers':gt'foto','showers'
 			elseif pcs_leghair > 3:
 				'"Go shave your legs, we''re not running a nature special on gorillas."'
 				act'Go to the showers':gt'foto','showers'
 			elseif mesec > 0 and isprok = 0:
-				'"What the hell <<$pcs_nickname>>!"'
+				'"What the hell <<$pcs_lastname>>!"'
 				'You follow his gaze to see the blood running down your legs.'
 				'"Go wash that off and switch to tampons already! There''s a dispenser in the shower room."'
 				act'Go to the showers':gt'foto','showers'
+			elseif pcs_makeup = 0:
+				'"Your makeup is smeared all over your face <<$pcs_lastname>>. Go clean up and see the makeup artists first."'
+				act'Go to the showers':gt'foto','showers'
 			else
 				if model_week = (daystart - week) / 7 and model_job_week >= 2:
 					gt 'foto', 'practicemodel'
@@ -865,7 +871,6 @@ if $ARGS[0] = 'job_offer':
 					'"No, fuck you!" you spit at him. "I''m not going to work for some manipulative ass who gets off on underage girls and leading them on. I''m done here."'
 				end
 				'You angrily pick up your clothes, getting dressed furiously and leave, stomping your way out the door.'
-				'He continues to stand there and softly chuckles to himself. "She''ll be back. They always come back."'
 				gs 'clothing', 'wear_last_worn'
 				gs 'underwear', 'wear'
 				gs 'stat'

+ 14 - 13
locations/foto_events.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'skill':
 		gt'foto_events','pool2'
 !!	elseif mdlng_skill_event = 4:
 !!		gt'foto_events','runway1'
-	elseif mdlng_skill_event = 4 and daystage > 2:
+	elseif mdlng_skill_event = 4 and daystage = 3:
 		gt'foto_events','runway2'
 	elseif mdlng_skill_event = 5:
 		gt'foto_events','wet'
@@ -965,16 +965,16 @@ if $ARGS[0] = 'special':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"Hey!" you call out to one of the studio managers. "Looking for some more work, any special jobs still available today?"'
 	act'Return to the main floor':gt'foto','studio'
-	if specialjob1 < 95 and specialjob2 < 95 and specialjob3 < 95 and specialjob4 < 95 and specialjob5 < 95 and specialjob6 < 95 and (specialjob7 < 95 and city_kickboxing >=30 and pcs_inhib >= 45) and (specialjob8 < 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8):
+	if specialjob1 > 95 or specialjob2 > 95 or specialjob3 > 95 or specialjob4 > 95 or specialjob5 > 95 or specialjob6 > 95 or (specialjob7 > 95 and city_kickboxing >=30 and pcs_inhib >= 45) or (specialjob8 > 95 and city_running >=30 and pcs_inhib >= 50 and month >= 3 and month <=8):
+		'"Sure, we have a few today. Come take a look at the list, tell me if you''re interested in doing something."'
+		act'Look at the list':gt 'foto_events','list'
+	else
 		no_job_reason = rand(1,2)
 		if no_job_reason = 1:
 			'"Sorry <<$pcs_firstname>>, we don''t have anything today. Check in again tomorrow, maybe there''ll be something for you."'
 		else
 			'"Sorry <<$pcs_firstname>>, we already assigned all the requests we had today to other girls. Got none left for you. Check in again tomorrow, maybe there''ll be something for you."'
 		end
-	else
-		'"Sure, we have a few today. Come take a look at the list, tell me if you''re interested in doing something."'
-		act'Look at the list':gt 'foto_events','list'
 	end
 end
 if $ARGS[0] = 'list':
@@ -986,14 +986,14 @@ if $ARGS[0] = 'list':
 		'You wave goodbye as you walk back to the main floor.'
 		act'Go back to the main floor':gt'foto','studio'
 	end
-	if specialjob1 >= 95:'<a href="exec:gt ''foto_events'',''high_fashion''">	High Fashion</a>'
-	if specialjob2 >= 95:'<a href="exec:gt ''foto_events'',''fine_art''">	Fine Art Project(sex)</a>'
-	if specialjob3 >= 95:'<a href="exec:gt ''foto_events'',''modern_art''">	Modern Art Project(69)</a>'
-	if specialjob4 >= 95:'<a href="exec:gt ''foto_events'',''aphrodite_advert''">	Aphrodite Advert</a>'
-	if specialjob5 >= 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
-	if specialjob6 >= 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
-	if specialjob7 >= 95 and city_kickboxing >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events'',''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_events'',''track_&_field_documentary''">   Track & Field documentary</a>'
+	if specialjob1 > 95:'<a href="exec:gt ''foto_events'',''high_fashion''">	High Fashion</a>'
+	if specialjob2 > 95:'<a href="exec:gt ''foto_events'',''fine_art''">	Fine Art Project(sex)</a>'
+	if specialjob3 > 95:'<a href="exec:gt ''foto_events'',''modern_art''">	Modern Art Project(69)</a>'
+	if specialjob4 > 95:'<a href="exec:gt ''foto_events'',''aphrodite_advert''">	Aphrodite Advert</a>'
+	if specialjob5 > 95:'<a href="exec:gt ''foto_events'',''independent_art''">	Independent Art Project</a>'
+	if specialjob6 > 95:'<a href="exec:gt ''foto_events'',''designer_wedding''">	Designer Wedding Dress</a>'
+	if specialjob7 > 95 and city_kickboxing >=30 and pcs_inhib >= 45:'<a href="exec:gt ''foto_events'',''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_events'',''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
@@ -2212,6 +2212,7 @@ if $ARGS[0] = 'wet':
 							modelfoto_nip += 1
 							modelfoto_topless += 1
 							modelfoto_nude += 1
+							if pcs_makeup > 1:pcs_makeup = 0
 							mdlng_exp += rand(9,10)
 							city_modelling += rand(18,21)
 							pav_modelling += rand(0,city_modelling)/4

+ 1 - 1
locations/foto_shoot.qsrc

@@ -789,7 +789,7 @@ if $ARGS[0] = 'nude':
 	gs 'fame', 'pav', 'modelling', rand(10,15)
 	if city_modelling > 200: gs 'fame', 'city', 'modelling', rand(5,10)
 	inhib_exp += rand(1,3)
-	if pcs_pubes <= 20:
+	if pcs_pubes < 16:
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/nude/<<rand(1,17)>>.jpg"></center>'
 		'Already naked, you step onto the set and begin the shoot immediately.'
 		*nl

+ 12 - 9
locations/gKristinaZv.qsrc

@@ -6,16 +6,19 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'After your gym class you go to the locker room with the rest of the girls. Christina theatrically moves over to you, and the eyes of all the girls in the locker room are on you now.'
 	
 	!! This handles the pictures Christina took of you at the lake. 1 = You begged her, 3 = You fought and lost
-	if christinaphotos = 1 or christinaphotos = 3:
-		if christinaphotos = 1:
-			christinaphotos = 2
-		elseif christinaphotos = 3:
-			christinaphotos = 4
+	if christinaQW['subpath'] = 2:
+		if christinaQW['submit'] = 1:
+			'She leans in close and hisses into your ear: "Time to see if you can keep your promise. Either that or every boy in school is going to see those pictures."'
+			'"B-But what about the girls here?" You ask hesitantly.'
+			'"They''ll do as I say." She says as she reaches for her phone.'
+			'You quickly lay a hand on her arm. "O-Ok," is all you can manage to get out.'
+		elseif christinaQW['fight'] = -1:
+			'"You should have kept those pictures a secret, bitch," she hisses at you under her breath. "If I were you, I would get used to this treatment, I own your ass now."'
+			'"B-But..."'
+			'Getting right in your face she says, "Want me to fuck you up again? Do as you''re told from now on, or else!"'
+			'You quickly lay a hand on her arm. "O-Ok," is all you can manage to get out.'
 		end
-		'She leans in close and hisses into your ear: "Time to see if you can keep your promise. Either that or every boy in school is going to see those pictures."'
-		'"B-But what about the girls here?" You ask hesitantly.'
-		'"They''ll do as I say." She says as she reaches for her phone.'
-		'You quickly lay a hand on her arm, "O-Ok." is all you can manage to get out.'
+		christinaQW['subpath'] = 3
 	end
 
 	if zverhumiliation < 9:

+ 5 - 5
locations/gadforest_event.qsrc

@@ -268,16 +268,16 @@ if $ARGS[0] = 'mushroom_pickers3':
 						else
 							'"Pretty well today." you answer happily, showing him your full basket.'
 							'You spend ten minutes talking about the forest and the best places to find mushrooms and berries, before getting up to continue on with your day.'
-						end if
-					end if
+						end
+					end
 					act 'Leave':gt 'gadforest','forest_outskirts'
 				end
 				gs 'stat'
 
 				act 'Leave':gt $loc, $loc_arg
-			end if
+			end
 		end
-	end if
+	end
 	gs 'stat'
 
 	act 'Leave them be':gt 'gadforest','forest_outskirts'
@@ -378,7 +378,7 @@ if $ARGS[0] = 'basket':
 		else
 			'Unfortunately your basket is already full and you cannot carry any more berries.'
 		end
-	end if
+	end
 	gs 'stat'
 
 	act 'Leave the basket alone':gt 'gadforest','forest_center'

+ 2 - 2
locations/gadroad.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = '':
 	act 'Walk down to the river (0:10)':minut += 10 & gt 'gadriver', 'start'
 	act 'Go into the woods (0:15)':minut += 15 & gt'gadforest','forest_edge'
 	act 'Go to the fields (0:10)':minut += 10 & gt'gadfield','field'
-	if $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour >= 6 and hour < 22 and gadrunday ! daystart:
+	if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour >= 6 and hour < 22 and gadrunday ! daystart:
 		act 'Go for a run (1:00)':
 			*clr & cla
 			menu_off = 1
@@ -89,7 +89,7 @@ if $ARGS[0] = '':
 
 			act 'Finish':gt'gadroad'
 		end
-	elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'trainers') and hour >= 6 and hour < 22 and gadrunday ! daystart:
+	elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'danilovich') and hour >= 6 and hour < 22 and gadrunday ! daystart:
 		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 end

+ 16 - 16
locations/gameover.qsrc

@@ -11,54 +11,54 @@ gs 'stat'
 
 if over = 1:
 	'<center><img <<$set_imgh>> src="images/system/gameover/deadgirl.jpg"></center>'
-	'You are dragged out by the morgue attendants, the pathologist noted that you died from an unknown cause. Soon your body was handed over to your parents...'
+	'You are dragged out by the morgue attendants. The pathologist notes that you died from an unknown cause. Soon, your body is handed over to your parents...'
 elseif over = 2:
 	'<center><img <<$set_imgh>> src="images/system/gameover/over.jpg"></center>'
 	if StoryLine = 0 and ntstart = 0:
-		'You went mad, and started running around town naked screaming, "I am a man!". The police were quickly alerted, and you were taken to a mental hospital. There you were put in a straitjacket then placed in a room with soft walls. You spent the rest of your days in happy delusions about your family, and being a man again. But the delusions never became reality.'
+		'You go mad and start running around town naked screaming, "I am a man!". The police are quickly alerted, and you are taken to a mental hospital. There, you are put in a straitjacket then placed in a room with soft walls. You spend the rest of your days in happy delusions about your family and being a man again, but the delusions never became reality.'
 		*nl
 		'Hint:'
-		'When your mood is low, your mind weakens and finally breaks. Don''t forget, it''s difficult for a normal man to come to terms with the fact that he is now a woman. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV, and visiting a psychotherapist.'
+		'When your mood is low, your mind weakens and finally breaks. Don''t forget, it''s difficult for a normal man to come to terms with the fact that he is now a woman. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV and visiting a psychotherapist.'
 	else
-		'You went mad, and started to run around town naked screaming, "I am THE PLAYER!". The police were quickly alerted, and you were arrested. Your mother could only send you to a mental hospital, hoping you''d recover. There you were put in a straitjacket then placed in a room with soft walls. You spent the rest of your days in happy delusions about your family. You can''t help but wonder, how different your life would have been, if you did not follow the whisper from the twisted mouse clicker?'
+		'You go mad and start to run around town naked screaming, "I am THE PLAYER!". The police are quickly alerted, and you are arrested. Your mother can only send you to a mental hospital, hoping you''ll recover. There you are put in a straitjacket then placed in a room with soft walls. You spend the rest of your days in happy delusions about your family. You can''t help but wonder how different your life would have been if you did not follow the whisper from the twisted mouse clicker?'
 		*nl
 		'Hint:'
 		'When your mood is low, your mind weakens and finally breaks. In order to keep your mood and psyche at an acceptable level, make sure you are healthy, increase it by watching TV or visiting the psychotherapist.'
 	end
 elseif over = 3:
 	'<center><img <<$set_imgh>> src="images/system/gameover/deadgirl.jpg"></center>'
-	'You have died of starvation. A stupid way to go, but apparently it''s one of the symptoms of anorexia.'
+	'You die of starvation. A stupid way to go, but apparently it''s one of the symptoms of anorexia.'
 elseif over = 4:
 	'<center><img <<$set_imgh>> src="images/system/gameover/birth.jpg"></center>'
-	'You died from complications during childbirth.'
+	'You die from complications during childbirth.'
 elseif over = 5:
 	'<center><img <<$set_imgh>> src="images/system/gameover/toilet.jpg"></center>'
-	'You tried to run, but immediately found yourself in a strange place surrounded by walls with obscene graffiti, you couldn''t move even if you tried. When suddenly, the door opened and some fat guy came in. He undid his pants and turned his back to you, his ass hovering in the air just above you. Then you realized, the witch kept her promise and turned you into a toilet at the station.'
-	'So you spent the rest of your days swallowing shit, until 50 years later, the train station is in need of repair, and you are just broken up, taken out and thrown in a landfill.'
+	'You try to run, but immediately find yourself in a strange place surrounded by walls with obscene graffiti. you couldn''t move even if you tried. Suddenly, the door opens and some fat guy comes in. He undoes his pants and turns his back to you, his ass hovering in the air just above you. Then you realize, the witch kept her promise and turned you into a toilet at the station.'
+	'So you spend the rest of your days swallowing shit, until 50 years later when the train station is in need of repair and you are just broken up, taken out and thrown in a landfill.'
 elseif over = 6:
 	'<center><img <<$set_imgh>> src="images/system/gameover/stab.jpg"></center>'
-	'You suddenly feel a sharp piercing pain in your abdomen, then another, and another. "Greetings to you, from the boys" says a shadowy figure, you look down as he moves away. You realize that you are standing in a puddle of your own blood, with multiple stab wounds in your stomach. The last thing you saw was the ground rushing towards you.'
+	'You suddenly feel a sharp piercing pain in your abdomen, then another, and another. "Greetings to you, from the boys," says a shadowy figure. You look down as he moves away. You realize that you are standing in a puddle of your own blood, with multiple stab wounds in your stomach. The last thing you see is the ground rushing towards you.'
 elseif over = 7:
 	'<center><img <<$set_imgh>> src="images/system/gameover/deadgirl.jpg"></center>'
-	'The last thing you saw was a police baton, flying at your face. You were beaten to death, and your early demise was written up as an accident. You are dragged out by the morgue attendants, the pathologist noted that you died from a blow to the head. Soon your body was handed over to your parents...'
+	'The last thing you see is a police baton flying at your face. You are beaten to death, and your early demise wi written up as an accident. You are dragged out by the morgue attendants, and the pathologist notes that you died from a blow to the head. Soon, your body is handed over to your parents...'
 elseif over = 8:
 	'<center><img <<$set_imgh>> src="images/system/gameover/crackwhore8.jpg"></center>'
-	'"At some point you question your life decisions." You are trying to understand why you made the choices you did, while your mouth is as yet another explosion of cum fills it. Without finding an answer, you swallow everything like you normally do and drift back into your drug hazed existence.'
+	'"At some point, you question your life decisions." You try to understand why you made the choices you did as yet another explosion of cum fills your mouth. Without finding an answer, you swallow everything like you normally do and drift back into your drug hazed existence.'
 elseif over = 9:
 	'<center><img <<$set_imgh>> src="images/system/gameover/overdose.jpg"></center>'
-	'Your last moments where those of bliss, your mind was so hazed by the drugs you didn''t even know you were dying. You body was found surrounded by the drugs that had ended your life.'
+	'Your last moments are those of bliss, your mind is so hazed by the drugs you don''t even know you are dying. You body is found surrounded by the drugs that ended your life.'
 elseif over = 10:
 	'<center><img <<$set_imgh>> src="images/system/gameover/over10.jpg"></center>'
-	'You fell into a quagmire while trying to find a way out of the swamp, it sucked you down deeper, and deeper. The blue sky through the tree tops is the last thing you see before marsh muck closes over you forever.'
+	'You fall into a quagmire while trying to find a way out of the swamp. It sucks you down deeper, and deeper. The blue sky through the tree tops is the last thing you see before marsh muck closes over you forever.'
 elseif over = 11:
 	'<center><img <<$set_imgh>> src="images/system/gameover/over11.jpg"></center>'
-	'Apparently you learned nothing from when your mother used to read you; the tale of Little Red Riding Hood. Otherwise you might not have gone into the forest at night alone. But you can at least be a cautionary tale the locals tell, and of course be food for the wolf.'
+	'Apparently, you learned nothing from when your mother used to read you the tale of Little Red Riding Hood. Otherwise, you might not have gone into the forest at night alone. But you can at least be a cautionary tale the locals tell, and of course be food for the wolf.'
 elseif over = 12:
 	'<center><img <<$set_imgh>> src="images/system/gameover/over12.jpg"></center>'
-	'Your body was found a few months later by some hunters, no one ever found out what happened to you.'
+	'Your body is found a few months later by some hunters. No one ever finds out what happened to you.'
 elseif over = 13:
    '<center><img <<$set_imgh>> src="images/system/gameover/fade.jpg"></center>'
-   'As the procedure continues, you feel a strange sensation. As if someone punched a hole in your spirit. You lose focus on everything around you, and it felt like you were flying into the ether. You attempt to rally your magical energies, to plug the hole, but the hole in your spirit isn''t able to be blocked by spirit energy, and you just force more of yourself out of it. You can''t run from it, it eats you up from your center, leaving no energy remaining in the part that was once you. The last b t of you f des aw y, an  wha   as y   n     g r                                .'
+   'As the procedure continues, you feel a strange sensation, as if someone punched a hole in your spirit. You lose focus on everything around you, and it feels like you are flying into the ether. You attempt to rally your magical energies to plug the hole, but the hole in your spirit isn''t able to be blocked by spirit energy, and you just force more of yourself out of it. You can''t run from it, it eats you up from your center, leaving no energy remaining in the part that was once you. The last b t of you f des aw y, an  wha   as y   n     g r                                .'
    !! {"The last bit of you fades away, and what was you no longer has the ability to care anymore." The idea being there was no soul that went to the afterlife. Total death. So not even able to bring full understanding of what happened, because you are gone. Broodmare curse abortion death.}
 end
 act 'End?':gt 'gameover', 'endscreen'

+ 36 - 14
locations/gdksport.qsrc

@@ -20,6 +20,8 @@ if $ARGS[0] = 'start':
 	'In the locker room is a <a href="exec: gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 	*nl
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	*nl
+	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and cheerleaders_on = 1: 'Albina is at cheerleading, so there is no Starlets training today.'
 
 	if kotovLoveQW > 0 and hour = 16:
 		'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'
@@ -40,7 +42,7 @@ if $ARGS[0] = 'start':
 
 	*nl
 	if $clothingworntype ! 'exercise': 'You are not dressed in sports clothes.'
-	if $shoeworntype ! 'trainers': 'You are not wearing training shoes.'
+	if $shoeworntype ! 'danilovich': 'You are not wearing training shoes.'
 
 	act 'Go outside':
 		if $clothingworntype = 'nude':
@@ -87,7 +89,7 @@ if $ARGS[0] = 'start':
 
 	*nl
 
-	if pcs_stam > 20 and $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour < 18:
+	if pcs_stam > 20 and $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour < 18:
 		if gsAboBeg > 0 and npc_pregtalk['A131'] = 0:
 			act 'Take a track lesson. You have <<gsAboBeg>> lessons remaining': gt 'gdksport', 'racing2'
 		end
@@ -121,11 +123,23 @@ if $ARGS[0] = 'start':
 				end
 			end
 		elseif AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
-			if (pregtime >= 90) or (grupTipe = 5):
-				if pregtime >= 90: act 'Train with Starlets': gt 'AlbStars', 'Starletsreact'
-				if grupTipe = 5: act 'Train with Starlets': gt 'AlbStars', 'StarletsEnd' 
+			if hour = 15 and starlets_on = 1:
+				if pregtime >= 90 or grupTipe = 5 or starlets_missed = 1:
+					if pregtime >= 90: act 'Train with Starlets': gt 'AlbStars', 'Starletsreact'
+					if grupTipe = 5: act 'Train with Starlets': gt 'AlbStars', 'StarletsEnd'
+					if starlets_missed = 1:
+						act 'Train with Starlets': 
+							starlets_missed = 0
+							starlet_practice_skipped += 1
+							gt 'AlbStars', 'StarletsPracticeMissed'
+						end
+					end
+				else
+					act 'Train with Starlets': gt 'AlbStars', 'starlets'
+				end
+				act 'Quit the Starlets' : gt 'AlbStars', 'Quit' 
 			else
-				act 'Train with Starlets': gt 'AlbStars', 'starlets'
+				act 'Train with Starlets': '<br><font color="red"> The Starlets are not training right now.</font>'
 			end
 		end
 	elseif pcs_stam <= 20:
@@ -239,7 +253,7 @@ if $ARGS[0] = 'dance2':
 	else
 		'There is nothing you can learn from this dance class with your current skill. You need to find a new teacher or travel to the city to find better dance classes if you wish to improve further.'
 
-		if AlbinaQW['StarletsJoined'] = 0 and StoryLine ! 0:
+		if AlbinaQW['StarletsJoined'] = 0 and StoryLine ! 0 and ( month < 10 or ( month = 10 and day < 18 )):
 			if alterstrtimg = 13:
 				gt 'AlbStars', 'albina3'
 			elseif grupTipe = 1 or grupTipe = 2:
@@ -591,7 +605,7 @@ if $ARGS[0] = 'shower':
 	if IvanShowerYes = 1 and rand(0,3) = 1 and ShowerIvan < 3:
 		if ShowerIvan = 1: ShowerIvan = 2
 		'You enter the women''s shower, and turning the water on, you begin to lather up your body with a washcloth. Suddenly, you hear the door creak open and you remember that you agreed not to lock it for Ivan.'
-		'You look around and see Ivan standing there looking at you. "Hello <<$pcs_nickname>>. The men''s shower is full, so I thought I would join you instead." he smiles.'
+		'You look around and see Ivan standing there looking at you. "Hello <<$pcs_nickname>>. The men''s shower is full, so I thought I would join you instead." He smiles.'
 		act 'Shower with Ivan': gt 'gdksport', 'ShowerWithIvan'
 		gs 'willpower', 'bj', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -609,15 +623,24 @@ if $ARGS[0] = 'shower':
 		else
 			act 'Not today (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-	elseif kotovVSprohorov = 1 and ShowerIvan < 3:
-		kotovVSprohorov = 2
+	!! We only set IvanShowerQW = 1 if the player showers with Ivan because the scene that uses this
+	!! variable where the player talks to Ivan about the shower at school assumes the player did
+	!! not run away or kick out Ivan before anything happened. This scene was initially a one-off,
+	!! but was changed to make it repeatable because showering with Ivan here is non-obviously an
+	!! intermediate step in becoming a starter on the volleyball team. If avoiding needing this
+	!! scene to be repeatable is desired, someone with a better sense of Ivan as a character than
+	!! me could add a version of the followup scene at school for when the player doesn''t shower
+	!! with Ivan using IvanShowerQW = 2 at some point. If this is done, this scene can be made
+	!! non-repeatable by removing the (IvanShowerQW = 2 and rand(0,3) = 1) part
+	elseif (kotovVSprohorov = 1 or (IvanShowerQW = 2 and rand(0,3) = 1)) and ShowerIvan < 3:
 		'You enter the women''s shower and turning the water on, begin to lather your body with a washcloth. Suddenly, you hear the door creak open and you remember that you forgot to lock it.'
-		'You look around and see Ivan standing in the doorway looking at you. "Hi <<$pcs_nickname>>. Can I join you? The men''s shower is full." he smiles.'
+		'You look around and see Ivan standing in the doorway looking at you. "Hi <<$pcs_nickname>>. Can I join you? The men''s shower is full' + iif(IvanShowerQW = 2, ' again', '') + '." He smiles.'
+		kotovVSprohorov = 2
+		IvanShowerQW = 2
 		gs 'willpower', 'bj', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Throw Ivan out (<<will_cost>> Willpower)':
 				*clr & cla
-				IvanShowerQW = 1
 				gs 'willpower', 'bj', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
@@ -640,7 +663,6 @@ if $ARGS[0] = 'shower':
 			if will_cost <= pcs_willpwr:
 				act 'Escape from the shower (<<will_cost>> Willpower)':
 					*clr & cla
-					IvanShowerQW = 1
 					gs 'willpower', 'bj', 'resist', 'hard'
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
@@ -652,6 +674,7 @@ if $ARGS[0] = 'shower':
 				act 'Escape from the shower (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Wash together':
+				IvanShowerQW = 1
 				IvanShowerYes = 0
 				if ShowerIvan = 0: ShowerIvan = 1
 				gt 'gdksport', 'ShowerWithIvan'
@@ -736,7 +759,6 @@ if $ARGS[0] = 'ShowerWithIvan':
 				else
 					act 'Turn around and bend over':
 						*clr & cla
-						IvanShowerQW = 1
 						lubonus = 2
 						spafinloc = 3
 						gs 'Cum_Manage'

+ 4 - 5
locations/glake.qsrc

@@ -59,12 +59,11 @@ if storyline = 1 and (month <= 2 or month = 12):
 	end
 end
 
-if storyline = 1 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)) and rand(0,4) = 0:
-	if week <= 5 and hour >= 15 and hour <= 20 and $clothingworntype = 'nude' and rand(0,3) = 0 and socialchg['christina_day'] ! daystart:
-		gt 'gschool_socialchg1', 'chrislina_naked'
+if StoryLine = 1 and SchoolAtestat = 0 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)) and week <= 5 and hour >= 15 and hour <= 20 and (christinaQW['dompath'] >= 6 or christinaQW['subpath'] = 1) and socialchg['tChristina_day'] ! daystart:
+	if christinaQW['subpath'] = 1:
+		'<a href="exec:gt ''gschool_socialchg1'', ''chris_sub''">Christina</a> is standing by the beach looking out over the lake, with Lina standing next to her, breathing heavily.'
 	else
-		iif(socialchg['tChristina_day'] ! daystart, '<a href="exec:gt ''gschool_socialchg1'', ''tChristina''">Christina</a>', 'Christina')+' is standing by the beach looking out over the lake. You also notice '+iif(socialchg['tLina_day'] ! daystart, '<a href="exec:gt ''gschool_socialchg1'', ''tLina''">Lina</a>', 'Lina')+' in the background standing next to her, breathing heavily.'
-		act'Walk away':gt'glake'
+		'Christina is standing by the beach looking out over the lake, with <a href="exec:gt ''gschool_socialchg1'', ''chris_dom''">Lina</a> standing next to her, breathing heavily.'
 	end
 end
 

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů