162 Commits 2451cd3de2 ... df31a0a18b

Author SHA1 Message Date
  rachels df31a0a18b fix typo and add saveupdater which I forgot add the last time 3 years ago
  rachels b2ce9e1137 change the saveupdater according to version numbering 3 years ago
  KevinSmarts 955bd3068c Merge remote-tracking branch 'Alaratt/master' 3 years ago
  KevinSmarts c48c55c1e8 Merge remote-tracking branch 'hornguy6/master' 3 years ago
  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. 3 years ago
  KevinSmarts f98b8fd46d [fixed] Variables accidentally renamed while changing clothing variable names 3 years ago
  hornguy6 79d3d5ecec [fixed] didn't have provisions for pubic styles 13 & 14 3 years ago
  hornguy6 6c2516022d [changed] text edits 3 years ago
  hornguy6 959258179a [removed] references to the aphrodite manager knowing your passport is fake 3 years ago
  hornguy6 9520e34920 [fixed] pcs_pubes requirement too long 3 years ago
  Vengeance11 2911cc799a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  Vengeance11 3fcca3fe89 Text cleaned up and edited to better suit my grand master plan. 3 years ago
  rachels 516f20c3f3 fix Name Updates 3 years ago
  rachels d213924340 rename artemEV -> artem_events 3 years ago
  rachels 67ce57a41b Revert "Removal of artemEV duplicate file. It was replaced by artem_events" 3 years ago
  rachels f161956acb remove temporary file 3 years ago
  rachels ace3ab7c3a Revert "Removal of artemEV duplicate file. It was replaced by artem_events" 3 years ago
  rachels 586337596f fix the branch error that was spotted by zablay 3 years ago
  rachels 77b63e2831 fix typo 3 years ago
  rachels bd9db17994 let it flow further 3 years ago
  KevinSmarts 0507cf3598 [fixed] Removed teh remaining cats shoe links file file 'shoes' 3 years ago
  KevinSmarts 2eb0c16675 Merge remote-tracking branch 'Arcadia/master' 3 years ago
  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 3 years ago
  Arcadia 90d077927d Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  Arcadia a3a107fa44 Merge branch 'master' of https://git.catrenelle.com/Youshou/glife 3 years ago
  Arcadia 939575e04f Removal of artemEV duplicate file. It was replaced by artem_events 3 years ago
  Arcadia 8d9ca0d243 artemdate renamed to artem_date_events 3 years ago
  Arcadia 3bd0afc81e Removal of artemEV duplicate file. It was replaced by artem_events 3 years ago
  Arcadia 92a03b280d Merge branch 'master' of https://git.catrenelle.com/Youshou/glife 3 years ago
  Arcadia af69241e3a artemdate renamed to artem_date_events 3 years ago
  Arcadia 5b78968c52 Removal of artemEV duplicate file. It was replaced by artem_events 3 years ago
  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 3 years ago
  KevinSmarts 96a21697d2 [fixed] disabled shoe purchase in Cats awaiting confirmation of removal or not. 3 years ago
  KevinSmarts 2926fad6a1 Merge remote-tracking branch 'Milky_boobs/master' 3 years ago
  KevinSmarts b1dc6d3480 Merge remote-tracking branch 'Alaratt/master' 3 years ago
  KevinSmarts 551ace1eea Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  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 3 years ago
  rachels ba7582096f rest of the rex party renaming 3 years ago
  rachels b72786f899 Fix typo 3 years ago
  rachels 9488cf7cea rename rex party files 3 years ago
  sandra_schulz a2cdc9a49b [update] removed useless if else branches from pav_pharmacy 3 years ago
  Alaratt 9f4b23cff6 [Added] Cheerleader and Julia hints aded to the journal 3 years ago
  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. 3 years ago
  Alaratt f83a810a09 [Fixed] Mostly just some text edits for Artem's father, every other sentence doesn't need to trail off like this... 3 years ago
  sandra_schulz 59c8f304c0 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  KevinSmarts c7a47e81e0 Merge remote-tracking branch 'Milky_boobs/master' 3 years ago
  sandra_schulz c238a13d04 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  sandra_schulz 5c834d65d1 [Documentation] Finished documentation on used variables in femcyc. Sorted variables from A to Z. 3 years ago
  rachels daa60d3b22 fix all the bugs 3 years ago
  KevinSmarts 05a6783a72 [fixed] Updated atrribute file links to stop errors while I work on shoe updates 3 years ago
  KevinSmarts 49cd459ab3 Merge remote-tracking branch 'Arcadia/master' 3 years ago
  KevinSmarts 1ec11eb79e [added] New attribute files for shoes and coats 3 years ago
  KevinSmarts 41d5f02d72 Merge remote-tracking branch 'Milky_boobs/master' 3 years ago
  sandra_schulz 43064e0170 [fix] additional variable fixes and killvar fixes 3 years ago
  Arcadia 9f4ed3895a artemdate renamed to artem_date_events 3 years ago
  KevinSmarts b6b5901bed Merge remote-tracking branch 'Milky_boobs/master' 3 years ago
  Arcadia 4d1cd496e1 Removal of artemEV duplicate file. It was replaced by artem_events 3 years ago
  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. 3 years ago
  KevinSmarts 8b59c571ec Merge remote-tracking branch 'origin/master' 3 years ago
  rachels 1a31703763 not so dynamic but it works 3 years ago
  Alaratt b35d2936ef [Added] Journal hints to become a starter in volleyball, with a lot of help from SpackledLanturn. 3 years ago
  KevinSmarts ca00290a09 [fixed] Use of old variable 3 years ago
  sandra_schulz 863b0f9a7a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  KevinSmarts fef4a2e307 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' 3 years ago
  Spackled Lanturn 82dad1a1b4 [text edit] typo in comment I just added 3 years ago
  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 3 years ago
  KevinSmarts 5855b1d178 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' 3 years ago
  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) 3 years ago
  Vengeance11 7c9ca283c0 Text edit missed in last commit. 3 years ago
  Vengeance11 4392aa84a8 Cleaned up school texts and made a few minor edits to Albina dialogue. 3 years ago
  KevinSmarts dee65e0ee6 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' 3 years ago
  KevinSmarts 8025d65123 Merge remote-tracking branch 'Alaratt/master' 3 years ago
  rachels bb7effa403 show shoes even if Sveta is not dressed properly 3 years ago
  Spackled Lanturn cd1d1023b2 [text edit] clean up road 3 years ago
  Spackled Lanturn bcd63eca71 Merge remote-tracking branch 'upstream/master' into minor-fixes 3 years ago
  Spackled Lanturn 0d7725194d [text edit] clean up sbReksHome 3 years ago
  rachels 997f9711f0 Move the orgasm in the proper place 3 years ago
  Spackled Lanturn 526dca232c [text edit] clean up seeporn 3 years ago
  Spackled Lanturn df64f54538 [text edit] further clean up serpent 3 years ago
  rachels 4f1b6aed35 clear unused variable 3 years ago
  rachels 3286bbe8ba do not rename array index 3 years ago
  Spackled Lanturn 8f34ecb780 [fixed] in sergeihunter, move code present in all branches of conditional to outside conditional 3 years ago
  Spackled Lanturn a25ac1a757 [text edit] clean up sergeihunter 3 years ago
  Spackled Lanturn 683c07013c [text edit] clean up serpent 3 years ago
  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 3 years ago
  Spackled Lanturn 2e15a32a4f [text edit] clean up sewing 3 years ago
  Alaratt d03c42ebf8 [text edits] cleaned up some text in the journal 3 years ago
  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 3 years ago
  Spackled Lanturn 71e0b83129 Merge remote-tracking branch 'upstream/master' into minor-fixes 3 years ago
  KevinSmarts b88d2ab32b Merge remote-tracking branch 'Arcadia/master' 3 years ago
  KevinSmarts da3c324fff Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' 3 years ago
  Arcadia ee03984edc File changed AlbFatherQW to albina_election_events 3 years ago
  KevinSmarts 42a78396fd [fixed] Added check for suitable slut fame before seeing grafiti in school toilets 3 years ago
  Arcadia a6134a8c95 Replaced all instances of psiklin with city_suburbs. 3 years ago
  Arcadia 7a88f020b3 Replaced all instances of artemEv with artem_events. 3 years ago
  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 3 years ago
  Spackled Lanturn b8f8fcb0f2 [text edit] clean up sex 3 years ago
  rachels 42e4737cc0 remove the third part of unused npc variables 3 years ago
  rachels 1e5429a940 rename a few npc variables 3 years ago
  rachels 02eddf24b7 remove the second part of unused npc variables 3 years ago
  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 3 years ago
  Spackled Lanturn c868909499 [text edit] clean up sexdvanadva 3 years ago
  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 3 years ago
  Spackled Lanturn 49537408e8 [text edit] clean up sexdvoe 3 years ago
  Spackled Lanturn c1aaf5e507 [fixed] in sexm, move action common to all branches of a conditional to outside the conditional 3 years ago
  Spackled Lanturn 10fb2b0ee4 [text edit] clean up sexm 3 years ago
  Spackled Lanturn 428cea0a11 [text edit] clean up bouling 3 years ago
  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 3 years ago
  Spackled Lanturn efc40cc423 [text edit] clean up sexorg 3 years ago
  Spackled Lanturn e4dcb9597e [text edit] clean up sexshop 3 years ago
  rachels 16794234ef put npcbreeder in the depository 3 years ago
  Spackled Lanturn 46cd25d20c [text edit] clean up shop 3 years ago
  Spackled Lanturn 78c8bd05ee [text edit] clean up shop_dolls 3 years ago
  Spackled Lanturn 45509bd720 [text edit] clean up shop_fashionista 3 years ago
  Spackled Lanturn 26e2475b4d [text edit] clean up shopdacha 3 years ago
  Spackled Lanturn 38d5e14baf [text edit] clean up shoplifting 3 years ago
  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 3 years ago
  KevinSmarts b6bcf4f069 [Fixed] it's bliny (блины) 3 years ago
  KevinSmarts df6dd4da70 [fixed] 2 instances of 'school' that should be 'gm_school' in 'wardrobe' spotted by Terlis2000 3 years ago
  KevinSmarts ad02b09194 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' 3 years ago
  rachels 92a4901deb reorganize the bedroom code 3 years ago
  rachels 2db76b0cdb put the act into the proper place (reported by Sword) 3 years ago
  Spackled Lanturn 128686cffb [text edit] clean up shulgabath 3 years ago
  Spackled Lanturn dde2cd16bd [text edit] clean up shulgahall 3 years ago
  Spackled Lanturn d198c8cbe6 [text edit] clean up shulgaskuh 3 years ago
  Spackled Lanturn 61376c8a4d [text edit] clean up sister 3 years ago
  Spackled Lanturn ab88a07cf4 Merge remote-tracking branch 'upstream/master' into minor-fixes 3 years ago
  Spackled Lanturn 7793e1cf85 [text edit] clean up sister_chat 3 years ago
  Spackled Lanturn a9ad33dc2f [text edit] clean up sister_party 3 years ago
  Spackled Lanturn 7be427e62c [text edit] clean up sisterQW 3 years ago
  Spackled Lanturn ef38565374 [fixed] simplify conditional in sitr 3 years ago
  Spackled Lanturn 9009e90eac [text edit] clean up sitr 3 years ago
  Spackled Lanturn 354befdcfc [fixed] simplify conditional in sitr2x 3 years ago
  Spackled Lanturn 30ff58b05c [text edit] clean up sitr2x 3 years ago
  Spackled Lanturn 839480941f [text edit] clean up sistersleep 3 years ago
  Spackled Lanturn 766a458d92 [text edit] clean up sistersleep 3 years ago
  rachels e7c077d49a fix formating and some ends 3 years ago
  Spackled Lanturn f1d5e32c2c [fixed] correct var check 3 years ago
  Vengeance11 6bfc5244d0 - Albina stuff 3 years ago
  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 3 years ago
  Spackled Lanturn 28be8b75ac Merge remote-tracking branch 'upstream/master' into minor-fixes 3 years ago
  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 3 years ago
  KevinSmarts 75cdb1d974 Merge remote-tracking branch 'Alaratt/master' 3 years ago
  KevinSmarts 08ad957c56 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  rachels 16c64be67b Fix selfies for android 3 years ago
  KevinSmarts cff6528884 [fixed] missing clear screen and actions in sex scene. 3 years ago
  KevinSmarts 4bf6ec4e4c [fixed] mis-matched variables after name change breaking bimbo and putting it in withdrawal. Spotted by 69in98 3 years ago
  Spackled Lanturn 4122d312d5 [fixed] cut out some duplicate code in soniadisco by merging together the shared parts of disco0 and disco01 3 years ago
  Spackled Lanturn 1f9ecbade9 [text edit] clean up soniadisco 3 years ago
  Alaratt c87580e5b1 [Fixed] Old Shit, as Kevin put it. 3 years ago
  rachels 13c84969cc fix a wrong sublocation 3 years ago
  rachels 8df8669a94 fix typo 3 years ago
  rachels f7314f1efb fix functions' calls 3 years ago
  rachels 6cf30c9c12 remove unused locations from main directory 3 years ago
  Spackled Lanturn 815ec34c9a [fixed] simplified some conditions in shulgabed to remove some duplication 3 years ago
  Spackled Lanturn 4490fec8c4 [text edit] clean up shulgabed 3 years ago
  Spackled Lanturn c29ceb466a [text edit] clean up shulgahome 3 years ago
  sandra_schulz 587eb20369 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  sandra_schulz 40e80655cd Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  sandra_schulz a095c5fce8 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  sandra_schulz eac8442022 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
  sandra_schulz 9795e4d80d Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 4 years ago
100 changed files with 5020 additions and 3337 deletions
  1. 4 0
      Name Updates.txt
  2. 3 3
      glife-notepad++
  3. 27 35
      glife.qproj
  4. 1 1
      locations/BDSM_Club.qsrc
  5. 2 2
      locations/Cheatmenu_din.qsrc
  6. 1 1
      locations/HotelHole.qsrc
  7. 20 20
      locations/HotelWork.qsrc
  8. 3 1
      locations/IvanEv.qsrc
  9. 1 1
      locations/JuliaMilHome.qsrc
  10. 2 2
      locations/LariskaGo.qsrc
  11. 11 7
      locations/LariskaHome.qsrc
  12. 0 2
      locations/LariskaStart.qsrc
  13. 0 12
      locations/NPCChanger.qsrc
  14. 1 1
      locations/NikoWhore.qsrc
  15. 1 1
      locations/VolleyTrenCentr.qsrc
  16. 7 4
      locations/Voltrener.qsrc
  17. 3 1
      locations/VoltrenerSexShower.qsrc
  18. 108 0
      locations/_attributes_bomba_coats.qsrc
  19. 114 81
      locations/_attributes_bomba_shoes.qsrc
  20. 108 0
      locations/_attributes_cats_coats.qsrc
  21. 108 0
      locations/_attributes_danilovich_coats.qsrc
  22. 66 24
      locations/_attributes_danilovich_shoes.qsrc
  23. 108 0
      locations/_attributes_dolls_coats.qsrc
  24. 79 96
      locations/_attributes_dolls_shoes.qsrc
  25. 107 0
      locations/_attributes_gm_coats.qsrc
  26. 57 144
      locations/_attributes_gm_shoes.qsrc
  27. 107 0
      locations/_attributes_moncheri_coats.qsrc
  28. 86 71
      locations/_attributes_moncheri_shoes.qsrc
  29. 1 1
      locations/_body_image.qsrc
  30. 5 5
      locations/_shoe_description.qsrc
  31. 8 8
      locations/_shoe_image.qsrc
  32. 1 1
      locations/albinaRide.qsrc
  33. 2 2
      locations/albina_election_events.qsrc
  34. 23 23
      locations/albinahome.qsrc
  35. 1 1
      locations/alexandriaEv.qsrc
  36. 1 1
      locations/arousal.qsrc
  37. 15 15
      locations/artem_date_events.qsrc
  38. 38 38
      locations/artem_events.qsrc
  39. 51 51
      locations/artemhome.qsrc
  40. 367 358
      locations/bedrPar.qsrc
  41. 37 21
      locations/bordel.qsrc
  42. 6 6
      locations/bouling.qsrc
  43. 1 2
      locations/brother.qsrc
  44. 13 22
      locations/budgetclothes.qsrc
  45. 2 2
      locations/city_park.qsrc
  46. 10 10
      locations/city_suburbs.qsrc
  47. 0 1
      locations/clothing_attributes.qsrc
  48. 3 3
      locations/din_van.qsrc
  49. 34 16
      locations/ender.qsrc
  50. 1 1
      locations/exercise.qsrc
  51. 284 42
      locations/femcyc.qsrc
  52. 2 2
      locations/fit.qsrc
  53. 5 5
      locations/food.qsrc
  54. 5 5
      locations/food_menu.qsrc
  55. 1 2
      locations/foto.qsrc
  56. 1 1
      locations/foto_shoot.qsrc
  57. 12 9
      locations/gKristinaZv.qsrc
  58. 2 2
      locations/gadroad.qsrc
  59. 17 9
      locations/gdksport.qsrc
  60. 4 5
      locations/glake.qsrc
  61. 179 185
      locations/gschool_boys_bathroom.qsrc
  62. 191 190
      locations/gschool_break.qsrc
  63. 5 5
      locations/gschool_chats.qsrc
  64. 260 143
      locations/gschool_chats1.qsrc
  65. 7 5
      locations/gschool_cheerleading.qsrc
  66. 8 4
      locations/gschool_events.qsrc
  67. 186 169
      locations/gschool_girls_bathroom.qsrc
  68. 2 2
      locations/gschool_gossip.qsrc
  69. 63 56
      locations/gschool_grounds.qsrc
  70. 1 1
      locations/gschool_lessons.qsrc
  71. 64 15
      locations/gschool_lessons1.qsrc
  72. 69 17
      locations/gschool_lessons2.qsrc
  73. 41 9
      locations/gschool_lessons3.qsrc
  74. 51 135
      locations/gschool_lessons4.qsrc
  75. 510 140
      locations/gschool_lessonsev1.qsrc
  76. 393 88
      locations/gschool_lessonsev2.qsrc
  77. 309 83
      locations/gschool_lessonsev3.qsrc
  78. 13 13
      locations/gschool_lunch.qsrc
  79. 112 112
      locations/gschool_office.qsrc
  80. 3 3
      locations/gschool_randperson.qsrc
  81. 2 2
      locations/gschool_socialchg.qsrc
  82. 141 304
      locations/gschool_socialchg1.qsrc
  83. 11 11
      locations/journal.qsrc
  84. 155 0
      locations/journal_quests.qsrc
  85. 2 4
      locations/katjaEvDin.qsrc
  86. 21 1
      locations/lact_bp.qsrc
  87. 1 1
      locations/lariska_schedule.qsrc
  88. 78 0
      locations/lariska_storyline.qsrc
  89. 2 4
      locations/lug.qsrc
  90. 3 3
      locations/metro.qsrc
  91. 5 11
      locations/moncheri.qsrc
  92. 12 3
      locations/music_delparco.qsrc
  93. 1 8
      locations/nogorslut.qsrc
  94. 8 82
      locations/npccleanc.qsrc
  95. 9 115
      locations/npcgeneratec.qsrc
  96. 4 53
      locations/npcpreservec.qsrc
  97. 7 123
      locations/npcstatic1.qsrc
  98. 2 18
      locations/npcstatic2.qsrc
  99. 0 11
      locations/npcstatic3.qsrc
  100. 1 28
      locations/npcstatic4.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

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

+ 27 - 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,6 @@
 		<Location name="food"/>
 		<Location name="beverage"/>
 		<Location name="food_menu"/>
-		<Location name="virginity_call"/>
 		<Location name="willpower"/>
 		<Location name="drugs"/>
 		<Location name="npc_relationship"/>
@@ -96,7 +92,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 +132,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 +204,6 @@
 		<Location name="npcgenext"/>
 		<Location name="npcpreservec"/>
 		<Location name="npcrnamefile"/>
-		<Location name="npcbreeder"/>
 		<Location name="npcstaticdefaults"/>
 		<Location name="npcstatic1"/>
 		<Location name="npcstatic2"/>
@@ -209,16 +212,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 +237,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 +435,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 +453,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 +720,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 +728,7 @@
 		<Location name="LariskaGo"/>
 		<Location name="LariskaHome"/>
 		<Location name="lariska_schedule"/>
+		<Location name="lariska_storyline"/>
 	</Folder>
 	<Folder name="Pets">
 		<Location name="krol"/>
@@ -836,7 +830,6 @@
 		<Location name="pirsingsalon"/>
 		<Location name="obekt"/>
 		<Location name="obekt2"/>
-		<Location name="dangeon"/>
 	</Folder>
 	<Folder name="Red Light">
 		<Location name="sexshop"/>
@@ -956,7 +949,6 @@
 		<Location name="FSstart"/>
 		<Location name="FSgame"/>
 		<Location name="FSstat"/>
-		<Location name="FSfight"/>
 		<Location name="FSroom"/>
 	</Folder>
 	<Folder name="Youth Shop">
@@ -1108,7 +1100,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"/>

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

+ 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

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

+ 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'] = 4:
 			'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'] = 5
 		else
 			'You go into the japanese styled apartment, then follow Lariska to her room.'
 		end

+ 11 - 7
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
@@ -722,8 +722,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>]':

+ 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

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

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

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

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

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

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

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

+ 2 - 2
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.
 
@@ -145,4 +145,4 @@ $din_zajava_albfather_no2 = {
 	end
 }
 
---- AlbFatherQW ---------------------------------
+--- albina_election_events ---------------------------------

+ 23 - 23
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 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. 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>, was 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.'
+					'"My mother is much younger than my father, but he charmed her with empty promises and offered to pay for her tution since she wanted to be a psychologist. While she''s struggling to juggle studying and raising their baby daughter, he''s off having some 19 year old gold digging whore suck his dick. It was his fault she left, 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.'
+					'But now that he''s going down, she''s come back to live with and look after me. She got herself a job at a hospital in the city and is helping me process everything going on in my mind. 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 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.'
 
 					act 'Your father did what?':
 						*clr & cla
@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 							'"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.'
+							'"My father 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.'
 
 							act 'Comfort her':
 								*clr & cla
@@ -84,7 +84,7 @@ if $ARGS[0] = 'start':
 								'<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.'
+								'"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:
@@ -97,9 +97,9 @@ if $ARGS[0] = 'start':
 										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.'
+										'"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, 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... thank you <<$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 before walking you to the door.'
 
 										act 'Continue':gt 'pav_residential'
 									end
@@ -153,7 +153,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
@@ -275,7 +275,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 +433,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 +448,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 +565,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'

+ 1 - 1
locations/alexandriaEv.qsrc

@@ -357,7 +357,7 @@ 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
 

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

+ 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] = '':
+	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

+ 37 - 21
locations/bordel.qsrc

@@ -53,22 +53,31 @@ if $ARGS[0] = 'brothel':
 		end
 	end
 
-	if func('bordel', 'is_open'):
-		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'
+	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
+			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
@@ -112,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
@@ -121,6 +129,7 @@ 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:
@@ -276,11 +285,18 @@ 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
 

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

+ 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
 

+ 10 - 10
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'
@@ -28,8 +28,8 @@ if $ARGS[0]='start':
 		'One of the most impressive buildings is your newly built mansion.'
 		act 'Visit your mansion': gt 'youplace'
 	end
-	act 'View the insane asylum': minut += 2 & gt 'psiklin', 'ps1'
-	act 'View the creepy old building': minut += 2 & gt 'psiklin', 'ps2'
+	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'
 
@@ -49,7 +49,7 @@ 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 ---------------------------------
 

+ 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

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

+ 34 - 16
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
-		lariskaQwestStart = daystart + 7
+		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:

+ 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

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

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

+ 1 - 2
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.'
@@ -865,7 +865,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'

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

+ 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

+ 17 - 9
locations/gdksport.qsrc

@@ -40,7 +40,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 +87,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
@@ -591,7 +591,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 +609,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 +649,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 +660,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 +745,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
 

File diff suppressed because it is too large
+ 179 - 185
locations/gschool_boys_bathroom.qsrc


File diff suppressed because it is too large
+ 191 - 190
locations/gschool_break.qsrc


+ 5 - 5
locations/gschool_chats.qsrc

@@ -191,7 +191,7 @@ if $ARGS[0] = 'cooljocks':
 			gs 'npc_relationship', 'modify', 'A13', -1
 			gs 'npc_relationship', 'modify', 'A15', -1
 			gs 'npc_relationship', 'modify', 'A17', 'dislike'
-			if zverSlutQW = 0: gs 'npc_relationship', 'modify', 'A18', 'hate'
+			if christinaQW['dompath'] < 6: gs 'npc_relationship', 'modify', 'A18', 'hate'
 			gs 'npc_relationship', 'modify', 'A19', -1
 			gs 'npc_relationship', 'modify', 'A22', 'dislike'
 			gs 'npc_relationship', 'modify', 'A23', 'dislike'
@@ -203,7 +203,7 @@ if $ARGS[0] = 'cooljocks':
 			gs 'npc_relationship', 'modify', 'A149', -1
 			gs 'npc_relationship', 'modify', 'A165', -1
 			
-			if zverSlutQW >= 2:
+			if christinaQW['dompath'] >= 6:
 				'As you approach them, you notice some of them giving you a disapproving look as Lizaveta takes your picture and then starts texting, obviously sending the picture around. Vicky is smirking a bit and then whispers something to Vanya and Katja.'
 			else
 				'As you approach them, you notice some of them giving you a disapproving look and Christina starts to laugh. "What are you wearing? Did mommy dress you? I mean we are all glad she did, the more clothes you wear that hide that hideous body the better." Lariska and Lina add their own snide remarks similar to Christina''s and several other students laugh at her comments. Lizaveta takes your picture and then starts texting, obviously sending the picture around. Vicky is smirking a bit and then whispers something to Vanya and Katja.'
@@ -229,7 +229,7 @@ if $ARGS[0] = 'cooljocks':
 				gs 'npc_relationship', 'modify', 'A139', 1
 				gs 'npc_relationship', 'modify', 'A140', 1
 				
-				if zverSlutQW >= 2:
+				if christinaQW['dompath'] >= 6:
 					'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah I like it, it looks very nice." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. Veronika is reading something and seems to be unaware of the whole conversation.'
 				else
 					'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah I like it, it looks very nice." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be unaware of the whole conversation.'
@@ -251,7 +251,7 @@ if $ARGS[0] = 'cooljocks':
 				grupvalue[2] += 1
 				if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
 				
-				if zverSlutQW >= 2:
+				if christinaQW['dompath'] >= 6:
 					'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah I like it, it looks very nice." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. Veronika is reading something and seems to be unaware of the whole conversation.'
 				else
 					'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah looking sexy <<$pcs_nickname>>." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe to you in partucular. '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be unaware of the whole conversation.'
@@ -285,7 +285,7 @@ if $ARGS[0] = 'cooljocks':
 			grupvalue[2] -= 5
 			gs 'npc_relationship', 'modify', 'A1', 'hate'
 			gs 'npc_relationship', 'modify', 'A17', 'dislike'
-			if zverSlutQW = 0: gs 'npc_relationship', 'modify', 'A18', 'hate'
+			if christinaQW['dompath'] < 6: gs 'npc_relationship', 'modify', 'A18', 'hate'
 			gs 'npc_relationship', 'modify', 'A22', 'hate'
 			if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
 			gs 'npc_relationship', 'modify', 'A139', 'dislike'

+ 260 - 143
locations/gschool_chats1.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'dimka':
 		if grupTipe = 1:
 			'"Just the person I was hoping to see!" Dimka smiles. "Take a look at this." He pulls out his phone and shows you some photos from his latest trip to Moscow. "You would have loved it out there. It really made me realize we''re wasting away out here in a place like this." You then mostly talk about the other places he has visited.'
 		else
-			'Dimka greets you with a friendly smile, making room for you in the group made up of Albina, Igor and a few other students you don''t recognize. Some of them give you an odd look, obviously not sure why you''re here since you''re not part of their clique, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague." he playfully chides everyone and soon you are engaged in a conversation with Dimka.'
+			'Dimka greets you with a friendly smile, making room for you in the group made up of Bella, Igor and a few other students you don''t recognize. Some of them give you an odd look, obviously not sure why you''re here since you''re not part of their clique, but Dimka makes you feel welcome. "Relax, she doesn''t have the plague." he playfully chides everyone and soon you are engaged in a conversation with Dimka.'
 		end
 		if dimarudorient = 1:act 'Ask for some pale lady': gt 'gschool_chats1', 'dim_drugs' 
 	elseif npc_rel['A1'] <= 20 and pav_slut < 200:
@@ -64,7 +64,7 @@ if $ARGS[0] = 'dimka':
 		'He gets a odd look on his face then shrugs. "Whatever." The two of you make a little small talk, but you get the feeling he is planning something.'
 	else 
 		npc_rel['A1'] += 1
-		'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking. "Hey, Albina!" he calls as he spots her walking by. "Sorry, I hope you don''t mind." He follows after her before you can even reply. At least he let you talk to him.'
+		'Dimka is willing to entertain you for a bit, occasionally taking part in the conversation but letting you do most of the talking. "Hey, Bella!" he calls as he spots her walking by. "Sorry, I hope you don''t mind." He follows after her before you can even reply. At least he let you talk to him.'
 		if dimarudorient = 1: act 'Ask for some pale lady': gt 'gschool_chats1', 'dim_drugs' 
 	end
 end
@@ -273,7 +273,7 @@ if $ARGS[0] = 'igor':
 			end
 		end
 	elseif pav_slut >= 200:
-		'Igor is hanging with Dimka, Stasya and Albina when you approach. The others are quick to throw some insults your way, but Igor hesitates. It isn''t until Stasya puts him on the spot for being so silent that he finally speaks up to agree with the rest of the group. "I''m surprised the gopniks are finished with her so early. Must have had another cocksleeve waiting for them, or maybe she''s just gotten too loose."'
+		'Igor is hanging with Dimka, Stasya and Bella when you approach. The others are quick to throw some insults your way, but Igor hesitates. It isn''t until Stasya puts him on the spot for being so silent that he finally speaks up to agree with the rest of the group. "I''m surprised the gopniks are finished with her so early. Must have had another cocksleeve waiting for them, or maybe she''s just gotten too loose."'
 		act 'Help with homework':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big4.jpg"></center>'
@@ -478,9 +478,10 @@ if $ARGS[0] = 'Katjaproblems':
     '"Come on Katja! It will be fun! I will pay for the popcorn!"'
     'The shy girl isn''t convinced and plays compulsively with her notebook, obviously trying to look for a way out.'
     '"Slavik... I don''t like that film. It''s just not my type and... well... I have homework to do."'
-    'Katja''s flimsy excuse and demeanor don''t convince the driven Svyatoslav, who just smiles, knowing that she will eventually agree with him. You ponder what exactly to do when Vicky steps between the two and... Huh?!'
-    '"Get lost you chiseled, sculpted hunk of a man! Don''t charm my sister into marrying you and I am forced to be an incredibly young, pretty and cool aunt!"'
-    'WTF?! That, with some variations, is the reaction all the people present are experiencing at those angrily shouted words, but is enough to break Svyatoslav''s hold and take away his confidence. The jock''s next words sound... somewhat shaken.'
+    *nl
+	'Katja''s flimsy excuse and demeanor don''t convince the driven Svyatoslav, who just smiles, knowing that she will eventually agree with him. You ponder about what to do when Vicky steps between the two of them.'
+    '"Get lost you chiseled, sculpted hunk of a man! Don''t charm my sister into marrying you so I am forced to be an incredibly young, pretty and cool aunt!"'
+    'There are various reactions from everyone present, but her words are enough to break Svyatoslav''s hold and take away his confidence. The jock''s next words sound... somewhat shaken.'
     '"Ok... Ehm... Look Katja, just think about it, ok? Just... give me a chance... Yeah... Ehm... Until later."'
     'As Svyatoslav leaves, Katja releases a long-winded sigh.'
     gs 'stat'
@@ -493,26 +494,26 @@ if $ARGS[0] = 'Katjaproblems':
         '"Come on Katja! It isn''t that bad. You didn''t do anything wrong! Relax! If you want to evade Slavik, beyond paying Vitek to break his legs, you only need to hang around other people, tell him that you have a full schedule!"'
 
 		if npc_rel['A14'] >= 30 and npc_rel['A14'] < 50:
-		    '"Thanks Vicky, but I don''t want to pester Vanya and you."'
+		    '"Thanks Vicky, but I don''t want to pester you and Vanya."'
             'Vicky looks at her for a moment, then at you. Grabbing your hand, she pushes you towards her sister.'
             '"Yeah... Right... We don''t want you around as we have "quote" innocent "unquote" fun, but... you... have... more... friends! Like <<$pcs_nickname>>! Just hang around with each other after school!"'
-            'Katja looks at you flabergasted. You don''t know if you feel offended or amused at her reaction. Well... Yeah, you aren''t exactly friends... more like acquaintances really, but you don''t dislike getting to know her a litte better.'
+            'Katja looks at you flabergasted. You don''t know if you feel offended or amused at her reaction. You aren''t exactly friends, but you don''t dislike the idea of getting to know her a litte better.'
             '"Yeah Katja! If I have the time, we can hang around after school."'
             '"Um... Thanks <<$pcs_nickname>>."'
             'After this little scene, you chat with the twins until it is time to return to class.'
 		elseif npc_rel['A14'] >= 50 and npc_rel['A14'] < 80:
-		    'Katja rest deflated against the lockers, her troubled eyes looking at you sideways.'
+		    'Katja rests deflated against the lockers, her troubled eyes looking at you sideways.'
             '"Vicky... <<$pcs_nickname>>... Sorry, I just don''t want to trouble anybody."'
             'Katja bites her lips and looks at Vicky, who tilts her red-maned head and a silent dialogue surges between the two... Then, the Xenomorphs turn towards you, showing their teeth.'
             '"You know <<$pcs_nickname>>... I have my hands more or less full with Vanya. So... I was thinking... Can you protect my sister''s chastity?"'
-            'The twins proceed to give you puppy eyes... Of course by this point, any answer beyond "Of course Katja! Whatever you want Katja! Whenever you want Katja! We can hang around after school Katja!" is socially suicidal with all the class looking at their cute display... Damm... The shit these girls make you do...'
+            'The twins proceed to give you puppy eyes. At this point, any answer beyond "Of course Katja! Whatever you want Katja! Whenever you want Katja! We can hang around after school Katja!" is socially suicidal with everyone looking at their cute display. Damm, the shit these girls make you do...'
             'After this little scene, you chat with the twins until it is time to return to class.'
 		else 
 		    'Katja rests against the lockers, pondering her sister''s words, then smiles and turns happily towards you and grabs your hands.'    
             '"<<$pcs_nickname>> please! You must help me! Can we hang around after school?"'        
             'She looks at you with puppy eyes, full of hope... looking breathtakingly cute... Yeah... Only Christina would say "no" to the redhead, so you answer with a happy "Yes! Of course Katja!" that prompts her to hug you.'
             '"Hey that is unjust Katja! We are sisters! I also want a hug!"'
-            'Vicky joins the (now)group embrace and you can think about how all the guys in the hall (and some girls) are going to masturbate furiously tonight thanks to this embarrassing event.'
+            'Vicky joins the (now)group embrace and all you can think about how all the guys in the hall (and maybe some girls) are going to masturbate furiously tonight thanks to this embarrassing event.'
             'After this little scene, you chat with the twins until it is time to return to class.'												
 		end
 		npc_rel['A14'] += 1
@@ -544,27 +545,27 @@ if $ARGS[0] = 'albina':
 		if AlbinaQW['Friends'] = 2:
 		    'You have a pleasant conversation with Albina where you both talk about almost anything, but you are careful not to bring up the Starlets or anything else that might upset her. The conversation ends with Albina embracing you in a tight and extended hug.'
 		elseif grupTipe = 2:
-			'Albina has a somewhat friendly, yet awkward conversation with you. You both talk about your shared interests, but when you bring up family life she fiercely avoids the subject, eventually outright refusing to speak with you anymore and storming off.'
+			'Albina has a somewhat friendly, yet awkward conversation with you. You both talk about your shared interests, but when you bring up family life she fiercely avoids the subject, eventually refusing to speak with you anymore and storming off.'
 		else
 			'Albina spends a lot of the conversation with her arms crossed and makes no effort to hide her boredom. She doesn''t dislike you, but you think she''s just tolerating your presence and humouring you with conversation.'
 		end
 	elseif npc_rel['A23'] <= 20 and pav_slut < 200:	
 		npc_rel['A23'] += 1
-		if grupTipe = 2:
-			'"Hey Albina, how are things going?" you ask her with a smile.'
+		if grupTipe = 1 or grupTipe = 2:
+			'"Hey Albina, how are things?" you ask her with a smile.'
 			'Albina just rolls her eyes. "Like you actually care." she says before shoving you aside and walking away. You swear you hear her calling you a ''fake bitch'' under her breath.'
 		else
-			'"Hey Albina, how are things going?" you ask her with a smile.'
-			'"Is this some kind of joke?" Albina growls. She grabs you, shoves you against one of the lockers and glares at you. "Who put you up to this!?" she snarls. The rest of the group watch, stunned by her outburst.'
+			'"Hey Albina, how are things?" you ask her with a smile.'
+			'"Is this some kind of fucking joke?" she growls before she grabs you, shoves you against one of the lockers and glares at you. "Who put you up to this!?" she snarls. The rest of the group watch, stunned by her outburst.'
 			'"No... Nobody? I just wanted to talk..." you sheepishly reply, but her tightening grip on you and her angry demeanor tell you that she doesn''t believe you. You try buttering her up with compliments, but she isn''t interested in your grovelling. She gets up in your face and tells you to stay away from her before releasing you and storming off, the others being smart enough not to follow her.' 
 		end
-	elseif pav_slut >= 200:
+	elseif pav_slut >= 150:
 		'Albina just stares at you in disbelief. "There''s some <i>nasty</i> rumors about you going around school. Everyone is saying you''re a cock hungry whore! How can you live with that - just letting guys... use you like that?"'
 		'You are about to speak up, but she shakes her head and walks away. You can''t tell if she was feeling disgusted or disappointed at you. She might even have been both.'
 	else 
 		npc_rel['A23'] += 1
 		'Your conversation, if you can call it that, with Albina is shallow and is over after only a minute or two as she excuses herself.'
-		'"You know my... father... cares... a lot...", she stops herself from laughing before walking away. You''re certain that you hear her holding back tears as she does, but you don''t want to push it and anger her.'
+		'"You know my... father... cares... a lot..." She stops herself from laughing before walking away. You''re certain that you hear her holding back tears as she does, but you don''t want to push it and anger her.'
 		'She outright refuses to speak about her home life, her father in particular, and more than a few people have been on the receiving end of her wrath when they press her about the subject.'
 	end
 	
@@ -596,7 +597,7 @@ if $ARGS[0] = 'lizaveta':
 			'The conversation is stale and lifeless as Lizaveta taps away at her phone while you talk, only managing an occasion "Yeah..." or "Uh-huh..."'
 		end		
 	elseif pav_slut >= 200:
-		'"The current rumor is that you''ve ridden well over 100 dicks!" Lizaveta exclaims with a cruel laugh. "There''s even a bet that you''ll have sucked or fucked 1,000 dicks by the end of the year. Wanna know if I''m betting against or for you?" she taunts before dismissing it as a joke, but you''re not sure if she''s telling the truth...'
+		'"The current rumor is that you''ve ridden well over 100 dicks!" Lizaveta exclaims with a cruel laugh. "There''s even a bet that you''ll have sucked or fucked 1,000 dicks by the end of the year. Want to know if I''m betting against or for you?" she taunts before dismissing it as a joke, but you''re not sure if she''s telling the truth...'
 	else 
 		npc_rel['A140'] += 1
 		'You spend some time talking with Lizaveta, and for a while you manage to avoid talking about anything gossipy, but considering she''s the queen of it, eventually it devolves into some "He said, she said."'
@@ -1064,57 +1065,101 @@ if $ARGS[0] = 'christina':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big18.jpg"></center>' 
-	if zverRageQW = 10:
-		'As you pass by Christina, she looks at you triumphantly. "Don''t forget my little slave! Showers after the gym class..."'
-		'Before you''re able to respond, she turns around and walks away...'
-	elseif lariskaQwestStart > 0 and zverSlutQW ! 0:
-		'As you walk up to Christina, you smirk and say "Better have your plug in and no panties, buttslut, or things won''t go well for you."'
-		'Before she''s able to respond, you grab her arm, force her to bend over, and flip up her skirt. Finding her buttplug in place, and no panties, you let her go and walk away.'
-	elseif kristinaSex > 0 and fizrukSex > 0:
-		npc_rel['A18'] += 1
-		'As soon as you approach Christina, she pushes you around. "Listen here <<$pcs_nickname>>! If you tell anyone what you saw... I swear... I will..."'
-		'Looking at her, you teasingly answer. "What? I have no idea what you''re talking about... I haven''t seen anything." you finish with a slight wink.'
-		'Once again, Christina pushes you and sighs. "Don''t push it <<$pcs_nickname>>. Consider this a warning."'
-	elseif kristinaSex = 0 and swinbeggor > 0:
-		if npc_rel['A18'] > 20: npc_rel['A18'] -= 10
-		'Christina looks at you full of hate: "I can''t believe you were faster than me... bitch!"'
-	elseif npc_rel['A18'] >= 50 and pav_slut < 200:
-		npc_rel['A18'] += 1
-		if grupTipe = 2:
-			'"Hi <<$pcs_nickname>>! Do you want to work out together since, you know, you''re the only one that is on the same level as me?" she confidently asks.'
-			'"I don''t know if I could keep up with you." you jokingly reply.'
-			'Christina lets out a loud laugh. "Well you know where to find me if you ever want to work out."'
-			'You give her a nod and say your goodbyes.'
+	if christinaQW['subpath'] >= 2 or christinaQW['dompath'] >= 2:
+		if christinaQW['subpath'] >= 3:
+			npc_rel['A18'] += 1
+			'As you pass by Christina, she looks at you triumphantly. "Don''t forget my little slave! Showers after the gym class..."'
+			'Before you''re able to respond, she turns around and walks away...'
+		elseif christinaQW['subpath'] = 2:
+			'"Looking forward to after P.E. class," Christina says with a wicked smile.'
+			'"W-Why? What happens after class?"'
+			'"Oh, I don''t want to ruin the suprise, pet." Throwing one last smirk in your direction, she heads off to her next class.'
+		elseif christinaQW['dompath'] = 2:
+			if npc_rel['A18'] > 20: npc_rel['A18'] -= 10
+			if LariskaQW['story'] = 3:
+				LariskaQW['story'] = 4
+				christinaQW['dompath'] = 3
+				'Going up to Christina, you quietly say "I need to talk to you about something, Christina."'
+				'"What do you want, <<$pcs_nickname>>, I''m busy," she says, not even looking at you.'
+				'Taking a deep breath, you say "Lariska. I want Lariska."'
+				'Suprised, she finally looks at you. "No, <<$pcs_nickname>>. She''s mine, and I don''t want you filling her head with nonsense."'
+				'"Well, the thing is you don''t really have a choice. Not a good one anyway." Pulling out your phone and checking to make sure nobody is looking, you show her a picture of her blowing the coach.'
+				'Her face turns bright red with anger, and she hisses at you, "You fucking bitch. How did you get that?! If you show anybody..."'
+				'"I wont...if you tell Lariska it''s ok to hang out with me outside of school. I mean, I would hate to see these pictures fall into Lizaveta''s hands..."'
+				'Her face turns even more red, if that were possible. "Fine," she spits out. "But I swear, if I ever even hear about these pictures again, I will fucking break you into tiny pieces!"'
+				'"Oh, you wont, as long as you keep your word," you say with a fake smile that doesn''t quite reach your eyes. "Now do be a dear and let her know she is free to do whatever she wants outside of school, will you?'
+				'"Oh, and if you try and punish her for this, I will know," the threat clear on your face. Turning on your heels, you head off to your next class, smiling.'
+			else
+				christinaQW['dompath'] = 3
+				'Going up to Christina, you quietly say "I need to talk to you about something, Christina."'
+				'"What do you want, <<$pcs_nickname>>, I''m busy," she says, not even looking at you.'
+				'"Oh, I just wanted you to know I have something you should see." Pulling out your phone and checking to make sure nobody is looking, you show her a picture of her blowing the coach.'
+				'Her face turns bright red with anger, and she hisses at you, "You fucking bitch. How did you get that?! If you show anybody..."'
+				'"It would be a real shame if Lisaveta got her hands on these..." you say menacingly.'
+				'Glaring at you, her hands balled into fists, she says quietly "What the fuck do you want from me, bitch?"'
+				'"Oh, I haven''t decided yet. When I do, I''ll let you know. I''m sure whatever I decide I want, you''ll give it to me without a fuss."'
+				'Her face turns even more red, if that were possible. "Fine," she spits out. "But I swear, if I ever even hear about these pictures again, I will fucking break you into tiny pieces!"'
+				'"Oh, you wont, as long as you keep your word," you say with a fake smile that doesn''t quite reach your eyes." Turning on your heels, you head off to your next class, smiling.'
+			end
+		elseif christinaQW['dompath'] = 3:
+			npc_rel['A18'] += 1
+			'Christina takes one look at you coming over to talk with her and says, "What now?"'
+			'"Nothing," you say cheerfully. "Just came over to say hi."'
+			'"Well don''t. We''re not friends, you got what you wanted, now leave me alone unless it''s important."'
+			'Giving her your best obvious fake smile you say, "Now don''t be like that. I thought we were great friends!"'
+			'"Whatever." Giving you a dirty look, she heads off to her next class, and you do the same, chuckling to yourself.'
+		elseif christinaQW['dompath'] = 4:
+			'Christina takes one look at you and her face turns crimson. "Bitch, I warned you. First chance I get, I''m gonna fuck you up!"'
+			'You give her your best patronizing look and say, "I''m not sure what you''re talking about. You''re welcome to give it your best shot though. Only one way to find out who''s Top Bitch around here!"'
+			'Her hands ball into fists, but then she takes a deep breath, looks around, and mutters to herself, "Not here..."'
+			'Smiling at her menacingly, you say "Later then..." before heading off to your next class.'
 		else
-			'"Hi <<$pcs_nickname>>! So what are you up to?" Christina asks.'
-			'"Nothing much, trying to figure out what I could do after school." you answer.'
-			'"You should join one of the sports teams. I''m sure you''d do great there," she says, trying to entice you.'
-			'"That''s something I will definitely consider. Thanks for the suggestion." you reply.'
+			'As you walk up to Christina, you smirk and say "Better have your plug in and no panties, buttslut, or things won''t go well for you."'
+			'Before she''s able to respond, you grab her arm, force her to bend over, and flip up her skirt. Finding her buttplug in place, and no panties, you let her go and walk away.'
 		end
-	elseif npc_rel['A18'] <= 20 and pav_slut < 200:
-		npc_rel['A18'] += 1
-		if grupTipe = 2:
-			'"Look at the biggest joke among us. You shouldn''t even be allowed to call yourself a jock. What a joke..." Christina shakes her head.'
-			'You fiercely reply. "Oh, yeah? I could beat you in whatever you want. Just name the place and time."'
-			'"Hmmrph!!" Christina looks angrily at you. "You know what? I don''t have time for this right now!" She crosses her arms and refuses to say another word to you.'
-		else
-			'"Why did you approach me? I don''t want to talk to someone like you." Christina scorns you.'
-			'"Well excuse me, your highness," you sarcastically take a bow in front of her. You hear some snickering behind you.'
-			'Christina turns a bit red as she pushes you away and storms off with Lina trying to keep up behind her.'
+	else
+		if npc_rel['A18'] >= 50 and pav_slut < 200:
+			npc_rel['A18'] += 1
+			if grupTipe = 2:
+				'"Hi <<$pcs_nickname>>! Do you want to work out together since, you know, you''re the only one that is on the same level as me?" she confidently asks.'
+				'"I don''t know if I could keep up with you." you jokingly reply.'
+				'Christina lets out a loud laugh. "Well you know where to find me if you ever want to work out."'
+				'You give her a nod and say your goodbyes.'
+			else
+				'"Hi <<$pcs_nickname>>! So what are you up to?" Christina asks.'
+				'"Nothing much, trying to figure out what I could do after school." you answer.'
+				'"You should join one of the sports teams. I''m sure you''d do great there," she says, trying to entice you.'
+				'"That''s something I will definitely consider. Thanks for the suggestion." you reply.'
+			end
+		elseif npc_rel['A18'] <= 20 and pav_slut < 200:
+			npc_rel['A18'] += 1
+			if grupTipe = 2:
+				'"Look at the biggest joke among us. You shouldn''t even be allowed to call yourself a jock. What a joke..." Christina shakes her head.'
+				'You fiercely reply. "Oh, yeah? I could beat you in whatever you want. Just name the place and time."'
+				'"Hmmrph!!" Christina looks angrily at you. "You know what? I don''t have time for this right now!" She crosses her arms and refuses to say another word to you.'
+			else
+				'"Why did you approach me? I don''t want to talk to someone like you." Christina scorns you.'
+				'"Well excuse me, your highness," you sarcastically take a bow in front of her. You hear some snickering behind you.'
+				'Christina turns a bit red as she pushes you away and storms off with Lina trying to keep up behind her.'
+			end
+		elseif pav_slut >= 200:
+			'"What does the biggest school slut want from me? Don''t you have a cock to suck somewhere?" Christina says mockingly.'
+			'"Shut up Christina! I''m tired of your bullshit." you tiredly reply.'
+			'"Poor little thing. It must''ve been, what, at least a few minutes since you last spread your legs for someone?" She begins to laugh as she walks away.'
+		else 
+			npc_rel['A18'] += 1
+			'"What do you want <<$pcs_nickname>>? I don''t really have the time right now." She''s looking around, for someone or something.'
+			'"Well... I wanted to ask you..." you choke up a little.'
+			'"Out with it <<$pcs_nickname>>!" Christina gets a bit irritated.'
+			'You take a deep breath. "I wanted to join..."'
+			'Before you end your sentence, she starts walking away and you can hear her say "Yeah yeah, you do that <<$pcs_nickname>>..."'
 		end
-	elseif pav_slut >= 200:
-		'"What does the biggest school slut want from me? Don''t you have a cock to suck somewhere?" Christina says mockingly.'
-		'"Shut up Christina! I''m tired of your bullshit." you tiredly reply.'
-		'"Poor little thing. It must''ve been, what, at least a few minutes since you last spread your legs for someone?" She begins to laugh as she walks away.'
-	else 
-		npc_rel['A18'] += 1
-		'"What do you want <<$pcs_nickname>>? I don''t really have the time right now." She''s looking around, looking for someone or something.'
-		'"Well... I wanted to ask you..." you choke up a little.'
-		'"Out with it <<$pcs_nickname>>!" Christina gets a bit irritated.'
-		'You take a deep breath. "I wanted to join..."'
-		'Before you end your sentence, she starts walking away and you can hear her say "Yeah yeah, you do that <<$pcs_nickname>>..."'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
+	if christinaQW['dompath'] = 0 and christinaQW['subpath'] = 0:
+		act 'Think about Christina': gt 'gschool_socialchg1', 'christina_decide'
+	end
+	
 end
 
 if $ARGS[0] = 'bella':
@@ -1142,7 +1187,7 @@ if $ARGS[0] = 'bella':
 		else
 			'"What do you want?" Bella arrogantly looks at you as you approach her.'
 			'"I just wanted to ask you about this store in the city. I heard..."'
-			'Before you''re able to continue she cuts you off, looks at her pedicure and, with a sigh, replies. "Listen, the city is not for children like you. You''re better off buying clothes like the rest of your classmates at the G&M store here in Pavlovsk..."'
+			'Before you''re able to continue she cuts you off, looks at her pedicure and, with a sigh, replies. "Listen, the city is not for children like you. You''re better off buying clothes like the rest of your classmates at the G&M store here in Pavlovsk."'
 		end
 	elseif pav_slut >= 200:
 		'"I heard some rumors that you''re interested in older guys? Is it true?" Bella asks.'
@@ -1150,7 +1195,7 @@ if $ARGS[0] = 'bella':
 		'"Well I''ve told some of my older male friends about you and they would love to meet you." she winks.'
 	else 
 		npc_rel['A22'] += 1
-		'"Well well, make it quick <<$pcs_nickname>>! I don''t really have the time to stand here and chat..." Bella hurries you on.'
+		'"Make it quick <<$pcs_nickname>>! I don''t really have the time to stand here and chat..." Bella hurries you on.'
 		'"I was thinking we could maybe hang after school one day?" you cheerfully ask.'
 		'"You and I?" she looks around. "Is this a prank? Where have you hidden the cameras?" She keeps on looking around. "Don''t be silly! Run along now, kid." She scoffs you aside.'
 	end
@@ -1173,7 +1218,7 @@ if $ARGS[0] = 'veronika':
 			'"Hi <<$pcs_nickname>>..." Veronika speaks quietly.'
 			'"Hi Veronika! Glad I ran into you." you cheerfully greet her.'
 			'"Oh?" she surprisingly replies.'
-			'"Yeah, just wanted to tell you that I''ll be cheering you on as you compete." you say.'
+			'"Yeah, I just wanted to tell you that I''ll be cheering you on as you compete." you say.'
 			'"Thank you." Veronika politely replies.'
 		end
 	elseif npc_rel['A141'] <= 20 and pav_slut < 150:
@@ -1206,48 +1251,64 @@ if $ARGS[0] = 'lina':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big19.jpg"></center>'
-	if lariskaQwestStart > 0 and lariskaQwestStart < 7 and zverSlutQW >= 1:
-		'"I have my eye on you, Lina. You are going to have to pick a side, between me and Christina. For your sake, I hope it isn''t the wrong one..."'
-		'With that statement, you turn and walk away.'
-	elseif lariskaQwestStart >= 7 and zverSlutQW >= 1:
-		'"I won''t forget you helped Christina come after me. Things are going to get rough for you."'
-		'With that statement, you turn and walk away.'
-	elseif LinaSlut = 1 and kotovLoveQW > 0:
-		'Lina sees the look on your face and recoils away from you. "Stay away from my boyfriend, slut, or I will beat you black and blue. Vitek won''t protect you, either."'
-		'Your one warning to her delivered, you turn and walk away.'
-	elseif LinaSlut = 1 and kotovLoveQW = 0:
-		'Seeing Lina, you laugh at her and say "Enjoy Vitek, slut. He''s all yours." When he rips you to pieces I am going to laugh."'
-	elseif npc_rel['A19'] >= 50 and pav_slut < 250:
-		npc_rel['A19'] += 1
-		if grupTipe = 2:
-			'"I''ve finally been improving my lap times." Lina proudly tells you.'
-			'"Great news! I''m glad you''re improving." you encourage her.'
-			'Lina nods. "Yeah, the new workout plan that Christina made for me is really great. She''s really helped me out a lot." There she goes, worshipping Christina.'
+	if christinaQW['dompath'] >= 4:
+		if christinaQW['dompath'] = 4:
+			'As soon as Lina sees you, she comes right up and says, "<<$pcs_nickname>>, how could you say those awful things about Christina?"'
+			'"Because they''re true," you say with a shrug. Raising an eyebrow, you add, "You didn''t know?"'
+			'"I...um...she never..." she stammers in response. Obviously she didn''t know.'
+			'"It''s ok, sweetie. She made her own choices and they have finally caught up to her." You smile at her, before heading off to the next class.'
 		else
-			'"Hi <<$pcs_nickname>>! Did you watch the latest video someone took of the Starlets? Their movements were amazing! I wish I could also join them, but I''m too clumsy..." Lina looks dejected.'
-			'"Is that so?" you curiously ask.'
-			'With a nervous laughter Lina replies. "I should stop, you''re probably not interested in this anyway." Before you''re able to answer, you can hear Christina calling her over and Lina quickly runs over to her, leaving you alone.'
+			npc_rel['A19'] += 1
+			if avelinaQW['encourage'] >= 1:
+				'Avelina sees you approaching and her face lights up. "Hey, <<$pcs_nickname>>!"'
+				'"Hey, Lina. How are you doing?"'
+				'"I''ve finally been improving my lap times." Lina proudly tells you.'
+				'"Great news! I''m glad you''re improving," you encourage her.'
+			else
+				avelinaQW['encourage'] = 1
+				if npc_rel['A13'] < 60: npc_rel['A13'] = 60
+				'You find Avelina standing alone, looking lost and sad.'
+				'"Looks like your role model made some bad choices," you say to her sternly. "Be careful spending time around her, you may find yourself dragged down with her."'
+				'She looks at her feet, obviously afraid of you.'
+				'"Don''t worry, sweetie, I''m not going to hurt you. I just hoping you will use this as an opportunity to start thinking for yourself, again." You say with a sweet smile.'
+				'Looking up at you, a bit suprised, you see a hint of a smile on her face before she nods at you. "Thanks, <<$pcs_nickname>>."'
+			end
 		end
-	elseif npc_rel['A19'] <= 20 and pav_slut < 250:
-		npc_rel['A19'] += 1
-		if grupTipe = 2:
-			'"I always hear that I''m bad at sports, but you''re even worse than me!" Lina spares no time to insult you.'
-			'"Where did this come from?" you ask.'
-			'Lina mockingly replies. "It''s just something me and the other girls were discussing and I just wanted you to know that."'
-			'"Come and face me then and I''ll show you who''s the worse athlete!" you fire back.'
-		else
-			'"So where''s the old ball and chain?" you teasingly ask.'
-			'"Oh shut up <<$pcs_nickname>>. Don''t you have anything better to do? At least I have a friend unlike <i>some</i> people." Lina fires back.'
+	else
+		if npc_rel['A19'] >= 50 and pav_slut < 250:
+			npc_rel['A19'] += 1
+			if grupTipe = 2:
+				'"I''ve finally been improving my lap times." Lina proudly tells you.'
+				'"Great news! I''m glad you''re improving." you encourage her.'
+				'Lina nods. "Yeah, the new workout plan that Christina made for me is really great. She''s really helped me out a lot." There she goes, worshipping Christina.'
+			else
+				'"Hi <<$pcs_nickname>>! Did you watch the latest video someone took of the Starlets? Their movements were amazing! I wish I could also join them, but I''m too clumsy..." Lina looks dejected.'
+				'"Is that so?" you curiously ask.'
+				'With a nervous laughter Lina replies. "I should stop, you''re probably not interested in this anyway." Before you''re able to answer, you can hear Christina calling her over and Lina quickly runs over to her, leaving you alone.'
+			end
+		elseif npc_rel['A19'] <= 20 and pav_slut < 250:
+			npc_rel['A19'] += 1
+			if grupTipe = 2:
+				'"I always hear that I''m bad at sports, but you''re even worse than me!" Lina spares no time to insult you.'
+				'"Where did this come from?" you ask.'
+				'Lina mockingly replies. "It''s just something me and the other girls were discussing and I just wanted you to know that."'
+				'"Come and face me then and I''ll show you who''s the worse athlete!" you fire back.'
+			else
+				'"So where''s the old ball and chain?" you teasingly ask.'
+				'"Oh shut up <<$pcs_nickname>>. Don''t you have anything better to do? At least I have a friend unlike <i>some</i> people." Lina fires back.'
+			end
+		elseif pav_slut >= 250:
+			npc_rel['A19'] -= 1
+			'"Christina says that you fuck anyone." Lina says while glaring at you.'
+			'"Christina doesn''t know what she''s talking about it." you reply.'
+			'"I knew it! It''s true isn''t it? Christina is always correct... Go and suck someone off!" she fires back.'
+			'"Whatever, bitch. Like you know anything about me," you laugh, and walk away.'
+		else 
+			npc_rel['A19'] += 1
+			'"What do you want <<$pcs_nickname>>? Christina is looking for me..." Lina says irritatingly.'
+			'"I wanted to ask you if you had the notes from the class. I need to copy it." you tell her.'
+			'"We''ll do it later. I have to find Christina right away or else she''ll get mad..." Lina excuses herself.'
 		end
-	elseif pav_slut >= 250:
-		'"Christina says that you fuck anyone." Lina says while glaring at you.'
-		'"Christina doesn''t know what she''s talking about it." you reply.'
-		'"I knew it! It''s true isn''t it? Christina is always correct... Go and suck someone off!" she fires back.'
-	else 
-		npc_rel['A19'] += 1
-		'"What do you want <<$pcs_nickname>>? Christina is looking for me..." Lina says irritatingly.'
-		'"I wanted to ask you if you had the notes from the class. I need to copy it." you tell her.'
-		'"We''ll do it later. I have to find Christina right away or else she''ll get mad..." Lina excuses herself.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -1257,44 +1318,99 @@ if $ARGS[0] = 'lariska':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
-	if LariskaQW['LariskaHelp'] = -1:
-		'She looks at you rejectingly and softly says: "Leave me alone <<$pcs_nickname>>. I want nothing to do with you any more."'
-	elseif LariskaHomeIn > 0:
-		'"Hey, cutie," you say when you see Lariska. She blushes a little but still smiles at you. You spend the rest of the break chatting with her.'
-	elseif npc_rel['A13'] >= 50 and pav_slut < 250:
-		npc_rel['A13'] += 1
-		if grupTipe = 2:
-			'"Hey <<$pcs_nickname>>, have you seen Christina around?" Lariska asks.'
-			'"No, why?" you can sense the desperation in her demeanor.'
-			'"Well Lina was running after her and I don''t want to be left out..." She dismayingly looks at you.'
-			'"Listen Lariska." You grab hold of her. "You don''t need to run after anyone. You''re fine on your own, okay? Now stop worrying and head to class instead."'
+	if LariskaQW['story'] >= 2:
+		if LariskaQW['story'] = 2:
+			if christinaQW['dompath'] >= 3 or christinaQW['subpath'] >= 2:
+				if christinaQW['subpath'] >= 2 or christinaQW['dompath'] < 6:
+					npc_rel['A13'] += 1
+					LariskaQW['story'] = 4
+					'Pulling out the the volleyball she dropped outside your parents apartment the other day, you hand it to her. "You dropped this, Lariska."'
+					'When she sees the ball, her eyes go wide and she looks around fearfully. Seeing that Christina is engrossed in her conversation with Lina, she snatches the ball and stuffs it out of sight.'
+					'I''m sorry, <<$pcs_nickname>>. If Christina finds out I was there instead of the sports center like I told her I would be...'
+					'"Then why were you there? You ask her teasingly, pretty sure you already know the answer."'
+					'Her face and neck turn bright red. "I-I...uh...I..." she stammers, trying to think of a something to tell you, unwilling to admit the truth.'
+					'"Relax," you say laughing. "I already talked to her, she agreed to let you hang out with me outside of school. I promise. Just ask her about it the next time you get a chance, ok?"'
+					'She looks at you, a bit dazed, but manages to nod.'
+					'Giving her a soft smile, you head off to your next class.'
+				else
+					npc_rel['A13'] += 1
+					LariskaQW['story'] = 4
+					'Pulling out the the volleyball she dropped outside your parents apartment the other day, you hand it to her. "You dropped this, Lariska."'
+					'When she sees the ball, her eyes go wide and her face turns bright red. She grabs the ball like it''s evidence of a conspiracy and stuffs it out of sight.'
+					'"So why did you run away? Didn''t you enjoy what we did?"'
+					'"I...uh...I panicked. I''m sorry, <<$pcs_nickname>>, it was too sudden," her face turns even more red as she thinks about the kiss.'
+					'"Wee I enjoyed it, just so you know. If you want to do it again sometime..."'
+					'She looks at you, a bit dazed, and says softly "I liked it too. I just need to think about it some more, ok?"'
+					'"Ok," you say with a soft smile, and head off to your next class.'
+				end
+			else
+				LariskaQW['story'] = 3
+				npc_rel['A13'] += 1
+				'Pulling out the the volleyball she dropped outside your parents apartment the other day, you hand it to her. "You dropped this, Lariska."'
+				'When she sees the ball, her eyes go wide and she looks around fearfully. Seeing that Christina is engrossed in her conversation with Lina, she snatches the ball and stuffs it out of sight.'
+				'I''m sorry, <<$pcs_nickname>>. If Christina finds out I was there instead of the sports center like I told her I would be...'
+				'"Then why were you there? You ask her teasingly, pretty sure you already know the answer."'
+				'Her face and neck turn bright red. "I-I...uh...I..." she stammers, trying to think of a something to tell you, unwilling to admit the truth.'
+				'"Relax," you say laughing. "I am pretty sure I already know," you say with a twinkle in your eye.'
+				'Her face flushes again, but all she says is "Don''t tell Christina I was there, she doesn''t like me hanging around you. She hates you, always has."'
+				'"I know, though I have no idea why. But don''t worry, I will figure out a way for her to agree to let us hang out. Or eliminate the need for her approval."'
+				'Lariska''s eyes go wide, but she just says, "Just be careful, <<$pcs_nickname>>. I don''t want her to hurt you because of me."'
+				'"I can take it, sweetie. Especially when it''s worth it." You give her a sweet smile and head off to class.'
+			end
+		elseif LariskaQW['story'] = 3:
+			npc_rel['A13'] += 1
+			'"Hey, Lariska! How is your day going?"'
+			'"I''m sorry, <<$pcs_nickname>>, but I told you, Christina doesn''t really want me hanging out with you afterschool."'
+			'"I know Lariska, I am working on it. In the meantime, I was just saying hi."'
+			'"O-Oh. I''m sorry, I just keep thinking about it. Hopefully you will manage to convince her." She gives you a sad smile.'
+			'"Hang in there, sweetie. I will convince her, I promise."'
+		elseif LariskaQW['story'] = 4:
+			npc_rel['A13'] += 1
+			'"Ok, <<$pcs_nickname>>. I guess Christina wont stop me from hanging out with you now." She smiles a bit shyly and says "Do you want to come over afterschool and work on our homework together?"'
+			'You smile in response, and say "Sure, Lariska. I will meet up with you afterschool!"'
+			'She blushes a bit and says "Good, I''m looking forward to it!"'
 		else
-			'"Hey <<$pcs_nickname>>! I need help with a thing and I think you''re the perfect person that can help me out." Lariska smiles.'
-			'"Sure thing Lariska. What do you need help with?" you curiously ask.'
-			'"Well... I need to impress Christina and need your help with coming up with something fitting..." she starts and goes on a long tirade about what might impress Christina.'
+			npc_rel['A13'] += 2
+			'"Hey, cutie," you say when you see Lariska. She blushes a little but still smiles at you. You spend the rest of the break chatting with her.'
 		end
-	elseif npc_rel['A13'] <= 20 and pav_slut < 250:
-		npc_rel['A13'] += 1
-		if grupTipe = 2:
-			'"I sure beat your ass during gym class. You had no chance against me." Lariska is gleefully trash-talking you.'
-			'"Well at least I don''t have to fish for other people''s approval." you ferociously tell her off.'
-			'"I can''t believe you said something like that!" She stands there, shocked.'
-		else
-			'"So where''s the old ball and chain?" you teasingly ask.'
-			'"Oh shut up <<$pcs_nickname>>. Don''t you have anything better to do? At least I have friends." Lariska fires back.'
-			'You start laughing. "Yeah, ''friends.''"'
+	else
+		!!if LariskaQW['LariskaHelp'] = -1:
+		!!	'She looks at you rejectingly and softly says: "Leave me alone <<$pcs_nickname>>. I want nothing to do with you any more."'
+		if npc_rel['A13'] >= 50 and pav_slut < 250:
+			npc_rel['A13'] += 1
+			if grupTipe = 2:
+				'"Hey <<$pcs_nickname>>, have you seen Christina around?" Lariska asks.'
+				'"No, why?" you can sense the desperation in her demeanor.'
+				'"Well Lina was running after her and I don''t want to be left out..." She dismayingly looks at you.'
+				'"Listen Lariska." You grab hold of her. "You don''t need to run after anyone. You''re fine on your own, okay? Now stop worrying and head to class instead."'
+			else
+				'"Hey <<$pcs_nickname>>! I need help with a thing and I think you''re the perfect person that can help me out." Lariska smiles.'
+				'"Sure thing Lariska. What do you need help with?" you curiously ask.'
+				'"Well... I need to impress Christina and need your help with coming up with something fitting..." she starts and goes on a long tirade about what might impress Christina.'
+			end
+		elseif npc_rel['A13'] <= 20 and pav_slut < 250:
+			npc_rel['A13'] += 1
+			if grupTipe = 2:
+				'"I sure beat your ass during gym class. You had no chance against me." Lariska is gleefully trash-talking you.'
+				'"Well at least I don''t have to fish for other people''s approval." you ferociously tell her off.'
+				'"I can''t believe you said something like that!" She stands there, shocked.'
+			else
+				'"So where''s the old ball and chain?" you teasingly ask.'
+				'"Oh shut up <<$pcs_nickname>>. Don''t you have anything better to do? At least I have friends." Lariska fires back.'
+				'You start laughing. "Yeah, ''friends.''"'
+			end
+		elseif pav_slut >= 250:
+			'"Aren''t you looking for a cock to suck you big slut?" Lariska says mockingly.'
+			'"Shut up Lariska! Don''t you have Christina''s tail to run after or something?" you tiredly reply.'
+			'"Poor little slut. Go chase another cock." she begins to laugh as she walks away.'
+		else 
+			npc_rel['A13'] += 1
+			'"What do you want <<$pcs_nickname>>? I don''t really have the time right now." Lariska says as she quickly walks towards the classroom.'
+			'"Well... I wanted to ask you..." you choke up a little.'
+			'"Out with it <<$pcs_nickname>>!" Lariska seems a bit irritated.'
+			'You take a deep breath. "I wanted you to ask Ch..."'
+			'Before you end your sentence, she pulls away from you and you can hear her say "Yeah yeah, you do that <<$pcs_nickname>>..."'
 		end
-	elseif pav_slut >= 250:
-		'"Aren''t you looking for a cock to suck you big slut?" Lariska says mockingly.'
-		'"Shut up Lariska! Don''t you have Christina''s tail to run after or something?" you tiredly reply.'
-		'"Poor little slut. Go chase another cock." she begins to laugh as she walks away.'
-	else 
-		npc_rel['A13'] += 1
-		'"What do you want <<$pcs_nickname>>? I don''t really have the time right now." Lariska says as she quickly walks towards the classroom.'
-		'"Well... I wanted to ask you..." you choke up a little.'
-		'"Out with it <<$pcs_nickname>>!" Lariska seems a bit irritated.'
-		'You take a deep breath. "I wanted you to ask Ch..."'
-		'Before you end your sentence, she pulls away from you and you can hear her say "Yeah yeah, you do that <<$pcs_nickname>>..."'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -1338,10 +1454,11 @@ if $ARGS[0] = 'ivan':
 		else
 			act 'Tell Ivan you''re bored':gt 'gdksport', 'Ivan_bored'
 		end
+	!! Since Ivan is only asking about the current day, not indefinitely, might be good to use a daystart
+	!! variable here and in the scene in gdksport IvanShowerYes guards (IvanShowerDayStart or something)
 	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 'Time for the next class': gt 'gschool_lessons', 'short_break'

+ 7 - 5
locations/gschool_cheerleading.qsrc

@@ -364,7 +364,8 @@ if $ARGS[0] = 'practice':
 					elseif rand(0,7) = 0: 
 						if (cheerleadingQW['backup_game'] ! 1) and (npc_grupTipe['A18'] ! 5):
 							*clr & cla
-							'As you are practicing, Lariska goes over on her ankle and falls to the ground. Albina has the group stop and she and Vicky go to check on her. She meekly insists that she is fine, but Albina disagrees and has her stay on the ground as Vicky checks her over. Christina then walks over and chimes in, a worried looking Lina silently standing behind her. "She said she''s fine, so stop fussing and get back to bossing us around!" Albina narrows her gaze. "Does she look fine to you? No, she''s going to sit this one out and we''ll see how ''fine'' she is later!" In response, Lariska tries to get back on her feet, but whimpers slightly in pain. "Stop faking it and get off your lazy ass!" Christina shouts. Lariska looks at her meekly and tries to stand, but Vicky has her sit back down. "She isn''t in any shape to continue. Vicky, take her over there to sit out and rest. We''ll have to make do without her for the rest of the session. Christina doesn''t seem happy, but doesn''t stop Vicky from carrying Lariska over to the benches to rest her injured foot. Albina beckons you over and reluctantly has you take her place for the remainder of the practice session. When you finish, Lariska seems well enough to walk to the changing room with a slight limp, which annoys Christina and causes her to again accuse her of faking it.'
+							'As you are practicing, Lariska goes over on her ankle and falls to the ground. Albina has the group stop and she and Vicky go to check on her. She meekly insists that she is fine, but Albina disagrees and has her stay on the ground as Vicky checks her over. Christina then walks over and chimes in, a worried looking Lina silently standing behind her. "She said she''s fine, so stop fussing and get back to bossing us around!" Albina narrows her gaze. "Does she look fine to you? No, she''s going to sit this one out and we''ll see how ''fine'' she is later!" In response, Lariska tries to get back on her feet, but whimpers slightly in pain. "Stop faking it and get off your lazy ass!" Christina shouts.' 
+							'Lariska looks at her meekly and tries to stand, but Vicky has her sit back down. "She isn''t in any shape to continue. Vicky, take her over there to sit out and rest." Christina doesn''t seem happy, but doesn''t stop Vicky from carrying Lariska over to the benches to rest her injured foot. Albina beckons you over and reluctantly has you take her place for the remainder of the practice session. When you finish, Lariska seems well enough to walk to the changing room with a slight limp, which annoys Christina and causes her to again accuse her of faking it.'
 							gs 'stat'
 							
 							act 'Go take a shower': gt 'gschool_cheerleading', 'shower'
@@ -388,7 +389,7 @@ if $ARGS[0] = 'practice':
 					elseif rand(0,2) = 0:
 						if npc_grupTipe['A18'] ! 5:
 							*nl
-							'As Lina practices a move that involves holding another girl, Christina decides to amuse herself and pulls Lina''s skirt up, causing her to squeal as her panties are exposed to everyone. She is blushing heavily, forced to endure the humilation since she can''t let go of the girl. Christina eventually lets her skirt go and Albina chews her out for being so reckless and childish while praising Lina for not losing her focus. Christina just laughs and calls her for being a bossy spoilsport while giving a mocking smirk to Lina. Christina just laughs and mocks Albina, comparing her to a yapping little dog.'
+							'As Lina practices a move that involves holding another girl, Christina decides to amuse herself and pulls Lina''s skirt up, causing her to squeal as her panties are exposed to everyone. She is blushing heavily, forced to endure the humilation since she can''t let go of the girl. Christina eventually lets her skirt go and Albina chews her out for being so reckless and childish while praising Lina for not losing her focus. Christina just laughs, calling Albina a bossy spoilsport and mocking her by comparing her to a yapping little dog, all while giving Lina a mocking smirk.'
 						end
 					end
 				else
@@ -690,7 +691,8 @@ if $ARGS[0] = 'shower':
 		if First_time_3some_with_Lazar = 0:
 			First_time_3some_with_Lazar = 1
 			'You stay in the shower a little longer than usual and it''s quiet when you enter the empty locker room. As you are getting your clothes ready, the door opens and Albina peeks in. "Oh fuck." she mumbles before walking in. "I was hoping it was going to be empty in here. I''m so fucking wet right now and was going to spend a little time here before I went home..."
-			At this point, Lazar peeks his head in the door. He has a wide grin on his face. "I couldn''t help but hear that you are in need of some aid. What kind of gentleman would I be if I didn''t help a lady in distress?" Albina just laughs. "You say the stupidest fucking shit sometimes, you know that?" she replies and he feigns insult at her. "And here I thought we had something after all the times I''ve helped you. Your little neon pink G-string is the pride of my collection you know." Albina smiles and shakes her head at him. "What can I say? A girl has needs and you just happen to be the only person who can satisfy them the way I like. And you''re not ugly or a pervy douchebag. Well, not as much of a pervy douchebag as some of the creeps who hit on me." she says with a grin and Lazar again feigns insult. "Yeah, I would definetly prefer having you inside me instead of my plastic friend here." Lazar playfully bows, then turns his attention to you. "Say, why don''t you join us <<$pcs_nickname>>?" You look at Albina, who just shrugs her shoulders. "Join if you want. We''re just going to have a quicky to get me off."'
+			At this point, Lazar peeks his head in the door, a wide grin on his face. "So we doing this or no- Oh hey <<$pcs_nickname>>..." he trails off as he spots you. Albina just laughs. "Yeah, turns out the place isn''t as empty as we thought." she tells him before she turns to you. "This is exactly what it looks like <<$pcs_nickname>>. What did Marcus call it? ''Friends with benefits''? We''re not in a relationship, we just have sex when we feel like it. This moron is the one guy I actually like checking me out." she says with a smile and gives him a wiggle of her ass.'   
+			'Lazar feigns insult at her comment before turning his attention to you. "Say, why don''t you join us <<$pcs_nickname>>?" You look at Albina, who just shrugs her shoulders. "Join if you want. We''re just going to have a little quicky to get me off."'
 			gs 'stat'
 
 			act 'Refuse':
@@ -726,7 +728,7 @@ if $ARGS[0] = 'shower':
 					act 'Albina gets anal':
 						*clr & cla
 						'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome2.mp4"></video></center>'
-						'When Lazar switches back to Albina, she breaks the kiss and sucks her fingers before slowly pushing them into her asshole and finger blasting her ass. Lazar groans at this. "Oh yeah. Fingering my ass makes my little pussy tighter doesn''t it? Mmmhhhm, fuck yeah!" she says, teasing him through her moans. Lazar quickly pulls out to avoid cumming too soon. "I need to fuck that ass!" he replies and Albina giggles in response. "Oh yeah, you want to stretch my little asshole with your big dick? Well come and get it then." she says as she pulls her fingers out and slaps herself on the ass. You move around and sit next to Albina. Lazar steps in behind you and you suck his dick before spreading Albina''s asscheeks and spitting on her hole. Lazar then guides the tip of his cock between her cheeks and both he and Albina groan as he penetrates her back door.' 
+						'When Lazar switches back to Albina, she breaks the kiss and sucks her fingers before slowly pushing them into her asshole and finger blasting her ass. Lazar groans at this. "Oh yeah. Fingering my ass makes my little pussy tighter doesn''t it? Mmmhhhm, fuck yeah!" she says, teasing him through her moans. Lazar quickly pulls out to avoid cumming too soon. "Time to fuck that ass!" he replies and Albina giggles in response. "Oh yeah, stretch my little asshole with your big dick!" she says as she pulls her fingers out and slaps herself on the ass. You move around and sit next to Albina. Lazar steps in behind you and you suck his dick before spreading Albina''s asscheeks and spitting on her hole. Lazar then guides the tip of his cock between her cheeks and both he and Albina groan as he penetrates her back door.' 
 						'You watch for the next few minutes as he fucks her asshole hard, his balls loudly slapping against her pussy. During one of his thrusts, his cock pops out of her hole and you look at her gape. You suck Lazar''s dick again but before he can put it back in, Albina chimes in. "I want you to taste my ass <<$pcs_nickname>>! Lick my asshole!"'
 						gs 'arousal', 'bj', 1
 						minut += 5
@@ -816,7 +818,7 @@ if $ARGS[0] = 'shower':
 						act 'Albina gets anal':
 							*clr & cla
 							'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/events/sex/threesome2.mp4"></video></center>'
-							'When Lazar switches back to Albina, she breaks the kiss and sucks her fingers before slowly pushing them into her asshole and finger blasting her ass. Lazar groans at this. "Oh yeah. Fingering my ass makes my little pussy tighter doesn''t it? Mmmhhhm, fuck yeah!" she says, teasing him through her moans. Lazar quickly pulls out to avoid cumming too soon. "I need to fuck that ass!" he replies and Albina giggles in response. "Oh yeah, you want to stretch my little asshole with your big dick? Well come and get it then." she says as she pulls her fingers out and slaps herself on the ass. You move around and sit next to Albina. Lazar steps in behind you and you suck his dick before spreading Albina''s asscheeks and spitting on her hole. Lazar then guides the tip of his cock between her cheeks and both he and Albina groan as he penetrates her back door.' 
+							'When Lazar switches back to Albina, she breaks the kiss and sucks her fingers before slowly pushing them into her asshole and finger blasting her ass. Lazar groans at this. "Oh yeah. Fingering my ass makes my little pussy tighter doesn''t it? Mmmhhhm, fuck yeah!" she says, teasing him through her moans. Lazar quickly pulls out to avoid cumming too soon. "Time to fuck that ass!" he replies and Albina giggles in response. "Oh yeah, stretch my little asshole with your big dick!" she says as she pulls her fingers out and slaps herself on the ass. You move around and sit next to Albina. Lazar steps in behind you and you suck his dick before spreading Albina''s asscheeks and spitting on her hole. Lazar then guides the tip of his cock between her cheeks and both he and Albina groan as he penetrates her back door.' 
 							'You watch for the next few minutes as he fucks her asshole hard, his balls loudly slapping against her pussy. During one of his thrusts, his cock pops out of her hole and you look at her gape. You suck Lazar''s dick again but before he can put it back in, Albina chimes in. "I want you to taste my ass <<$pcs_nickname>>! Lick my asshole!"'
 							gs 'arousal', 'bj', 1
 							minut += 5

+ 8 - 4
locations/gschool_events.qsrc

@@ -1050,7 +1050,7 @@ if $ARGS[0] = 'break_events':
 		gs 'stat'
 	elseif break_rand = 22:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/handstand.jpg"></center>'
-		if zverSlutQW >= 1:
+		if christinaQW['dompath'] >= 6:
 			'As you stop by your locker, you see some girls from your brother''s class doing handstands against the wall. Everytime their skirts flip down, the boys watching cheer. Giggling, they keep doing it until a teacher is spotted, and everybody scatters.'
 		else
 			'As you stop at your locker, you overhear Christina berating Lariska and Lina for yesterday''s practice. Something about how worthless they are and how it will make them lose their first game if they play that badly. They try to appologise and promise to do better but Christina is having none of it. She tells the girls to do hand stands in the hallway until the next class. When Lariska points out their skirts will fall up and everyone will see, Christina tells them they should have thought of that and played better.'
@@ -1077,7 +1077,7 @@ if $ARGS[0] = 'break_events':
 		'As you walk down the hallway, you see Bella sitting on one of the window ledges, ignoring her classmates as she touches up her makeup with her compact. You admit she is pretty and always looks nice, but she is such a snob, acting like she is better than everyone else.'
 	elseif break_rand = 26:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nastymessage.jpg"></center>'
-		if zverSlutQW >= 1:
+		if christinaQW['dompath'] >= 6:
 			'As you walk down the hallway, you see Christina writing a nasty message on a locker. It is obviously another girl''s locker by the comments calling her a "fat cow of a slut" and such. Walking up behind her, you clear your throat loudly. Jumping in suprise, she turns to find you glaring at her.'
 			'"Old habits, huh? That''s ok, I know how we can break them. Give me the marker." Nervously she hands you the pen, obviously not looking forward to whatever you have cooked up for her. "Bend over, Christina. Time for your punishment." Used to getting checked by now, she automatically bends over and flips up her skirt, showing you her pantiless ass and the buttplug wedged inbetween her cheeks. Smiling, you write Butt on her left cheek, and Slut on her right cheek, before pocketing the marker and walking away.'
 		else
@@ -1103,7 +1103,7 @@ if $ARGS[0] = 'break_events':
 		gs 'stat'
 	elseif break_rand = 30:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/skirtupback.jpg"></center>'
-		if zverSlutQW >= 1:
+		if christinaQW['dompath'] >= 6:
 			'You see Christina walk past Mr. Nikolaevich and as she does, she briefly flips up the back of her skirt to show off her panty clad ass. Mr. Nikolaevich gives her a stern look but otherwise doesn''t say anything. You follow behind her until he is out of sight, then grab her arm and drag her into the nearest girls bathroom.'
 			'"What did I say about panties, Christina?" Looking at you fearfully, she says "No panties, wear a buttplug." "And are you wearing panties without your plug in?" You ask sweetly. When she shakes her head no, you sigh theatrically. "Lying now, too. Ok, bend over and show me."'
 			'Trembling, she bends over and flips her skirt up, showing you the panties you already knew she was wearing. "Drop them, buttslut, and grab your ankles." Whimpering, she does as she is told. Lining yourself up, you spank her, hard, on each cheek. "That''s for lying!" You do it again, "That''s for wearing panties!" Then a third time, "That''s for not wearing your plug!"'
@@ -2251,7 +2251,11 @@ if $ARGS[0] = 'toilet_bj':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
 	'You know perfectly well that the group of boys are not going to let you escape. You meekly let the boys drag you to the men''s room, hoping for a miracle to save you. It never comes. When you arrive at the men''s room, one of the guys drives everyone else out; it''s just you and the gopniks in here now. He goes outside and keeps watch while two of the others reach for their pants. Several more come in to watch.'
-	'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way. On one wall, you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+	if pav_slut > 250:
+		'The walls of the restroom are covered in crude texts, quite a few of them involving you in some way. On one wall, you see written, in particularly large letters, "<b><<$pcs_nickname>> <<$pcs_lastname>> = <<$gnikname>>"</b>.'
+	else
+		'The walls of the restroom are covered in crude texts, quite a few of them involving your classmates in some way.'
+	end
 	act 'Start sucking':
 		*clr & cla
 		if $boydesc = 'Vitek':

+ 186 - 169
locations/gschool_girls_bathroom.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 	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 slip into the girl''s bathroom and into one of the stalls; the few other students who are already in the room don''t pay any attention to you. You sit on one of the toilets and pull your feet up, so no one can see them under the stall. After a few minutes, you hear the other girls all leave. Only moments later, the bell for class rings and you relax, a period of peace and quiet ahead of you.'
+	'You slip into the girl''s bathroom and into one of the stalls; the few other students who are already in the room don''t pay any attention to you. You sit on one of the toilets and pull your feet up so no one can see them under the stall. After a few minutes, you hear the other girls all leave. Only moments later, the bell for class rings and you relax, a period of peace and quiet ahead of you.'
 	act 'Play on phone':
 		*clr & cla
 		menu_off = 1
@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 		gs 'stat'
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/usephone'+ rand(1,2) +'.jpg"></center>'
-		'You sit on the toilet, playing on your phone. With class in session, most people you could text with would take agonizingly long to respond, and the few games you find to occupy yourself with are pretty terrible, but it still sure as hell beats another boring class.'
+		'You sit on the toilet, playing on your phone. With class in session, most people you text with take agonizingly long to respond, and the few games you find to occupy yourself with are pretty terrible, but it still sure as hell beats another boring class.'
 		i = rand(1,100)
 		if i <= 25:
 			gt 'gschool_girls_bathroom', 'girls'
@@ -41,7 +41,7 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke'+ rand(1,3) +'.jpg"></center>'
-			'You pull out a cigarette and light it, take a long drag and holding it in for a while. You immediately feel yourself relaxing, the smoke''s familiar tingling in your lungs taking the edge off. Yep, much better than going to class.'
+			'You pull out a cigarette and light it, take a long drag and hold it in for a while. You immediately feel yourself relaxing, the smoke''s familiar tingling in your lungs taking the edge off. This feels much better than going to class.'
 			i = rand(1,100)
 			if i <= 25:
 				gt 'gschool_girls_bathroom', 'girls'
@@ -66,10 +66,10 @@ if $ARGS[0] = 'bathroom2':
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	if school_bunk = 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/usephone'+ rand(1,2) +'.jpg"></center>'
-		'For the rest of the period, you play on your phone. Despite several instances of boredom and indecision that left you wishing you could just go out, you find it very relaxing to be your own master and by the time the next class bell rings, you are in a far better mood than before.'	
+		'For the rest of the period, you play on your phone. Despite several instances of boredom and indecision that leave you wishing you could just go out, you find it very relaxing to be your own master and by the time the bell rings, you are in a far better mood than before.'	
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/smoke'+ rand(1,3) +'.jpg"></center>'
-		'You spend the rest of the period playing on your phone while you smoke. The games on your cellphone are kinda boring, and once or twice you hear somebody walking around out on the corridor, causing your heart to skip a beat when you realize they might smell the smoke, but despite all that, you found this use of the period very relaxing and by the time the next class bell rings, you are in a far better mood than before.'
+		'You spend the rest of the period playing on your phone while you smoke. The games on your phone are boring, and once or twice you hear somebody walking around out in the corridor, causing your heart to skip a beat when you realize they might smell the smoke, but despite all that, you find this use of the period very relaxing and by the time the bell rings, you are in a far better mood than before.'
 	end
 	act 'Go to class':gt 'gschool_lessons', 'short_break'
 end
@@ -95,7 +95,7 @@ if $ARGS[0] = 'girl1':
 	jump_counter = 0
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
-	'After a couple of minutes, you hear the bathroom door open - someone else is in the bathroom with you! Carefully, you peek out, half-expecting to see a teacher... and see <<$rand_girl>>. Relieved and smiling, you exit the stall and greet her. She turns around, slightly startled at first but then breaking into a smile when she see you. Within seconds, the two of you are chatting away about school, boys, clothes, makeup and anything else that strikes your fancy, having all but forgotten about the fact that you are sitting in the school bathroom. Before you know it, the class bell rings. You both stop and look up out of reflex, then bid each other later and head to your next class.'		
+	'After a few minutes, you hear the bathroom door open - someone else is in the bathroom with you! You carefully peek out, half-expecting to see a teacher, but see <<$rand_girl>>. Relieved and smiling, you exit the stall and greet her. She turns around, slightly startled at first but then breaking into a smile when she see you. Within seconds, the two of you are chatting away about school, boys, clothes, makeup and anything else that strikes your fancy, having all but forgotten about the fact that you are sitting in the school bathroom and before you know it, the bell rings. You both stop and look up out of reflex, then bid each other farewell and head to your next class.'		
 	act 'Go to class':gt 'gschool_lessons', 'short_break'
 end
 
@@ -107,7 +107,7 @@ if $ARGS[0] = 'girl2':
 	'After a couple of minutes, you hear the bathroom door quietly open and close. Soft footsteps echo back and forth and you know someone else is in the bathroom with you. You peek out of your stall and see Sonia standing at the mirror, applying makeup. Relieved, bored and starved for company, you open the stall door. "Hey Sonia, what''s up?"'
 	*nl
 	'"Hi <<$pcs_nickname>>, you cutting class?" she asks while looking at you from the mirror.'
-	'"Yeah, I couldn''t take another boring class, I needed a little fun," you tell her with a smile.'
+	'"Yeah, I couldn''t take another boring class, I needed a little fun." you tell her with a smile.'
 	'Sonia turns around and looks at you for a moment, biting her lower lip. You can tell by the way the look in her eyes that she''s considering something; her mind made up, she walks up to you, gives you a kiss and whispers seductively into your ear: "I know what we could do for fun..."'
 	gs 'willpower', 'sex', 'resist'
 	if will_cost <= pcs_willpwr:
@@ -117,14 +117,14 @@ if $ARGS[0] = 'girl2':
 			npc_rel['A25'] += 10
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
-			'You can kinda understand why the boys are going crazy over Sonia - something about the way she looks, talks, even smells is incredibly tempting. It takes all of your strength of will to gently push her away. "Sorry Sonia, but that''s not what I meant."'
-			'Sonia seems a little surprised but then shrugs and goes back to the mirror, continuing her work on her makeup. "So what **did** you have in mind?"'
+			'You can understand why the boys are going crazy over Sonia - something about the way she looks, talks, even smells is incredibly tempting. It takes all of your strength of will to gently push her away. "Sorry Sonia, but that''s not what I meant."'
+			'Sonia seems a little surprised but then shrugs and goes back to the mirror, continuing her work on her makeup. "So what <i>did</i> you have in mind?"'
 			*nl
 			'"We could, you know, just talk. I mean, how have you been? I know things have been rough but that doesn''t mean we can''t be friends and talk to each other, right?" you ask as you walk up to stand next to her.' 
-			'Now that the spell is broken, you can''t help but feel sorry for her. She made a stupid mistake, some guys took advantage of her drunken, horny mood, and now she was a pariah, the school slut that practically nobody wanted to be seen with... including *you*, you realize.'
+			'Now that the spell is broken, you can''t help but feel sorry for her. She made a stupid mistake, some guys took advantage of her drunken, horny mood, and now she is a pariah, the school slut that practically nobody wants to be seen with... including you.'
 			*nl
 			'She glances at you, and smiles - not seductively like before but in a way you''ve rarely seen her smile since her fall from grace: Genuine, glad, happy even. "Sure. Yeah, I think I''d like that."' 
-			'The two of you spend the next hour talking about a variety of things, like you used to before. She gives you more than a few tips about how to use makeup, and you help her finish her own, putting into practice what she taught you. You talk about school and what you wanna do after, about family, about life... about anything and everything, except one thing: Sex. For one short period, Sonia and you pretend that you''re both innocent schoolgirls again.' 
+			'The two of you spend the next hour talking about a variety of things, like you used to before. She gives you more than a few tips about how to use makeup, and you help her finish her own, putting into practice what she taught you. You talk about school and what you want to do after, about family, about life... about anything and everything, except one thing: Sex. For one short period, you and Sonia pretend that you''re both innocent schoolgirls again.' 
 			'And before you know it, the bell rings. Sonia gives you lingering hug and a final, dazzling smile before both of you head to class.'
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
@@ -160,14 +160,14 @@ if $ARGS[0] = 'girl2':
 					*clr & cla
 					'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/school/soniatrade.jpg"></center>'
-					'You relish the smell and taste of her as she comes down from her high, eyes locked with each other and smiling like idiots as you recover. When her convulsions have stopped, she pulls you up and passionately kisses you, then gently licks her own juices off your face. The final kisses she gives you are different: Lingering, tender, almost bashful. With a smile, she breaks away from you and announces that you better get dressed. As you do, she asks: "<<$pcs_nickname>>, do you think we are going to write a test in chemistry this week?"'
+					'You relish the smell and taste of her as she comes down from her high, eyes locked with each other and smiling like idiots as you recover. When her convulsions have stopped, she pulls you up and passionately kisses you, then gently licks her own juices off your face. The final kisses she gives you are different: Lingering, tender, almost bashful. With a smile, she breaks away from you and announces that you better get dressed. As you do, she asks: "<<$pcs_nickname>>, do you think we are going to have a test in chemistry this week?"'
 					*nl
-					'The question leaves you dumbfounded - it takes you a moment or two to realize that everything you just experienced with her took place in a school toilet and that you now have to return to ''reality''. "Uh, I think he said there would be a quiz, yeah. Maybe we should have studied instead of having fun." You can''t help but giggle, and Sonia joins in. You spend the rest of the hour till the bell rings talking about mundane stuff and (sigh) going over some chemistry notes. Still, if this is how good it can be, maybe you should skip class more often.'
+					'The question leaves you dumbfounded - it takes you a moment or two to realize that everything you just experienced with her took place in a school toilet and that you now have to return to ''reality''. "Uh, I think he said there would be a quiz, yeah. Maybe we should have studied instead of having fun." You can''t help but giggle, and Sonia joins in. You spend the rest of the hour until the bell rings talking about mundane stuff and (sigh) going over some chemistry notes. Still, if this is how good it can be, maybe you should skip class more often.'
 					gs 'arousal', 'cuni_give', 10, 'lesbian'
 					gs 'arousal', 'vaginal_finger_give', -5, 'lesbian'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Go to Class':gt 'gschool_lessons', 'short_break'
+					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end
 		end
@@ -181,17 +181,17 @@ if $ARGS[0] = 'girl3':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena-lera.jpg"></center>'
 	*nl
 	if grupTipe ! 4:
-		'After a couple of minutes, you hear someone else in the bathroom with you: Two girls are talking, and you recognize the voices as Lena and Lera''s. Most of the other girls in school avoid them, as they like to bully them and even some of the boys. Trying to be quiet, you pull your feet up - you really don''t want to draw their attention and catch you here, alone in the bathroom. Unfortunately, you''ve forgotten all about your phone in your lap: As you raise your legs up so they can''t see your feet under the stall, your phone slides off your lap and clatters onto the floor.'
+		'After a few minutes, you hear someone else in the bathroom with you: Two girls are talking, and you recognize the voices as Lena and Lera''s. Most of the other girls in school avoid them, as they like to bully them and even some of the boys. Trying to be quiet, you pull your feet up - you really don''t want to draw their attention and catch you here, alone in the bathroom. Unfortunately, you''ve forgotten all about your phone in your lap: As you raise your legs up so they can''t see your feet under the stall, your phone slides off your lap and clatters onto the floor.'
 		*nl
-		'At once, the room is eerily silent; you hold your breath, your heartbeat so loud in your ears that, for a moment, it might be drowning out their sounds, but then you hear them walking in your direction and, suddenly, the door is slammed open. Lena and Lera stand on each side of the open stall, cigarettes in their mouths, looking right at you. "Well, well, look what we have here, Lena: A scared little bunny hiding in a stall," Lera says with a smirk.'
+		'At once, the room is eerily silent; you hold your breath, your heartbeat so loud in your ears that, for a moment, it might be drowning out their sounds, but then you hear them walking in your direction and, suddenly, the door is slammed open. Lena and Lera stand on each side of the open stall, cigarettes in their mouths, looking right at you. "Well, well, look what we have here, Lena: A scared little bunny hiding in a stall." Lera says with a smirk.'
 		*nl
 		'Lena leans in a bit, taking a closer look at you. "Is that right? Are you a scared little bunny, <<$pcs_nickname>>?" Without waiting for you to answer, she glances at Lera. "Maybe she thinks she''s a bad girl, trying to cut class. How about we show her what happens to bad little girls?" She laughs gleefully and Lera joins in. You have a really bad feeling about what they might want to do to you.'
 	else
-		'After a couple of minutes, you hear someone else in the bathroom with you: Two girls are talking, and you recognize the voices as Lena and Lera''s. You consider going out to talk to them. All and all, they treat you pretty well, but sometimes they can be pretty mean and demeaning. You know you are the low girl on the totem pole in the gopniks, but it would be nice if they treated you better. Still, they do make sure no one else messes with you, and when they are in a good mood, it is a blast hanging out with them, so it''s not all bad.'
+		'After a few minutes, you hear someone else in the bathroom with you: Two girls are talking, and you recognize the voices as Lena and Lera''s. You consider going out to talk to them. All and all, they treat you pretty well, but sometimes they can be pretty mean and demeaning. You know you are the low girl on the totem pole in the gopniks, but it would be nice if they treated you better. Still, they do make sure no one else messes with you, and when they are in a good mood, it is a blast hanging out with them, so it''s not all bad.'
 		*nl
-		'Before you can make up your mind, though, you hear their footsteps heading your way and you realize you forgot to lift up your feet. Suddenly, the door is pushed open. Lena and Lera stand on each side of the open stall, cigarettes in their mouths, looking right at you. "Well, well, look what we have here, Lena, our favorite scared little bunny hiding in a stall," Lera says with a smirk.'
+		'Before you can make up your mind, though, you hear their footsteps heading your way and you realize you forgot to lift up your feet. Suddenly, the door is pushed open. Lena and Lera stand on each side of the open stall, cigarettes in their mouths, looking right at you. "Well, well, look what we have here Lena, our favorite scared little bunny hiding in a stall." Lera says with a smirk.'
 		*nl
-		'Lena leans in a bit, taking a closer look at you. "Is that right? Are you a scared little bunny, <<$pcs_nickname>>?" Without waiting for you to answer, she glances at Lera. "I bet she thinks she''s a bad girl, for cutting class. How about we show her what happens to bad little girls?" She starts laughing and Lera joins in. You are not sure how you feel about this; they are a lot of fun, but their idea of fun can also be pretty damn mean. Part of you is strangely excited, but you are also worried about what comes next.'
+		'Lena leans in a bit, taking a closer look at you. "Is that right? Are you a scared little bunny, <<$pcs_nickname>>?" Without waiting for you to answer, she glances at Lera. "I bet she thinks she''s a bad girl for cutting class. How about we show her what happens to bad little girls?" She starts laughing and Lera joins in. You are not sure how you feel about this; they are a lot of fun, but their idea of fun can also be pretty damn mean. Part of you is strangely excited, but you are also worried about what comes next.'
 	end
 	gs 'willpower', 'sex', 'resist'
 	if will_cost <= pcs_willpwr:
@@ -203,17 +203,17 @@ if $ARGS[0] = 'girl3':
 			if runout = 1:
 				'<center><b><font color="maroon">School Hall</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-				'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several class room. You think you are almost in the clear... when you hear a voice behind you. "Where do you think you are going in such a hurry, Miss <<$pcs_lastname>>?" The adrenaline in your bloodstream seems to multiply, but the fear of being followed itching at the back of your neck is instantly replaced by cold dread filling your stomach: You''re busted. Grinding to a halt, you turn around and see a teacher glaring at you.'
+				'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several classrooms. You think you are almost in the clear... when you hear a voice behind you. "Where do you think you are going in such a hurry, Miss <<$pcs_lastname>>?" The adrenaline in your bloodstream seems to multiply, but the fear of being followed itching at the back of your neck is instantly replaced by cold dread filling your stomach: You''re busted. Grinding to a halt, you turn around and see a teacher glaring at you.'
 				*nl
-				'"Well, you see, I-," you stammer but he interrupts you before you can finish. "I know you have class this period, and yet you are out here, **running late** in every sense of the word. You weren''t cutting class, were you?"'
-				'The sarcastic tone leaves little doubt that he already knows the answer, but maybe you can still bullshit your way out of this. "Uh,yes, I mean, no. I mean... Yes, I have a class, but I wasn''t cutting. I was just running late, I had some stuff to do and I," you trail off lamely. You can tell he isn''t buying it, not even a part of it.'
+				'"Well, you see, I-" you stammer, but he interrupts you before you can finish. "I know you have class this period, and yet you are out here, running late in every sense of the word. You weren''t cutting class, were you?"'
+				'The sarcastic tone leaves little doubt that he already knows the answer, but maybe you can still bullshit your way out of this. "Uh, yes. I mean, no. I mean... Yes, I have a class, but I wasn''t cutting. I was just running late, I had some stuff to do and I..." you trail off lamely. You can tell he isn''t buying it, not even a part of it.'
 				*nl
-				'"Be that as it may, that is no excuse. Now get your butt to the Principal''s office. I will let her know you are on your way." With that, he points in the direction of her office, his stare extinguishing any hope of avoiding this. You can feel his eyes on your back until you are turning the corner before he returns to his classroom. With a sigh and no choice, you head to the Principal''s office.'
+				'"Be that as it may, that is no excuse. Now get to the Principal''s office. I will let her know you are on your way." With that, he points in the direction of her office, his stare extinguishing any hope of avoiding this. You can feel his eyes on your back until you are turning the corner before he returns to his classroom. With a sigh and no choice, you head to the Principal''s office.'
 				act 'Go to Principal''s Office':demerit += 10 & gt 'gschool_office', 'principal'
 			else
 				'<center><b><font color="maroon">School Hall</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall02.jpg"></center>'
-				'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several class room; you don''t even really know where you''re going, you just want to put some distance between them and you. Finally you stop and lean against some of the lockers, looking back you don''t see them and it seems no one notice you running down the halls. Sighing you spend the rest of the period trying not to be spotted until your next class.'
+				'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several classrooms; you don''t even really know where you''re going, you just want to put some distance between them and you. Finally you stop and lean against some of the lockers - looking back, you don''t see them and it seems no one noticed you running down the halls. Sighing, you spend the rest of the period trying not to be spotted until your next class.'
 				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
 		end
@@ -226,7 +226,7 @@ if $ARGS[0] = 'girl3':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena-lerabully.jpg"></center>'
 		'"No. I mean, I''m cutting class, but I''m not scared, and I don''t think I''m bad. I just needed a break and was hoping for a little fun, you know?" You smile weakly at them as you step out of the stall.'
 		*nl
-		'Lera leans in close and blows smoke in your face while Lena says: "Oh, you want to have some fun, huh? Ok, we can have some fun with you." Glancing and smirking at Lera as she speaks, both of them grab ahold of you from each side and you''re starting to wish you had just kept your mouth shut.'
+		'Lera leans in close and blows smoke in your face while Lena says: "Oh, you want to have some fun, huh? Ok, we can have some fun with you." Glancing and smirking at Lera as she speaks, both of them grab hold of you from each side and you''re starting to wish you had just kept your mouth shut.'
 		act 'Submit': gt 'gschool_girls_bathroom', 'toy bunny'
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -238,17 +238,17 @@ if $ARGS[0] = 'girl3':
 				if runout = 1:
 					'<center><b><font color="maroon">School Hall</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-					'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several class room. You think you are almost in the clear... when you hear a voice behind you. "Where do you think you are going in such a hurry, Miss <<$pcs_lastname>>?" The adrenaline in your bloodstream seems to multiply, but the fear of being followed itching at the back of your neck is instantly replaced by cold dread filling your stomach: You''re busted. Grinding to a halt, you turn around and see a teacher glaring at you.'
+					'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several classrooms. You think you are almost in the clear... when you hear a voice behind you. "Where do you think you are going in such a hurry, Miss <<$pcs_lastname>>?" The adrenaline in your bloodstream seems to multiply, but the fear of being followed itching at the back of your neck is instantly replaced by cold dread filling your stomach: You''re busted. Grinding to a halt, you turn around and see a teacher glaring at you.'
 					*nl
-					'"Well, you see, I-," you stammer but he interrupts you before you can finish. "I know you have class this period, and yet you are out here, **running late** in every sense of the word. You weren''t cutting class, were you?"'
-					'The sarcastic tone leaves little doubt that he already knows the answer, but maybe you can still bullshit your way out of this. "Uh,yes, I mean, no. I mean... Yes, I have a class, but I wasn''t cutting. I was just running late, I had some stuff to do and I," you trail off lamely. You can tell he isn''t buying it, not even a part of it.'
+					'"Well, you see, I-" you stammer, but he interrupts you before you can finish. "I know you have class this period, and yet you are out here, running late in every sense of the word. You weren''t cutting class, were you?"'
+					'The sarcastic tone leaves little doubt that he already knows the answer, but maybe you can still bullshit your way out of this. "Uh, yes. I mean, no. I mean... Yes, I have a class, but I wasn''t cutting. I was just running late, I had some stuff to do and I..." you trail off lamely. You can tell he isn''t buying it, not even a part of it.'
 					*nl
-					'"Be that as it may, that is no excuse. Now get your butt to the Principal''s office. I will let her know you are on your way." With that, he points in the direction of her office, his stare extinguishing any hope of avoiding this. You can feel his eyes on your back until you are turning the corner before he returns to his classroom. With a sigh and no choice, you head to the Principal''s office.'
+					'"Be that as it may, that is no excuse. Now get to the Principal''s office. I will let her know you are on your way." With that, he points in the direction of her office, his stare extinguishing any hope of avoiding this. You can feel his eyes on your back until you are turning the corner before he returns to his classroom. With a sigh and no choice, you head to the Principal''s office.'
 					act 'Go to Principal''s Office':demerit += 10 & gt 'gschool_office', 'principal'
 				else
 					'<center><b><font color="maroon">School Hall</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall02.jpg"></center>'
-					'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several class room; you don''t even really know where you''re going, you just want to put some distance between them and you. Finally you stop and lean against some of the lockers, looking back you don''t see them and it seems no one notice you running down the halls. Sighing you spend the rest of the period trying not to be spotted until your next class.'
+					'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several classrooms; you don''t even really know where you''re going, you just want to put some distance between them and you. Finally you stop and lean against some of the lockers - looking back, you don''t see them and it seems no one noticed you running down the halls. Sighing, you spend the rest of the period trying not to be spotted until your next class.'
 					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end
@@ -262,7 +262,7 @@ if $ARGS[0] = 'girl3':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena-lerabully.jpg"></center>'
 		'You step out of the stall and decide to put on your best tough-girl act: "What''s it to you if I want to cut class, huh?" All that does is get a laugh out of them, though. Lera leans in close and blows smoke in your face.'
 		*nl
-		'"Is that so, bunny? You a bad girl now? Why don''t we show you what real bad girls are like," Lena says as she steps close and grabs your arm; Lera quickly follows suit on your other side. "We''re going to have some fun with you, little bunny." Lera promises with a mean grin.'
+		'"Is that so, bunny? You a bad girl now? Why don''t we show you what real bad girls are like?" Lena says as she steps close and grabs your arm; Lera quickly follows suit on your other side. "We''re going to have some fun with you, little bunny." Lera promises with a mean grin.'
 		act 'Submit': gt 'gschool_girls_bathroom', 'toy bunny'
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -276,15 +276,15 @@ if $ARGS[0] = 'girl3':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
 					'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several class room. You think you are almost in the clear... when you hear a voice behind you. "Where do you think you are going in such a hurry, Miss <<$pcs_lastname>>?" The adrenaline in your bloodstream seems to multiply, but the fear of being followed itching at the back of your neck is instantly replaced by cold dread filling your stomach: You''re busted. Grinding to a halt, you turn around and see a teacher glaring at you.'
 					*nl
-					'"Well, you see, I-," you stammer but he interrupts you before you can finish. "I know you have class this period, and yet you are out here, **running late** in every sense of the word. You weren''t cutting class, were you?"'
-					'The sarcastic tone leaves little doubt that he already knows the answer, but maybe you can still bullshit your way out of this. "Uh,yes, I mean, no. I mean... Yes, I have a class, but I wasn''t cutting. I was just running late, I had some stuff to do and I," you trail off lamely. You can tell he isn''t buying it, not even a part of it.'
+					'"Well, you see, I-" you stammer, but he interrupts you before you can finish. "I know you have class this period, and yet you are out here, running late in every sense of the word. You weren''t cutting class, were you?"'
+					'The sarcastic tone leaves little doubt that he already knows the answer, but maybe you can still bullshit your way out of this. "Uh, yes. I mean, no. I mean... Yes, I have a class, but I wasn''t cutting. I was just running late, I had some stuff to do and I..." you trail off lamely. You can tell he isn''t buying it, not even a part of it.'
 					*nl
-					'"Be that as it may, that is no excuse. Now get your butt to the Principal''s office. I will let her know you are on your way." With that, he points in the direction of her office, his stare extinguishing any hope of avoiding this. You can feel his eyes on your back until you are turning the corner before he returns to his classroom. With a sigh and no choice, you head to the Principal''s office.'
+					'"Be that as it may, that is no excuse. Now get to the Principal''s office. I will let her know you are on your way." With that, he points in the direction of her office, his stare extinguishing any hope of avoiding this. You can feel his eyes on your back until you are turning the corner before he returns to his classroom. With a sigh and no choice, you head to the Principal''s office.'
 					act 'Go to Principal''s Office':demerit += 10 & gt 'gschool_office', 'principal'
 				else
 					'<center><b><font color="maroon">School Hall</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool_hall02.jpg"></center>'
-					'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several class room; you don''t even really know where you''re going, you just want to put some distance between them and you. Finally you stop and lean against some of the lockers, looking back you don''t see them and it seems no one notice you running down the halls. Sighing you spend the rest of the period trying not to be spotted until your next class.'
+					'Afraid of what they might do, you run out of the stall, and straight out of the bathroom - you are just as surprised at the fact that this worked as they must have been at you even attempting to flee. With your footsteps echoing from the walls, you can''t tell if they''re on your tail or not, so you keep running down the hall, past several classrooms; you don''t even really know where you''re going, you just want to put some distance between them and you. Finally you stop and lean against some of the lockers - looking back, you don''t see them and it seems no one noticed you running down the halls. Sighing, you spend the rest of the period trying not to be spotted until your next class.'
 					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end	
@@ -314,16 +314,30 @@ if $ARGS[0] = 'girl3':
 			grupvalue[4] += 3
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/girls/nowkiss.mp4"></video></center>'
-			'You step out of the stall and look the two girls up and down. You know the game they''re playing, but you can play games, too. You reach up, grab the cigarette from Lera and take a drag off it, blowing smoke in her face as you hand it back. "Maybe I''m not the one that should be scared." Lera is momentarily stunned by your brazenness while Lena watches on in curiosity and amusement.'
+			'You step out of the stall and look the two girls up and down. You know the game they''re playing, but you can play games too. You grab the cigarette from Lera and take a drag off it, blowing smoke in her face as you hand it back. "Maybe I''m not the one that should be scared." Lera is momentarily stunned by your brazenness while Lena watches on in curiosity and amusement.'
 			*nl
-			'When she recovers, Lera steps closer to you, determined to regain the upper hand. "Is that-" But you don''t give her the chance: You interrupt whatever she was going to say by grabbing her and pulling her into a long, passionate french kiss.'
-			'She stiffens at first, her hands grabbing your arms as if to push you back, but before she''s even taken hold of you, she''s molten into it and returns it as passionately as you give it. A good minute passes and Lena is starting to feel a little left out before you finally break the kiss, leaving Lera flushed and breathless. "Yeah, it is," you respond to her unfinished sentence. "Speaking of which, what are you girls up to?"'
+			'When she recovers, Lera steps closer to you, determined to regain the upper hand. "Is that-" But you don''t give her the chance: You interrupt whatever she was going to say by grabbing her and pulling her into a long, passionate French kiss.'
+			'She stiffens at first, her hands grabbing your arms as if to push you back, but before she''s even taken hold of you, she''s molten into it and returns it as passionately as you give it. A good minute passes and Lena is starting to feel a little left out before you finally break the kiss, leaving Lera flushed and breathless. "Yeah, it is." you respond to her unfinished sentence. "Speaking of which, what are you girls up to?"'
 			'Lena, looking a little turned on by the make-out session she just witnessed, offers you a cigarette. "We were just bored and looking for a little fun."'
 			*nl
-			'"Yeah, me too, but not that kind of fun... at least not this week," you meaningfully place your hand on your stomach and Lena nods in understanding while Lera licks her lips, obviously hoping for some more smooches to make up for other pleasures. Instead, you manage to steer them away from the topic entirely and the three of you are soon talking about school, the gopniks and a couple of other things. Before you know it, the class bell rings and the three of you head to your next class.'
+			'"Yeah, me too, but not that kind of fun... at least not this week." you meaningfully place your hand on your stomach and Lena nods in understanding while Lera licks her lips, obviously hoping for some more smooches to make up for other pleasures. Instead, you manage to steer them away from the topic entirely and the three of you are soon talking about school, the gopniks and a couple of other things. Before you know it, the bell rings and the three of you head to your next class.'
 			'You feel like you''ve earned a little more of their respect today.'
-			act 'Go to Class':gt 'gschool_lessons', 'short_break'
+			act 'Go to class':gt 'gschool_lessons', 'short_break'
 		end
+	elseif grupTipe = 2:
+	  !!Lead to an event during break where Sveta is confronted by Vitek, but is defended by the other jocks?
+	    act 'Fuck off':
+		  *clr & cla
+		  npc_rel['A20'] -= 5
+		  npc_rel['A21'] -= 5
+		  grupvalue[4] -= 3
+		  '<center><b><font color="maroon">Girls bathroom</font></b></center>'
+		  '<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+		  'You step out of the stall and look the two girls up and down. You know the game they''re playing, and you want nothing to do with it. You grab the cigarette from Lera and throw it into the toilet. "You need to get out of my face and fuck off... bitch." you snarl as you get up in Lera''s face and forcefully shove her against the stall, causing her to fall to the floor. Lena''s enraged snarl gives her away and you turn to dodge her incoming right hook before kicking her hard in the stomach, causing her to crumple to the floor next to Lera.'
+		  'The two girls, stunned by your actions, struggle pathetically to get to their feet as you open the door and walk out, Lena''s threat bellowing out behind you. "VITEK WILL HEAR ABOUT THIS, YOU FUCKING CUNT!!!" You ignore the threat and head on your way as the bell rings.'
+		  'It''s obvious that you''ve lost respect with them and their clique, but you don''t care.'
+		  act 'Go to class':gt 'gschool_lessons', 'short_break'
+	    end	
 	end
 end
 
@@ -334,9 +348,9 @@ if $ARGS[0] = 'toy bunny':
 	gs 'pain', 1, 'asscheeks', 'spank'
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena-leraown.jpg"></center>'
-	'The first thing they do is unbutton your shirt and pull it off - you protest meekly, but they simply ignore you. Lena wraps one hand around your head and holds it steady while leaning in and licking the side of your face. Meanwhile, her other hand reaches into your shirt and she pulls down one side of your bra, exposing your breast which she quickly starts to kneed and squeeze.'
+	'The first thing they do is unbutton your shirt and pull it off - you protest meekly, but they simply ignore you. Lena wraps one hand around your head and holds it steady while leaning in and licking the side of your face. Meanwhile, her other hand pulls down one side of your bra, exposing your breast, which she quickly starts to kneed and squeeze.'
 	*nl
-	'Lera squats down next to you and pulls your skirt and panties down to your ankles and makes you step out of them before tossing them across the room. Lena unclasps your bra, letting it fall to the floor as she starts kissing you, her tongue darting into your mouth and her hands roaming your body, making you acutely aware of the fact that you are now completely naked except for your shoes and socks. Suddenly, Lera gives your ass a smack so hard it makes you yelp and even jump a little; that seems to be exactly the reaction they were looking for, because she and Lena giggle and proceed to spank you.'
+	'Lera squats down next to you and pulls your skirt and panties down to your ankles and makes you step out of them before tossing them across the room. Lena unclasps your bra, letting it fall to the floor as she starts kissing you, her tongue darting into your mouth and her hands roaming your body, making you acutely aware of the fact that you are now almost completely naked. Suddenly, Lera gives your ass a smack so hard it makes you yelp and even jump a little; that seems to be exactly the reaction they were looking for, because she and Lena giggle and proceed to spank you.'
 	gs 'arousal', 'foreplay', 10, 'lesbian', 'group', 'sub'
 	gs 'stat'
 	act 'You got a pretty mouth':
@@ -344,10 +358,10 @@ if $ARGS[0] = 'toy bunny':
 		gs 'pain', 2, 'asscheeks', 'spank'
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena-leranipple.jpg"></center>'
-		'Lena keeps making out with you while her hands fondle your breasts. Meanwhile, Lera stands up and continues to smack your ass until it''s stinging so much you''re sure it must be cherry red by now. She finally stops and takes off her top and bra, exposing her perky tits, and says to Lena, "Okay, now it''s my turn with her pretty mouth".'
+		'Lena keeps making out with you while her hands fondle your breasts. Meanwhile, Lera stands up and continues to smack your ass until it''s stinging so much you''re sure it must be cherry red by now. She finally stops and takes off her top and bra, exposing her perky tits. "Okay, now it''s my turn with her pretty mouth."'
 		*nl
-		'Lena breaks her kiss with you and forcefully turns you to face Lera, grabbing you by your arms to hold you in place, and Lera grabs your head and pulls you down to her bust. "Suck my nipple, bunny. Do a good job and maybe we won''t hurt you... too much," she promises with an amused tone, causing Lena to chuckle behind you.'
-		'Not knowing what else to do and afraid of angering them, you go to work on her nipple, kissing, licking, sucking on it, your efforts guided by Lera''s soft moans as she obviously enjoys it. After a while, she shifts her body so you can give the other breast a similar treatment.'
+		'Lena breaks her kiss with you and forcefully turns you to face Lera, grabbing you by your arms to hold you in place as Lera grabs your head and pulls you down to her bust. "Suck my nipple, bunny. Do a good job and maybe we won''t hurt you... too much." she promises with an amused tone, causing Lena to chuckle behind you.'
+		'Not knowing what else to do and afraid of angering them, you go to work on her nipple, kissing, licking and sucking on it, your efforts guided by Lera''s soft moans as she obviously enjoys it. After a while, she shifts her body so you can give the other breast a similar treatment.'
 		*nl
 		'As they make you suck on Lera''s tits, you notice Lera pulling down her panties, letting them slide off her legs and down around her ankles where she quickly kicks them aside.'
 		gs 'arousal', 'foreplay', 10, 'lesbian', 'group', 'sub'
@@ -356,11 +370,11 @@ if $ARGS[0] = 'toy bunny':
 			*clr & cla
 			'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena-leraeat.jpg"></center>'
-			'Looking over your head, Lera meets Lena''s eyes. "Her mouth isn''t too bad, but I wanna know how good she is with her tongue." By unspoken agreement, Lena lets go of your arms and puts her hands around your neck, first pulling you away from Lera, then forcing you down on your knees while Lera pulls up her skirt and spreads her legs, exposing her sex.'
+			'Looking over your head, Lera meets Lena''s eyes. "Her mouth isn''t too bad, but I want to know how good she is with her tongue." By unspoken agreement, Lena lets go of your arms and puts her hands around your neck, first pulling you away from Lera, then forcing you down on your knees while Lera pulls up her skirt and spreads her legs, exposing her pussy.'
 			*nl
-			'Lena forces your face between Lera''s legs, practically rubbing your nose against Lera''s pussy as she does. Without even thinking about resisting, you open your mouth and start licking and sucking on Lera''s clit. The moans that escaped her when you played with her nipples were nothing compared to the loud ones you''re hearing now, and even though you''re not doing this entirely voluntarily, it''s turning you on a little. Eventually, you feel bold enough to slip your tongue inside of her soaking wet pussy and fucking her with your mouth.'
+			'Lena forces your face between Lera''s legs, practically rubbing your nose against Lera''s pussy as she does. Without even thinking about resisting, you open your mouth and start licking and sucking on Lera''s clit. The moans that escaped her when you played with her nipples were nothing compared to the loud ones you''re hearing now, and even though you''re not doing this entirely voluntarily, it''s turning you on a little. Eventually, you feel bold enough to slip your tongue inside of her soaking wet pussy and start tongue fucking her.'
 			*nl
-			'Lera''s breathing faster now and she starts grinding her pussy against your face, her movements becoming more and more erractic. "Oh my god, bunny, you''re so good at this! You must have had a lot of practice. Are you a lesbian or something?!" With your mouth full of her pussy, you obviously can''t answer her. At this point, Lena lets go of your neck while Lera runs her fingers through your hair and grabs it tightly, using you for leverage as she rubs against you.'
+			'Lera''s breathing faster now and she starts grinding her pussy against your face, her movements becoming more and more erractic. "Oh my god bunny, you''re so good at this! You must have had a lot of practice. Are you a lesbian or something?!" With your mouth full of her pussy, you obviously can''t answer her. At this point, Lena lets go of your neck while Lera runs her fingers through your hair and grabs it tightly, using you for leverage as she rubs against you.'
 			*nl
 			'A few moments later, you hear Lena: "Lera, get over here. I need your tongue." Lera releases you, your face wet with her juices. You turn your head to see Lena naked down on all fours, her legs spread, presenting herself to her friend and you.'
 			gs 'arousal', 'cuni_give', 10, 'lesbian', 'group', 'sub'
@@ -369,7 +383,7 @@ if $ARGS[0] = 'toy bunny':
 				*clr & cla
 				'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena-leratrain.jpg"></center>'
-				'Lera wastes no time: She grabs you by your hair, drags you closer to Lena and forces you to lay down on your back, then straddles your face, putting her pussy right over your mouth. The order is clear, even without her command: "Finish me off."'
+				'Lera wastes no time: She grabs you by your hair, drags you closer to Lena and forces you to lie down on your back, then straddles your face, putting her pussy right over your mouth. The order is clear, even without her command: "Finish me off."'
 				*nl
 				'Without hesitation, you continue where you left off. When you glance up, you see that Lera is licking Lena''s pussy from behind. She seems to really know what she is doing and turns Lena into a moaning mess in no time by alternating between licking Lena''s pussy and her asshole, tongue-fucking one, then the other, exploring the girl''s orifices with gusto. You can''t help but smirk when you understand that Lera is Lena''s bitch, but then you realize that this makes you Lera''s bitch and thus the bottom bitch in this trio.'
 				*nl
@@ -389,9 +403,9 @@ if $ARGS[0] = 'toy bunny':
 					if grupTipe ! 4:
 						'With your face covered in Lera''s liquids, you pant, struggling to catch your breath. The two girls get up, but Lena forces Lera to squat down next to her again and gives you an imperious look. "Come here and lick my juices off Lera''s face." You get up and do as you''re told, licking Lera''s face clean. Once you''re done, Lera stands up once more, and both girls spread their legs, their pussies level with your kneeling self.'
 						*nl
-						'"What are you waiting for, an invitation? Clean our pussies up, right now," Lena orders you. Once again, you follow her instruction and bathe their cunts with your tongue until they have a spit shine.'
+						'"What are you waiting for, an invitation? Clean our pussies up, right now!" Lena orders you. Once again, you follow her instruction and bathe their cunts with your tongue until they have a spit shine.'
 						*nl
-						'Once you have them both clean, the two girls squat down next to you and force you to sit back on your heels. Lena leans in close, uncomfortably close, and suddenly grabs you by your throat, her voice a menacing whisper: "You''re a good little bitch - **our** little bitch. And as long as you keep your mouth shut about this, we won''t have to punish you. But if I hear about this though, we will find you, call every guy we know and let them fuck you senseless - hell, we could probably even make money with that. And once we were done with you, everyone would think that Sonia was just a tease next to you. You see what I''m getting at, bitch?" You meekly nod your head.'
+						'Once you have them both clean, the two girls squat down next to you and force you to sit back on your heels. Lena leans in close, uncomfortably close, and suddenly grabs you by your throat, her voice a menacing whisper: "You''re a good little bitch - <i>our</i> little bitch. And as long as you keep your mouth shut about this, we won''t have to punish you. But if I hear about this though, we will find you, call every guy we know and let them fuck you senseless - hell, we could probably even make money with that. And once we were done with you, everyone would think that Sonia was just a tease next to you. You see what I''m getting at, bitch?" You meekly nod your head.'
 						*nl
 						'"Good, don''t you forget it. Now, be a good little bitch and stay like that until we leave." With that, they both stand up and seemingly forget about your existence: They talk about a variety of things, smoke and put their clothes in order while you sit between them, naked, until the class bell rings. When they finally leave, you get up and frantically collect your clothes, just barely making it into one of the stalls before other girls come in. With your heart beating like crazy after this close call, you get dressed, take a minute to wipe the girl cum off your face, and then head to your next class. Maybe classes aren''t so bad after all...'
 						act 'Go to Class':gt 'gschool_lessons', 'short_break'
@@ -402,8 +416,8 @@ if $ARGS[0] = 'toy bunny':
 						*nl
 						'Once you have them both clean, the two girls squat down next to you and force you to sit back on your heels. Lena leans in close, uncomfortably close, and suddenly grabs you by your throat, her voice a menacing whisper: "You''re a good little bitch - **our** little bitch. And as long as you know your place, we will all get along great... won''t we?" You meekly nod your head.'
 						*nl
-						'"Good bunny. Now be a good little bitch and stay like that until I tell you otherwise." You want to nod yes but Lena blindsides you with a long, passionate kiss before they both stand up. For all intents an purposes, they forget about your existence, because they start talking about a variety of things, smoke and put their clothes in order. Just when you think that the bell''s gonna ring any minute now, Lena gives you a gracious smile. "You know, you''ve been a good little bunny today. Go ahead, get dressed." Not only do they help you gather your clothes from the four corners of the bathroom but they chat with you, treating you as an equal now. Lera even helps you clean your face. Once the bell rings, the three of you leave together and head to the next class.'
-						act 'Go to Class':gt 'gschool_lessons', 'short_break'
+						'"Good bunny. Now be a good little bitch and stay like that until I tell you otherwise." You want to nod, but Lena blindsides you with a long, passionate kiss before they both stand up. They seemingly forget about your existence since they get dressed and start smoking while they chat. Just when you think that the bell is going to ring, Lena gives you a gracious smile. "You know, you''ve been a good little bunny today. Go ahead, get dressed." Not only do they help you gather your clothes from the four corners of the bathroom but they also chat with you, treating you as an equal. Lera even helps you clean your face. Once the bell rings, the three of you leave together and head to the next class.'
+						act 'Go to class':gt 'gschool_lessons', 'short_break'
 					end
 				end
 			end
@@ -440,9 +454,9 @@ if $ARGS[0] = 'company1':
 	menu_off = 1
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/voyvag.mp4"></video></center>'
-	'After a couple of minutes, you hear someone else in the bathroom with you. Soft murmured voices echo in the room, one male, the other female; you can''t quite make out what they are saying. Then there is some rustling of clothes, shortly followed by female moans. You creep up to the stall door, open it just a tiny bit, just as far as you dare without drawing attention, and peek outside.'
+	'After a few minutes, you hear someone else in the bathroom with you. Soft murmured voices echo in the room, one male, the other female; you can''t quite make out what they are saying. Then there is some rustling of clothes, shortly followed by female moans. You creep up to the stall door, open it just a tiny bit, just as far as you dare without drawing attention, and peek outside.'
 	*nl
-	'The couple has their backs to you but you can see that her skirt is flipped up and his pants down - you can''t tell if the guy is a student or a teacher, at first then you catch a glimpse of <<$rand_boy>>''s face in the mirror. He has <<$rand_girl>> up against the sinks, partially bent over them, and he is fucking her from behind. Her face is nearly touching the mirror as he pounds her pussy doggystyle and she seems to be loving every second of it!'
+	'The couple has their backs turned to you, but you can see that her skirt is flipped up and his pants are pulled down - you can''t tell if the guy is a student or a teacher at first, then you catch a glimpse of <<$rand_boy>>''s face in the mirror. He has <<$rand_girl>> up against the sinks, partially bent over them, and he is fucking her from behind. Her face is nearly touching the mirror as he pounds her pussy doggystyle and she seems to be loving every second of it.'
 	gs 'arousal', 'voyeur_sex', 10
 	gs 'stat'
 	'Afraid you might get caught, you close the door and move back to sit on the toilet.'
@@ -451,7 +465,7 @@ if $ARGS[0] = 'company1':
 		pcs_horny += 15
 		gs 'arousal', 'end'
 		gs 'stat'
-		'You decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her "harder!". A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
+		'You decide to keep quiet and wait until they are done. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her harder. A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
 		if school_bunk = 0:
 			act 'Continue playing on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 		else
@@ -463,16 +477,16 @@ if $ARGS[0] = 'company1':
 		if pcs_inhib < 40:inhib_exp += rand(1,3)
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/masturbate'+ rand(1,2) +'.mp4"></video></center>'
-		'Listening to <<$rand_girl>> getting her ass violated, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread your legs. Your hands slide down, down your thigh, then back up, up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
+		'Listening to <<$rand_girl>> getting her pussy violated, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread your legs. Your hand slides down your thigh, then back up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
 		*nl
-		'You rub your sensitive little nub carefully, to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck <<$rand_boy>> is giving a girl you don''t know. You add your other hand to the mix, rubbing your clit while you''re finger fucking yourself, faster and faster as they get louder and louder, and even play with your asshole a little bit, encouraged by the girl''s audible pleasure.'
+		'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck <<$rand_boy>> is giving a girl you don''t know. You add your other hand to the mix, rubbing your clit while you''re finger fucking yourself, faster and faster as they get louder and louder, and even play with your asshole a little bit, encouraged by the girl''s audible pleasure.'
 		$orgasm_or = 'custom'
-		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat like you are having a seizure.'
+		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
 		gs 'arousal', 'mast', 10
 		gs 'arousal', 'end'
 		gs 'stat'
-		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and everything is quiet once more.'
-		act 'Go to Class':gt 'gschool_lessons', 'short_break'
+		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and everything is quiet once more.'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -481,9 +495,9 @@ if $ARGS[0] = 'company2':
 	menu_off = 1
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/voyanal.mp4"></video></center>'
-	'After a couple of minutes, you hear someone else in the bathroom with you. Soft murmured voices echo in the room, one male, the other female; you can''t quite make out what they are saying. Then there is some rustling of clothes, shortly followed by female moans. You creep up to the stall door, open it just a tiny bit, just as far as you dare without drawing attention, and peek outside.'
+	'After a few minutes, you hear someone else in the bathroom with you. Soft murmured voices echo in the room, one male, the other female; you can''t quite make out what they are saying. Then there is some rustling of clothes, shortly followed by female moans. You creep up to the stall door, open it just a tiny bit, just as far as you dare without drawing attention, and peek outside.'
 	*nl
-	'The couple has their backs to you but you can see that her skirt is flipped up and his pants down - you can''t tell if the guy is a student or a teacher but after a bit you catch site of <<$rand_boy>>''s face, as he has <<$rand_girl>> bent over near the bathroom window and she is looking back at him and in your direction - or at least she would be, if she didn''t have her eyes closed. You can tell that he is fucking her ass and she seems to be loving it, getting her tight little ass pounded right here in a school bathroom! Her soft moans of pleasure echo in the room and the sight is entrancing... but if she opened her eyes right now, you are pretty sure she''d see you!'
+	'The couple has their backs turned to you, but you can see that her skirt is flipped up and his pants are pulled down - you can''t tell if the guy is a student or a teacher, but you soon catch sight of <<$rand_boy>>''s face. He has <<$rand_girl>> bent over near the bathroom window and she is looking back at him and in your direction - or at least she would be if she didn''t have her eyes closed. You can tell that he is fucking her ass and she seems to be loving it. Her soft moans of pleasure echo in the room and the sight is entrancing, but if she opened her eyes right now, you are pretty sure she''d see you.'
 	gs 'arousal', 'voyeur_sex', 10
 	gs 'stat'
 	'Afraid you might get caught, you close the door and move back to sit on the toilet.'
@@ -492,7 +506,7 @@ if $ARGS[0] = 'company2':
 		pcs_horny += 15
 		gs 'arousal', 'end'
 		gs 'stat'
-		'You decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass "harder!". A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
+		'You decide to keep quiet and wait until they are done. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass harder. A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
 		if school_bunk = 0:
 			act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 		else
@@ -508,16 +522,16 @@ if $ARGS[0] = 'company2':
 		gs 'stat'
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/masturbate'+ rand(1,2) +'.mp4"></video></center>'
-		'Listening to <<$rand_girl>> getting her ass violated, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread you legs. Your hands slides down, down your thigh, then back up, up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
+		'Listening to <<$rand_girl>> getting her ass violated, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread you legs. Your hand slides down your thigh, then back up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
 		*nl		
-		'You rub your sensitive little nub carefully, to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck <<$rand_boy>> is giving <<$rand_girl>>. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder, and even play with your asshole a little bit, encouraged by the girl''s audible pleasure.'
+		'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck <<$rand_boy>> is giving <<$rand_girl>>. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder, and even play with your asshole a little bit, encouraged by the girl''s audible pleasure.'
 		$orgasm_or = 'custom'
-		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seats like you are having a seizure.'
+		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
 		gs 'arousal', 'mast', 10
 		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
-		act 'Go to Class':gt 'gschool_lessons', 'short_break'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -529,14 +543,14 @@ if $ARGS[0] = 'company3':
 	gs 'stat'
 	'<center><b><font color="maroon">Boys bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/couplesuck.jpg"></center>'
-	'After a couple of minutes, you hear someone else in the bathroom with you. Soft murmured voices echo in the room, one male, the other female; you can''t quite make out what they are saying. Then there is some rustling of clothes, shortly followed by female moans. You creep up to the stall door, open it just a tiny bit, just as far as you dare without drawing attention, and peek outside.'
+	'After a few minutes, you hear someone else in the bathroom with you. Soft murmured voices echo in the room, one male, the other female; you can''t quite make out what they are saying. Then there is some rustling of clothes, shortly followed by female moans. You creep up to the stall door, open it just a tiny bit, just as far as you dare without drawing attention, and peek outside.'
 	*nl
-	'You see Arkadi, with his pants around his ankles, while Anushka is squatting down in front of him and sucking his dick. You watch for a moment and you''d like to watch even longer, but Arkadi keeps looking around, and in your direction! You duck back into the stall before you get spotted... and feel yourself getting very aroused from watching them, listening to them, even just knowing what they are doing. The sucking sounds stop and are quickly replaced by soft female moans of pleasure. Before your inner eye, you can see him fucking her over the sink, or perhaps against the wall? And is he fucking her pussy or her ass?'
+	'You see Arkadi with his pants around his ankles, Anushka squatting in front of him and sucking his dick. You watch for a moment and you''d like to watch even longer, but Arkadi keeps looking around, and in your direction. You duck back into the stall before you get spotted... and feel yourself getting very aroused from watching them, listening to them, even just knowing what they are doing. The sucking sounds soon stop and are quickly replaced by soft female moans of pleasure.'
 	if pcs_horny < 70:
 		act 'Wait':
 			cla & *nl
 			gs 'arousal', 'end'
-			'You banish these thoughts from your mind - with great effort - and decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass "harder!". A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
+			'You banish these thoughts from your mind - with great effort - and decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her harder. A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
 			if school_bunk = 0:
 				act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 			else
@@ -551,7 +565,7 @@ if $ARGS[0] = 'company3':
 				gs 'willpower', 'pay', 'self'
 				gs 'arousal', 'end'
 				gs 'stat'
-				'You banish these thoughts from your mind - with great effort - and decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass "harder!". A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
+				'You banish these thoughts from your mind - with great effort - and decide to keep quiet and wait until they are done. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her ass harder. A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
 				if school_bunk = 0:
 					act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 				else
@@ -566,15 +580,15 @@ if $ARGS[0] = 'company3':
 		*clr & cla
 		'<center><b><font color="maroon">Boys bathroom</font></b></center>'
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/masturbate'+ rand(1,2) +'.mp4"></video></center>'
-		'Listening to <<$rand_girl>> getting pounded, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread you legs. Your hands slides down, down your thigh, then back up, up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.' 
+		'Listening to Anushka getting pounded, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread you legs. Your hand slides down your thigh, then back up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.' 
 		*nl
-		'You rub your sensitive little nub carefully, to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck the guy is giving <<$rand_girl>>. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder.'
-		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seats like you are having a seizure.'
+		'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck Arkadi is gicing Anushka. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder.'
+		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
 		$orgasm_or = 'custom'
 		gs 'arousal', 'masturbate', 20
 		gs 'arousal', 'end'
 		gs 'stat'
-		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
+		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
 		if school_bunk = 0:
 			act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 		else
@@ -592,16 +606,16 @@ if $ARGS[0] = 'company4':
 	gs 'stat'
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/teachers1.mp4"></video></center>'
-	'After a couple of minutes, you hear someone else in the bathroom with you. Soft murmured voices echo in the room, one male, the other female; you can''t quite make out what they are saying. Then there is some rustling of clothes, shortly followed by female moans. You creep up to the stall door, open it just a tiny bit, just as far as you dare without drawing attention, and peek outside.'
+	'After a few minutes, you hear someone else in the bathroom with you. Soft murmured voices echo in the room, one male, the other female; you can''t quite make out what they are saying. Then there is some rustling of clothes, shortly followed by female moans. You creep up to the stall door, open it just a tiny bit, just as far as you dare without drawing attention, and peek outside.'
 	*nl
-	'You see Vice Principal Kuznetsov standing near the sinks with his pants around his ankles while Miss Orlov down on her knees, with her top pulled down. She has his cock in her mouth, sucking it for all she is worth. They both seem to be greatly enjoying themselves. You know you should really stop watching incase you get caught but how often do you get to see two of your teachers go at it?'
+	'You see Mr. Kuznetsov standing near the sinks with his pants around his ankles while Miss Orlov is down on her knees with her top pulled down. She has his cock in her mouth, sucking it for all she is worth. They both seem to be greatly enjoying themselves. You know you should stop watching in case you get caught, but how often do you get to see two of your teachers go at it?'
 	act 'Watch':
 		*clr & cla
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/teachers2.mp4"></video></center>'
-		'You decide to keep watching them, she sucks his cock for awhile as you watch. Neither seem to be aware of your presence as they are engrossed in each other. Then he pulls her up standing and turns her around, he pushes her forward. Bending her over the sinks, as she pulls up her skirt, he pulls down her panties. With her panties around her ankles he moves up and starts fucking her, at first he is slow but passionate. As she begins to moan louder he picks up his pace and before long he is pounding her like crazy.'
+		'You decide to keep watching them. She sucks his cock for a while and neither seem to be aware of your presence as they are too engrossed in each other. Then he pulls her up, turns her around and pushes her forward. Bending her over the sinks, she pulls up her skirt while he pulls down her panties. He moves up and starts fucking her, slow but passionate at first but as she begins to moan louder, he picks up his pace and before long, he is pounding her like crazy.'
 		*nl
-		'It doesn''t take much longer until Miss Orlov is having a screaming orgasm, Mr. Kuznetsov, is forced to put his hand over her mouth as she orgasms while he fucks her to muffle her cries of ecstasy. Some time after she finishes, he pulls out of her. She turns around and gets back on her knees and starts sucking his cock again. Moment latter he starts grunting obviously cumming in her mouth. Not a single drop escapes her mouth, she milks his cock of ever last drop before removing it from her mouth.'
+		'It doesn''t take much longer until Miss Orlov is having a screaming orgasm. Mr. Kuznetsov is forced to put his hand over her mouth as she orgasms to muffle her cries of ecstasy. Some time after she finishes, he pulls out of her. She turns around and gets back on her knees and starts sucking his cock again. Moments later he starts grunting, obviously cumming in her mouth. Not a single drop escapes her mouth, she milks his cock of every last drop before removing it from her mouth.'
 		gs 'arousal', 'voyeur_sex', 10
 		gs 'stat'
 		'They grin at each other and then kiss, after that they get dressed and leave the bathroom.'
@@ -618,7 +632,7 @@ if $ARGS[0] = 'company4':
 		pcs_horny += 15
 		gs 'arousal', 'end'
 		gs 'stat'
-		'You decide to keep quiet and wait until they are done fucking. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her "harder!". A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
+		'You decide to keep quiet and wait until they are done. She gets very loud after a while, obviously having an orgasm, and moans obscenities, encouraging him to fuck her harder. A few minutes later, he grunts as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
 		if school_bunk = 0:
 			act 'Continue playing on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 		else
@@ -630,16 +644,16 @@ if $ARGS[0] = 'company4':
 		if pcs_inhib < 40:inhib_exp += rand(1,3)
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/bathroom/sex/masturbate'+ rand(1,2) +'.mp4"></video></center>'
-		'Listening to <<$rand_girl>> getting pounded, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread you legs. Your hands slides down, down your thigh, then back up, up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.' 
+		'Listening to <<$rand_girl>> getting pounded, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread you legs. Your hands slide down your thigh, then back up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.' 
 		*nl
-		'You rub your sensitive little nub carefully, to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck <<$rand_boy>> is giving <<$rand_girl>>. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder.'
-		$orgasm_txt = ' You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seats like you are having a seizure.'
+		'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck <<$rand_boy>> is giving <<$rand_girl>>. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder.'
+		$orgasm_txt = ' You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
 		$orgasm_or = 'custom'
 		gs 'arousal', 'mast', 10
 		gs 'arousal', 'end'
 		gs 'stat'
-		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
-		act 'Go to Class':gt 'gschool_lessons', 'short_break'
+		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
+		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 end
 
@@ -668,14 +682,14 @@ if $ARGS[0] = 'caught1':
 	gs 'stat'
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtf.jpg"></center>'
-	'After a couple of minutes, you hear someone else in the bathroom with you. You peek out and see one of your teachers, Ms. Braakman, at the mirror. You duck back into the stall, close the door as quietly as you can and sit down on the toilet, your heart beating like crazy, hoping he didn''t notice you. You hear the click of her heels coming closer, closer... and stop, right outside your stall door.' 
+	'After a couple of minutes, you hear someone else in the bathroom with you. You peek out and see Ms. Braakman at the mirror. You duck back into the stall, close the door as quietly as you can and sit down on the toilet, your heart beating like crazy, hoping she didn''t notice you. You hear the click of her heels coming closer, closer... and stop, right outside your stall door.' 
 	*nl
-	'"I saw you in the mirror, young lady", she says sternly as she pushes the door open. "What do you think you are doing in the bathroom in the middle of the period, anyways? Skipping class?"'
-	if school_bunk = 1:'Her nostrils flare and her eyes narrow when she finds the source of the acrid smoke: The cigarette the shock over her appearance knocked out of your hand, leaving it to smolder on the floor. "And smoking in school, I see. I really thought you were smarter than that, <<$pcs_firstname>>."'
+	'"I saw you in the mirror, young lady." she says sternly as she pushes the door open. "What do you think you''re doing in the bathroom in the middle of the period? Skipping class?"'
+	if school_bunk = 1:'Her nostrils flare and her eyes narrow when she finds the source of the acrid smoke: The cigarette - the shock over her appearance knocked out of your hand, leaving it to smolder on the floor. "And smoking in school, I see. I really thought you were smarter than that, Miss <<$pcs_lastname>>."'
 	*nl
-	'Ms. Braakman shakes her head, looking more disappointed than angry to you. "Well, come on, young lady. Get your butt out of here and down to the principal''s office." She points in the direction of the bathroom door.'
-	'You don''t know what to say, if or how you could get out of this mess. Of course she knows you are supposed to be in class, so there''s no point in trying to lie to her about that; but maybe you can convince him to let you off with a warning or something.'
-	act 'Go to Principal''s Office':
+	'Ms. Braakman shakes her head, looking more disappointed than angry at you. "Well, come on young lady. Get out of here and down to the principal''s office." She points in the direction of the bathroom door.'
+	'You don''t know what to say, if or how you could get out of this mess. Of course she knows you are supposed to be in class, so there''s no point in trying to lie to her about that; but maybe you can convince him to let you off with a warning or something?'
+	act 'Go to the principal''s office':
 		demerit += 10
 		if school_bunk = 1:demerit += 5
 		gt 'gschool_office', 'principal'
@@ -685,10 +699,10 @@ if $ARGS[0] = 'caught1':
 		gs 'gschool_events', 'sweet'
 		if rand(1,100) < Sweet_talk + 25:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
-			'You hang your head and feign shame as best you can. "I know, and I''m sorry, Ms. Braakman, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have but I couldn''t help it." You give her a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
-			'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her... but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You **dare** lie to my face like that? Do you really think I am dumb enough to fall for that?" She doesn''t give you a chance to reply but reaches out, grabs you by the arm and, with surprising strength, pulls you out of the stall, then leads you out of the bathroom. "I''m taking you to the principal''s office. And you should pray that she''s feeling more lenient than I do right now."' 
+			'You hang your head and feign shame as best you can. "I know, and I''m sorry Ms. Braakman. I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have, but I couldn''t help it." You give her a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
+			'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her, but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You <i>dare</i> lie to my face like that? Do you really think I''m dumb enough to fall for that?" She doesn''t give you a chance to reply but reaches out, grabs you by the arm and, with surprising strength, pulls you out of the stall before leading you out of the bathroom. "I''m taking you to the principal''s office. And you should pray that she''s feeling more lenient than I do right now."' 
 			*nl
-			'True to her word, she drags you around school by your arm, furiously muttering under her breath, until you are standing in front of the principal''s office.'
+			'True to her word, she drags you around the school by your arm, furiously muttering under her breath, until you are standing in front of the principal''s office.'
 			act 'Go to Principal''s Office':
 				demerit += 10
 				if school_bunk = 1:demerit += 5
@@ -696,8 +710,8 @@ if $ARGS[0] = 'caught1':
 			end
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sweettalk'+rand(1,2)+'.jpg"></center>'
-			'You hang your head and feign shame as best you can. "I know, and I''m sorry, Ms. Braakman, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have but I couldn''t help it." You give her a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
-			'Ms. Braakman looks at you in silence, her expression unreadable, her eyes sharp like a predator''s, searching for dishonesty in your expression. You''re starting to get nervous, fearing that she might look through you... when you hear her sigh. Is that pity you see? "Alright, I''ll let you off with a warning and you take some time to collect yourself... but no more cutting class, you hear me?" You nod yes. She gives you a last look, mumbling something that sounds like "my good nature be damned", and goes about her business. A few seconds later, the bathroom is quiet again.'
+			'You hang your head and feign shame as best you can. "I know, and I''m sorry Ms. Braakman. I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have, but I couldn''t help it." You give her a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
+			'Ms. Braakman looks at you in silence, her expression unreadable, her eyes sharp like a predator''s, searching for dishonesty in your expression. You''re starting to get nervous, fearing that she might see through you... when you hear her sigh. "Alright, I''ll let you off with a warning and you take some time to collect yourself... but no more cutting class, you hear me?" You nod silently and she gives you a last look, mumbling something that sounds like "my good nature be damned", and goes about her business. A few seconds later, the bathroom is quiet again.'
 			if school_bunk = 0:
 				act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 			else
@@ -709,16 +723,16 @@ if $ARGS[0] = 'caught1':
 		*clr & cla
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
-		'You get up and walk past her, out of the stall, then get down on all fours. You meet her look of incomprehension with feigned innocence. "I know I''ve been a bad girl, Miss, but why does it have to be the principle? Couldn''t **you** punish me instead? Those demerits could ruin my life, and you would love a chance to teach me a lesson, wouldn''t you?" You wiggle your butt invitingly.'
+		'You get up and walk past her, out of the stall, then get down on all fours. You meet her look of incomprehension with feigned innocence. "I know I''ve been a bad girl Miss, but why does it have to be the principal? Couldn''t <i>you</i> punish me instead? Those demerits could ruin my life, and you would love a chance to teach me a lesson, wouldn''t you?" You wiggle your ass invitingly.'
 		act 'Continue':
 			*clr & cla
 			gs 'gschool_events', 'sweet'
 			if rand(1,100) < Sweet_talk + 35:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
-				'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her... but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You **dare** trying to manipulate me like that? Do you really think I''d be base enough to fall for such juvenile attempts at seduction?" She doesn''t give you a chance to reply but reaches out, grabs you by the arm and, with surprising strength, pulls you to your feet, then leads you out of the bathroom. "I''m taking you to the principal''s office. And you should pray that she''s feeling more lenient than I do right now."' 
+				'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her, but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You <i>dare</i> trying to manipulate me like that? Do you really think I''d be base enough to fall for such juvenile attempts at seduction?" She doesn''t give you a chance to reply but reaches out, grabs you by the arm and, with surprising strength, pulls you to your feet before leading you out of the bathroom. "I''m taking you to the principal''s office. And you should pray that she''s feeling more lenient than I do right now."' 
 				*nl
-				'True to her word, she drags you around school by your arm, furiously muttering under her breath, until you are standing in front of the principal''s office.'
-				act 'Go to Principal''s Office':
+				'True to her word, she drags you around the school by your arm, furiously muttering under her breath, until you are standing in front of the principal''s office.'
+				act 'Go to principal''s office':
 					demerit += 10
 					if school_bunk = 1:demerit += 5
 					gt 'gschool_office', 'principal'
@@ -730,9 +744,9 @@ if $ARGS[0] = 'caught1':
 						gs 'pain', 2, 'asscheeks', 'spank'
 						'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfspank.jpg"></center>'
-						'Ms. Braakman looks at you for a long moment. You can tell that she is seriously considering her options, can see a hardness in her eyes, a desire to punish you that seems greater than you expected. A moment later, she has made up her mind and walks over to you. "I suppose the principle doesn''t have to know about this, as long as you get properly punished." She grabs you by the hair, pulls you over to the sinks and bends you over the sinks, with your head nearly touching the mirror. "And make no mistake: I will make sure you''ll remember this lesson." She pulls your skirt up and your panties down with an ease that speaks of habit - maybe those rumors about the principal being a dominatrix were about the wrong teacher? You watch her rummage through her purse and bite your lower lip, a bit turned on by her display of dominance and experience and looking forward to a little spanking... but then your eyes go wide: The object she had been looking for is a large black wooden paddle. Suddenly, you wonder if the principal might have been the better alternative.'
+						'Ms. Braakman looks at you for a long moment. You can tell that she is seriously considering her options, can see a hardness in her eyes, a desire to punish you that seems greater than you expected. A moment later, she has made up her mind and walks over to you. "I suppose the principal doesn''t have to know about this, as long as you get properly punished." She grabs you by the hair, pulls you over to the sinks and bends you over, your head nearly touching the mirror. "And make no mistake: I will make sure you''ll remember this lesson." She pulls your skirt up and your panties down with an ease that speaks of habit - maybe those rumors about the principal being a dominatrix were about the wrong teacher? You watch her rummage through her purse and bite your lower lip, a bit turned on by her display of dominance and experience and looking forward to a little spanking... but then your eyes grow wide: The object she had been looking for is a large black wooden paddle. You suddenly wonder if the principal might have been the better alternative.'
 						*nl
-						'Before you even have a chance to protest, she brings the paddle down on your bare ass. The smack echoes in the room, as does your yelp of pain. After just one swing, your butt is already stinging like you''d sat down on a beehive, and her swings come quickly, each one bringing her full force and anger down on your cheeks. Each of them makes you jump inadvertently; you even hit your head against the mirror several times. Out of instinct, you try to shield your tender flesh from the paddle''s next blow, but Ms. Braakman quickly grabs your hands with her free one and pulls them out of the way, once again exhibiting a strength you wouldn''t expect from this slender woman.'
+						'Before you even have a chance to protest, she brings the paddle down on your bare ass. The smack echoes in the room, as does your yelp of pain. After just one swing, your ass is already stinging sharply, and her swings come quickly, each one bringing her full force and anger down on your cheeks. Each of them makes you jump inadvertently; you even hit your head against the mirror several times. Out of instinct, you try to shield your tender flesh from the paddle''s next blow, but Ms. Braakman quickly grabs your hands with her free one and pulls them out of the way, once again exhibiting a strength you wouldn''t expect from this slender woman.'
 						gs 'arousal', 'foreplay', 10, 'sub', 'maso'
 						gs 'stat'
 						act 'Continue':
@@ -744,9 +758,9 @@ if $ARGS[0] = 'caught1':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfspank.jpg"></center>'
 							'If you didn''t know better, you could have sworn she was getting off on hurting you. You try your best to hold back the tears, but by the tenth smack or so, the pain has gotten so intense that nothing can stop the tears from rolling down your cheeks, followed by soft sobs.'
 							*nl
-							'The dread of the next blow seems to slow down time, turning seconds into small eternities; counting the hits doesn''t help either. Ms. Braakman always looked kinda tough, but - ''***swat***'' FUCKING HELL, THAT HURT! - you never expected her to be the kind of woman who would turn your ass into an aching mess. Finally, after a full thirty swats, she stops and releases your hands. Your knees almost give away from relief. You rub your stinging ass cheeks while Ms. Braakman puts her paddle away. She looks immensely, almost physically satisfied. "You''re going to feel this punishment for a while. When you sit down in class, or try to, you''ll remember this and you''ll think twice about cutting class again. I will give you the rest of this period to recover, but," she warns as she leaves the bathroom, "God help you if I see you in here again."'
+							'The dread of the next blow seems to slow down time, turning seconds into small eternities; counting the hits doesn''t help either. Ms. Braakman always looked kind of tough, but you never expected her to be the kind of woman who would turn your ass into an aching mess. Finally, after a full thirty swats, she stops and releases your hands. Your knees almost give away from relief. You rub your stinging ass cheeks while Ms. Braakman puts her paddle away. She looks immensely, almost physically satisfied. "You''re going to feel this punishment for a while. When you sit down in class, or try to, you''ll remember this and you''ll think twice about cutting class again. I will give you the rest of this period to recover, but-" she warns as she leaves the bathroom, "God help you if I see you in here again."'
 							*nl
-							'You shiver at that promise and spend the rest of the period rubbing your ass, trying to get it to stop stinging; by the time you realize that it''s not gonna stop anytime soon, you''ve stopped crying and can at least put on a little makeup to make yourself more presentable. Once the bell rings, you head to class; the agony your hard chair promises makes skipping class seem a lot less appealing.'
+							'You shiver at that promise and spend the rest of the period rubbing your ass, trying to get it to stop stinging; by the time you realize that it''s not going to stop anytime soon, you''ve stopped crying and can at least put on a little makeup to make yourself more presentable. Once the bell rings, you head to class; the agony your hard chair promises makes skipping class seem a lot less appealing.'
 							if school_bunk = 0:
 								act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 							else
@@ -759,23 +773,23 @@ if $ARGS[0] = 'caught1':
 						*clr & cla
 						'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/strap.jpg"></center>'
-						'Ms. Braakman looks at you for a long moment. You can tell that she is seriously considering her options, can see a hardness in her eyes, a desire to punish you that seems greater than you expected. A moment later, she has made up her mind and walks over to you. "I suppose the principle doesn''t have to know about this, as long as you get properly punished." She grabs you by the hair, pulls you over to the sinks and bends you over the sinks, with your head nearly touching the mirror. "And make no mistake: I will make sure you''ll remember this lesson." She pulls your skirt up and your panties down with an ease that speaks of habit, then strips off your shirt and bra too - maybe those rumors about the principal being a dominatrix were about the wrong teacher? You watch her rummage through her purse and bite your lower lip, a bit turned on by her display of dominance and experience and looking forward to a little spanking... but then your eyes go wide: The object she had been looking for is a large black strapon. It looks like it could hurt a bit, but you''re already a little wet, so maybe it won''t be so bad. Steeling yourself, you reach down between your legs and spread your pussy lips to make it easier for her to enter.'
+						'Ms. Braakman looks at you for a long moment. You can tell that she is seriously considering her options, can see a hardness in her eyes, a desire to punish you that seems greater than you expected. A moment later, she has made up her mind and walks over to you. "I suppose the principal doesn''t have to know about this, as long as you get properly punished." She grabs you by the hair, pulls you over to the sinks and bends you over, your head nearly touching the mirror. "And make no mistake: I will make sure you''ll remember this lesson." She pulls your skirt up and your panties down with an ease that speaks of habit, then strips off your shirt and bra too - maybe those rumors about the principal being a dominatrix were about the wrong teacher? You watch her rummage through her purse and bite your lower lip, a bit turned on by her display of dominance and experience and looking forward to a little spanking... but then your eyes grow wide: The object she had been looking for is a large black strapon. It looks like it could hurt a bit, but you''re already a little wet, so maybe it won''t be so bad. Steeling yourself, you reach down between your legs and spread your pussy lips to make it easier for her to enter.'
 						*nl
-						'She notices and chuckles: "You were right, I''d love to punish you... but I''m going to punish you how **I** want." With the strapon in place, she slips a condom on and spreads some lube on it too. *If she''s even lubing it up, maybe this won''t be so bad*, you hope. If this is how she wants to punish you, then who are you to argue with your teacher? You start rubbing your spread pussy as she comes closer, planning to enjoy this.'
+						'She notices and chuckles: "You were right, I''d love to punish you... but I''m going to punish you how <i>I</i> want." She tightens the strapon into place and squirts some lube over it. "If she''s even lubing it up, maybe this won''t be so bad?" you hope. You start rubbing your pussy as she comes closer, planning to enjoy this.'
 						act 'Continue':
 							*clr & cla
 							'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfstrap.jpg"></center>'
-							'But instead of feeling it slip into your pussy, you feel the large, lubed-up tip force its way past your sphincter: She wants to fuck your ass with this huge thing! It hurts, and you try to pull away, but she grab your hips and keeps you in place. "You''ve been a bad little girl, <<$pcs_firstname>>", Ms. Braakman observes, her voice somewhere between imperious and gleeful, "and bad little girls deserve to have their asses punished." You shiver in fearful anticipation of the anal rape her words promise, but instead, all she does is slowly push the massive dildo in.'
+							'You wince in pain when instead of feeling it slip into your pussy, the lubed-up tip force its way into your asshole. It hurts, and you try to pull away, but she grabs your hips and keeps you in place. "You''ve been a bad little girl, <<$pcs_firstname>>!" Ms. Braakman states, her voice somewhere between imperious and gleeful, "and bad little girls deserve to have their asses punished." You shiver in fearful anticipation as she slowly pushes the massive dildo deeper inside.'
 							*nl
-							'It''s not exactly pleasant, and she seems to have no intention of stopping until at least a good part of it is inside you, but the pain is bearable. After a few seconds, she seems content with how much of your ass she has claimed and pulls out again, commencing the assfuck proper. However, that too proves much gentler than you''d expect, going neither very fast nor hard. In fact, now that your backdoor has had some time to adjust to the intrusion, it''s slowly starting to feel good. You remember that your hand is still resting on your pussy and tentatively brush against your clit. Yes, you realize, with a little extra stimulation, this might not be too bad. As you play with the cunt you so willingly offered your teacher, pleasure defeats pain as main sensation and a first sigh of desire escapes you. You hear a buzz coming from the harness now - sounds like that strapon came with gadgets.'
+							'It''s not exactly pleasant, and she seems to have no intention of stopping until at least a good part of it is inside you, but the pain is bearable. After a few seconds, she seems content with how much of your ass she has claimed and pulls out again, commencing the assfuck proper. However, that too proves much gentler than you''d expect, going neither very fast nor hard. In fact, now that your backdoor has had some time to adjust to the intrusion, it''s slowly starting to feel good. You remember that your hand is still resting on your pussy and tentatively brush against your clit. As you play with your now wet pussy, pleasure replaces pain and a moan of desire escapes you. You hear a buzz coming from the harness now - sounds like that strapon came with gadgets.'
 							*nl
-							'Her rhythm is steadily increasing, Ms. Braakman''s pounding your ass harder and deeper and, in turn, causing you to cry out louder. She''s starting to pant, the vibrating harness and sight of the schoolgirl whose ass she''s violating stoking the flames in pelvis. Whatever regard she displayed for your comfort is evidently gone now as she mercilessly hammers the strapon into you, going tip to root almost every time. But the truth is that you don''t need and, in fact, don''t *want* her to be gentle anymore, now that the eroticism of the situation has caught up with you: You''re a student, naked and bent over a school bathroom sink, and your female teacher is fucking your ass hard with a large strapon - it sounds like something out of a cheap porno, and you''re loving it. Your moans are loud, almost matching hers, as you feel warmth pool in your belly.'
+							'Her rhythm is steadily increasing, Ms. Braakman pounding your ass harder and deeper and, in turn, causing you to cry out louder. She''s starting to pant and whatever regard she displayed for your comfort is evidently gone now as she mercilessly hammers the strapon into you, going tip to root almost every time. You then realize that you don''t want her to be gentle anymore as the eroticism of the situation catches up with you. Your moans are loud, almost matching hers, as you feel a warmth pool in your belly.'
 							gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub'
 							gs 'arousal', 'end'
 							gs 'stat'
 							*nl
-							'All too soon, she cries out and goes still, nearly collapsing on your back when her orgasm hits, the strapon fully buried in your ass. You can feel her kisses on the back of your neck, a display of affection to contrast the rough anal you received, and she whispers: "My my, I really think you earned to take the rest of the period off." She gently pulls the strapon out of you and takes the harness off, then moves to the sinks to clean it up. "This will be our little secret, <<$pcs_firstname>>," she promises, smiling absentmindedly as she dries the dildo. After throwing the condom away and checking her appearance, she walks towards the exit and gives you one last look, a hint of desire gleaming through the cracks of her mask of authority and indifference, before she silently leaves the bathroom. You rub your butt, get dressed while your mind goes over what you just experienced, and you eventually find yourself back in your stall where you have to decide what to do with the rest of the period.'
+							'All too soon, she cries out and goes still, nearly collapsing on your back when her orgasm hits, the strapon fully buried in your ass. You can feel her kisses on the back of your neck, a display of affection to contrast the rough anal you received, and she whispers: "My my, I really think you earned the rest of the period off." She gently pulls the strapon out of you and takes the harness off, then moves to the sinks to clean it up. "This will be our little secret, <<$pcs_firstname>>." she promises, smiling absentmindedly as she dries the dildo. After checking her appearance, she walks towards the exit and gives you one last look, a hint of desire gleaming through the cracks of her mask of authority and indifference, before she silently leaves the bathroom. You rub your ass and get dressed while your mind goes over what you just experienced, and you eventually find yourself back in your stall where you have to decide what to do with the rest of the period.'
 							if school_bunk = 0:
 								act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 							else
@@ -797,28 +811,28 @@ if $ARGS[0] = 'caught1':
 			gs 'gschool_events', 'sweet'
 			if rand(1,100) < Sweet_talk + 30:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/eartwist.jpg"></center>'
-				'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her... but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You **dare** trying to manipulate me like that? Do you really think I''d be base enough to fall for such juvenile attempts at seduction?" She doesn''t give you a chance to reply but reaches out, grabs you by the arm and, with surprising strength, pulls you to your feet, then leads you out of the bathroom. "I''m taking you to the principal''s office. And you should pray that she''s feeling more lenient than I do right now."' 
+				'Ms. Braakman looks at you in silence. For a moment, you think you''ve convinced her, but then you see something change in her eyes: She wasn''t angry before, but she definitely is now. "You <i>dare</i> trying to manipulate me like that? Do you really think I''d be base enough to fall for such juvenile attempts at seduction?" She doesn''t give you a chance to reply but reaches out, grabs you by the arm and, with surprising strength, pulls you to your feet before leading you out of the bathroom. "I''m taking you to the principal''s office. And you should pray that she''s feeling more lenient than I do right now."' 
 				*nl
-				'True to her word, she drags you around school by your arm, furiously muttering under her breath, until you are standing in front of the principal''s office.'
-				act 'Go to Principal''s Office':
+				'True to her word, she drags you around the school by your arm, furiously muttering under her breath, until you are standing in front of the principal''s office.'
+				act 'Go to principal''s office':
 					demerit += 10
 					if school_bunk = 1:demerit += 5
 					gt 'gschool_office', 'principal'
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtffinger.jpg"></center>'
-				'Ms. Braakman looks at you for a long moment. You can tell that she is seriously considering her options, can see a hardness in her eyes give way to lust. She seems to be struggling with herself, but her words leave no doubt as to which side came out on top: "Take off your skirt and panties." Suppressing a smile, you do as she tells you and you get naked from the waist down. Once you are, she bends you over the sink, sucking on two of her fingers as she goes. With her other hand, she gives your bare ass several hard swats of the kind that make you yelp and leaves your butt red and stinging, but you almost immediately forget about that when she slides her wet fingers inside your pussy and starts finger-banging you with one hand. Ms. Braakman doesn''t ease up on the spanking but now all the pain does is add to the pleasure.'
+				'Ms. Braakman looks at you for a long moment. You can tell that she is seriously considering her options, can see a hardness in her eyes give way to lust. She seems to be struggling with herself, but her words leave no doubt as to which side came out on top: "Take off your skirt and panties." Suppressing a smile, you do as she tells you and get naked from the waist down. Once you are, she bends you over the sink, sucking on two of her fingers as she goes. With her other hand, she gives your bare ass several hard swats that make you yelp and leaves your ass red and stinging, but you almost immediately forget about that when she slides her wet fingers inside your pussy and starts finger-banging you with one hand. She doesn''t ease up on the spanking, but the pain adds to the pleasure.'
 				*nl
-				'Moans start to escape you; your teacher''s fingers seem to touch all the right spots inside you with unerring ease and you can feel the heat in your cunt build up - it looks like this woman is going to make you cum in record time!'
+				'Moans start to escape you; her fingers seem to touch all the right spots inside you with unerring ease and you can feel the heat in your pussy build up - it looks like this woman is going to make you cum in record time!'
 				$orgasm_or = 'no'
 				gs 'arousal', 'vaginal_finger', 10, 'lesbian'
 				gs 'stat'
-				'But just as you''re approaching the edge, she stops, pulls her fingers out of you and steps away. You want to protest, but her order preempts it: "Take off the rest of your clothes."'
+				'Just as you''re approaching the edge, she stops, pulls her fingers out of you and steps away. You want to protest, but her order preempts it: "Take off the rest of your clothes."'
 				
 				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/raven/sex/school/caughtfvag.jpg"></center>'
-					'Tense and frustrated, you do as you''re told, watching from the corner of your eyes as Ms. Braakman removes her blouse, skirt, and panties, leaving her naked save for her stockings and corset. With most clothes removed, she grabs you by your hair and pulls you into the stall; there, she puts one foot up on the disabled bar and presses your face against her crotch.'
+					'Tense and frustrated, you do as you''re told, watching from the corner of your eyes as Ms. Braakman removes her blouse, skirt and panties, leaving her naked save for her stockings and corset. She grabs you by your hair and pulls you into the stall; there, she puts one foot up on the disabled bar and presses your face against her crotch.'
 					*nl
 					'Even if the silent command wasn''t clear on its own, the glistening pussy in front of you leaves no room for doubt. You immediately attack her pussy and clit with your tongue, lapping at her inviting slit and occasionally taking her engorged button between your lips and sucking on it. Her grip on your head tightens and she grinds her pussy against your face, trying to increase the sensations you''re giving her. You can hear her moan softly from your ministrations and she seems to be getting wetter still. Minutes pass as you work her cunt with your mouth and she''s covered most of your face with her liquid before her sounds change, the telltale sign you''ve been waiting for.'
 					*nl
@@ -826,7 +840,7 @@ if $ARGS[0] = 'caught1':
 					gs 'arousal', 'cuni_give', 10, 'lesbian', 'sub'
 					gs 'arousal', 'end'
 					gs 'stat'
-					'She basks in the afterglow, rhythmically moving against you still but without the need that drove her before. Once she has come back to her senses, she immediately lets go off your hair and moves her leg back down. Your teacher awkwardly moves past you and starts getting dressed, and even as you join her at the sinks to wash her secretions off of you, she avoids your curious gaze. "This never happened, you understand? You stay in this stall until I leave, and we will both forget this ever happened." It would seem that she''s regretting your encounter, now that her lust is sated and she''s cleaning herself up. Still, you nod, and a few seconds later, she hastily leaves the bathroom. Alone once more, you gather up your clothes and get dressed - looks like your still have a little bit of time to kill before the bell rings.'
+					'She basks in the afterglow, rhythmically moving against you still but without the need that drove her before. Once she has come back to her senses, she immediately lets go off your hair and moves her leg back down. She awkwardly moves past you and starts getting dressed, and even as you join her at the sinks to wash her secretions off, she avoids your curious gaze. "This never happened, you understand? You stay in this stall until I leave, and we will both forget this ever happened." It would seem that she''s regretting your encounter, now that her lust is sated and she''s cleaning herself up. You nod, and a few seconds later, she hastily leaves the bathroom. Alone once more, you gather up your clothes and get dressed - looks like you still have a little bit of time to kill before the bell rings.'
 					if school_bunk = 0:
 						act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 					else
@@ -846,12 +860,12 @@ if $ARGS[0] = 'caught2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caught'+ rand(1,2) +'.jpg"></center>'
 	'After a couple of minutes, you hear someone else in the bathroom with you. You peek out and see one of your male teachers standing at the mirror. You duck back into the stall, close the door as quietly as you can and sit down on the toilet, your heart beating like crazy, hoping he didn''t notice you. What the hell is he doing in the girls bathroom anyways?! You hear his footsteps coming closer, closer... and stop, right outside your stall door.' 
 	*nl
-	'"I saw you in the mirror, young lady", he says sternly as he pushes the door open. "What do you think you are doing anyways? Skipping class?"'
-	if school_bunk = 1:'His eyes fall on the smoldering cigarette on the ground. His eyes narrow. "Smoking in school, I see. I really thought you were smarter than that, <<$pcs_firstname>>."'
+	'"I saw you in the mirror, young lady." he says sternly as he pushes the door open. "What do you think you''re doing anyways? Skipping class?"'
+	if school_bunk = 1:'His eyes fall on the smoldering cigarette on the ground. His eyes narrow. "Smoking in school, I see. I really thought you were smarter than that, Miss <<$pcs_lastname>>."'
 	*nl
-	'Your teacher shakes his head. He looks more disappointed than angry, you think. "Well, come on, young lady. Get your butt out of here and down to the principal''s office." He points in the direction of the bathroom door.'
+	'Your teacher shakes his head. He looks more disappointed than angry, you think. "Well, come on young lady. Get down to the principal''s office." He points in the direction of the bathroom door.'
 	'You don''t know what to say, if or how you could get out of this mess. Of course he knows you are supposed to be in class, so there''s no point in trying to lie to him about that, but maybe you can convince him to let you off with a warning or something.'
-	act 'Go to Principal''s Office':
+	act 'Go to principal''s office':
 		demerit += 10
 		if school_bunk = 1:demerit += 5
 		gt 'gschool_office', 'principal'
@@ -861,17 +875,17 @@ if $ARGS[0] = 'caught2':
 		gs 'gschool_events', 'sweet', 'normal'
 		if rand(1,100) < Sweet_talk:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-			'You hang your head and feign shame as best you can. "I know, and I''m sorry, sir, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have but I couldn''t help it." You give him a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
-			'The teacher looks at you and snorts. "Do you really think I am dumb enough to fall for that?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall, then leads you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
+			'You hang your head and feign shame as best you can. "I know, and I''m sorry sir, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have, but I couldn''t help it." You give him a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
+			'The teacher looks at you and snorts. "Do you really think I''m dumb enough to fall for that?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
 			'He is nothing if not a man of his word, and he drags you down the hall, by your arm, until you are standing in front of the principal''s office.'
-			act 'Go to Principal''s Office':
+			act 'Go to principal''s office':
 				demerit += 10
 				if school_bunk = 1:demerit += 5
 				gt 'gschool_office', 'principal'
 			end
 		else
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sweettalk'+rand(1,2)+'.jpg"></center>'
-			'You hang your head and feign shame as best you can. "I know, and I''m sorry, sir, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have but I couldn''t help it." You give him a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
+			'You hang your head and feign shame as best you can. "I know, and I''m sorry sir, but I was feeling stressed out and I just needed a break, just a few minutes alone. I know I shouldn''t have, but I couldn''t help it." You give him a pleading look. "Please, please don''t report me. I promise I won''t do it again."'
 			'Your teacher looks at you for a long minute and then sighs. You think you can see pity in his eyes. "Okay. I''ll let you off with a warning and you take some time to collect yourself... but no more cutting class, you hear me?" You nod that you understand, then he shakes his head, mumbles something that sounds like "my good nature be damned" and goes about his business. A few seconds later, the bathroom is quiet again, leaving you to wonder why he was in the girls bathroom in the first place. You can''t think of a good reason.'
 			if school_bunk = 0:
 				act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
@@ -890,9 +904,9 @@ if $ARGS[0] = 'caught2':
 			gs 'gschool_events', 'sweet', 'sex'
 			if rand(1,100) < Sweet_talk:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-				'The teacher looks at you and snorts. "Please, don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall, then leads you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
-				'He is nothing if not a man of his word, and he drags you down the hall, by your arm, until you are standing in front of the principal''s office.'
-				act 'Go to Principal''s Office':
+				'The teacher looks at you and snorts. "Please don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
+				'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
+				act 'Go to principal''s office':
 					demerit += 10
 					if school_bunk = 1:demerit += 5
 					gt 'gschool_office', 'principal'
@@ -900,11 +914,11 @@ if $ARGS[0] = 'caught2':
 			else
 				gs 'boyStat', 'A128'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtbj.jpg"></center>'
-				'He looks down at you and seems to freeze. He doesn''t say anything, doesn''t move away either - all he does is look at you, transfixed with your lips. You decide to take that as assent, stretch out your hand and unzip his pants. You reach inside and feel that his dick is almost hard already; seems like you read his reaction right, you think to yourself with a smile.'
+				'He looks down at you and seems to freeze. He doesn''t say anything, doesn''t move away either - all he does is look at you, transfixed with your lips. You decide to take that as a yes, stretch out your hand and unzip his pants. You reach inside and feel that his dick is almost hard already.'
 				*nl
-				'He pulls his pants down a little bit, just enough to release his manhood and make it easier for you. You give him an appreciative look and stroke his dick a few times until it is fully hard, then lean forward and start licking it; you lick up the shaft and back down, then back up, run your tongue around the head once, twice, thrice, four times, your eyes locked with his all the while... before you smile at him and take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick and start bobbing your head, stroking his cock with your lips, your tongue still making its rounds. He rests one hand on the top of your head, but he lets you completely control the action.'
+				'He pulls his pants down a little bit, just enough to release his manhood and make it easier for you. You give him an appreciative look and stroke his dick a few times until it is fully hard, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head, your eyes locked with his all the while before you smile at him and take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick and start bobbing your head, stroking his cock with your lips, your tongue still making its rounds. He rests one hand on the top of your head, but he lets you completely control the action.'
 				*nl
-				'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him deeper inside, too, as deep into your mouth as you can without gagging. He starts moaning now, all false pretense of self-possession gone, completely at the mercy of you, his student, right here in a school bathroom - the thought is empowering and intoxicating. You feel his hand dig into your hair and can tell that he is getting close to cumming.'
+				'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him as deep into your mouth as you can without gagging. He starts moaning and you feel his hand dig into your hair, telling you that he is getting close to cumming.'
 				gs 'arousal', 'bj', 10, 'dom'
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -913,12 +927,12 @@ if $ARGS[0] = 'caught2':
 					gs 'stat'
 					'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg"></center>'
-					'You pick up the pace even more, you want him finish soon. "I''m about to cum", he mutters weakly, as if trying to warn you - maybe his wife or girlfriend doesn''t swallow, you think, but you don''t care and suck him even harder. He starts grunting and you feel his dick throbbing in your mouth, when he suddenly pulls your head away, his hand in your hair firmly gripping you.'
+					'You pick up the pace even more, you want him finish soon. "I''m about to cum!" he mutters weakly, as if trying to warn you, but you don''t care and suck him even harder. He starts grunting and you feel his dick throbbing in your mouth, when he suddenly pulls your head away, his hand in your hair firmly gripping you.'
 					*nl
-					'As soon his dick is out of your mouth with a loud pop, his free hand goes to it at once and he jerks it a couple of times, pointing it at you. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth, a small flood of white he must have been saving up for several days, at least. When the well in his balls dries up, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He pulls himself out of your mouth again and tucks his dick back into his pants.'
+					'As soon his dick loudly pops out of your mouth, he jerks it a couple of times while pointing it at you. It soon starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. When he finishes, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He then pulls out of your mouth and tucks his dick back into his pants.'
 					*nl
-					'Without a word, your teacher walks over to one of the sinks and washes his hands; he seems to be ignoring you but you can see that he''s looking at you in the mirror. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret." With a chuckle, he leaves out of the bathroom - in fact, you think you can hear him whistling outside as he walks away.' 
-					'You go to the mirror yourself and clean yourself up, get the cum off your face and fix your hair. That wasn''t too bad, you think, and at least you have the rest of the period to yourself. Still, you wonder what he was doing in the girls bathroom, besides getting a blowjob.'
+					'Without a word, your teacher walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s looking at you in the mirror. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret." With a chuckle, he leaves - in fact, you think you can hear him whistling outside as he walks away.' 
+					'You go to the mirror yourself, clean yourself up and fix your hair. That wasn''t too bad, you think, and at least you have the rest of the period to yourself. Still, you wonder what he was doing in the girls bathroom in the first place.'
 					if school_bunk = 0:
 						act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 					else
@@ -932,33 +946,33 @@ if $ARGS[0] = 'caught2':
 		*clr & cla
 		'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/bendover.jpg"></center>'
-		'You get up and walk past him, out of the stall, then bend over against the wall. One of your hand runs down to your butt and you hike the skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at Mr. Vasilyev over your shoulder, and now you say: "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your butt.'
+		'You get up and walk past him, out of the stall, then bend over against the wall. One of your hands runs down to your ass and you hike your skirt a bit, then a bit more... then a little bit more, just enough to see a hint of your crotch. All the while, you are looking at him over your shoulder. "I know I''ve been a bad, bad girl... and I don''t want any demerits. If you don''t report me, sir, I will let you fuck me." You follow your offer up with an inviting wiggle of your ass.'
 		act 'Continue':
 			*clr & cla
 			gs 'gschool_events', 'sweet', 'sex'
 			if rand(1,100) < Sweet_talk:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/angryteacher.jpg"></center>'
-				'Your teacher looks at you and snorts. "Please, don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall, then leads you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
-				'He is nothing if not a man of his word, and he drags you down the hall, by your arm, until you are standing in front of the principal''s office.'
-				act 'Go to Principal''s Office':
+				'Your teacher looks at you and snorts. "Please don''t embarrass yourself, or me, with such juvenile attempts at seduction. Did you really think that would work on me?" He doesn''t wait for your reply but reaches out, grabs you by the arm and pulls you out of the stall before leading you out of the bathroom. "Come on, I''m taking you to the principal''s office."' 
+				'He is nothing if not a man of his word, and he drags you down the hall by your arm until you are standing in front of the principal''s office.'
+				act 'Go to principal''s office':
 					demerit += 10
 					if school_bunk = 1:demerit += 5
 					gt 'gschool_office', 'principal'
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/seduction.jpg"></center>'
-				'Your teacher looks at you for a long moment. You can tell that he is seriously considering his options; you can also see one of those ''options'' getting hard in his pants while he stares at your ass. You smile and tug at your skirt, causing it to rise and fall just a tiny bit every time. Only a few seconds later, he walks towards you, pulling out his dick and stroking it - apparently, your wiggling tight nubile ass was too much for him to say no to. When he reaches you, he pushes you down. "Get on your knees and give me a blow job."' 
+				'Your teacher looks at you for a long moment. You can tell that he is seriously considering his options; you can also see one of those ''options'' getting hard in his pants while he stares at your ass. You smile and tug at your skirt, causing it to rise and fall just a tiny bit every time. Only a few seconds later, he walks towards you while pulling out his dick and stroking it. When he reaches you, he pushes you down. "Get on your knees and give me a blowjob."' 
 				'You do as he says and reach out for his cock.'
 				act 'Suck him':
 					*clr & cla
 					gs 'boyStat', 'A128'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtbj.jpg"></center>'
-					'You stroke his dick a few times until it is fully hard, then lean forward and start licking it; you lick up the shaft and back down, then back up, run your tongue around the head once, twice, thrice, four times, your eyes locked with his all the while... before you smile at him and take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick and start bobbing your head, stroking his cock with your lips, your tongue still making its rounds. He rests one hand on the top of your head, but he lets you completely control the action.'
+					'You stroke his dick a few times until it is fully hard, then lean forward and start licking it; you lick up and down the shaft and run your tongue around the head, your eyes locked with his all the while before you smile at him and take his <<dick>>cm <<$dick_girth>> cock into your mouth. You wrap your <<$liptalk>> tightly around his dick and start bobbing your head, stroking his cock with your lips, your tongue still making its rounds. He rests one hand on the top of your head, but he lets you completely control the action.'
 					*nl
-					'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him deeper inside, too, as deep into your mouth as you can without gagging.'
+					'You caress and fondle his balls with one of your hands while the other strokes him in unison with your head''s movement. You increase your speed over time and take him as deep into your mouth as you can without gagging.'
 					gs 'arousal', 'bj', 10, 'dom'
 					gs 'stat'
-					'He enjoys your blowjob in silence and after several minutes of this, he grabs you by the hair and roughly pulls you up and over to the sinks.'
+					'He enjoys your blowjob in silence and after several minutes, he grabs you by the hair and roughly pulls you up and over to the sinks.'
 					if pcs_vag = 0:
 						act 'Cum': gs 'arousal', 'end' & gt 'gschool_girls_bathroom', 'caught2_cum'
 					else
@@ -966,17 +980,20 @@ if $ARGS[0] = 'caught2':
 							*clr & cla
 							'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtsex.jpg"></center>'
-							'He has you get up on one of the sinks, pushes up your skirt all the way and pulls down your panties, tossing them aside. His fingers find your pussy a few moments later and it seems he''s making sure you are good and wet. Then you see a condom in his hand - does he always have one in his pocket when he''s at school? - and he puts it on. As he does that, you try to get comfortable but it is not easy with the faucet jabbing you in the back.'
-							*nl
-							'Once the condom is in place, he rubs the tip of his dick against your pussy lips, making sure it is well lubricated, then gently pushes his <<dick>>cm <<$dick_girth>> cock inside you, causing you to gasp. His movements are slow and he is taking all the time in the world to work his way deeper into you, one of his hands rubbing your clit all the while. You groan in pleasure; you hardly even notice the faucet jabbing into your back anymore.'
-							*nl
-							'He might have been slow at first but he''s steadily picking up the pace, now that he is balls deep inside you; he stays gentle with you the whole time, though, and keeps stimulating your clit and occasionally kneads your breasts as well. You didn''t expect this to feel so good and cry out: "Oh God! Fuck me, sir! Fuck me harder!" He smiles and indeed gets a little rougher with you. Once or twice, he lifts his fingers from your wet pussy and sticks them into your mouth for you to suck them, tasting your own juices.'
-							$orgasm_txt = 'With an unexpectedly considerate lover like that, it doesn''t take long until you orgasm and scream out your ecstasy, your wet folds twitching around your teacher''s hard cock. He doesn''t let up, though, and his stamina seems to know no limit, violating your pussy in all the right ways. A second orgasm and even a third shake you before he finally starts to grunt.'
-							$orgasm_or = 'custom'
-							gs 'arousal', 'vaginal', 10, 'dom'
-							gs 'arousal', 'end'
-							gs 'stat'
-
+							if $pantyworntype = 'true':
+						        'He has you get up on one of the sinks while pulling your skirt up. His fingers find your pussy a few moments later and it seems he''s making sure you are good and wet. Then you see a condom in his hand and he puts it on. As he does that, you try to get comfortable, but it is not easy with the faucet jabbing you in the back.'
+					        else
+							    'He has you get up on one of the sinks, pushes up your skirt all the way and pulls down your panties, tossing them aside. His fingers find your pussy a few moments later and it seems he''s making sure you are good and wet. Then you see a condom in his hand and he puts it on. As he does that, you try to get comfortable, but it is not easy with the faucet jabbing you in the back.'
+							    *nl
+							    'Once the condom is in place, he rubs the tip of his dick against your pussy lips, making sure it is well lubricated, then gently pushes his <<dick>>cm <<$dick_girth>> cock inside you, causing you to gasp. His movements are slow and he is taking all the time in the world to work his way deeper into you, one of his hands rubbing your clit all the while. You moan in pleasure; you hardly even notice the faucet jabbing into your back anymore.'
+							    *nl
+							    'He might have been slow at first, but he''s steadily picking up the pace now that he is balls deep inside you; he stays gentle with you the whole time though and keeps stimulating your clit and occasionally kneads your breasts as well. You didn''t expect this to feel so good and cry out: "Oh God! Fuck me, sir! Fuck me harder!" He smiles and indeed gets a little rougher with you. Once or twice, he lifts his fingers from your wet pussy and sticks them into your mouth for you to suck them, tasting your own juices.'
+							    $orgasm_txt = 'With an unexpectedly considerate lover like that, it doesn''t take long until you orgasm and scream out your ecstasy, your wet folds twitching around your teacher''s hard cock. He doesn''t let up though, and his stamina seems to know no limit, violating your pussy in all the right ways. A second orgasm and even a third shake you before he finally starts to grunt.'
+							    $orgasm_or = 'custom'
+							    gs 'arousal', 'vaginal', 10, 'dom'
+							    gs 'arousal', 'end'
+							    gs 'stat'
+                            end
 							act 'Cum': gt 'gschool_girls_bathroom', 'caught2_cum'
 						end
 					end
@@ -991,10 +1008,10 @@ if $ARGS[0] = 'caught2_cum':
 	menu_off = 1
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/makar/sex/school/caughtcum.jpg"></center>'
-	'Your teacher pulls out of you and you off the sink, gentle pushing you down to your knees while he gets rid of the condom. He holding his dick near your face, right in front of your mouth, and jerks it a couple of times. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth, a small flood of white he must have been saving up for several days, at least. When the well in his balls dries up, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He pulls himself out of your mouth again and tucks his dick back into his pants.'
+	'Your teacher pulls out of you and drags you off the sink, gently pushing you down to your knees while he gets rid of the condom. He holding his dick near your face, right in front of your mouth, and jerks it a couple of times. It starts spurting loads of hot cum out and the jets land all over your face, mostly around your mouth. When he finishes, he rubs the tip of his dick against your lips and then shoves it back into your mouth, the sight of you covered in his cum emboldening him. You look up at him while you suck his cock clean, smiling around him as you feel him getting soft in your mouth. He pulls out of your mouth and tucks his dick back into his pants.'
 	*nl
-	'Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you but you can see that he''s giving you sideways glances. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret."' 
-	'You smile back. "If I get ''punished'' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. You get up to the mirror now and clean yourself up, get the cum off your face, wipe the sweat and pussy juices off, fix your hair. That was amazing, you think, and not only do you feel a little sore from the orgasms but you also have the rest of the period to yourself. Still, you can''t help but wonder what he was doing in the girls bathroom - besides fucking one of his students silly, of course.'
+	'Without a word, he walks over to one of the sinks and washes his hands; he seems to be ignoring you, but you can see that he''s giving you sideways glances. Finally, he smiles and says: "Feel free to cut class any time you like, <<$pcs_firstname>>. I''ll happily keep your secret."' 
+	'You smile back. "If I get ''punished'' like that every time I skip class, I will." He chuckles at that, shakes his head, then leaves the bathroom - you think you can hear him whistling outside as he walks away. You get up to the mirror, clean yourself up and fix your hair. That was amazing and you also have the rest of the period to yourself. Still, you can''t help but wonder what he was doing in the girls bathroom in the first place.'
 	if school_bunk = 0:
 		act 'Continue to play on phone':gt 'gschool_girls_bathroom', 'bathroom2'
 	else
@@ -1008,40 +1025,40 @@ if $ARGS[0] = 'caught3':
 	gs 'stat'
 	'<center><b><font color="maroon">Girls bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caughtpr1.jpg"></center>'
-	'After a couple of minutes, you hear someone else in the bathroom with you. You peek out and see Miss Volkov, standing at the mirror. You duck back into the stall, close the door as quietly as you can and sit down on the toilet, your heart beating like crazy, hoping she didn''t notice you. You hear her footsteps coming closer, closer... and stop, right outside your stall door.' 
+	'After a couple of minutes, you hear someone else in the bathroom with you. You peek out and see Miss Volkov standing at the mirror. You duck back into the stall, close the door as quietly as you can and sit down on the toilet, your heart beating like crazy, hoping she didn''t notice you. You hear her footsteps coming closer, closer... and stop, right outside your stall door.' 
 	*nl
-	'"I saw you in the mirror, girl", she says menacingly as he pushes the door open. "What do you think you are doing? Skipping class, I presume?" Then her eyes fall on the smoldering cigarette on the ground. Her eyes narrow to slits. "And smoking in school, too, huh? You know how I feel about students smoking in my school."'
+	'"I saw you in the mirror, girl." she says menacingly as she pushes the door open. "What do you think you are doing? Skipping class, I presume?" Then her eyes fall on the smoldering cigarette on the ground and her eyes narrow. "And smoking in school too, huh? You know how I feel about students smoking in my school."'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caughtpr2.jpg"></center>'
-		'Before you can even respond, she grabs you painfully by the hair and yanks the cigarette out of your mouth. "I am tired of you kids thinking you can just do anything you want, well you can''t, there are consequences to your actions."'
-		'She seems really pissed, you try to explain come up with anything to defuse this, but she is having none of it. She interupts you before you even get a word out. "I don''t want to hear any of your feeble excuses!"'
+		'Before you can even respond, she grabs you painfully by the hair and yanks the cigarette out of your mouth. "I am tired of you kids thinking you can just do anything you want. Well, you can''t and you need to learn that there are consequences to your actions."'
+		'She seems really pissed. You try tt come up with anything to defuse the situation, but she is having none of it. She interupts you before you even get a word out. "I don''t want to hear any of your feeble excuses!"'
 		act 'Not the ear':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caughtpr3.jpg"></center>'
-			'She tosses the cigarette between your legs into the toilet, followed by her grabbing your uniform in one hand and your ear with her other hand. She painfully twists your ear and drags you out of the stall, so fast you nearly stumble and fall. "You will learn to respect me and this school, no matter what. Before I am done with you missy you will either be toeing the line or begging to be expelled."'
+			'She tosses the cigarette between your legs into the toilet, followed by her grabbing your uniform in one hand and your ear with her other hand. She painfully twists your ear and drags you out of the stall so fast you nearly stumble and fall. "You will learn to respect me and this school, no matter what. You''ll either be toeing the line or begging to be expelled when I''m done with you young lady."'
 			act 'She''s really pissed':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caughtpr4.jpg"></center>'
-				'She twists you ear so painfully that tears well up in your eyes. She forces you down on all fours on the floor, she slides her foot forward and then forces your head down right over her shoe. "Lick my shoes clean" When you hesitate she twists your ear hard enough you think she is about to rip if off the side of your head. Not having much of a choice your start licking her shoes. After you do as you are told and lick her shoes for a bit she lets go of your ear and instead directs you how to lick her shoes. You are tempted to stop but you know she will just get ahold of your ear again or worse, so you do as you are instructed.'
+				'She twists you ear so painfully that tears well up in your eyes. She forces you down on all fours on the floor, slides her foot forward and forces your head down. "Lick my shoes clean" When you hesitate, she twists your ear hard enough you think she is about to rip if off the side of your head. Not having much of a choice, you start licking her shoes. After you do as you are told, she lets go of your ear and instead directs you on how to lick her shoes. You are tempted to stop, but you know she will just grab your ear again, or worse, so you do as you are instructed.'
 				gs 'arousal', 'foreplay', 10, 'sub', 'humiliation'
 				gs 'stat'
 				act 'This is not fair':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/caughtpr5.jpg"></center>'
-					'As you lick her shoes, she reaches down and grabs you by the hair and twists it painfully in her hand, yanking you to your feet by your hair painfully. Once back on your feet she pushes you forward bending you over, her hand in you hair holds you in place while her other hand pulls up your skirt and pulls your panties down around your knees.'
+					'As you lick her shoes, she reaches down, grabs you by the hair and twists it painfully in her hand before painfully yanking you to your feet. She then pushes you forward, bending you over as her hand in your hair holds you in place while her other hand pulls up your skirt and pulls your panties down around your knees.'
 					gs 'arousal', 'foreplay', 10, 'sub', 'maso'
 					gs 'arousal', 'end'
 					gs 'stat'
-					if $pantyworntype = 'none': 'As you lick her shoes, she reaches down and grabs you by the hair and twists it painfully in her hand, yanking you to your feet by your hair painfully. Once back on your feet she pushes you forward bending you over, her hand in you hair holds you in place while her other hand pulls up your skirt and when she can''t find your panties. She twists your hair painfully. "You dirty little slut, where are your panties? From now on you better be wearing panties in my school, you hear me?!" She''s not waiting for a reply.'
+					if $pantyworntype = 'none': 'As you lick her shoes, she reaches down, grabs you by the hair and twists it painfully in her hand before painfully yanking you to your feet. She then pushes you forward, bending you over as her hand in you hair holds you in place while her other hand pulls up your skirt. When she can''t find your panties, she again painfully twists your hair. "You dirty little slut, where are your panties? You better be wearing panties in my school from now on, you hear me?!" She''s not waiting for a reply.'
 					*nl
 					if detention_set = 0:
 						detention_set = 1
 						gs 'pain', 2, 'asscheeks', 'spank'
-						'Once your bare ass is exposed your begins to spank it with her open hand. She uses the full force of her swings to deliver stinging slaps to your bare ass. She spanks you until your ass is cherry red, she seems to only stop when her hand starts to hurt too much from spanking you to continue. She finally lets go of you and steps away. "In addition you will report to detention this weekend. Now get your ass to class and I don''t want to catch you cutting class again, you understand?" You nod your head and wipe away the tears, you straighten up your clothes and go to class.'
+						'Once your bare ass is exposed, she begins to spank it with her open hand. She uses the full force of her swings to deliver stinging slaps to your bare ass and spanks you until your ass is cherry red. She only stops when her hand starts to hurt too much to continue. She finally lets go of you and steps away. "In addition, you will report to detention this weekend. Now get your ass to class! I don''t want to catch you cutting class again, you understand?" You nod your head and wipe away the tears before you straighten up your clothes and go to class.'
 					else
 						gs 'pain', 2, 'asscheeks', 'spank'
-						'Once your bare ass is exposed your begins to spank it with her open hand. She uses the full force of her swings to deliver stinging slaps to your bare ass. She spanks you until your ass is cherry red, she seems to only stop when her hand starts to hurt too much from spanking you to continue. She finally lets go of you and steps away.' 
+						'Once your bare ass is exposed, she begins to spank it with her open hand. She uses the full force of her swings to deliver stinging slaps to your bare ass and spanks you until your ass is cherry red. She only stops when her hand starts to hurt too much to continue. She finally lets go of you and steps away.' 
 !!Todo: Has to be written
 !!						'"In addition you will report to my office after school. Now get your ass to class and I don''t want to catch you cutting class again, you understand?" You nod your head and wipe away the tears, you straighten up your clothes and go to class.'
 					end

+ 2 - 2
locations/gschool_gossip.qsrc

@@ -354,7 +354,7 @@ if $ARGS[0] = 'mixed':
 		'"I think she takes singing lessons or something."'
 		'"With a voice like hers, she probably sucks him off so he doesn''t run out."'
 	elseif chat_rand = 72:
-		if zverSlutQW >= 1:
+		if christinaQW['fight'] >= 1:
 			'"Did you hear Christina got her ass beat?"'
 			'"I was there! That girl tore Christina to pieces!"'
 			'"Good, if anybody had it coming, it was her."'
@@ -478,7 +478,7 @@ if $ARGS[0] = 'mixed':
 		'"She is their so called backup member. Honestly, she is probably only there so they can laugh at her."'
 		'"Poor naive girl doesn''t know what she''s gotten herself into."'
 	elseif chat_rand = 94:
-		if zverSlutQW >= 1:
+		if christinaQW['dompath'] >= 6:
 			'"Did you hear Christina was kicked off the cheerleading team?"'
 			'"Really? How come?"'
 			'"Between the rumors about Christina blowing the coach, and her face getting fucked up from her fight with <<$pcs_nickname>>, Albina didn''t want her anymore."'

+ 63 - 56
locations/gschool_grounds.qsrc

@@ -141,7 +141,7 @@ if $ARGS[0] = 'main':
 
 !!	act 'Go to the Principals Office': gt
 
-	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and gm_school_block = 0:
+	if week < 6 and hour >= 6 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0:
 		if CloStyle2 = 4 or Enable_sforma = 1:
 			gs 'gschool_socialchg', 'group_student_rel_change_2'
 			if hour = 6:
@@ -190,9 +190,9 @@ if $ARGS[0] = 'main':
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint behind the school building': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
-	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and gm_school_block = 0: act 'Go to detention': gt 'gschool_detention', 'start'
+	if week = 6 and hour = 8 and StoryLine > 0 and SchoolAtestat = 0 and detention_set = 1 and SchoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
 
-	if zverRageQW = 1: gt 'gschool_grounds', 'KristinaFight'
+	if christinaQW['dompath'] = 4: gt 'gschool_grounds', 'KristinaFight'
 
 	if week < 6 and hour = 14 and dimaRevenge = 5 and dimaRevChoice = 0:
 		gt 'dimaRevenge', dimaRevenge
@@ -238,14 +238,12 @@ if $ARGS[0] = 'main':
 
 		if ivan_afterschool = 1: act 'Meet Ivan after school': gt 'gschool_sex', 'afterschool'
 
-		if LinaSlut > 0 and rand(1,10) < 3: 'You see Lina, Dan and Vasily leaving the school together.'
-
 		if Enable_tablemap = 0:
 			if anushkaFirstvisit = 0 and meet_after_school = 1: '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a> is leaning against a tree just in front of the school.'
-			if LariskaHomeIn > 0 and cheerleaders_on = 0: '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
+			if LariskaQW['story'] >= 4 and cheerleaders_on = 0: '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
 			if JuliaMilLernQW >= 1: '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a> is sitting somewhere on the school courtyard, reading a book.'
 			if NatbelQW['QWstage'] > 0: '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a> is standing in a corner.'
-			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: '<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
+			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
 			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5: '<a href="exec:minut += 1 & gt ''AleksandraGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a> is waiting for you at the end of the school courtyard, listening to music.'
 
 			if katjaMeynoldday ! daystart and meynoldQW >= 1: '<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a> is walking across the school courtyard, getting ready to go home.'
@@ -272,10 +270,10 @@ if $ARGS[0] = 'main':
 			!display friends in table if switch is on.
 			st_count=0 & $show_table=''
 			if anushkaFirstvisit = 0 and meet_after_school = 1: gs 'show_table', '<a href="exec: gt ''anushka'', ''meet_after_school''">Anushka Konstantinov</a>', '5'
-			if LariskaHomeIn > 0 and cheerleaders_on = 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>', '5'
+			if LariskaQW['story'] >= 4 and cheerleaders_on = 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>', '5'
 			if JuliaMilLernQW >= 1: gs 'show_table', '<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a>', '5'
 			if NatbelQW['QWstage'] > 0: gs 'show_table', '<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>', '5'
-			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a>', '5'
+			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0 and artlie ! 2 and artembrokenheart ! 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''artem_events'', ''start''">Artem Chebotarev</a>', '5'
 			if npc_QW['A231'] = 1 or npc_QW['A231'] = 3 or npc_QW['A231'] >= 5: gs 'show_table', '<a href="exec:minut += 1 & gt ''AleksandraGo'', ''Start''"><<$npc_firstname[''A231'']>> <<$npc_lastname[''A231'']>></a>', '5'
 			if katjaMeynoldday ! daystart and meynoldQW >= 1: gs 'show_table', '<a href="exec:minut += 15 & gt ''katjaEv''">Katja Meynold</a>', '5'
 			if DimaBeHomeOnce = 1 and DimaRudeBlock = 0:
@@ -349,7 +347,7 @@ if $ARGS[0] = 'sports':
 
 	act 'Leave the sports field': minut += 1 & gt 'gschool_grounds', 'main'
 
-	if schoolrunday ! daystart and $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
+	if schoolrunday ! daystart and $clothingworntype = 'exercise' and $shoeworntype = 'danilovich':
 		act 'Go for a run (1 hour)':
 			*clr & cla
 			menu_off = 1
@@ -368,27 +366,27 @@ if $ARGS[0] = 'sports':
 
 			act 'Continue': gt 'gschool_grounds', 'sports'
 		end
-	elseif schoolrunday ! daystart and ($clothingworntype ! 'exercise' or $shoeworntype ! 'trainers'):
+	elseif schoolrunday ! daystart and ($clothingworntype ! 'exercise' or $shoeworntype ! 'danilovich'):
 		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 
 	if hour >= 9 and hour < 18 and StoryLine > 0 and SchoolAtestat = 0 and kanikuli = 0: 'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 
-	if week = 6 and gm_school_sorev = 2 and hour = 10 and SchoolBlock = 0:
+	if week = 6 and SchoolSorev = 2 and hour = 10 and SchoolBlock = 0:
 		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
-		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
+		if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich':
 			act 'Participate in the 400m sprint event': gt 'gschool_grounds', 'SchoolRun2'
 		else
 			'You need to wear exercise clothes to participate.'
 		end
 	end
 
-	if week = 6 and gm_school_sorev = 1 and hour = 10 and SchoolBlock = 0:
+	if week = 6 and SchoolSorev = 1 and hour = 10 and SchoolBlock = 0:
 		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 
-		if $clothingworntype = 'exercise' and $shoeworntype = 'trainers':
+		if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich':
 			act 'Participate in the 400m sprint race': gt 'gschool_grounds', 'SchoolRun'
 		else
 			'You need to wear exercise clothes to participate.'
@@ -443,41 +441,27 @@ if $ARGS[0] = 'bulding':
 		His words fill you with dread as you make your way to class.'
 	end
 
-	if zverSlutQW = 1 and week = 1 and lariskaQwestDay < daystart and lariskaQwestDay ! 0 and zverRageQW = 2:
+	if week <= 5 and christinaQW['dompath'] = 6:
 		menu_off = 1
-		zverSlutQW = 2
-		if LariskaQW['VitekHelp'] ! 1:
-			$npc_notes['A18'] = 'Ever since your fight, Christina has been avoiding you. She''s been humiliated ever since you told the whole school about how she sucked the P.E. teacher''s dick for a place in the running competition, and beat her up when she tried to fight you. Barely a shade of her former self, she stands timidly in a corner, her head still wrapped in gauss. Whenever she opens her mouth, people can see the broken teeth she hasn''t had a chance to get fixed yet.'
-			if LariskaQW['LariskaHelp'] > 0:
-				'Lariska tells you that you crushed Christina''s spirit when she lost that fight to you, and that there''s no fight left in her now. She was even kicked from both the Cheerleading and Track teams. You know not to let your guard down though; Christina is the type of person to hold a grudge, and you expect she''s just biding her time until she finds a good opportunity to get back at you.'
-			end
-		else
-			if LinaSlut > 0:$text_end = ' and Lina'
-			'Lariska tells you that Christina will require treatment for several months to fully recover from the beating you gave her, and that she was kicked from both the Cheerleading and Track teams. She also says that Avelina has been hooking up with Vitek lately. You suspect this might have something to do with Christina; Lina would do anything for her. You feel a knot in your stomach; being on Vitek''s bad side could be really bad for you.'
-		end
-		if LariskaQW['LariskaHelp'] > 0:LariskaHomeIn = 1
-		$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 and offered her a spot on the volleyball team, she''s afraid to go pro.'
-	elseif zverSlutQW = 0 and week = 1 and lariskaQwestDay < daystart and lariskaQwestDay ! 0 and zverRageQW = 2:
+		npc_rel['A18'] = 0
+		christinaQW['dompath'] = 7
+		if LariskaHomeIn < 1:LariskaHomeIn = 1
+		'Lariska tells you that you crushed Christina''s spirit when she lost that fight to you, and that there''s no fight left in her now. Sounds like Coach Pavlovich took your threat seriously too, as she was kicked from both the Cheerleading Squad and the Track team.'
+		
+	elseif (week = 1 or week = 3 or week = 5) and christinaQW['fight'] = -1 and christinaQW['subpath'] = 3:
 		menu_off = 1
-		$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.'
 		npc_rel['A18'] = 0
-		*nl
-		$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 the fight she has been avoiding you. She seems even more down than usual, and often looks sad. Even though Mikhail Nikolayevich sees a lot of potential in her and offered her a spot on the volleyball team, she''s afraid to go pro.'
-		if LariskaQW['LariskaHelp'] > 0:
-			$text_end = ' And don''t you worry, I will take care of your girlfriend Lariska as well. I''ll teach her what happens when she sides against me.'
-			$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 stood up to Christina she has been a lot more lively. Even though Mikhail Nikolayevich saw a lot of potential in her and offered her a spot on the volleyball team, she''s afraid to go pro. Her close ties with Christina Zvereva have put her in a bad light, and she has now been banned from playing for the volleyball team even if she wanted to.'
-		end
-		'Christina approaches you:'
-		'"What do you want, bitch? Have you recovered from your ass-kicking yet? At least you understand your place now.<<$text_end>>"'
-		lariskaQwestDay += 99999
+		'Christina approaches you and says, "Have you recovered from your ass-kicking yet? At least you understand your place now, looking forward to after P.E. class today!"'
+		'"W-What happens after P.E. class?"'
+		'Without answering, she simply smirks at you and walks away.'
 	end
 end
 
 if $ARGS[0] = 'KristinaFight':
 	*clr & cla
 	menu_off = 1
-	zverRageQW = 2
 	$location_type = 'event_outdoors'
+	christinaQW['dompath'] = 5
 	gs 'stat'
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/christina/school/fight.mp4"></video></center>'
 	'As you cross the school yard after school, you are surprised by something heavy slamming into your back. Falling to your hands and knees, you look behind you and see Christina, her face contorted with rage. "You fucking bitch! How dare you spread shit about me? I''ll break your fucking face in!"'
@@ -499,7 +483,7 @@ if $ARGS[0] = 'SchoolRun':
 	act 'Go to the start':
 		*clr & cla
 		minut += 30
-		gm_school_sorev = 0
+		SchoolSorev = 0
 		kolsorev += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/begsor.jpg"></center>'
@@ -590,19 +574,29 @@ if $ARGS[0] = 'SchoolRun2':
 	gs 'stat'
 	'You think you might be able to win, and sign up to participate in the competition. After quickly changing into your running gear you return to the track. The guys are having their race first, and you watch them as you prepare. As expected, Ivan Prokhorov wins. When the guys have finished, it is the girls'' turn.'
 
-	if swinbeggor = 0:
-		'Getting ready at the starting line is Christina, one of the girls in your class. She just scoffs at you. "You''ll never beat me!"'
-	elseif swinbeggor = 1:
-		'Getting ready at the starting line is Christina, one of the girls in your class. She looks at you angrily and says "You beat me once, but never again!"'
-	elseif swinbeggor = 2:
-		'Getting ready at the starting line is Christina, one of the girls in your class. She looks at you with pure hatred. "You again, bitch? You''re going down this time, I promise you!"'
+	if christinaQW['dompath'] >= 6:
+		if swinbeggor = 0:
+			'You find Lina at the starting line with a smile on her face. Seeing you she waves and calls out cheerfully "Good luck, <<$pcs_nickname>>!"'
+		elseif swinbeggor = 1:
+			'You find Lina at the starting line with a smile on her face. Seeing you she waves and calls out cheerfully "I am going to get you this time, <<$pcs_nickname>>!"'
+		elseif swinbeggor = 2:
+			'You find Lina at the starting line with a smile on her face. Seeing you she waves and calls out cheerfully "Not going to get me a third time, <<$pcs_nickname>>!"'
+		end
+	else
+		if swinbeggor = 0:
+			'Getting ready at the starting line is Christina, one of the girls in your class. She just scoffs at you. "You''ll never beat me!"'
+		elseif swinbeggor = 1:
+			'Getting ready at the starting line is Christina, one of the girls in your class. She looks at you angrily and says "You beat me once, but never again!"'
+		elseif swinbeggor = 2:
+			'Getting ready at the starting line is Christina, one of the girls in your class. She looks at you with pure hatred. "You again, bitch? You''re going down this time, I promise you!"'
+		end
 	end
 
 	act 'Go to the start':
 		*clr & cla
 		kolsorev += 1
 		minut += 30
-		gm_school_sorev = 0
+		SchoolSorev = 0
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/begsor.jpg"></center>'
 		'The 400m sprint event for girls is up next. You take off your jacket and go the starting line, mentally preparing yourself for the race.'
@@ -621,7 +615,7 @@ if $ARGS[0] = 'SchoolRun2':
 			begminus = ((25 - bmi_calc)*6)
 		end
         begresult = pcs_run - begminus
-				
+		
 		act 'Run': gs 'gschool_grounds', 'SchoolRun2_result'
 		gs 'willpower', 'skill', 'run_lvl', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -671,21 +665,34 @@ if $ARGS[0] = 'SchoolRun2_result':
 
 	if swinbeggor = 3 and LocalRun = 1:
 		LocalRun = 2
-		npc_rel['A18'] = 0
-		zverevaQW = 1
 		if razradbeg < 2:
 			'You have won the competition three more times and Mr. Pavlovich awards you the second tier sports trophy in running.'
 			razradbeg = 2
 		else
 			'You have won the competition three more times and Mr. Pavlovich awards you another trophy.'
 		end
-		'Christina stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
+		if christinaQW['dompath'] >= 6:
+			npc_rel['A19'] += 5
+			'Lina stands at at the finish line, gasping for breath. Even though you beat her again, she flashes you a bright smile in congratulations.'
+		else
+			'Christina stands nearby glaring at you the whole time, her hands balled into fists. She''s seething with rage, realizing she cannot beat you.'
+		end
 	elseif swinbeggor = 2 and begresult >= 130:
-		npc_rel['A18'] = 0
-		'Christina is gasping for breath at the finish line. She was unable to overtake you, and came second again. Christina avoids your gaze, not wanting to look you in the eye.'
+		if christinaQW['dompath'] >= 6:
+			npc_rel['A19'] += 5
+			'Lina stands at at the finish line, gasping for breath. Even though you beat her a second time, she flashes you a bright smile in congratulations.'
+		else
+			npc_rel['A18'] -= 10
+			'Christina is gasping for breath at the finish line. She was unable to overtake you, and came second again. Christina avoids your gaze, not wanting to look you in the eye.'
+		end
 	elseif swinbeggor = 1 and begresult >= 130:
-		npc_rel['A18'] = 0
-		'Christina is gasping for breath at the finish line. She was unable to overtake you, and came second yet again. You just flash her a teethy grin and continue your victory lap. Through clenched teeth Christina growls at you. "You bitch!"'
+		if christinaQW['dompath'] >= 6:
+			npc_rel['A19'] += 5
+			'Lina stands at at the finish line, gasping for breath. Even though you beat her, she flashes you a bright smile in congratulations.'
+		else
+			npc_rel['A18'] -= 10
+			'Christina is gasping for breath at the finish line. She was unable to overtake you, and came second yet again. You just flash her a teethy grin and continue your victory lap. Through clenched teeth Christina growls at you. "You bitch!"'
+		end
 	end
 
 	gs 'stat'

+ 1 - 1
locations/gschool_lessons.qsrc

@@ -25,7 +25,7 @@ if $ARGS[0] = 'morning':
 		if pcs_grades < 0: pcs_grades = 0
 		lernSkill += 1
 		lernHome += 1
-		if gm_school_sorev = 1: gm_school_sorev = 0
+		if SchoolSorev = 1: SchoolSorev = 0
 		gs 'gschool_socialchg', 'test'
 	end
 		

+ 64 - 15
locations/gschool_lessons1.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'russian':
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
-				'You notice Svyatoslav glancing over at you a few times and decide to play with him. The next time he looks over at you when Mr. Yenotin back is turned, you pull your shirt open and expose your tits to him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who stares with his mouth open.'
+				'You notice Svyatoslav glancing over at you a few times and decide to play with him. The next time he looks over at you when Mr. Yenotin''s back is turned, you pull your shirt open and expose your tits to him. His mouth drops open in shock as he stares at your exposed <<$titsize>> breasts. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who stares with his mouth open.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'russian'
 			end
 		else
@@ -148,7 +148,12 @@ if $ARGS[0] = 'russian':
 			'While looking at your phone, you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				if Enable_Android = 1:
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'	
+				else
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'	
+				end
+
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
 				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
@@ -164,7 +169,11 @@ if $ARGS[0] = 'russian':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					if Enable_Android = 1:
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+					else
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
 					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
@@ -184,7 +193,11 @@ if $ARGS[0] = 'russian':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'', 1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -203,7 +216,11 @@ if $ARGS[0] = 'russian':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -582,7 +599,7 @@ if $ARGS[0] = 'geography':
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
-				'You notice Artem glancing over at you a few times and decide to play with him. The next time he looks over at you while Mrs. Sokoloff''s back is turned, you pull your shirt open and expose your tits to him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who stares with his mouth open.'
+				'You notice Artem glancing over at you a few times and decide to play with him. The next time he looks over at you while Mrs. Sokoloff''s back is turned, you pull your shirt open and expose your tits to him. His mouth drops open in shock as he stares at your exposed <<$titsize>> breasts. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who stares with his mouth open.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'geography'
 			end
 		else
@@ -664,7 +681,11 @@ if $ARGS[0] = 'geography':
 			'While looking at your phone you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				if Enable_Android = 1:
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+				else
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				end
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
 				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
@@ -680,7 +701,11 @@ if $ARGS[0] = 'geography':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					if Enable_Android = 1:
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+					else
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
 					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
@@ -700,7 +725,11 @@ if $ARGS[0] = 'geography':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -719,7 +748,11 @@ if $ARGS[0] = 'geography':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -1084,7 +1117,7 @@ if $ARGS[0] = 'history':
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
-				'You notice Petka glancing over at you a few times and decide to play with him. The next time he looks over at you while Mrs. Sokoloff''s back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who stares with his mouth open.'
+				'You notice Petka glancing over at you a few times and decide to play with him. The next time he looks over at you while Mrs. Sokoloff''s back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>> breasts. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who stares with his mouth open.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev2', 'history'
 			end
 		else
@@ -1166,7 +1199,11 @@ if $ARGS[0] = 'history':
 			'While looking at your phone you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				if Enable_Android = 1:
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+				else
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				end
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
 				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
@@ -1182,7 +1219,11 @@ if $ARGS[0] = 'history':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					if Enable_Android = 1:
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+					else
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
 					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
@@ -1202,7 +1243,11 @@ if $ARGS[0] = 'history':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -1221,7 +1266,11 @@ if $ARGS[0] = 'history':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'						
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'

+ 69 - 17
locations/gschool_lessons2.qsrc

@@ -70,7 +70,7 @@ if $ARGS[0] = 'computer':
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
-				'You notice Artem glancing over at you a few times and decide to play with him. The next time he looks over at you while Mr. Ivanov''s back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the other students notice what you''re doing.' 
+				'You notice Artem glancing over at you a few times and decide to play with him. The next time he looks over at you while Mr. Ivanov''s back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>> breasts. A couple of the other students notice what you''re doing.' 
 				'Sonia grins, Zinaida gives you a slightly disgusted look before turning away, Anushka and Alyona smile about it and Lizaveta starts texting on her phone at once. You are sure she is texting everyone what you just did. Vasily tries to take a picture, but you close your shirt before he gets his phone up.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'computer'
 			end
@@ -157,7 +157,11 @@ if $ARGS[0] = 'computer':
 			'While looking at your phone you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				if Enable_Android = 1:
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+				else
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				end
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
 				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
@@ -173,7 +177,11 @@ if $ARGS[0] = 'computer':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					if Enable_Android = 1:
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+					else
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
 					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
@@ -193,7 +201,11 @@ if $ARGS[0] = 'computer':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -212,7 +224,11 @@ if $ARGS[0] = 'computer':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -619,7 +635,7 @@ if $ARGS[0] = 'science':
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
-				'You notice Fedor glancing over at you a few times and decide to play with him. The next time he looks over at you while Miss Orlov''s back is turned, you pull your shirt open and expose your tits to him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who stares with his mouth open.'
+				'You notice Fedor glancing over at you a few times and decide to play with him. The next time he looks over at you while Miss Orlov''s back is turned, you pull your shirt open and expose your tits to him. His mouth drops open in shock as he stares at your exposed <<$titsize>> breasts. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who stares with his mouth open.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'science'
 			end
 		else
@@ -701,7 +717,11 @@ if $ARGS[0] = 'science':
 			'While looking at your phone you  decided now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				if Enable_Android = 1:
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+				else
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				end
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
 				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
@@ -717,7 +737,11 @@ if $ARGS[0] = 'science':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					if Enable_Android = 1:
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+					else
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
 					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
@@ -737,7 +761,11 @@ if $ARGS[0] = 'science':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -756,7 +784,11 @@ if $ARGS[0] = 'science':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -1028,7 +1060,7 @@ if $ARGS[0] = 'music':
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
-				'You notice Petka glancing over at you a few times and decide to play with him. The next time he looks over at you while Mr. Vasilyev''s back is turned, you pull your shirt open and expose your tits to him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who stares with his mouth open. Lavrenti tries to take a picture, but you close your shirt before he gets his phone up.'
+				'You notice Petka glancing over at you a few times and decide to play with him. The next time he looks over at you while Mr. Vasilyev''s back is turned, you pull your shirt open and expose your tits to him. His mouth drops open in shock as he stares at your exposed <<$titsize>> breasts. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who stares with his mouth open. Lavrenti tries to take a picture, but you close your shirt before he gets his phone up.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev3', 'music'
 			end
 		else
@@ -1110,7 +1142,11 @@ if $ARGS[0] = 'music':
 			'While looking at your phone you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 			act 'Regular selfie':
 				*clr & cla
-				dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				if Enable_Android = 1:
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+				else
+					dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+				end
 				i = rand(1,temp_selfietot)
 				dynamic 'school_classroom_closelfie[<<i>>] = 1'
 				'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
@@ -1126,7 +1162,11 @@ if $ARGS[0] = 'music':
 					gs 'willpower', 'pay', 'self'
 					gs 'exhibitionism', 1
 					gs 'fame', 'pav', 'sex', 3
-					dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					if Enable_Android = 1:
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+					else
+						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_titflash[<<i>>] = 1'
 					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
@@ -1146,7 +1186,11 @@ if $ARGS[0] = 'music':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -1165,7 +1209,11 @@ if $ARGS[0] = 'music':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -1527,7 +1575,7 @@ if $ARGS[0] = 'biology':
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 5
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/flashboobs1.jpg"></center>'
-				'You notice Lesco glancing over at you a few times and decide to play with him. The next time he looks over at you while Miss Orlov''s back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>>s. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who continues to stare at you with his mouth open.'
+				'You notice Lesco glancing over at you a few times and decide to play with him. The next time he looks over at you while Miss Orlov''s back is turned, you pull your shirt open and expose your tits at him. His mouth drops open in shock as he stares at your exposed <<$titsize>> breasts. A couple of the other students notice what you are doing. Most of them either grin, smile or laugh at your antics. All but Lesco of course, who continues to stare at you with his mouth open.'
 				act 'Wait for the end of the lesson': gs 'gschool_lessonsev1', 'biology'
 			end
 		else
@@ -1660,7 +1708,11 @@ if $ARGS[0] = 'biology':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 3
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'

+ 41 - 9
locations/gschool_lessons3.qsrc

@@ -424,7 +424,7 @@ if $ARGS[0] = 'art':
 			elseif temp = 1:
 				'"Some expensive looking white lacy panties. Are they yours Katja?" Mr. Vasilyev is desperately trying to get the class to calm down. You notice Katja blushing as you wonder how Anushka knows her panties.'
 			elseif temp = 2:
-				'"Oooooh. It looks like Albina''s leopard print thong." Mr. Vasilyev is desperately trying to get the class to calm down. You notice Albina closing her knees together and giving them both a deathly cold stare. Erast starts frantically apologizing to her as you wonder how Anushka knows her panties.'
+				'"Oooooh. It looks like Albina''s leopard print g-string." Mr. Vasilyev is desperately trying to get the class to calm down. You notice Albina closing her knees together and giving them both a deathly cold stare. Erast starts frantically apologizing to her as you wonder how Anushka knows her panties.'
 			elseif temp = 3:
 				'"Black and yellow ''Slippery when wet'' panties." Mr. Vasilyev is desperately trying to get the class to calm down as Anushka laughs. "Those are mine!" She grins at Erast, places a hand on his chest and looks him right in the eyes. "If you wanted to see, then all you had to do was ask." she says as she hikes up her skirt to show off her black and yellow panties. Mr. Vasilyev opens his jacket wide to try and block the view.'
 			elseif temp = 4:
@@ -582,7 +582,11 @@ if $ARGS[0] = 'art':
 				'While looking at your phone you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 				act 'Regular selfie':
 					*clr & cla
-					dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					if Enable_Android = 1:
+						dynamic 'temp_selfietot = <<selfieClotot[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+					else
+						dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_closelfie[<<i>>] = 1'
 					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
@@ -598,7 +602,11 @@ if $ARGS[0] = 'art':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 1
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfieTitflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_titflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
@@ -618,7 +626,11 @@ if $ARGS[0] = 'art':
 							gs 'willpower', 'pay', 'self'
 							gs 'exhibitionism', 3
 							gs 'fame', 'pav', 'sex', 3
-							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+							if Enable_Android = 1:
+								dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+							else
+								dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+							end
 							i = rand(1,temp_selfietot)
 							dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 							'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -637,7 +649,11 @@ if $ARGS[0] = 'art':
 							gs 'willpower', 'pay', 'self'
 							gs 'exhibitionism', 3
 							gs 'fame', 'pav', 'sex', 3
-							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+							if Enable_Android = 1:
+								dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+							else
+								dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+							end
 							i = rand(1,temp_selfietot)
 							dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 							'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -1130,7 +1146,11 @@ if $ARGS[0] = 'shop':
 				'While looking at your phone you decide now would be a good time to take a selfie, but what kind of selfie should you take?'
 				act 'Regular selfie':
 					*clr & cla
-					dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					if Enable_Android = 1:
+						dynamic 'temp_selfietot = <<selfieClotot[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+					else
+						dynamic 'temp_selfietot = <<selfieClotot[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+					end
 					i = rand(1,temp_selfietot)
 					dynamic 'school_classroom_closelfie[<<i>>] = 1'
 					'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/clothed/<<i>>.jpg"></center>'
@@ -1146,7 +1166,11 @@ if $ARGS[0] = 'shop':
 						gs 'willpower', 'pay', 'self'
 						gs 'exhibitionism', 1
 						gs 'fame', 'pav', 'sex', 3
-						dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						if Enable_Android = 1:
+							dynamic 'temp_selfietot = <<selfieTitflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+						else
+							dynamic 'temp_selfietot = <<selfieTitflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+						end
 						i = rand(1,temp_selfietot)
 						dynamic 'school_classroom_titflash[<<i>>] = 1'
 						'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/titflash/<<i>>.jpg"></center>'
@@ -1166,7 +1190,11 @@ if $ARGS[0] = 'shop':
 							gs 'willpower', 'pay', 'self'
 							gs 'exhibitionism', 3
 							gs 'fame', 'pav', 'sex', 3
-							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+							if Enable_Android = 1:
+								dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+							else
+								dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+							end
 							i = rand(1,temp_selfietot)
 							dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 							'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'
@@ -1185,7 +1213,11 @@ if $ARGS[0] = 'shop':
 							gs 'willpower', 'pay', 'self'
 							gs 'exhibitionism', 3
 							gs 'fame', 'pav', 'sex', 3
-							dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+							if Enable_Android = 1:
+								dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(''$selfieLoc'', ''school_classroom'',1)]>>'
+							else
+								dynamic 'temp_selfietot = <<selfiePussyflash[arrpos(1, ''$selfieLoc'', ''school_classroom'')]>>'
+							end
 							i = rand(1,temp_selfietot)
 							dynamic 'school_classroom_pussyflash[<<i>>] = 1'
 							'<center><img <<$set_imgh>> src="images/pc/activities/selfies/school_classroom/pussyflash/<<i>>.jpg"></center>'

+ 51 - 135
locations/gschool_lessons4.qsrc

@@ -212,11 +212,11 @@ if $ARGS[0] = 'math':
 			gs'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/phone.jpg"></center>'
 			'The day seems to be dragging in and you find yourself constantly staring at the clock, waiting for the time to pass and the class to be over. You decide to play on your phone to pass the time.'
-		    if (VK = 1 and npc_rel['A18'] <= 60 and zverSlutQW < 2 and salocatnow >= 5) or (VK = 1 and zverRageQW > 0 and zverSlutQW < 2 and salocatnow >= 5):
+		    if VK = 1 and npc_rel['A18'] <= 60 and (christinaQW['fight'] = -1 or christinaQW['subpath'] >= 2) and salocatnow >= 5:
 				if npc_rel['A18'] > 30:npc_rel['A18'] = 30
 				'As you are browsing the web, you receive a text message from Christina reading; "Hey there piggy, are you looking up discounts on Peremech so that you can shove them down your throat? Why don''t you lose some weight before the teachers decide to add bovine etiquette to the curriculum because they may feel it necessary to teach the students how to talk to a cow like you?" You can feel your face growing flushed in embarrassment while reading Christina''s hurtful comments. You quickly turn off your phone and try not to make eye contact with Christina for the rest of the lesson.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
-			elseif (VK = 1 and npc_rel['A18'] >= 80 and npc_grupTipe['A18'] = 2 and zverRageQW = 0) or (VK = 1 and grupTipe = 2 and npc_grupTipe['A18'] = 2 and zverRageQW = 0):
+			elseif (VK = 1 and npc_rel['A18'] >= 80 and npc_grupTipe['A18'] = 2 and (christinaQW['subpath'] < 2 or christinaQW['dompath'] < 4)) or (VK = 1 and grupTipe = 2 and npc_grupTipe['A18'] = 2 and (christinaQW['subpath'] < 2 or christinaQW['dompath'] < 4)):
 				VKrand = rand(1,3)
 				if salocatnow >= 5:
 					'As you are browsing the web, you receive a text message from Christina reading; "Hey <<$pcs_nickname>>, I can''t help but notice that you have been putting on some weight. Would you like to run with Lina and I after school to maybe burn some of those calories?" Feeling embarrassed, you reply "Um maybe another time." Christina replies immediately. "<<$pcs_nickname>>, the other girls are starting to talk about you. You don''t want to be known as the fat girl of the school, do you?" You look toward Christina and see a mildly concerned look on her face before she texts one last message; "A few workouts a day and a proper diet can do wonders for your future. Think about it <<$pcs_firstname>>." She gives you an assuring nod before turning back towards the teacher.'
@@ -233,8 +233,9 @@ if $ARGS[0] = 'math':
 					'You giggle as you reply. "Sure sounds like fun." You then stick your tongue out at her, causing you both to giggle before turning back to your phones.'
 				end
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
-			elseif VK = 1 and zverSlutQW >= 2:
-				'As you are browsing the web, you receive a text message from Christina reading; "Hey <<$pcs_nickname>>, can I please take this buttplug out? It''s really uncomfortable and it makes it hard to focus in class." "Tough shit, bitch," you reply. "You''re a buttslut now, get used to it." You send a smirk in her direction, before you go back to playing with your phone.'
+			elseif VK = 1 and christinaQW['dompath'] >= 7:
+				'As you are browsing the web, you receive a text message from Christina reading; "Hey <<$pcs_nickname>>, can I please take this buttplug out? It''s really uncomfortable and it makes it hard to focus in class."' 
+				'"Tough shit, bitch," you reply. "You''re a buttslut now, get used to it." You send a smirk in her direction, before you go back to playing with your phone.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			elseif VK = 2 and NataliaPavlovaQW >= 10:
 				'You are browsing the web when you suddenly receive a text message from Natalia depicting your name and her''s inside of a heart together. You turn to Natalia to see a big smile on her face as she gazes into your eyes. You return the smile before replying with "You are so precious to me, Natalia." Natalia quickly replies "I am so happy that I have you in my life." You reply to Natalia. "Ohhh you are just so cute. Muah." Natalia giggles before turning back to Mr. Tsarev while occasionally turning back toward you and smiling.'
@@ -668,15 +669,15 @@ if $ARGS[0] = 'pe':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra.jpg"></center>'
 	'You arrive in the gym and head straight to the girls locker room. Once inside, you quickly change into your athletic clothes before heading back out into the hall. Once everyone is ready, Coach Pavlovich conducts a roll call to ensure everyone is here.'
 	if week = 5 and LocalRun = 0:
-		if gm_school_sorev = 0:gm_school_sorev = 1
+		if SchoolSorev = 0:SchoolSorev = 1
 		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
 	elseif week = 5 and LocalRun = 1:
-		if gm_school_sorev = 0:gm_school_sorev = 2
+		if SchoolSorev = 0:SchoolSorev = 2
 		'Coach Pavlovich announces that the inter-school running competition will be held this Saturday at 11:00. If you want to participate, you should come to school between 10:00 and 11:00.'
 	end
 	act 'Continue':
 		*clr & cla
-		fizrarand = rand(1, 7)
+		fizrarand = rand(1, 8)
 		if fizrarand = 1:
 			pcs_mood -= 5
 			if pcs_run >= 60: 
@@ -768,7 +769,7 @@ if $ARGS[0] = 'pe':
 			'The instructor is actually counting and recording how many each person does, so it''s a bit more stressful than usual.'
 			gs 'gschool_lessonsev1', 'fiz_rand'
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
-		elseif fizrarand = 2:
+		elseif fizrarand = 3:
 			gs 'exercise', 'tier2', 1, 'stren_exp'
 			gs 'stat'
 			pullup = rand (1,7)
@@ -801,7 +802,7 @@ if $ARGS[0] = 'pe':
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
-		elseif fizrarand = 3:
+		elseif fizrarand = 4:
 			gs 'exercise', 'tier2', 1, 'stren_exp'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/fizra7.jpg"></center>'
@@ -823,7 +824,7 @@ if $ARGS[0] = 'pe':
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
-		elseif fizrarand = 4:
+		elseif fizrarand = 5:
 			gs 'exercise', 'tier2', 1, 'vital_exp'
 			'For one of the activities, the teacher breaks everyone into small groups and has you compete to see who can jump rope the longest. Many of the boys pay special attention to the girls during their turns.'
 			if pcs_cupsize <= 20:
@@ -873,7 +874,7 @@ if $ARGS[0] = 'pe':
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
-		elseif fizrarand = 5:
+		elseif fizrarand = 6:
 			*clr & cla
 			gs 'exercise', 'tier2', 1, 'stren_exp'
 			gs 'stat'
@@ -931,7 +932,7 @@ if $ARGS[0] = 'pe':
 			end
 			gs 'gschool_lessonsev1', 'fiz_rand'
 			act 'End of lesson':gt 'gschool_lessons4', 'postphys'
-		elseif fizrarand = 6:
+		elseif fizrarand = 7:
 			gs 'exercise', 'tier2', 1, 'vital_exp'
 			'For one of the activities, the teacher breaks everyone into small groups and has you compete to see who can perform jumping jacks the longest. Many of the boys pay special attention to the girls during their turns.'
 			jumpingjacks = rand (1,5)
@@ -945,7 +946,7 @@ if $ARGS[0] = 'pe':
 			else
 				gt 'gschool_lessons4', 'jumping_jacks'
 			end
-		elseif fizrarand = 7:
+		elseif fizrarand = 8:
 			gs 'exercise', 'tier2', 1, 'stren_exp'
 			'After the roll call, Mr. Nikolaevich announces that you will all be taking turns doing push-ups. The instructor is actually counting and recording how many each person does, so it''s a bit more stressful than usual.'
 			jumpingjacks = rand (1,5)
@@ -1049,122 +1050,36 @@ if $ARGS[0] = 'postphys':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/postphys<<rand(1,4)>>.jpg"></center>'
-	if zverevaQW = 1:
+	if christinaQW['dompath'] = 1:
 		postphys_event = daystart
 		'After class, Coach Pavlovich returns to his office. For some reason, Christina is following him while all other students go to the locker rooms as usual.'
 		act 'Ignore it and go to the locker room': gt 'gschool_lessons4', 'postphys2'
 		act 'Listen in on Christina and Coach Pavlovich':
 			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
+			'You sneak up to Coach Pavlovich''s office door to listen to what they''re talking about. You hear Christina saying "Did you miss me, Sir?" '
+			'The coach doesn''t answer her in words, but does in gasps. Deciding you need to take the risk and look, you crack the door open and peek in.'
+			'What you see is like a dream come true; Christina, on her knees naked in front of Pavlovich, sucking his cock for all she''s worth.'
+			+$OpenInnerThought+'"This is exactly what I was looking for!"'+$CloseInnerThought 
+			'Pulling out your phone, you make sure the flash is turned off, and start taking pictures.'
+			christinaQW['dompath'] = 2
+			pcs_horny += 10
 			gs 'stat'
-			'You quietly move up to Coach Pavlovich''s office to listen to what they''re talking about. You hear Christina saying "Please sir, you can''t let <<$pcs_nickname>> go to the regional competition!"'
-			'He replies "<<$pcs_firstname>> beat you fair and square, Christina. There''s not a whole lot I can do about it."'
-			'Christina''s voice again: "But you promised! Please? I''ll make it worth your while if you choose me over her, sir..."'
-			'After a few seconds of silence, you hear him reply. "Is that so, Christina? You know what to do then. This is not your first time here." Seconds later, you hear a gasp from your teacher and then soft moaning from him.'
-			act 'Try to see what''s happening':
+			act 'Keep Watching':
 				*clr & cla
-				zverevaQW = 2
-				pcs_horny += 10
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
-				'You crack the door open slightly and peek in. You''re flabbergasted by what you see: Christina is on her knees, in front of Coach Pavlovich, sucking him off like her life depended on it.'
-				gs 'arousal', 'voyeur_sex', 5
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/cocksuck3.jpg"></center>'
+				'The coach grabs Christina''s head and starts face fucking her. She grips his legs, obviously trying to get him to slow down, but he doesn''t relent, as gagging sounds fill the room.'
+				'The sounds and sight start making you wet, but you aren''t here to masturbate, so you keep taking as many pictures as you can.'
+				'Pavlovich seems to reach his limit and pulls mostly out, ordering her to keep her mouth open between gasps, and shoots thick ropes of cum into her waiting mouth.'
+				'Deciding you have enough evidence, and not wanting to play your hand just yet, you quietly close the door and sneak off, extremely pleased with yourself.'
+				gs 'arousal', 'voyeur', 5
 				gs 'stat'
-				gs 'willpower', 'misc', 'self', 'medium'
-				if will_cost <= pcs_willpwr:
-					act 'Burst into the room (<<will_cost>> Willpower)':
-						*clr & cla
-						gs 'willpower', 'pay', 'self'
-						zverevaQW = 3
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
-						'You open the door and enter the room. Christina is startled, jumping up from her kneeling position and desperately wiping her mouth while Coach Pavlovich quickly stuffs his erection back into his shorts. "Miss <<$pcs_lastname>>, has no one taught you that you should knock before entering a room!? Christina and I were just discussing some important matters!" he exclaims, pretending to be insulted by your sudden intrusion.'
-					    'You can''t believe he''s even trying! You tell him just that. "Christina was using her mouth, but it certainly wasn''t for talking! You''re letting her suck you off so she can go to the regional competition instead of me!"'
-						'He drops the charade, but has a confident grin on his face. "Who would believe you? It''s your word against mine, and the word of our school''s star athlete. The principal would consider it slander! Your parents would be outraged! Face it: You don''t have shit on me, so get out of my office. Christina, get back on your knees. We''re not done."'
-						*nl
-						'Christina obliges, rubbing his cock through his shorts as she looks you in the eye. Having regained her confidence, she parrots him."Face it bitch, you can''t prove a thing. Now get the fuck out, Coach Pavlovich and I have more to discuss."'
-						'You can''t believe this but they are right. No one is likely to believe you. "You can''t do this! I earned my spot in the competition." He smiles a bit, leaning back in his chair. He reaches in his shorts and pulls out his cock again. "Then get over here and suck my dick." Christina looks at him and then you, obviously furious, but she drops down to her knees and start sucking his dick again.'
-						gs 'willpower', 'bj', 'resist'
-						if will_cost <= pcs_willpwr:
-							act 'Refuse to suck his dick (<<will_cost>> Willpower)':
-								*clr & cla
-								gs 'willpower', 'pay', 'resist'
-								'<center><video autoplay loop src="images/shared/sex/cum/cumf10.mp4"></video></center>'
-								'As Christina starts happily sucking his dick again, you decide you won''t give into his demands. You quietly close the door and leave. It looks like, despite being the better runner, you won''t be going to the regional championships.'
-								gs 'arousal', 'end'
-								gs 'stat'
-								act 'Go and get changed': gt 'gschool_lessons4', 'postphys2'
-							end
-						else
-							act 'Refuse to suck his dick (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-						end
-						act 'Give him a blowjob with Christina':
-							*clr & cla
-							if fizrukSex = 0:fizrukSex = 1 & guy += 1
-							if kristinaSex = 0:kristinaSex = 1
-							npc_rel['A18'] = 100
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/shared/sex/mff/fiz.jpg"></center>'
-							'You nod and walk in, closing the door behind you. Christina is sucking for all she is worth and you get down on your knees next to her, willing to do whatever it takes to earn your spot in the competition. He looks down at the two of you and says "Now learn to share girls." Christina sucks on it for a little while before offering it to you. You follow her lead and obediently take his cock in your mouth, sucking on it and trying to take it as far down your throat as you are comfortable with.' 
-							'After a while, she pushes your face away and closes her lips around it, sucking him off until he shoots his load inside her mouth. Unwilling to share, she swallows it and then goes to the changing room to get dressed. You might be faster than Christina, but she definitely outperformed you here.'
-							gs 'arousal', 'bj', 10, 'group'
-							gs 'arousal', 'end'
-							gs 'stat'
-							act 'Go and get changed': gt 'gschool_lessons4', 'postphys2'
-						end
-					end
-				else
-					act 'Burst into the room (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end
-				act 'Just watch':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
-					'Coach Pavlovich groans, and after a few minutes, he can''t hold back anymore, shooting his load into Christina''s mouth. She diligently swallows his sperm without even taking her mouth off his cock, giving it a thorough tongue-bath, before tucking it back into his shorts. You hear her ask "Did I do a good job, sir? Did I earn my spot in the regional championships?"'
-					'He groans, petting her head as he instructs her to stay on her knees for a while longer. "Absolutely babe. As long as you keep taking care of me, I''ll make sure you''ll be running those championships. Don''t get up, stay there and keep nuzzling. I think I can go again in a minute."'
-					gs 'arousal', 'voyeur_sex', 5, 'unkown'
+				act 'Go to the showers':
 					gs 'arousal', 'end'
 					gs 'stat'
-!!Event missing for bursting into the room when christina already sucked him off
-					!!act 'Burst into the room':gt 'gschool_lessons4', 'postphys'
-					act 'Admit defeat':
-						*clr & cla
-						'<center><video autoplay loop src="images/shared/sex/cum/cumf10.mp4"></video></center>'
-						'As you see Christina happily dig her face into his groin, you quietly close the door and leave. It looks like, despite being the better runner, you won''t be going to the regional championships.'
-						act 'Go and get changed': gt 'gschool_lessons4', 'postphys2'
-					end
+					gt 'gschool_lessons4', 'postphys2'
 				end
-				act 'Admit defeat':
-					*clr & cla
-					'<center><video autoplay loop src="images/shared/sex/cum/cumf10.mp4"></video></center>'
-					'Yeah, you''re not willing to do that. As you see Christina happily dig her face into his groin, you quietly close the door and leave. It looks like, despite being the better runner, you won''t be going to the regional championships.'
-					gs 'arousal', 'end'
-					gs 'stat'
-					act 'Go and get changed': gt 'gschool_lessons4', 'postphys2'
-				end
-			end
-		end
-	elseif fizrukSex > 0 and kristinaSex > 0:
-		'When the class is finished, Christina approaches you. "<<$pcs_nickname>> sweetie, Coach Pavlovich wants you to join me again in his office. He wants us to ''entertain him'' if you know what I mean. Want to join me?"'
-		gs 'willpower', 'bj', 'resist'
-		if will_cost <= pcs_willpwr:
-			act 'No thanks (<<will_cost>> Willpower)':
-				gs 'willpower', 'pay', 'resist'
-				gt 'gschool_lessons4', 'postphys2'
 			end
-		else
-			act 'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end
-		act 'Entertain Coach Pavlovich with Christina':
-			*clr & cla
-			stat['bj'] += 1
-			if fizrukSex = 0:fizrukSex = 1 & guy += 1
-			if kristinaSex = 0:kristinaSex = 1
-			npc_rel['A18'] = 100
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/sex/school/chcoachbj.jpg"></center>'
-			'You go with Christina to the coach''s office, following her lead as she squats before your teacher. She diligently takes off his clothes and takes his penis in her hand, sucking on it for a little while before offering it to you. You follow her lead and obediently take his cock in your mouth, sucking on it and trying to take it as far down your throat as you are comfortable with.' 
-			'After a while she pushes your face away and closes her lips around it, sucking him off until he shoots his load inside her mouth. Unwilling to share, she swallows it, and then goes to the changing room to get dressed.'
-			act 'Go and get changed': gt 'gschool_lessons4', 'postphys2'
 		end
 	else
 		gt 'gschool_lessons4', 'postphys2'
@@ -1172,7 +1087,7 @@ if $ARGS[0] = 'postphys':
 end
 
 if $ARGS[0] = 'postphys2':
-	if (zverRageQW = 10 or (christinaphotos > 0 and christinaphotos <= 4)) and postphys_event ! daystart:postphys_event = daystart & gt 'gKristinaZv'
+	if christinaQW['subpath'] >= 2 and postphys_event ! daystart:postphys_event = daystart & gt 'gKristinaZv'
 	*clr & cla
 	$menu_loc = 'gschool_lessons4'
 	$menu_arg = 'postphys2'
@@ -1208,12 +1123,12 @@ if $ARGS[0] = 'shower2':
 	gymshower = rand(1,6)
 	if gymshower = 1:
 		'<center><video autoplay loop src="images/locations/pavlovsk/school/gym/showerspank.mp4"></video></center>'
-		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower, but you do hear Bella asking "Is it real?" and asking if she can "prove it."'
+		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few minutes basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower, but you do hear Bella talking to Albina.'
 	    'As you wash off the soap, you turn just in time to see Bella start spanking Albina; most of the girls in the shower room stop what they''re doing to watch. After several fairly hard smacks, they stop and laugh about it, Albina rubbing her ass with strange glee as Bella smiles and nods her head, seemingly in approval. Everyone then returns to showering.'
 	elseif gymshower = 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/picture.jpg"></center>'
 		'You pick one of the empty shower heads at random and turn the water on, letting it pour over you and run down your body, caressing you in the relaxing way that is unique to hot showers - after PE, this feels simply great. After spending a few moments basking in the water, you lather up your body with soap. You barely pay any attention to the other girls showering with you, their conversations mostly drowned out by the sound of the shower.'
-	    if zverSlutQW => 2:
+	    if christinaQW['dompath'] >= 7:
 			'As you wash off the soap, you turn just in time to see one of the girls pointing at Christina. She says something to a couple of girls near her and they all burst out laughing. Christina''s face turns bright red and she takes a step forward, before stopping and looking in your direction. Seeing you looking she cringes and tries to pretend like nothing was happening. Not falling for it, you walk over to her and ask what they were laughing at. "My buttplug." she replies, embarrassed and afraid.'
 			'Looking at her sternly you tell her to bend over and show it to them. When she hesitates you grab her arm and pull her down, turn her ass in their direction, and say loud enough for everybody nearby to hear, "This is for trying to hide it." Smack! You spank her hard, causing her to squeal out in suprise. The girls watching start laughing so hard one of them snorts, prompting them to laugh even louder. Christina''s face turns even redder, if that was possible, but she stays put, knowing better than to cross you again.'
 			'You spank her one more time for good measure, and remind her in a low tone. "This is your life now, bitch." You walk back to your shower head and finish rinsing yourself off. Seeing that the fun was everybody went back to their showers.'
@@ -1230,7 +1145,7 @@ if $ARGS[0] = 'shower2':
 		'Sonia doesn''t resist or even hesitate and immediately buries her face right into Lena''s crotch and starts eating her out. Albina, Bella and Vicky are among the group of girls who look in disgust before walking out to get dressed.'
 		gs 'arousal', 'erotic_nudity', -3
 		gs 'stat'
-		if pav_slut >= 150 and grupTipe = 5:
+		if pav_slut >= 150:
 			act 'Try to leave unnoticed':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/chris_sveta.jpg"></center>'
@@ -1252,7 +1167,7 @@ if $ARGS[0] = 'shower2':
 					end
 				end
 			end
-		elseif zverRageQW = 10 or christinaphotos = 1 or christinaphotos = 3:
+		elseif christinaQW['fight'] = -1 or christinaQW['submit'] = 1:
 			act 'Try to leave unnoticed':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/chris_sveta.jpg"></center>'
@@ -1273,7 +1188,7 @@ if $ARGS[0] = 'shower2':
 					end
 				end
 			end
-		elseif zverSlutQW = 2:
+		elseif christinaQW['dompath'] >= 7:
 			act 'Leave':
 				cla
 				'You quickly join them and hurry out of the showers to your locker, ignoring Christina and letting her off this time.'
@@ -1290,8 +1205,8 @@ if $ARGS[0] = 'shower2':
 				'As a large group of girls gather around to watch and film the show, you spot Christina trying to quietly slip out with the group of girls. She sees you looking at her and she stops in her tracks, her eyes fearfully pleading with you. You ignore her and mercilessly drag her into the middle of the room and throw her down next to Sonia. "I brought an extra bitch to the party!" you say mockingly to the laughter of the others. You waste no time and immediately present your pussy to Christina, spreading yourself wide and exposing your clit. She looks at you scornfully, but knowing that she has no choice, she reluctantly starts eating you out. "Come on slut, you can do better than that!" you say before you grab her hair and start grinding against her, smearing her face with your wetness as she keeps licking away at your clit. She seems to put more effort in and you slowly feel your orgasm building within you.'
 				$orgasm_txt = 'Just as you are about to climax, you pull her face out of your crotch and quickly rub your engorged clit, bringing yourself to an explosive orgasm as you spray a fountain of pussy juice across Christina''s face, much to the amazement and amusement of the other girls present.'
 				$orgasm_or = 'custom'
-				'When you finish cumming, you force her head back into your crotch, making her lick up every last drop of your juices. When you''re done, you pat her on the head and throw her to the floor for the other girls to have some fun with her. When everyone has had a turn, Sonia and Christina are both drenched in sticky girl cum. Christina is furious, but Sonia doesn''t care, instead focusing on fingering herself. You give Christina a mocking smile and leave her sitting there as you join the others in returning to the locker room to get dressed. She doesn''t resist, instead just sitting on the floor, dejected and defeated. She hasn''t returned to the locker room by the time you finish getting dressed and leave.'   
 				gs 'arousal', 'cuni', -8, 'lesbian', 'dom'
+				'When you finish cumming, you force her head back into your crotch, making her lick up every last drop of your juices. When you''re done, you pat her on the head and throw her to the floor for the other girls to have some fun with her. When everyone has had a turn, Sonia and Christina are both drenched in sticky girl cum. Christina is furious, but Sonia doesn''t care, instead focusing on fingering herself. You give Christina a mocking smile and leave her sitting there as you join the others in returning to the locker room to get dressed. She doesn''t resist, instead just sitting on the floor, dejected and defeated. She hasn''t returned to the locker room by the time you finish getting dressed and leave.'   
 				gs 'stat'
 				'You can choose another outfit while you''re here.'
 				act 'Finish dressing':
@@ -1326,6 +1241,7 @@ if $ARGS[0] = 'shower2':
 					end
 				end
 				act 'Wait your turn':
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/sex/sonia_busted_3.jpg"></center>'
 					'You''re getting incredibly aroused watching this show and know where it''s going. You follow the other girls in masturbating as you watch and wait your turn. Christina soon reaches her explosive orgasm and drenches Sonia in a shower of pussy juice as she moans loudly. The other girls express their amazement while Sonia looks to be greatly enjoying herself. Anushka, Lina and a few other girls take their turns squirting over Sonia as you continue to rub your clit and finger yourself. Eventually, you feel your orgasm building and step up to Sonia as another girl finishes. You are surprised when Sonia suddenly starts licking your pussy as you stand above her. She is <i>really</i> good at this and you quickly feel yourself about to cum, so you pull her face out of your crotch and rub your engorged clit to bring yourself to orgasm.'
 					$orgasm_txt = 'You moan loudly as your pussy explodes and you squirt your juice all over Sonia''s already drenched face and into her mouth, Sonia happily taking it all and swallowing it.'
@@ -1438,8 +1354,8 @@ if $ARGS[0] = 'long_shower':
 							'The both just laugh. "So what? What are you going to do about it?"'
 							'You feel yourself start to panic. "I''ll scream! The coach is still in his office." He is most days anyways and you hope he is today.'
 							'Vitek gives you a hard look and takes a step towards you. You inhale like you are about to scream and he stops dead. "You''re going to regret this bitch." He then storms out while Dan lingers just a moment longer, checking you out before he leaves as well. You wait until you hear the door close, then you rush to your locker to quickly dry off and get dressed before they come back.'
-							act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 						end
+						act 'Finish dressing': gt 'gschool_lessons4', 'post_dress'
 					end
 				else
 					act 'Tell them to get out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1487,7 +1403,7 @@ if $ARGS[0] = 'long_shower':
 				gs 'stat'
 				if hotcat => 6 and npc_rel['A23'] > 60 and checkoutalbina = 1:
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/lockerroom/lockerflirt.jpg"></center>'
-					'As you walk into the locker room, you can tell it is Albina on the phone. She seems to be talking about her dance troupe and a new show they will be doing. Once you start drying your hair, you can''t hear what she is saying anymore. As you finish drying your hair, still naked, she comes around to your side of the lockers wearing only a towel. She smiles at you before dropping the towel, revealing her naked, toned body to you. She then turns around, giving you an even better view of her ass. "You like what you see?" she asks teasingly.'
+					'As you walk into the locker room, you can tell it is Albina on the phone. She seems to be talking about the Starlets and a new show they will be doing. Once you start drying your hair, you can''t hear what she is saying anymore. As you finish drying your hair, still naked, she comes around to your side of the lockers wearing only a towel. She smiles at you before dropping the towel, revealing her naked, toned body to you. She then turns around, giving you an even better view of her ass. "You like what you see?" she asks teasingly.'
 					gs 'arousal', 'voyeur', 2
 					gs 'stat'
 					act 'Yes':
@@ -1682,7 +1598,7 @@ if $ARGS[0] = 'post_shower':
 			pcs_horny += 5
 			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/chrispeek.jpg"></center>'
-			if zverSlutQW = 2:
+			if christinaQW['dompath'] >= 7:
 				'You notice Christina walking around naked after getting dried off. Nobody would call her beautiful, but you know most of the boys think she is attractive and you have to agree. She has a very athletic build, somewhat stocky for a girl, with well defined muscles. She is almost what you would call "ripped." Despite her muscular build, she has larger than average breasts while her bush is a neat little landstrip. Ever since you beat her up, you keep an eye on her, making sure she cannot try and hurt anybody else.'
 				gs 'arousal', 'voyeur', 3
 				gs 'stat'
@@ -1765,7 +1681,7 @@ if $ARGS[0] = 'post_shower2':
 		pcs_horny += 5
 		pcs_mood += 10
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/watch3.jpg"></center>'
-		if zverSlutQW = 2:
+		if christinaQW['dompath'] >= 7:
 			'You notice Christina soaping up her naked wet body, her hands rubbing all over her curves. She is pretty. No one would call her beautiful, but you know most of the boys think she is attractive and you have to agree. She has a very athletic build, somewhat stocky for a girl, with well defined muscles. She is almost what you would call "ripped." Despite her muscular build, she has larger than average breasts while her bush is a neat little landing strip. Ever since you beat her up, you keep an eye on her, making sure she cannot try and hurt anybody else.'
 		else
 			'You notice Christina soaping up her naked wet body, her hands rubbing all over her curves. She is pretty. No one would call her beautiful, but you know most of the boys think she is attractive and you have to agree. She has a very athletic build, somewhat stocky for a girl, with well defined muscles. She is almost what you would call "ripped." Despite her muscular build, she has larger than average breasts while her bush is a neat little landing strip. You can''t help but watch her, there is just something attractive about her to you. You tear your gaze away before someone notices you watching her and go back to the lockers.'
@@ -1856,7 +1772,7 @@ if $ARGS[0] = 'dress':
 	elseif gymdress = 4:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nudepic<<rand(1,2)>>.jpg"></center>'
-		if zverSlutQW = 2:
+		if christinaQW['dompath'] >= 7:
 			'Still naked, you hear a couple of girls giggling, so you turn to look at them, but they are not looking at you. Confused, you follow their collective gaze and see Christina trying to work her buttplug into a comfortable position. Smirking, you go over to her, slap her hand away, and yank the plug out, making her yelp in suprise. "Open." you say in a menacing tone. She cringes before closing her eyes and opening her mouth.'
 			'Shoving the plug into her mouth you spin it around a few times, letting her slobber on it a bit. Despite the taste, she does lube it up as best she can, mindful of where it is going. "Bend over." you bark at her. She sighs, but bends over and spreads her buttcheeks, trying to ignore the laughing of the other girls. Without being gentle in the slightest, you jam it back in, getting another gasp out of her.'
 		else
@@ -1867,7 +1783,7 @@ if $ARGS[0] = 'dress':
 	elseif gymdress = 5:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/boysraid.jpg"></center>'
-		'You start to get dressed, most of the girls around you still in their underwear or naked, when the locker room door bursts open. You and everyone else turn to see Vitek and Dan standing in the doorway already dressed and leering at all the pretty girls in the locker room. Several girls cover up, a few run around the corner out of view and others yell at them, which only makes them laugh. Albina, wearing only a rather eyecatching pink thong, walks up to them and places her hand on the door. "Get the fuck out of here." she says in a low, menacing tone.'
+		'You start to get dressed, most of the girls around you still in their underwear or naked, when the locker room door bursts open. You and everyone else turn to see Vitek and Dan standing in the doorway already dressed and leering at all the pretty girls in the locker room. Several girls cover up, a few run around the corner out of view and others yell at them, which only makes them laugh. Albina, wearing only a rather eyecatching bright pink g-string thong, walks up to them and places her hand on the door. "Get the fuck out of here." she says in a low, menacing tone.'
 		'Dan snorts. "Or what?"'
 		'Albina, not backing down, says "Do you really want to find out?" Everyone can hear the implied threat and considering her fearsome temper and willingness to get violently physical, Dan backs off.'
 		'Vitek, however, just laughs. "Don''t get your panties in a twist. We just wanted to know if any of you girls wanted to take part in a ''private workout.''" he says lewdly.'
@@ -1877,7 +1793,7 @@ if $ARGS[0] = 'dress':
 	elseif gymdress = 6:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/christinaselfie<<rand(1,3)>>.jpg"></center>'
-		if zverSlutQW = 2:
+		if christinaQW['dompath'] >= 7:
 			'As you get dressed you overhear one of the girls say to another, "Come take a picture with me. I want to send something to my boyfriend." Giggling, two of her friends came over and posed with her.'
 		else
 			'As you get dressed you overhear Christina say "Damn we look good, I look really amazing." You turn and see her checking out her naked body in the mirror, along with Lariska and Lina.'
@@ -1897,7 +1813,7 @@ if $ARGS[0] = 'dress':
 		*clr & cla
 		pcs_mood += 10
 		gs 'stat'
-		if zverSlutQW = 2:
+		if christinaQW['dompath'] >= 7:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 			'As you get dressed you decide to have some fun with Christina, who is trying to hide in a corner so she isn''t noticed. Calling her to the center of the room, you tell her to raise her skirt and bend over. When she hesitates, you warn her if she has panties on and no buttplug inserted, you are going to spank her ass so hard she won''t be able to sit for a week. Grimacing, she bends over and flips up her skirt. Seeing she is following your rules, you tell her to turn and give everybody a good look, before letting her continue to get dressed. Several girls laugh at her while she hurries to finish dressing and flees the locker room before you mess with her some more.'
 		else
@@ -1912,7 +1828,7 @@ if $ARGS[0] = 'dress':
 	elseif gymdress = 9:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/chrislarwedgie.jpg"></center>'
-		if zverSlutQW = 2:
+		if christinaQW['dompath'] >= 7:
 			'You see a couple of the girls teasing each other while getting dressed. One manages to get behind the other, grabs her panties, and pulls up. They both start laughing, obviously just messing around with each other. Things settle back down as the girl who got wedgied adjusts her panties and they leave the room, still teasing each other.'
 		else
 			'As Lariska finishes getting dressed, Christina walks up behind her, grabs the back of her panties and yanks up on them hard, making Lariska squeal a bit as she stands on her toes to try and relieve the pressure. Most of the other girls laugh at this. "Oh please, we all know you like things up your ass, so don''t act like you''re not enjoying this." Christina tells her.'
@@ -1937,10 +1853,10 @@ if $ARGS[0] = 'dress':
 	elseif gymdress <= 15:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/nerdoutcast.jpg"></center>'
-		if zverSlutQW = 2:
+		if christinaQW['dompath'] >= 7:
 			'As you are getting dressed you see a girl from your brother''s grade glaring at Christina, who is trying to get dressed quietly in a corner. Deciding to punish Christina for wearing panties, and maybe cheer the girl up, you sneak up behind Christina, grab her panties, and yank up, hard. Christina screams, then looks over her shoulder angrily to see who would dare, but when she sees you, she turns white, too scared to fight back. You drop to your haunches and push up, hard. Just as you think you might actually left her off the ground, the straps of her panties break, making her stumble into the lockers. Her panties hang off of her, wedged so tightly into her ass and pussy that they don''t fall off. Turning and smiling at the girl, who smiles back, you go back to getting dressed while Christina struggles to dig her panties out, sniffling.'
 		elseif (grupTipe = 3 or grupTipe = 5) and $pantyworntype ! 'none':
-			'Just as you finish dressing, you feel someone grabs the back of your panties. Before you can say or do anything, you feel your panties get yanked up hard,  painfully digging into your ass crack and against your clit. You hear the other girls all laugh as you struggle to free yourself. As you try and get up, you almost lose your balance as the person pulling up your panties keeps pulling them up higher. You are finally able to pull yourself free and turn to see Christina laughing at you. "Fucking loser, likely the closest anything has been to rubbing your clit." She laughs and then heads out with Lariska and Lina in tow. You spend a few minutes pulling your panties out of your ass crack and getting them back in place.'
+			'Just as you finish dressing, you feel someone grabs the back of your panties. Before you can say or do anything, you feel your panties get yanked up hard, painfully digging into your ass crack and against your clit. You hear the other girls all laugh as you struggle to free yourself. As you try and get up, you almost lose your balance as the person pulling up your panties keeps pulling them up higher. You are finally able to pull yourself free and turn to see Christina laughing at you. "Fucking loser, likely the closest anything has been to rubbing your clit." She laughs and then heads out with Lariska and Lina in tow. You spend a few minutes pulling your panties out of your ass crack and getting them back in place.'
 			gs 'pain', 1, 'asscheeks', 'ache'
 		else
 			'As you finish dressing, you turn around in time to see Christina stand up on one of the benches, reach down, and grab a girl from your brother''s grade''s panties from behind. She yanks up on them hard, making the girl yelp and stand up. This doesn''t stop Christina though, who keeps lifting until she manages to lift the girl off her feet. She squirms and cries out, dangling from her panties. Some of the girls laugh, a few nervously, obviously afraid to make Christina mad, as others look away in disgust. The girl starts to beg Christina to let her go, which seems to only encourage Christina, who now starts bouncing the girl by her panties until there is a loud rip and the girl''s panties end up under her arms. The girl looks to be on the verge of tears and runs out once Christina finally lets go. Christina laughs some more then heads out with Lariska and Lina in tow.'

+ 510 - 140
locations/gschool_lessonsev1.qsrc

@@ -61,14 +61,14 @@ if $ARGS[0] = 'fiz_rand':
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				grupvalue[2] +=1
-				'He starts to back up but you manage to kick him hard in the shin, causing him to hop around on one leg while holding his shin in pain, which just got the others laughing harder. A couple of the other girls give the guys dirty looks and walk over to give you moral support and use their bodies to shield you from the rest of the class so you can peel your panties out of your ass, putting everything back in it''s proper place.'
+				'He starts to back up, but you manage to kick him hard in the shin, causing him to hop around on one leg while holding his shin in pain, which causes the others to laugh harder at him. A few of the other girls give the guys dirty looks and walk over to give you moral support and use their bodies to shield you from the rest of the class so you can peel your panties out of your ass, putting everything back in it''s proper place.'
 				act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 			end
 		else
 			act 'Kick him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		gs 'willpower', 'misc', 'self', 'hard'
-		if will_cost <= pcs_willpwr:
+		if will_cost <= pcs_willpwr and (grupTipe = 2 or grupTipe = 4):
 			act 'Beat his ass (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'misc', 'self', 'hard'
@@ -79,7 +79,8 @@ if $ARGS[0] = 'fiz_rand':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/gym/beathisass.jpg"></center>'
 				'Your first kick catches him on the shin, causing him to hop around on one leg. Not expecting any more, his attention wanders and he doesn''t see you charging him. You bash into him, knocking him to the floor, and quickly climb on top of him. You start furiously punching him in the face, beating him senseless in front of everyone.'
 				*nl
-				'He is stunned by this sudden and vicious attack and tries to block your incoming blows to no avail. Luckily for him, the coach arrives just in time. The coach grabs you by the back of the neck and with one powerful yank, pulls you off a bloody and beaten Dan, nearly throwing you on your back. He then steps between the two of you, stopping you from going at it again. He turns to you and says "Go to the principal''s office, NOW!" You try and protest, but he doesn''t want to hear it and points sternly at the door.'
+				'He is stunned by this sudden and vicious attack and tries to block your incoming blows, to no avail. Luckily for him, the coach arrives just in time. The coach grabs you by the back of the neck and pulls you off Dan with a powerful yank, causing you to stumble backwards and almost fall on your back. He then steps between the two of you, stopping you from going at it again, and turns to you. "Go to the principal''s office, NOW!" You try and protest, but he doesn''t want to hear it and points sternly at the door.'
+				'You begrudingly walk out as the coach helps Dan to his feet. Everyone is stunned or amused by your actions - some of the gopniks even look a little impressed.'
 				act 'Go to the principal''s office': gt 'gschool_office', 'principal'
 			end
 		else
@@ -145,7 +146,7 @@ end
 if $ARGS[0] = 'biology':
 	*clr & cla
 	menu_off = 1
-	if rand(0,5) > 0:	
+	if rand(0,5) > 0:
 		school_event_hour = 1
 		scooltiperand = rand(1,24)
 		!!This is default action for all scenes, if not wanted then use cla
@@ -170,7 +171,7 @@ if $ARGS[0] = 'biology':
 				gs 'exhibitionism', 3
 				gs 'fame', 'pav', 'sex', 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
-				'You''ve been called up to answer the question written on the blackboard. While solving it, you accidentally drop the cloth used to wipe it clean, and totally forget that not only are you are not wearing any panties, but also have a butt plug stuffed in your ass. When you bend over you feel your skirt rise up, exposing your bare pussy and ass to your classmates. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Miss Orlov sits, she can''t see what everyone is fussing over, so she starts to move to get a better look, but you quickly snap back up, adjust your skirt and start wiping away at the board as if nothing happened.'	
+				'You''ve been called up to answer the question written on the blackboard. While solving it, you accidentally drop the cloth used to wipe it clean, and totally forget that not only are you are not wearing any panties, but also have a butt plug stuffed in your ass. When you bend over you feel your skirt rise up, exposing your bare pussy and ass to your classmates. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Miss Orlov sits, she can''t see what everyone is fussing over, so she starts to move to get a better look, but you quickly snap back up, adjust your skirt and start wiping away at the board as if nothing happened.'
 			else
 				gs 'exhibitionism', 1
 				gs 'fame', 'pav', 'sex', 1
@@ -409,66 +410,144 @@ if $ARGS[0] = 'biology':
 			'As you arrive in class, you look around and decide to sit next to...'
 			act 'Irina':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A17'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Irina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Irina. She looks at you in disgust and turns away to talk to someone else.'
+				else
+					if grupTipe = 1:
+						npc_rel['A17'] += 1
+						'You sit next to Irina and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Irina, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and talking to other people.'
+					else
+						npc_rel['A17'] += 1
+						'You sit next to Irina. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Julia':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A12'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Julia. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
-			end
-			act 'Dan':
-				*clr & cla
 				chrsm_exp += rand(1,2)
-				npc_rel['A10'] += 1
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Dan. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				if pav_slut >= 150:
+					'You sit next to Julia. She avoids making eye contact with you and instead focuses on her coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A12'] += 1
+						'You sit next to Julia and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Julia, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
+					else
+						npc_rel['A12'] += 1
+						'You sit next to Julia. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lavrenti':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A155'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Lavrenti. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lavrenti. He gives you a perverted smile and keeps asking if you want to suck his dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A155'] += 1
+						'You sit next to Lavrenti and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Lavrenti and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A155'] += 1
+						'You sit next to Lavrenti. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Artem':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A2'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Artem. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Artem. He looks at you in disgust and instead focuses on his coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A2'] += 1
+						'You sit next to Artem and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Artem, but he ignores you and chooses to talk to other people or do his coursework.'
+					else
+						npc_rel['A2'] += 1
+						'You sit next to Artem. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Natasha':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A16'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Natasha. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Natasha. She avoids making eye contact with you and instead focuses on her coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A16'] += 1
+						'You sit next to Natasha and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Natasha, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
+					else
+						npc_rel['A16'] += 1
+						'You sit next to Natasha. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lazar':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A149'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Lazar. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lazar, who mocks you for the duration of the lesson about how many dicks you''ve sucked and how your breath probably smells of cum.'
+				else
+					if grupTipe = 2:
+						npc_rel['A149'] += 1
+						'You sit next to Lazar and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Lazar. He ignores you, only talking to you if it involves mocking you.'
+					else
+						npc_rel['A149'] += 1
+						'You sit next to Lazar. He is a little surprised that you chose to do so, but seems to enjoy the attention you''re giving him. You are able to strike up a brief conversation with him before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lesco':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A7'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Lesco. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lesco. He avoids making eye contact with you and awkwardly puts his head down. Your classmates notice this and you feel embarrassed at the fact that you''re so unpopular that even Lesco won''t talk to you.'
+				elseif grupTipe = 5:
+					 npc_rel['A7'] += 1
+					 'You sit next to Lesco and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				else
+					'You sit next to Lesco and he looks at you in confusion, fearful of what you''ll do. Despite your attempts to reassure him, he is so scared of you that he doesn''t speak for the duration of the lesson.'
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		else
@@ -481,6 +560,7 @@ if $ARGS[0] = 'biology':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/eavesdrop.jpg"></center>'
 				gs 'gschool_gossip', 'lesson'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		end
@@ -553,7 +633,7 @@ if $ARGS[0] = 'science':
 				'You quickly grasp both sides of your blouse and pull them tightly together. Andrey grins when he realizes he''s been caught, and he winks at you before turning back to face the blackboard. Stasya, having finally noticed what her boyfriend was doing, gives you a dirty look.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			
+
 			gs 'willpower', 'exhib', 'self', 'easy'
 			if will_cost <=  pcs_willpwr:
 				act 'You ignore it (<<will_cost>> Willpower)':
@@ -575,60 +655,145 @@ if $ARGS[0] = 'science':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
 			'As you arrive in class, you look around and decide to sit next to...'
 			act 'Irina':
-				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A17'] += 1
+				 *clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Irina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Irina. She looks at you in disgust and turns away to talk to someone else.'
+				else
+					if grupTipe = 1:
+						npc_rel['A17'] += 1
+						'You sit next to Irina and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Irina, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and talking to other people.'
+					else
+						npc_rel['A17'] += 1
+						'You sit next to Irina. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Andrey and Stasya':
-				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A147'] += 1
-				npc_rel['A139'] += 1
+				 *clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Andrey and his girlfriend Stasya. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Andrey and Stasya. Stasya glares at you and warns you not to even try and suck Andrey''s dick, but he laughs in response, saying how he would never let your filthy mouth near him.'
+				else
+					if grupTipe = 1:
+						npc_rel['A139'] += 1
+						npc_rel['A147'] += 1
+						'You sit next to Andrey and Stasya and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you all to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Andrey and Stasya, but they dismiss all of your attempts to speak with them and instead spend the lesson talking to each other.'
+					else
+						npc_rel['A139'] += 1
+						npc_rel['A147'] += 1
+						'You sit next to Andrey and Stasya. They are a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Mefodiy':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A148'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Mefodiy. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Mefodiy, who expresses his disgust at your slutiness with sarcastic jokes and then ignores you for the rest of the lesson.'
+				else
+					if grupTipe = 1:
+						npc_rel['A148'] += 1
+						'You sit next to Mefodiy and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Mefodiy, but he ignores you for the duration of the lesson.'
+					else
+						npc_rel['A148'] += 1
+						'You sit next to Mefodiy. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Gerasim':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A153'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Gerasim. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Gerasim. He looks at you in disgust and instead focuses on his coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A153'] += 1
+						'You sit next to Gerasim and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Gerasim, but he ignores you and chooses to talk to other people or do his coursework.'
+					else
+						npc_rel['A153'] += 1
+						'You sit next to Gerasim. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Veronika':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A141'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Veronika. She is her usual cold and distant self and doesn''t say much, but doesn''t seem to mind you talking to her. You often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Veronika. She glares at you, clearly disgusted at your slutiness, and looks away. A shiver runs down your spine at how cold she just was to you.'
+				else
+				   npc_rel['A141'] += 1
+				   'You sit next to Veronika. She is her usual cold and distant self and doesn''t make any effort to engage you in conversation, so you don''t bother trying.'
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Vanya':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A165'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Vanya. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Vanya, who immediately stands up and walks over to sit with Katja and Vicky, all of them giving disgusted looks.'
+				else
+					if grupTipe = 2:
+						npc_rel['A165'] += 1
+						'You sit next to Vanya and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Vanya. He ignores you, instead choosing to lean back and talk with Katja and Vicky.'
+					else
+						npc_rel['A165'] += 1
+						'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before you catch Vicky giving you dagger eyes and you turn away.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Fedor':
+			act 'Arkadi':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A5'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Fedor. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Miss Orlov, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Arkadi. He gives you a perverted smile and keeps asking if you want to suck his dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A156'] += 1
+						'You sit next to Arkadi and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Arkadi and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A156'] += 1
+						'You sit next to Arkadi. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 11:
@@ -747,7 +912,7 @@ if $ARGS[0] = 'computer':
 					npc_rel['A11'] -= 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/rand_scoolboy1.jpg"></center>'
 					'You ignore Mr. Ivanov and turn around, slapping Vasily with all the force you can muster. Vasily recoils, his hand going to his cheek. Students start murmuring about what happened, some of them even laughing.'
-					'Mr. Ivanov''s voice cuts sharply through the noise. "That''s enough of that Miss <<$pcs_lastname>>! Go to the principals office!"'
+					'Mr. Ivanov''s voice cuts sharply through the noise. "That''s enough of that Miss <<$pcs_lastname>>! Go to the principal''s office!"'
 					act 'Go to the principal''s office': gt 'gschool_office', 'principal'
 				end
 			else
@@ -898,67 +1063,169 @@ if $ARGS[0] = 'computer':
 			'As you arrive in class, you look around and decide to sit next to...'
 			act 'Vasily':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A11'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Vasily. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Ivanov, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Vasily. He gives you a perverted smile and keeps asking if you want to suck his dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A11'] += 1
+						'You sit next to Vasily and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Ivanov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Vasily and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+				else
+					 npc_rel['A11'] += 1
+					 'You sit next to Vasily. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Ivanov asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Albina':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A23'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Albina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Ivanov, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Albina, who immediately looks you over before shaking her head in disgust and walking away to sit with Vicky.'
+				else
+					if grupTipe = 1 or grupTipe = 2 or AlbinaQW['Friends'] = 2:
+						npc_rel['A23'] += 1
+						'You sit next to Albina and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Ivanov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Albina, who gives you a pitiful look before turning away and ignoring you for the rest of the lesson.'
+				else
+					 'You sit next to Albina and she rolls her eyes. She begrudingly engages you in a very brief and awkward conversation, her piercing glare dissauding you from making any further attempts.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lizaveta':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A140'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Lizaveta. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Ivanov, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lizaveta, who immediately laughs at you and starts mocking you with gossip about whose dick you''ve sucked recently.'
+				else
+					if grupTipe = 1:
+						npc_rel['A140'] += 1
+						'You sit next to Lizaveta and you spend most of the class talking quietly with each other, Lizaveta filling you in on the latest gossip and trying to pry what she can from you. You often get stern looks from Mr. Ivanov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Lizaveta, who proceeds to fill you in on all the gossip about what a friendless loser you are.'
+				else
+					 'You sit next to Lizaveta, who is a little surprised that you chose to do so at first, but proceeds to fill you in on the latest gossip before Mr. Ivanov tells her to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Alyona':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A143'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Alyona. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Ivanov, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Alyona, who ignores you at first before mouthing "slut" at you and doing a motion with her hands where she pretends to be forcing your head down on her imaginary dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A143'] += 1
+						'You sit next to Alyona and you spend most of the class talking quietly with each other. You often get stern looks from Mr. Ivanov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Alyona and she immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+				else
+					 npc_rel['A143'] += 1
+					 'You sit next to Alyona. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Ivanov asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Artem':
-				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A2'] += 1
+					*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Artem. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Ivanov, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Artem. He looks at you in disgust and instead focuses on his coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A2'] += 1
+						'You sit next to Artem and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Ivanov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Artem, but he ignores you and chooses to talk to other people or do his coursework.'
+				else
+					 npc_rel['A2'] += 1
+					 'You sit next to Artem. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Ivanov asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Gerasim':
-				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A153'] += 1
+					*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Gerasim. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Ivanov, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Gerasim. He looks at you in disgust and instead focuses on his coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A153'] += 1
+						'You sit next to Gerasim and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Ivanov when you get a bit too loud. He clears her throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Gerasim, but he ignores you and chooses to talk to other people or do his coursework.'
+				else
+					 npc_rel['A153'] += 1
+					 'You sit next to Gerasim. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Ivanov asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Zinaida':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A142'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Zinaida. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Ivanov, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Zinaida. She avoids making eye contact with you and instead focuses on playing a game on her phone before class starts.'
+				else
+					if grupTipe = 3:
+						npc_rel['A16'] += 1
+						'You sit next to Zinaida and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Ivanov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Zinaida, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
+				else
+					 npc_rel['A16'] += 1
+					 'You sit next to Zinaida. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Ivanov asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Sonia':
+			act 'Katja':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A25'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Sonia. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Ivanov, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Katja. She stares at you in disbelief and starts blushing bright red before she gets up and hurries to sit next to her sister.'
+				else
+					if grupTipe = 1:
+						npc_rel['A14'] += 1
+						'You sit next to Katja and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Ivanov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Katja, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
+				else
+					 npc_rel['A14'] += 1
+					 'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Ivanov asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 14:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
@@ -1001,7 +1268,7 @@ if $ARGS[0] = 'computer':
 				'For the remainder of the class, he keeps shooting glances in your direction. He seems to be having a great time in class today and you suspect that you''re the reason.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			
+
 			gs 'willpower', 'exhib', 'self', 'self'
 			if will_cost <=  pcs_willpwr:
 				act 'Ignore his stares and wait for the break (<<will_cost>> Willpower)':
@@ -1012,7 +1279,7 @@ if $ARGS[0] = 'computer':
 			else
 				act 'Ignore his stares and wait for the break (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			
+
 			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <=  pcs_willpwr:
 				act 'Call him out (<<will_cost>> Willpower)':
@@ -1025,12 +1292,12 @@ if $ARGS[0] = 'computer':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirt.jpg"></center>'
 					'He can''t be doing that! You pull your skirt over your legs so he can''t look at you any more and loudly say "Mr. Ivanov, be careful! If you keep staring at me like that, your eyeballs might pop out of their sockets!"'
 					'A loud laughter erupts in the classroom, and he raps his desk several times until he gets the class to quieten down. "Go to the principal''s right now Miss <<$pcs_lastname>>!'
-					act 'Go to the Principals office': gt 'gschool_office', 'principal'
+					act 'Go to the principal''s office': gt 'gschool_office', 'principal'
 				end
 			else
 				act 'Call him out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
-			
+			end
+
 			gs 'willpower', 'exhib', 'self'
 			if will_cost <=  pcs_willpwr:
 				act 'Spread your legs (<<will_cost>> willpower)':
@@ -1053,7 +1320,7 @@ if $ARGS[0] = 'computer':
 			else
 				act 'Spread your legs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			
+
 			gs 'willpower', 'misc', 'self', 'hard'
 			if will_cost <=  pcs_willpwr:
 				act 'Flip him off (<<will_cost>> Willpower)':
@@ -1097,12 +1364,12 @@ if $ARGS[0] = 'computer':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/alyrage2.jpg"></center>'
 				'He fumes. "That''s enough young lady. I''m taking you to the principal''s office." he says as he starts walking torwards her, but she grabs a chair and violently yells at him. "I will smash your fucking head in if you even dare try to touch me asshole!" This causes him to stop and take a step back, the whole class stunned. Alyona is known to have a violent streak, but she normally spends most of her time sleeping in class.'
-				
+
 				act 'Keep watching':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/alyrage3.jpg"></center>'
 					'Mr. Ivanov somewhat calmly says "Fine I won''t touch you, but you are going to the principal''s office." She screams and throws the chair across the room, then in a much more calm tone says "Fine, whatever. Let''s go." She heads out of class with Mr. Ivanov trailing behind her. Once they are gone, everyone starts talking about what just happened and sending texts on their phones. Neither of them return to class before the bell rings.'
-					
+
 					act 'Leave the classroom': gt 'gschool_lessons', 'short_break'
 				end
 			end
@@ -1128,7 +1395,7 @@ if $ARGS[0] = 'computer':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/computer/soniashirt.jpg"></center>'
 			'At the end of class, Mr. Ivanov gives a final assignment for the day. As your fellow students finish it, some of them get up and start checking out some of the computer books Mr. Ivanov has available in class. Sonia sits on one of the desks, her legs slightly spread and showing off her panties as she unbuttons her shirt until you can see between her boobs. Mr. Ivanov scolds her "Sit down and button your shirt."'
-			'Sonia smiles to him seductively. "I thought you liked what you saw."'
+			'Sonia smiles to him seductively. "I thought you liked what you saw?"'
 			'He blushes and repeats himself. "Sit down now." Sonia, with a bemused smile, sits back in her chair and slowly buttons her shirt back up.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
@@ -1182,7 +1449,7 @@ if $ARGS[0] = 'russian':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidently drop the cloth needed to wipe the board clean and hesitate to pick it up as you think about the fact that not only are you not wearing any panties, your ass is stuffed with a butt plug.'
 				*nl
-				'"Well?" Mr. Yenotin prods impatiently. Mr. Yenotin is right, might as well get on with it.'
+				'"Well?" Mr. Yenotin prods impatiently.'
 				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your classmates. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mr. Yenotin sits, he can''t see what everyone is fussing over, so he starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, start wiping away at the board as if nothing happened.'
 			else
 				gs 'exhibitionism', 1
@@ -1246,67 +1513,170 @@ if $ARGS[0] = 'russian':
 			'As you arrive in class you look around and decide to sit next to...'
 			act 'Marcus':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A146'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Marcus. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Yenotin, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Marcus, who awkwardly shuffles in his seat and avoids looking at you. As you look around, you see many of your classmates pointing and giggling, and not just at you. "Go on <<$pcs_nickname>>! You know you want that big black cock stuffed into your whore mouth and down your slutty throat!" you hear someone shout out.'
+				else
+					if grupTipe = 1:
+						npc_rel['A146'] += 1
+						'You sit next to Marcus and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Yenotin when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Marcus, who tries to politely avoid conversation, but people start laughing at him for letting you talk to him. They then turn their attention to you and mock you for trying to speak with a popular kid.'
+				else
+					 npc_rel['A146'] += 1
+					 'You sit next to Marcus. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Yenotin asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Stasya':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A139'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Stasya. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Yenotin, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Stasya, who shoots daggers at you. "What the fuck do you want whore? Do I look like I talk to dick hungry sluts like you? Keep your filthy mouth away from Andrey or you''ll regret it bitch."'
+				else
+					if grupTipe = 1:
+						npc_rel['A139'] += 1
+						'You sit next to Stasya and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Yenotin when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Stasya, but she scoffs at your attempts to speak with her and turns her attention to speaking with Irina.'
+				else
+					 npc_rel['A139'] += 1
+					 'You sit next to Stasya. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Yenotin asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Alyona':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A143'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Alyona. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Yenotin, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Alyona, who ignores you at first before mouthing "slut" at you and doing a motion with her hands where she pretends to be forcing your head down on her imaginary dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A143'] += 1
+						'You sit next to Alyona and you spend most of the class talking quietly with each other. You often get stern looks from Mr. Yenotin when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Alyona and she immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+				else
+					 npc_rel['A143'] += 1
+					 'You sit next to Alyona. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Yenotin asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Ekaterina':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A145'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Ekaterina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Yenotin, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Alyona, who ignores you at first before mouthing "slut" at you and doing a motion with her hands where she pretends to be forcing your head down on her imaginary dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A145'] += 1
+						'You sit next to Ekaterina and you spend most of the class talking quietly with each other. You often get stern looks from Mr. Yenotin when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Ekaterina and she immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+				else
+					 'You sit next to Ekaterina and she immediately gives you a deathly stare that lets you know you shouldn''t even bother trying to talk to her.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Svyatoslav':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A8'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Svyatoslav. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Yenotin, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Svyatoslav, who ignores you at first before getting your attention and pointing at the bulge in his pants while winking. "You know you want it, so come and get it slut." he whispers with a smile.'
+				else
+					if grupTipe = 2:
+						npc_rel['A8'] += 1
+						'You sit next to Svyatoslav and you spend most of the class talking quietly with each other. You often get stern looks from Mr. Yenotin when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Svyatoslav, who completely ignores you and talks to Vanya instead.'
+				else
+					 npc_rel['A8'] += 1
+					 'You sit next to Svyatoslav. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him where he flirts with you before Mr. Yenotin asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Paulina':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A24'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Paulina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Yenotin, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Paulina, who ignores you at first before mouthing "slut" at you and doing a motion with her hands where she pretends to be forcing your head down on her imaginary dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A24'] += 1
+						'You sit next to Alyona and you spend most of the class talking quietly with each other. You often get stern looks from Mr. Yenotin when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Paulina and she immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+				else
+					 npc_rel['A24'] += 1
+					 'You sit next to Paulina. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Ivanov asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Sonia':
+			act 'Viktoria':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A25'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Sonia. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Yenotin, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Vicky, who gives you a disgusted glare and walks away to sit with Vanya.'
+				else
+					if grupTipe = 1:
+						npc_rel['A15'] += 1
+						'You sit next to Vicky and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Yenotin when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Vicky, but she ignores you and instead talks to Vanya and her sister.'
+				else
+					 npc_rel['A15'] += 1
+					 'You sit next to Vicky. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before Mr. Yenotin asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Irina':
-				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A17'] += 1
+				 *clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Irina. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mr. Yenotin, mostly when you get a bit too loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principal''s office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Irina. She looks at you in disgust and turns away to talk to someone else.'
+				else
+					if grupTipe = 1:
+						npc_rel['A17'] += 1
+						'You sit next to Irina and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Yenotin when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Irina, but she dismisses all of your attempts to speak with her and spends the lesson ignoring you and talking to other people.'
+				else
+					 npc_rel['A17'] += 1
+					 'You sit next to Irina. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Yenotin asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 14:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'
@@ -1439,7 +1809,7 @@ if $ARGS[0] = 'russian':
 				end
 			else
 				act 'Call him out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 			gs 'willpower', 'exhib', 'self', 'hard'
 			if will_cost <=  pcs_willpwr:
 				act 'Spread your legs (<<will_cost>> willpower)':

+ 393 - 88
locations/gschool_lessonsev2.qsrc

@@ -1,6 +1,6 @@
 # gschool_lessonsev2
 !2020/10/16
-! This file contains the class events for geopgraphy, math, history and shop 
+! This file contains the class events for geography, math, history and shop
 
 if $ARGS[0] = 'geography':
 	*clr & cla
@@ -63,62 +63,168 @@ if $ARGS[0] = 'geography':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand =< 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-			'As you arrive in class, you look around and decided to sit next to...'
+			'As you arrive in class, you look around and decide to sit next to...'
 			chrsm_exp += rand(1,2)
 			act 'Mefodiy':
 				*clr & cla
-				npc_rel['A148'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Mefodiy during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Mefodiy, who expresses his disgust at your slutiness with sarcastic jokes and then ignores you for the rest of the lesson.'
+				else
+					if grupTipe = 1:
+						npc_rel['A148'] += 1
+						'You sit next to Mefodiy and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Mefodiy, but he ignores you for the duration of the lesson.'
+					else
+						npc_rel['A148'] += 1
+						'You sit next to Mefodiy. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Andrey and Stasya':
 				*clr & cla
-				npc_rel['A147'] += 1
-				npc_rel['A139'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'During class you sit next to Andrey and his girlfriend Stasya. You spend most of the class talking quietly with each other, though the two of you often get dirty looks from Mrs. Sokoloff, mostly when you get a bit too loud. She clears her throat a few times and even hushes you once, before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Andrey and Stasya. Stasya glares at you and warns you not to even try and suck Andrey''s dick, but he laughs in response, saying how he would never let your filthy mouth near him.'
+				else
+					if grupTipe = 1:
+						npc_rel['A139'] += 1
+						npc_rel['A147'] += 1
+						'You sit next to Andrey and Stasya and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you all to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Andrey and Stasya, but they dismiss all of your attempts to speak with them and instead spend the lesson talking to each other.'
+					else
+						npc_rel['A139'] += 1
+						npc_rel['A147'] += 1
+						'You sit next to Andrey and Stasya. They are a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Valentin':
 				*clr & cla
-				npc_rel['A158'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Valentin during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Valentin. He gives you a perverted smile and keeps asking if you want "go for a ride" with him. "And I don''t mean on my bike, slut." he adds with a wink.'
+				else
+					if grupTipe = 4:
+						npc_rel['A158'] += 1
+						'You sit next to Valentin and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Valentin and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A158'] += 1
+						'You sit next to Valentin. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Evgeny':
 				*clr & cla
-				npc_rel['A151'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Evgeny during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Evgeny. He looks at you in disgust, picks up his chess board and finds another seat to play his game.'
+				else
+					'You sit next to Evgeny, but he is so focused on the chess game in front of him that he doesn''t notice you and ignores your efforts to communicate with him.'
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Artem':
 				*clr & cla
-				npc_rel['A2'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Artem during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Artem. He looks at you in disgust and instead focuses on his coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A2'] += 1
+						'You sit next to Artem and you spend most of the class talking quietly with each other. You often get Miss Orlov''s best attempts to give you a stern look when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Artem, but he ignores you and chooses to talk to other people or do his coursework.'
+					else
+						npc_rel['A2'] += 1
+						'You sit next to Artem. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Miss Orlov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Vanya':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Vanya during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Vanya, who immediately stands up and walks over to sit with Katja and Vicky, all of them giving disgusted looks.'
+				else
+					if grupTipe = 2:
+						npc_rel['A165'] += 1
+						'You sit next to Vanya and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Vanya. He ignores you, instead choosing to lean back and talk with Katja and Vicky.'
+					else
+						npc_rel['A165'] += 1
+						'You sit next to Vanya. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before you catch Vicky giving you dagger eyes and you turn away.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lazar':
 				*clr & cla
-				npc_rel['A149'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Irina during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lazar, who mocks you for the duration of the lesson about how many dicks you''ve sucked and how your breath probably smells of cum.'
+				else
+					if grupTipe = 2:
+						npc_rel['A149'] += 1
+						'You sit next to Lazar and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Lazar. He ignores you, only talking to you if it involves mocking you.'
+					else
+						npc_rel['A149'] += 1
+						'You sit next to Lazar. He is a little surprised that you chose to do so, but seems to enjoy the attention you''re giving him. You are able to strike up a brief conversation with him before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Vitek':
 				*clr & cla
-				npc_rel['A9'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Vitek during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Vitek. He gives you a perverted smile and leans back in his chair to show you the bulge in his pants. "It''s all yours, whore. All you have to do is ask." he says with a wink.'
+				else
+					if grupTipe = 4:
+						npc_rel['A9'] += 1
+						'You sit next to Vitek and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Vitek and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A156'] += 1
+						'You sit next to Vitek. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 10:
@@ -180,7 +286,7 @@ if $ARGS[0] = 'geography':
 							'You glance up at her and then turn to clean up the rest of your shoulder while looking at the boys. "Something must have dripped on me from the ceiling and I was just cleaning it up." Mrs. Sokoloff looks up at the celling, as if expecting something to fall from it for a few moments and then goes back to teaching the class.'
 							act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 						end
-						
+
 						gs 'willpower', 'misc', 'self', 'medium'
 						if will_cost <= pcs_willpwr:
 							act 'Tell on them (<<will_cost>> Willpower)':
@@ -227,7 +333,7 @@ if $ARGS[0] = 'geography':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/tease.jpg"></center>'
 				'You decide to tease them a little and begin laughing. "Well, from what I''ve noticed you guys are in big trouble if Marcus begins going after all the girls. There''s a reason they say ''once you go black you never go back.''"'
-		        'The boys are sitting there with their mouths wide open. They can''t believe what they just heard.'
+				'The boys are sitting there with their mouths wide open. They can''t believe what they just heard.'
 				'You continue laughing. "You lot really are fucking stupid! How the hell should I know? Tell you what. Next time you have gym class, stand next to each other and compare your little dicks, faggots."'
 				'"That''s enough! You''ve had your fun." Mrs. Sokoloff angrily shouts. You quickly settle down and return to the lesson.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
@@ -404,13 +510,13 @@ if $ARGS[0] = 'math':
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/upskirt.jpg"></center>'
-					'He can''t be doing that! You pull your skirt over your legs so he can''t look at you any more and loudly say "Mr. Tsarev, be careful! If you keep staring at me like that, your eyeballs might pop out of their sockets!"' 
+					'He can''t be doing that! You pull your skirt over your legs so he can''t look at you any more and loudly say "Mr. Tsarev, be careful! If you keep staring at me like that, your eyeballs might pop out of their sockets!"'
 					'Loud laughter erupts in the classroom and Mr. Tsarev is obviously embarrassed. He opens his mouth to speak, but realizes that speaking might make things worse, so he tries his best to get the class back under control before continuing the lesson, carefully avoiding your legs.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
 				act 'Call him out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 			gs 'willpower', 'exhib', 'self', 'hard'
 			if will_cost <= pcs_willpwr:
 				act 'Spread your legs (<<will_cost>> willpower)':
@@ -454,7 +560,7 @@ if $ARGS[0] = 'math':
 			end
 		elseif scooltiperand = 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/chrislar.jpg"></center>'
-			if zverSlutQW >= 1:
+			if christinaQW['dompath'] >= 7:
 				'As class is ending Lina, Lariska and Vanya are all talking. The girls get up and hug, posing together as Vanya takes Lariska''s phone and takes several pictures of them together.'
 			else
 				'As class is ending Christina, Lariska and Vanya are all talking. The girls get up and hug, posing together as Vanya takes Lariska''s phone and takes several pictures of them together.'
@@ -469,7 +575,7 @@ if $ARGS[0] = 'math':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 11:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/larskirtup.jpg"></center>'
-			if zverSlutQW >= 1:
+			if christinaQW['dompath'] >= 7:
 				'During class, Lariska leans forward in her seat to talk to Lina, who is sitting in front of her. As she does Arkadi, who is sitting behind her, grabs her skirt and pulls it up, showing off her panty clad ass. It takes her a while to wrestle the hem of her skirt out of his hands and get it back in place, blushing as most of the class laughs.'
 				gs 'arousal', 'erotic', 5
 				gs 'arousal', 'end'
@@ -488,7 +594,7 @@ if $ARGS[0] = 'math':
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Leave class': gt 'gschool_lessons', 'short_break'
-		elseif scooltiperand = 13 and zverSlutQW < 1:
+		elseif scooltiperand = 13 and christinaQW['dompath'] < 4:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/dare1.jpg"></center>'
 			'Near the end of class, Mr. Tsarev tells the class to study quietly as he begins to grade the pop quiz he had just given the class. Some of the students study, but most start messing with their phones or quietly talking to each other, only to be shushed by Mr. Tsarev. You notice Christina writing something and then passing it to Lariska.'
 			act 'A note arrives':
@@ -506,14 +612,14 @@ if $ARGS[0] = 'math':
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/math/dare5.jpg"></center>'
-							'You shake your head. Christina and Lariska taunt you for not doing it. "Come on your pussy. Don''t be a little bitch and just do it."'
+							'You shake your head and Christina and Lariska taunt you for not doing it. "Come on you pussy. Don''t be a little bitch and just do it."'
 							'You keep up your resolve, shaking your head again and then hiss to Lariska. "Why don''t you do it?"'
 							'Christina nods and says to Lariska "Show her you''re no pussy." Lariska looks around and then puts her phone under her skirt for a moment, then pulls it back up. You lean over to glance and can see a close up image of her pussy. She then sends it through the school wifi to Mr. Tsarev, who stops what he is doing when his phone buzzes and looks at it. There is a shocked look on his face for a moment before he looks around at the class, obviously trying to figure out who sent it. A few minutes later, the bell to end class rings.'
 							act 'Leave class': gt 'gschool_lessons', 'short_break'
 						end
 					else
 						act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end	
+					end
 					act 'Do it':
 						*clr & cla
 						gs 'fame', 'pav', 'sex', 1
@@ -626,13 +732,13 @@ if $ARGS[0] = 'history':
 				gs 'fame', 'pav', 'sex', 2
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_4_2.jpg"></center>'
 				'Before you can answer the question Mrs. Sokoloff poses you, you have to clean the blackboard. You accidentally drop the cloth used to wipe it clean with and totally forgoe that you aren''t wearing panties. The whistling and shouting from the boys and murmurs of disapproval from most of the girls behind you tell you that everyone has a clear view of your bare ass and both of your holes are on display for everyone to see. Everyone but Mrs. Sokoloff that is, who has no clue why the class is so riled up and desperately tries to calm them down.'
-			elseif $pantyworntype = 'none' and analplugin = 1:	
+			elseif $pantyworntype = 'none' and analplugin = 1:
 				gs 'exhibitionism', 2
 				gs 'fame', 'pav', 'sex', 3
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidently drop the cloth needed to wipe the board clean and hesitate to pick it up as you think about the fact that not only are you not wearing any panties, your ass is stuffed with a butt plug.'
 				*nl
-				'"Well?" Mrs. Sokoloff prods impatiently. Mrs. Sokoloff is right, might as well get on with it.'
+				'"Well?" Mrs. Sokoloff prods impatiently.'
 				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mrs. Sokoloff sits, she can''t see what everyone is fussing over, so she starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, you start wiping away at the board as if nothing happened.'
 			else
 				gs 'exhibitionism', 1
@@ -816,69 +922,173 @@ if $ARGS[0] = 'history':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand =< 11:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-			'As you arrive in class, you look around and decided to sit next to...'
+			'As you arrive in class, you look around and decide to sit next to...'
 			act 'Marcus':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A146'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Marcus during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Marcus, who awkwardly shuffles in his seat and avoids looking at you. As you look around, you see many of your classmates pointing and giggling, and not just at you. "Go on <<$pcs_nickname>>! You know you want that big black cock stuffed into your whore mouth and down your slutty throat!" you hear someone shout out.'
+				else
+					if grupTipe = 1:
+						npc_rel['A146'] += 1
+						'You sit next to Marcus and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Marcus, who tries to politely avoid conversation, but people start laughing at him for letting you talk to him. They then turn their attention to you and mock you for trying to speak with a popular kid.'
+					else
+						npc_rel['A146'] += 1
+						'You sit next to Marcus. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lena':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A20'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Lena during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lena, who ignores you at first before mouthing "slut" at you and doing a motion with her hands where she pretends to be forcing your head down on her imaginary dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A20'] += 1
+						'You sit next to Lena and you spend most of the class talking quietly with each other. You often get stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Lena and she immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A20'] += 1
+						'You sit next to Lena. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Roman':
-				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A157'] += 1
+					*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Roman during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Roman, a decision you regret when he scares you with his deathly stares and comments about you being a dirty, disgusting whore who nobody would miss.'
+				else
+					if grupTipe = 4:
+						npc_rel['A157'] += 1
+						'You sit next to Roman and you spend most of the class talking quietly with each other. You often get stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Roman and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A157'] += 1
+						'You sit next to Roman. He stares straight into your eyes with a creepy look that terrifies you and causes you to look away in fear.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Petka':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A6'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Petka during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Petka. He looks at you in disgust and instead focuses on his coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A6'] += 1
+						'You sit next to Petka and you spend most of the class talking quietly with each other, often getting stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Petka, but he ignores you and chooses to talk to other people or do his coursework.'
+					else
+						npc_rel['A6'] += 1
+						'You sit next to Petka. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mrs. Sokoloff asks you to be quiet.'
+					end
+			   end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lera':
-				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A21'] += 1
+					*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Lera during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lera, who ignores you at first before mouthing "slut" at you and doing a motion with her hands where she pretends to be forcing your head down on her imaginary dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A21'] += 1
+						'You sit next to Lera and you spend most of the class talking quietly with each other. You often get stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Lera and she immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A21'] += 1
+						'You sit next to Lera. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lina':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A19'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Lina during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lina, who loudly scoffs. "Don''t you have to go and suck a dick somewhere you massive whore?"'
+				else
+					if grupTipe = 2:
+						npc_rel['A19'] += 1
+						'You sit next to Lina and you spend most of the class talking quietly with each other. You often get stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Lina, who scoffs loudly when you try talking to her. "Go and talk to Lesco. He''s the only friend a loser like you will ever get. If you''re lucky."'
+					else
+						npc_rel['A19'] += 1
+						'You sit next to Lina. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Igor':
-				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A4'] += 1
+					*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Igor during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Igor, who just stares at you before looking around for somewhere else to sit. "God, I have to sit next to the bike?" he moans when he can''t find anywhere to go.'
+				else
+					if grupTipe = 1:
+						npc_rel['A4'] += 1
+						'You sit next to Igor and you spend most of the class talking quietly with each other. You often get stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Igor, who makes great efforts to not avoid talking to you.'
+					else
+						npc_rel['A4'] += 1
+						'You sit next to Igor. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Niko':
-				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A189'] += 1
+					*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Niko during class. You spend much of the class talking quietly to each other, often getting looks from Mrs. Sokoloff when you get to loud. She clears her throat a few times and even hushes you once, finally she tells you to be quiet or she will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Niko, who makes crude remarks about how you should under his desk and on your knees sucking his dick like a good little slut.'
+				else
+					if grupTipe = 4:
+						npc_rel['A189'] += 1
+						'You sit next to Niko and you spend most of the class talking quietly with each other. You often get stern looks from Mrs. Sokoloff when you get a bit too loud. She clears her throat and hushes you a few times before she finally tells you to be quiet or she''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Niko and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A189'] += 1
+						'You sit next to Niko. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mrs. Sokoloff asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 12:
@@ -982,7 +1192,7 @@ if $ARGS[0] = 'shop':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nopanties_buttplug.jpg"></center>'
 				'You''ve been called up to answer the question written on the blackboard, but while solving it, you need to erase something. You accidently drop the cloth needed to wipe the board clean and hesitate to pick it up as you think about the fact that you''re not wearing any panties while your ass is currently stuffed full with a butt plug.'
 				*nl
-				'"Well?" Mr. Kuznetsov prods impatiently. Mr. Kuznetsov is right, might as well get on with it.'
+				'"Well?" Mr. Kuznetsov prods impatiently.'
 				'With a coy smile, you slowly begin to bend over until you feel your skirt rise up, exposing your bare pussy and ass to your class. Hearing the flurry of murmurs and whispers, you can''t help but squeeze and clench around the toy. The boys sound both surprised and intrigued by the sight while the girls whisper to one another that you''re a slut. From where Mr. Kuznetsov sits, he can''t see what everyone is fussing over, so he starts to move to get a better look. You quickly snap back up, adjust your skirt and with a devious smile and cloth in hand, you start wiping away at the board as if nothing happened.'
 			else
 				gs 'exhibitionism', 1
@@ -992,7 +1202,7 @@ if $ARGS[0] = 'shop':
 			end
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 3:
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_9.jpg"></center>' 
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_9.jpg"></center>'
 			'As you sit in class waiting for the lesson to begin, you can''t help but admire the expensive looking stockings Viktoria is wearing. With a tinge of jealousy, you wonder where you could buy yourself some and if you can afford them.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 4:
@@ -1128,7 +1338,7 @@ if $ARGS[0] = 'shop':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/class1.jpg"></center>'
 				'You shake your head at Mr. Kuznetsov, desperately wanting to turn around and strangle Dan, but you don''t dare with Mr. Kuznetsov now keeping an eye on you.'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
-			end			
+			end
 			gs 'willpower', 'misc', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Slap Dan (<<will_cost>> Willpower)':
@@ -1164,68 +1374,163 @@ if $ARGS[0] = 'shop':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand =< 10:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-			'As you arrive in class, you look around and decided to sit next to...'
+			'As you arrive in class, you look around and decide to sit next to...'
 			act 'Dimka':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A1'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Dimka during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Kuznetsov when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Dimka, who laughs at your slutiness with sarcastic jokes and then ignores you for the rest of the lesson.'
+				else
+					if grupTipe = 1:
+						npc_rel['A1'] += 1
+						'You sit next to Dimka and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Kuznetsov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Dimka, but he ignores you for the duration of the lesson.'
+					else
+						npc_rel['A1'] += 1
+						'You sit next to Dimka. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him before Mr. Kuznetsov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Vicky':
+			act 'Viktoria':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A15'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Vicky during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Kuznetsov when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Vicky, who gives you a disgusted glare and walks away to sit with Vanya.'
+				else
+					if grupTipe = 1:
+						npc_rel['A15'] += 1
+						'You sit next to Vicky and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Kuznetsov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Vicky, but she ignores you and instead talks to Vanya and her sister.'
+					else
+						npc_rel['A15'] += 1
+						'You sit next to Vicky. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before Mr. Kuznetsov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Dan':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A10'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Dan during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Kuznetsov when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Dan. He gives you a perverted smile and keeps asking if you want to suck his dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A10'] += 1
+						'You sit next to Dan and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Kuznetsov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Dan and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A10'] += 1
+						'You sit next to Dan. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Kuznetsov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Vitek':
-				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A9'] += 1
+				 *clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Vitek during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Kuznetsov when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Vitek. He gives you a perverted smile and leans back in his chair to show you the bulge in his pants. "It''s all yours, whore. All you have to do is ask." he says with a wink.'
+				else
+					if grupTipe = 4:
+						npc_rel['A9'] += 1
+						'You sit next to Vitek and you spend most of the class talking quietly with each other, often getting stern looks from Mr Kuznetsov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Vitek and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A156'] += 1
+						'You sit next to Vitek. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Kuznetsov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Vasily':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A11'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Vasily during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Kuznetsov when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Vasily. He gives you a perverted smile and keeps asking if you want to suck his dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A11'] += 1
+						'You sit next to Vasily and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Kuznetsov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Vasily and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A11'] += 1
+						'You sit next to Vasily. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Kuznetsov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Paulina':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A24'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Paulina during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Kuznetsov when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Paulina, who ignores you at first before mouthing "slut" at you and doing a motion with her hands where she pretends to be forcing your head down on her imaginary dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A24'] += 1
+						'You sit next to Alyona and you spend most of the class talking quietly with each other. You often get stern looks from Mr. Kuznetsov when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Paulina and she immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A24'] += 1
+						'You sit next to Paulina. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Kuznetsov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Fedor':
+			act 'Petia':
 				*clr & cla
 				chrsm_exp += rand(1,2)
-				npc_rel['A5'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Fedor during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Kuznetsov when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				if pav_slut >= 150:
+					'As you walk into class, you look around and to your despair find that the only seat left is next to Petia, everyone else having given the fat, smelly loser a wide berth. Your nostrils are assaulted as soon as you sit down, the ordeal made worse by Petia leaning in and asking if he can get a blowjob since you''re such a slut. You reply by sticking your fingers in your mouth and gagging. "When will you realise that you''re such a fat and smelly loser that not even <<$pcs_nickname>> will suck your tiny dick?" Arkadi chimes in, causing the gopniks to gang up on him and free you from his horrible attempts at hitting on you.'
+				else
+					'As you walk into class, you look around and to your despair find that the only seat left is next to Petia, everyone else having given the fat, smelly loser a wide berth. Your nostrils are assaulted as soon as you sit down, the ordeal made worse by Petia leaning in and continually making disgusting attempts to hit on you, despite you clearly not being interested. You recoil and gag as his proximity makes the smell of him worse. "Girls always gag and run away when you talk to them because you''re a fat, disgusting loser that I can smell from over here! They don''t want to and never will suck your tiny dick, so fuck off and leave them alone." Arkadi chimes in, causing the gopniks to gang up on him and free you from the ordeal.'
+				end
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Marcus':
 				*clr & cla
-				npc_rel['A146'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Marcus during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Kuznetsov when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Marcus, who awkwardly shuffles in his seat and avoids looking at you. As you look around, you see many of your classmates pointing and giggling, and not just at you. "Go on <<$pcs_nickname>>! You know you want that big black cock stuffed into your whore mouth and down your slutty throat!" you hear someone shout out.'
+				else
+					if grupTipe = 1:
+						npc_rel['A146'] += 1
+						'You sit next to Marcus and you spend most of the class talking quietly with each other, often getting stern looks from Mr. KuznetsovVal when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Marcus, who tries to politely avoid conversation, but people start laughing at him for letting you talk to him. They then turn their attention to you and mock you for trying to speak with a popular kid.'
+					else
+						npc_rel['A146'] += 1
+						'You sit next to Marcus. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Kuznetsov asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 11:
@@ -1326,7 +1631,7 @@ if $ARGS[0] = 'shop_punishment':
 				minut += 2
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/ruslan/sex/pshop3.jpg"></center>'
 				if hotcat >= 6 and pav_slut >= 150:
-					if $pantyworntype ! 'none':						
+					if $pantyworntype ! 'none':
 						'He quickly walks around his desk and once he is standing next to you, he shoves you forward, bending you over his desk. He pulls up your skirt and violently yanks down your panties. You can hear the tearing fabric as he does. He gives your bare ass one hard open handed swat that stings. You expect more but nothing comes. You look back just as he pulls something out of his pocket. He holds it up for you to see. It is a larger than average butt plug.'
 					else
 						'He quickly walks around his desk and once he is standing next to you, he shoves you forward, bending you over his desk. He pulls up your skirt and forcefully holds you down over his desk. "Not even wearing panties to school you little slut." he says as he gives your bare ass one hard open handed swat that stings. You expect more but nothing comes. You look back just as he pulls something out of his pocket. He holds it up for you to see. It is a larger than average butt plug.'

+ 309 - 83
locations/gschool_lessonsev3.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = 'literature':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			gs 'willpower', 'misc', 'self', 'medium'
-			if will_cost <= pcs_willpwr:	
+			if will_cost <= pcs_willpwr:
 				act 'Defend Igor (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
@@ -251,12 +251,12 @@ if $ARGS[0] = 'reading':
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big159.jpg"></center>'
 		'"Screw reading! <<$pcs_nickname>>''s mouth is better suited for sucking cock." you overhear someone say from behind you. You turn around and it''s none other than Petia staring back at you. Unashamed, a perverted smile spreads across his face. You get the feeling he''s undressing you with his eyes.'
 		act 'Say nothing':
-			*clr & cla			
+			*clr & cla
 			'Unable to respond, you turn around without confronting him. You hear him chuckle and mutter something incoherent under his breath, but he doesn''t say anything else for the remainder of class. Replaying the encounter in your head, a part of you wonders if saying nothing was the right thing to do.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Blush':
-			cla & *nl			
+			cla & *nl
 			'Your cheeks flush with heat at his words and you meekly look away, feeling his leering gaze burn into your neck. A few boys nearby snigger at his remark and a couple girls huff in disgust.'
 			*nl
 			'As class continues and everyone''s attention moves on, you wonder maybe if your reaction might''ve given the wrong impression...'
@@ -303,7 +303,7 @@ if $ARGS[0] = 'reading':
 				*nl
 				'"Damn <<$pcs_nickname>> isn''t fucking around." Anushka marvels, giving you a nod of approval.'
 				'"Just hit that fat piece of shit! Nobody''s going to care." Roman comments as he turns to face Petia with a scowl.'
-				'"Jesus Christ, when are you gonna realize no one fucking likes you, especially chicks!?" Arkadi adds, his lips curled back in disgust. Before you know it, the three gopniks have zeroed in on the outcast, giving him a verbal lashing he''ll spend all day recovering from.'
+				'"Jesus Christ, when are you going to realize that nobody fucking likes you, especially chicks!?" Arkadi adds, his lips curled back in disgust. Before you know it, the three gopniks have zeroed in on the outcast, giving him a verbal lashing he''ll spend all day recovering from.'
 				act 'Get back to work':
 					*clr & cla
 					'Leaving it to the gopniks to finish what you started, you go back to work.'
@@ -312,6 +312,7 @@ if $ARGS[0] = 'reading':
 				act 'Join in':
 					*clr & cla
 					grupvalue[1] += 1
+					grupvalue[2] += 1
 					grupvalue[3] -= 1
 					grupvalue[4] += 1
 					'You join the three gopniks and continue to mercilessly berate Petia until he''s saved by Ms. Braakman telling everyone to get back to work.'
@@ -322,7 +323,7 @@ if $ARGS[0] = 'reading':
 			act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		gs 'willpower', 'misc', 'self', 'medium'
-		if will_cost <= pcs_willpwr:		
+		if will_cost <= pcs_willpwr:
 			act 'Insult him (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'misc', 'self', 'medium'
@@ -330,6 +331,7 @@ if $ARGS[0] = 'reading':
 				gs 'stat'
 				demerit += 5
 				grupvalue[1] += 1
+				grupvalue[2] += 1
 				grupvalue[3] -= 1
 				grupvalue[4] += 1
 				'"You''re too fat to even see your own dick, so what would you know about blowjobs besides being a pro at giving them?" you say with a mocking smile. There''s a moment of stunned silence before laughter breaks out in the class. Watching Petia''s face flush bright red as he struggles to defend himself fills you with a smug satisfaction.'
@@ -433,7 +435,7 @@ if $ARGS[0] = 'getphone':
 						if $pantyworntype ! 'none':
 							'"Hell no, I''m not going to--" You''re cut off as Ms. Braakman slaps you hard across your face. You look back at her in stunned silence as you cup your burning cheek.'
 							'"I wasn''t asking." she warns, her lips curling into a scowl. "Now do as I said."'
-							'The arrogance you had early quickly disappears as you stare into her cold, dark eyes. Obediently, you turn your back to her and await further instructions. "Bend over in front of that desk." she orders. You can only assume she means the one right in front of you, but it''s not like you''re going to ask for confirmation.'
+							'Your earlier arrogance quickly disappears as you stare into her cold, dark eyes. Obediently, you turn your back to her and await further instructions. "Bend over in front of that desk." she orders. You can only assume she means the one right in front of you, but it''s not like you''re going to ask for confirmation.'
 							*nl
 							'"If only you behaved this well in class." she quips as you place your hands on the desk, leaning down only slightly so that your ass doesn''t stick out too much. Ms. Braakman is quick to notice this, and without hesitation, she grabs you by the back of the neck and shoves your upper half down onto the desk, forcing you to present your ass to her. You wince as your cheek hits the hard surface, but Ms. Braakman doesn''t seem to care as she flips your skirt up onto your back and pulls your panties down.'
 							*nl
@@ -522,8 +524,8 @@ if $ARGS[0] = 'english':
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			gs 'willpower', 'misc', 'self', 'medium'
-			if will_cost <= pcs_willpwr:	
-				act 'Play a cruel trick on them (<<will_cost>> Willpower)':
+			if will_cost <= pcs_willpwr:
+				act 'Trick them (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
@@ -533,12 +535,12 @@ if $ARGS[0] = 'english':
 					grupvalue[4] -= 1
 					grupvalue[1] += 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/events/badlanguage.jpg"></center>'
-					'"Sure, repeat after me: I''m a worthless cock-sleeve who enjoys being a cum dump to all the boys in school."'
+					'"Sure, repeat after me: I''m a worthless cock-sleeve who enjoys being a cum dump for all the boys in school."'
 					'Lera and Lena seem surprised with how much you say, but you reassure them it''s a really good insult; the worst of the worst. With a smile, they repeat the sentence, completely unaware of what they''re actually saying.'
 					act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 				end
 			else
-				act 'Play a cruel trick on them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Trick them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif scooltiperand = 4:
 			if pcs_makeup > 1:
@@ -605,7 +607,7 @@ if $ARGS[0] = 'english':
 		elseif scooltiperand = 6:
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/belver.jpg"></center>'
-			'Near the end of class, Bella pulls out a paper while Veronika checks her makeup, apparently both are pretty bored with class and have given up trying to pay attention.'
+			'Near the end of class, Bella pulls out a paper while Albina checks her makeup. They both seem pretty bored with class and have given up trying to pay attention.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 7:
 			*clr & cla
@@ -641,7 +643,7 @@ if $ARGS[0] = 'english':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/leraeatme.jpg"></center>'
 			'You notice Lera squirming around in her seat during class and decide to see what''s wrong. "What''s up?" you ask.'
-			'She glances at you and seems like she is about to have a sharp retort, but then closes her mouth and seems to really look at you and then says "Nothing you couldn''t fix for me." She sticks her tongue out between two of her fingers in the universal ''eat me'' sign. You can''t help but blush a little as it caught you a little off guard, as Lera seems to only pays attention to Lena. Before you can reply though, Ms. Braakman clears her throat and gets you both looking forward again. She spends the rest the class keeping an eye on both of you.'
+			'She glances at you and seems like she is about to have a sharp retort, but then closes her mouth and seems to really look at you and then says "Nothing you couldn''t fix for me." She sticks her tongue out between two of her fingers in the universal ''eat me'' sign. You can''t help but blush a little as since Lera only ever seems to pay attention to Lena. Before you can reply, Ms. Braakman clears her throat and gets you both looking forward again. She spends the rest the class keeping an eye on both of you.'
 			gs 'arousal', 'erotic', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -650,7 +652,7 @@ if $ARGS[0] = 'english':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/english/lerapussy.jpg"></center>'
 			'You notice Lera squirming around in her seat during class and decide to see what''s wrong. "What''s up?" you ask.'
-			'She glances at you and seems like she is about to have a sharp retort, but then closes her mouth and seems to really look at you, but the bell rings to end class. As everyone gets up and heads out of class she says. "Nothing you couldn''t fix for me, if you put that tongue to good use for a change." She pulls up her skirt and pulls her panties aside to show you her clean shaven pussy. Before you can respond though, Lena comes over and steps between the two of you, blocking your view. They exchange a few whispers and then leave class together.'
+			'She glances at you and seems like she is about to have a sharp retort, but then closes her mouth and seems to really look at you, but the bell rings to end class. As everyone gets up and heads out of class she says "Nothing you couldn''t fix for me, if you put that tongue to good use for a change." She pulls up her skirt and pulls her panties aside to show you her clean shaven pussy. Before you can respond, Lena comes over and steps between the two of you, blocking your view. They exchange a few whispers and then leave class together.'
 			gs 'arousal', 'erotic_nudity', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -721,7 +723,7 @@ if $ARGS[0] = 'working':
 		end
 		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
-			act 'Ignore them (<<will_cost>> Willpower)': 
+			act 'Ignore them (<<will_cost>> Willpower)':
 				cla
 				gs 'willpower', 'misc', 'self', 'medium'
 				gs 'willpower', 'pay', 'self'
@@ -765,7 +767,7 @@ if $ARGS[0] = 'working':
 		end
 	elseif scooltiperand = 3:
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big3.jpg"></center>'
-		'"Hey, do you think you can help me? You seem to know what you''re doing," Ivan whispers to you. He laughs a bit nervously, clearly he isn''t used to asking for help like this.'		
+		'"Hey, do you think you can help me? You seem to know what you''re doing." Ivan whispers to you. He laughs a bit nervously, clearly he isn''t used to asking for help like this.'
 		act 'Help him':
 			*clr & cla
 			npc_rel['A3'] +=1
@@ -775,7 +777,7 @@ if $ARGS[0] = 'working':
 		end
 		gs 'willpower', 'misc', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
-			act 'Make up an excuse (<<will_cost>> Willpower)': 
+			act 'Make up an excuse (<<will_cost>> Willpower)':
 				*clr & cla
 				npc_rel['A3'] -= 2
 				grupvalue[2] -= 1
@@ -854,7 +856,7 @@ if $ARGS[0] = 'music':
 		school_event_hour = 1
 		scooltiperand = rand(1,22)
 		if scooltiperand = 1:
-			if Katja_tanga_end = 1 and $pantyworntype ! 'none':	
+			if Katja_tanga_end = 1 and $pantyworntype ! 'none':
 				gs 'exhibitionism', 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/scoolrand_1.jpg"></center>'
 				'As you move into the classroom, Katja runs up to you with a slight blush on her face. Before you know it, she gives you a deep kiss and pulls up your skirt to touch your ass. You return the kiss, not caring about the hooting and hollering in the background from your fellow classmates.'
@@ -1085,13 +1087,26 @@ if $ARGS[0] = 'music':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand =< 13:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-			'As you arrive in class you look around and decided to sit next to...'
+			'As you arrive in class you look around and decide to sit next to...'
 			act 'Katja':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A14'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Katja during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Katja. She stares at you in disbelief and starts blushing bright red before she gets up and hurries to sit next to her sister.'
+				else
+					if grupTipe = 1:
+						npc_rel['A14'] += 1
+						'You sit next to Katja and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Katja, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
+					else
+						npc_rel['A14'] += 1
+						'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Vasilyev asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Radomir':
@@ -1099,55 +1114,137 @@ if $ARGS[0] = 'music':
 				chrsm_exp += rand(1,2)
 				npc_rel['A154'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Radomir during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				if pav_slut >= 150 or grupTipe = 5:
+					'You sit next to Radomir, but he ignores your attempts to speak by saying that he only talks to girls who he wants to fuck, making it clear that you aren''t one of those girls.'
+				else
+					'You sit next to Radomir, but you don''t get a chance to speak as he dominates the conversation about how amazing he and the band are and how he pulls all the hot chicks. He finishes by asking if you want to suck his dick.'
+				end
+				gs 'stat'
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lavrenti':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A155'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Lavrenti during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lavrenti. He gives you a perverted smile and keeps asking if you want to suck his dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A155'] += 1
+						'You sit next to Lavrenti and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Lavrenti and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A155'] += 1
+						'You sit next to Lavrenti. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Vasilyev asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Valentin':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A158'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Valentin during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Valentin. He gives you a perverted smile and keeps asking if you want "go for a ride" with him. "And I don''t mean on my bike, slut." he adds with a wink.'
+				else
+					if grupTipe = 4:
+						npc_rel['A158'] += 1
+						'You sit next to Valentin and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You are forced to sit next to Valentin and he immediately starts bullying you, eventually getting some of the other gopniks to join in.'
+					else
+						npc_rel['A158'] += 1
+						'You sit next to Valentin. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr Vasilyev asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lariska':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A13'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Lariska during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lariska, who gleefully laughs at you. "Don''t you have a big cock waiting for you in the bathroom, slut?"'
+				else
+					if grupTipe = 2:
+						npc_rel['A13'] += 1
+						'You sit next to Lariska and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Lariska, who giggles when you try talking to her. "Go and talk to Lesco. He''s the only friend a loser like you will ever get. If you''re lucky."'
+					else
+						npc_rel['A13'] += 1
+						'You sit next to Lariska. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Vasilyev asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Lina':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A19'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Lina during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Lina, who loudly scoffs. "Don''t you have to go and suck a dick somewhere you massive whore?"'
+				else
+					if grupTipe = 2:
+						npc_rel['A19'] += 1
+						'You sit next to Lina and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Lina, who scoffs loudly when you try talking to her. "Go and talk to Lesco. He''s the only friend a loser like you will ever get. If you''re lucky."'
+					else
+						npc_rel['A19'] += 1
+						'You sit next to Lina. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Vasilyev asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Bella':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A22'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Bella during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Bella, who makes no effort to hide her disgust. "You''re such a washed up and desperate slut who''ll do anything for a cock. How anyone here even tolerates you is beyond me."'
+				else
+					if grupTipe = 1:
+						npc_rel['A22'] += 1
+						'You sit next to Bella and she begrudingly engages you in a brief conversation that she quickly shuts down, deeming it to be too childish for her.'
+					elseif grupTipe = 5:
+						'Bella gives a disapproving look and makes no effort to hide her dislike of you. "How can you get to your age and not have at least one friend? You need to grow up."'
+					else
+						'You sit next to Bella and she rolls her eyes. "What do you want <<$pcs_firstname>>? I don''t have time to sit here and talk to kids."'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Petka':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A159'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Petia during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Petka. He looks at you in disgust and instead focuses on his coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A6'] += 1
+						'You sit next to Petka and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Petka, but he ignores you and chooses to talk to other people or do his coursework.'
+					else
+						npc_rel['A6'] += 1
+						'You sit next to Petka. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Vasilyev asks you to be quiet.'
+					end
+				end
+				gs 'stat'
+
 				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 14:
@@ -1307,90 +1404,219 @@ if $ARGS[0] = 'art':
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 9:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/wedgieb.jpg"></center>'
-			'You hear a pained grasp, as did several others. You glance over just in time to see Dan letting go of Petia''s underwear. He pulled the panties half way up his back. You wince slightly at what looks like a painful wedgie.'
+			'You hear a pained grasp, as do several others. You glance over just in time to see Dan letting go of Petia''s underwear. He''s pulled his underwear half way up his back and you wince slightly at what looks like a painful wedgie.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand =< 11:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-			'As you arrive in class you look around and decided to sit next to...'
+			'As you arrive in class you look around and decide to sit next to...'
 			act 'Erast':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A150'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Erast during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Erast, who awkwardly shuffles in his seat and avoids looking at you. You can tell your reputation as the school bike is making him feel uncomfortable, but he''s too polite to say anything.'
+				else
+					if grupTipe = 2:
+						npc_rel['A150'] += 1
+						'You sit next to Erast and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Erast and he politely enages you in conversation before someone calls you out for trying to socialise with someone above your social standing and Erast grows quiet.'
+				else
+					 npc_rel['A146'] += 1
+					 'You sit next to Erast. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Vasilyev asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Julia':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A12'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Julia during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Julia. She avoids making eye contact with you and instead focuses on her coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A12'] += 1
+						'You sit next to Julia and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Julia, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
+				else
+					 npc_rel['A12'] += 1
+					 'You sit next to Julia. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Vasilyev asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Katja':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A17'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Katja during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Katja. She stares at you in disbelief and starts blushing bright red before she gets up and hurries to sit next to her sister.'
+				else
+					if grupTipe = 1:
+						npc_rel['A14'] += 1
+						'You sit next to Katja and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Katja, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
+				else
+					 npc_rel['A14'] += 1
+					 'You sit next to Katja. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Vasilyev asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Albina':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A23'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Albina during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Albina, who immediately looks you over before shaking her head in disgust and walking away to sit with Vicky.'
+				else
+					if grupTipe = 1 or grupTipe = 2 or AlbinaQW['Friends'] = 2:
+						npc_rel['A23'] += 1
+						'You sit next to Albina and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Albina, who gives you a pitiful look before turning away and ignoring you for the rest of the lesson.'
+				else
+					 'You sit next to Albina and she rolls her eyes. She begrudingly engages you in a very brief and awkward conversation, her piercing glare dissauding you from making any further attempts.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Anushka':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A144'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Anushka during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Anushka, who ignores you at first before mouthing "slut" at you and doing a motion with her hands where she pretends to be forcing your head down on her imaginary dick.'
+				else
+					if grupTipe = 4:
+						npc_rel['A144'] += 1
+						'You sit next to Anushka and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Anushka and she starts having fun with you, gleefully mocking you so much that the other gopniks join in.'
+				else
+					 npc_rel['A144'] += 1
+					 'You sit next to Anuska. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Vasilyev asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Natasha':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A16'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Natasha during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Natasha. She avoids making eye contact with you and instead focuses on her coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A16'] += 1
+						'You sit next to Natasha and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Natasha, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
+				else
+					 npc_rel['A16'] += 1
+					 'You sit next to Natasha. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Vasilyev asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Feofan':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A152'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Feofan during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Feofan. He looks at you in disgust and instead focuses on his coursework.'
+				else
+					if grupTipe = 3:
+						npc_rel['A152'] += 1
+						'You sit next to Feofan and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Feofan, but he ignores you and chooses to talk to other people or do his coursework.'
+				else
+					 npc_rel['A152'] += 1
+					 'You sit next to Feofan. He is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with him before Mr. Vasilyev asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Svyatoslav':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A8'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Svyatoslav during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Svyatoslav, who ignores you at first before getting your attention and pointing at the bulge in his pants while winking. "You know you want it, so come and get it slut." he whispers with a smile.'
+				else
+					if grupTipe = 2:
+						npc_rel['A8'] += 1
+						'You sit next to Svyatoslav and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Svyatoslav, who completely ignores you and talks to Vanya instead.'
+				else
+					 npc_rel['A8'] += 1
+					 'You sit next to Svyatoslav. He is a little surprised that you chose to do so, but you are able to strike up a brief conversation with him where he flirts with you before Mr. Vasilyev asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
-			act 'Vicky':
+			act 'Viktoria':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A15'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Vicky during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Vicky, who gives you a disgusted glare and walks away to sit with Vanya.'
+				else
+					if grupTipe = 1:
+						npc_rel['A15'] += 1
+						'You sit next to Vicky and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Vicky, but she ignores you and instead talks to Vanya and her sister.'
+				else
+					 npc_rel['A15'] += 1
+					 'You sit next to Vicky. She is a little surprised that you chose to do so, but you are able to strike up a brief conversation with her before Mr. Vasilyev asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 			act 'Zinaida':
 				*clr & cla
-				chrsm_exp += rand(1,2)
-				npc_rel['A142'] += 1
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/talk.jpg"></center>'
-				'You sit next to Zinaida during class. You spend much of the class talking quietly to each other, often getting looks from Mr. Vasilyev when you get to loud. He clears his throat a few times and even hushes you once, finally he tells you to be quiet or he will send you to the principals office.'
-				act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
+				chrsm_exp += rand(1,2)
+				if pav_slut >= 150:
+					'You sit next to Zinaida. She avoids making eye contact with you and instead focuses on playing a game on her phone before class starts.'
+				else
+					if grupTipe = 3:
+						npc_rel['A16'] += 1
+						'You sit next to Zinaida and you spend most of the class talking quietly with each other, often getting stern looks from Mr. Vasilyev when you get a bit too loud. He clears his throat and hushes you a few times before he finally tells you to be quiet or he''ll send you to the principal''s office.'
+					elseif grupTipe = 5:
+						'You sit next to Zinaida, but she awkwardly ignores you and chooses to talk to other people or do her coursework.'
+				else
+					 npc_rel['A16'] += 1
+					 'You sit next to Zinaida. She is a little surprised that you chose to do so, but you are able to strike up a brief, if a little awkward, conversation with her before Mr. Vasilyev asks you to be quiet.'
+				end
+			end
+			gs 'stat'
+
+			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 			end
 		elseif scooltiperand = 12:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/open.jpg"></center>'

+ 13 - 13
locations/gschool_lunch.qsrc

@@ -121,7 +121,7 @@ if $ARGS[0] = 'break':
 	gs 'stat'
 	urand = rand(0,8)
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/chat/cooljocks.jpg"></center>'
-	'During break many of the kids split up to hang out with those in their same social groups. The nerds and outcast hangout in the classrooms, while the cool kids and jocks hang out in the hallway near the lockers, and the gopniks hangout in the stairwell, near the classrooms that are not used.'
+	'During break, the students split up to hang out with those in their social groups. The nerds and outcasts hang out in the classrooms, the cool kids and jocks hang out in the hallway near the lockers, and the gopniks hang out in the stairwell near the disused classrooms.'
 
 	$eventtype = 'long_break'
 
@@ -136,7 +136,7 @@ if $ARGS[0] = 'break':
 	if meynoldQW = 0 and npc_rel['A14'] >= 30 and pav_slut < 25 and pcs_grades >= 70 and pcs_makupskl >= 40 and hotcat >= 6: gt 'gschool_chats1', 'Katjaproblems'
 
 	if $breaktype ! 'long':
-		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat did you happen to see Dimka?" "Hi <<$pcs_nickname>>, he was here before speaking with Lena and Lera.'
+		if dimaRevenge = 4 and dimaRevChoice = 2 and hour < 10: '<br>"Hi Nat, did you happen to see Dimka?" "Hey <<$pcs_nickname>>, he was here earlier, speaking with Lena and Lera.'
 
 		if dimaRevenge = 2:
 			gt 'dimaRevenge', 2
@@ -166,7 +166,7 @@ if $ARGS[0] = 'break':
 		if school_period = 6:
 			if lunch_event ! daystart: lunch_event = daystart & gt 'gschool_lunch', 'events'
 
-			if soniaPS = 2: soniaPS = 3 & 'During break, while you''re wandering through the school hallways killing time, you notice Sonia Ivanko and Vitek Kotov talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
+			if soniaPS = 2: soniaPS = 3 & 'During break, you''re wandering through the school hallways killing time when you notice Sonia and Vitek talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
 
 			act 'Use water cooler': $breaktype = 'long' & gt 'gschool_break', 'watercooler'
 			act 'Go to the girls restroom': $breaktype = 'long' & gt 'gschool_break', 'girls_restroom'
@@ -177,7 +177,7 @@ if $ARGS[0] = 'break':
 				gt 'gschool_events', 'break_events'
 			end
 
-			if soniaPS = 2: soniaPS = 3 & 'During break, while you''re wandering through the school hallways killing time, you notice Sonia Ivanko and Vitek Kotov talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
+			if soniaPS = 2: soniaPS = 3 & 'During break, you''re wandering through the school hallways killing time when you notice Sonia and Vitek talking about something. Sonia looks like she''s about to cry, but eventually she gives a quiet nod as Vitek whispers something in her ear.'
 
 			act 'Use water cooler': $breaktype = 'short' & gt 'gschool_break', 'watercooler'
 			act 'Go to the girls restroom': $breaktype = 'short' & gt 'gschool_break', 'girls_restroom'
@@ -187,7 +187,7 @@ if $ARGS[0] = 'break':
 
 	act 'Relax in a classroom': gt 'gschool_chats', 'nerds'
 	act 'Hang out in the hallway': gt 'gschool_chats', 'cooljocks'
-	act 'Go hangout with the gopniks': gt 'gschool_chats', 'gopniks'
+	act 'Hang out with the gopniks': gt 'gschool_chats', 'gopniks'
 
 	if school_period = 6:
 		act 'Stay in cafeteria':
@@ -200,7 +200,7 @@ if $ARGS[0] = 'break':
 			gs 'gschool_groups', 'teachers'
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 			if rolanmeet < 1:
-				'Rolan is sitting with his head on the table, he seems lonely.'
+				'Rolan is sitting with his head on the table, looking a little lonely.'
 				act 'Look for the lonely man': gt 'gschool_lunch', 'rolan_meet'
 			elseif rolanmeet < 2:
 				'Rolan is sleeping at the table as usual.'
@@ -211,14 +211,14 @@ if $ARGS[0] = 'break':
 		end
 	end
 
-	if zverevaQW = 2 and zverRageQW = 0 or zverevaQW = 3 and zverRageQW = 0:
+	if christinaQW['dompath'] = 3:
 		act 'Spread rumors about Christina':
 			*clr & cla
 			menu_off = 1
-			if zverRageQW = 0:zverRageQW = 1
+			christinaQW['dompath'] = 4
 			minut += 5
 			gs 'stat'
-			'You spread rumors about how Christina has sex with Mr. Pavlovich, the P.E. teacher. The rumor spreads like wildfire: within the hour, everyone knows how she stays ahead.'
+			'You spread rumors about how Christina has sex with Mr. Pavlovich, the P.E. teacher. The rumor spreads like wildfire: within the hour, most of the school has heard about it.'
 			xgt 'gschool_lessons', 'short_break','nopict'
 		end
 	end
@@ -230,10 +230,10 @@ if $ARGS[0] = 'marcus_event':
 	*clr & cla
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/marcus/marcusflirt.jpg"></center>'
-	'As you stop at your locker before lunch, Marcus walks over. "Hey <<$pcs_nickname>>, you are looking fine today. Damn, you look good in that little plaid skirt!"'
+	'As you stop at your locker before lunch, Marcus walks over. "Hey <<$pcs_nickname>>, you''re looking fine today. Damn, you look good in that little plaid skirt!"'
 	'You can''t help but smile and shake your head a little. You can tell by the way his eyes roam all over your body that despite his compliments, there is only one thing on his mind right now. If the way he''s flirting wasn''t obvious enough, the bulge straining against his pants is a dead give away. "Well you''re not looking too bad yourself Marcus. And by the look of things, you sure are VERY happy to see me." you say with a giggle while deliberately staring at his crotch.'
 	*nl
-	'He blushes slightly and pulls out his shirt so it hangs over his crotch, trying to hide his erection a little. "Oh fuck, sorry about that. I just had two girls in my last class who took turns flashing me. I swear those girls get a huge kick out of teasing me." He looks around a bit and then leans in a little close to you and softly says "Hey, think you might be able to you know... help me out with this?", indicating the evident bulge in his pants.'
+	'He blushes slightly and pulls out his shirt so it hangs over his crotch, trying to hide his erection a little. "Oh fuck, sorry about that. I just had two girls in my last class who took turns flashing me. I swear those girls get a huge kick out of teasing me." He looks around a bit and then leans in a little close to you and softly says "Hey, think you might be able to you know... help me out with this?" while indicating the evident bulge in his pants.'
 	gs 'willpower', 'bj', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Make an excuse and go (<<will_cost>> Willpower)':
@@ -258,7 +258,7 @@ if $ARGS[0] = 'marcus_event':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big146.jpg"></center>'
-			'You shake your head. "Sorry not today Marcus."'
+			'You shake your head. "Sorry, not today Marcus."'
 			'He nods his head in understanding. "Yeah ok, not a problem. I figured, you know it wouldn''t hurt to ask, but don''t worry about it. But hey you want to sit with me at lunch and talk?"'
 			act 'Yeah that would be nice':
 				*clr & cla
@@ -429,7 +429,7 @@ if $ARGS[0] = 'events':
 		'During the break, you are approached by some of the gopniks. "<<$pcs_nickname>>, come to the bathroom with us so we can have a little fun. You look like you could use a protein snack anyways." A couple of them snicker as they put their hands around your arms and try to guide you towards the restrooms.'
 		*nl
 		'You pull back, slapping their hands away playfully. "Give a girl a chance to consider her options." You already know what you plan to do, but you like to tease them when you get the chance. Should you give them all a quick suck or just leave them high and dry?'
-		act 'Nah I don''t think so':
+		act 'I don''t think so':
 			*clr & cla
 			if $pantyworntype ! 'none':
 				'<center><video autoplay loop src="images/locations/pavlovsk/school/lunch/buttflash.mp4"></video></center>'

+ 112 - 112
locations/gschool_office.qsrc

@@ -9,10 +9,10 @@ if $ARGS[0] = 'principal':
 	'The office is, in a word, impressive: It must have cost a full year''s worth of the school''s budget to decorate it. At least now you know why so much of the rest of the school has cracked and faded paint, or is in need of repair that never seems to happen - all the money is spent on this one room.'
 	*nl
 	if detention_set = 2:
-		'You take a seat at Principal <<$npc_lastname[''A134'']>>''s desk and wait for her to address you with an exacerbated tone: "I usually give pupils the choice of detention so that I don''t have to punish them personally... but you have abused my leniency one time too many. I''m going to teach you not to insult my kindness." She is clearly angry and you can almost already feel the pain on your butt that you are about to receive.'
+		'You take a seat at Miss Volkov''s desk and wait for her to address you with an exacerbated tone: "I usually give pupils the choice of detention so that I don''t have to punish them personally, but you have abused my leniency one time too many. I''m going to teach you not to insult my kindness." She is clearly angry and you can almost already feel the pain on your ass that you are about to receive.'
 		act 'Accept the inevitable': gt 'gschool_office', 'spanked'
 	elseif demerit > 50:
-		'You take a seat at Principal <<$npc_lastname[''A134'']>>''s desk and wait for her to address you with an exacerbated tone: "What did you do this time, <<$pcs_lastname>>? No, I don''t want to know. I really don''t care what it is. You obviously have no respect for me or your teachers." She looks over your file some more and shakes her head slightly. "You have been here enough and you know what comes next. So, what will it be this time? Spanking, or perhaps Saturday detention?" She seems more than a bit annoyed that you appear to be immune to her punishment system... or maybe that you are that troubled of a student.'
+		'You take a seat at Miss Volkov''s desk and wait for her to address you with an exacerbated tone: "What did you do this time, <<$pcs_lastname>>? No, I don''t want to know. I really don''t care what it is. You obviously have no respect for me or your teachers." She looks over your file some more and shakes her head slightly. "You have been here enough and you know what comes next. So, what will it be this time? Spanking or Saturday detention?" She seems more than a bit annoyed that you appear to be immune to her punishment system, or maybe that you are that troubled of a student.'
 		if detention_set = 0: 
 			act 'Choose detention': detention_set = 1 & gt 'gschool_lessons', 'short_break'
 			act 'Choose spanking': gt 'gschool_office', 'spanked'
@@ -24,7 +24,7 @@ if $ARGS[0] = 'principal':
 !!		if demerit >= 50:act 'Choose suspension': gt 'gschool_lessons', 'suspension'
 !!		act 'Call Parents': gt 'gschool_lessons', 'Call Parents' - I will add this one in later as it will be a bit of work to write and tie in events at home.
 	elseif demerit > 20:
-		'You take a seat at her desk and wait for Principal <<$npc_lastname[''A134'']>> to address you. "This is becoming a routine with you; I feel like I am seeing you every day! What has changed, <<$pcs_lastname>>? You used to be such a good girl, perhaps a bit quiet, but now? This is not the way to get attention." She looks over your file some more and shakes her head slightly.'
+		'You take a seat at her desk and wait for Miss Volkov to address you. "This is becoming a routine with you; I feel like I am seeing you every day! What has changed, <<$pcs_lastname>>? You used to be such a good girl, perhaps a bit quiet, but now? This is not the way to get attention." She looks over your file some more and shakes her head slightly.'
 		'"We can''t have you keep getting in trouble like this - I will have to punish you." She looks directly at you for a moment to make sure you understand that when you cause problems, you will be getting punished. "I believe in giving the students a voice in their future, so I will let you decide: Saturday detention, or a spanking, right now - which will it be?"'
 
 		if detention_set = 0: 
@@ -36,7 +36,7 @@ if $ARGS[0] = 'principal':
 			act 'Get spanked': gt 'gschool_office', 'spanked'
 		end
 	else
-		'You take a seat at Principal <<$npc_lastname[''A134'']>>''s desk and wait for her to address you. "Do you know why you are here, <<$pcs_lastname>>?", before you have a chance to reply she continues on. "It was a rhetorical question - we both know why you are here. You are here because you got in trouble." She pauses to look over at the folder in front of her. "Your file shows you have mostly stayed out of trouble until now. I hope this is only a minor lapse in judgment and not a new trend from you. We won''t get into what you did, just understand this is a warning. Straighten yourself out or there will be consequences. Now, return to class."'
+		'You take a seat at Miss Volkov''s desk and wait for her to address you. "Do you know why you are here, <<$pcs_lastname>>?" Before you have a chance to reply, she continues on. "It was a rhetorical question - we both know why you are here. You are here because you got in trouble." She pauses to look over at the folder in front of her. "Your file shows you have mostly stayed out of trouble until now. I hope this is only a minor lapse in judgment and not a new trend from you. We won''t get into what you did, just understand this is a warning. Straighten yourself out or there will be consequences. Now, return to class."'
 		act 'Go to class':gt 'gschool_lessons', 'short_break'
 	end
 end
@@ -48,7 +48,7 @@ if $ARGS[0] = 'spanked':
 	'<center><b><font color="maroon">Principal''s Office</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big134.jpg"></center>'
 	if detention_set ! 2:'No way are you coming back to school on a Saturday. "Uh, I would rather just get it over with, so... Spanking."'
-	'"Very well, come over here." She says as she gets up, pulls a chair out and sits down on it. You get up and walk over to her.'
+	'"Very well, come over here." she says as she gets up, pulls a chair out and sits down on it. You get up and walk over to her.'
 	demerit -= 10
 	if principal_spank <= 5 and detention_set ! 2:
 		principal_spank += 1
@@ -59,15 +59,15 @@ if $ARGS[0] = 'spanked':
 		elseif $pantyworntype = 'none' and analplugin = 1:
 			gt 'gschool_office', 'plugin_nude'
 		else
-			act 'Take Punishment':
+			act 'Take punishment':
 				*clr & cla
 				gs 'pain', 1, 'asscheeks', 'spank'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolspank.jpg"></center>'
-				'Once you walk over to her, Principal <<$npc_lastname[''A134'']>> pulls you down across her knees. With you laying like that, she pulls up your skirt and gives your ass a hard smack with her hand. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson.'
+				'Once you walk over to her, Miss Volkov pulls you down across her knees, pulls up your skirt and gives your ass a hard smack with her hand. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson.'
 				*nl
 				'You silently take your punishment, even if it is not all that bad and a bit of you actually likes it. Regardless, you don''t want her to know this doesn''t bother you all that much, so you play along, withering around and whimpering as she spanks you for a good solid minute.'
-				'Then she lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you head back to class.'
+				'She then lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you head back to class.'
 				
 				!!butt stuff insertion for jul
 				
@@ -83,13 +83,13 @@ if $ARGS[0] = 'spanked':
 				gs 'pain', 2, 'asscheeks', 'spank'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolspank.jpg"></center>'
-				'Once you walk over to her, Principal <<$npc_lastname[''A134'']>> pulls you down across her knees. With you laying like that, she pulls up your skirt and gives your ass a hard smack with her hand. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson.'
+				'Once you walk over to her, Miss Volkov pulls you down across her knees, pulls up your skirt and gives your ass a hard smack with her hand. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson.'
 				*nl
-				'With each hit, you give a moan, soft at first but getting louder each time she strikes. "Stop that!", she says and gives you the hardest smack on your ass yet. You moan even louder and wiggle your butt a bit.'
+				'With each hit, you give a moan, soft at first but getting louder each time she strikes. "Stop that!" she says and gives you the hardest smack on your ass yet. You moan even louder and wiggle your ass a bit.'
 				*nl
-				'"Oh yes, Mrs. <<$npc_lastname[''A134'']>>, yes, please, harder, harder!", you beg as if you were on the verge of an orgasm. "Yes, spank me, spank me harder and I promise to be your special, little, bad girl," you say with a giggle.'
+				'"Oh yes, Miss Volkov, yes please! Harder, harder!" you beg as if you were on the verge of an orgasm. "Yes, spank me! Spank me harder and I promise to be your special, little, bad girl..." you say with a giggle.'
 				*nl
-				'To her credit, she doesn''t relent and even manages to spank you harder. After another a minute or two of this, however, she roughly lifts you off her knees and back on your feet. She points at the door, her voice quivering with anger: "Back to class now, before I give you detention as well." Not wanting detention, you don''t say anymore but, instead, head for the door, putting a bit of extra sway into your hips as you go.'
+				'To her credit, she doesn''t relent and even manages to spank you harder. After another a minute or two of this, however, she roughly lifts you off her knees and back on your feet. She points at the door, her voice quivering with anger: "Back to class now, before I give you detention as well!" Not wanting detention, you don''t say anymore and head for the door, putting a bit of extra sway into your hips as you go.'
 							
 				gs 'arousal', 'foreplay', 5, 'maso', 'rough'
 				gs 'stat'
@@ -107,16 +107,16 @@ if $ARGS[0] = 'spanked':
 		elseif $pantyworntype = 'none' and analplugin = 1:
 			gt 'gschool_office', 'plugin_nude'
 		else
-			act 'Take Punishment':
+			act 'Take punishment':
 				*clr & cla
 				gs 'pain', 2, 'asscheeks', 'spank'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolbarespank.jpg"></center>'
-				'Once you walk over to her, Principal <<$npc_lastname[''A134'']>> pulls you down across her knees. With you laying like that, she pulls up your skirt and your panties down to your knees, exposing your bare ass before she gives it a hard smack with her hand. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson.'
+				'Once you walk over to her, Miss Volkov pulls you down across her knees, pulls up your skirt and your panties down to your knees, exposing your bare ass before she gives it a hard smack with her hand. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson.'
 				*nl
-				'You silently take your punishment, even if it is not all that bad and a bit of you actually likes it. Regardless, you don''t want her to know this doesn''t bother you all that much, so you play along, withering around and whimpering as she spanks you for a good solid minute, giving your butt a nice crimson hue.'
+				'You silently take your punishment, even if it is not all that bad and a bit of you actually likes it. Regardless, you don''t want her to know this doesn''t bother you all that much, so you play along, withering around and whimpering as she spanks you for a good solid minute, giving your ass a nice crimson hue.'
 				*nl
-				'Then she lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your panties up before heading back to class.'
+				'She then lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your panties up before heading back to class.'
 				
 				!!butt stuff insertion for jul
 				
@@ -132,13 +132,13 @@ if $ARGS[0] = 'spanked':
 				gs 'pain', 3, 'asscheeks', 'spank'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolbarespank.jpg"></center>'
-				'Once you walk over to her, Principal <<$npc_lastname[''A134'']>> pulls you down across her knees. With you laying like that, she pulls up your skirt and your panties down to your knees, exposing your bare ass before she gives it a hard smack with her hand. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson.'
+				'Once you walk over to her, Miss Volkov pulls you down across her knees and pulls your skirt up and your panties down to your knees, exposing your bare ass before she gives it a hard smack with her hand. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson.'
 				*nl
-				'With each hit, you give a moan, soft at first but getting louder each time she strikes. "Stop that!", she says and gives you the hardest smack on your ass yet. You moan even louder and wiggle your butt a bit.'
+				'With each hit, you give a moan, soft at first but getting louder each time she strikes. "Stop that!" she says and gives you the hardest smack on your ass yet. You moan even louder and wiggle your ass a little.'
 				*nl
-				'"Oh yes, Mrs. <<$npc_lastname[''A134'']>>, yes, please, harder, harder!", you beg as if you were on the verge of an orgasm. "Yes, spank me, spank me harder and I promise to be your special, little, bad girl," you say with a giggle.'
+				'"Oh yes, Miss Volkov, yes please! Harder, harder!" you beg as if you were on the verge of an orgasm. "Yes, spank me! Spank me harder and I promise to be your special, little, bad girl!" you say with a giggle.'
 				*nl
-				'To her credit, she doesn''t relent and even manages to spank you harder. After another a minute or two of this, about the time your butt has taken on a nice shade of red, she roughly lifts you off her knees and back on your feet. She points at the door, her voice quivering with anger: "Back to class now, before I give you detention as well." Not wanting detention, you slowly pull your panties back up, giving her an extra-long look at your cherry-red butt cheeks before you head for the door, putting a bit of extra sway into your hips as you go.'
+				'To her credit, she doesn''t relent and even manages to spank you harder. After another a minute or two of this, she roughly lifts you off her knees and back on your feet. She points at the door, her voice quivering with anger: "Back to class now, before I give you detention as well!" Not wanting detention, you slowly pull your panties back up, giving her an extra-long look at your cherry-red cheeks before you head for the door, putting a bit of extra sway into your hips as you go.'
 				
 				!!butt stuff insertion for jul
 				
@@ -158,16 +158,16 @@ if $ARGS[0] = 'spanked':
 		elseif $pantyworntype = 'none' and analplugin = 1:
 			gt 'gschool_office', 'plugin_nude'
 		else
-			act 'Take Punishment':
+			act 'Take punishment':
 				*clr & cla
 				gs 'pain', 4, 'asscheeks', 'spank'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolpaddle2.jpg"></center>'
-				'Once you walk over to her, Principal <<$npc_lastname[''A134'']>> pulls you down across her knees. With you laying like that, she pulls up your skirt and your panties down to your knees, exposing your bare ass. This time she pulls out a leather paddle and gives you a hard smack across your bare butt. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson... and it''s kinda working, too.'
+				'Once you walk over to her, Miss Volkov pulls you down across her knees and pulls your skirt up and your panties down to your knees, exposing your bare ass. This time she pulls out a leather paddle and gives your ass a hard smack. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson... and it''s kind of working too.'
 				*nl
-				'You silently take your punishment. It almost brings you to tears but a part of you gets turned on by it as well... a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> stings, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your butt is bright red and feels like it''s radiating heat.'
+				'You silently take your punishment. It almost brings you to tears, but a part of you gets turned on by it as well... a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> stings, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your ass is bright red and feels like it''s radiating heat.'
 				*nl
-				'Then she lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your panties up before heading back to class.'
+				'She then lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your panties up before heading back to class.'
 				
 				!!butt stuff insertion for jul
 				
@@ -183,13 +183,13 @@ if $ARGS[0] = 'spanked':
 				gs 'pain', 5, 'asscheeks', 'spank'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolpaddle2.jpg"></center>'
-				'You walk over to her, swaying your hips. You pull your panties down to your knees and lay across her legs, biting your lower lips and looking back up at her expectantly like you might at a lover. Principal <<$npc_lastname[''A134'']>> tries to ignore your look and picks up a leather paddle with which she then smacks you hard across your bare ass. You jerk a bit in reflex - she is a strong woman and her blows really sting - but a soft moan escapes you while she is obviously trying to spank your butt with enough force to teach you a lesson.'
+				'You walk over to her, swaying your hips. You pull your panties down to your knees and lay across her legs, biting your lower lips and looking back up at her expectantly. Miss Volkov tries to ignore your look and picks up a leather paddle which she smacks hard across your bare ass. You jerk a bit in reflex - she is a strong woman and her blows really sting - but a soft moan escapes you. She is obviously trying to spank you with enough force to teach you a lesson.'
 				*nl
-				'With each hit, you''re getting louder. She smacks your ass even harder, really putting her shoulder into it now, but all it does is cause you to respond with a louder groan and a wiggle of your butt. She looks a little troubled, like she is unsure if this is working at all, but the troubled look only lasts a second and her face hardens into an expression of stern, if not stubborn, resolve.'
+				'With each hit, you''re getting louder. She smacks your ass even harder, really putting her shoulder into it now, but all it does is cause you to respond with a louder groan and a wiggle of your ass. She looks a little troubled, like she is unsure if this is working at all, but the troubled look only lasts a second and her face hardens into an expression of stern, if not stubborn, resolve.'
 				*nl
-				'"Oh yes, Mrs. <<$npc_lastname[''A134'']>>, yes, please, harder, harder!", you beg as if you were on the verge of an orgasm. "Yes, spank me, spank me harder and I promise to be your special, little, bad girl. Oh god, you are making me so wet," you say in a husky tone.'
+				'"Oh yes, Miss Volkov, yes please! Harder, harder!" you beg as if you were on the verge of an orgasm. "Yes, spank me! Spank me harder and I promise to be your special, little, bad girl. Oh god, you are making me so wet!" you say in a husky tone.'
 				*nl
-				'To her credit, she doesn''t relent and even manages to spank you harder. After another a minute or two of this, about the time your butt has taken on a nice shade of red, she roughly lifts you off her knees and back on your feet. She points at the door, her voice quivering with anger... but also uncertainty: "Back to class now, before this gets worse for you." You head for the door, putting a bit of extra sway into your hips and very slowly pulling your panties back up as you go, giving her an extra-long look at your cherry-red butt cheeks.'
+				'To her credit, she doesn''t relent and even manages to spank you harder. After another a minute or two of this, she roughly lifts you off her knees and back on your feet. She points at the door, her voice quivering with anger... but also uncertainty: "Back to class now, before this gets worse for you!" You head for the door, putting a bit of extra sway into your hips and very slowly pulling your panties back up as you go, giving her an extra-long look at your cherry-red cheeks.'
 								
 				gs 'arousal', 'foreplay', 5, 'maso', 'rough'
 				gs 'stat'
@@ -209,16 +209,16 @@ if $ARGS[0] = 'spanked':
 		elseif $pantyworntype = 'none' and analplugin = 1:
 			gt 'gschool_office', 'plugin_nude'
 		else
-			act 'Take Punishment':
+			act 'Take punishment':
 				*clr & cla
 				gs 'pain', 5, 'asscheeks', 'spank'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolpaddle1.jpg"></center>'
-				'Once you walk over to her, Principal <<$npc_lastname[''A134'']>> pulls you down across her knees. With you laying like that, she pulls up your skirt and your panties down to your knees, exposing your bare ass. This time she pulls out a large wooden paddle and gives you a hard smack across your bare butt. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson... and it''s kinda working, too.'
+				'Once you walk over to her, Miss Volkov pulls you down across her knees and pulls your skirt up and your panties down to your knees, exposing your bare ass. This time she pulls out a large wooden paddle and gives you a hard smack. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson... and it''s kind of working too.'
 				*nl
-				'You silently take your punishment. It almost brings you to tears but a part of you gets turned on by it as well... a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> stings, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your butt is bright red and feels like it''s radiating heat.'
+				'You silently take your punishment. It almost brings you to tears, but a part of you gets turned on by it as well... a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> stings, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your ass is bright red and feels like it''s radiating heat.'
 				*nl
-				'Then she lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your panties up before heading back to class.'
+				'She then lifts you back to your feet and rubs your arm. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your panties up before heading back to class.'
 							
 				gs 'arousal', 'foreplay', 5, 'maso', 'rough'
 				gs 'stat'
@@ -232,13 +232,13 @@ if $ARGS[0] = 'spanked':
 				gs 'pain', 6, 'asscheeks', 'spank'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolpaddle1.jpg"></center>'
-				'You walk over to her, swaying your hips. You pull your panties down to your knees and lay across her legs, biting your lower lips and looking back up at her expectantly like you might at a lover. Principal <<$npc_lastname[''A134'']>> tries to ignore your look and picks up a large wooden paddle with which she then smacks you hard across your bare ass. You jerk a bit in reflex - she is a strong woman and her blows really sting - but a soft moan escapes you while she is obviously trying to spank your butt with enough force to teach you a lesson.'
+				'You walk over to her, swaying your hips. You pull your panties down to your knees and lay across her legs, biting your lower lips and looking back up at her expectantly. Miss Volkov tries to ignore your look and picks up a large wooden paddle which she smacks hard across your bare ass. You jerk a bit in reflex - she is a strong woman and her blows really sting - but a soft moan escapes you. She is obviously trying to spank you with enough force to teach you a lesson.'
 				*nl
-				'With each hit, you''re getting louder. She smacks your ass even harder, really putting her shoulder into it now, but all it does is cause you to respond with a louder groan and a wiggle of your butt. She looks a little troubled, like she is unsure if this is working at all, but the troubled look only lasts a second and her face hardens into an expression of stern, if not stubborn, resolve.'
+				'With each hit, you''re getting louder. She smacks your ass even harder, really putting her shoulder into it now, but all it does is cause you to respond with a louder groan and a wiggle of your ass. She looks a little troubled, like she is unsure if this is working at all, but the troubled look only lasts a second and her face hardens into an expression of stern, if not stubborn, resolve.'
 				*nl
-				'"Oh yes, Mrs. <<$npc_lastname[''A134'']>>, yes, please, harder, harder!", you beg as if you were on the verge of an orgasm. "Yes, spank me, spank me harder and I promise to be your special, little, bad girl. Oh god, you are making me so wet," you say in a husky tone.'
+				'"Oh yes, Miss Volkov>, yes please! Harder, harder!" you beg as if you were on the verge of an orgasm. "Yes, spank me! Spank me harder and I promise to be your special, little, bad girl. Oh god, you are making me so wet!" you say in a husky tone.'
 				*nl
-				'To her credit, she doesn''t relent and even manages to spank you harder. After another a minute or two of this, about the time your butt has taken on a nice shade of red, she roughly lifts you off her knees and back on your feet. Her hands rest on your hips and as she stands up to face you, one hand slips down to your bare ass and stays there for just a moment... Then she removes her hands and points at the door, her expression unreadable. "You are playing a very dangerous game, young lady. Get back to class." You head for the door, putting a bit of extra sway into your hips and very slowly pulling your panties back up as you go, giving her an extra-long look at your cherry-red butt cheeks. You don''t dare to look back but you are almost certain that Principal <<$npc_lastname[''A134'']>> had her eyes on your ass right until the door closed behind you.'
+				'To her credit, she doesn''t relent and even manages to spank you harder. After another a minute or two of this, she roughly lifts you off her knees and back on your feet. Her hands rest on your hips and as she stands up to face you, one hand slips down to your bare ass and stays there for just a moment... She then removes her hand and points at the door, her expression unreadable. "You are playing a very dangerous game, young lady. Get back to class." You head for the door, putting a bit of extra sway into your hips and very slowly pulling your panties back up as you go, giving her an extra-long look at your cherry-red cheeks. You don''t dare to look back, but you are almost certain that Miss Volkov had her eyes on your ass right until the door closed behind you.'
 				
 				act 'Go to class':gt 'gschool_lessons', 'short_break'
 			end
@@ -246,7 +246,7 @@ if $ARGS[0] = 'spanked':
 	else
 		*nl
 		principal_spank += 1
-		'"It is obvious spanking is not an option any longer. In fact, I doubt it was an adequate punishment for you to begin with: You just moan and act like a whore when I try and punish you." She looks at you for a long moment to see if you will dispute it, but, really, what can you say? She''s right - you do - and it is just as funny now as it was the first time you did it, despite her best efforts.' 
+		'"It is obvious that spanking is not an option any longer. In fact, I doubt it was an adequate punishment for you to begin with: You just moan and act like a whore when I try and punish you." She looks at you for a long minute to see if you will dispute it. She''s right - you do - and it is just as funny now as it was the first time you did it, despite her best efforts.' 
 		'"You leave me no choice. If you are going to act like a whore, I will treat you like a whore. Come over here."'
 		if $pantyworntype = 'none' and analplugin = 0:
 			gt 'gschool_office', 'no_plugin_nude'
@@ -262,21 +262,21 @@ end
 
 if $ARGS[0] = 'no_plugin_nude':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/bare.jpg"></center>'
-	'Once you walk over to her, Principal <<$npc_lastname[''A134'']>> bends you over. With you standing like that, she pulls up your skirt and when she see''s your bare ass she pauses. "Where are your panties?"'
+	'Once you walk over to her, Miss Volkov bends you over. She pulls up your skirt, but pauses. "Where are your panties?"'
 	act 'Feign innocence':
 		*clr & cla
 		gs 'pain', 7, 'asscheeks', 'spank'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolpaddle1.jpg"></center>'
-		'"What? Oh, I must have forgotten them," you tell her in mock-surprise.'
-		'She sighs. "You seriously expect me to believe you forgot to put on your underwear?" She pauses for the briefest of moments and, before you can reply, she adds. "I don''t care what reasons you have - it is simply unacceptable not to wear underwear to school. I will note this down as additional demerits; don''t let me catch you not wearing them again, <<$pcs_lastname>>. Do you understand me?" Without waiting for a response, she pulls out a large wooden paddle and gives you a hard smack across your bare butt. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson... and it''s kinda working, too.'
+		'"What? Oh, I must have forgotten them." you tell her in mock-surprise.'
+		'She sighs. "You seriously expect me to believe you forgot to put on your underwear?" She pauses very briefly but before you can reply, she adds. "I don''t care what reasons you have - it is simply unacceptable not to wear underwear to school. I will note this down as an additional demerit; don''t let me catch you not wearing them again, <<$pcs_lastname>>. Do you understand me?" Without waiting for a response, she pulls out a large wooden paddle and gives you a hard smack across your bare ass. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson... and it''s kind of working too.'
 		*nl
-		'You silently take your punishment. It almost brings you to tears... but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your butt is bright red and feels like it''s radiating heat.'
+		'You silently take your punishment. It almost brings you to tears, but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your ass is bright red and feels like it''s radiating heat.'
 		*nl
-		'Then she lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your skirt down, making sure your naked privates are properly covered, before heading back to class.'
+		'She then lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your skirt down before heading back to class.'
 		if detention = 0:
 			detention_set = 1
-			'Just before you walk out the door she adds. "I am also giving you detention this Saturday, do not miss it."'
+			'Just before you walk out the door, she adds. "I am also giving you detention this Saturday. Do <i>not</i> miss it."'
 		end
 		gs 'arousal', 'foreplay', 5, 'maso', 'rough'
 		gs 'arousal', 'end'
@@ -289,7 +289,7 @@ if $ARGS[0] = 'no_plugin_nude':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/angry.jpg"></center>'
 		'"I don''t like wearing them; the freedom I feel when I don''t have them on is just so..."'
 		*nl
-		'You stop when you realize how quickly your headmaster''s face darkens. A blind man could tell she is angry with you, even without the shrill tone of her voice: "I don''t care if you don''t like wearing them, you will not walk around my school like some whore. Do you understand me?"'
+		'You stop when you realize how quickly her face darkens. A blind man could tell she is angry with you, even without the shrill tone of her voice: "I don''t care if you don''t like wearing them, you will not walk around my school like some whore. Do you understand me?"'
 		
 		gs 'willpower', 'misc', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -298,9 +298,9 @@ if $ARGS[0] = 'no_plugin_nude':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/angry.jpg"></center>'
-				'"No, I don''t have to wear them if I don''t want to," you say in a haughty voice; it''s not like she can force you, right?'
+				'"No, I don''t have to wear them if I don''t want to!" you say in a haughty voice.'
 				*nl
-				'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you wanna be... but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
+				'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you want to be, but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
 
 				act 'See how she treats a whore': gt 'gschool_office', 'whore'
 			end
@@ -313,11 +313,11 @@ if $ARGS[0] = 'no_plugin_nude':
 			gs 'pain', 7, 'asscheeks', 'spank'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolpaddle1.jpg"></center>'
-			'"Yes, I understand, I won''t let it happen again," you respond meekly. She nods, pulls out a large wooden paddle and gives you a hard smack across your bare butt. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson... and it''s kinda working, too.'
+			'"Yes, I understand, I won''t let it happen again..." you respond meekly. She nods, pulls out a large wooden paddle and gives you a hard smack across your bare ass. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson... and it''s kind of working too.'
 			*nl
-			'You silently take your punishment. It almost brings you to tears... but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your butt is bright red and feels like it''s radiating heat.'
+			'You silently take your punishment. It almost brings you to tears, but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your ass is bright red and feels like it''s radiating heat.'
 			*nl
-			'Then she lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your skirt down, making sure your naked privates are properly covered, before heading back to class.'
+			'She then lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your skirt down before heading back to class.'
 			gs 'arousal', 'foreplay', 5, 'maso', 'rough'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -328,13 +328,13 @@ if $ARGS[0] = 'no_plugin_nude':
 	act 'Flirt':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/flirt.jpg"></center>'
-		'You wiggle your butt around a bit. "I didn''t wear any for you. Like what you see?"'
+		'You wiggle your ass around a little. "I didn''t wear any, just for you. Like what you see?"'
 		*nl
-		'"Stop acting like some little whore right this moment!", she says in a stern voice, obviously not pleased by you or your antics.'
+		'"Stop acting like some little whore!" she says in a stern voice, obviously not pleased by you or your antics.'
 		*nl
-		'You smile at her. "Come on and give my ass a slap, you know you want to."'
+		'You smile at her. "Come on and give my ass a slap, you know you want to..."'
 		*nl
-		'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you wanna be... but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
+		'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you want to be, but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
 
 		act 'See how she treats a whore': gt 'gschool_office', 'whore'
 	end
@@ -342,21 +342,21 @@ end
 
 if $ARGS[0] = 'plugin_panties':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/plug.jpg"></center>'
-	'Once you walk over to her, Principal <<$npc_lastname[''A134'']>> bends you over. With you standing like that, she pulls up your skirt, pulls down your panties and stops when she see''s the buttplug. "Why do you have that stuck in your butt?"'
+	'Once you walk over to her, Miss Volkov bends you over. She pulls up your skirt and pulls down your panties, but stops when she sees the buttplug. "Why do you have <i>this</i>, young lady?"'
 	act 'Say you''re sorry':
 		*clr & cla
 		gs 'pain', 7, 'asscheeks', 'spank'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolpaddle1.jpg"></center>'
-		'"What? Oh, sorry. I like the way it feels and I forgot I was wearing it. I meant to take it out before I came to school this morning," you tell her.'
-		'She sighs. "You seriously expect me to believe you forgot you had a plug stuck in your butt?" She pauses for the briefest of moments and, before you can reply, she adds. "I don''t care what reasons you have - it is simply unacceptable to wear a buttplug to school. I will note this down as additional demerits; don''t let me catch you wearing this again, <<$pcs_lastname>>. Do you understand me?" Without waiting for a response, she pulls out a large wooden paddle and gives you a hard smack across your bare butt. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson... and it''s kinda working, too.'
+		'"What? Oh, sorry. I like the way it feels and I forgot I was wearing it. I meant to take it out before I came to school this morning." you tell her.'
+		'She sighs. "You seriously expect me to believe you forgot you had a plug jammed in your ass?" She pauses very briefly, but before you can reply, she adds. "I don''t care what reasons you have - it is simply unacceptable to wear a buttplug to school. I will note this down as an additional demerit; don''t let me catch you wearing this again, <<$pcs_lastname>>. Do you understand me?" Without waiting for a response, she pulls out a large wooden paddle and gives you a hard smack across your bare ass. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson... and it''s kind of working too.'
 		*nl
-		'You silently take your punishment. It almost brings you to tears... but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your butt is bright red and feels like it''s radiating heat.'
+		'You silently take your punishment. It almost brings you to tears, but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your ass is bright red and feels like it''s radiating heat.'
 		*nl
-		'Then she lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk; you pull your panties back up before heading back to class.'
+		'She then lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk; you pull your panties back up before heading back to class.'
 		if detention = 0:
 			detention_set = 1
-			'Just before you walk out the door she adds. "I am also giving you detention this Saturday, do not miss it."'
+			'Just before you walk out the door, she adds. "I am also giving you detention this Saturday. Do <i>not</i> miss it."'
 		end
 		gs 'arousal', 'foreplay', 5, 'maso', 'rough'
 		gs 'arousal', 'end'
@@ -377,8 +377,8 @@ if $ARGS[0] = 'plugin_panties':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/angry.jpg"></center>'
-				'"No, I like wearing it and I''m not gonna let you tell me what I can or can''t do," you say in a haughty voice; it''s not like she can force you, right?'
-				'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you wanna be... but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
+				'"No, I like wearing it and I''m not going to let you tell me what I can or can''t do!" you say in a haughty voice.'
+				'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you want to be, but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
 
 				act 'See how she treats a whore': gt 'gschool_office', 'whore'
 			end
@@ -391,14 +391,14 @@ if $ARGS[0] = 'plugin_panties':
 			gs 'pain', 7, 'asscheeks', 'spank'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolpaddle1.jpg"></center>'
-			'"Yes, I understand, I won''t let it happen again," you respond meekly. She nods, pulls out a large wooden paddle and gives you a hard smack across your bare butt. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson... and it''s kinda working, too.'
+			'"Yes, I understand, I won''t let it happen again..." you respond meekly. She nods, pulls out a large wooden paddle and gives you a hard smack across your bare ass. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson... and it''s kind of working too.'
 			*nl
-			'You silently take your punishment. It almost brings you to tears... but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your butt is bright red and feels like it''s radiating heat.'
+			'You silently take your punishment. It almost brings you to tears, but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your ass is bright red and feels like it''s radiating heat.'
 			*nl
-			'Then she lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk; you pull your panties back up before heading back to class.'
+			'She then lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk; you pull your panties back up before heading back to class.'
 			if detention = 0:
 				detention_set = 1
-				'Just before you walk out the door she adds. "I am also giving you detention this Saturday, do not miss it."'
+				'Just before you walk out the door, she adds. "I am also giving you detention this Saturday. Do <i>not</i> miss it."'
 			end
 			gs 'arousal', 'foreplay', 5, 'maso', 'rough'
 			gs 'arousal', 'end'
@@ -410,13 +410,13 @@ if $ARGS[0] = 'plugin_panties':
 	act 'Flirt':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/flirt.jpg"></center>'
-		'You wiggle your butt around a bit. "I wore it for you. Like what you see?"'
+		'You wiggle your ass around a little. "I wore it for you. Like what you see?"'
 		*nl
-		'"Stop acting like some little whore right this moment!", she says in a stern voice, obviously not pleased by you or your antics.'
+		'"Stop acting like some little whore!" she says in a stern voice, obviously not pleased by you or your antics.'
 		*nl
-		'You smile at her. "Come on and give my ass a slap, you know you want to."'
+		'You smile at her. "Come on and give my ass a slap, you know you want to..."'
 		*nl
-		'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you wanna be... but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
+		'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you want to be, but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
 
 		act 'See how she treats a whore': gt 'gschool_office', 'whore'
 	end
@@ -424,21 +424,21 @@ end
 
 if $ARGS[0] = 'plugin_nude':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/plug.jpg"></center>'
-	'Once you walk over to her, Principal <<$npc_lastname[''A134'']>> bends you over. With you standing like that, she pulls up your skirt and when she see''s your bare ass she pauses. "Where are your panties? And why do you have that stuck in your butt?"'
+	'Once you walk over to her, Miss Volkov bends you over. With you standing like that, she pulls up your skirt and when she see''s your bare ass she pauses. "Where are your panties? And why do you have <i>that</i> inside you?"'
 	act 'Say you''re sorry':
 		*clr & cla
 		gs 'pain', 7, 'asscheeks', 'spank'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolpaddle1.jpg"></center>'
-		'"What? Oh, sorry. I like the way it feels and I forgot I was wearing it. I meant to take it out before I came to school this morning, but I forgot... and I guess I also forgot my panties," you tell her.'
-		'She sighs. "You seriously expect me to believe you forgot to put on your underwear <b>and</b> forgot that you had a plug stuck in your butt?" She pauses for the briefest of moments and, before you can reply, she adds. "I don''t care what reasons you have - it is simply unacceptable to wear a buttplug to school... or <i>not to</i> wear underwear. I will note this down as additional demerits; don''t let me catch you doing this again, <<$pcs_lastname>>. Do you understand me?" Without waiting for a response, she pulls out a large wooden paddle and gives you a hard smack across your bare butt. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson... and it''s kinda working, too.'
+		'"What? Oh, sorry. I like the way it feels and I forgot I was wearing it. I meant to take it out before I came to school this morning, but I forgot. I guess I also forgot my panties too..." you tell her.'
+		'She sighs. "You seriously expect me to believe you forgot to put on your underwear <b>and</b> forgot that you had a plug jammed in your ass?" She pauses very briefly but before you can reply, she adds. "I don''t care what reasons you have - it is simply unacceptable to wear a buttplug to school... or <i>not to</i> wear underwear. I will note these down as additional demerits; don''t let me catch you doing this again, <<$pcs_lastname>>. Do you understand me?" Without waiting for a response, she pulls out a large wooden paddle and gives you a hard smack across your bare ass. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson... and it''s kind of working too.'
 		*nl
-		'You silently take your punishment. It almost brings you to tears... but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your butt is bright red and feels like it''s radiating heat.'
+		'You silently take your punishment. It almost brings you to tears, but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your ass is bright red and feels like it''s radiating heat.'
 		*nl
-		'Then she lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your skirt down, making sure your naked privates and plug are properly covered, before heading back to class.'
+		'She then lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your skirt down before heading back to class.'
 		if detention_set = 0:
 			detention_set = 1
-			'Just before you walk out the door she adds. "I am also giving you detention this Saturday, do not miss it."'
+			'Just before you walk out the door, she adds. "I am also giving you detention this Saturday. Do <i>not</i> miss it."'
 		end
 		gs 'arousal', 'foreplay', 5, 'maso', 'rough'
 		gs 'arousal', 'end'
@@ -450,7 +450,7 @@ if $ARGS[0] = 'plugin_nude':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/angry.jpg"></center>'
 		'"I don''t like wearing them; the freedom I feel when I don''t have them on is incredible, and the sensations of having a plug in my ass are..."'
 		*nl
-		'You stop when you realize how quickly your headmaster''s face darkens. A blind man could tell she is angry with you, even without the shrill tone of her voice: "I don''t care if you don''t like wearing them, you will not walk around my school like some whore. Do you understand me?"'
+		'You stop when you realize how quickly her face darkens. A blind man could tell she is angry with you, even without the shrill tone of her voice: "I don''t care if you don''t like wearing them, you will not walk around my school like some whore. Do you understand me?"'
 		
 		gs 'willpower', 'misc', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -459,9 +459,9 @@ if $ARGS[0] = 'plugin_nude':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/angry.jpg"></center>'
-				'"No, I''m not gonna let you tell me what I can or can''t wear," you say in a haughty voice; it''s not like she can force you, right?'
+				'"No, I''m not going to let you tell me what I can or can''t wear!" you say in a haughty voice.'
 				*nl
-				'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you wanna be... but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
+				'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you want to be, but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
 
 				act 'See how she treats a whore': gt 'gschool_office', 'whore'
 			end
@@ -474,14 +474,14 @@ if $ARGS[0] = 'plugin_nude':
 			gs 'pain', 7, 'asscheeks', 'spank'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/schoolpaddle1.jpg"></center>'
-			'"Yes, I understand, I won''t let it happen again," you respond meekly. She nods, pulls out a large wooden paddle and gives you a hard smack across your bare butt. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank your butt with enough force to teach you a lesson... and it''s kinda working, too.'
+			'"Yes, I understand, I won''t let it happen again," you respond meekly. She nods, pulls out a large wooden paddle and gives you a hard smack across your bare ass. You jerk a bit in reflex - she is a strong woman and her blows sting quite a bit. She is obviously trying to spank you with enough force to teach you a lesson... and it''s kind of working too.'
 			*nl
-			'You silently take your punishment. It almost brings you to tears... but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your butt is bright red and feels like it''s radiating heat.'
+			'You silently take your punishment. It almost brings you to tears, but a part of you gets turned on by it as well - a circumstance you don''t want her to know about. You don''t have to play along much to hide it either: It <b>really</b> hurts, even if you are enjoying it too, so you wither around and whimper as she spanks you for a good solid minute or three, until your ass is bright red and feels like it''s radiating heat.'
 			*nl
-			'Then she lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your skirt down, making sure your naked privates and plug are properly covered, before heading back to class.'
+			'She then lifts you back to your feet. "I hope this has taught you a lesson; I don''t want to see you in my office anymore, <<$pcs_lastname>>. You can return to your classes now." With that, she goes back to her desk and you pull your skirt down before heading back to class.'
 			if detention_set = 0:
 				detention_set = 1
-				'Just before you walk out the door she adds. "I am also giving you detention this Saturday, do not miss it."'
+				'Just before you walk out the door, she adds. "I am also giving you detention this Saturday. Do <i>not</i> miss it."'
 			end
 			gs 'arousal', 'foreplay', 5, 'maso', 'rough'
 			gs 'arousal', 'end'
@@ -493,11 +493,11 @@ if $ARGS[0] = 'plugin_nude':
 	act 'Flirt':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/principal/flirt.jpg"></center>'
-		'You wiggle your butt around a bit. "I wore it for you. Like what you see?"'
-		'"Stop acting like some little whore right this moment!", she says in a stern voice, obviously not pleased by you or your antics.'
-		'You smile at her. "Come on and give my ass a slap, you know you want to."'
+		'You wiggle your ass around a little. "I wore it for you. Like what you see?"'
+		'"Stop acting like some little whore!" she says in a stern voice, obviously not pleased by you or your antics.'
+		'You smile at her. "Come on and give my ass a slap, you know you want to..."'
 		*nl
-		'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you wanna be... but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
+		'She gives you a long, hard look and her eyes narrow dangerously. "Fine, if that is what you want to be, but this is a school, <b>your</b> school, and as your teacher, I will show you how to be a proper whore."'
 
 		act 'See how she treats a whore': gt 'gschool_office', 'whore'
 	end
@@ -513,18 +513,18 @@ if $ARGS[0] = 'detPunishment1':
 	gs 'pain', 7, 'asscheeks', 'spank'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/ffspank1.jpg"></center>'
-	'"Very well, since you both wanted to be naked so badly, take off your clothes. All of them." She says as she pulls a chair over near her leather couch, taking a seat. Hesitantly you both slowly remove all your clothes. Once you are both naked, Miss Volkov motions you over. As soon as you are within an arms reach she grabs you and pulls you across her lap. She then proceeds to spank your bare ass until your buttcheeks are cherry red and stinging like crazy, while <<$rand_girl>> takes a seat on the couch and just watches you get spanked.'
+	'"Very well, since you both wanted to be naked so badly, take off your clothes. All of them." she says as she pulls a chair over near her leather couch, taking a seat. Hesitantly, you both slowly remove all your clothes. Once you are both naked, Miss Volkov motions you over. As soon as you are within arms reach, she grabs you and pulls you across her lap. She then proceeds to spank your bare ass until your cheeks are cherry red and stinging, while <<$rand_girl>> takes a seat on the couch and just watches you get spanked.'
 	act 'Continue':
 		*clr & cla
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/ffspank2.jpg"></center>'
-		'Once she is satisfied, she pulls you up and points to the corner of her office. "Go stand over there. Leave your clothes where they are, face the corner." You do as you are told, gingerly rubbing your butt as you go. You glance back when you hear the slap of flesh on flesh, it seems to be <<$rand_girl>>''s turn. She is laid out across Miss Volkov''s lap, getting her ass spanked as well. As time passes, you can hear <<$rand_girl>> moaning, either pretending to like it or really enjoying it. Miss Volkov seems annoyed at this and spends considerably more time spanking <<$rand_girl>>''s already glowing ass than she did with you. Finally she seems to grow tired of it, lifting <<$rand_girl>> off her lap and pointing to your corner. "Go join your friend."'
+		'Once she is satisfied, she pulls you up and points to the corner of her office. "Go and stand over there. Leave your clothes where they are and face the corner." You do as you are told, gingerly rubbing your ass as you go. You glance back when you hear the slap of flesh on flesh, it seems to be <<$rand_girl>>''s turn. She is laid out across Miss Volkov''s lap, getting her ass spanked as well. As time passes, you can hear <<$rand_girl>> moaning, either pretending to like it or really enjoying it. Miss Volkov seems annoyed at this and spends considerably more time spanking <<$rand_girl>>''s already glowing ass than she did with you. Finally she seems to grow tired of it, lifting <<$rand_girl>> off her lap and pointing to your corner. "Go join your friend."'
 		act 'Continue':
 			*clr
 			cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/ffspank3.jpg"></center>'
-			'You and <<$rand_girl>> stand facing the corner together, your ass is seriously stinging and if anything <<$rand_girl>>''s butt is must be much redder than yours. Apparently expecting one of you to disobey her, Miss Volkov keeps an eye on you for a while, but neither of you do. The two of you stay standing facing the corner, naked with your butts on fire.'
+			'You and <<$rand_girl>> stand facing the corner together, your ass is seriously stinging and if anything <<$rand_girl>>''s must be much redder than yours. Apparently expecting one of you to disobey her, Miss Volkov keeps an eye on you for a while, but neither of you do. The two of you stay standing facing the corner, naked with your backsides on fire.'
 			act 'Continue':
 				*clr & cla
 				minut += 120
@@ -532,11 +532,11 @@ if $ARGS[0] = 'detPunishment1':
 				gs 'clothing', 'wear_last_worn'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/ffspank4.jpg"></center>'
-				'A couple of hours later, Miss Volkov finally speaks to you again. "Alright you two, get dressed and go home. I don''t want to see you in here again."'
+				'A few hours later, Miss Volkov finally speaks to you again. "Alright you two, get dressed and go home. I don''t want to see you in here again."'
 				*nl
-				'With that you quickly gather up your clothes and get dressed again.'
+				'You quickly gather up your clothes and get dressed again.'
 
-				act 'Leave the school building as fast as you can': gt 'gschool_grounds', 'main'
+				act 'Leave the school building': gt 'gschool_grounds', 'main'
 			end
 		end
 	end
@@ -546,30 +546,30 @@ if $ARGS[0] = 'whore':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore.jpg"></center>'
-	'"Strip off your clothes." When you hesitate, she adds: "Either that or I call your parents right now and tell them why you are being expelled from school." A cold chill runs down your spine at the thought - could she really expel you for this? Unwilling to test her and with little choice in the matter, you strip off your clothes. Once you are down to just your shoes and socks, she pulls you across her lap and starts giving your bare ass a hard spanking with her hand. She hits you with full force every single time and keeps it up until her own hand starts to sting and she stops. You''re starting to think you''re done then she grips you by the hair and bends you over her desk instead.'
+	'"Strip off your clothes." When you hesitate, she adds: "Either that or I call your parents right now and tell them why you are being expelled from school." A cold chill runs down your spine at the thought. Unwilling to test her and with little choice in the matter, you strip off your clothes. Once you are down to just your shoes and socks, she pulls you across her lap and starts giving your bare ass a hard spanking with her hand. She hits you with full force every single time and keeps it up until her own hand starts to sting and she stops. You''re starting to think you''re done then she grips you by the hair and bends you over her desk instead.'
 	act 'She takes out the paddle':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore1.jpg"></center>'
-		'Once bent over her desk, she takes out a large paddle and spanks you hard with it, leaving your ass red and throbbing. After a while, the pain is really starting to get to you, and she doesn''t seem to have any intention of stopping. Finally, after many minutes, she seems to be getting tired, her hits lack the zip the early ones had. She pulls you away from the desk and turns you to face the other way, then forces you down to your knees. "Stay like this", she commands, and walks behind you, back to her desk.'
+		'Once bent over her desk, she takes out a large paddle and spanks you hard with it, leaving your ass red and throbbing. After a while, the pain is really starting to get to you, and she doesn''t seem to have any intention of stopping. Finally, after many minutes, she seems to be getting tired, her hits lacking the sting the early ones had. She pulls you away from the desk and turns you to face the other way, then forces you down to your knees. "Stay like this." she commands, and walks behind you, back to her desk.'
 		act 'When she comes back...':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore4.jpg"></center>'
-			'You hear her rummaging around in her desk for a moment and then... well, you can''t really sort the sounds and you don''t dare looking at her. But sure enough, she comes back into view a couple of minutes later, wearing a rather large strap-on. Your eyes widen a bit in shock at the sight of it, and while you''re still preoccupied with working through your surprise, she closes the gap between you and starts rubbing the tip of the dildo against your lips, as if trying to force it into your mouth. "Open your mouth like the good little whore you so desperately want to be."'
+			'You hear her rummaging around in her desk before she comes back into view a few minutes later, wearing a rather large strap-on. Your eyes widen a bit in shock at the sight of it, and while you''re still preoccupied with working through your surprise, she closes the gap between you and starts rubbing the tip of the dildo against your lips, as if trying to force it into your mouth. "Open your mouth like the good little whore you so desperately want to be."'
 			act 'Suck it':
 				*clr & cla
 				gs 'boyStat', 'A64'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore5.jpg"></center>'
-				'You barely even have time to open your mouth at all before she shoves the <<dick>>cm <<$dick_girth>> strap-on inside and down your throat, causing you to start gagging at once. Unconcerned by this, she shoves the dildo as far down your throat as it will physically go and then she starts roughly fucking your throat with it, barely giving you any time to catch your breath. After several minutes, your throat feels like it is on fire and she finally stops, finally giving you time to gulp down the air you so desperately needed. As you do, she lifts you up and bends you over her desk once more. She briefly slips one finger into your pussy, likely checking if you are a virgin.'
+				'You barely even have time to open your mouth at all before she shoves the <<dick>>cm <<$dick_girth>> strap-on inside and down your throat, causing you to start gagging at once. Unconcerned by this, she shoves the dildo as far down your throat as it will physically go and then she starts roughly fucking your throat with it, barely giving you any time to catch your breath. After several minutes, your throat feels like it is on fire and she finally stops, finally giving you time to gulp down the air you so desperately need. As you do, she lifts you up and bends you over her desk once more. She briefly slips one finger into your pussy, likely checking if you are a virgin.'
 				gs 'arousal', 'bj', 5, 'lesbian', 'humiliation', 'sub', 'deepthroat'
 				gs 'stat'
 				if pcs_vag = 0:
-					'"I must admit, I am very surprised anyone acting like such a whore like yourself would still be a virgin. I suppose that means you are one of those girls that just let the boys use their other holes instead."'
+					'"I must admit, I am very surprised that anyone acting like such a whore would still be a virgin. I suppose that means you are one of those girls that just let the boys use their other holes instead..."'
 					act 'Get your ass fucked': gt 'gschool_office', 'whore2'
 				else
 					act 'Get fucked':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore6.jpg"></center>'
-						'Lifting one of your legs up to place your knee on the desk, you know what is about to come next, and though knowing itself only helps so much, the natural wetness of your pussy and your slobber on the dildo absolutely do. It hurts a little when she shoves the <<dick>>cm <<$dick_girth>> strap-on basically all the way into your twat, and the moan you give is one of both pain and pleasure. "You even moan like a little whore," the Principal says as she hammers the dildo''s full length into you repeatedly.'
+						'Lifting one of your legs up to place your knee on the desk, you know what is about to come next, and though knowing itself only helps so much, the natural wetness of your pussy and your slobber on the dildo absolutely do. It hurts a little when she shoves the <<dick>>cm <<$dick_girth>> strap-on all the way inside you, and the moan you give is one of both pain and pleasure. "You even moan like a little whore." she says as she hammers the dildo''s full length into you repeatedly.'
 						gs 'arousal', 'vaginal_strap', 5, 'lesbian', 'humiliation', 'sub'
 						gs 'stat'
 
@@ -585,37 +585,37 @@ if $ARGS[0] = 'whore2':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore7.jpg"></center>'
-	'She half-lifts, half-pushes you onto her desk where she has you kneel down and sit back until you''re touching your heels. With your feet dangling off the edge of the desk, your backdoor is easily accessible, which seems to be the idea - you feel the pressure of the <<dick>>cm <<$dick_girth>> strap-on against your anus. It only lasts for a moment, though: As soon as she is sure she has it lined up, she shoves the dildo up your ass. Given how unprepared you were and that the only lubrication was whatever wetness clung to the dildo, your cry of pain was surprisingly soft, but your first reflex still is to move forward.'
+	'She half-lifts, half-pushes you onto her desk where she has you kneel down and sit back until you''re touching your heels. With your feet dangling off the edge of the desk, your backdoor is easily accessible, which seems to be the idea - you feel the pressure of the <<dick>>cm <<$dick_girth>> strap-on against your anus. It only lasts for a moment, though: As soon as she is sure she has it lined up, she shoves the dildo up your ass. Given how unprepared you were and that the only lubrication was whatever wetness clung to the dildo, your cry of pain is surprisingly soft, but your first reflex is to move forward.'
 	*nl
-	'Realizing that, she grabs hold of your hips to keep you from pulling away. "I''m not done with you yet, <<$pcs_lastname>>. This is what whores do every day, and they have to like it," she says as she pounds the dildo into your ass. The first few thrusts are the worst, even worse than the initial penetration... but after a while - and maybe also due to the Principal spitting on your puckered hole several times - the pain subsides to tolerable levels and it starts feeling good, <i>really</i> good. Soft moans escape your lips as she pounds your little ass. No longer trying to pull away, you are pushing back against her.' 
-	'"Now you''re acting like a good little whore," she comments, and with your only response being another moan and thrust against her, she is not wrong.'
+	'Realizing this, she grabs hold of your hips to keep you from pulling away. "I''m not done with you yet, <<$pcs_lastname>>. This is what whores do every day, and they have to like it!" she says as she pounds the dildo into your ass. The first few thrusts are the worst, even worse than the initial penetration, but after a while - and maybe also due to her spitting on your puckered hole several times - the pain subsides to tolerable levels and it starts feeling good, <i>really</i> good. Soft moans escape your lips as she pounds your little ass. No longer trying to pull away, you are pushing back against her.' 
+	'"Now you''re acting like a good little whore." she comments, with your only response being another moan and thrust against her.'
 	anal_slip += 4
 	gs 'arousal', 'anal_strap', 5, 'lesbian', 'humiliation', 'sub'
 	gs 'stat'
 	act 'Take it deep':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore8.jpg"></center>'
-		'She pulls out of you and part of you is relieved... but another part of you wants her to keep going. She pushes you forward until your elbows touch the top of her desk, and once you are on your hands and knees, she climbs onto the desk behind you. It seems she isn''t actually done after all, slipping the <<dick>>cm <<$dick_girth>> dildo back into your gaping ass and sliding inside with ease.'
+		'She pulls out of you and part of you is relieved, but another part wants her to keep going. She pushes you forward until your elbows touch the top of her desk, and once you are on your hands and knees, she climbs onto the desk behind you. It seems she isn''t actually done after all, slipping the <<dick>>cm <<$dick_girth>> dildo back into your gaping ass, sliding inside with ease.'
 		*nl
-		'Her one hand holds onto your hips for leverage, but with the other she grabs a handful of your hair and painfully pulls and twists it as she starts jackhammering your ass again.'
+		'Her free hand holds onto your hips for leverage while the other grabs a handful of your hair and painfully pulls and twists it as she starts jackhammering your ass again.'
 		*nl
-		'Many more minutes pass, and while it did feel extraordinarily good for a while, your butt is now starting to get really sore and hurt; all the lubrication seems to have come off the dildo and the friction is turning every thrust into a bigger (literal) pain in the ass than the last. You grit your teeth and bear it as best you can, but eventually it starts hurting so much that your ass feels like it is on fire and you beg: "Please, Miss Volkov, please stop, it is really starting to hurt!"'
-		$orgasm_txt = 'As she gives your ass a merciless pounding, you can feel that familiar tingling building up inside of your body, and soon an orgasm crashes over you. You start humping back against her as she fucks your ass while the orgasm courses through your body. Barely coherent, you hear her say something along the lines of "that''s right, my little whore, moan and orgasm like the dirty little anal slut you are", and eventually the sensation passes... but she doesn''t stop fucking you.'
+		'Many more minutes pass, and while it did feel extraordinarily good for a while, your ass is now starting to get really sore; all the lubrication seems to have come off the dildo and the friction is making every thrust more painful than the last. You grit your teeth and bear it as best you can, but eventually it starts hurting so much that your ass feels like it is on fire and you beg: "Please, Miss Volkov, please stop, it is really starting to hurt!"'
+		$orgasm_txt = 'As she gives your ass a merciless pounding, you can feel that familiar tingling building up inside of your body, and soon an orgasm crashes over you. You start humping back against her as she fucks your ass while the orgasm courses through your body. Barely coherent, you hear her say something along the lines of "That''s right my little whore, moan and orgasm like the dirty little anal slut you are!" and eventually the sensation passes, but she doesn''t stop fucking you.'
 		gs 'arousal', 'anal_strap', 10, 'lesbian', 'humiliation', 'sub'
 		gs 'stat'
 		$orgasm_txt = ''
 		*nl
-		'"I thought you wanted to act like a little whore in my school. Are you saying you changed your mind?", she asks as she pulls nearly completely out and then slams the entire shaft back in again.'
+		'"I thought you wanted to act like a little whore in my school? Are you saying you''ve changed your mind?" she asks as she pulls almost completely out and then slams the entire shaft back in again.'
 		*nl
-		'You cry out in agony; at this point, you''d be willing to do just about anything to stop this. "Yes! Yes, I changed my mind! I''m sorry, Principal, I don''t want to be a whore. Please stop!"'
+		'You cry out in agony; at this point, you''d be willing to do just about anything to stop this. "Yes! Yes, I''ve changed my mind! I''m sorry Miss Volkov, I don''t want to be a whore. Please stop!"'
 		*nl
-		'For a moment you don''t know what she''s going to do, and are nonetheless surprised, let alone relieved, when she pulls out. "Very well", she says, "roll over."'
+		'For a minute, you don''t know what she''s going to do, and are nonetheless surprised, let alone relieved, when she pulls out. "Very well." she says. "Roll over."'
 		act 'Roll over':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore9.jpg"></center>'
-			'You do as she tells you and roll over, now belly-up on her desk. She steps one leg off the desk, straddling your face, and lowers her pussy right over your mouth. "Good little whores get their customers off. Maybe you have changed your mind, or maybe you just told me what I wanted to hear, but either way, this lesson isn''t over yet. Get licking or I''ll fuck that sore little ass of yours again."'
+			'You do as she tells you and roll over, now laying on your back on her desk. She steps one leg off the desk, straddling your face, and lowers her pussy right over your mouth. "Good little whores get their customers off. Maybe you have changed your mind, or maybe you just told me what I wanted to hear, but either way, this lesson isn''t over yet. Get licking or I''ll fuck that sore little ass of yours again."'
 			*nl
-			'Not wanting her to make good on that threat, you start licking her pussy and find it soaking wet already: It would seem the rumors that she used to be or still is a dominatrix really are true, if fucking you raw excited her this much. You lick and suck on her pussy lips and clit, avoiding the center for a few moments, but then slip your tongue into her twat, fucking her pussy as well as you can to get at least a hint of poetic justice. It doesn''t take long until she orgasms and coats your face in her pussy juices.'
+			'Not wanting her to make good on that threat, you start licking her pussy and find it soaking wet already: It would seem the rumors that she used to be or still is a dominatrix really are true, if fucking you raw excited her this much. You lick and suck on her pussy lips and clit, avoiding the center for a few minutes, but then slip your tongue into her, fucking her pussy as well as you can. It doesn''t take long until she orgasms and coats your face in her pussy juices.'
 			gs 'arousal', 'cuni_give', 5, 'humiliation', 'sub'
 			gs 'stat'
 			act 'Clean up':
@@ -630,9 +630,9 @@ if $ARGS[0] = 'whore2':
 				act 'Get out':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/aleksandrina/sex/school/whore11.jpg"></center>'
-					'Once the Principal deems the dildo clean enough, she removes it from your mouth, gets off the desk and pulls you off as well. She leans against the table and points at the door. "Get your shit and remove yourself from my office right now. If you hurry, you can make it back into the hall and get dressed before the next bell." Your eyes widen slightly at the thought of being forced out into a hall full of the classmates, naked as you are, but the expression on her face and her previous cruelties leave no doubt in your mind that she is serious. You quickly gather your clothes and hurry out of the office.'
+					'Once she deems the dildo clean enough, she removes it from your mouth, gets off the desk and pulls you off as well. She leans against the table and points at the door. "Get your shit and remove yourself from my office right now. If you hurry, you can make it back into the hall and get dressed before the next bell." Your eyes widen slightly at the thought of being forced out into a hall full of the classmates naked, but the expression on her face and her previous cruelties leave no doubt in your mind that she is serious. You quickly gather your clothes and hurry out of the office.'
 					*nl
-					'Once out in the hall, you quickly get dressed and try your best to ignore your burning asshole as you do. You barely finish getting yourself in order before the bell rings and the hall fills up with your fellow students. It takes you a moment to realize that the Principal was fucking you for a full class - no wonder your ass started hurting so much. With a new understanding for what school punishment can entail, you go to your next class, trying not to walk too bowlegged.'
+					'Once out in the hall, you quickly get dressed, trying your best to ignore your burning asshole as you do. You barely finish getting yourself in order before the bell rings and the hall fills up with your fellow students. It takes you a moment to realize that the Principal was fucking you for a full class - no wonder your ass started hurting so much. With a new understanding for what school punishment can entail, you go to your next class, trying not to walk too bowlegged.'
 					act 'Go to class':gt 'gschool_lessons', 'short_break'
 				end
 			end

+ 3 - 3
locations/gschool_randperson.qsrc

@@ -184,15 +184,15 @@ if $ARGS[0] = 'couple_generator':
         $rand_girl = 'Sonia'
         $rand_boy = 'Lavrenti'
 	elseif couple_rand = 41:
-        $rand_girl = 'Albina'
+        $rand_girl = 'Alyona'
         $rand_boy = 'Radomir'
     elseif couple_rand = 42:
         $rand_girl = 'Lizaveta'
         $rand_boy = 'Lavrenti'
-	elseif couple_rand = 43 and zverSlutQW = 0:
+	elseif couple_rand = 43 and christinaQW['dompath'] < 6:
         $rand_girl = 'Christina'
         $rand_boy = 'Lazar'
-    elseif couple_rand = 44 and zverSlutQW = 0:
+    elseif couple_rand = 44 and christinaQW['dompath'] < 6:
         $rand_girl = 'Christina'
         $rand_boy = 'Ivan'
 	elseif couple_rand = 45:

+ 2 - 2
locations/gschool_socialchg.qsrc

@@ -620,8 +620,8 @@ if $ARGS[0] = 'group_student_rel_change':
 		if npc_rel['A16'] <= 20: grupvalue[3] -= 1   
 		if npc_rel['A17'] >= 80: grupvalue[1] += 1     
 		if npc_rel['A17'] <= 20: grupvalue[1] -= 1   
-		if zverSlutQW < 2 and npc_rel['A18'] >= 80: grupvalue[3] += 1     
-		if zverSlutQW < 2 and npc_rel['A18'] <= 20: grupvalue[3] -= 1   
+		if christinaQW['dompath'] < 6 and npc_rel['A18'] >= 80: grupvalue[3] += 1     
+		if christinaQW['dompath'] < 6 and npc_rel['A18'] <= 20: grupvalue[3] -= 1   
 		if npc_rel['A19'] >= 80: grupvalue[2] += 1     
 		if npc_rel['A19'] <= 20: grupvalue[2] -= 1   
 		if npc_rel['A200'] >= 80: grupvalue[4] += 1     

+ 141 - 304
locations/gschool_socialchg1.qsrc

@@ -503,148 +503,153 @@ if $ARGS[0] = 'tErast':
 	end
 end
 
-if $ARGS[0] = 'tChristina':
+if $ARGS[0] = 'christina_decide':
+	menu_off = 1
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big18.jpg"></center>' 
+	'You can''t ever seem to decide how to deal with Christina. No matter how you treat her, she always seems to come off as cold or fake. She has been this way for as long as you can remember.'
+	'She can be such a bully to everybody, Albina seems to be the only one she is wary of. You have mixed feelings about how to handle it, though.'
+	'It might be fun to be in her shoes, telling the girls what to do all the time, and punishing them when they misbehave.'
+	'Attempting to dominate her and claiming Lariska and Lina for yourself could be risky. If it backfires, you could end up as her pet too, or worse.'
+	'If you try that, you would need something to keep her in line. Something that ensures she cannot break free. Blackmail, maybe, something she would be devastated if people found out about.'
+	'On the other hand, Lina and Lariska both seem pretty happy to follow her orders, and not having to think for themselves. The idea of being humiliated strangely appeals to some dark part of you.'
+	'It probably would be pretty easy to let her take control of your life too. You could head to the beach, where she trains Lina to be a better runner, and see what happens.'
+	act 'Leave it as is': gt 'gschool_lessons', 'short_break'
+	act 'Try to dominate her':
+		christinaQW['dompath'] = 1
+		gt 'gschool_lessons', 'short_break'
+	end
+	act 'Try and become her new pet':
+		christinaQW['subpath'] = 1
+		gt 'gschool_lessons', 'short_break'
+	end
+end
+
+if $ARGS[0] = 'chris_sub':
 	cla & *clr
 	menu_off = 1
-	socialchg['tLina_day'] = daystart
 	socialchg['tChristina_day'] = daystart
-	gs 'stat'
 	if $clothingworntype ! 'nude':
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big18.jpg"></center>'
-		'"What are the two of you up to?" you ask Christina ignoring Lina as you walk up to them.'
-		'"I''m trying to get this lazy ass to perform better..." Christina sourly answers. "Thanks to her we lost the last relay race. And now I''ve got to whip her into shape before the next one."'
-		act 'You''re right':
-			cla & *clr
-			minut += 10
-			npc_rel['A18'] += 2
-			npc_rel['A19'] -= 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big18.jpg"> <img <<$set_imgh>> src="images/characters/shared/photos/big19.jpg"></center>'
-			'"But... But..." Lina tries to explain but gets interrupted by you, "No Lina, Christina is right. If you messed it up then you need to train harder and perform better next time. There''s no slacking off."'
-			'"Of course I''m correct." Christina fills in, "I''m the most prominent athlete at the school and also the captain of the track and field team. My word is law."'
-			'Dejected, Lina stares at the ground and you can hear her quietly whimper since she thought that you would help her out.'
-			'"No time to rest, take another run around the lake. I''ll time you this run, and if you fail, you''ll be in a world of trouble," Christina commands.'
-			'As Lina can''t find a way out she nods and gets ready. You hear Christina shout "GO!" and watch Lina speed off...'
-			act 'Leave them alone': gt 'gLake'
-		end
-		act 'You''re being too harsh':
-			cla & *clr
-			minut += 10
-			npc_rel['A18'] -= 2
-			npc_rel['A19'] += 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big18.jpg"></center>'
-			'"Give her a break, Christina. Everyone can have a bad race once in a while..." you begin defending Lina.'
-			'"What do you know, <<$pcs_nickname>>? Were you there?! You have no idea how humiliated I felt," Christina replies.'
-			'"Put your ego aside. Just look at Lina, she''s totally exhausted and needs a break. What will you do if she gets injured?" you press on.'
-			'Christina glares at you menacingly, "Like I care... Because of this you''ll do double the sprints, Lina."'
-			'The only thing you can do is sigh and look apologetically to Lina, while she nods understandingly.'
-			act 'Leave them alone': gt 'gLake'
-		end
-	elseif $clothingworntype ! 'nude' and zverSlutQW >= 1:
-		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big18.jpg"></center>'
-		'"What are the two of you up to now?" you ask Christina, ignoring Lina, as you walk up to them.'
-		'She looks at you in fright, and says meekly "Just training Lina. She asked me for help." Lina, looking at Christina in suprise, starts to say something, but seems to think better of it and shuts her mouth.'
-		'You stare coldly at Christina, waiting for her to break. It doesn''t take long. "Uh, I mean, since I cannot run in the track teams anymore, I thought I would offer her my help." Lina is nodding, still seeming confused at the new dynamic between the two of you.'
-		'"So, you lied to me, just now. Lina didn''t ask for help, you offered." Christina, really looking scared now, nods really fast and tries to stammer out an apology, but you cut her off...'
-		act 'Encourage Lina':
-			cla & *clr
-			minut += 10
-			npc_rel['A19'] += rand(1,2)
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big19.jpg"></center>'
-			'Ignoring Christina, you tell Lina "I don''t know why you would let her help you, she was only captain of the track team because of her cock sucking skills, but if you want to train, and get better, then good for you!"'
-			'"Just remember, you''re worth ten of her, on or off the track." Lina blushes at the unexpected compliment, and smiles sweetly at you before saying thank you.'
-			act 'Smile at Lina and leave': gt 'gLake'
-		end
-		act 'Punish Christina for lying':
-			cla & *clr
-			minut += 10
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big18.jpg"></center>'
-			'"Always lying to me. We''re going to have to do something about that, aren''t we. Hands behind your back!" As soon as she does, you slap her on the cheek, hard. Tears spring to her eyes, but she doesn''t move or try to block the second one, or the third.'
-			'Lina just watches, mouth wide open in suprise. A few people walking by look, but nobody says anything. Patting her cheek softly where you just slapped her, you say "Someday you will learn. Even a dog can learn to obey, I''m sure you will figure it out."'
-			act 'Finish the punishment and leave': gt 'gLake'
-		end
-	elseif $clothingworntype = 'nude' and zverSlutQW >= 1:
-		gs 'exhibitionism', 3
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
-		'"What are the two of you up to now?" you ask Christina, ignoring Lina, as you walk up to them.'
-		'Lina''s eyebrows shoot up when she sees you''re naked, but when Christina sees you, she just looks straight down and mumbles something. Grabbing her by the arm, you give her a shake, and say "I''m talking to you, bitch! Speak up." Meekly, she replies "Training, <<$pcs_nickname>>. I''m not allowed to run anymore, but I thought I could still help Lina."'
-		'Lina is looking back and forth, between the two of you, unsure how to behave in this new dynamic. The fact that you''re also naked seems to be messing with her even more. Still, she tries to cover for Christina by saying "I did horrible in the last race, so I... uh... asked her for help."'
-		act 'Let them train in peace': gt 'gLake'
-		act 'Train Lina yourself (0:30)':
-			cla & *clr
-			npc_rel['A19'] += rand(2,4)
-			gs 'exercise', 'tier1', 30, 'run_exp'
-			fat -= rand(0,2)
-			gs 'sweat', 'add', 3
+		'"Hey Christina, can I talk to you about something?"'
+		'She turns and looks at you, apparently annoyed. "What, <<$pcs_nickname>>? Can''t you see I''m busy trying to get this lazy ass to perform better..." Christina sourly answers. "Thanks to her we lost the last relay race. And now I''ve got to whip her into shape before the next one."'
+		'"I was trying to get Lariska to hang out with me outside of school, but she said only if you approved it."'
+		'"Now why would I do that? I have her trained good, spending time with you would just corrupt her."'
+		'Taking a submissive posture and tone, you say "Please? If there is anything I can do to change your mind, I will."'
+		'A bit suprised by your response, she carefully looks you up and down before replying with "Get naked. Right here, right now. Prove to me you really want this!"'
+		'Startled, you look up to see if she was serious, and you can tell with just a glance she most definitely is.'
+		'"Now, bitch, or get lost!"'
+		act 'Run away': gt'gLake'
+		act 'Submit and Strip':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/strip.jpg"></center>'
+			'You reluctantly nod your head and meekly agree. "Ok," you tell her.'
+			'Hesitantly you start taking your clothes off. She watches you impassively, Lina behind her looking at you in shock.'
+			'When you stand before, completely naked, she pulls out her phone and starts taking pictures'
+			'You don''t mind if I take some pictures and send them to everyone, right? They''re going to love seeing these."'
+			'You start to panic as you realize what this means, this could ruin your reputation.'
+			if pcs_inhib > 60:
+				inhib_exp += rand(3,5)
+			else
+				inhib_exp += rand(1,3)
+			end
+			if LariskaQW['story'] = 3:LariskaQW['story'] = 4
+			sauna_stripped = 0
+			gs 'underwear', 'remove'
+			gs 'clothing', 'strip'
+			christinaQW['subpath'] = 2
+			christinaQW['submit'] = 1
+			gs 'exhibitionism', 3
+			gs 'fame', 'pav', 'sex', 3
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/run_naked1.jpg"></center>'
-			'"Aww, isn''t that sweet," you say with a wicked smile. "Well, since I''m the better runner, I had better pitch in too. Strip, both of you." Lina immediately turns red and tries to stammer out a protest, but Christina doesn''t even hesitate. She just starts taking her clothes off and tossing them into a pile.'
-			'Having not forgotten the part Lina played in Christina''s attempt at revenge, you simply look at Lina coldly and say "Now." She takes one look at your face and, shivering in fear, starts taking off her clothes too. When they are both naked, you grab their clothes and toss them next to your stuff, and then tell them to keep up.'
-			'The three of you run up and down the beach nude for the next half hour. For the first part of the run, Lina is bright red, and not because of the exercise. By the end of the run, however, she seems to be enjoying herself, smiling and laughing at the people gawking at her.'
-			'Christina, on the other hand, seems like she is going to die of embarrassment. You doubt her being naked in public is having that much effect, your guess is she doesn''t want people to see you taking charge of her. It''s too late though, her reputation is already in complete ruins.'
-			act 'Let them rest': gt 'gLake'
+			act 'Beg her not to':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
+				'Panic sets in as you try and cover yourself as best you can. "Please Christina, don''t send anyone those pictures," you beg her.'
+				'Christina laughs at that and looks to Lina. "Can you believe this whinny little bitch? She asks for my approval and now is begging for help."'
+				'Lina starts laughing too, before Christina looks back to you and says "I might be persuaded not to share these. But if I agree, then I own you, you understand?"'
+				'Confused, you ask "Own me?"'
+				'Christina snarls at you. "Yeah that''s right bitch, I will own you. If tell you to do my homework, you will. If I tell you to lick my shoes clean, you will. If I tell you to stick a bottle up your ass,you will. Got it?"'
+				'You feel the blood drain from your face as you realize she means it, and will likely torment you for the rest of the school year. It will save your reputation, though, and Lariska will be allowed to hang out with you.'
+				act 'Agree':
+					cla & *clr
+					pcs_mood -= 10
+					gs 'pain', 1, 'labia', 'kick'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/beach/onall4s.jpg"></center>'
+					'You reluctantly nod your head and meekly agree. "Ok," you tell her.'
+					'"That''s right bitch, from now on I own your ass. Turn around and get on your hands and knees." You reluctantly do as you''re told.'
+					'She walks up behind you. "Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame as she takes several more pictures, laughing the whole time. "You''re going to do anything I want, whenever I want, or everyone in school will see these pictures." You meekly nod, on the verge of tears.'
+					*nl
+					'Suddenly Christina kicks you in the twat from behind, hard. You cry out, and tears start running down your cheeks, as you grab your crotch and roll onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it," she demands as she towers over you.'
+					*nl
+					'"I am a little cunt that will do anything you say, anytime you say it," you croak out. With that Christina laughs evilly, she seems to be enjoying bullying you a lot. She and Lina then walk off, leaving you laying on the beach, naked and in pain. Once they are gone, you dry your tears as best you can, get up, and get dressed again.'
+					act 'Walk off':
+						gs 'clothing', 'wear_last_worn'
+						gs 'underwear', 'wear'
+						gt 'gLake'
+					end
+				end
+			end
 		end
 	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
+		'"Hey Christina, can I talk to you about something?"'
+		'She turns and opens her mouth, but noticing you are nude, she seems too suprised to form the words she was going to say.'
+		'She bursts out laughing, pointing at you, then walks towards you. Lina is confused a moment until she realizes what Christina is laughing at, then joins in as she follows Christina over. "Don''t you have any shame, you fucking slut?"'
+		'"Yeah." Lina adds kinda half heartedly, you think she is just doing it to make Christina happy.'
+		'Christina looks you over head to toe, with a look of disgust on her face. "Maybe this is the only way you can get guys to even look at you, hag."'
+		'Suddenly, she pulls out her phone and starts taking pictures. "You don''t mind if I take some pictures and send them to everyone, right? They''re going to love seeing these."'
+		'You start to panic as you realize what this means, this could ruin your reputation.'
 		gs 'exhibitionism', 3
 		gs 'fame', 'pav', 'sex', 3
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
-		'"What are the two of you up to?" you ask Christina, ignoring Lina, as you walk up to them.'
-		'"I''m trying to get this lazy ass to perform better..." She suddenly stops talking as she turns and sees you completely naked. Bursting out laughing, she says "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you. You blush as you realize what this means.'
-		*nl
-		'"I am going to send these to everyone, they are going to love seeing them."'
-		act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
-		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
-		act 'I don''t care':
-			socialchg['christina_day'] = daystart
-			socialchg['christina_dont_care'] = 1
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked2.jpg"></center>'
-			'"I don''t care," you shrug, looking down at yourself. "I''m not ashamed of my body. I like the way I look."'
-			'"And the boys are going to <i>love</i> the way you look," she guffaws back. Christina snaps several more pictures and inspects them before smiling to herself in satisfaction. "See you at school, slut. That''s enough of a break. Start running fatass!"'
-			'She begins shouting at Lina pushing her to start sprinting down the beach, slapping her ass when she deems she isn''t moving fast enough. Soon enough you''re left alone on the beach again.'
-			act'Continue':gt'gLake'
+		gs 'stat'
+		act 'Run away': gt'gLake'
+		act 'Submit and Beg':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
+			'Panic sets in as you try and cover yourself as best you can. "Please Christina, don''t send anyone those pictures," you beg her.'
+			'Christina laughs at that and looks to Lina. "Can you believe this whinny little bitch? She asks for my approval and now is begging for help."'
+			'Lina starts laughing too, before Christina looks back to you and says "I might be persuaded not to share these. But if I agree, then I own you, you understand?"'
+			'Confused, you ask "Own me?"'
+			'Christina snarls at you. "Yeah that''s right bitch, I will own you. If tell you to do my homework, you will. If I tell you to lick my shoes clean, you will. If I tell you to stick a bottle up your ass,you will. Got it?"'
+			'You feel the blood drain from your face as you realize she means it, and will likely torment you for the rest of the school year. It will save your reputation, though.'
+			'"Will you tell Lariska she can hang out with me outside of school if I do?"'
+			'"Sure, she can help train you..." she says evilly.'
+			christinaQW['submit'] = 1
+			christinaQW['subpath'] = 2
+			if LariskaQW['story'] = 3:LariskaQW['story'] = 4
+			act 'Agree':
+				cla & *clr
+				pcs_mood -= 10
+				gs 'pain', 1, 'labia', 'kick'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/beach/onall4s.jpg"></center>'
+				'You reluctantly nod your head and meekly agree. "Ok," you tell her.'
+				'"That''s right bitch, from now on I own your ass. Turn around and get on your hands and knees." You reluctantly do as you''re told.'
+				'She walks up behind you. "Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame as she takes several more pictures, laughing the whole time. "You''re going to do anything I want, whenever I want, or everyone in school will see these pictures." You meekly nod, on the verge of tears.'
+				*nl
+				'Suddenly Christina kicks you in the twat from behind, hard. You cry out, and tears start running down your cheeks, as you grab your crotch and roll onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it," she demands as she towers over you.'
+				*nl
+				'"I am a little cunt that will do anything you say, anytime you say it," you croak out. With that Christina laughs evilly, she seems to be enjoying bullying you a lot. She and Lina then walk off, leaving you laying on the beach, naked and in pain. Once they are gone, you dry your tears as best you can, get up, and get dressed again.'
+				act 'Walk off':gt 'gLake'
+			end
 		end
 	end
 end
 
-if $ARGS[0] = 'tLina':
+
+if $ARGS[0] = 'chris_dom':
 	cla & *clr
 	menu_off = 1
-	socialchg['tLina_day'] = daystart
 	socialchg['tChristina_day'] = daystart
 	gs 'stat'
 	if $clothingworntype ! 'nude':
-		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big18.jpg"></center>'
-		'"What are you two up to?" you ask Lina ignoring Christina as you walk up to them.'
-		'Lina is just about to answer but gets interrupted by Christina, "Who told you that you could speak?! You don''t deserve that after your poor performance after the last race."'
-		act 'Was I talking to you?':
-			cla & *clr
-			minut += 10
-			npc_rel['A18'] -= 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big19.jpg"></center>'
-			'You turn around to Christina, "Did I ask you anything?" Christina is clearly fuming but you once again turn to Lina and ask "What are you doing?"'
-			'Lina carefully picks her words as Christina listens on, "I-I messed up in the last race. And..." she stops in her tracks and thinks for a short moment, "And I asked Christina for some pointers since she''s a great athlete."'
-			'Lina quickly casts a look towards Christina that has calmed down hearing Lina''s explanation...'
-			act 'Keep on fighting':
-				cla & *clr
-				npc_rel['A19'] += 2
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big19.jpg"></center>'
-				'You''re grinning hearing that, "Well good for you wanting to improve your performance. I''m sure Christina will have no issues getting you into shape. Just don''t let her take advantage of you. She can be quite excessive when it comes to these things."'
-				'Lina nods, "No, don''t worry I need the help."'
-				'"Well, if Christina gives you a hard time be sure to tell me and we''ll have a talk." you stick out your tongue teasingly and give her a wink.'
-				'Lina smiles while Christina clears her throat, "Okay that''s enough, time to head back to work... Get ready this will be painful..."'
-				act 'Leave them alone':gt 'gLake'
-			end
-		end
-	elseif $clothingworntype ! 'nude' and zverSlutQW >= 1:
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big19.jpg"></center>'
 		'"What are the two of you up to now?" you ask Lina, ignoring Christina, as you walk up to them.'
-		'"Training. I need to get better, I''m holding the team back." Frowning, you ask her who told her that. She doesn''t say anything, but a look sideways tells you all you need to know. "Christina, did you tell her that!" Trembling, she shakes her head, but you already know she''s lying.'
+		'"Training. I need to get better, I''m holding the team back." Frowning, you ask her who told her that.'
+		'She doesn''t say anything, but a look sideways tells you all you need to know.'
+		'"Christina, did you tell her that!" Trembling, she shakes her head, but you already know she''s lying.'
 		act 'Encourage Lina':
 			cla & *clr
 			minut += 10
@@ -664,166 +669,32 @@ if $ARGS[0] = 'tLina':
 			'Lina just watches, mouth wide open in suprise. A few people walking by look, but nobody says anything. Patting her cheek softly where you just slapped her, you say "Someday you will learn. Even a dog can learn to obey, I''m sure you will figure it out."'
 			act 'Finish the punishment and leave': gt 'gLake'
 		end
-	elseif $clothingworntype = 'nude' and zverSlutQW >= 1:
+	else
 		gs 'exhibitionism', 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
 		'"What are the two of you up to now?" you ask Lina, ignoring Christina, as you walk up to them.'
 		'Lina''s eyebrows shoot up when she sees you''re naked, but all she says is "I did horrible in the last race, so I... uh... asked Christina for help." Christina just nods, staring at her feet, too afraid to even look at you.'
 		'"Training is good, Lina. A much better plan than trying to suck the coach off, if you ask me." Christina''s cheeks flush a little, but she keeps looking down. Lina just smiles, but still seems too afraid of Christina to say anything against her.'
 		act 'Let them train in peace': gt 'gLake'
-		act 'Train Lina yourself (0:30)':
-			cla & *clr
-			npc_rel['A19'] += rand(2,4)
-			gs 'exercise', 'tier1', 30, 'run_exp'
-			fat -= rand(0,2)
-			gs 'sweat', 'add', 3
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/run_naked1.jpg"></center>'
-			'"Well, since I''m the better runner, I had better pitch in too. Strip, both of you." Lina immediately turns red and tries to stammer out a protest, but Christina doesn''t even hesitate. She just starts taking her clothes off and tossing them into a pile.'
-			'Having not forgotten the part Lina played in Christina''s attempt at revenge, you simply look at Lina coldly and say "Now." She takes one look at your face and, shivering in fear, starts taking off her clothes too. When they are both naked, you grab their clothes and toss them next to your stuff, and then tell them to keep up.'
-			'The three of you run up and down the beach nude for the next half hour. For the first part of the run, Lina is bright red, and not because of the exercise. By the end of the run, however, she seems to be enjoying herself, smiling and laughing at the people gawking at her.'
-			'Christina, on the other hand, seems like she is going to die of embarrassment. You doubt her being naked in public is having that much effect, your guess is she doesn''t want people to see you taking charge of her. It''s too late though, her reputation is already in complete ruins.'
-			act 'Let them rest': gt 'gLake'
-		end
-	else
-		gs 'exhibitionism', 3
-		gs 'fame', 'pav', 'sex', 3
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
-		'"What are you two up to?" you ask Lina, ignoring Christina, as you walk up to them.'
-		'Lina is just about to answer but gets interrupted by Christina, "Who told you that you could speak?!..." Then she stops talking, as she turns to face you and sees you completely naked. She bursts out laughing. "Oh my god, what a fucking slut you are." Lina joins in laughing at you as well, as they both point and laugh at you being naked. Christina pulls out her phone and starts taking pictures of you. You blush as you realize what this could mean.'
-		*nl
-		'"I am going to send these to everyone, they are going to love seeing them."'
-		gs 'willpower', 'misc', 'self', 'medium'
-		if will_cost <= pcs_willpwr:
-			act 'Kick her ass (<<will_cost>> Willpower)':
-				gs 'willpower', 'pay', 'self'
-				gt 'gschool_socialchg1', 'christina_fight'
+		if swinbeg = 3 or swinbeggor = 3:
+			act 'Train Lina yourself (0:30)':
+				cla & *clr
+				npc_rel['A19'] += rand(2,4)
+				gs 'exercise', 'tier1', 30, 'run_exp'
+				fat -= rand(0,2)
+				gs 'sweat', 'add', 3
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/run_naked1.jpg"></center>'
+				'"Well, since I''m the better runner, I had better pitch in too. Strip, both of you." Lina immediately turns red and tries to stammer out a protest, but Christina doesn''t even hesitate. She just starts taking her clothes off and tossing them into a pile.'
+				'Having not forgotten the part Lina played in Christina''s attempt at revenge, you simply look at Lina coldly and say "Now." She takes one look at your face and, shivering in fear, starts taking off her clothes too. When they are both naked, you grab their clothes and toss them next to your stuff, and then tell them to keep up.'
+				'The three of you run up and down the beach nude for the next half hour. For the first part of the run, Lina is bright red, and not because of the exercise. By the end of the run, however, she seems to be enjoying herself, smiling and laughing at the people gawking at her.'
+				'Christina, on the other hand, seems like she is going to die of embarrassment. You doubt her being naked in public is having that much effect, your guess is she doesn''t want people to see you taking charge of her. It''s too late though, her reputation is already in complete ruins.'
+				act 'Let them rest': gt 'gLake'
 			end
-		else
-			act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
-		act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
-		act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
-		act 'I don''t care':
-			socialchg['christina_day'] = daystart
-			socialchg['christina_dont_care'] = 1
-			cla & *clr
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked2.jpg"></center>'
-			'"I don''t care," you shrug, looking down at yourself. "I''m not ashamed of my body. I like the way I look."'
-			'"And the boys are going to <i>love</i> the way you look," she guffaws back. Christina snaps several more pictures and inspects them before smiling to herself in satisfaction. "See you at school, slut. That''s enough of a break. Start running, fatass!"'
-			'She begins shouting at Lina, pushing her to start sprinting down the beach, and slapping her ass when she deems she isn''t moving fast enough. Soon enough you''re alone on the beach again.'
-			act'Continue':gt'gLake'
 		end
 	end
 end
 
-if $ARGS[0] = 'chrislina_naked':
-	cla & *clr
-	menu_off = 1
-	gs 'exhibitionism', 3
-	gs 'fame', 'pav', 'sex', 3
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked.jpg"></center>'
-	'Christina is standing by the beach looking out over the lake, with Lina standing next to her, breathing heavily. You feel yourself panic a bit at the thought of them seeing you naked. You to sneak away before you''re seen, but Christina suddenly turns and looks right at you.'
-	'She bursts out laughing, pointing at you, then walks towards you. Lina is confused a moment until she realizes what Christina is laughing at, then joins in as she follows Christina over. "Don''t you have any shame, you fucking slut?"'
-	'"Yeah." Lina adds kinda half heartedly, you think she is just doing it to make Christina happy.'
-	'Christina looks you over head to toe, with a look of disgust on her face. "Maybe this is the only way you can get guys to even look at you, hag."'
-	
-	act 'I made a mistake': christina_temp = 0 & gt 'gschool_socialchg1', 'christina_decision'	
-	act 'I''m not ashamed': christina_temp = 1 & gt 'gschool_socialchg1', 'christina_decision'
-end
-
-if $ARGS[0] = 'christina_decision':
-	cla & *clr
-	minut += 2
-	gs 'stat'	
-	
-	if christina_temp = 0:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
-		'Hearing the girls laugh and Christina''s stinging words you blush and cover yourself as best you can. "I... I made a mistake. I don''t know what I was thinking. Please don''t tell anyone," you beg her.'
-		'Christina pulls out her phone and starts taking pictures of you as she talks. "Yeah, you made a mistake, you stupid cunt. Now you''re going to pay for it. I am sending these to everyone, they''re going to love seeing them." You start to panic as you realize what this means, this could ruin your reputation.'	
-	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked2.jpg"></center>'
-		'Hearing the girls laugh and Christina''s words, you just shake your head and don''t cover up. You know you have nothing to be ashamed of. "I''m not ashamed, Christina. This is how I was made, and I look amazing. Just because you are ashamed of your body doesn''t mean I am." You tell her with a sneer.'
-		'Christina''s jaw tightens and her eyes narrow in obvious anger, as she pulls out her phone and starts taking pictures of you. "No? Well then you won''t mind if I take some pictures and send them to everyone, right? They''re going to love seeing these." Your confidence wavers a little, as you realize this might ruin your reputation.'
-	end
-	
-	killvar 'christina_temp'
-	
-	gs 'willpower', 'misc', 'self', 'medium'
-	if will_cost <= pcs_willpwr:
-		act 'Kick her ass (<<will_cost>> Willpower)':
-			gs 'willpower', 'pay', 'self'
-			gt 'gschool_socialchg1', 'christina_fight'
-		end
-	else
-		act 'Kick her ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
-	act 'Run off': socialchg['christina_day'] = daystart & gt 'gLake'
-	act 'Beg her not to': gt 'gschool_socialchg1', 'beg_christina'
-end
-	
-if $ARGS[0] = 'beg_christina':
-	cla & *clr
-	menu_off = 1
-	socialchg['christina_day'] = daystart
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
-	'Panic sets in as you try and cover yourself as best you can. Maybe you can convince her not to send the pictures to everyone. "Please Christina, don''t send anyone those pictures," you beg her.'
-	'Christina laughs at that and looks to Lina. "Can you believe this whinny little bitch? She gets herself into trouble and now is begging for help." Lina starts laughing too, before Christina looks back to you and says "I might be persuaded not to share these. But if I agree, then I own you, you understand?"'
-	'Confused, you ask "Own me?"'
-	'Christina snarls at you. "Yeah that''s right bitch, I will own you. If tell you to do my homework, you will. If I tell you to lick my shoes clean, you will. If I tell you to stick a bottle up your ass,you will. Got it?"'
-	'You feel the blood drain from your face as you realize she means it, and will likely torment you for the rest of the school year. It will save your reputation, though.'
-	gs 'willpower', 'misc', 'resist', 'medium'
-	if will_cost <= pcs_willpwr:
-		act 'Refuse (<<will_cost>> Willpower)':
-			*clr & cla
-			gs 'willpower', 'pay', 'resist'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
-			'You shake your head and say "No, I''m not going to do that, you will humiliate me worse than those photos every could."'
-			'Christina snorts then shrugs. "Yeah you''re probably right, but now everyone will see you naked and know you run around the beach like a whore." She does something on her phone and then says "There, now everyone will get a link to these images." You feel yourself on the verge of tears, but what can you do? You glance at Lina and she seems to have some sympathy for you, but doesn''t say a word. Likely afraid to incur Christina''s wraith herself if she speaks up. Not knowing what else to do you turn and walk away.'
-			act 'Walk off': gt 'gLake'
-		end
-	else
-		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
-	
-	act 'Agree':
-		cla & *clr
-		pcs_mood -= 10
-		christinaphotos = 1		
-		gs 'pain', 1, 'labia', 'kick'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/christina/beach/onall4s.jpg"></center>'
-		'You reluctantly nod your head and meekly agree. "Ok," you tell her.'
-		'"That''s right bitch, from now on I own your ass. Turn around and get on your hands and knees." You reluctantly do as you''re told.'
-		'She walks up behind you. "Now spread those legs so we can get a nice shot of that disgusting pussy and dirty ass of yours." You blush with shame as she takes several more pictures, laughing the whole time. "You''re going to do anything I want, whenever I want, or everyone in school will see these pictures." You meekly nod, on the verge of tears.'
-		*nl
-		'Suddenly Christina kicks you in the twat from behind, hard. You cry out, and tears start running down your cheeks, as you grab your crotch and roll onto your side with your legs squeezed closed. "Then say it! Say you are a little cunt and will do anything I say anytime I say it," she demands as she towers over you.'
-		*nl
-		'"I am a little cunt that will do anything you say, anytime you say it," you croak out. With that Christina laughs evilly, she seems to be enjoying bullying you a lot. She and Lina then walk off, leaving you laying on the beach, naked and in pain. Once they are gone, you dry your tears as best you can and get up.'
-		
-		act 'Walk off': gt 'gLake'
-	end
-end
-	
-if $ARGS[0] = 'christina_fight':
-	cla & *clr
-	menu_off = 1
-	gs 'stat'
-	'You step closer to Christina and say. "Give me the fucking phone before I kick your ass."'
-	'She smirks at you as she puts the phone in her pocket, then gets in fighting stance, obviously more than willing to fight you. "Take it if you think you can, cunt!" Lina gets out of the way, just as you take your first swing. Christina was waiting for it and easily side steps your first blow, but now the fight is on.'
-	
-	act 'Fight her':
-		gs 'boyStat', 'A18'
-		gs 'fight','initFight'
-		gs 'fight_npcdata', 'christina'
-		fightEnding = 15
-		gt 'fight', 'start'
-	end
-end
-
 if $ARGS[0] = 'tBella':
 	cla & *clr
 	menu_off = 1
@@ -901,39 +772,5 @@ if $ARGS[0] = 'tVeronika':
 	end
 end
 
-if $ARGS[0] = 'tLariska':
-	cla & *clr
-	menu_off = 1
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
-	'You carefully walk up to her, trying your best not the make your presence known. As you stand and observe her for a moment, you''re flabbergasted as Lariska is smashing the ball and have it effortlessly return to her hands over and over again...'
-	'You really get into seeing her keeping it up that you let out a loud-voiced gasp as the ball bounces differently. Letting yourself be known, it'' as you''ve managed the brake the spell Lariska was under as she turns towards you, "Impressed?"'
-	act 'Yes!':
-		cla & *clr
-		minut += 20
-		npc_rel['A13'] += 2
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
-		'You nod your head, "Yeah, you''re amazing, Lariska. I didn''t even know that you had such control over the ball."'
-		'Lariska, breaks out in a huge smile and you even notice her cheeks blush a little, "Thanks, <<$pcs_nickname>>. I really got into the zone this time. Usually I''m not doing that good..." she humbly replies.'
-		'"No need to be humble, it was really amazing, trust me... You''re one of the best volleyball players I''ve ever seen." you genuinely respond, "I''ll let you go back to it, I didn''t want to bother." you smile.'
-		'Smiling back Lariska turns back towards the wall and smashes it as usual, but instead of catching the ball it ends up hitting her in the head and you can see her whole face turn red as you quickly walk away from there.'
-		act 'Continue on': gt 'pav_complex', 'start'
-	end
-	act 'Play it off':
-		cla & *clr
-		minut += 20
-		npc_rel['A13'] -= 2
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
-		'Wanting to play it off nonchalantly you shake your head, chuckle and tell her that you aren''t that impressed and that you''ve seen others pull out even more impressive moves.'
-		'Lariska smiles it off, but deep down you know that her fragile ego has been rattled, "Like you could do it better," she viciously attacks...'
-		'You begin to laugh, "Why would I need to prove myself over such a silly little thing."'
-		'By now you can clearly notice that you''ve gotten under Lariska''s skin, "Go away, <<$pcs_nickname>>... Or else I''ll make you regret it..."'
-		'Knowing she''s close to Christina you take the hint and nod your head. As you''re walking away you can hear the bouncing sounds clearly louder...'
-		act 'Walk away': gt 'pav_complex', 'start'
-	end
-end
-
 --- gschool_socialchg1 ---------------------------------
 

+ 11 - 11
locations/journal.qsrc

@@ -27,27 +27,27 @@ if $ARGS[0] = 'records':
 	if home_owned[1] = 3:'You own a two room apartment in the city residential area. It''s currently occupied by your tenants.'
 	if home_owned[2] > 0:'You live in a two room apartment in a large apartment complex. You live with your parents and siblings in Pavlovsk.'
 	if home_owned[3] > 0:'You own small holiday cottage with an adjacent allotment in the communal village.'
-	if home_owned[4] > 0:'You rent a two room apartment in Pushkin. Your rent for the apartment is subtracted automatically in sum of <<home_rent[4]>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<ArendHouseSL4>></b> days'
+	if home_owned[4] > 0:'You rent a two room apartment in Pushkin. Your rent for the apartment is subtracted automatically in the sum of <<home_rent[4]>> <b>₽</b> us electric bill on the 25th of each month. You are currently paid up for <b><<ArendHouseSL4>></b> days'
 	if home_owned[5] = 1:'You own a vacant block in the city suburbs. Your utility bills are due on the 25th of each month.'
-	if home_owned[5] = 2:'You own a block in the city suburbs upon which you are building a house. Your utility bills are due on the 25th of each month.'
+	if home_owned[5] = 2:'You own a block in the city suburbs, upon which you are building a house. Your utility bills are due on the 25th of each month.'
 	if home_owned[5] = 3:'You own an impressive mansion in the suburbs of St. Petersburg. Your utility bills are due on the 25th of each month.'
 	
 	'<center><h2>Work</h2></center>'
 	
 	if workPTU > 2:'You work as a teacher at the Lycée and your schedule is Mon-Sat, teaching between 14:00 to 16:00. Your salary is 300r/day. The dress code is Office Clothes, Strict. The road from the apartment to the Lyceum takes 2 hours 10 minutes.'
 	if (work = 1 or cheatWork = 1) and workKafe > 0:'You are working as a waitress at The Roadhouse cafe. You need to come to work between 11:00-12:00 while your working days are: Tuesday, Wednesday, and Thursday. At work, you can receive tips from customers and your wages are received on 25th of each month.'
-	if (work = 1 or cheatWork = 1) and workhosp > 0:'You work as a nurse in the city residential area clinic. You need to come to work between 08:00-09:00 during the week. Salary is automatically transferred on 25th of each month.'
+	if (work = 1 or cheatWork = 1) and workhosp > 0:'You work as a nurse in the city residential area clinic. You need to come to work between 08:00-09:00 during the week. Salary is automatically transferred on the 25th of each month.'
 	if (work = 1 or cheatWork = 1) and worksalon > 0:'You work as a masseuse in the city at the Beauty Bar. You need to come to work between 09:00-10:00 while your working days are: Monday, Wednesday, and Friday. Salary is automatically transferred on 25th of each month.'
-	if (work = 1 or cheatWork = 1) and workSec > 0:'You work as a secretary at Titran Express. You need to come to work by 09:00 during the week Monday-Friday. Salary is automatically transferred on 25th of each month.'
+	if (work = 1 or cheatWork = 1) and workSec > 0:'You work as a secretary at Titran Express. You need to come to work by 09:00 during the week Monday-Friday. Salary is automatically transferred on the 25th of each month.'
 	if (work = 1 or cheatWork = 1) and tanwork > 0:'You work as a governess for Tanya at Nicholas'' luxury city apartment. Salary is automatically transferred on the 25th of each month.'
-	if (work = 1 or cheatWork = 1) and young_shop_work = 1:'You work in the city as a store clerk at the Pussy Kats clothing store. Work starts at 15:00 Monday to Friday. The salary shall be issued once a week on Fridays.'
-	if (work = 1 or cheatWork = 1) and young_shop_work1 = 1:'You work in the city as a store clerk at the Pussy Kats clothing store. Work starts at 09:00 Saturday and Sunday. The salary shall be issued once a week on Fridays.'
-	if (work = 1 or cheatWork = 1) and young_shop_work2 = 1:'You work in the city as a store clerk at the Pussy Kats clothing store. Work starts at 09:00 Monday through Friday. The salary shall be issued once a week on Fridays.'
-	if (work = 1 or cheatWork = 1) and workFabrika = 1:'You work as a seamstress in a factory in Pavlovsk. Work is every day except Saturday and Sunday. Salary is automatically transferred on 25th of each month.'
+	if (work = 1 or cheatWork = 1) and young_shop_work = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 15:00 Monday to Friday. The salary shall be issued once a week, on Fridays.'
+	if (work = 1 or cheatWork = 1) and young_shop_work1 = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Saturday and Sunday. The salary shall be issued once a week, on Fridays.'
+	if (work = 1 or cheatWork = 1) and young_shop_work2 = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Monday through Friday. The salary shall be issued once a week, on Fridays.'
+	if (work = 1 or cheatWork = 1) and workFabrika = 1:'You work as a seamstress in the factory in Pavlovsk. Work is every weekday, with weekends off. Salary is automatically transferred on the 25th of each month.'
 	if workrin = 1:'You are working at the market in Arthur''s tent as a clothing saleswoman. You work on Tuesday, Thursday and Saturday with a start time of 08:00. Salary depends on sales.'
 	if maidqw = 1:'You work in the Pavlovsk hotel as a maid. Your work schedule is every day from 16:00 to 19:00 and your salary is 250 <b>₽</b> plus tips.'
 	if postjobQW = 2 or postjobQW = 4:'You deliver mail for the postmaster. The work day starts each Saturday between 11:00 and 12:00. Salary is 450 <b>₽</b> .'
-	if (work = 1 or cheatWork = 1) and gpoliuborka > 1:'You work part-time as a cleaner in the Pavlovosk clinic. Your schedule is from 16:00 to 21:00.'
+	if (work = 1 or cheatWork = 1) and gpoliuborka > 1:'You work part-time as a cleaner in the Pavlovsk clinic. Your schedule is from 16:00 to 21:00.'
 	if stripwork >= 1:'You can work as a stripper in the city industrial region. You have an open schedule that can be every day from 15:00-00:00. No salary as you earn tips.'
 	if film > 0:'You are working in the city industrial region as a pornographic actress under the name <<$pfname>>.'
 	if bumtolik = 4:'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.'
@@ -58,7 +58,7 @@ if $ARGS[0] = 'records':
 	if audition['day'] = daystart:
 		'Your audition for the role of <<$role>> is today!'
 	elseif audition['day'] - daystart = 1:
-		'You are auditioning for the role of <<$role>> is tomorrow.'
+		'You are auditioning for the role of <<$role>> tomorrow.'
 	elseif audition['day'] - daystart > 1:
 		'You are auditioning for the role of <<$role>> in <<audition[''day''] - daystart>> days.'
 	end
@@ -665,7 +665,7 @@ if $ARGS[0] = 'outcasts':
 	if npc_grupTipe['A18'] = 5:
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/18.jpg"></center>'
 		'<center>Christina Zvereva</center>'
-		'Ever since your fight, Christina has been avoiding you. She''s been humiliated ever since you told the whole school about how she sucked the P.E. teacher''s cock for a place in the running competition, and you managed to beat her up when she tried to fight you. Barely a shade of her former self, she stands timidly in a corner, her head still wrapped in bandage. Whenever she opens her mouth, people can see the broken tooth she hasn''t been able to get fixed yet.'
+		'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.'
 	end
 	
 	act 'Go back': gt 'journal', 'school'

+ 155 - 0
locations/journal_quests.qsrc

@@ -10,6 +10,68 @@ if $ARGS[0] = 'start':
 
 !!to check Sveta is at school. All school quests must pass this and it should become a category as we expand
 	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
+		'<center><h1>Cheerleading</h1></center>'
+		*nl
+		if (month > 11 or month < 6) and cheerleadingQW['quest_stage'] = 0:
+			'For various reasons, I cannot be a cheerleader.'
+		elseif month < 10 and month >= 6 and cheerleadingQW['quest_stage'] = 0:
+			'If I want to be a cheerleader, I should keep my eyes out for the tryout posters that usually go up in the school around October.'
+		elseif (month = 10 or month = 11) and cheerleadingQW['quest_stage'] = 0:
+			'If I want to be a cheerleader, I should keep my eye out for the cheerleader tryout posters that usually go up in school around this time of year.'
+		elseif cheerleadingQW['quest_stage'] = -1 and cheerleadingQW['try_count'] > 0:
+			'If I want to try again to become a cheerleader, I will need to wait until the posters go back up in school.'
+		elseif cheerleadingQW['quest_stage'] = -1:
+			'If I change my mind about joining the cheerleading squad, I will have to wait for the posters to go up again.'
+		elseif cheerleadingQW['quest_stage'] = -2:
+			'For one reason or another, I don''t want to join the cheerleading squad.'
+		elseif cheerleadingQW['quest_stage'] = 1:
+			'I have signed up to tryout for the cheerleading squad.'
+		elseif cheerleadingQW['quest_stage'] = 2:
+			'I was accepted into the cheerleading squad as a backup. Unless people start thinking I am a jock or see me as cool enough, this is as far as Albina will let me go.'
+		elseif cheerleadingQW['quest_stage'] = 3:
+			'I joined the cheerleading squad as a full member.'
+		else
+			'Unknown. You might want to report this as a bug on the TFGS Forum.'
+		end
+		*nl
+		*nl
+		'<center><h1>Julia Milov</h1></center>'
+		*nl
+		if pav_slut < 200:
+			if npc_rel['A12'] >= 60:
+				if JuliaMilLernQW = 1:
+					if BeInJulMilHome = 1:
+						if wine = 1:
+							if JulMilBestFrend >= 5:
+								if SexTalkJulia >= 4:
+									'Julia and I are in a sexual relationship now.'
+								elseif SexTalkJulia > 0:
+									'I should try getting Julia to tell me more about her sexual adventures.'
+								else
+									'I should try talking to Julia about sex.'
+								end
+							else
+								'I should spend some time chatting with Julia. I bet if I get to know her weel enough, she would open up to me more.'
+							end
+						else
+							'I bet if I bought some wine, Julia would drink it with me.'
+						end
+					else
+						'Julia agreed to help me with my homework, she should be waiting for me after school ends.'
+					end
+				else
+					'I should ask Julia to help me with my homework afterschool sometime. I can find her hanging out with the other nerds in a classroom during school breaks.'
+				end
+			else
+				'I need to get to know Julia better before she is willing to hang out with me after school.'
+			end
+		else
+			'As long as people see me as a slut around town, there is no way Julia will give me the time of day.'
+		end
+		*nl
+		*nl
+		'<center><h1>Natasha Belova</h1></center>'
+		*nl
 		!! This might need a note about debt required for most actions to be available, was not sure how to handle that part though.
 		if NatbelQW['QWstage'] >= 11:
 			'This is the end of Natasha''s quest line, for now.'
@@ -36,6 +98,99 @@ if $ARGS[0] = 'start':
 		else
 			'Natasha seems really smart, I should try to befriend her to help me with my grades. During school breaks seems like a good time to chat her up. It might take a lot of effort for her to trust me though.'
 		end
+		*nl
+		*nl
+		'<center><h1>Volleyball</h1></center>'
+		*nl
+		if trener_Speak = 8 and volleysostav > 0:
+			'Coach Mikhail has finally made me a starter on the Volleyball Team.'
+		elseif trener_Speak = 7 and volleysostav > 0:
+			if pcs_vball > 70:
+				'I am pretty sure I have pushed every button and jumped through every hoop I can with the coach. It''s time to request that starter spot again.'
+			else
+				'I have done everything I can do to twist Mikhail around my finger. Now I just need to keep practicing my volleyball skills to be worthy of a starter position.'
+			end
+		elseif trener_Speak = 6 and volleysostav > 0:
+			if trenerSex >= 1:
+				'It''s time to start pushing for a spot as a starter. I should be careful about pushing too hard though, or I could ruin my chances, and worse.'
+			else
+				'I need to at least give the coach a blowjob to finish my seduction scheme.'
+			end
+		elseif trener_Speak = 5 and volleysostav > 0:
+			if ShowerIvan = 6:
+				'I should talk to the coach.'
+			elseif ShowerIvan = 5:
+				if ricewine = 1:
+					'I should deliver the rice wine to Guang next Sunday morning, before noon.'
+				else
+					'I need to find some rice wine. The Pavlovsk train station market would be a good place to look.'
+				end
+			else
+				'I need to check out the city gym on Sunday morning, before noon. Maybe I can learn something about Coach Mikhail there.'
+			end
+		elseif trener_Speak = 4 and volleysostav > 0:
+			if VoltrenerVoyeur >= 3:
+				if npc_rel['A3'] >= 80:
+					if kotovVSprohorov = 2:
+						if IvanShowerQW = 11:
+							if IvanShowerYes = 1:
+								if VoltrenerVoyeur = 6:
+								   'I should talk to the coach.'
+								elseif VoltrenerVoyeur = 5:
+									'I should shower with Ivan again'
+								elseif VoltrenerVoyeur = 4:
+									'I should shower with Ivan again'
+								else
+									'I should shower with Ivan again'
+								end
+							else
+								'I should chat with Ivan at school again.'
+							end
+						elseif IvanShowerQW = 1:
+							'I should talk to Ivan about what happened in the sports center the next time I am at school.'
+						else
+							'I need to not chicken out the next time Ivan tries to join my in the sports center shower.'
+						end
+					elseif kotovVSprohorov = 1:
+						'I should take a shower at the sports center. If the rumors I heard about Ivan are true, he should try to join me.'
+					else
+						'I want to use Ivan to make the coach jealous, somehow. I should start by chatting with him in the sports section when he is just showing up, usually around 17:00.'
+					end
+				else
+					'I need something to make the coach jealous of me. Ivan spends a lot of time at the sports center, maybe I can use him to my advantage. I should put some effort into getting to know him better.'
+				end
+			elseif VoltrenerVoyeur = 2:
+				if trenerlust >= 40:
+					'I should talk to the coach about him spying on me in the sports center showers.'
+				else
+					'I need to keep trying to tease the coach.'
+				end
+			elseif VoltrenerVoyeur = 1:
+				if trenerlust >= 40:
+					'I should take a shower again at the sports center. Maybe this time he wont run away so fast.'
+				else
+					'I need to keep trying to tease the coach.'
+				end
+			else
+				if trenerlust >= 40:
+					'I should take a shower at the sports center. I have driven the coach so crazy with lust, he is bound to come for me eventually.'
+				else
+					'I need to keep trying to tease the coach.'
+				end
+			end
+		elseif trener_Speak = 3 and volleysostav > 0:
+			'As much as I did not enjoy the lecture about volleyball the last time I spoke with the coach, if I keep asking about it, maybe he will volunteer some information on his own about his past on the European Team. If all else fails, maybe I can straight seduce him.'
+		elseif trener_Speak = 2 and volleysostav > 0:
+			'Lets see what other information I can get out of the Coach. Surely there is something I can use to manipulate him. I should try just asking about volleyball in general.'
+		elseif trener_Speak = 1 and volleysostav > 0:
+			'Apparently the memories of the Coach''s time on the European team are painful, something bad must have happened. I should remember that for later, for now, lets see what I can get out of him about his personal life.'
+		elseif trener_Speak = 0 and volleysostav > 0:
+			'I should talk to Mikhail. The only way I am ever going to be a starter for the team is if I manage to wrap him around my finger. Maybe I should ask him about the rumors of him playing for the European championship winning team in the past.'
+		elseif volleysostav < 0:
+			'I got kicked off the Volleyball Team, pretty sure there is nothing I can say or do to get back on the team.'
+		else
+			'If I want to join the Volleyball Team, I need to practice my skills at the community center, then talk to the coach about joining.'
+		end
 	end
 end
 

+ 2 - 4
locations/katjaEvDin.qsrc

@@ -94,13 +94,11 @@ if $ARGS[0] = 'strapon_miss':
 	gs 'arousal', 'vaginal_strap_give', 5, 'lesbian', 'dom'
 	gs 'stat'
 
-!! check to see if Katyas hymen is broken and how much is left of it
-	gs 'npcbreeder', 'insert'
-!! This variable is set if her hymen is broken at this time
-	if npcbrokehymen = 1:
+	if npc_vag['A14'] <= 1:
 		'Katja groans and bites her lip in pain as the strap-on enters her. You notice visible blood on the strap-on, you just popped Katja''s cherry.'
 		KatjaSlut-=10
 		katjahorny=0
+		npc_vag['A14'] += 3
 	elseif dick1 > npc_vag['A14'] + 5:
 		KatjaSlut-=1
 		katjahorny-=10

+ 21 - 1
locations/lact_bp.qsrc

@@ -56,6 +56,26 @@
 !!	umbc_i
 !!	usbc_i
 !!	vmb_i
+!!	bpID_arr['index'] : breast pump id. Starts at 0, with every purchased breast pump the id will be added
+!!	bpType_arr['index'] : breast pump type. 0 = 'manual_single', 1 = 'electric_single', 2 ='electric_dual'
+!!	bpLocID_arr['index'] : 0 = lost, 1 = in svetas hand... same as bottle locations
+!!	bpbID1_arr['index'] : index of milk bottle array.
+!!	bpbID2_arr['index'] : only used for dual pump, index for milk bottle array. cannot be the same like breastpump_arr['bottle_id_1'].
+
+!!	when ever sveta buys a new breastpump, it has to be added to the breast pump array.
+if $ARGS[0] = 'build_bp':
+	!!	ARGS[1] = type
+	!!	ARGS[2] = location_id
+	!!	usage func('lact_bp', 'build_bp', 'breast pump type', 'location id')
+	!!	returns the new bottle ID
+	bp_i = arrsize('bpID_arr')
+	bpID_arr[bp_i] = bp_i
+	bpType_arr[bp_i] = ARGS[1]
+	bpLocID_arr[bp_i] = ARGS[2]
+	bpbID1_arr[bp_i] = ''
+	bpbID2_arr[bp_i] = ''
+	result = bp_i
+end
 
 !!	view milk bottles function
 if $ARGS[0] = 'view_milk_bottles':
@@ -292,7 +312,7 @@ if $ARGS[0] = 'useable_mbottle_count':
 end
 
 !!	bp_milking - breast pump milking
-!!	use href="exec:gt ''lact_bp'',''bp_milking''"
+!!	use href="exec:gt ''lact_bp'',''bp_milking''" or gt 'lact_bp','bp_milking'
 
 if $ARGS[0] = 'bp_milking':
 	pumptime = 0

+ 1 - 1
locations/lariska_schedule.qsrc

@@ -103,7 +103,7 @@ if SchoolAtestat = 0 or natholi = 0:
 			lariloc = 22
 			lariloc['athome'] = 1
 		elseif hour = 17 and minut > 45:
-			if LariskaProfi = 1:
+			if LariskaQW['volleyball'] = 1:
 				!!!!NotHome - Community Center - Volleyball Game
 				lariloc = 21
 				lariloc['athome'] = 0

+ 78 - 0
locations/lariska_storyline.qsrc

@@ -0,0 +1,78 @@
+# lariska_storyline
+
+
+if $ARGS[0] = 'story_intro':
+	menu_off = 1
+	lariska_ball = daystart
+	LariskaQW['story'] = 1
+	cla & *clr
+	'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
+	'You carefully walk up behind her, trying your best not to distract her as she effortlessly smacks the ball into the wall and having it return to her hands over and over again...'
+	+$OpenInnerThought+'"What is she doing hanging around here,"'+$CloseInnerThought+' you wonder.'
+	'You stand there, observing her, trying to figure out why here of all places she would do this, instead of at a safer place like the Community Center, where she wouldn''t have to worry about being messed with by the local gopniks. You know she doesn''t live nearby either, which just feeds your curiosity.'
+	'She catches the ball and stops, looking around as if trying to find someone. Noticing someone is behind her, she quickly spins around, but when she realizes it''s you, her face goes bright red and she literally staggers backwards in suprise.'
+	+$OpenInnerThought+'"I think she was looking for me,"'+$CloseInnerThought+' you say to yourself.'
+	'"Hi, <<$pcs_nickname>>," she says, sounding nervous. "I was just practicing my control. Impressed?"'
+	minut += 10
+	gs 'stat'
+	act 'Yes!':
+		cla & *clr
+		minut += 10
+		npc_rel['A13'] += 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
+		'You nod your head, "Yeah, you''re amazing, Lariska. I didn''t know you were such a good volleyball player!'
+		'Lariska, breaks out in a huge smile and she says "Thanks, <<$pcs_nickname>>. I really got into the zone this time, usually I don''t do this good."'
+		'"No need to be humble, it was really amazing, trust me. I''ll let you go back to it, I don''t want to bother you." you say with a smile.'
+		'Smiling back, Lariska turns uncertainly back towards the wall and hits the ball again, only this time she misses it and it smacks her hard in the face.'
+		minut += 10
+		npc_rel['A13'] += 1
+		gs 'stat'
+		act 'Pretend not to see that':
+			npc_rel['A13'] += 1
+			gs 'stat'
+			gt 'pav_complex', 'start'
+		end
+		act 'Make sure she is OK':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
+			'You rush over to her and take her face in your hands, looking at the spot where the ball smacked her in the face. She tries to tell you she is fine, even though the spot is even more red than her blushing face.'
+			'Suprisingly she stops protesting pretty quickly, and you catch her staring at your lips, which are now only a few centimeters from her own.'
+			+$OpenInnerThought+'"Does she have a crush on me? Is that why she''s hanging around here, maybe looking for me? Should I try to kiss her and find out?"'+$CloseInnerThought
+			'This might be a dangerous thing to do, Christina controls Lariska, and she may not like you messing with her. Kissing her would pretty much be declaring war on Christina, if she ever found out.' 
+			minut += 5
+			npc_rel['A13'] += 2
+			gs 'stat'
+			act 'Let her go':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
+				'Letting go of her face and stepping back seems to bring her to her senses. Stammering something about needing to go, she grabs the ball and runs off, leaving you wondering if you should have kissed her.'
+				act 'Continue':gt 'pav_complex', 'start'
+			end
+			act 'Kiss her':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
+				'You slide one hand to the back of her head, cup her chin with the other, and lean in. As soon as your lips touch hers she panics, looks around like a deer caught in headlights, and bolts away looking terrified.'
+				'Chuckling to yourself, you pick up the forgotten volleyball and take it with you. Returning it could be a good excuse to talk to her at school.'
+				LariskaQW['story'] = 2
+				act 'Continue':gt 'pav_complex', 'start'
+			end
+		end
+	end
+	act 'Play it off':
+		cla & *clr
+		minut += 10
+		npc_rel['A13'] -= 2
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big13.jpg"></center>'
+		'Wanting to play it off nonchalantly, you shake your head, chuckle, and tell her you''ve seen others pull off even more impressive moves.'
+		'Lariska tries to smile it off, but deep down you know that rattled her fragile ego, making her lash out with "Like you could do it better!"'
+		'"Why would I need to prove myself over such a silly little thing," you say, laughing derisively'
+		'By now you can clearly see that you''ve gotten under her skin. "Go away, <<$pcs_nickname>>... Or else I''ll make you regret it..."'
+		'Knowing she''s close to Christina you take the hint, shrug, and start walking away. Behind you the bouncing sounds start again, louder than before...'
+		act 'Walk away': gt 'pav_complex', 'start'
+	end
+end
+
+--- lariska_storyline ---------------------------------
+

+ 2 - 4
locations/lug.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/park/lug.jpg" ></center>'
-	'It''s a small but well maintained meadow with evergreen grass, perfect for laying down to rest, have a picnic or just sunbathe. Mothers with small children regularly visit this place.'
+	'It''s a small but well maintained meadow with evergreen grass, perfect for laying down to rest, have a picnic or just sunbathe. Mothers with small children regularly visit this place. Despite that, if you feel like exposing yourself here, there would be less people to see it, making it easier to find the bravery to do so.'
 
 	streetrand = RAND(0,100)
 	if streetrand >= 60 and pcs_lover < 3:
@@ -47,7 +47,6 @@ if $ARGS[0] = 'start':
 		act 'Flash your tits':
 			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
 			cls
-			gs 'exhibitionism', 1
 			inhib_exp += rand(1,3)
 			gs 'flash', 'tits', 'outdoors', 5
 			gs 'stat'
@@ -60,7 +59,6 @@ if $ARGS[0] = 'start':
 		act 'Flash your pussy':
 			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
 			cls
-			gs 'exhibitionism', 3
 			gs 'flash', 'pussy', 'outdoors', 5
 			gs 'stat'
 
@@ -150,7 +148,7 @@ if $ARGS[0] = 'prut2':
 				pcs_sweat = 10 + rand(0,4)
 				pcs_mood += 5
 				if pcs_stren < 30: stren_exp += 1
-				gs 'exhibitionism', 3
+				gs 'arousal', 'flash', 10, 'exhibitionism'
 				gs 'clothing', 'strip'
 				gs 'underwear', 'remove'
 				if pcs_horny >= 80 and pcs_inhib >= 60:

+ 3 - 3
locations/metro.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 		'<center><b><font color="maroon">City Industrial Region</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platindust.jpg"></center>'
 !!new locations for the metro, you will have to see how the code works and for now the island will be commented out until we add that area of the city
-	elseif $loc = 'psiklin':
+	elseif $loc = 'city_suburbs':
 		'<center><b><font color="maroon">City Suburbs</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platsuburb.jpg"></center>'
 	elseif $loc = 'city_island': 
@@ -71,9 +71,9 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if $loc ! 'psiklin':
+		if $loc ! 'city_suburbs':
 			act 'Go to the <b>City Suburbs</b> (16 <b>₽</b>)':
-				$loc = 'psiklin'
+				$loc = 'city_suburbs'
 				$loc_arg = 'start'
 				money -= 16
 				minut += 10

+ 5 - 11
locations/moncheri.qsrc

@@ -126,19 +126,13 @@ if $ARGS[0] = 'shoes':
 
 	act 'Return': minut += 1 & gt 'moncheri', 'start'
 
-	if Clothingstock > 11:
-		i = 1
-	else
-		i = 2
-	end
-
-	:loopboutique_shoes
-		if sboutique[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''boutique_shoes''"><img src="images/pc/shoes/boutique/<<i>>.jpg" height="250" /></a>'
-		i += 2
-	if i <= 37:jump 'loopboutique_shoes'
+	:loopmoncheri_shoes
+		if smoncheri[i] = 0:*p '<a href="exec: i = <<i>> & gt ''moncheri'', ''moncheri_shoes''"><img src="images/pc/items/moncheri/shoes/<<i>>.jpg" height="250" /></a>'
+		i += 1
+	if i <= 40:jump 'loopmoncheri_shoes'
 end
 
-if $ARGS[0] = 'boutique_shoes':	gt 'shoes', 'view_shoe_item', 'shop', 'boutique',i, 5000
+if $ARGS[0] = 'moncheri_shoes':	gt 'shoes', 'view_shoe_item', 'shop', 'moncheri',i, 5000
 
 if $ARGS[0] = 'purses':
 	$loc_arg = 'purses'

+ 12 - 3
locations/music_delparco.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'talkwithzariyah':
 		'She puts down the phone "<<$pcs_nickname>>, so glad that you came. How are you? Did you think about the offer?" she smiles at you as you sit down.'
 		act 'Accept the offer to play at Del Parco': gt 'music_delparco', 'delparco_accept'
 	!!	act 'Decline the offer': gt 'mod_musiclife_delparco', 'delparco_decline'
-	elseif ml_delparcoQW = 1:
+	elseif ml_delparcoQW = 2:
 		'She puts down the phone "<<$pcs_nickname>>, so glad that you came. How are you? Did you come to talk about the offer?" she smiles at you as you sit down.'
 		act 'Discuss the live music with': gt 'music_delparco', 'firstdiscussion'
 	end
@@ -19,6 +19,8 @@ if $ARGS[0] = 'delparco_accept':
 	ml_delparcoQW = 2
 !!	TODO: Better scene.	
 	'You accept.'
+	*nl
+	'(Warning - the event is unfinished, so there is lack of pictures and the text is simplified)'
     act 'Discuss the live music with': gt 'music_delparco', 'firstdiscussion'
 	act 'Leave': gt 'cafe_parco', 'start'
 end
@@ -39,6 +41,7 @@ if $ARGS[0] = 'firstdiscussion':
 	'You think for a moment. 800 rubles is way more than you can get anywhere else in Pavlovsk. On the other hand, 30 minutes is quite a few songs, and you will have to practice a lot in the beginning to do it.'
 	*nl
 	act 'Accept the offer':
+		*clr & cla
 		ml_deparcoQW = 4
 		'"I would love to do it!" you almost bite your tongue as you stop, but the fact that someone asks you to play is a first step to your dream. You almost couldn''t contain yourself.'
 		'"Excellent!" Zariyah smiles at you, and pushes the paper she was writing on towards you "Everything is there. Don''t forget, two weeks from now, Friday at 8pm, so please be here latest half past seven.
@@ -53,6 +56,7 @@ if $ARGS[0] = 'firstdiscussion':
 	end
 	
 	act 'Ask for some time':
+		*clr & cla
 		ml_delparcoQW = 3
 		ml_delparcogigdeadline = daystart + 2
 		ml_delparcooriginaldate = daystart
@@ -94,7 +98,7 @@ if $ARGS[0] = 'eveningshow':
 	ml_performance['performed_minutes'] += 30
 	ml_performance['total_time_performed'] += 30
 
-	if perform_lvl < 45 = rand(1,3):
+!!	if perform_lvl < 45 = rand(1,3):
 		'<center><video autoplay loop src="images/pc/activities/music/GigPlaceHolder.mp4"></video></center>'
 	!!TODO: More scene, on set up, arriving, etc.	
 		if ml_success < ml_performance['set_quality']: 
@@ -119,7 +123,12 @@ if $ARGS[0] = 'eveningshow':
 			'Today definitely wasn''t your day. You bombed, there is no better word for it. While you lasted your 30 minutes, you could see on the audience that they didn''t really enjoy it, even though they politely clapped at the end.'
 			'You will have to do some serious practicing if you want to have another chance to perform.'
 		end
-	end
+!!	end
+	*nl
+	'(The event is unfinished - do not comply about quality - report just serious bugs)'
+	
+	
+	act 'Leave': gt 'cafe_parco', 'start'	
 end
 	
 --- music_delparco ---------------------------------

+ 1 - 8
locations/nogorslut.qsrc

@@ -122,14 +122,7 @@ if pav_slut < 250:
 			''
 		elseif numnpc = 18:
 			!!Christina Zvereva
-			if kristinaSex = 0 and swinbeggor = 0 and kristinaSex = 0:
-				''
-			elseif kristinaSex = 0 and swinbeggor > 0 and kristinaSex = 0:
-				npc_rel['A<<numnpc>>'] = 20
-				'Christina looks at you full of hate: "I can''t believe you were faster than me... bitch!"'
-			elseif kristinaSex > 0:
-				''
-			end
+			''
 		elseif numnpc = 19:
 			!!Avelina ''Lina'' Starov
 			''

+ 8 - 82
locations/npccleanc.qsrc

@@ -11,70 +11,33 @@ if mid($tempcclean, 1, 1) = 'C' and npc_firstname['$tempcclean'] > 0:
     $tmpStrArr[] = 'npc_lastname'
     $tmpStrArr[] = 'npc_usedname'
     $tmpStrArr[] = 'npc_notes'
-    $tmpStrArr[] = 'npc_firstpart'
-    $tmpStrArr[] = 'npc_lastpart'
-    $tmpStrArr[] = 'npc_kidpater'
     $tmpStrArr[] = 'npc_thdick'
-    $tmpStrArr[] = 'npc_dad'
-    $tmpStrArr[] = 'npc_mom'
     $tmpStrArr[] = 'npc_pic'
     $tmpStrArr[] = 'npc_PersType'
     $tmpStrArr[] = 'npc_dna'
+    $tmpStrArr[] = 'npc_occupation'
     ! {array for ints}
     $tmpIntArr[0] = 'npc_dob'
-    $tmpIntArr[] = 'npc_vital'
-    $tmpIntArr[] = 'npc_stren'
     $tmpIntArr[] = 'npc_intel'
-    $tmpIntArr[] = 'npc_agil'
-    $tmpIntArr[] = 'npc_sprt'
-    $tmpIntArr[] = 'npc_magik'
     $tmpIntArr[] = 'npc_drunk'
-    $tmpIntArr[] = 'npc_pantys'
-    $tmpIntArr[] = 'npc_cyc'
-    $tmpIntArr[] = 'npc_fert'
     $tmpIntArr[] = 'npc_gender'
     $tmpIntArr[] = 'npc_dick'
     $tmpIntArr[] = 'npc_sexskill'
     $tmpIntArr[] = 'npc_spermpot'
-    $tmpIntArr[] = 'npc_vag'
-    $tmpIntArr[] = 'npc_ass'
-    $tmpIntArr[] = 'npc_hymen'
     $tmpIntArr[] = 'npc_horny'
-    $tmpIntArr[] = 'npc_Pavrep'
-    $tmpIntArr[] = 'npc_Godrep'
     $tmpIntArr[] = 'npc_apprnc'
-    $tmpIntArr[] = 'npc_lipbalm'
-    $tmpIntArr[] = 'npc_makeup'
-    $tmpIntArr[] = 'npc_sweat'
-    $tmpIntArr[] = 'npc_dye'
-    $tmpIntArr[] = 'npc_hairbsh'
-    $tmpIntArr[] = 'npc_skin'
-    $tmpIntArr[] = 'npc_bodyhair'
-    $tmpIntArr[] = 'npc_breath'
-    $tmpIntArr[] = 'npc_hipcurv'
-    $tmpIntArr[] = 'npc_hgt'
+    $tmpIntArr[] = 'npc_height'
     $tmpIntArr[] = 'npc_bust'
-    $tmpIntArr[] = 'npc_nips'
-    $tmpIntArr[] = 'npc_fat'
     $tmpIntArr[] = 'npc_haircol'
-    $tmpIntArr[] = 'npc_tan'
-    $tmpIntArr[] = 'npc_lip'
-    $tmpIntArr[] = 'npc_lashes'
-    $tmpIntArr[] = 'npc_eyesize'
-    $tmpIntArr[] = 'npc_eyecol'
-    $tmpIntArr[] = 'npc_dom'
-    $tmpIntArr[] = 'npc_sub'
     $tmpIntArr[] = 'npc_QW'
     $tmpIntArr[] = 'npc_rel'
     $tmpIntArr[] = 'npc_love'
-    $tmpIntArr[] = 'npc_job'
-    $tmpIntArr[] = 'npc_cloc'
+    $tmpIntArr[] = 'npc_outfit'
     $tmpIntArr[] = 'npc_herpes'
     $tmpIntArr[] = 'npc_syth'
     $tmpIntArr[] = 'npc_gon'
     $tmpIntArr[] = 'npc_thrush'
-    $tmpIntArr[] = 'npc_chem'
-    $tmpIntArr[] = 'npc_clothpref'
+    $tmpIntArr[] = 'npc_style'
 
     ! {loop through the arrays to kill entries}
     tmpArrIndex = 0
@@ -111,66 +74,29 @@ else
 	$npc_usedname[$tempcclean] = ''
 	$npc_notes[$tempcclean] = ''
 	npc_dob[$tempcclean] = 0
-	npc_vital[$tempcclean] = 0
-	npc_stren[$tempcclean] = 0
 	npc_intel[$tempcclean] = 0
-	npc_agil[$tempcclean] = 0
-	npc_sprt[$tempcclean] = 0
-	npc_magik[$tempcclean] = 0
 	npc_drunk[$tempcclean] = 0
-	npc_pantys[$tempcclean] = 0
-	npc_cyc[$tempcclean] = 0
-	npc_fert[$tempcclean] = 0
-	$npc_firstpart[$tempcclean] = ''
-	$npc_lastpart[$tempcclean] = ''
-	$npc_kidpater[$tempcclean] = ''
 	npc_gender[$tempcclean] = 0
 	$npc_thdick[$tempcclean] = ''
 	npc_dick[$tempcclean] = 0
 	npc_sexskill[$tempcclean] = 0
 	npc_spermpot[$tempcclean] = 0
-	npc_vag[$tempcclean] = 0
-	npc_ass[$tempcclean] = 0
-	npc_hymen[$tempcclean] = 0
 	npc_horny[$tempcclean] = 0
-	npc_Pavrep[$tempcclean] = 0
-	npc_Godrep[$tempcclean] = 0
 	npc_apprnc[$tempcclean] = 0
-	npc_lipbalm[$tempcclean] = 0
-	npc_makeup[$tempcclean] = 0
-	npc_sweat[$tempcclean] = 0
-	npc_dye[$tempcclean] = 0
-	npc_hairbsh[$tempcclean] = 0
-	npc_skin[$tempcclean] = 0
-	npc_bodyhair[$tempcclean] = 0
-	npc_breath[$tempcclean] = 0
-	npc_hipcurv[$tempcclean] = 0
-	npc_hgt[$tempcclean] = 0
+	npc_height[$tempcclean] = 0
 	npc_bust[$tempcclean] = 0
-	npc_nips[$tempcclean] = 0
-	npc_fat[$tempcclean] = 0
 	npc_haircol[$tempcclean] = 0
-	npc_tan[$tempcclean] = 0
-	npc_lip[$tempcclean] = 0
-	npc_lashes[$tempcclean] = 0
-	npc_eyesize[$tempcclean] = 0
-	npc_eyecol[$tempcclean] = 0
-	npc_dom[$tempcclean] = 0
-	npc_sub[$tempcclean] = 0
 	npc_QW[$tempcclean] = 0
 	npc_rel[$tempcclean] = 0
 	npc_love[$tempcclean] = 0
-	npc_job[$tempcclean] = 0
-	npc_cloc[$tempcclean] = 0
-	$npc_dad[$tempcclean] = ''
-	$npc_mom[$tempcclean] = ''
+	$npc_occupation[$tempcclean] = ''
+	npc_outfit[$tempcclean] = 0
 	$npc_pic[$tempcclean] = ''
 	npc_herpes[$tempcclean] = 0
 	npc_syth[$tempcclean] = 0
 	npc_gon[$tempcclean] = 0
 	npc_thrush[$tempcclean] = 0
-	npc_chem[$tempcclean] = 0
-	npc_clothpref[$tempcclean] = 0
+	npc_style[$tempcclean] = 0
 	$npc_PersType[$tempcclean] = ''
 	$npc_dna[$tempcclean] = ''    
 end

+ 9 - 115
locations/npcgeneratec.qsrc

@@ -61,20 +61,10 @@ else
 	npctempc2[1] = rand(19,24)
 end
 ! {We flag virginity based on the results of the check. Overwrite it after generation if you want to be sure of status.}
-if npctempc2[1] >= 20:
-	$npc_firstpart[$npclastgenerated] = 'U'
-	$npc_lastpart[$npclastgenerated] = 'U'
-	$npc_kidpater[$npclastgenerated] = 'N'
-else
-	$npc_firstpart[$npclastgenerated] = 'V'
-	$npc_lastpart[$npclastgenerated] = 'V'
-	$npc_kidpater[$npclastgenerated] = 'N'
+if npctempc2[1] < 20:
 	npc_sexskill[$npclastgenerated] = 0
 end
 ! {index}
-npc_firstpart[$npclastgenerated] = npclastgeneratedn
-npc_lastpart[$npclastgenerated] = npclastgeneratedn
-npc_kidpater[$npclastgenerated] = npclastgeneratedn
 $npc_sexskill[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 
@@ -84,86 +74,50 @@ if npctempgsex = 0:
 	gs 'npcrnamefile', 'rusMale'
 	gs 'npcgenext', 'dick'
 	npc_gender[$npclastgenerated] = 0
-	npc_cyc[$npclastgenerated] = -1
-	npc_fert[$npclastgenerated] = -1
 	npc_spermpot[$npclastgenerated] = 10000
 	$npc_thdick[$npclastgenerated] = $npctempgn[4]
 	npc_dick[$npclastgenerated] = npctempgn[5]
 	$npc_notes[$npclastgenerated] = 'A male.'
 	npc_bust[$npclastgenerated] = 0
-	npc_nips[$npclastgenerated] = 1
-	if npctempc2[1] >= 20:
-		npc_hymen[$npclastgenerated] = -1
-	end
 elseif npctempgsex = 1:
 	! {Female}
 	gs 'npcrnamefile', 'rusFemale'
 	npc_gender[$npclastgenerated] = 1
-	npc_cyc[$npclastgenerated] = rand(0,29)
-	npc_fert[$npclastgenerated] = 1
 	npc_spermpot[$npclastgenerated] = -1
 	$npc_thdick[$npclastgenerated] = 'clitoris'
 	npc_dick[$npclastgenerated] = rand(0,1)
 	$npc_notes[$npclastgenerated] = 'A female.'
 	!!0 - 60  curve around 22,5 (C/D cups)
 	npc_bust[$npclastgenerated] = rand(0,15) + rand(0,15) + rand(0,15) & if rand(1,10) = 1: npc_bust[$npclastgenerated] += rand(0,15)
-	npc_nips[$npclastgenerated] = rand(2,6)
-	if npctempc2[1] >= 20:
-		npc_hymen[$npclastgenerated] = rand(4,6)
-	else
-		npc_hymen[$npclastgenerated] = 0
-	end
 elseif npctempgsex = 2:
 	! {HermFemale}
 	gs 'npcrnamefile', 'rusFemale'
 	gs 'npcgenext', 'dick'
 	npc_gender[$npclastgenerated] = 1
-	npc_cyc[$npclastgenerated] = rand(0,29)
-	npc_fert[$npclastgenerated] = 1
 	npc_spermpot[$npclastgenerated] = -1
 	$npc_thdick[$npclastgenerated] = 'clitoris'
 	npc_dick[$npclastgenerated] = npctempgn[5]
 	$npc_notes[$npclastgenerated] = 'A female Hermaphrodite.'
 	!!0 - 60  curve around 22,5 (C/D cups)
 	npc_bust[$npclastgenerated] = rand(0,15) + rand(0,15) + rand(0,15)
-	npc_nips[$npclastgenerated] = rand(1,5)
-	if npctempc2[1] >= 20:
-		npc_hymen[$npclastgenerated] = rand(0,6)
-		if npc_hymen[$npclastgenerated] < 4 and npc_hymen[$npclastgenerated] > 0: npc_hymen[$npclastgenerated] = 4
-	else
-		npc_hymen[$npclastgenerated] = 0
-	end
 else
 	! {HermMale}
 	gs 'npcrnamefile', 'rusMale'
 	gs 'npcgenext', 'dick'
 	npc_gender[$npclastgenerated] = 0
-	npc_cyc[$npclastgenerated] = -1
-	npc_fert[$npclastgenerated] = -1
 	npc_spermpot[$npclastgenerated] = 10000
 	$npc_thdick[$npclastgenerated] = $npctempgn[4]
 	npc_dick[$npclastgenerated] = npctempgn[5]
 	$npc_notes[$npclastgenerated] = 'A male Hermaphrodite.'
 	npc_bust[$npclastgenerated]= rand(0,10)
-	npc_nips[$npclastgenerated] = rand(1,3)
-	if npctempc2[1] >= 20:
-		npc_hymen[$npclastgenerated] = rand(0,6)
-		if npc_hymen[$npclastgenerated] < 4 and npc_hymen[$npclastgenerated] > 0: npc_hymen[$npclastgenerated] = 4
-	else
-		npc_hymen[$npclastgenerated] = 0
-	end
 end
 ! {index}
 $npc_gender[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_cyc[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_fert[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_spermpot[$npclastgenerated] = '<<npclastgeneratedn>>'
 npc_thdick[$npclastgenerated] = npclastgeneratedn
 $npc_dick[$npclastgenerated] = '<<npclastgeneratedn>>'
 npc_notes[$npclastgenerated] = npclastgeneratedn
 $npc_bust[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_nips[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_hymen[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 
 ! {Then we set the names, and the stat high ends as determined earlier.}
@@ -172,92 +126,38 @@ $npc_firstname[$npclastgenerated] = $npctempgn[1]
 $npc_nickname[$npclastgenerated] = $npctempgn[2]
 $npc_lastname[$npclastgenerated] = $npctempgn[3]
 $npc_usedname[$npclastgenerated] = $npctempgn[0]
-npc_vital[$npclastgenerated] = rand(1,npctempc2)
-npc_stren[$npclastgenerated] = rand(1,npctempc2)
 npc_intel[$npclastgenerated] = rand(1,npctempc2)
-npc_agil[$npclastgenerated] = rand(1,npctempc2)
-npc_sprt[$npclastgenerated] = rand(1,npctempc2)
 ! {index}
 npc_firstname[$npclastgenerated] = npclastgeneratedn
 npc_nickname[$npclastgenerated] = npclastgeneratedn
 npc_lastname[$npclastgenerated] = npclastgeneratedn
 npc_usedname[$npclastgenerated] = npclastgeneratedn
-$npc_vital[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_stren[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_intel[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_agil[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_sprt[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Then we call out other stats}
-npc_magik[$npclastgenerated] = 0
 npc_drunk[$npclastgenerated] = 0
-npc_pantys[$npclastgenerated] = 0
-npc_vag[$npclastgenerated] = 0
-npc_ass[$npclastgenerated] = 0
 ! {index}
-$npc_magik[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_drunk[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_pantys[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_vag[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_ass[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {NPCs start with random horniness}
 npc_horny[$npclastgenerated] = rand(0,60)
-npc_Pavrep[$npclastgenerated] = 0
-npc_Godrep[$npclastgenerated] = 0
 ! {index}
 $npc_horny[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_Pavrep[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_Godrep[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Random attractiveness}
 npc_apprnc[$npclastgenerated] = rand(30,60)
-npc_lipbalm[$npclastgenerated] = 0
-npc_makeup[$npclastgenerated] = 0
-npc_sweat[$npclastgenerated] = 0
-npc_dye[$npclastgenerated] = 0
-npc_hairbsh[$npclastgenerated] = 0
 ! {index}
 $npc_apprnc[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_lipbalm[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_makeup[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_sweat[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_dye[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_hairbsh[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Random skin quality and body hair}
-npc_skin[$npclastgenerated] = rand(30,70)
-npc_bodyhair[$npclastgenerated] = rand(0,4)
-npc_breath[$npclastgenerated] = 0
-npc_hipcurv[$npclastgenerated]  = 0
-npc_hgt[$npclastgenerated] = 0
-npc_fat[$npclastgenerated] = 0
+npc_height[$npclastgenerated] = 0
 ! {index}
-$npc_skin[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_bodyhair[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_breath[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_hipcurv[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_hgt[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_fat[$npclastgenerated] = '<<npclastgeneratedn>>'
+$npc_height[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Random pubic hair}
 npc_haircol[$npclastgenerated] = 0
-npc_tan[$npclastgenerated] = 0
-npc_lip[$npclastgenerated] = 0
-npc_lashes[$npclastgenerated] = 0
-npc_eyesize[$npclastgenerated] = 0
-npc_eyecol[$npclastgenerated] = 0
-npc_dom[$npclastgenerated] = 0
-npc_sub[$npclastgenerated] = 0
 ! {index}
 $npc_haircol[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_tan[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_lip[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_lashes[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_eyesize[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_eyecol[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_dom[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_sub[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Starting at 0 quest state and love for the character, and slightly disliked.}
 npc_QW[$npclastgenerated]= 0
@@ -269,19 +169,15 @@ $npc_rel[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_love[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Start unemployed and unspecified location}
-npc_job[$npclastgenerated] = 0
-npc_cloc[$npclastgenerated] = 0
+npc_occupation[$npclastgenerated] = 0
+npc_outfit[$npclastgenerated] = 0
 ! {index}
-$npc_job[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_cloc[$npclastgenerated] = '<<npclastgeneratedn>>'
+$npc_occupation[$npclastgenerated] = '<<npclastgeneratedn>>'
+$npc_outfit[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Unspecified dad and <<$npc_nickname[''A29'']>>, and picture. We could have a stock group of pictures and have it pick based on certain attribute types, but...}
-$npc_dad[$npclastgenerated] = 'U'
-$npc_mom[$npclastgenerated] = 'U'
 $npc_pic[$npclastgenerated] = 'xPICx'
 ! {index}
-npc_dad[$npclastgenerated] = npclastgeneratedn
-npc_mom[$npclastgenerated] = npclastgeneratedn
 npc_pic[$npclastgenerated] = npclastgeneratedn
 
 ! {STDs are not randomly given here. For characters with a STD, you need to gs npcgenext rstd. It will be expecting an npclastgeneratedn variable.}
@@ -296,11 +192,9 @@ $npc_gon[$npclastgenerated] = '<<npclastgeneratedn>>'
 $npc_thrush[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Chemestry and clothing preference are unspecified}
-npc_Chem[$npclastgenerated] = 0
-npc_Clothpref[$npclastgenerated] = 0
+npc_style[$npclastgenerated] = 0
 ! {index}
-$npc_Chem[$npclastgenerated] = '<<npclastgeneratedn>>'
-$npc_Clothpref[$npclastgenerated] = '<<npclastgeneratedn>>'
+$npc_style[$npclastgenerated] = '<<npclastgeneratedn>>'
 
 ! {Personality is called up}
 gs 'npcgenext', 'pers'

+ 4 - 53
locations/npcpreservec.qsrc

@@ -27,62 +27,25 @@ if mid($npctemp,1,1) = 'C':
 	$npc_usedname[$npclastsaved] = $npc_usedname[$npctemp]
 	$npc_notes[$npclastsaved] = $npc_notes[$npctemp]
 	npc_dob[$npclastsaved] = npc_dob[$npctemp]
-	npc_vital[$npclastsaved] = npc_vital[$npctemp]
-	npc_stren[$npclastsaved] = npc_stren[$npctemp]
 	npc_intel[$npclastsaved] = npc_intel[$npctemp]
-	npc_agil[$npclastsaved] = npc_agil[$npctemp]
-	npc_sprt[$npclastsaved] = npc_sprt[$npctemp]
-	npc_magik[$npclastsaved] = npc_magik[$npctemp]
 	npc_drunk[$npclastsaved] = npc_drunk[$npctemp]
-	npc_pantys[$npclastsaved] = npc_pantys[$npctemp]
-	npc_cyc[$npclastsaved] = npc_cyc[$npctemp]
-	npc_fert[$npclastsaved] = npc_fert[$npctemp]
-	$npc_firstpart[$npclastsaved] = $npc_firstpart[$npctemp]
-	$npc_lastpart[$npclastsaved] = $npc_lastpart[$npctemp]
-	$npc_kidpater[$npclastsaved] = $npc_kidpater[$npctemp]
 	npc_gender[$npclastsaved] = npc_gender[$npctemp]
 	$npc_thdick[$npclastsaved] = $npc_thdick[$npctemp]
 	npc_dick[$npclastsaved] = npc_dick[$npctemp]
 	npc_sexskill[$npclastsaved] = npc_sexskill[$npctemp]
 	npc_spermpot[$npclastsaved] = npc_spermpot[$npctemp]
-	npc_vag[$npclastsaved] = npc_vag[$npctemp]
-	npc_ass[$npclastsaved] = npc_ass[$npctemp]
-	npc_hymen[$npclastsaved] = npc_hymen[$npctemp]
 	npc_horny[$npclastsaved] = npc_horny[$npctemp]
-	npc_Pavrep[$npclastsaved] = npc_Pavrep[$npctemp]
-	npc_Godrep[$npclastsaved] = npc_Godrep[$npctemp]
 	npc_apprnc[$npclastsaved] = npc_apprnc[$npctemp]
-	npc_lipbalm[$npclastsaved] = npc_lipbalm[$npctemp]
-	npc_makeup[$npclastsaved] = npc_makeup[$npctemp]
-	npc_sweat[$npclastsaved] = npc_sweat[$npctemp]
-	npc_dye[$npclastsaved] = npc_dye[$npctemp]
-	npc_hairbsh[$npclastsaved] = npc_hairbsh[$npctemp]
-	npc_skin[$npclastsaved] = npc_skin[$npctemp]
-	npc_bodyhair[$npclastsaved] = npc_bodyhair[$npctemp]
-	npc_breath[$npclastsaved] = npc_breath[$npctemp]
-	npc_hipcurv[$npclastsaved] = npc_hipcurv[$npctemp]
-	npc_hgt[$npclastsaved] = npc_hgt[$npctemp]
+	npc_height[$npclastsaved] = npc_height[$npctemp]
 	npc_bust[$npclastsaved] = npc_bust[$npctemp]
-	npc_nips[$npclastsaved] = npc_nips[$npctemp]
-	npc_fat[$npclastsaved] = npc_fat[$npctemp]
 	npc_haircol[$npclastsaved] = npc_haircol[$npctemp]
-	npc_tan[$npclastsaved] = npc_tan[$npctemp]
-	npc_lip[$npclastsaved] = npc_lip[$npctemp]
-	npc_lashes[$npclastsaved] = npc_lashes[$npctemp]
-	npc_eyesize[$npclastsaved] = npc_eyesize[$npctemp]
-	npc_eyecol[$npclastsaved] = npc_eyecol[$npctemp]
-	npc_dom[$npclastsaved] = npc_dom[$npctemp]
-	npc_sub[$npclastsaved] = npc_sub[$npctemp]
 	npc_QW[$npclastsaved] = npc_QW[$npctemp]
 	npc_rel[$npclastsaved] = npc_rel[$npctemp]
 	npc_love[$npclastsaved] = npc_love[$npctemp]
-	npc_job[$npclastsaved] = npc_job[$npctemp]
-	npc_cloc[$npclastsaved] = npc_cloc[$npctemp]
-	$npc_dad[$npclastsaved] = $npc_dad[$npctemp]
-	$npc_mom[$npclastsaved] = $npc_mom[$npctemp]
+	$npc_occupation[$npclastsaved] = $npc_occupation[$npctemp]
+	npc_outfit[$npclastsaved] = npc_outfit[$npctemp]
 	$npc_pic[$npclastsaved] = $npc_pic[$npctemp]
-	npc_Chem[$npclastsaved] = npc_Chem[$npctemp]
-	npc_Clothpref[$npclastsaved] = npc_Clothpref[$npctemp]
+	npc_style[$npclastsaved] = npc_style[$npctemp]
 	$npc_PersType[$npclastsaved] = $npc_PersType[$npctemp]
 	$npc_dna[$npclastsaved] = $npc_dna[$npctemp]
 
@@ -109,18 +72,6 @@ if mid($npctemp,1,1) = 'C':
 	if $pcs_firstpart = $npctemp: $pcs_firstpart = $npclastsaved
 	if $pcs_lastpart = $npctemp: $pcs_lastpart = $npclastsaved
 	
-!!	:npctempaloop
-!!	$npctemp2 = arrpos('$npc_firstpart', $npctemp)
-!!	if $npc_firstpart[$npctemp2] = $npctemp: $npc_firstpart[$npctemp2] = $npclastsaved & jump 'npctempaloop'
-!!	$npctemp2 = arrpos('$npc_lastpart', $npctemp)
-!!	if $npc_lastpart[$npctemp2] = $npctemp: $npc_lastpart[$npctemp2] = $npclastsaved & jump 'npctempaloop'
-!!	$npctemp2 = arrpos('$npc_kidpater', $npctemp)
-!!	if $npc_kidpater[$npctemp2] = $npctemp: $npc_kidpater[$npctemp2] = $npclastsaved & jump 'npctempaloop'
-!!	$npctemp2 = arrpos('$npc_dad', $npctemp)
-!!	if $npc_dad[$npctemp2] = $npctemp: $npc_dad[$npctemp2] = $npclastsaved & jump 'npctempaloop'
-!!	$npctemp2 = arrpos('$npc_mom', $npctemp)
-!!	if $npc_mom[$npctemp2] = $npctemp: $npc_mom[$npctemp2] = $npclastsaved & jump 'npctempaloop'
-
 	! {This clears the Entry in Array C}
 	gs 'npccleanc', $npctemp
 end

+ 7 - 123
locations/npcstatic1.qsrc

@@ -12,62 +12,24 @@ $npc_notes['A<<npctemp>>'] = 'Dimka Nosov is a cute guy and all the girls adore
 !!set gender before calling npcstaticdefaults, override values you don''t like afterwards
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-npc_vital['A<<npctemp>>'] = rand(10,30)
-npc_stren['A<<npctemp>>'] = rand(10,30)
 npc_intel['A<<npctemp>>'] = rand(10,30)
-npc_agil['A<<npctemp>>'] = rand(10,30)
-npc_sprt['A<<npctemp>>'] = rand(10,30)
-npc_magik['A<<npctemp>>'] = 0
 npc_drunk['A<<npctemp>>'] = 0
-npc_pantys['A<<npctemp>>'] = 0
-npc_cyc['A<<npctemp>>'] = -1
-npc_fert['A<<npctemp>>'] = -1
-$npc_firstpart['A<<npctemp>>'] = 'U'
-$npc_lastpart['A<<npctemp>>'] = 'U'
-$npc_kidpater['A<<npctemp>>'] = 'N'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
 npc_dick['A<<npctemp>>'] = 16
 npc_sexskill['A<<npctemp>>'] = 1
 npc_spermpot['A<<npctemp>>'] = 10000
-npc_vag['A<<npctemp>>'] = -1
-npc_ass['A<<npctemp>>'] = 0
-npc_hymen['A<<npctemp>>'] = -1
 npc_horny['A<<npctemp>>'] = 0
-npc_Pavrep['A<<npctemp>>'] = 0
-npc_Godrep['A<<npctemp>>'] = 0
 npc_apprnc['A<<npctemp>>'] = 0
-npc_lipbalm['A<<npctemp>>'] = 0
-npc_makeup['A<<npctemp>>'] = 0
-npc_sweat['A<<npctemp>>'] = 0
-npc_dye['A<<npctemp>>'] = 0
-npc_hairbsh['A<<npctemp>>'] = 0
-npc_skin['A<<npctemp>>'] = 0
-npc_bodyhair['A<<npctemp>>'] = 0
-npc_breath['A<<npctemp>>'] = 0
-npc_hipcurv['A<<npctemp>>'] = 0
-npc_hgt['A<<npctemp>>'] = 0
+npc_height['A<<npctemp>>'] = 0
 npc_bust['A<<npctemp>>'] = 0
-npc_nips['A<<npctemp>>'] = 1
-npc_fat['A<<npctemp>>'] = 0
 npc_haircol['A<<npctemp>>'] = 0
-npc_tan['A<<npctemp>>'] = 0
-npc_lip['A<<npctemp>>'] = 0
-npc_lashes['A<<npctemp>>'] = 0
-npc_eyesize['A<<npctemp>>'] = 0
-npc_eyecol['A<<npctemp>>'] = 0
-!! create and use dom/sub in the npcs story, if needed, not in npcstatic
-npc_dom['A<<npctemp>>'] = 0
-npc_sub['A<<npctemp>>'] = 0
 npc_QW['A<<npctemp>>'] = 0
 npc_rel['A<<npctemp>>'] = 0
 npc_love['A<<npctemp>>'] = 0
-npc_job['A<<npctemp>>'] = 0
-npc_cloc['A<<npctemp>>'] = 0
-$npc_dad['A<<npctemp>>'] = 'A160'
-$npc_mom['A<<npctemp>>'] = 'U'
+$npc_occupation['A<<npctemp>>'] = ''
+npc_outfit['A<<npctemp>>'] = 0
 $npc_pic['A<<npctemp>>'] = 'xPICx'
-npc_chem['A<<npctemp>>'] = 0
-npc_clothpref['A<<npctemp>>'] = 0
+npc_style['A<<npctemp>>'] = 0
 $npc_PersType['A<<npctemp>>'] = 'XXXX'
 npc_grupTipe['A<<npctemp>>'] = 1
 npc_selfieon['A<<npctemp>>'] = 1
@@ -90,7 +52,6 @@ gs 'npcstaticdefaults', 'group', 'coolkid'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
 npc_dick['A<<npctemp>>'] = 16
 npc_sexskill['A<<npctemp>>'] = 1
-$npc_dad['A<<npctemp>>'] = 'A160'
 hotcat_rating['A<<npctemp>>'] = 8
 
 
@@ -105,8 +66,6 @@ $npc_notes['A<<npctemp>>'] = 'Artem Chebotarev is a typical geek but one could e
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'nerd'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
 npc_dick['A<<npctemp>>'] = 16
 hotcat_rating['A<<npctemp>>'] = 6
@@ -155,8 +114,6 @@ npc_dob['A<<npctemp>>'] = 20000324
 $npc_notes['A<<npctemp>>'] = 'Fedor Kozlov is a decent athlete. He often trains with his good friend Ivan, but lacks the level of talent that Ivan does have. He is decent looking and often is seen chasing Ivan''s leftovers.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
 npc_dick['A<<npctemp>>'] = 17
 if fedormasha = 1: gs 'npcstaticdefaults', 'group', 'outcast'
@@ -175,8 +132,6 @@ $npc_notes['A<<npctemp>>'] = 'Petka Klyuyev is a nerd who usually doesn''t inter
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'nerd'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'slim'
 npc_dick['A<<npctemp>>'] = 12
 hotcat_rating['A<<npctemp>>'] = 4
@@ -193,8 +148,6 @@ $npc_notes['A<<npctemp>>'] = 'Everyone at school always bullies Lesco about anyt
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'outcast'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 16
 $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''lesco''"><<$npc_usedname[''A7'']>></a>'
@@ -212,8 +165,6 @@ $npc_notes['A<<npctemp>>'] = 'Svyatoslav Voinov is an athletic guy with a very c
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'jock'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'thick'
 npc_dick['A<<npctemp>>'] = 18
 hotcat_rating['A<<npctemp>>'] = 7
@@ -268,7 +219,6 @@ $npc_thdick['A<<npctemp>>'] = 'massive'
 npc_dick['A<<npctemp>>'] = 15
 npc_sexskill['A<<npctemp>>'] = rand(0,2)
 if storyline = 1: npc_rel['A<<npctemp>>'] = 40
-$npc_dad['A<<npctemp>>'] = 'A112'
 $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats3'',''vasily''"><<$npc_usedname[''A11'']>></a>'
 hotcat_rating['A<<npctemp>>'] = 4
 
@@ -284,8 +234,6 @@ $npc_notes['A<<npctemp>>'] = 'Julia is a diligent and silent girl. She''s very n
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'nerd'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 23
 hotcat_rating['A<<npctemp>>'] = 7
 $npc_body['A<<npctemp>>'] = 's5'
@@ -297,17 +245,12 @@ $npc_firstname['A<<npctemp>>'] = 'Lariska'
 $npc_nickname['A<<npctemp>>'] = 'Lariska'
 $npc_lastname['A<<npctemp>>'] = 'Gruzdeva'
 $npc_usedname['A<<npctemp>>'] = 'Lariska'
-if zverSlutQW = 2:
-	$npc_notes['A<<npctemp>>'] = 'Lariska is an athletic girl that''s highly insecure, 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 energetic. 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 and offered her a spot on the volleyball team, she''s afraid to go pro.'
-else
-	$npc_notes['A<<npctemp>>'] = 'Lariska is a very athletic girl, with an exceptional talent for volleyball. She has a very weak personality though, and is very dependent on other people''s opinions of her. Her best friend is Christina and one can often see Lariska chasing after Christina.'
-end
+$npc_notes['A<<npctemp>>'] = 'Lariska is a very athletic girl, with an exceptional talent for volleyball. She has a very weak personality though, and is very dependent on other people''s opinions of her. Her best friend is Christina and one can often see Lariska chasing after Christina.'
 npc_dob['A<<npctemp>>'] = 20000603
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'jock'
 npc_sexskill['A<<npctemp>>'] = 2
-npc_hymen['A<<npctemp>>'] = 4
 npc_bust['A<<npctemp>>'] = 8
 hotcat_rating['A<<npctemp>>'] = 6
 $npc_body['A<<npctemp>>'] = 'l2'
@@ -324,8 +267,6 @@ $npc_notes['A<<npctemp>>'] = 'Katja Meynold is a very attractive and petite girl
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'coolkid'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 7
 $npc_body['A<<npctemp>>'] = 's3'
@@ -342,8 +283,6 @@ $npc_notes['A<<npctemp>>'] = 'Vicky Meynold is the opposite of her sister, on on
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'coolkid'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 18
 $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''viktoria''"><<$npc_usedname[''A15'']>></a>'
 hotcat_rating['A<<npctemp>>'] = 7
@@ -361,8 +300,6 @@ $npc_notes['A<<npctemp>>'] = 'Natasha is an excellent student and one of the sma
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'nerd'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 26
 hotcat_rating['A<<npctemp>>'] = 6
 $npc_body['A<<npctemp>>'] = 'm3'
@@ -379,8 +316,6 @@ $npc_notes['A<<npctemp>>'] = 'Inna Devyatova is a tall and pretty girl, she know
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'coolkid'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 34
 hotcat_rating['A<<npctemp>>'] = 9
 $npc_body['A<<npctemp>>'] = 'm3'
@@ -392,20 +327,13 @@ $npc_firstname['A<<npctemp>>'] = 'Christina'
 $npc_nickname['A<<npctemp>>'] = 'Christina'
 $npc_lastname['A<<npctemp>>'] = 'Zvereva'
 $npc_usedname['A<<npctemp>>'] = 'Christina'
-if zverSlutQW = 2:
-	$npc_notes['A<<npctemp>>'] = 'Ever since your fight, Christina has been avoiding you. She''s been humiliated ever since you told the whole school about how she sucked the P.E. teacher''s cock for a place in the running competition, and you managed to beat her up when she tried to fight you. Barely a shade of her former self, she stands timidly in a corner, her head still wrapped in bandage. Whenever she opens her mouth, people can see the broken tooth she hasn''t been able to get fixed yet.'
-else
-	$npc_notes['A<<npctemp>>'] = 'Christina is one of your school''s best athletes, and is the strongest girl you know. She has leadership abilities that, together with her tenacity and intelligence, make her having a dominant presence wherever she goes. She is also more than a bit of a bully to most of the other girls in school.'
-end
+$npc_notes['A<<npctemp>>'] = 'Christina is one of your school''s best athletes, and is the strongest girl you know. She has leadership abilities that, together with her tenacity and intelligence, make her having a dominant presence wherever she goes. She is also more than a bit of a bully to most of the other girls in school.'
 npc_dob['A<<npctemp>>'] = 19991226
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'A69'
-$npc_lastpart['A<<npctemp>>'] = 'A69'
 npc_sexskill['A<<npctemp>>'] = 1
-npc_hymen['A<<npctemp>>'] = 5
 npc_bust['A<<npctemp>>'] = 21
-if zverSlutQW >= 2:
+if christinaQW['dompath'] >= 7:
 	gs 'npcstaticdefaults', 'group', 'outcast'
 else
 	gs 'npcstaticdefaults', 'group', 'jock'
@@ -425,8 +353,6 @@ $npc_notes['A<<npctemp>>'] = 'Lina Starov is a mediocre athlete. She''s sort of
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'jock'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 14
 hotcat_rating['A<<npctemp>>'] = 7
 $npc_body['A<<npctemp>>'] = 'l1'
@@ -444,7 +370,6 @@ npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'gopnik'
 npc_sexskill['A<<npctemp>>'] = 2
-npc_hymen['A<<npctemp>>'] = 5
 npc_bust['A<<npctemp>>'] = 22
 hotcat_rating['A<<npctemp>>'] = 6
 $npc_body['A<<npctemp>>'] = 'l1'
@@ -462,10 +387,7 @@ npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'group', 'gopnik'
 gs 'npcstaticdefaults', 'defaults'
 npc_sexskill['A<<npctemp>>'] = 1
-npc_hymen['A<<npctemp>>'] = 4
 npc_bust['A<<npctemp>>'] = 18
-$npc_dad['A<<npctemp>>'] = 'A26'
-$npc_mom['A<<npctemp>>'] = 'A27'
 hotcat_rating['A<<npctemp>>'] = 6
 $npc_body['A<<npctemp>>'] = 'm4'
 
@@ -481,8 +403,6 @@ npc_dob['A<<npctemp>>'] = 19990422
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'coolkid'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 27
 hotcat_rating['A<<npctemp>>'] = 9
 $npc_body['A<<npctemp>>'] = 'm4'
@@ -499,11 +419,8 @@ npc_dob['A<<npctemp>>'] = 19990502
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'jock'
-$npc_firstpart['A<<npctemp>>'] = 'A118'
 npc_sexskill['A<<npctemp>>'] = 2
-npc_hymen['A<<npctemp>>'] = 6
 npc_bust['A<<npctemp>>'] = 14
-$npc_dad['A<<npctemp>>'] = 'A117'
 hotcat_rating['A<<npctemp>>'] = 8
 $npc_body['A<<npctemp>>'] = 'l2'
 
@@ -520,7 +437,6 @@ npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'gopnik'
 npc_sexskill['A<<npctemp>>'] = 1
-npc_hymen['A<<npctemp>>'] = 4
 npc_bust['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 5
 $npc_body['A<<npctemp>>'] = 'l2'
@@ -541,8 +457,6 @@ end
 npc_dob['A<<npctemp>>'] = 19990623
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 21
 if soniaPS > 0:
 	gs 'npcstaticdefaults', 'group', 'outcast'
@@ -564,7 +478,6 @@ npc_dob['A<<npctemp>>'] = 19730307
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'teacher'
-$npc_lastpart['A<<npctemp>>'] = 'A27'
 $npc_thdick['A<<npctemp>>'] = 'thick'
 npc_dick['A<<npctemp>>'] = 15
 
@@ -579,9 +492,7 @@ $npc_notes['A<<npctemp>>'] = 'The mother of Lara'
 npc_dob['A<<npctemp>>'] = 19750903
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
-$npc_lastpart['A<<npctemp>>'] = 'A26'
 npc_sexskill['A<<npctemp>>'] = 2
-npc_hymen['A<<npctemp>>'] = 6
 npc_bust['A<<npctemp>>'] = 9
 
 
@@ -596,7 +507,6 @@ npc_dob['A<<npctemp>>'] = 19700418
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'family'
-$npc_lastpart['A<<npctemp>>'] = 'A29'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 17
 npc_sexskill['A<<npctemp>>'] = 1
@@ -614,10 +524,7 @@ npc_dob['A<<npctemp>>'] = 19820612
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'family'
-$npc_firstpart['A<<npctemp>>'] = 'A35'
-$npc_lastpart['A<<npctemp>>'] = 'A119'
 npc_sexskill['A<<npctemp>>'] = 2
-npc_hymen['A<<npctemp>>'] = 6
 npc_bust['A<<npctemp>>'] = 25
 npc_rel['A<<npctemp>>'] = 100
 
@@ -632,9 +539,7 @@ $npc_notes['A<<npctemp>>'] = 'Your mother''s sister, Lyudmila Knavs'
 npc_dob['A<<npctemp>>'] = 19750311
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
-$npc_lastpart['A<<npctemp>>'] = 'A55'
 npc_sexskill['A<<npctemp>>'] = 2
-npc_hymen['A<<npctemp>>'] = 6
 npc_bust['A<<npctemp>>'] = 18
 npc_rel['A<<npctemp>>'] = 20
 
@@ -649,12 +554,7 @@ $npc_notes['A<<npctemp>>'] = 'Your Great Grandmother from your Mother''s Father'
 npc_dob['A<<npctemp>>'] = 19331027
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
-npc_cyc['A<<npctemp>>'] = 0
-npc_fert['A<<npctemp>>'] = 6
-$npc_firstpart['A<<npctemp>>'] = 'A32'
-$npc_lastpart['A<<npctemp>>'] = 'A32'
 npc_sexskill['A<<npctemp>>'] = 1
-npc_hymen['A<<npctemp>>'] = 6
 npc_bust['A<<npctemp>>'] = 9
 npc_rel['A<<npctemp>>'] = 100
 
@@ -669,8 +569,6 @@ $npc_notes['A<<npctemp>>'] = 'Your Great Grandfather from your Mother''s Father'
 npc_dob['A<<npctemp>>'] = 19331205
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'A31'
-$npc_lastpart['A<<npctemp>>'] = 'A31'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 14
 npc_sexskill['A<<npctemp>>'] = 1
@@ -689,14 +587,8 @@ npc_dob['A<<npctemp>>'] = 19980816
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'family'
-$npc_lastpart['A<<npctemp>>'] = 'A56'
-npc_vag['A<<npctemp>>'] = 12
-npc_ass['A<<npctemp>>'] = 8
-npc_hymen['A<<npctemp>>'] = 4
 npc_bust['A<<npctemp>>'] = 19
 npc_rel['A<<npctemp>>'] = 50
-$npc_dad['A<<npctemp>>'] = 'A35'
-$npc_mom['A<<npctemp>>'] = 'A29'
 
 
 npctemp = 34
@@ -710,13 +602,9 @@ npc_dob['A<<npctemp>>'] = 20001219
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'family'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'slim'
 npc_dick['A<<npctemp>>'] = 14
 npc_rel['A<<npctemp>>'] = 20
-$npc_dad['A<<npctemp>>'] = 'A28'
-$npc_mom['A<<npctemp>>'] = 'A29'
 hotcat_rating['A<<npctemp>>'] = 7
 
 
@@ -731,7 +619,6 @@ npc_dob['A<<npctemp>>'] = 19830504
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'family'
-$npc_firstpart['A<<npctemp>>'] = 'A29'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 13
 npc_sexskill['A<<npctemp>>'] = 1
@@ -748,8 +635,6 @@ $npc_notes['A<<npctemp>>'] = 'A saleswoman at the Botique'
 npc_dob['A<<npctemp>>'] = 19950907
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 9
 
 
@@ -763,7 +648,6 @@ npc_dob['A<<npctemp>>'] = rand(10,30)
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 npc_sexskill['A<<npctemp>>'] = rand(1,2)
-npc_hymen['A<<npctemp>>'] = rand(4,5)
 npc_bust['A<<npctemp>>'] = 9
 
 

+ 2 - 18
locations/npcstatic2.qsrc

@@ -79,8 +79,6 @@ $npc_notes['A<<npctemp>>'] = 'Your Sister''s Boyfriend. Brother to Katja and Vik
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'friends'
-$npc_firstpart['A<<npctemp>>'] = 'A33'
-$npc_lastpart['A<<npctemp>>'] = 'A33'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
 npc_dick['A<<npctemp>>'] = 17
 
@@ -92,8 +90,6 @@ $npc_usedname['A<<npctemp>>'] = 'Rex'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'friends'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 14
 
@@ -107,8 +103,6 @@ $npc_usedname['A<<npctemp>>'] = 'Zhendos'
 $npc_notes['A<<npctemp>>'] = 'Your Brother''s Friend.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
 npc_dick['A<<npctemp>>'] = 14
 hotcat_rating['A<<npctemp>>'] = 4
@@ -123,8 +117,6 @@ $npc_usedname['A<<npctemp>>'] = 'Mishan'
 $npc_notes['A<<npctemp>>'] = 'Your brother''s friend.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 13
 hotcat_rating['A<<npctemp>>'] = 6
@@ -312,7 +304,6 @@ $npc_usedname['A<<npctemp>>'] = 'Anatoly'
 $npc_notes['A<<npctemp>>'] = 'Director of the Burger Bistro'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_lastpart['A<<npctemp>>'] = 'A80'
 $npc_thdick['A<<npctemp>>'] = 'slim'
 npc_dick['A<<npctemp>>'] = 12
 
@@ -330,11 +321,8 @@ npc_dick['A<<npctemp>>'] = 20
 npc_QW['A<<npctemp>>'] = 0
 npc_rel['A<<npctemp>>'] = 0
 npc_love['A<<npctemp>>'] = 0
-npc_job['A<<npctemp>>'] = 0
-npc_cloc['A<<npctemp>>'] = 0
-$npc_dad['A<<npctemp>>'] = 'A74'
-$npc_mom['A<<npctemp>>'] = 'A80'
-
+$npc_occupation['A<<npctemp>>'] = ''
+npc_outfit['A<<npctemp>>'] = 0
 
 npctemp = 76
 $npc_dna['A<<npctemp>>'] = '1008510370 1518299135 1584717411 1093601930 1547392081 1332335506 1589745960'
@@ -354,8 +342,6 @@ $npc_usedname['A<<npctemp>>'] = 'Timofei'
 $npc_notes['A<<npctemp>>'] = 'Lives in apartment 69 in the Residential area of the City'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 14
 
@@ -386,7 +372,6 @@ $npc_usedname['A<<npctemp>>'] = 'Mrs. Borisovich'
 $npc_notes['A<<npctemp>>'] = 'Wife of Anatoly Borisovich.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
-$npc_lastpart['A<<npctemp>>'] = 'A74'
 npc_bust['A<<npctemp>>'] = 9
 
 
@@ -499,7 +484,6 @@ $npc_notes['A<<npctemp>>'] = 'Sister of Eugene, works as a cook at the barbecue
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 npc_sexskill['A<<npctemp>>'] = 1
-npc_hymen['A<<npctemp>>'] = 5
 npc_bust['A<<npctemp>>'] = 9
 
 

+ 0 - 11
locations/npcstatic3.qsrc

@@ -221,7 +221,6 @@ $npc_firstname['A<<npctemp>>'] = 'Borislav'
 $npc_nickname['A<<npctemp>>'] = 'Slava'
 $npc_notes['A<<npctemp>>'] = 'The owner of the Cafe your <<$npc_nickname[''A29'']>> works at.'
 npc_dob['A<<npctemp>>'] = 19711209
-$npc_lastpart['A<<npctemp>>'] = 'A29'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
@@ -466,8 +465,6 @@ $npc_notes['A<<npctemp>>'] = 'Stasya Pavlov is a complete bitch, and always has
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'coolkid'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 22
 hotcat_rating['A<<npctemp>>'] = 6
 $npc_body['A<<npctemp>>'] = 's3'
@@ -483,8 +480,6 @@ $npc_notes['A<<npctemp>>'] = 'Lizaveta Petrov wants to know everyone''s secrets,
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'coolkid'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 13
 hotcat_rating['A<<npctemp>>'] = 7
 $npc_body['A<<npctemp>>'] = 's2'
@@ -500,8 +495,6 @@ $npc_notes['A<<npctemp>>'] = 'Veronika Sokolov is called the ice queen by her fe
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'jock'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 20
 hotcat_rating['A<<npctemp>>'] = 7
 $npc_body['A<<npctemp>>'] = 'm2'
@@ -517,8 +510,6 @@ $npc_notes['A<<npctemp>>'] = 'Zinaida Alkaev is a mousey girl who is very plain
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'nerd'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 13
 hotcat_rating['A<<npctemp>>'] = 5
 $npc_body['A<<npctemp>>'] = 's4'
@@ -549,8 +540,6 @@ $npc_notes['A<<npctemp>>'] = 'Anushka Konstantinov is the lead guitarist in Rado
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'gopnik'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 npc_bust['A<<npctemp>>'] = 24
 hotcat_rating['A<<npctemp>>'] = 8
 $npc_body['A<<npctemp>>'] = 'l3'

+ 1 - 28
locations/npcstatic4.qsrc

@@ -194,8 +194,6 @@ $npc_nickname['A<<npctemp>>'] = 'Arsen'
 $npc_usedname['A<<npctemp>>'] = 'Arsen'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 13
 
@@ -207,8 +205,6 @@ $npc_nickname['A<<npctemp>>'] = 'Maksim'
 $npc_usedname['A<<npctemp>>'] = 'Maksim'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'thick'
 npc_dick['A<<npctemp>>'] = 18
 
@@ -223,8 +219,6 @@ $npc_notes['A<<npctemp>>'] = 'Vanya Yanka is a little goofy jock, playing jokes
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'jock'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'thicker than average'
 npc_dick['A<<npctemp>>'] = 15
 hotcat_rating['A<<npctemp>>'] = 5
@@ -479,8 +473,6 @@ $npc_usedname['A<<npctemp>>'] = 'Michael'
 $npc_notes['A<<npctemp>>'] = 'An invalid.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 13
 npc_sexskill['A<<npctemp>>'] = 2
@@ -517,8 +509,6 @@ $npc_dna['A<<npctemp>>'] = '1437373624 1498180021 1914707319 1923163911 15203642
 $npc_notes['A<<npctemp>>'] = 'Bely''s cousin'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'skinny'
 npc_dick['A<<npctemp>>'] = 12
 npc_sexskill['A<<npctemp>>'] = 2
@@ -535,8 +525,6 @@ npc_dob['A<<npctemp>>'] = 20000405
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'gopnik'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'skinny'
 npc_dick['A<<npctemp>>'] = 15
 npc_sexskill['A<<npctemp>>'] = 2
@@ -552,8 +540,6 @@ $npc_notes['A<<npctemp>>'] = 'Yurik Volkov is a burly biker, who spends most of
 npc_dob['A<<npctemp>>'] = 19951116
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_firstpart['A<<npctemp>>'] = 'V'
-$npc_lastpart['A<<npctemp>>'] = 'V'
 $npc_thdick['A<<npctemp>>'] = 'skinny'
 npc_dick['A<<npctemp>>'] = 19
 npc_sexskill['A<<npctemp>>'] = 2
@@ -598,7 +584,6 @@ npc_dick['A<<npctemp>>'] = 26
 npc_sexskill['A<<npctemp>>'] = 2
 npc_spermpot['A<<npctemp>>'] = 12000
 npc_haircol['A<<npctemp>>'] = 3
-npc_eyecol['A<<npctemp>>'] = 1
 
 
 npctemp = 194
@@ -615,7 +600,6 @@ $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 16
 npc_sexskill['A<<npctemp>>'] = 2
 npc_haircol['A<<npctemp>>'] = 1
-npc_eyecol['A<<npctemp>>'] = 1
 
 
 npctemp = 195
@@ -633,7 +617,6 @@ npc_dick['A<<npctemp>>'] = 18
 npc_sexskill['A<<npctemp>>'] = 1
 npc_spermpot['A<<npctemp>>'] = 8000
 npc_haircol['A<<npctemp>>'] = 1
-npc_eyecol['A<<npctemp>>'] = 1
 
 
 npctemp = 196
@@ -644,11 +627,7 @@ $npc_lastname['A<<npctemp>>'] = 'Vedenin'
 $npc_usedname['A<<npctemp>>'] = 'Porn actor Jason Black'
 $npc_notes['A<<npctemp>>'] = 'Ignat is from Kaliningrad and he lives in his own rented apartment near campus. He is a university student, and he thought this is a good way to make money and fuck girls at the same time. He is athletic, handsome and intelligent.'
 npc_dob['A<<npctemp>>'] = 19980501
-npc_vital['A<<npctemp>>'] = rand(40,50)
-npc_stren['A<<npctemp>>'] = rand(40,50)
 npc_intel['A<<npctemp>>'] = rand(40,50)
-npc_agil['A<<npctemp>>'] = rand(40,50)
-npc_sprt['A<<npctemp>>'] = rand(40,50)
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
 $npc_thdick['A<<npctemp>>'] = 'thick'
@@ -656,8 +635,6 @@ npc_dick['A<<npctemp>>'] = 17
 npc_sexskill['A<<npctemp>>'] = 1
 npc_spermpot['A<<npctemp>>'] = 11000
 npc_haircol['A<<npctemp>>'] = 2
-npc_tan['A<<npctemp>>'] = 1
-npc_eyecol['A<<npctemp>>'] = 2
 
 
 npctemp = 197
@@ -675,8 +652,6 @@ npc_dick['A<<npctemp>>'] = 18
 npc_sexskill['A<<npctemp>>'] = 2
 npc_spermpot['A<<npctemp>>'] = 18000
 npc_haircol['A<<npctemp>>'] = 2
-npc_tan['A<<npctemp>>'] = 1
-npc_eyecol['A<<npctemp>>'] = 2
 
 
 npctemp = 198
@@ -693,8 +668,6 @@ $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 17
 npc_sexskill['A<<npctemp>>'] = 1
 npc_haircol['A<<npctemp>>'] = 3
-npc_tan['A<<npctemp>>'] = 1
-npc_eyecol['A<<npctemp>>'] = 2
 
 
 npctemp = 199
@@ -712,7 +685,7 @@ $npc_thdick['A<<npctemp>>'] = 'well proportioned'
 npc_dick['A<<npctemp>>'] = 15
 npc_sexskill['A<<npctemp>>'] = 1
 npc_spermpot['A<<npctemp>>'] = 10500
-npc_hgt['A<<npctemp>>'] = 182
+npc_height['A<<npctemp>>'] = 182
 
 --- npcstatic4 ---------------------------------
 

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