205 Commits 4fa4d952cd ... 2451cd3de2

Author SHA1 Message Date
  KevinSmarts 2451cd3de2 Merge branch 'master' of https://git.catrenelle.com/GwenK2020/glife 3 years ago
  KevinSmarts ea0d6e49a7 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' 3 years ago
  KevinSmarts a6f3deab4b [fixed] Attribute change as top replaces bra 3 years ago
  Gwen 75bfd75dc5 [Changed] the value of clothing item 3 years ago
  Spackled Lanturn dd2b69215f [fixed] simplify conditional in sny 3 years ago
  Spackled Lanturn 30c7f13f9c [text edit] clean up sny 3 years ago
  Spackled Lanturn 6df559717c [text edit] clean up Snpc 3 years ago
  Spackled Lanturn 5f9f508694 [text edit] clean up sitrPar 3 years ago
  Spackled Lanturn 7adffc1516 [text edit] clean up street_event 3 years ago
  Spackled Lanturn 0e89380fed [text edit] clean up street_walker 3 years ago
  KevinSmarts 226eac5966 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' 3 years ago
  KevinSmarts 240754662a Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  KevinSmarts efc8e4d76b [fixed] typo in attribute file and old links for purses in custom start spotted by kwscj 3 years ago
  rachels 25256de455 teach it *= and /= 3 years ago
  Spackled Lanturn 83ef8858bd [text edit] change line in tatiana_lab back to using simpler style code like in the version rachels reverted to when my initial commit broke the code, but with the spelling/grammar corrections from my earlier commit and with the initial line using *p so the sentence doesn't have a weird line break in the middle of it 3 years ago
  Spackled Lanturn 8958ee8bec [text edit] clean up ykuh 3 years ago
  Spackled Lanturn 1673b076ea [fixed] in webcam_site, removed some colons after elses that might have inadvertently been added back when merging 3 years ago
  Spackled Lanturn e0257a2342 Merge remote-tracking branch 'upstream/master' into minor-fixes 3 years ago
  Spackled Lanturn 32773050be [fixed] in webcam_site, fix some issues with the anal dildo conditional logic that arose from poorly copypasting from the vaginal dildo logic, remove some *clr calls that shouldn't be there as well as some colons after elses, and fix the condition for the double penetration dildo action being visible as the previous version was running into the 100 expression limit QSP has for conditional expressions 3 years ago
  Spackled Lanturn 3f34a2e879 [fixed] add missing parenthesis in tatiana_lab 3 years ago
  KevinSmarts 1f661a6371 [fixed] Cats missing from batch sell 3 years ago
  KevinSmarts 517b84e06f [changed] Updated the release name and version history for second bug fix release 3 years ago
  KevinSmarts 527b6dfe31 [fixed] Size of images when viewing underwear for sale were too small and it wasn't clear if you owned both coats in Mon Chéri 3 years ago
  KevinSmarts c40db30d7b [fixed] 2 ways to enter music store and only one reset data 3 years ago
  Alaratt caee87c14e [Fixed] Journal hints for classmates should no longer show up on New in Town or Transformation Starts. 3 years ago
  Alaratt ca7e6d7b0d [Fixed] Bugs reported on TFGS about jobs being available when they should/shouldn't and added a resign for the rest of the summer option for the tour guide job. 3 years ago
  rachels 550ca423b5 revert to simple code 3 years ago
  rachels 1b1373c37d S -> _s, H -> _h, B -> _b (beach, swimwear, coat) 3 years ago
  rachels c624de711d revert to previous version 3 years ago
  rachels 82942fb58a clean loadg and add version trigger into saveupdater 3 years ago
  Spackled Lanturn addf7bd86b [text edit] clean up succubus 3 years ago
  Spackled Lanturn 72ac397231 [text edit] clean up some text in spell 3 years ago
  slonon 2490206aa7 [fixes] disables the twin quest, see code comment for more info 3 years ago
  slonon 627ca5cbad Merge https://git.catrenelle.com/Kevin_Smarts/glife into master 3 years ago
  Spackled Lanturn 29ac4ac6dc [text edit] clean up spellList 3 years ago
  Spackled Lanturn 030adf70e9 [text edit] clean up sportShop 3 years ago
  Spackled Lanturn 9363c4c76a [text edit] clean up stallion 3 years ago
  Spackled Lanturn ad76f9649e [text edit] Goole --> Google 3 years ago
  Spackled Lanturn ba3d154b6b [text edit] clean up StasQS 3 years ago
  Spackled Lanturn df45743d01 [text edit] clean up StasSex 3 years ago
  Spackled Lanturn 0e01647540 [text edit] clean up stat 3 years ago
  Spackled Lanturn b09a815486 [text edit] clean up stat_display 3 years ago
  Spackled Lanturn 177f2c4da7 [text edit] in stol, write hour instead of hours when you only have one hour of homework left 3 years ago
  Spackled Lanturn 1c7ac485fc [text edit] clean up stripclub 3 years ago
  Spackled Lanturn 4bbb3faafa [text edit] clean up stwork 3 years ago
  Spackled Lanturn 4a84e61ec8 [text edit] clean up stwork2 3 years ago
  Spackled Lanturn 32948d8f1c [text edit] clean up subkid 3 years ago
  Spackled Lanturn a796d9c75a [text edit] clean up svidboy 3 years ago
  Spackled Lanturn a791d08738 [text edit] clean up swamp 3 years ago
  Spackled Lanturn 20687518db [text edit] clean up gameover 3 years ago
  Spackled Lanturn 86b6666a72 [text edit] clean up swamp_woods 3 years ago
  Spackled Lanturn 9f3e410d73 [text edit] clean up swamp_yard 3 years ago
  Spackled Lanturn 14eb01ee52 [text edit] clean up swamphouse 3 years ago
  Spackled Lanturn 00ec3396d6 [fixed] cleaned up some unnecessarily duplicated code in tour_guide 3 years ago
  Spackled Lanturn 9de4c23313 [fixed] make the Vika birthday event condition in obroom file match the one in Vika file (fixes are (1) changing day to daystart like was done for the Vika file version and (2) removing the checks that bordel = 1 and slutty > 0 as I think the Vika file version without them makes more sense since the scene where you reject Vika's present (getting gangbanged) has you tell her "What do you take me for?" which wouldn't make sense if she already got you a job as a prostitute). also simplify the conditionals for accessing Vika here and make all checks against the brothel's opening and closing hours use the functions defined in the brothel file instead of the raw value 3 years ago
  Spackled Lanturn bc6af1e10b [text edit] clean up obroom 3 years ago
  Spackled Lanturn e49d3129a5 [changed] (1) rework Vika file to remove the need for an extra step where the player clicks finish before selecting a new action every time they chat or study with Vika (this includes separating the code for the top level text and actions because the page title/image should be displayed before the text from the chat and study actions but some of the actions only show up at certain times and the chat and study actions update the time), (2) add functions for checking whether the brothel Vika works at is open to bordel file and used them in places this data is checked, (3) added a check whether the brothel is open before the action to wait for customers is displayed in bordel file, (4) removed the vikaAge variable from Vika file since all it was doing was being used in a line of text in the same file and her age is just the player's age plus one (also there is another Vika in the game that uses the same variable) 3 years ago
  rachels 9fcc1d4a7d add the version number to each save 3 years ago
  Spackled Lanturn f228571e5c [fixed] correctly display the price brothel customers pay for the player to service them when the player is nude 3 years ago
  Spackled Lanturn 7ebd8d54c1 [text edit] clean up bordel and add a line to the entrance when the player's appearance is good enough to work to make it clearer what is going on that's causing an extra click there 3 years ago
  rachels 72fd7c3ea6 fix the repeated actions 3 years ago
  Spackled Lanturn a4f7411d3b [text edit] clean up autoservisF 3 years ago
  Spackled Lanturn 2e300dc045 [changed] (1) made it possible to enter the car directly from inside the car dealership and repair shop if the car is parked there, (2) added functions to the car dealership and repair shop that return their open hours, (3) used those functions to block the player from driving to those locations when they are closed, (4) replaced the other places currently guarded by those open hours with calls to this function, (5) added logic to move the car out of the dealership or repair shop if the car is not wrecked and the player comes by while they are closed (non-wrecked cars are moved to not block the player from accessing their car; wrecked cars are not moved to avoid forcing the player to pay a towing fee a second time to move the car back inside), (6) added lines of text saying the car is locked inside if the car is in the repair shop or dealership and they are closed 3 years ago
  Spackled Lanturn ce7113566b [fixed] make it so location 9 (car dealership entrance) is used instead of location 8 when the player purchases a new car and when the player drives to the car dealership. location 8 was formerly autosalonF, but this location was deleted in https://git.catrenelle.com/Kevin_Smarts/glife/commit/6fbae895776aaa7b8afb79980f45474280ff6e20 so the player cannot get out of the car if it is at location 8. also the car needs to be at location 9 for the player to sell it, so it previously being impossible to drive there meant there was no way to avoid the tow fee of 3,000 for getting the car to the lot 3 years ago
  Spackled Lanturn a299528e9d [fixed] (1) make it so that the text and action for the case where the player's car breaks down when the player starts it are actually displayed, (2) make it so that the case where the player drives drunk and crashes into a tree is actually reachable (it wasn't previously because if alko >= 10 then alko > 0 is always true), and (3) simplify the conditional for determining whether the car breaks down by removing unnecessary parts 3 years ago
  slonon b1a5e8b586 Merge https://git.catrenelle.com/Kevin_Smarts/glife into master 3 years ago
  rachels d10f13682d add ability to detect colon after else 3 years ago
  Kevin_Smarts 98b2e9348f Merge branch 'patch' of yanchi/glife into master 3 years ago
  Spackled Lanturn 26a4e68472 Merge remote-tracking branch 'origin/minor-fixes' into minor-fixes 3 years ago
  Spackled Lanturn 465ac7dc1d [fixed] extracted the near identical logic used by all the local pav and city driving actions to a single place (the only one that was different (aside from bugs in the text displayed to players that said drives that took five minutes took an hour) was driving to pav's old district, but I believe that's just something that was left over from when the old district wasn't part of pav), cutting the size of carF by about 1/3 3 years ago
  Spackled Lanturn 4463bc1641 [changed] made the player's car accessible from the red light district and added five minutes passing when accessing the car in the industrial district or red light district when the car is parked somewhere that takes five minutes to walk to from where the player currently is 3 years ago
  Spackled Lanturn f6025ec327 [fixed] extracted the near identical logic used by all the local pav and city driving actions to a single place (the only one that was different (aside from bugs in the text displayed to players that said drives that took five minutes took an hour) was driving to pav's old district, but I believe that's just something that was left over from when the old district wasn't part of pav), cutting the size of carF by about 1/3 3 years ago
  dalu98 2632b62ff9 [fixed] Update path in `build.sh` 3 years ago
  slonon f661878a12 [fixes] restores broken twin request quest you can get from Pavlin at the hotel 3 years ago
  dalu98 e0993ec75e Fix path problem when using build.sh 3 years ago
  Spackled Lanturn 072cdea5a0 [added] made the player's car accessible from the red light district and added five minutes passing when accessing the car in the industrial district or red light district when the car is parked somewhere that takes five minutes to walk to from where the player currently is 3 years ago
  Spackled Lanturn 1a09491b41 [text edit] clean up avt 3 years ago
  Spackled Lanturn 74bf55923b [fixed] extract the common car examining and buying logic to shared logic called with gt, reducing the size of autotraidF by 161 lines or a little under 50% 3 years ago
  Spackled Lanturn 0136feb664 [text edit] clean up autotraidF 3 years ago
  Spackled Lanturn b92b4561c1 [fixed] or or --> or 3 years ago
  Spackled Lanturn 49c8007f2d [fixed] extract the common car buying logic to shared logic called with gt, reducing the size of autosalonF by about 390 lines or about 2/3 3 years ago
  Spackled Lanturn de38e79a90 [text edit] clean up autosalonF 3 years ago
  Spackled Lanturn ba41e58642 [fixed] remove the massive amount of unnecessary copypasting in carF1 and removed remaining uses of the cartraid variable, reducing the size of carF1 by over 500 lines or about 85% 3 years ago
  Spackled Lanturn f0d4c95826 [fixed] fix some bugs where it was possible to drive to the city industrial area train station (19) and the city island (25) without going on the highway but not the other way around. the city industrial train station issue looks like it was missed when the car code was cleaned up and the various locations were split into different blocks (city, pavlovsk, and other). the city island issue looks like a result of that logic being added before the island was created and before the car code was refactored so that having that guard is no longer needed 3 years ago
  Spackled Lanturn da07296f63 [fixed] remove the cartraid variable used to distinguish whether carF1 is being called from autosalonF or autotraidF as autotraidF does not actually access carF1 3 years ago
  Spackled Lanturn 57f8b6110d [text edit] clean up carF 3 years ago
  Spackled Lanturn 031a3c2735 [text edit] changed a line in the Vika brothel intro scene to make it more clear where it is. the player can't walk from the island to the red light district, and they aren't the same neighborhood 3 years ago
  Spackled Lanturn c3b1c2d505 [fixed] the brothel Vika works at is in the red light district, not the city residential area, so the player should be in the red light district when they leave 3 years ago
  Spackled Lanturn 1e6de54f4f [fixed] simplify a few conditionals. make the code for buying 10 joints worth of weed actually show up if you have the right amount of money and make the associated text say you are buying 10, not 5 3 years ago
  Spackled Lanturn 4339d47fcf [text edit] clean up metro 3 years ago
  KevinSmarts 5dbdc22ac4 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' 3 years ago
  KevinSmarts 417c7cb23f Merge remote-tracking branch 'slanon/master' 3 years ago
  KevinSmarts 919c2d58c9 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  KevinSmarts 39992fa7ff [fixed] duplitcate loops causing crashes 3 years ago
  Spackled Lanturn a9e10bfb04 [text edit] clean up bordelv 3 years ago
  Spackled Lanturn 22b9e6fb77 [text edit] anouncement --> announcement 3 years ago
  rachels ab873bb0db fix a few bugs realated to resizing 3 years ago
  Spackled Lanturn 470bff3980 [text edit] clean up tatiana_lab 3 years ago
  slonon 4819de7c36 Removes obsolete variables 'SiSonWork' and 'SiSgdk' 3 years ago
  Spackled Lanturn 359c56a2a0 [text edit] clean up ivanRoom 3 years ago
  slonon 29d7b88f2f [fixes] removes blank screen when visiting kendra 3 years ago
  KevinSmarts ef1c497a4b Merge remote-tracking branch 'slanon/master' 3 years ago
  KevinSmarts 2a07c50a2a [changed] Tittle change for bug fig release 3 years ago
  KevinSmarts 51d0db1cb0 [fixed] Typos and small errors in the attributes files spotted by DeusExLibris 3 years ago
  slonon 5fc670e654 [fixes] removes 'if' after 'end', removes ':' after 'else' 3 years ago
  KevinSmarts 05826d9518 [fixed] else's with colons converted to else's without colons 3 years ago
  KevinSmarts 75c4ab7d4e Merge remote-tracking branch 'Alaratt/master' 3 years ago
  KevinSmarts a9745396cf Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' 3 years ago
  Spackled Lanturn a0c476f240 [fixed] replace all the copypasted "act 'Leave':gt'talent_agency','hallway'" in all the branches of the conditional for the random interviews the player can walk in on with a single act call that's outside the conditional 3 years ago
  Spackled Lanturn 300faa76eb [fixed] cleaned up some code that had a lot of copypasting: 3 years ago
  Alaratt 2bc55dee57 [Added] Can now have a snack in the Mansion kitchen 3 years ago
  Alaratt fad8630697 Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife 3 years ago
  KevinSmarts 932dceaff9 [fixed] description numbers offset 3 years ago
  Alaratt 1b605c3aaa [Changed] Updated the Mansion to use the dynamic kitchen code to keep things consistent. 3 years ago
  KevinSmarts 1e19980451 [fixed] Strength and hip values for swimwear and coats were not all updated 3 years ago
  KevinSmarts 6fb71c1e56 [fixed] Some poor copy/pasting 3 years ago
  KevinSmarts 85f63485a1 [added] Check for old clothing variables will sell them off and add 1 basic outfit 3 years ago
  dalu98 cd99b3700e Fix path problem when using build.sh 3 years ago
  Spackled Lanturn 1a77d4020e [fixed] change all instances of Timothy to Timofei. previously the character referred to in these places had been called Timothy in some places and Timofei in others and it was decided that Timofei should be the name that's used https://discord.com/channels/439744316555132948/519791787158536192/790555550856249374 3 years ago
  Spackled Lanturn 3acf4e990e [text edit] clean up swampspring 3 years ago
  Spackled Lanturn bc8ba9744d [text edit] clean up talent_ageny 3 years ago
  Spackled Lanturn e6859a65fb [text edit] change all remaining references to Juugo to Gustav (this name change mostly happened in 2016 according to blame history) and fix some spelling errors in ivanRoom 3 years ago
  Spackled Lanturn 13ca1c527b [fixed] make it so that the Gustav agility/reaction/endurance trainings actually take an hour like they say they do instead of an hour and fifteen minutes. also extract their shared code to a gs call since the logic is identical outside of what exp they give 3 years ago
  Spackled Lanturn aabb0b755e [fixed] moved some code/text repeated in all branches of a conditional to outside the conditional and changed some places where "end if" had been written instead of "end" to just say "end" 3 years ago
  Spackled Lanturn bc4234cd8e [text edit] clean up tatiana_missions 3 years ago
  Spackled Lanturn 0757f9cc1c Merge remote-tracking branch 'upstream/master' into minor-fixes 3 years ago
  KevinSmarts cdcd28273c [added] Update to version number, Wiki link and changelog for release 3 years ago
  KevinSmarts 70635756e6 Merge remote-tracking branch 'slanon/master' 3 years ago
  KevinSmarts aa2e1353e7 Merge remote-tracking branch 'Spackled_Lanturn/minor-fixes' 3 years ago
  slonon e10a23447b [fixes] adds new argumwents to capture errors 3 years ago
  slonon 4cdc438480 [fixes] cum call using wrong argument 3 years ago
  slonon 02ef249d6a [fixes] adds whole directory to be ignored 3 years ago
  KevinSmarts 3cb45cefa3 [fixed] Set Misha day check variable to use his unique id as he was using same one as Timothy in the city 3 years ago
  Spackled Lanturn 43d7f7da06 [text edit] change line in tatiana mission where the player hasn't met the fairy before since the line about possible reasons the fairy doesn't have anyone to talk to is in response to a line in the version where the player has seen the fairy before where the player says "She told me that I was the only one who could see her and who she could talk to" 3 years ago
  Spackled Lanturn 7cb822d759 [fixed] moved two large blocks of text that were copypasted multiple times to gs calls so that they only need to be written out once 3 years ago
  Spackled Lanturn 44ae2476d5 [fixed] made text saying the player's makeup is smeared only appear if the player is wearing non-smeared makeup and added logic to actually set the player's makeup to smeared if the player is wearing any 3 years ago
  Spackled Lanturn 5cfce3ca71 [fixed] moved some logic in both paths of a couple conditionals to outside the conditional 3 years ago
  Spackled Lanturn 867ffa7f31 [fixed] correct the spafinloc value for the non-virgin anal action chain (3 is butt, 11 is mouth) and set it for the vaginal action chains 3 years ago
  Spackled Lanturn f08fa757d1 [fixed] moved two giant blocks of text that occur multiple times to gs calls so that they don't need to be copypasted multiple times 3 years ago
  Spackled Lanturn 79fcea2f5d [text edit] clean up taxi 3 years ago
  Spackled Lanturn 39ada77935 [text edit] clean up telefon 3 years ago
  Spackled Lanturn 8aa3cd7011 [text edit] clean up therapist 3 years ago
  Spackled Lanturn fac129ce7d [text edit] clean up tobiQW 3 years ago
  Spackled Lanturn 6e1ad00101 Merge remote-tracking branch 'upstream/master' into minor-fixes 3 years ago
  Crux 376545ce50 [GRAMMAR] - Capitalization of Pavlovsk 3 years ago
  Crux 7243ce5359 Merge branch 'master' into master-grammar-fixes 3 years ago
  Crux abe0392f57 Merge branch 'master' into master-grammar-fixes 3 years ago
  Spackled Lanturn 5a42567159 [text edit] clean up TerminalOffice 3 years ago
  Spackled Lanturn 09909130d6 [text edit] clean up Timofei 3 years ago
  Spackled Lanturn 2847b9a15b [fixed] merge text that is displayed if the same conditions are met into one conditional block and remove a couple unnecessary parentheses 3 years ago
  Spackled Lanturn fa10dfd646 [text edit] clean up TimofeiMetro 3 years ago
  Spackled Lanturn 1627f2ae45 [text edit] fix typos in tour_guide 3 years ago
  Spackled Lanturn 9280b71447 [text edit] clean up train 3 years ago
  Spackled Lanturn 4540bb6e6b [fixed] this is supposed to be an if-else where in the if branch the player doesn't have enough milk to feed the baby and in the else branch the player does. however, the else keyword was inadvertently left out of the code, meaning that, when the player doesn't have enough milk, the text and actions for when the player does have enough milk were displayed anyway. this commit adds the missing else 3 years ago
  Spackled Lanturn 667aef0534 [text edit] move text that was the same in all three branches of a conditional to outside the conditional so it only needs to be written out once instead of three times 3 years ago
  Spackled Lanturn 56f5ae9323 [text edit] clean up train_incidental 3 years ago
  Spackled Lanturn 1d716b1d96 [text edit] clean up trainBimbo (mostly spelling/grammar/word choice issues, but also in a couple cases where there was text saying a man got dressed and left 2-3 times I removed all but 1 of the times) 3 years ago
  Spackled Lanturn feae7083ee [text edit] clean up traits and fix the description of how many points are needed to reach level 3 for nerd_status 3 years ago
  Spackled Lanturn b5dbbc1329 [text edit] clean up TV 3 years ago
  Spackled Lanturn 3231cfa21e [text edit] clean up liam 3 years ago
  Spackled Lanturn bd1767db5a [text edit] clean up dibodi. also change the line from Marinka to say she does know where the art studio is instead of her saying that she doesn't since having this conversation with her is how the player unlocks the art studio (or is how the player would unlock the art studio if the earlier events in the chain leading to accessing the art studio were actually triggerable) 3 years ago
  Spackled Lanturn 8cbcc4a703 [text edit] clean up artstudia 3 years ago
  Spackled Lanturn 926beaf0ae [text edit] clean up ugel 3 years ago
  Spackled Lanturn 283257c09f [text edit] clean up ugol 3 years ago
  Spackled Lanturn 9d974ff5c0 [text edit] clean up ugol1 3 years ago
  Spackled Lanturn d67899c59c [text edit] clean up underwear 3 years ago
  Spackled Lanturn ae910b23cf [text edit] update the text for when the player agrees to Vika's birthday present as, seemingly due to an oversight when converting these from being largely machine translated, the text was identical in both the case where the player has slept with at least 6 guys total before and where they haven't. changes are (1) in the scenario where the player has slept with less than 6 guys total, added a line saying that, (2) in the scenario where the player has slept with 6 or more guys (where it isn't necessarily true they haven't slept with 6 at once), changed the line back to being similar to the original version where the player is happy and excited instead of apprehensive, and (3) added back in the line about making sure the player isn't interrupted (I think that's what the machine translation meant by "I''ll make you so no one prevented") to make it clear that that's why Vika is locking the door and that she isn't trapping the player in the room (at least I don't think it's supposed to be that she's trapping the player since that wouldn't make sense in the case where the player likes her present and the player can freely leave at the end of the series of scenes without her coming back to unlock the door) 3 years ago
  Spackled Lanturn c5ff868d3d [text edit] fix the npcstatic entry for the university roommate by (1) correcting a couple spelling/grammar issues in her notes and (2) updating her last name to the one that is actually used in the game ($npc_lastname['A220'] isn't used anywhere so this should be safe) 3 years ago
  Spackled Lanturn b50fabdd25 [fixed] match $npc_usedname call to boyStat call 3 years ago
  Spackled Lanturn c0967bfc7f [text edit] clean up univer_din 3 years ago
  Spackled Lanturn 6cc189fe1e [text edit] clean up vann 3 years ago
  Spackled Lanturn 495655ff78 [fixed] moved a line of text used in both the if and else branch of a conditional to outside the conditional and fixed some indentation 3 years ago
  Spackled Lanturn d8cc50088f [text edit] clean up vanr2x 3 years ago
  Spackled Lanturn 4d9d7b3d05 [text edit] clean up vanrPar 3 years ago
  Spackled Lanturn a7a0af26de [text edit] clean up vecher 3 years ago
  Spackled Lanturn a8248e3345 [text edit] fixed four typos in version file 3 years ago
  Spackled Lanturn cfcfa7537e Merge remote-tracking branch 'upstream/master' into minor-fixes 3 years ago
  Spackled Lanturn 444b6367b1 [text edit] clean up some of the text in din_pav. much of the file still looks pretty machine translated though 3 years ago
  Spackled Lanturn ee72d34fb4 [fixed] update code in Vika file to use gs calls and conditionals for the three different scenarios it contains (Vika asleep, Vika celebrating your birthday, Vika awake but not celebrating your birthday) to simplify it and remove need for cls and exit calls. also updated the line for seeing Vika sleeping to not question whether she worked in the brothel to be consistent with the line in the dorm room file you click to reach it, which mentions that she did work in the brothel 3 years ago
  Spackled Lanturn 2a8ed7643f [fixed] move the exit action to the top for the magic circle in response to discord comment from hornguy6 on avoiding inconsistent UI https://discord.com/channels/439744316555132948/526624671219580948/789309865029009428 3 years ago
  Spackled Lanturn d8587d83db [text edit] clean up Vika 3 years ago
  Spackled Lanturn 03703c2b92 [text edit] clean up vipclub 3 years ago
  Spackled Lanturn 2f563ee428 [text edit] clean up virginity_call 3 years ago
  Spackled Lanturn 0c269b2234 Merge remote-tracking branch 'upstream/master' into minor-fixes 3 years ago
  Spackled Lanturn 4ad81457d0 [text edit] clean up Vnlake1 3 years ago
  Spackled Lanturn ae80fcbe13 [text edit] clean up Vnlake2 3 years ago
  Spackled Lanturn a78fed911d [text edit] clean up volAndGev 3 years ago
  Spackled Lanturn d8fbe61a0f [text edit] clean up VolkovHome 3 years ago
  Spackled Lanturn 77ad52f120 [text edit] clean up VolleyTrenCentr 3 years ago
  Spackled Lanturn 29ee3c73a6 [text edit] clean up VolleyTrenerSpeak 3 years ago
  Spackled Lanturn 35586da8a5 [text edit] clean up worksalon 3 years ago
  Spackled Lanturn c69583ac4a [text edit] clean up Voltrener 3 years ago
  Spackled Lanturn a1fa3122b7 [text edit] clean up Voltrenersex 3 years ago
  Spackled Lanturn b6eb4d19e3 [text edit] clean up VoltrenerSexShower 3 years ago
  Spackled Lanturn 152ad28dad [fixed] made an initial attempt at adding in missing dildo sizes, made it so the player can only see the dildo actions if they have an appropriately sized one, simplified some conditionals, and fixed the logic for the double penetration with dildos action so that it only shows up if the player has two appropriately sized dildos. also cleaned up some text/comments 3 years ago
  Spackled Lanturn f200577871 [text edit] clean up webcam_site 3 years ago
  Spackled Lanturn 9469b36a40 [text edit] clean up WorkHosp 3 years ago
  Spackled Lanturn c47b382e9a [text edit] clean up worksalon 3 years ago
  Spackled Lanturn fc0fc1564f [text edit] seamen --> semen 3 years ago
  Spackled Lanturn 2c383464da [text edit] clean up yarik 3 years ago
  Spackled Lanturn f14ad3c41f [text edit] clean up ybass 3 years ago
  Spackled Lanturn a8c21619e7 [fixed] clean up some text, replace some hardcoded names with calls to npc_firstname and npc_nickname arrays, and remove conditionals where both paths are the same 3 years ago
  Spackled Lanturn ac465f3fcc [text edit] further clean up text in youplace 3 years ago
  Spackled Lanturn 749ccca440 [text edit] clean up text in youplace 3 years ago
  Spackled Lanturn f13d1dde22 [text edit] clean up text in youry 3 years ago
100 changed files with 2602 additions and 3895 deletions
  1. 1 5
      .gitignore
  2. 8 8
      build.sh
  3. 4 4
      locations/BurgerTip.qsrc
  4. 38 29
      locations/HotelHole.qsrc
  5. 1 1
      locations/LCwork.qsrc
  6. 66 66
      locations/Snpc.qsrc
  7. 21 21
      locations/StasQW.qsrc
  8. 7 7
      locations/StasSex.qsrc
  9. 11 11
      locations/TV.qsrc
  10. 28 28
      locations/TerminalOffice.qsrc
  11. 5 5
      locations/Timofei.qsrc
  12. 7 9
      locations/TimofeiMetro.qsrc
  13. 197 136
      locations/Vika.qsrc
  14. 11 11
      locations/Vnlake1.qsrc
  15. 8 8
      locations/Vnlake2.qsrc
  16. 4 4
      locations/VolkovHome.qsrc
  17. 29 29
      locations/VolleyTrenCentr.qsrc
  18. 13 13
      locations/VolleyTrenerSpeak.qsrc
  19. 2 2
      locations/Voltrener.qsrc
  20. 28 28
      locations/VoltrenerSexShower.qsrc
  21. 86 86
      locations/Voltrenersex.qsrc
  22. 12 12
      locations/WorkHosp.qsrc
  23. 2 1
      locations/_attributes_coco_outfits.qsrc
  24. 8 8
      locations/_attributes_fetish.qsrc
  25. 1 1
      locations/_attributes_moncheri.qsrc
  26. 2 3
      locations/_attributes_swimwear.qsrc
  27. 0 2
      locations/_attributes_uniform.qsrc
  28. 55 55
      locations/_clothing_name.qsrc
  29. 10 10
      locations/alexandriaEv.qsrc
  30. 8 8
      locations/andreihunter.qsrc
  31. 3 2
      locations/andrey.qsrc
  32. 8 8
      locations/artstudia.qsrc
  33. 70 460
      locations/autosalonF.qsrc
  34. 16 10
      locations/autoservisF.qsrc
  35. 64 219
      locations/autotraidF.qsrc
  36. 4 5
      locations/avt.qsrc
  37. 2 2
      locations/backwater.qsrc
  38. 1 1
      locations/belpicknick.qsrc
  39. 49 26
      locations/bordel.qsrc
  40. 28 28
      locations/bordelv.qsrc
  41. 94 272
      locations/carF.qsrc
  42. 49 662
      locations/carF1.qsrc
  43. 4 4
      locations/changingroom.qsrc
  44. 1 1
      locations/cikl.qsrc
  45. 24 6
      locations/city_industrial.qsrc
  46. 8 8
      locations/cloakroom.qsrc
  47. 3 3
      locations/clothing.qsrc
  48. 1 1
      locations/clothing_QV.qsrc
  49. 6 0
      locations/cum_call.qsrc
  50. 29 24
      locations/dibodi.qsrc
  51. 30 29
      locations/din_pav.qsrc
  52. 2 2
      locations/dorm.qsrc
  53. 3 3
      locations/etoexhib.qsrc
  54. 1 1
      locations/fame.qsrc
  55. 5 5
      locations/gadforest_event.qsrc
  56. 16 16
      locations/gameover.qsrc
  57. 2 2
      locations/gschool_boys_bathroom.qsrc
  58. 36 36
      locations/gschool_cheerleading.qsrc
  59. 1 1
      locations/hunter_ambient.qsrc
  60. 2 2
      locations/hunter_favors.qsrc
  61. 13 13
      locations/hunter_interactions.qsrc
  62. 12 12
      locations/igorhunter.qsrc
  63. 61 73
      locations/ivanRoom.qsrc
  64. 1 1
      locations/journal_quests.qsrc
  65. 8 8
      locations/katjaEv.qsrc
  66. 6 6
      locations/liam.qsrc
  67. 0 93
      locations/loadg.qsrc
  68. 18 32
      locations/metro.qsrc
  69. 1 0
      locations/moncheri.qsrc
  70. 2 2
      locations/npcstatic2.qsrc
  71. 2 2
      locations/npcstatic5.qsrc
  72. 15 15
      locations/obroom.qsrc
  73. 1 1
      locations/parkBimbo.qsrc
  74. 2 2
      locations/pav_aptcourtev.qsrc
  75. 4 2
      locations/pav_park.qsrc
  76. 4 3
      locations/pav_residential.qsrc
  77. 2 2
      locations/podval_rape.qsrc
  78. 15 27
      locations/portnoi.qsrc
  79. 10 16
      locations/portnoi2.qsrc
  80. 12 12
      locations/preCUST.qsrc
  81. 5 5
      locations/preSYS2.qsrc
  82. 4 4
      locations/psiklin.qsrc
  83. 4 1
      locations/saveg.qsrc
  84. 824 893
      locations/saveupdater.qsrc
  85. 10 10
      locations/sergeihunter.qsrc
  86. 2 2
      locations/sexshop.qsrc
  87. 3 3
      locations/shop.qsrc
  88. 2 2
      locations/shop_fashionista.qsrc
  89. 2 2
      locations/shop_pussycats.qsrc
  90. 17 17
      locations/sister.qsrc
  91. 131 1
      locations/sister_chat.qsrc
  92. 2 2
      locations/sister_party.qsrc
  93. 13 13
      locations/sitrPar.qsrc
  94. 37 46
      locations/sny.qsrc
  95. 1 1
      locations/soniadisco.qsrc
  96. 80 80
      locations/spell.qsrc
  97. 25 25
      locations/spellList.qsrc
  98. 3 3
      locations/sportShop.qsrc
  99. 11 11
      locations/stallion.qsrc
  100. 2 2
      locations/start.qsrc

+ 1 - 5
.gitignore

@@ -11,11 +11,7 @@ avatar.*
 *.jpg
 *.jpeg
 *.sublime-*
-VideoDecodeStats/MANIFEST-000001
-VideoDecodeStats/CURRENT
-VideoDecodeStats/LOCK
-VideoDecodeStats/LOG
-VideoDecodeStats/LOG.old
+VideoDecodeStats/
 
 glmf.code-workspace
 

+ 8 - 8
build.sh

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

+ 4 - 4
locations/BurgerTip.qsrc

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

+ 38 - 29
locations/HotelHole.qsrc

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

+ 1 - 1
locations/LCwork.qsrc

@@ -229,7 +229,7 @@ if $ARGS[0] = 'start4':
 
 				gs 'arousal', 'anal', 20, 'sub', 'prostitution'
 				gs 'arousal', 'end'
-				gs 'cum_call', 'anal', $boy
+				gs 'cum_call', 'anus', $boy
 				gs 'stat'
 				
 				act 'Leave their apartment building':money += randLCpay & gt 'city_residential'

+ 66 - 66
locations/Snpc.qsrc

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

+ 21 - 21
locations/StasQW.qsrc

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

+ 7 - 7
locations/StasSex.qsrc

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

+ 11 - 11
locations/TV.qsrc

@@ -4,10 +4,10 @@ if $ARGS[0] = 'start':
 	elektro += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
-	'You turn on the TV and settled comfortably on the couch.'
+	'You turn on the TV and settle comfortably on the couch.'
 
-	if TV = 1:'Your ancient TV warms up and you''re greeted by adverts, the sound is terrible.'
-	if TV = 2:'Your huge plasma comes to life and you hear the crisp sound of some advert, it looks great in HD.'
+	if TV = 1:'Your ancient TV warms up, and you''re greeted by adverts. The sound is terrible.'
+	if TV = 2:'Your huge plasma comes to life, and you hear the crisp sound of some advert. It looks great in HD.'
 
 	if kabel = 0:
 		'You do not have cable, so it shows only one channel that''s just constant advertising and news.'
@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
 	end
 
-	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 	act 'Turn off the TV and get off the couch':
 		cla
 		gt $loc, $loc_arg
@@ -34,7 +34,7 @@ if $ARGS[0] = 'nokable':
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 	'You watch the network channel, lying on the couch. It''s all repeats and cheesy infomercials.'
 
-	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'nokable'
 	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
@@ -46,9 +46,9 @@ if $ARGS[0] = 'kable':
 	elektro += 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
-	'You watch cable television., it''s really good these days.'
+	'You watch cable television. It''s really good these days.'
 
-	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
 	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
@@ -61,7 +61,7 @@ if $ARGS[0] = 'pav':
 		tvtime = 1
 		gs 'stat'
 		'<center><video autoplay src="images/locations/gadukino/grandparents/tv/oldtvon.mp4"></video></center>'
-		'You turn on the TV and settled comfortably on the couch as you wait for the ancient TV to warm up. After 5 minutes or so, the tiny white dot at the center of the screen expands into a grainy black and white image that scrolls up and down for a few moments before settling.'
+		'You turn on the ancient TV and settle comfortably on the couch as you wait for it to warm up. After 5 minutes or so, the tiny white dot at the center of the screen expands into a grainy black and white image that scrolls up and down for a few moments before settling.'
 		act 'Continue': gt 'TV', 'pav'
 	elseif tvtime = 1:
 		*clr & cla
@@ -74,7 +74,7 @@ if $ARGS[0] = 'pav':
 			*clr & cla
 			tvtime = 0 
 			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
-			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squalk in protest.'
+			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squawk in protest.'
 			act 'Continue': gt $loc, $loc_arg
 		end
 	end
@@ -87,7 +87,7 @@ if $ARGS[0] = 'gad':
 		tvtime = 1
 		gs 'stat'
 		'<center><video autoplay src="images/locations/gadukino/grandparents/tv/oldtvon.mp4"></video></center>'
-		'You turn on the TV and settled comfortably on the couch as you wait for the ancient TV to warm up. After 5 minutes or so, the tiny white dot at the center of the screen expands into a grainy black and white image that scrolls up and down for a few moments before settling.'
+		'You turn on the ancient TV and settle comfortably on the couch as you wait for it to warm up. After 5 minutes or so, the tiny white dot at the center of the screen expands into a grainy black and white image that scrolls up and down for a few moments before settling.'
 		act 'Continue': gt 'TV', 'gad'
 	elseif tvtime = 1:
 		*clr & cla
@@ -100,7 +100,7 @@ if $ARGS[0] = 'gad':
 			*clr & cla
 			tvtime = 0 
 			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
-			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squalk in protest.'
+			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squawk in protest.'
 			act 'Continue': gt $loc, $loc_arg
 		end
 	end

+ 28 - 28
locations/TerminalOffice.qsrc

@@ -106,15 +106,15 @@ if $ARGS[0] = '11':
 		end
 		
 		if DoNotBuy = 2:
-			'You think about it for a while, realizing that you just have nowhere to store the goods and decide to downturn the purchase.'
+			'You think about it for a while, realize that you just have nowhere to store the goods and decide to turn down the purchase.'
 		else
 			!Produce purchase
-			act 'The small trinkets cost 100 <b>₽</b>, please put in how many trinkets you want to purchase':
+			act 'The small trinkets cost 100 <b>₽</b>. Please put in how many trinkets you want to purchase.':
 				minut += 13
 				MaxQuantityA = input("How many trinkets do you want to buy for 100 <b>₽</b> apiece?")
 				
 				if MaxQuantityA > (MaxQuantity1 + MaxQuantity2):
-					'<b><font color=red>You have nowhere to store the surplus <<MaxQuantityA-(MaxQuantity1 + MaxQuantity2)>> of trinkets.</front></b>'
+					'<b><font color=red>You have nowhere to store the surplus <<MaxQuantityA-(MaxQuantity1 + MaxQuantity2)>> ' + iif(MaxQuantityA - (MaxQuantity1 + MaxQuantity2) = 1, 'trinket', 'trinkets') + '.</front></b>'
 					cla
 					act 'Leave': gt 'TerminalOffice', '11'
 				end
@@ -123,11 +123,11 @@ if $ARGS[0] = '11':
 				
 				if MaxCost > money:
 					!If not enough money
-					'You don''t have enough money on you, you will have to withdraw money before proceeding with the purchase.'
+					'You don''t have enough money on you. You will have to withdraw money before proceeding with the purchase.'
 					if (money + karta >= MaxCost) or (karta >= MaxCost):
 						!The player can be plastic money
-						'You have enough money on your credit card and you offer them to pay with that.'
-						'"I''m sorry, we don''t own a card terminal." the Manager replies, "We accept only cash."'
+						'You have enough money on your credit card, and you offer them to pay with that.'
+						'"I''m sorry, we don''t own a card terminal," the Manager replies, "We accept only cash."'
 					end
 					cla
 					act 'Leave': gt 'TerminalOffice', '11'
@@ -155,7 +155,7 @@ if $ARGS[0] = '11':
 					end
 					
 					if YouCanGar = 0 and money > 100: 
-						'You''ve purchased plenty of trinkets, but you''ve been thinking about expanding your business, but where could you store it all? Maybe you should talk to the stepfather if you could use some free space in his garage...'
+						'You''ve purchased plenty of trinkets, but you''ve been thinking about expanding your business. But where could you store them all? Maybe you should ask your stepfather if you could use some free space in his garage...'
 					end
 					
 					cla
@@ -173,11 +173,11 @@ if $ARGS[0] = '11':
 				!Hammered warehouses
 				if MaxCost > money:
 					!If not enough money
-					'You don''t have enough money on you, you will have to withdraw money before proceeding with the purchase.'
+					'You don''t have enough money on you. You will have to withdraw money before proceeding with the purchase.'
 					if (money + karta >= MaxCost) or (karta >= MaxCost):
 						!The player can be plastic money
-						'You have enough money on your credit card and you offer them to pay with that.'
-						'"I''m sorry, we don''t own a card terminal." the Manager replies, "We accept only cash."'
+						'You have enough money on your credit card, and you offer them to pay with that.'
+						'"I''m sorry, we don''t own a card terminal," the Manager replies, "We accept only cash."'
 					end
 					
 					cla
@@ -207,7 +207,7 @@ if $ARGS[0] = '11':
 					end
 					
 					if YouCanGar = 0 and money > 100: 
-						'You''ve purchased plenty of trinkets, but you''ve been thinking about expanding your business, but where could you store it all? Maybe you should talk to the stepfather if you could use some free space in his garage...'
+						'You''ve purchased plenty of trinkets, but you''ve been thinking about expanding your business. But where could you store them all? Maybe you should ask your stepfather if you could use some free space in his garage...'
 					end
 					
 					cla
@@ -221,7 +221,7 @@ if $ARGS[0] = '11':
 		!Where the Director, the Door was closed dir
 		act 'Ask about the Director':
 			'"Excuse me, I wonder if I could meet your supervisor?" you ask.'
-			'The Manager grins, "Yuri is usually here every Monday through Friday, between 9:00 to 18:00 except lunch between 13:00 to 14:00."'
+			'The Manager grins, "Yuri is usually here every Monday through Friday, between 9:00 and 18:00 except lunch between 13:00 and 14:00."'
 			cla
 			act 'Leave': YouNotOpenDoorDir = 0 & gt 'TerminalOffice', '11'
 		end
@@ -231,7 +231,7 @@ if $ARGS[0] = '11':
 	if YouNotOpenDoorBuh = 1:
 		act 'Ask about the accountant':
 			'"Excuse me, I wonder if I could meet your accountant?" you ask.'
-			'The Manager grins, "Elizabeth is usually here Monday through Friday, between 9:00 to 20:00 except lunch between 13:00 to 14:00."'
+			'The Manager grins, "Elizabeth is usually here Monday through Friday, between 9:00 and 20:00 except lunch between 13:00 and 14:00."'
 			cla
 			act 'Leave': YouNotOpenDoorBuh = 0 & gt 'TerminalOffice', '11'
 		end
@@ -239,9 +239,9 @@ if $ARGS[0] = '11':
 	
 	!He Has papers, but a Manager should say to go to the accounting Department.
 	if AboutDocsManager=0 and BurgerQW['TerminalTask'] = 1 and BurgerQW['TerminalTaskDay'] = daystart:
-		'"I''m Anatoly Chubais from the company "OOO Bystroushka limited", do you have the required documents with you?"'
+		'"I''m Anatoly Chubais from the company "OOO Bystroushka limited". Do you have the required documents with you?"'
 		act 'Give him the documents':
-			'"Looks good. Go and see Elizabeth in the account department, she needs to register you. You can find her next door."'
+			'"Looks good. Go and see Elizabeth in the account department. She needs to register you. You can find her next door."'
 			cla
 			act 'Leave': AboutDocsManager=1 & gt 'TerminalOffice', '11'
 		end
@@ -249,7 +249,7 @@ if $ARGS[0] = '11':
 
 	!The GG yet topics of conversation.
 	if verakassir = 0 and YouNotOpenDoorDir = 0 and YouNotOpenDoorBuh = 0 and BurgerQW['TerminalTask'] = 0: 
-		'You have nothing to say or left to do, you can leave the office.'
+		'You have nothing to say or left to do. You can leave the office.'
 	end
 end
 
@@ -268,24 +268,24 @@ if $ARGS[0] = '21':
 		act 'Leave the office': minut += 1 & gt 'TerminalOffice', '00'
 		
 		!GG not a complete idiot, so will limit communication with only Buch documents, then that thread again
-		'A cute girl looks up from the monitor, turning to you and asks, "What can I help you with?"'
+		'A cute girl looks up from her monitor, turns to you and asks, "What can I help you with?"'
 		
 		if BurgerQW['TerminalTask'] = 1 and BurgerQW['TerminalTaskDay'] = daystart:
-			'"I was talking with Anatoly Chubais from the company ''OOO Bystroushka limited'', I was instructed to deliver these documents."'
-			'"Yes, I''ve been expecting these, may I?" she holds out her hand.'
+			'"I was talking with Anatoly Chubais from the company ''OOO Bystroushka limited''. I was instructed to deliver these documents."'
+			'"Yes, I''ve been expecting these, may I?" She holds out her hand.'
 			act 'Give her the documents':
 				cla
 				minut += 1
 				BurgerQW['TerminalTask'] = 2
 				gs 'stat'
-				'You hand the girl the folder, she opens it and quickly checks the content.'
+				'You hand the girl the folder. She opens it and quickly checks the contents.'
 				'"Tell Anatoly Borisovich that Elizabeth said thank you."'
 				'The girl smiles and then turns her attention to her monitor and starts rapidly typing away on her keyboard.'
 				
 				act 'Leave the office': minut += 1 & gt 'TerminalOffice', '00'
 			end
 		else
-			'You have nothing to say or left to do, you can leave the office.'
+			'You have nothing to say or left to do. You can leave the office.'
 		end
 		
 	else
@@ -293,7 +293,7 @@ if $ARGS[0] = '21':
 		cla
 		gs 'TerminalOffice', 'TerminalOfficeScreen', 'A door with a sign', 'terminal6'
 		act 'Move away from the door': minut += 1 & gt 'TerminalOffice', '00'
-		'You knock, but there is only silence. You try pushing down the handle, realizing that the door is locked. You''ll have to come back at a different time.'
+		'You knock, but there is only silence. You try pushing down the handle, but realize that the door is locked. You''ll have to come back at a different time.'
 		
 		YouNotOpenDoorBuh = 1
 		
@@ -314,7 +314,7 @@ if $ARGS[0] = '31':
 		act 'Leave the office': minut += 1 & gt 'TerminalOffice', '00'
 		
 		!Before the development of the plot 'Talk' the Director will constantly be on the phone and send he tries out of the office
-		'You knocked and opened the door. Behind a massive desk you see a man. He''s talking on the phone and apparently not in the mood. He''s a bit surpised as you weren''t the person he was expecting, so he dismissively waves his hand, clearly indicating that you need to leave the office.'
+		'You knock and open the door. Behind a massive desk, you see a man. He''s talking on the phone and apparently not in the mood. He''s a bit surprised as you aren''t the person he was expecting, so he dismissively waves his hand, clearly indicating that you need to leave the office.'
 		
 		if AboutBussines = 0: 
 			act 'Talk':
@@ -332,22 +332,22 @@ if $ARGS[0] = '31':
 			act 'Give him the documents':
 				gs 'TerminalOffice', 'TerminalOfficeScreen', 'The Director''s office', 'terminal1'
 				
-				'You walk up to the desk. However, you''re ignored by the man, but you refuse to turn back, you have an important assignment from the boss.'
-				'"I was told by Anatoly Chubais from the company "OOO Bystroushka limited", to hand over these documents to you."'
-				'The man stops talking on the phone, frowns, and pointing towards the door, "You need to head over to the accountant''s office."'
+				'You walk up to the desk. You''re ignored by the man, but you refuse to turn back, you have an important assignment from the boss.'
+				'"I was told by Anatoly Chubais from the company "OOO Bystroushka limited" to hand over these documents to you."'
+				'The man stops talking on the phone, frowns, and, pointing towards the door, asserts, "You need to head over to the accountant''s office."'
 				AboutDocs = 1
 				delact 'Give him the documents'
 			end
 		end
 		
-		if AboutBussines = 1 or AboutDocs = 1: 'You have nothing to say or left to do, you can leave the office.'
+		if AboutBussines = 1 or AboutDocs = 1: 'You have nothing to say or left to do. You can leave the office.'
 		
 	else
 		!The Director is not in place
 		cla
 		gs 'TerminalOffice', 'TerminalOfficeScreen', 'A door with a sign', 'terminal5'
 		act 'Move away from the door': minut += 1 & gt 'TerminalOffice', '00'
-		'You knock, but there is only silence. You try pushing down the handle, realizing that the door is locked. You''ll have to come back at a different time.'
+		'You knock, but there is only silence. You try pushing down the handle, but realize that the door is locked. You''ll have to come back at a different time.'
 		
 		YouNotOpenDoorDir = 1
 		

+ 5 - 5
locations/Timofei.qsrc

@@ -18,20 +18,20 @@ act 'Have a chat with Timofei':
 		if sosed = 1:
 			'Timofei tells you that he''s a college student but he''s going to graduate soon.'
 		elseif sosed = 2:
-			'Timofei tells you that he lives with his mother; his father filed for divorce a couple of years ago and now and lives with a new wife and children.'
+			'Timofei tells you that he lives with his mother; his father filed for divorce a couple of years ago and now lives with a new wife and children.'
 		elseif sosed = 3:
 			'Timofei tells you that he is working towards a law degree and his father promised to buy him a car if he succeeds.'
 		elseif sosed = 4:
-			'Timofei tells you that he has been taking dance lessons since he could walk and even today, he often practices at dancing at the fitness center.'
+			'Timofei tells you that he has been taking dance lessons since he could walk and, even today, he often practices dancing at the fitness center.'
 		elseif sosed = 5:
-			'Timofei tells you that he spends most of his evenings repairing computers. It costs him most of his freetime but at least he doesn''t have to rely on his parents for money.'
+			'Timofei tells you that he spends most of his evenings repairing computers. It costs him most of his free time, but at least he doesn''t have to rely on his parents for money.'
 		elseif sosed = 6:
-			'Timofei tells you that after college, he wants to go to the university and study law; he''ll probably have to serve in the military first, though.'
+			'Timofei tells you that, after college, he wants to go to the university and study law; he''ll probably have to serve in the military first though.'
 		elseif sosed >= 7:
 			'Timofei and you chat about life, computers and other things, cracking jokes and enjoying each other''s company.'
 		end
 	elseif sosedSlut = 1:
-		'You are trying to strike up a conversation but Timofei''s responses are taciturn and once he finishes his cigarette, he turns and leaves without another word.'
+		'You try to strike up a conversation, but Timofei''s responses are taciturn, and once he finishes his cigarette, he turns and leaves without another word.'
 	end
 
 	act 'Say goodbye and leave':gt 'etoexhib', 'pos51'

+ 7 - 9
locations/TimofeiMetro.qsrc

@@ -4,26 +4,24 @@ sosedMetroDay = daystart
 gs 'stat'
 ! Missing Image
 !!'<center><img <<$set_imgh>> src="images/characters/city/timothy/sosed.jpg"></center>'
-'Timofei saw you and greeted you, "Hello <<$pcs_nickname>>. How are you doing today?"'
-
-if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1 and sosedSlut = 0:'You chatted with Timofei while riding the subway.'
+'Timofei sees you and greets you, "Hello <<$pcs_nickname>>. How are you doing today?"'
 
 if sosedSlut = 1:
-	'As you greet each other, Timofei clearly signals that he is not interested keeping up a conversation with you.'
+	'As you greet each other, Timofei clearly signals that he is not interested in keeping up a conversation with you.'
 elseif sosedSlut = 0:
-	if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
+	if cumloc[6] = 1 or cumloc[7] = 1 or cumloc[11] = 1:
 		sosedSlut = 1
-
+		'You chat with Timofei while riding the subway.'
 		if cumloc[11] = 1:
-			'He looked puzzled at your face. "<<$pcs_nickname>>, your face is smeared in something." He stares at you and after a moment he realized that''s cum on her face. "What''s that? Cum?" he asks suspiciously.'
+			'He looks at your face puzzled. "<<$pcs_nickname>>, your face is smeared with something." He stares at you, and after a moment, he realizes that''s cum on her face. "What''s that? Cum?" he asks suspiciously.'
 		else
-			'The two of you are having a great conversation, before he suddenly notices semen on your clothes. As he comes to realization, his eyes noticeably widen, "What''s that? Cum?" he asks suspiciously.'
+			'The two of you are having a great conversation before he suddenly notices semen on your clothes. As he comes to the realization, his eyes noticeably widen. "What''s that? Cum?" he asks suspiciously.'
 		end
 
 		act 'Make an excuse':
 			cls
 			gs 'stat'
-			'You begin making excuses, claiming that it was all a missunderstanding and that you''re are absolutely innocent. But Timofei doesn''t believe you and only pays half attention to your explanation.'
+			'You begin making excuses, claiming that this is all a misunderstanding and that you''re are absolutely innocent. But Timofei doesn''t believe you and only half pays attention to your explanation.'
 
 			act 'Get out of the car':gt 'metro', 'start'
 		end

+ 197 - 136
locations/Vika.qsrc

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

+ 11 - 11
locations/Vnlake1.qsrc

@@ -1,6 +1,6 @@
 # Vnlake1
 '<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake1.jpg"></center>'
-'While you were sunbathing a tipsy girl holding a bottle of wine walks up to you, she sits down next to you and begins to stroke your back.'
+'While you are sunbathing, a tipsy girl holding a bottle of wine walks up to you. She sits down next to you and begins to stroke your back.'
 	
 gs 'willpower', 'sex', 'resist'
 if will_cost <= pcs_willpwr:	
@@ -17,7 +17,7 @@ act 'Kiss':
 	*clr
 	girl += 1
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake2.jpg"></center>'
-	'You turn to her and kiss her lips, she begins to fondle your breasts with her tongue, and her hand massages your pussy.'
+	'You turn to her and kiss her lips. She begins to fondle your breasts with her tongue, and her hand massages your pussy.'
 
 	gs 'arousal', 'give_kiss', 5, 'lesbian'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
@@ -31,7 +31,7 @@ if $ARGS[0] = 'variant':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake0.jpg"></center>'
-	'The girl looks at you in anticipation of your actions'
+	'The girl looks at you in anticipation of your actions.'
 
 	act 'Lick her':gt 'Vnlake1', 'ukuni'
 	act 'Ask her to lick you':gt 'Vnlake1', 'kuni'
@@ -48,7 +48,7 @@ if $ARGS[0] = 'ukuni':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake4.jpg"></center>'
-	'You kiss her breasts, eventually moving down lower and lower until your mouth reaches her pussy. You begin to caress her with your tongue, opening the route for your tongue to touch her clitoris, she pushes her lips apart with her fingers to give you full access and you lap away at her clitoris.'
+	'You kiss her breasts, eventually moving down lower and lower until your mouth reaches her pussy. You begin to caress her with your tongue, opening the route for your tongue to touch her clitoris. She pushes her lips apart with her fingers to give you full access, and you lap away.'
 
 	gs 'arousal', 'cuni_give', 10, 'lesbian'
 	gs 'stat'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'kuni':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake5.jpg"></center>'
-	'The Girl runs her tongue over your thighs, crotch and delicately kisses your vagina, her tongue slides over your slit then caressing your clitoris it penetrates your vagina.'
+	'The girl runs her tongue over your thighs and crotch and delicately kisses your vagina. Her tongue slides over your slit then, caressing your clitoris, it penetrates your vagina.'
 
 	gs 'arousal', 'cuni', 10, 'lesbian'
 	gs 'stat'
@@ -74,7 +74,7 @@ if $ARGS[0] = 'anuli':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake6.jpg"></center>'
-	'She kisses your buttocks affectionately, eventually moving to the center. Reaching her goal, she spends your anus with her tongue, then shoves it inside, pulls back to again lick the anus, then repeats several times.'
+	'She kisses your buttocks affectionately, eventually moving to the center. Reaching her goal, she spreads your anus with her tongue, then shoves it inside, pulls back to again lick the anus, then repeats several times.'
 
 	gs 'arousal', 'cuni', 10, 'lesbian'
 	gs 'stat'
@@ -87,7 +87,7 @@ if $ARGS[0] = 'bvag':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake7.jpg"></center>'
-	'You take the bottle neck and poke it into her pussy, she kisses you while you are driving with one hand and with the other, fondle her breasts.'
+	'You take the bottle neck and poke it into her pussy. She kisses you while you drive it in and out with one hand and, with the other, fondle her breasts.'
 
 	gs 'arousal', 'vaginal_dildo_give', 10, 'lesbian'
 	gs 'stat'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'ubvag':
 	*clr
 	orgasm += 1
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake9.jpg"></center>'
-	'The girl puts the bottle on your pussy, she moves it back and forth while constantly turning it. It feels really good and just keeps getting better, you start to fantasize having sex with a stranger, when your body shudders in orgasm.'
+	'The girl puts the bottle in your pussy. She moves it back and forth while constantly turning it. It feels really good and just keeps getting better. You start to fantasize about having sex with a stranger as your body shudders in orgasm.'
 
 	$orgasm_or = 'yes'
 	gs 'arousal', 'vaginal_dildo', 10, 'lesbian'
@@ -127,7 +127,7 @@ if $ARGS[0] = 'ubanal':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake10.jpg"></center>'
-	'The girl spits on your ass, collects saliva on the bottle neck and inserts it into your anus, you feel the glass slide into your ass, bringing you pleasure.'
+	'The girl spits on your ass, collects saliva on the bottle neck and inserts it into your anus. You feel the glass slide into your ass, bringing you pleasure.'
 
 	gs 'arousal', 'anal_dildo', 10, 'lesbian'
 	gs 'stat'
@@ -140,7 +140,7 @@ if $ARGS[0] = 'ubsit':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake11.jpg"></center>'
-	'You put the bottle down and sit on it with your anus, you like the slippery feel of it, she caresses your breasts with her tongue until you get back off the bottle.'
+	'You put the bottle down and sit on it with your anus. You like the slippery feel of it. The girl caresses your breasts with her tongue until you get back off the bottle.'
 
 	gs 'arousal', 'anal_dildo', 10, 'lesbian'
 	gs 'stat'
@@ -153,7 +153,7 @@ if $ARGS[0] = 'sex':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake1/vnlake12.jpg"></center>'
-	'You sit across from each other, your legs interwoven so your pussies touch and started to moving your hips caress each other. You carry on doing this while kissing and touching each other until the wave of pleasure covers you both.'
+	'You sit across from each other, your legs interwoven so your pussies touch, and start to move your hips while caressing each other. You carry on doing this while kissing and touching each other until the wave of pleasure covers you both.'
 
 	$orgasm_or = 'yes'
 	gs 'arousal', 'trib', 10, 'lesbian'

+ 8 - 8
locations/Vnlake2.qsrc

@@ -1,6 +1,6 @@
 # Vnlake2
 '<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake2/vnlake1.jpg"></center>'
-'Whilst tanning you doze off, and you dream about your breasts being caressed, as someones tongue pleasures your pussy. You open your eyes and understand that this is not a dream, next to you two men one caressing your breasts, the second has already dug his head between your legs.'
+'Whilst tanning, you doze off, and you dream about your breasts being caressed as someone''s tongue pleasures your pussy. You open your eyes and understand that this is not a dream. Next to you, two men one caressing your breasts, the second has already dug his head between your legs.'
 
 gs 'willpower', 'sex', 'resist'
 if will_cost <= pcs_willpwr:		
@@ -20,7 +20,7 @@ act 'Touch member':
 	gs 'boyStat', $npclastgenerated
 	guy += 2
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake2/vnlake2.jpg"></center>'
-	'You touch one of their members and smile invitingly as you get up on to your knees. The men rise and stand next to you, their members close to you, you take them in your hands hand and begin to suck alternately.'
+	'You touch one of their members and smile invitingly as you get up onto your knees. The men rise and stand next to you, their members close to you. You take them in your hands and begin to suck them, alternating between one and the other.'
 	gs 'arousal', 'bj', 10, 'group'
 	gs 'stat'
 
@@ -28,7 +28,7 @@ act 'Touch member':
 		cls
 		minut -= 10
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake2/vnlake3.jpg"></center>'
-		'Having sucked them enough you get on to all fours, one of the men lies in front of you and you take his cock in your mouth, the second kneels behind you and drives himself into your vagina.'
+		'Having sucked them enough, you get on to all fours. One of the men lies in front of you, and you take his cock in your mouth. The second kneels behind you and drives himself into your vagina.'
 		gs 'arousal', 'bj', 10, 'group'
 		gs 'boyStat', $boy1
 		gs 'arousal', 'vaginal', 10, 'group'
@@ -39,9 +39,9 @@ act 'Touch member':
 			minut -= 20
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake2/vnlake4.jpg"></center>'
 			gs 'arousal', 'auto_lube', 'anal'
-			'You move forwards and sit on the cock that was in your mouth, hands on your buttocks you present your ass to the other, encouraged he accepts. They fuck you in both holes, while you moan loudly.'
-			'This continues for what feels like forever as you are lost in bliss, finally the member in your ass is removed, you are spent and happy to finish now.'
-			'"Sit your ass here" says the man on the bottom.'
+			'You move forwards and sit on the cock that was in your mouth. Hands on your buttocks, you present your ass to the other. Encouraged, he accepts. They fuck you in both holes, while you moan loudly.'
+			'This continues for what feels like forever as you are lost in bliss. Finally, the member in your ass is removed. You are spent and happy to finish now.'
+			'"Sit your ass here," says the man on the bottom.'
 			gs 'arousal', 'vaginal', 20, 'group'
 			gs 'boyStat', $npclastgenerated
 			gs 'arousal', 'anal', 20, 'group'
@@ -53,7 +53,7 @@ act 'Touch member':
 				spafinloc = 4
 				gs 'cum_manage'
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake2/vnlake5.jpg"></center>'
-				'You get up, turn around and sit your ass down on the member, the other man stands next to your face and you eagerly take his cock your mouth. Soon you feel that your ass has been flooded with sperm and the dick in your mouth is twitching as the guy struggles to hold back.'
+				'You get up, turn around and sit your ass down on his member. The other man stands next to your face, and you eagerly take his cock in your mouth. Soon, you feel that your ass has been flooded with sperm and the dick in your mouth is twitching as the guy struggles to hold back.'
 				gs 'arousal', 'anal', 5, 'group'
 				gs 'boyStat', $boy1
 				gs 'arousal', 'bj', 10, 'group'
@@ -66,7 +66,7 @@ act 'Touch member':
 					spafinloc = 11
 					gs 'cum_manage'
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vnlake2/vnlake6.jpg"></center>'
-					'You spit the dick out of your mouth and the man splatters your face with his load.'
+					'You spit the dick out of your mouth, and the man splatters your face with his load.'
 					gs 'arousal', 'end'
 					gs 'stat'
 

+ 4 - 4
locations/VolkovHome.qsrc

@@ -30,9 +30,9 @@ if $ARGS[0] = 'Hallway 2':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/volkovhome/rooms/hallway2.jpg"></center>'
 	if NikoEv = 18:
-		'This is the second floor hallway where the bathroom, Niko''s room and Yurik''s room is located.'
+		'This is the second floor hallway where the bathroom, Niko''s room and Yurik''s room are located.'
 	else
-		'This is the second floor hallway where the <a href="exec:gt ''VolkovHome'', ''Bathroom''">Bathroom</a>, <a href="exec:gt ''VolkovHome'', ''Niko Bedroom''">Niko''s room</a> and <a href="exec:gt ''VolkovHome'', ''Yurik Bedroom''">Yurik''s room</a> is located.'
+		'This is the second floor hallway where the <a href="exec:gt ''VolkovHome'', ''Bathroom''">bathroom</a>, <a href="exec:gt ''VolkovHome'', ''Niko Bedroom''">Niko''s room</a> and <a href="exec:gt ''VolkovHome'', ''Yurik Bedroom''">Yurik''s room</a> are located.'
 	end
 
 	act 'Head downstairs':gt 'NikoEv2', 'Yurik BJ'
@@ -51,7 +51,7 @@ if $ARGS[0] = 'Bathroom':
 	menu_off = 0
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/volkovhome/rooms/bathroom.jpg"></center>'
-	'This bathroom seems rather clean, and has two towels, two bathrobes, a sink, a toilet, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, and a bathtub.'
+	'This bathroom seems rather clean and has two towels, two bathrobes, a sink, a toilet, a <a href="exec:gt ''mirror'', ''start''">mirror</a>, and a bathtub.'
 
 	act 'Quick wash (0:10)':gt 'NikoDates', 'Quick Wash'
 
@@ -77,7 +77,7 @@ if $ARGS[0] = 'Quick Wash':
 	gs'stat'
 	'<center><h4><font color="blue">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/movies/restroom/facecleanse.jpg"></center>'
-	'You grab a few paper towels then approach the sink to clean yourself, as thoroughly, as possible while taking a few seconds to enjoy a splash of warm water on your face, leaving you feeling refreshed as you finish up and walk away from the sink.'
+	'You grab a few paper towels then approach the sink to clean yourself as thoroughly as possible. You take a few seconds to enjoy a splash of warm water on your face, leaving you feeling refreshed as you finish up and walk away from the sink.'
 
 	act 'Dry off':
 		if NikoEv = 5:

+ 29 - 29
locations/VolleyTrenCentr.qsrc

@@ -11,58 +11,58 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak18.jpg"></center>'
 if ShowerIvan = 4 and centr = 1:
 	centr = 2
-	'You entered the gym and saw your coach talking to a strange man.'
+	'You enter the gym and see your coach talking to a strange man.'
 	act 'Say hello to Coach':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak11.jpg"></center>'
-		'After greeting Mikhail, an awkward silence followed, because you didn''t know what to say.'
-		'"<<$pcs_nickname>>, what are you doing here?" Mikhail asked you in astonishment.'
-		'"Well, I wanted to improve my physical fitness and since the sports club doesn''t open until 14:00, I figured it was worth the trip into the city to come here," you explained hastily.'
-		'The coach looked at you with an approving nod, "That is good, <<$pcs_nickname>>."'
-		'The stranger smiled at you and said, "I am Guang. Your coach and I are old friends from when we used to compete against each other. He represented the people of the Soviet Republics and I, naturally, represented the people of the republic of China. After my team beat his so many times, his government finally convinced me to change sides as it were. Now I train the atheletes of the Russian Federation and Mikhail and I meet here from time to time."'
-		'"I am sorry, <<$pcs_nickname>> and Guang, but my wife is expecting me and I must be going," the coach said, looking at his watch then departed leaving you in the company of the Chinese trainer.'
+		'After greeting Mikhail, an awkward silence follows because you don''t know what to say.'
+		'"<<$pcs_nickname>>, what are you doing here?" Mikhail asks you in astonishment.'
+		'"Well, I wanted to improve my physical fitness, and since the sports club doesn''t open until 14:00, I figured it was worth the trip into the city to come here," you explain hastily.'
+		'The coach looks at you with an approving nod, "That is good, <<$pcs_nickname>>."'
+		'The stranger smiles at you and says, "I am Guang. Your coach and I are old friends from when we used to compete against each other. He represented the people of the Soviet Republics, and I, naturally, represented the people of the Republic of China. After my team beat his so many times, his government finally convinced me to change sides as it were. Now I train the athletes of the Russian Federation, and Mikhail and I meet here from time to time."'
+		'"I am sorry, <<$pcs_nickname>> and Guang, but my wife is expecting me and I must be going," the coach says, looking at his watch. He then departs, leaving you in the company of the Chinese trainer.'
 		act 'Ask about the coach':
 			cla & *clr
 			
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak12.jpg"></center>'
-			'As soon as Mikhail left, you bombarded the other trainer with questions about the coach, wanting to know about his life, his girlfriend, about competitions and, of course, about the European championship. Dumbfounded, Guang stared at you, unable to get a word in edgewise for the next few minutes as you jumped from subject to subject without pause.' 
-			'Guang finally managed to force himself into the conversation as you paused momentarily to draw in a breath.'
-			'"If you don''t know these things, it means that Misha didn''t tell you, so why should I tell you and betray my friend''s trust?" he asked you.'
-			'You were at a loss, not knowing how to proceed. Fearing that he was going to continue to scold you, you prepared to leave.'
-			'"Now, if you had some huangjiu, I would happily answer some of your questions," he said dreamily.'
-			'You stared at the Chinese trainer in puzzlement, not understanding what he is asking for.'
-			'"Huangjiu is rice wine from my country," he explained sighing wistfully, "Sadly, it is hard to find outside of great cities like St. Petersburg or Moscow."'
+			'As soon as Mikhail left, you bombard the other trainer with questions about the coach, wanting to know about his life, his girlfriend, competitions and, of course, the European championship. Dumbfounded, Guang stares at you, unable to get a word in edgewise for the next few minutes as you jump from subject to subject without pause.' 
+			'Guang finally manages to force himself into the conversation as you pause momentarily to draw in a breath.'
+			'"If you don''t know these things, it means that Misha didn''t tell you, so why should I tell you and betray my friend''s trust?" he asks you.'
+			'You are at a loss, not knowing how to proceed. Fearing that he is going to continue to scold you, you prepare to leave.'
+			'"Now, if you had some huangjiu, I would happily answer some of your questions," he says dreamily.'
+			'You stare at the Chinese trainer in puzzlement, not understanding what he is asking for.'
+			'"Huangjiu is rice wine from my country," he explains sighing wistfully, "Sadly, it is hard to find outside of great cities like St. Petersburg or Moscow."'
 			'"Okay, so if I bring you a bottle of wungzoo wine you will answer my questions?" you ask eagerly.'
-			'"Huangjiu," he corrected you, "it is called huangjiu. If you find me a bottle, I will answer any question you like."'
-			'"It is a deal," you exclaimed and started to head for the door then turned back to Guang, "Where can I find your rice wine, your Huangjiu?"'
-			'The older man just smiled at you and shrugged.'
+			'"Huangjiu," he corrects you, "it is called huangjiu. If you find me a bottle, I will answer any question you like."'
+			'"It is a deal," you exclaim and start to head for the door then turn back to Guang, "Where can I find your rice wine, your huangjiu?"'
+			'The older man just smiles at you and shrugs.'
 			'You think about it and remember there were a couple of Chinese merchants at the market back home. Maybe one of them will have the rice wine.'
 			ShowerIvan = 5
 			act 'Move away':gt 'fit', 'start'
 		end
 	end
 elseif ShowerIvan = 5 and centr = 2:
-	'You saw Guang and hurried over to him.'
+	'You see Guang and hurry over to him.'
 	act 'Greet Guang':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak13.jpg"></center>'
-		'You went up to Guang and said hello.' 
-		'"Have you brought it?" he asked.'
+		'You go up to Guang and say hello.' 
+		'"Have you brought it?" he asks.'
 		if ricewine = 1:
 			act 'Give him the wine':
 				cla
 				ricewine = 2 & ! to close out the rice wine quest
 				ShowerIvan = 6 &! close Chinese
-				'You show him the bottle of wine and stared questioningly at the other coach.'
-				'Guang sighed, "Okay, I will answer one of your questions, but don''t bug me anymore, and slow down, you talk like a rabid monkey."'
-				'You felt offended for being compared to a rabid monkey, but you restrained yourself.'
+				'You show him the bottle of wine and stare questioningly at the other coach.'
+				'Guang sighs, "Okay, I will answer one of your questions, but don''t bug me anymore, and slow down, you talk like a rabid monkey."'
+				'You feel offended being compared to a rabid monkey, but you restrain yourself.'
 				act 'Ask question':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak15.jpg"></center>'
-					'About the European championship, tell me why the coach doesn''t want to talk about it," you asked after taking a deep breath.' 
-					'Guang bit his lip thoughtfully, then began the story.' 
+					'About the European championship, tell me why the coach doesn''t want to talk about it," you ask after taking a deep breath.' 
+					'Guang bites his lip thoughtfully, then begins the story.' 
 					'"The stories are true, your coach really was on the national team. And they did make it to the European championships."'
-					'With bated breath you listened to the story.'
+					'With bated breath, you listen to the story.'
 					act 'Play on':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenerspeak14.jpg"></center>'
@@ -74,8 +74,8 @@ elseif ShowerIvan = 5 and centr = 2:
 							act 'Surprised':
 								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 thought to yourself.'
+								'"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.'
 								act 'Move away':gt 'fit', 'start'
 							end
 						end
@@ -83,7 +83,7 @@ elseif ShowerIvan = 5 and centr = 2:
 				end
 			end
 		else
-			'"Why are you here then?" he asked as he walked away from you.'
+			'"Why are you here then?" he asks as he walks away from you.'
 			act 'Move away':gt 'fit', 'start'
 		end
 	end

+ 13 - 13
locations/VolleyTrenerSpeak.qsrc

@@ -15,14 +15,14 @@ if volleysostav > 0:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener2.jpg"></center>'
 		'You go up to Mikhail Nikolaevich, and politely say hello.'
 		'"<<$pcs_lastname>>, I was told you were here, are you really that stupid? There''s a game tomorrow!"'
-		'"I... err... was... erm... dropping off a book for a friend." you mumble.'
+		'"I... err... was... erm... dropping off a book for a friend," you mumble.'
 		if alko > 1:
 			'"You''ve been drinking! If you can''t even take the team seriously, then you''re not playing tomorrow."'
 			npc_rel['A69'] -= 1
 ! The flag is for no admission to the game on Saturday
 			seealko = 1 
 		end
-		'"Come on I''d better take you home." The coach says. Looks like you are done with the dance for tonight.'
+		'"Come on I''d better take you home," The coach says. Looks like you are done with the dance for tonight.'
 
 		act 'Go with the coach':
 			Discoclose = 1 &!closing disco on this day not to forget stat
@@ -32,36 +32,36 @@ if volleysostav > 0:
 			gs 'stat'
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
-			'You walk through town, as you get near your apartment, the coach stops and turns to you to say something.'
+			'You walk through town. As you get near your apartment, the coach stops and turns to you to say something.'
 			act 'Listen to him': gt 'Voltrener', 'trener_speak'
 		end
 	end
 else
 	!---------------------------While not in the squad-------------------------
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener1.jpg"></center>'
-	'You go up to Mikhail Nikolaevich, and politely say hello.'
+	'You go up to Mikhail Nikolaevich and politely say hello.'
 	if pcs_vball < 20:
-		'Mikhail turns and looks at you. "Uh... have we met?" He doesn''t seem to recognize you. "Ah, I''ve seen you at school, you''re in pretty good shape, you should come to volleyball training".'
+		'Mikhail turns and looks at you. "Uh... have we met?" He doesn''t seem to recognize you. "Ah, I''ve seen you at school. You''re in pretty good shape, you should come to volleyball training."'
 	elseif pcs_vball < 35:
-		'The coach looked at you with condemnation. "<<$pcs_lastname>>, well done, you''re getting a hang of the basics. You don''t belong here though... although, what do I know?"'
+		'The coach looks at you with condemnation. "<<$pcs_lastname>>, well done. You''re getting a hang of the basics. You don''t belong here though... although, what do I know?"'
 	elseif pcs_vball < 60:
-		'The coach looked at you with condemnation. "<<$pcs_lastname>> you were pretty good in training, but places like this help to regress the formation of skills. You should go home."'
+		'The coach looks at you with condemnation. "<<$pcs_lastname>>, you were pretty good in training, but places like this help to regress the formation of skills. You should go home."'
 	elseif pcs_vball < 80:
-		'The coach looked at you with condemnation. "What are you doing here?"'
+		'The coach looks at you with condemnation. "What are you doing here?"'
 		'"What are you doing here?" You turn the question back onto him.'
-		'"<<$pcs_lastname>>, don''t piss me off, what I do is my business, and what are you doing here is also my business.'
+		'"<<$pcs_lastname>>, don''t piss me off. What I do is my business, and what you are doing here is also my business.'
 		if pcs_horny > 79:
 			trenerlust += 1
-			'"Is that the truth, Mr. Nikolaevich? Are you here because of me?" You move closer to the coach, and flutter your eyes at him.'
+			'"Is that the truth, Mr. Nikolaevich? Are you here because of me?" You move closer to the coach and flutter your eyes at him.'
 			'"I meant as your coach, and don''t think you can win just by fluttering your eyes. Want to impress me? Workout, and no partying."'
 		else
-			'"As your coach." he adds with a slight blush.'
+			'"As your coach," he adds with a slight blush.'
 		end
 	else
-		'The coach looked at you with condemnation. "<<$pcs_lastname>> you here again, what the fuck? This is not the place for candidates for the team.'
+		'The coach looks at you with condemnation. "<<$pcs_lastname>>, you here again, what the fuck? This is not the place for candidates for the team.'
 		'"Mr. Nikolaevich, you never said anything about not going out on a Friday."'
 		'"<<$pcs_lastname>>, are you thick? When does the team play?"'
-		'"Saturday." You respond, sheepishly.'
+		'"Saturday," you respond, sheepishly.'
 		'"So, on Friday I expect my players not to hang out here but go home and get some sleep. Or they aren''t going to be fit to play tomorrow. Clear? You have some skill, sort out your attitude and you might yet make the team."'
 	end
 end

+ 2 - 2
locations/Voltrener.qsrc

@@ -149,7 +149,7 @@ if $ARGS[0] = 'talk':
 		elseif pcs_vball < 40:
 			'Mikhail looks at you and says, "<<$pcs_lastname>>. You certainly don''t play bad, at least not for an amateur. With more work you could reach a higher level."'
 		else
-			'Mikhail looks at you and says, "Ah, <<$pcs_lastname>>. You have the makings of an athlete, though I''m not sure if you are up to a professional level yet."'
+			'Mikhail looks at you and says, "Ah, <<$pcs_lastname>>, you have the makings of an athlete, though I''m not sure if you are up to a professional level yet."'
 			act 'Ask to join the team':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
@@ -522,7 +522,7 @@ if $ARGS[0] = 'trener_speak':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener5.jpg"></center>'
 		'Mikhail smiles at you, gives a thumbs up, and says, "<<$pcs_nickname>>, I want to congratulate you, I think. I''ve decided to make you a first string regular. From now on, you''ll be starting."'
 		'"But," he adds, shaking his finger at you admonishingly. "You still need to keep practicing, and less drinking!"'
-		'You squeal happily and threw your arms around the Mikhail''s neck. "Now we have them... I always... Yes we like..." The excitement of the unexpected anouncement left you unable to speak and Mikhail just smiles at you and says "Go."'
+		'You squeal happily and threw your arms around the Mikhail''s neck. "Now we have them... I always... Yes we like..." The excitement of the unexpected announcement left you unable to speak and Mikhail just smiles at you and says "Go."'
 		volleysostav = 2
 	else
 		npc_rel['A69'] += 1

+ 28 - 28
locations/VoltrenerSexShower.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = '1':
 	act 'Scream':
 		cls
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower4.jpg"></center>'
-		'You scream with fright and the coach quickly runs out.'
+		'You scream with fright, and the coach quickly runs out.'
 		act 'Finish shower': gt 'gdksport', 'start'
 	end
 	gs 'willpower', 'exhib', 'self', 'easy'
@@ -44,14 +44,14 @@ if $ARGS[0] = '1':
 			trenerlust += 2
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower6.jpg"></center>'
-			'You smiled at Mikhail Nikolaevich, and continued to wash, making a show of cleaning your bulging ass and breasts, coach watches, but stays perfectly still.'
+			'You smile at Mikhail Nikolaevich and continue to wash, making a show of cleaning your bulging ass and breasts. The coach watches but stays perfectly still.'
 			VoltrenerVoyeur += 1
 			pcs_horny += 10
 			gs 'stat'
 			act 'Dry yourself off':
 				cls
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower5.mp4"></video></center>'
-				'Stepping out of the shower, you are not at all embarrassed by the coach who continues to stare at you. Drying yourself on a towel you ask, "Get everything you wanted, coach?" The coach smiles, then shakes his head, before leaving slowly.'
+				'Stepping out of the shower, you are not at all embarrassed by the coach who continues to stare at you. Drying yourself with a towel, you ask, "Get everything you wanted, coach?" The coach smiles, then shakes his head, before leaving slowly.'
 				act 'Finish shower': gt 'gdksport', 'start'
 			end
 		end
@@ -63,11 +63,11 @@ end
 if $ARGS[0] = '2':
 	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower1.jpg"></center>'
-	'You hear a suspicious noise. Wiping the steam off the glass, you see coach there his cock in his hand, looking at your silhouette...'
+	'You hear a suspicious noise. Wiping the steam off the glass, you see coach there, his cock in his hand, looking at your silhouette...'
 	act 'Flip him off':
 		cls
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower7.jpg"></center>'
-		'The coach takes the hint and tucking his cock away, does up his trousers and leaves. "It seems he did not have time to cum." You think with a touch of glee."'
+		'The coach takes the hint and, tucking his cock away, does up his trousers and leaves. "It seems he did not have time to cum." You think with a touch of glee."'
 		act 'Leave':gt 'gdksport', 'start'
 	end
 	gs 'willpower', 'exhib', 'self'
@@ -81,12 +81,12 @@ if $ARGS[0] = '2':
 			gs 'stat'
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower8.jpg"></center>'
-			'You stop, and falling into a stupor for a few seconds, feeling a fire in your belly you want to do it, but you still hesitate. Watching you frozen with your hand on your pussy, coach says, "Don''t be afraid, you''re a big girl now and it''s normal to have urges. You''ve let me watch you, now you can watch me."'
+			'You stop and fall into a stupor for a few seconds, feeling a fire in your belly. You want to do it, but you still hesitate. Watching you frozen with your hand on your pussy, coach says, "Don''t be afraid, you''re a big girl now and it''s normal to have urges. You''ve let me watch you, now you can watch me."'
 			act 'Watch him':
 				cls
 				pcs_mood = 100
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower9.mp4"></video></center>'
-				'You look at his cock as if spellbound... At the same time caressing your Clit, and struggling to suppressing a groan. You see his hand stroking his member, the head appearing, and disappearing. Shaking his balls... The coach groans, and his dick squirts straight at you. Sperm splashes on your body, destroying your resolve, you shake in a powerful orgasm. Through the waves of orgasm you hardly hear what the coach is saying, "That was fun, we should do it again sometime."'
+				'You look at his cock as if spellbound... at the same time caressing your clit and struggling to suppress a groan. You see his hand stroking his member, the head appearing and disappearing. Shaking his balls... the coach groans, and his dick squirts straight at you. Sperm splashes on your body, destroying your resolve, and you shake in a powerful orgasm. Through the waves of orgasm you just barely manage to make out what the coach is saying: "That was fun, we should do it again sometime."'
 				$orgasm_or = 'yes'
 				gs 'arousal', 'masturbate', 10, 'exhibitionism'
 				gs 'arousal', 'end'
@@ -102,12 +102,12 @@ end
 if $ARGS[0] = '3':
 	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower10.jpg"></center>'
-	'Leaning against the glass and sticking out your ass, you moan from the pounding your ass is receiving. What the fuck is that moving the other side of the glass?'
-	act 'To get a better look':
+	'Leaning against the glass and sticking out your ass, you moan from the pounding your ass is receiving. What the fuck is that moving on the other side of the glass?'
+	act 'Get a better look':
 		cls
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower19.jpg"></center>'
-		'You wipe the steam off a patch of the glass in front of you and see coach sitting in the dark, watching as Ivan fucks you in the ass. When he got here and how much he''s seen, you don''t know, but your eyes meet and you are hit by a wave of shame and arousal. You literally throw yourself forward trying to jump off Ivan''s member, but your shaky legs betray you.'
-		'Whether from Ivan''s actions, the fact that the coach is watching you, or the combination of both you begin to cum violently shouting and rhythmically squeezing your classmates cock with your anus. This is more than enough to send Ivan over the edge, his cum filling your ass.'
+		'You wipe the steam off a patch of the glass in front of you and see coach sitting in the dark, watching as Ivan fucks you in the ass. When he got here and how much he''s seen, you don''t know, but your eyes meet, and you are hit by a wave of shame and arousal. You literally throw yourself forward trying to jump off Ivan''s member, but your shaky legs betray you.'
+		'Whether from Ivan''s actions, the fact that the coach is watching you, or the combination of both, you begin to cum violently, shouting and rhythmically squeezing your classmates cock with your anus. This is more than enough to send Ivan over the edge, his cum filling your ass.'
 		pcs_mood = 100
 		$orgasm_txt = 'The sudden feeling of being watched, was new, acute, the orgasm intense. You drop to the floor of the shower and lay there helplessly for some time.'
 		$orgasm_or = 'custom'
@@ -126,9 +126,9 @@ if $ARGS[0] = '3':
 					gs 'willpower', 'pay', 'resist'
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower12.jpg"></center>'
-					'Scared, you cover your ass with your hands and look at him like a deer caught in the headlights.'
+					'Scared, you cover you ass with your hands and look at him like a deer caught in the headlights.'
 					'Mikhail Nikolaevich gives you an evil look, "Prokhorov fucks your ass and you scream with joy, but your coach just wants to alleviate some tension and you curl up all scared?"'
-					'You can see from the look in his eyes that he''s been at the wine and his slurring and unsteady legs confirm this. "Your ass isn''t that special." He spits on you and stumbles out of the showers.'
+					'You can see from the look in his eyes that he''s been at the wine, and his slurring and unsteady legs confirm this. "Your ass isn''t that special." He spits on you and stumbles out of the showers.'
 					gs 'stat'
 					act 'Wash your ass':
 						noShampoo = 1
@@ -144,7 +144,7 @@ if $ARGS[0] = '3':
 				trenerlust += 2
 				cls
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower11.mp4"></video></center>'
-				'You have no idea what he means but a simple gesture makes it clear what he wants. You willingly grab your but cheeks stretch them apart giving coach full view of your holes. The coach walks up to you his cock in his hand and with just a few quick jerk sprays his seed over your ass his cum mixing with Ivan''s as it dribbles out of your butt.'
+				'You have no idea what he means, but a simple gesture makes it clear what he wants. You willingly grab your butt cheeks and stretch them apart, giving coach full view of your holes. The coach walks up to you his cock in his hand, and with just a few quick jerks, sprays his seed over your ass, his cum mixing with Ivan''s as it dribbles out of your butt.'
 				gs 'arousal', 'flash', 10
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -162,7 +162,7 @@ if $ARGS[0] = '4':
 	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower10.jpg"></center>'
 	'Leaning against the glass and sticking out your ass, you moan from the pounding your ass is receiving. You can see movement through the glass...'
-	act 'To get a better look':
+	act 'Get a better look':
 		cls
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower19.jpg"></center>'
 		'It seems Mikhail, again, decided to admire how your classmate fucks your anus, but Ivan is too busy with your ass to notice anything. You decide to tease the coach a little...'
@@ -171,7 +171,7 @@ if $ARGS[0] = '4':
 		act 'Drop to your knees':
 			cls
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower14.mp4"></video></center>'
-			'You get on my knees and begin to carefully suck Ivan''s member, which has just been in your ass. Surprised, you hear a satisfied snort from both parties, the participant and the viewer. It seems they like what''s happening. You accidentally nudge the door into the shower and it opens, giving the coach an unobstructed view of what you plan to do next.'
+			'You get on your knees and begin to carefully suck Ivan''s member. Surprised, you hear a satisfied snort from both parties, the participant and the viewer. It seems they like what''s happening. You accidentally nudge the door into the shower, and it opens, giving the coach an unobstructed view of what you plan to do next.'
 			gs 'arousal', 'bj', 5, 'sub', 'exhibitionism'
 			gs 'stat'
 			act 'Lick his balls':
@@ -184,11 +184,11 @@ if $ARGS[0] = '4':
 					cls
 					facial += 1
 					'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower16.mp4"></video></center>'
-					'It seems Ivan never expected this, but moments later jets of sperm begin fountaining from his member and heavy, warm drops start falling on your face. He clearly liked it very much.'
+					'It seems Ivan never expected this, but moments later, jets of sperm begin fountaining from his member, and heavy, warm drops start falling on your face. He clearly liked it very much.'
 					act 'Turn':
 						cls
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower17.jpg"></center>'
-						'You turn to see the coach still looking, wide-eyed and with his jaw hanging open. Ivan finally notices this, and oblivious to the fact that your actions were only partially for his benifit, hastily covers up, grabs his things and jumps out of the shower. As soon as the door closes behind Ivan, the coach walks closer to you, pulls his member out of his pants and points it at you. Passion and lust overpower you and you immediately reach for his cock, but unfortunately it seems the coach was already on the edge and begins to cum as soon as your hands envelop his shaft. He sprays your breasts with his spunk, then promptly pulls up his pants and leaves you in the shower. On your knees. Overflowing with arousal.'
+						'You turn to see the coach still looking, wide-eyed and with his jaw hanging open. Ivan finally notices this, and oblivious to the fact that your actions were only partially for his benefit, hastily covers up, grabs his things and jumps out of the shower. As soon as the door closes behind Ivan, the coach walks closer to you, pulls his member out of his pants and points it at you. Passion and lust overpower you and you immediately reach for his cock, but unfortunately, it seems the coach was already on the edge, and he begins to cum as soon as your hands envelop his shaft. He sprays your breasts with his spunk, then promptly pulls up his pants and leaves you in the shower. On your knees. Overflowing with arousal.'
 						VoltrenerVoyeur += 1
 						pcs_horny = 100
 						facial += 1
@@ -199,7 +199,7 @@ if $ARGS[0] = '4':
 							cls
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower18.jpg"></center>'
 							$orgasm_or = 'custom'
-							$orgasm_txt = 'You are left almost in tears from the aching, overwhelming feelings of dissatisfaction. Covered in cum and thinking about how both these jerks just left you here in this state, you lie down on the bench beside the shower and furiously start rubbing your pussy, quickly bringing yourself to orgasm. Of course, it was nothing like it could have been, and after ''consoling'' yourself in this way, you promise yourself you will make at least one of them take care of you next time, maybe even both at once. That last thought starts getting your engine running yet again and blushing from such vulgarity, you quickly wash your face and jump out of the shower.'
+							$orgasm_txt = 'You are left almost in tears from the aching, overwhelming feelings of dissatisfaction. Covered in cum and thinking about how both these jerks just left you here in this state, you lie down on the bench beside the shower and furiously start rubbing your pussy, quickly bringing yourself to orgasm. Of course, it was nothing like it could have been, and after ''consoling'' yourself in this way, you promise yourself you will make at least one of them take care of you next time, maybe even both at once. That last thought starts getting your engine running yet again, and blushing from such vulgarity, you quickly wash your face and jump out of the shower.'
 							gs 'arousal', 'masturbate', 5
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -220,7 +220,7 @@ if $ARGS[0] = '5':
 	act 'Get a better look':
 		cls
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower19.jpg"></center>'
-		'Through the glass you see Mikhail staring and approaching the booth, while Ivan pays attention to nothing but your ass bouncing with his thrusts. Ivan forgot to close the shower door and you frantically try to correct his mistake, but the constant ass-punding and Ivan''s tight grip on your hips will not let you do it. The door abruptly opens, and you hear the coach growl: "Again? Prokhorov, I''ve had it with you! I will tell your coach and have you banned from the competitions you are preparing for." You immediately feel Ivan''s penis going soft and shrinking inside you, before sliding limply out of your ass. Still terrified, he turns sideways to hide his dignity and pleads "Please don''t do that coach Vlasov! It won''t happen again, and I''ll help with the hall wenever you need me to!", before grabbing his stuff and getting out of the shower.'
+		'Through the glass, you see Mikhail staring and approaching the booth, while Ivan pays attention to nothing but your ass bouncing with his thrusts. Ivan forgot to close the shower door, and you frantically try to correct his mistake, but the constant ass-pounding and Ivan''s tight grip on your hips will not let you do it. The door abruptly opens, and you hear the coach growl: "Again? Prokhorov, I''ve had it with you! I will tell your coach and have you banned from the competitions you are preparing for." You immediately feel Ivan''s penis going soft and shrinking inside you, before sliding limply out of your ass. Still terrified, he turns sideways to hide his dignity and pleads "Please don''t do that coach Nikolaevich! It won''t happen again, and I''ll help with the hall whenever you need me to!" before grabbing his stuff and getting out of the shower.'
 		!!Originally 65, but without significant anal experience Ivan will have you in too much pain to get anywhere near that		
 		if pcs_horny < 30: 
 			act 'Close the shower door':
@@ -237,11 +237,11 @@ if $ARGS[0] = '5':
 				VoltrenerVoyeur += 1
 				ShowerIvan = 3 & ! close sex with the coach in the shower
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenersexshower22.jpg"></center>'
-				'Still unsattisfied by the abrupt end of your sex session with Ivan, you make no effort to close the door or hide your body from the coach. Any fool would understand what you wanted in this situation, and it seems the coach has thought about what you said earlier, so he undresses and climbs into the shower.'
+				'Still unsatisfied by the abrupt end of your sex session with Ivan, you make no effort to close the door or hide your body from the coach. Any fool would understand what you wanted in this situation, and it seems the coach has thought about what you said earlier, so he undresses and climbs into the shower.'
 				act 'On your knees':
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower23.jpg"></center>'
-					'You drop to your knees, and take a moment to admire Mikhail''s impressive, rock hard member. As it moves closer, you start to work your tongue, carefully licking first the head of the penis and then the whole thing, with determination burning in your eyes.'
+					'You drop to your knees and take a moment to admire Mikhail''s impressive, rock hard member. As it moves closer, you start to work your tongue, carefully licking first the head of the penis and then the whole thing, with determination burning in your eyes.'
 					gs 'arousal', 'foreplay', 5, 'sub'
 					gs 'stat'
 					act 'Take it in your mouth':
@@ -259,13 +259,13 @@ if $ARGS[0] = '5':
 							finrand = 1
 							if trenerSex = 0:trenerSex = 1 & guy += 1
 							gs 'stat'
-							'After a few minutes the coach pulls his cock out of your mouth, pushes you on your back, raises and spreads your knees, so they''re slightly bent and resting against his chest. In this position your holes are unceremoniously put on display. He pushes a finger into each hole and starts to rub your insides, gradually increasing his pace.'
+							'After a few minutes the coach pulls his cock out of your mouth, pushes you on your back, and raises and spreads your knees so they''re slightly bent and resting against his chest. In this position your holes are unceremoniously put on display. He pushes a finger into each hole and starts to rub your insides, gradually increasing his pace.'
 							if pcs_vag = 0 and stat['vaginal'] = 0:
 								'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower26.mp4"></video></center>'
-								'For a moment you feel some regret you might lose your virginity like this, but in your excitement you don''t focus on the thought. But then the coach stops with surprise and says: "Are you a virgin?". It seems he felt one of his finger push against your hymen. Pulling the fingers from your pussy, he switches all his focus to your ass, saying: "No, I will not take your virginity, besides you''ve got more beautiful young holes for me to explore." He continues to finger your anus, which along with his words has you whining with desire. You can''t wait any longer and moan out loud: "Fuck me!"'
+								'For a moment, you feel some regret you might lose your virginity like this, though in your excitement you don''t focus too much on this thought. However, then the coach stops with surprise and says: "Are you a virgin?". It seems he felt one of his finger push against your hymen. Pulling his fingers from your pussy, he switches all his focus to your ass, saying: "No, I will not take your virginity. Besides, you''ve got more beautiful young holes for me to explore." He continues to finger your anus, which along with his words has you whining with desire. You can''t wait any longer and moan out loud: "Fuck me!"'
 							elseif pcs_vag <= 15:
 								'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower26.mp4"></video></center>'
-								'He is having some difficulties fingering your pussy, it seems you''re too tight for him. Pulling the finger from your pussy, he switches all his focus to your ass, saying: "You''re a bit too tight for me, but no matter, you''ve got more beautiful young holes for me to explore." He continues to finger your anus, which along with his words has you whining with desire. You can''t wait any longer and moan out loud: "Fuck me!"'
+								'He is having some difficulties fingering your pussy. It seems you''re too tight for him. Pulling the finger from your pussy, he switches all his focus to your ass, saying: "You''re a bit too tight for me, but no matter, you''ve got more beautiful young holes for me to explore." He continues to finger your anus, which along with his words has you whining with desire. You can''t wait any longer and moan out loud: "Fuck me!"'
 							elseif pcs_vag > 15 and mesec <= 0:
 								'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower25.mp4"></video></center>'
 								'Thrusting one finger in your ass and one in your pussy, the coach begins to move them at the same time in both holes. The feeling of them rubbing against each other through the thin walls between them is driving you wild and forcing you to moan and squirm. A moan almost becomes a scream: "Fuck me, fuck, fuck...", - you cry completely deprived of reason from the overflowing desire.'
@@ -278,7 +278,7 @@ if $ARGS[0] = '5':
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower27.jpg"></center>'
 										gs 'arousal', 'foreplay', -15, 'sub'
 										$orgasm_or = 'custom'
-										$orgasm_txt = 'Literally exhausted from your need for a cock inside you, you push the coach on the floor and mount his cock. The head parts your lips, and pushes deep into your pussy, causing wave after wave of pleasure. Starting to move up and down, side to side, you skewer yourself on his cock. Mikhail caresses your neck, then moved down to your chest and showers pleasure on your nipples. He proceeds to squeeze them and in that moment pleasure runs through you like an electric current, causing you to cry out in orgasm.'
+										$orgasm_txt = 'Literally exhausted from your need for a cock inside you, you push the coach on the floor and mount his cock. The head parts your lips, and pushes deep into your pussy, causing wave after wave of pleasure. Starting to move up and down, side to side, you skewer yourself on his cock. Mikhail caresses your neck, then moves down to your chest and showers pleasure on your nipples. He proceeds to squeeze them, and in that moment, pleasure runs through you like an electric current, causing you to cry out in orgasm.'
 										gs 'arousal', 'vaginal', 15, 'sub'
 										gs 'arousal', 'end'
 										gs 'stat'
@@ -292,12 +292,12 @@ if $ARGS[0] = '5':
 							act 'Offer your ass':
 								cls
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower28.jpg"></center>'
-								'You present your ass to the coach, and soon feel the head of his penis pushing against your anus. You felt a slight pain as it passes through, and try to relax your ass for what''s coming.'
+								'You present your ass to the coach and soon feel the head of his penis pushing against your anus. You feel a slight pain as it passes through and try to relax your ass for what''s coming.'
 								act 'Relax your ass':
 									cls
 									'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower29.mp4"></video></center>'
 									$orgasm_or = 'custom'
-									$orgasm_txt = 'You feel the head stretch your sphincter, and for a moment you think it might tear. At the same time coaches hands caress your breasts and stroke your pussy, distracting you from the momentary discomfort and quickly turning it to pleasure. He slowly starts thrusting in and out of your hole, his cock pleasantly stretching your walls as it goes. Soon all the discomfort is gone and you begin to thoroughly enjoy his fucking. The cock keeps sliding in and out of your ass, which keeps getting tighter and tighter as you approach your orgasm, before it finally clamps down on him, causing you both to cry out in estasy. A warm liquid fills your bowels, and for a while you hear nothing but heavy breathing fill the shower booth, but then finally the coach heaves a pleasured sigh: "What a sweet ass."'									
+									$orgasm_txt = 'You feel the head stretch your sphincter, and for a moment, you think it might tear. At the same time, coach''s hands caress your breasts and stroke your pussy, distracting you from the momentary discomfort and quickly turning it to pleasure. He slowly starts thrusting in and out of your hole, his cock pleasantly stretching your walls as it goes. Soon all the discomfort is gone and you begin to thoroughly enjoy his fucking. The cock keeps sliding in and out of your ass, which keeps getting tighter and tighter as you approach your orgasm, before it finally clamps down on him, causing you both to cry out in ecstasy. A warm liquid fills your bowels, and for a while, you hear nothing but heavy breathing fill the shower booth. Finally, the coach heaves a pleasured sigh: "What a sweet ass."'									
 									gs 'arousal', 'anal', 15, 'sub'
 									gs 'arousal', 'end'
 									gs 'stat'

+ 86 - 86
locations/Voltrenersex.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex1.jpg"></center>'
-	'You go to the coaches office. Just as you open the door, an arm reaches out and grabs you by the hand and pulls you inside.'
+	'You go to the coach''s office. Just as you open the door, an arm reaches out and grabs you by the hand and pulls you inside.'
 
 	gs 'boyStat', 'A69'
 	silavag = 2
@@ -47,26 +47,26 @@ end
 	
 if $ARGS[0] = 'talk':
 	if Voltrenersee = 1:
-		'With a puzzled look on your face you look at your coach, he looks at you then let''s go of your hand and mumbles something, "You have a good technique <<$pcs_lastname>>." With each word his voice becomes more confident, "You need to train more. At some later point, I will show you some more techniques, to improve your game." With an even more puzzled look on your face, you turn around and walk out'
+		'With a puzzled look on your face, you look at your coach. He looks back at you then lets go of your hand and mumbles, "You have a good technique <<$pcs_lastname>>." With each word, his voice becomes more confident. "You need to train more. At some later point, I will show you some more techniques to improve your game." With an even more puzzled look on your face, you turn around and walk out'
 	end
 	if Voltrenersee = 2:
-		'Pulling you in and closing the door the coach whispered angrily: "<<$pcs_lastname>> is this what you''re asking for?" blushing you run out of the coaches office, away from Mikhail Nikolaevich. Although you desire to play on the first team, you''re not ready for something more.'
+		'Pulling you in and closing the door, the coach whispers angrily, "<<$pcs_lastname>> is this what you''re asking for?" Blushing, you run out of the coach''s office, away from Mikhail Nikolaevich. Although you desire to play on the first team, you''re not ready for something more.'
 	end
 	if Voltrenersee => 3:
 		cls
 		pcs_horny += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex2.jpg"></center>'
-		'Vigorously shaking his head, Mikhail Nikolaevich closes the door. The coach turns to you and doesn''t say a word, grabs you and begins to lift up your shirt. He starts to paw at your <<$titsize>> breasts.'
-		if guy < 3 and pav_slut <= 50: 'You squeaked indignantly and pulled your shirt back down and ran out of the office. Although you can not say that the actions of the coach were so unpleasant. But you are not ready for such things.'	
+		'Vigorously shaking his head, Mikhail Nikolaevich closes the door. The coach turns to you, and without saying a word, grabs you and begins to lift up your shirt. He starts to paw at your <<$titsize>> breasts.'
+		if guy < 3 and pav_slut <= 50: 'You squeak indignantly, pull your shirt back down, and run out of the office. You can not say that the actions of the coach were so unpleasant, but you are not ready for such things.'	
 		if (guy >= 3 and guy < 7) or pav_slut > 50: 'You stand and wait until the coach is done playing with your breasts.'
 		if guy >= 7  or pav_slut > 100:
 			killvar 'volleytanga'
-			'Knowing what the coach wants from you, you pull up your shirt exposing your bare breasts and drawing his strong hands to them. Coach inspired by your actions with obvious pleasure kneads your breasts with his hands. "I go to shower, and here is how boring", - You say you are looking at the challenge of the coach.'
+			'Knowing what the coach wants from you, you pull up your shirt exposing your bare breasts and drawing his strong hands to them. Coach inspired by your actions with obvious pleasure kneads your breasts with his hands. You''re starting to get turned on, but suddenly he stops. "I am going to shower. This is getting boring," he says and heads for the door.'
 			!! volleytanga cleared to end the coach without panties gdksport events
 		else 	
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener3.jpg"></center>'
-			'He looks into your eyes, you shiver a bit, whether in anticipation or from excitement, you don''t know, but the coach says "<<$pcs_lastname>> I have business to attend to, we will have to postpone our conversation for now." He pushes you out the door.'	
+			'He looks into your eyes, and you shiver a bit, whether in anticipation or from excitement, you don''t know, but the coach says, "<<$pcs_lastname>>, I have business to attend to. We will have to postpone our conversation for now." He pushes you out the door.'	
 		end
 	end	
 	act 'Leave': gt 'gdksport', 'start'
@@ -80,20 +80,20 @@ if $ARGS[0] = 'sex':
 	gs 'boyStat', 'A69'
 	gs 'stat'
 	'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex3.mp4"></video></center>'
-	'He unzips his fly and pulls down his pants, letting his <<dick>>cm <<$dick_girth>> cock spring to life. Clasping his dick in your hand you start to stroke him, your every movement, causes him to moan in pleasure.'
+	'He unzips his fly and pulls down his pants, letting his <<dick>>cm <<$dick_girth>> cock spring to life. Clasping his dick in your hand, you start to stroke him, your every movement causing him to moan in pleasure.'
 	act 'Balls':
 		cls
 		stat['bj'] += 1
 		eggs += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex4.jpg"></center>'
-		'After jerking him off for a time you lift his cock up and admire his balls, you began to lick and suck his balls as you continue to jerk him off.'
+		'After jerking him off for a time, you lift his cock up and admire his balls. You begin to lick and suck them as you continue to jerk him off.'
 		if pcs_horny < 60:
 			act 'Tease':
 				cls
 				Joke += 1 &! the counter start sex on disco
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voitrensex5.jpg"></center>'
-				'Already preparing to move from the scrotum, you get the idea to tease the coach with out mercy. You let go of him and stand up quickly. Flashing him your boobs and bouncing them around in front of him, then you bolt out the door. Behind you, you hear your coach roar. "<<$pcs_lastname>>, you little tease, I''m going to catch you and pull you into a secluded corner and fuck you right there." Though he sounded angry there was also a hint of laughter to his voice.'
+				'Already preparing to move from the scrotum, you get the idea to tease the coach without mercy. You let go of him and stand up quickly. Flashing him your boobs and bouncing them around in front of him, you then bolt out the door. Behind you, you hear your coach roar, "<<$pcs_lastname>>, you little tease, I''m going to catch you and pull you into a secluded corner and fuck you right there." Though he sounds angry, there is also a hint of laughter to his voice.'
 				act 'Leave':gt 'gdksport', 'start'
 			end
 		end
@@ -105,20 +105,20 @@ if $ARGS[0] = 'sex':
 			gs 'willpower', 'sex', 'self', 'hard'
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex6.mp4"></video></center>'
-			'Kissing the head of his cock, you open your mouth and began to caress his dick with your tongue, lightly sucking it. Then, you start to suck his cock in earnest, running your lips up and down his shaft as you bob your head sucking him off, you hands caressing his balls as you do.'
+			'Kissing the head of his cock, you open your mouth and began to caress his dick with your tongue, lightly sucking it. Then, you start to suck his cock in earnest, running your lips up and down his shaft as you bob your head, you hands caressing his balls as you do.'
 			if trenerSex >= 3 and pcs_vag = 0 and stat['vaginal'] = 0 and mesec <= 0:
 				if will_cost <= pcs_willpwr:
-					act 'Losing my virginity (<<will_cost>> Willpower)': cla & gt 'Voltrenersex', 'Defl'
+					act 'Lose your virginity (<<will_cost>> Willpower)': cla & gt 'Voltrenersex', 'Defl'
 				else
-					act 'Losing my virginity (<font color="red"><<will_cost>> Willpower</font>': '<br><font color="red">You don''t have enough willpower to lose your virginity.</font>'
+					act 'Lose your virginity (<font color="red"><<will_cost>> Willpower</font>': '<br><font color="red">You don''t have enough willpower to lose your virginity.</font>'
 				end
 			end
 			
 			act 'Continue to suck':
 				cla
-				'The coach tried to pull his dick from your mouth, but you keeps your lips around his shaft and keep a firm hold of his balls so he can''t pull away from you. You increase you effort, he begins to pant and you can tell he is about to blow his load.'
+				'The coach tries to pull his dick from your mouth, but you keep your lips around his shaft and keep a firm hold of his balls so he can''t pull away from you. You increase your efforts, and he begins to pant. You can tell he is about to blow his load.'
 				if trenerSex >= 10 and pcs_throat > 15:
-					act 'To swallow':
+					act 'Swallow':
 						cls
 						gs 'boyStat', 'A69'
 						sexpartkno = 1
@@ -126,7 +126,7 @@ if $ARGS[0] = 'sex':
 						spafinloc = 12
 						gs 'cum_manage'
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex6.mp4"></video></center>'
-						'He begins pumping his dick into your mouth roughly, then with a final grunt you feel the splash of hot sperm splattering inside of your mouth, several more spurts fill your mouth up, you quickly swallow it all.'
+						'He begins pumping his dick into your mouth roughly, then with a final grunt you feel the splash of hot sperm splattering inside of your mouth. Several more spurts fill your mouth up, and you quickly swallow it all.'
 						act 'Masturbate': gt 'Voltrenersex', 'Mast'
 						!if trenerSex => 20 and mesec <= 0: act 'Get lick': dynamic $din_trener_kun
 						act 'Leave':gt 'gdksport', 'start'
@@ -139,7 +139,7 @@ if $ARGS[0] = 'sex':
 					spafinloc = 14
 					gs 'cum_manage'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex9.jpg"></center>'
-					'Feeling a surge of cock in your mouth, you understand that he is about to blow his load. Pulling the member out of your mouth you keep jerking him off until he starts send spurts of cum showering your breasts.'
+					'Feeling his cock surge in your mouth, you understand that he is about to blow his load. Pulling the member out of your mouth, you keep jerking him off until he starts showering your breasts with spurts of cum.'
 					act 'Masturbate': gt 'Voltrenersex', 'Mast'
 					!if trenerSex => 20 and mesec <= 0: act 'Get lick': dynamic $din_trener_kun
 					act 'Leave':gt 'gdksport', 'start'
@@ -153,7 +153,7 @@ if $ARGS[0] = 'sex':
 						spafinloc = 12
 						gs 'cum_manage'
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex10.mp4"></video></center>'
-						'Your actions had an effect, the coach actively moved his hips thrusting his cock deeper into your mouth. With out warning he begins cumming in your mouth, shooting thick hot spurts of sperm into your mouth, he keeps his dick in your mouth until his spurts his final bit of sperm, then he pulls it out, watching as you swallow his cum.'
+						'Your actions have an effect. The coach actively moves his hips, thrusting his cock deeper. Without warning, he begins cumming, shooting thick hot spurts of sperm into your mouth. He keeps his dick inside until his final bit of sperm dribbles out, then he pulls it out, watching as you swallow his cum.'
 						act 'Masturbate': gt 'Voltrenersex', 'Mast'
 						!if trenerSex => 20 and mesec <= 0: act 'Get lick': dynamic $din_trener_kun
 						act 'Leave':gt 'gdksport', 'start'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'sex':
 						spafinloc = 12
 						gs 'cum_manage'
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex7.mp4"></video></center>'
-						'Feeling a surge of cock in your mouth, you understand that he is about to cum. Pulling the dick out of your mouth, but keep it open with your tongue stuck out. He''s wastes no time jerking himself off and shooting most of his cum in your mouth, some of it splatters on your lips or rains down on your breasts. Waiting until there is no more spurts of sperm you keep your cum coated tongue out. Only then do you close your mouth and swallow his load.'
+						'Feeling his cock surge in your mouth, you understand that he is about to cum. Pulling his dick out of your mouth, you stick out your tongue. He wastes no time jerking himself off, shooting most of his cum into your mouth, though some of it splatters on your lips or rains down on your breasts. You keep your cum coated tongue out until there are no more spurts of sperm. Only then do you close your mouth and swallow his load.'
 						act 'Masturbate': gt 'Voltrenersex', 'Mast'
 						!if trenerSex => 20 and mesec <= 0: act 'Get lick': dynamic $din_trener_kun
 						act 'Leave':gt 'gdksport', 'start'
@@ -188,27 +188,27 @@ end
 if $ARGS[0] = 'vag':
 	cls
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex29.jpg"></center>'
-	'Pulling his dick out of your mouth, he lefts you up and lays you back, where he spreads your pussy wide with his fingers. He gently asks "Is this hole ready for some training?", exhausted from the desire you only groaned in response.'
+	'Pulling his dick out of your mouth, he lifts you up and lays you back, then spreads your pussy wide with his fingers. He gently asks, "Is this hole ready for some training?" Consumed with desire, you only groan in response.'
 	act 'Further':
 		cls
 		npc_rel['A69'] += 1
 		gs 'boyStat', 'A69'
 		'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex30.mp4"></video></center>'
-		'With you still laying on your back he slips two fingers easily into your wet pussy, causing you moan softly. He finger bangs you for some time, leaving you withering in pleasure, he pulls the fingers out of your wet snatch and immediately thrusts them into your mouth. You suck them, tasting your own pussy juices.'
+		'With you still lying on your back, he slips two fingers easily into your wet pussy, causing you to moan softly. He finger bangs you for some time, leaving you writhing in pleasure, then pulls the fingers out of your wet snatch and immediately thrusts them into your mouth. You suck them, tasting your own pussy juices.'
 		gs 'arousal', 'vaginal_finger', 5
 		gs 'stat'
 		act 'Further':
 			cls
 			'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex31.mp4"></video></center>'
-			'After you suck his fingers clean of your pussy juices he grabs you and rolls you over, bending you over. You ask him "Will you wear a rubber?"'
-			'He shakes his head and replies: "No I''m old fashioned and don''t use that rubber shit". A second later his <<dick>>cm <<$dick_girth>> cock slides into you. '
+			'After you suck his fingers clean of your pussy juices, he grabs you and rolls you over, bending you over. You ask him, "Will you wear a rubber?"'
+			'He shakes his head and replies, "No I''m old fashioned and don''t use that rubber shit." A second later, his <<dick>>cm <<$dick_girth>> cock slides into you. '
 			$orgasm_or = 'no'
 			gs 'arousal', 'vaginal', 5
 			gs 'stat'
 			act 'Further':
 				cls
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex32.mp4"></video></center>'
-				'Fucking you doggy style, his fingers begin massaging your asshole. It was nice. Then he slides his thumb in your ass. Feeling yourself filled in two holes was so nice, you reflexively began to compress the vagina clasping tightly around his cock, this immediately affected Mikhail Nikolaevich, he increased the depth and speed of his motion as he fucked you harder.'
+				'Fucking you doggy style, his fingers begin massaging your asshole. It feels nice. Then he slides his thumb into your ass. Feeling yourself filled in two holes is so nice, you reflexively begin to compress your vagina, clasping tightly around his cock. This immediately affects him, and he increases the depth and speed of his motion as he fucks you harder.'
 				gs 'arousal', 'vaginal', 5
 				gs 'arousal', 'anal_finger', -5
 				gs 'stat'
@@ -216,7 +216,7 @@ if $ARGS[0] = 'vag':
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex33.jpg"></center>'
 					$orgasm_or = 'yes'
-					$orgasm_txt = 'Even through the waves of pleasure you are feeling you understand the coach is about to cum and pump your pussy full of his sperm. With a cry you say "Don''t cum in me!", you jump away from him, causing him to pull out of you. You turn around just in time to catch a face full of cum, it spurts and flies all over you face, into your hair and between your breasts.'
+					$orgasm_txt = 'Even through the waves of pleasure you are feeling, you understand the coach is about to cum and pump your pussy full of his sperm. With a cry, you say, "Don''t cum in me!" and jerk away from him, causing him to pull out of you. You turn around just in time to catch a face full of cum. It spurts and flies all over you face, into your hair and between your breasts.'
 					gs 'dinsex','vaginal_sex',10
 					gs 'arousal', 'end'
 					gs 'stat'
@@ -227,7 +227,7 @@ if $ARGS[0] = 'vag':
 						spafinloc = 12
 						gs 'cum_manage'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex34.jpg"></center>'
-						'Waiting for the last drops to fall, you begin to use your fingers wipe up his cum, with each glob you raise your fingers to your mouth and suck them clean, only to repeat the process until you have cleaned yourself. After watching this he seems mesmerized by your actions.'
+						'Waiting for the last drops to fall, you begin to use your fingers to wipe up his cum. With each glob, you raise your fingers to your mouth and suck them clean, only to repeat the process until you have cleaned yourself. Watching this, he seems mesmerized by your actions.'
 						act 'Leave':gt 'gdksport', 'start'
 					end
 				 end
@@ -239,12 +239,12 @@ end
 if $ARGS[0] = 'Anal':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex24.jpg"></center>'
-	'Invitingly you reach back and pull the buns of your ass apart, so your asshole is exposed and gapping slightly from the pressure.'
+	'Invitingly, you reach back and pull the buns of your ass apart so your asshole is exposed and gaping slightly from the pressure.'
 	act 'Further':
 		cls
 		npc_rel['A69'] += 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex25.jpg"></center>'
-		'Grinning the coach says "Well since you asked nicely", he starts to lick your asshole, after a time his tongue darts inside of your ass, getting it nice and wet and you very aroused. You being rubbing your pussy at the same time, it is already soaking wet from your excitement.'
+		'Grinning, the coach says, "Well since you asked nicely." He starts to lick your asshole. After a time, his tongue darts inside of your ass, getting it nice and wet and you very aroused. You begin rubbing your pussy at the same time. It is already soaking wet from your excitement.'
 		gs 'arousal', 'rimming', 5
 		gs 'stat'
 		act 'Further':
@@ -253,14 +253,14 @@ if $ARGS[0] = 'Anal':
 			gs 'boyStat', 'A69'
 			sexpartkno = 1
 			gs 'dinSex', 'boy_wants_anal', 'lubri'
-			'Once he has your ass good and wet, he sits back and pulls you on top of him. With one hand he guides his cock to your asshole, with the other he pulls you down. You feel the head of his cock against your ass, you bit your lip a little at the pain as he pulls you down forcing his <<dick>>cm <<$dick_girth>> cock into your ass. Once he has the head in, he uses both hands to hold your hip and pull you down. He encourages you to set the pace, but lifting yourself up and down to fuck his dick with your ass.'
+			'Once he has your ass good and wet, he sits back and pulls you on top of him. With one hand he guides his cock to your asshole, with the other he pulls you down. You feel the head of his cock against your ass. You bite your lip a little at the pain as he pulls you down, forcing his <<dick>>cm <<$dick_girth>> cock into your ass. Once he has the head in, he uses both hands to hold your hips and pull you down. He encourages you to set the pace, and you lift yourself up and down to fuck his dick with your ass.'
 			gs 'dinsex', 'analsex', 10
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Recover':
 				cls
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex28.jpg"></center>'
-				'He lets you guide the pace and depth for most of the time, but as he begins to pant, he grabs your hips and firmly pulls you down as he thrusts up with his hips. Jamming himself balls deep into your ass. You cry out a little in pain as he stretch out your ass a bit more. After several such thrusts he finally pulls you down, leaving himself buried balls deep in you not moving. You feel his spurts of sperm filling up your ass. Once he has finished he finally lets go of your hips so you can pull yourself up, freeing his cock from your ass. You can already feel the cum running out of your gapped asshole.'
+				'He continues to let you set the pace and depth for most of the time, but as he begins to pant, he grabs your hips and firmly pulls you down as he thrusts up, jamming himself balls deep into your ass. You cry out a little in pain as he stretch out your ass a bit more. After several such thrusts, he finally pulls you down, leaving himself buried balls deep in you not moving. You feel his spurts of sperm filling up your ass. Once he has finished, he finally lets go of your hips so you can pull yourself up. You can already feel the cum running out of your gaped asshole.'
 				act 'Leave': gt 'gdksport', 'start'
 			end
 		end
@@ -270,13 +270,13 @@ end
 if $ARGS[0] = 'Defl':
 *clr
 '<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex19.mp4"></video></center>'
-'Sucking the coach you began to caress your pussy, moaning from pleasure.'
+'Sucking the coach, you began to caress your pussy, moaning from pleasure.'
 	act 'Show pussy':
 		*clr & cls
 		gs 'willpower', 'pay', 'self', 'hard'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex20.jpg"></center>'
-		'Mikhail rubs the delicate petals of your pussy, and making sure that you are still a virgin said: "You are still a girl." You watch your coach as he makes the decision on whether or not you will remain a virgin and do you want to stay a virgin?'
+		'Mikhail rubs the delicate petals of your pussy and, making sure that you are still a virgin, says, "You are still a girl." You watch your coach as he decides whether or not you will remain a virgin and realize this is the your last chance to leave before he makes up his mind.'
 		act 'Leave':gt 'gdksport', 'start'
 		act 'Stay':
 			cls
@@ -286,26 +286,26 @@ if $ARGS[0] = 'Defl':
 			npc_rel['A69'] += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex21.jpg"></center>'
-			'Coach dropped to his knees and began to lick your pussy. He then licked the clit, the tongue penetrated into the vagina, when he took the clit into his mouth and began to suck, you thought you were going crazy with pleasure. You grabbed his head with both hands and grinded your crotch against his face.'
+			'Coach drops to his knees and begins to lick your pussy. He then licks the clit, his tongue penetrating your vagina. As he takes your clit into his mouth and begins to suck, you think you are going crazy with pleasure. You grab his head with both hands and grind your crotch against his face.'
 			Act 'Surrender':
 				cls
 				gs 'boyStat', 'A69'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex22.jpg"></center>'
-				'He pulled his head away and got up, he slipped his <<dick>>cm <<$dick_girth>> cock inside of you, causing you to cry out when he broke you hymen.'
+				'He pulls his head away and gets up. He slips his <<dick>>cm <<$dick_girth>> cock inside of you, causing you to cry out as he breaks your hymen.'
 				Act 'Further':
 					cls
 					gs 'boyStat', 'A69'
 					sexpartkno = 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex23.jpg"></center>'
-					$sexstart2Deflor = '"You''re so sweet", coach caressed your hands, kissed, whispered sweet words to you as he took your virginity. Gradually, you started to get used to the new sensations, feeling of fullness, from having a dick in your body. Mikhail was moving slowly, giving you time to get used to it.'
+					$sexstart2Deflor = '"You''re so sweet." Coach caresses your hands, kissing and whispering sweet words to you as he takes your virginity. Gradually, you start to get used to the new sensation, the feeling of fullness from having a dick in your body. Mikhail moves slowly, giving you time to adjust.'
 					gs 'dinsex','vaginal_sex',10
-					'Then, gradually accelerating, coach, began to gently fuck your pussy. You led, you felt incredible languor, it didn''t really, as during Masturbation, or during anal sex. You seem, what he gets right to the marrow, because there were given a real firework of your emotions from the first vaginal sex.'
+					'Then, gradually accelerating, coach begins to gently fuck your pussy. You feel incredible languor. It''s different from masturbation or anal sex. You feel it in your bones, a real firework of emotions from your first vaginal sex.'
 					gs 'dinsex','sexcum'
 					finrand = 0
 					act 'Recover':
 						cls
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex27.jpg"></center>'
-						'With a grunt you feel his hot sperm shooting into you, filling you up, pulling out of you his cock is covered in blood and sperm, the coach began to talk about something, something about you not be a girl anymore but you really didn''t hear what he said the pain of losing your virginity and the ecstasy of nearly having your first orgasm distracted you. You finally notice your coach giving you an attentive and caring look, as he helps you gather up your stuff. Once you are redressed you leave his office, ready to see the world in a new way.'
+						'With a grunt, you feel his hot sperm shooting into you, filling you up. Pulling out of you, his cock is covered in blood and sperm. The coach began to talk about something... something about you not be a girl anymore, but you really don''t hear what he says. The pain of losing your virginity and the ecstasy of nearly having your first orgasm distract you. You finally notice your coach giving you an attentive and caring look as he helps you gather up your stuff. Once you are redressed, you leave his office, ready to see the world in a new way.'
 						act 'Leave':gt 'gdksport', 'start'
 					end
 				end
@@ -319,27 +319,27 @@ if $ARGS[0] = 'Mast':
 gs 'arousal','masturbate', 10
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex11.jpg"></center>'
-'Looking your coach in the eyes, you remove the rest of your clothes and start to lick and suck on your own fingers. The coach seems to understood your idea and sits down ready to watch the show.'
+'Looking your coach in the eyes, you remove the rest of your clothes and start to lick and suck on your fingers. The coach seems to understand your idea and sits down ready to watch the show.'
 	act 'Expose your pussy':
 		cls
 		if pcs_inhib < 40:inhib_exp += rand(1,3)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex12.jpg"></center>'
-		'Sitting you spread legs as wide as they will go, showing coach your pussy oozing with juices.'
-		act 'Fondle nipples':
+		'Sitting, you spread your legs as wide as they will go, showing coach your pussy oozing with juices.'
+		act 'Fondle your nipples':
 			pcs_horny += 10
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex13.jpg"></center>'
-			'Getting more aroused at the idea of your coach watching you, you begin to caress her breasts, twisting the nipples gently with your fingers.'
-			act 'Caress the clitoris':
+			'Getting more aroused at the idea of your coach watching you, you begin to caress your breasts, twisting the nipples gently with your fingers.'
+			act 'Caress your clitoris':
 				pcs_horny += 10
 				cls
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex14.jpg"></center>'
-				'It is obvious you coach is enjoying the show, the bulge in his pants making no secret of it. You lowered one hand to her wet crotch while the other continued to play with a nipple, when you hand touched her clit it seemed as if an electric discharge passed through your body, you moan in passion and begin to frantically rub your clit.'
-				act 'To caress the anus':
+				'It is obvious your coach is enjoying the show. The bulge in his pants making no secret of it. You lower one hand to your wet crotch while the other continues to play with a nipple. When your hand touches your clit it seems as if an electric discharge passes through your body. You moan in passion and begin to frantically rub your clit.'
+				act 'Caress your anus':
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex15.jpg"></center>'
 					'Incessantly rubbing your clit, your second hand began to massage your asshole.'
-					act 'Come':
+					act 'Cum':
 						pcs_horny = 0
 						orgasm += 1
 						pcs_mood += 20
@@ -347,7 +347,7 @@ gs 'stat'
 						gs 'stat'
 						cls
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex16.mp4"></video></center>'
-						'Unable to withstand this double pressure, your body convulses as you have an orgasm. Once the feeling passes you look up at your coach as he says "Yes <<$pcs_lastname>>, you look so hot"'
+						'Unable to withstand this double pressure, your body convulses as you have an orgasm. Once the feeling passes, you look up at your coach as he says, "Yes <<$pcs_lastname>>, you look so hot."'
 						act 'Leave':gt 'gdksport', 'start'
 					end
 					i = rand(1,4)
@@ -355,8 +355,8 @@ gs 'stat'
 						act 'Look at the coach':
 							cls
 							'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex17.mp4"></video></center>'
-							'You through the mental fog of your orgasm looking at coach, he''s has his dick in his hand as he approaches you and starts rubbing the head of it against you soaking wet pussy.'
-							act 'Pulling a member':
+							'Through the mental fog of your orgasm, you look at coach. He has his dick in his hand as he approaches you and starts rubbing the head of it against your soaking wet pussy.'
+							act 'Pull his member inside':
 								cls
 								minut += 10
 								pcs_horny = 0
@@ -365,7 +365,7 @@ gs 'stat'
 								gs 'arousal','end'
 								gs 'stat'
 								'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensex18.mp4"></video></center>'
-								'Maddened with desire you grab Mikhail Nikolaevich cock and try to pull it inside of you, as you stroke him. But it looks like you won''t get a chance as he immediately starts to cum. Drops of semen begin raining down on your tummy.'
+								'Maddened with desire you grab Mikhail Nikolaevich''s cock and try to pull it inside of you. But it looks like you won''t get a chance as he immediately starts to cum. Drops of semen begin raining down on your tummy.'
 								act 'Leave':gt 'gdksport', 'start'
 							end
 						end
@@ -387,19 +387,19 @@ if $ARGS[0] = 'bj':
 
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mikhail/sex/tren.jpg"></center>'
-		'You squat in front of the coach and stroke his crotch feeling his cock stand up. You reach into his sweatpants and caress his balls, while the other hand grabs his throbbing hard cock. You pull it free from his sweatpants and lean toward him, wrapping your lips around the head, before giving him a blowjob he''ll never forget.'
+		'You squat in front of the coach and stroke his crotch, feeling his cock stand up. You reach into his sweatpants, caressing his balls with one hand while the other grabs his throbbing hard cock. You pull it free from his sweatpants and lean toward him, wrapping your lips around the head, before giving him a blowjob he''ll never forget.'
 		gs 'boyStat', 'A69'
 		sexpartkno = 1
 		spafinloc = 12
 		gs 'cum_manage'
 		swallow += 1
 		gs 'stat'
-		'Coach groans as fills your mouth with warm sperm. You swallow it all down, then open your mouth sticking out your tongue, to show that you had swallowed every drop.'
+		'Coach groans as he fills your mouth with warm sperm. You swallow it all down then open your mouth, sticking out your tongue to show that you had swallowed every drop.'
 
 		if volleysostav = 0:
 			volleysostav = 1
 			if npc_rel['A69'] < 20:npc_rel['A69'] = 20
-			'Coach puts his cock back in his pants. "Okay <<$pcs_lastname>>, you are very diligent girl, I can see you fitting in very well, consider yourself on the team, as a sub of course."'
+			'Coach puts his cock back in his pants. "Okay <<$pcs_lastname>>, you are very diligent girl. I can see you fitting in very well. Consider yourself on the team, as a sub of course."'
 		end
 
 		act 'Leave':gt 'gdksport', 'start'
@@ -407,32 +407,32 @@ if $ARGS[0] = 'bj':
 end
 
 if $ARGS[0] = 'masaj':
-	'"<<$pcs_lastname>>, you look tired, do you want a massage?"'
+	'"<<$pcs_lastname>>, you look tired. Do you want a massage?"'
 	act 'Agree':
 		cls
 		gs 'boyStat', 'A69'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj1.jpg"></center>'	
-		'Coach lubricates his hand with oil and said to you: "Undress", you are slightly embarrassed, but also hot with desire to get a massage and you began to pull your clothes off.'
+		'Coach lubricates his hand with oil and says, "Undress." You are slightly embarrassed, but also hot with desire to get a massage, and you begin to pull your clothes off.'
 		act 'Undress':
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj2.jpg"></center>'	
-			'"Fully undressed", added coach, when he seen that you hesitated on panties. Sighing, you pull your panties off.'
+			'"Fully undressed," adds coach when he sees you hesitate when you reach your panties. Sighing, you pull them off.'
 			gs 'arousal', 'foreplay', 5
 			gs 'stat'
 			act 'Lie down':
 				cls
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj3.jpg"></center>'	
-				'You sat on the edge of the sofa covered in sheets, it seems the coach is going to use it as a massage table. The coach looks at you and says "Lie down on your back and relax."'
+				'You sit on the edge of the sofa covered in sheets. It seems the coach is going to use it as a massage table. The coach looks at you and says, "Lie down on your back and relax."'
 				act 'Relax':
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj4.jpg"></center>'
-					'You lay on the sofa, as the coach began to lubricate your naked body with oil, gently rubbing your chest, foot, neck, rubbing the oil in and relaxing the muscles. You nipples harden from the feelings of pleasure and you blush. Seeing this, the coach just smiled.'	
+					'You lie on the sofa as the coach begins to lubricate your naked body with oil, gently rubbing it on your chest, foot, and neck and relaxing the muscles. Your nipples harden from the feeling of pleasure, and you blush. Seeing this, the coach just smiles.'	
 					gs 'arousal', 'massage', 5
 					gs 'stat'
 					act 'Further':
 						cls
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj5.jpg"></center>'
-						'Mikhail began to knead your feet, lifting and twisting them. And you could only moan with pleasure and mild pain. You lost all track of time as the coach massaged you.'
+						'Mikhail begins to knead your feet, lifting and twisting them, and you can only moan with pleasure and mild pain. You lose all track of time as the coach massages you.'
 						gs 'arousal', 'massage', 10
 						gs 'stat'
 						act 'Further':
@@ -442,37 +442,37 @@ if $ARGS[0] = 'masaj':
 							gs 'stat'
 							cls
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj6.jpg"></center>'
-							'You lie with your legs spread apart, you can feel how wet your pussy is. Perfectly visible to your coach, he gently glides his hands over your body. Then Mikhail Nikolayevich asked "Well that ''s all for today, or do you want to continue?".'
+							'You lie with your legs spread apart. You can feel how wet your pussy is. Perfectly visible to your coach, he gently glides his hands over your body. Then Mikhail Nikolayevich asks, "Should that be all for today, or do you want to continue?".'
 							act 'Dress and leave': gs 'arousal', 'end' & gt 'gdksport', 'start'
 							if pcs_horny >= 100 and rand(0,1) = 1 and mesec <= 0: 
 								act 'Continue':
 									cls
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/event/voltrenermasaj7.jpg"></center>'
-									'He slide his hand between your legs, the touch was so light, intoxicating and gentle. You desire building in your body, all you want to do is just grab him and force his hand to caress you firmer. Mikhail continued stroking your hot swollen pussy, from which flowed your wetness. Closing your eyes, you try not to moan, suddenly you feel the touch of the lips and tongue on your pussy.'
+									'He slides his hand between your legs, the touch so light, intoxicating and gentle. Your desire builds in your body. All you want to do is just grab him and force his hand to caress you firmer. Mikhail continues stroking your hot swollen pussy from which your wetness flows. Closing your eyes, you try not to moan. Suddenly, you feel the touch of his lips and tongue on your pussy.'
 									gs 'arousal', 'foreplay', 5
 									gs 'stat'
 									act 'Further':
 										cls
 										npc_rel['A69'] += 1
 										'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj8.mp4"></video></center>'
-										$orgasm_txt = 'His mouth and tongue worked your pussy, bringing you to new highest of passion and pleasure. Before long your body is wracked with rolling orgasms.'
+										$orgasm_txt = 'His mouth and tongue work your pussy, bringing you to new heights of passion and pleasure. Before long, your body is wracked with rolling orgasms.'
 										$orgasm_or = 'yes'
 										gs 'arousal', 'cuni', 5
 										gs 'stat'
 										act 'Recover':
 											cls
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj9.jpg"></center>'
-											'With your eyes still closed you recover form your orgasm. Mikhail, moved up near you head, he starts to massage your breasts next.'
+											'With your eyes still closed, you recover from your orgasm. Mikhail, moves up near you head and starts to massage your breasts next.'
 											gs 'arousal', 'foreplay', 5
 											gs 'stat'
 											act 'Lick':
 												cls
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj10.jpg"></center>'
-												'As he massages your breasts with his hands, you feel something hard start bumping into your face and lips. Opening your eyes you see his hard dick practically lying on your face. Then you hear him say "Open your mouth."'
-												act 'Open mouth':
+												'As he massages your breasts with his hands, you feel something hard start bumping into your face and lips. Opening your eyes, you see his hard dick practically lying on your face. Then you hear him say, "Open your mouth."'
+												act 'Open your mouth':
 													cls
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj11.jpg"></center>'
-													'You happily open your mouth, he grabs you and pulls you towards him till your head is off the couch and your head tilts back, till holding your mouth open, he slides his dick in your mouth. You instantly start sucking his cock. At first he is slow and gentle as he thrust into your mouth, but as he gets more aroused he gets faster and harder. He starts driving his cock into your mouth and down your throat as he literally starts to fuck your mouth. Despite the discomfort of feeling his cock thrust down your throat you still moan in pleasure.'
+													'You happily open your mouth. He grabs you and pulls you towards him till your head is off the couch tilting back, then slides his dick into your mouth. You instantly start sucking his cock. At first, he is slow and gentle as he thrusts into your mouth, but as he gets more aroused, he gets faster and harder. He drives his cock into your mouth and down your throat as he literally starts to fuck your mouth. Despite some discomfort, you still moan in pleasure.'
 													gs 'arousal', 'bj', 10, 'deepthroat'
 													gs 'stat'
 													act 'Swallow':
@@ -484,11 +484,11 @@ if $ARGS[0] = 'masaj':
 														trenerSex += 1
 														gs 'stat'
 														'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj12.mp4"></video></center>'
-														'Expecting him to cum when he had his cock pushed deep in your throat, he surprises you and pulls out instead. Leaving his dick on your face, the head of his cock over your mouth he finally cums, shooting large spurts of sperm into your mouth, a few spurts end up on your chin. Still it feels like he nearly completely fills your mouth with his cum, you barely manage to swallow it all.'
+														'Expecting him to cum when he had his cock pushed deep in your throat, he surprises you and pulls out instead. Leaving his dick on your face, the head of his cock over your mouth, he finally cums, shooting large spurts of sperm into your mouth. A few spurts end up on your chin, but it still feels like he nearly completely fills your mouth with his cum, and you barely manage to swallow it all.'
 														act 'Further':
 															cls
 															'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voltrenermasaj13.jpg"></center>'
-															'Coach exhausted on shaky legs moved away and sat down. You look at him and use your fingers to push the cum from your chin into your mouth where you swallow that down too.'
+															'Coach, exhausted on shaky legs, moves away and sits down. You look at him and use your fingers to push the cum from your chin into your mouth where you swallow that down too.'
 															act 'Leave':gt 'gdksport', 'start'
 														end
 													end
@@ -509,48 +509,48 @@ end
 if $ARGS[0] = 'discoSex':
 	cls
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener4.jpg"></center>'
-	'"<<$pcs_lastname>>, let''s find a secluded place to fuck." You are about to say that there isn''t a quiet place, when coach smiles and says, "Follow me."'
+	'"<<$pcs_lastname>>, let''s find a secluded place to fuck." You are about to say that there isn''t a quiet place when coach smiles and says, "Follow me."'
 	act 'Follow him':
 		if rand (0,2) = 0:
 			cls
 			if pcs_horny > 80:
 				volume = 40
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco1.mp4"></video></center>'
-				'He takes you down the hall to one of the girls bathrooms, he pulls the door open as you get to it. Letting you walk in first, he follows closely behind.'
-				act 'Pulling up your skirt':
+				'He takes you down the hall to one of the girls bathrooms and pulls the door open as you get to it. Letting you walk in first, he follows close behind.'
+				act 'Pull up your skirt':
 					cls
 					npc_rel['A69'] += 5
 					if $pantyworntype ! 'none':
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco2.mp4"></video></center>'
-						'You sit on one of the toilets, pulling your skirt up and spreading your legs, watching your little display for a moment. He pulls you up and then pulls your panties down, letting them pool around your ankles.'
+						'You sit on one of the toilets, pulling your skirt up and spreading your legs. Watching your little display for a moment, he pulls you up and then pulls your panties down, letting them pool around your ankles.'
 					else
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco3.jpg"></center>'
-						'Stepping out of your panties around your ankles you pull up your skirt showing him your naked wet pussy. While the coach pulls out his hard dick and starts stroking it as he watched you.'
+						'Stepping out of your panties, you pull up your skirt, showing him your naked wet pussy. The coach pulls out his hard dick and starts stroking it as he watches you.'
 					end
 					gs 'arousal', 'foreplay', 2
 					gs 'stat'
-					act 'Bending over to show him your ass':
+					act 'Bend over to show him your ass':
 						cls
 						gs 'boyStat', 'A69'
 						gs 'arousal', 'foreplay', 3
 						gs 'stat'
 						'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco4.mp4"></video></center>'
-						'As you bend over you pull up your skirt showing him your bare ass. Almost at once he grabs your hip with one hand, apparently no longer wanting to just watch. With his other hand he guides his dick, he rubs the head of it against your wet pussy. Then trails it up to your asshole, leaving a trail of your wetness from your pussy to your ass, then he slides it back down and rubs his head against your pussy again.'
-						'Getting the head of his dick even more soaked in your pussy juices, once more he slides it back up and starts rubbing it against your asshole. This time he doesn''t slide it back down, instead he pushes the head of his dick into your ass. You wince and cry out slightly in pain, as you feel the head of his dick force itself into your ass. He rubs your back with one hand, caressing you. "Take a breath and relax it will feel better."'
-						act 'Fuck your ass':
+						'As you bend over, you pull up your skirt showing him your bare ass. Almost at once, he grabs your hip with one hand, apparently no longer wanting to just watch. With his other hand, he guides his dick, rubbing the head of it against your wet pussy then sliding it up to your asshole, leaving a trail of your wetness. He then slides it back down and rubs his head against your pussy again.'
+						'Having gotten the head of his dick even more soaked in your pussy juices, once more he slides it back up and starts rubbing it against your asshole. This time he doesn''t slide it back down. Instead, he pushes the head of his dick into your ass. You wince and cry out slightly in pain as you feel the head of his dick force itself inside. He rubs your back with one hand, caressing you. "Take a breath and relax. It will feel better."'
+						act 'Get your ass fucked':
 							*clr & cla
 							'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco5.mp4"></video></center>'
 							gs 'dinSex','boy_wants_anal','lubri'
 							gs 'arousal', 'auto_lube', 'anal'
-							'You do your best to do as he says, taking a deep breath and trying to relax, but it is hard to relax when you have a <<dick>>cm <<$dick_girth>> cock in your ass. He begins slowly and gently fucking your ass, with each stroke he does just a tiny bit deeper. Bitting your lower lip in pain as he slowly fucks your ass.'
-							'But he was right in time it hurts less and even starts to feel kinda good, a bit of a mixture of pleasure and pain. You feel yourself starting to moan. Taking this as a sign you are ready he starts to pump in and out of your ass faster, slowly but steadily picking up the pace, until he is pounding your balls deep in your ass.'
-							'You moan in a groan as he fucks your ass, you can''t decided which sensation is stronger, the pain or the pleasure.'
+							'You do your best to do as he says, taking a deep breath and trying to relax, but it is hard to relax when you have a <<dick>>cm <<$dick_girth>> cock in your ass. You bite your lower lip in pain as he begins slowly and gently fucking your ass, with each stroke just a tiny bit deeper.'
+							'But he was right. In time, it hurts less and even starts to feel kinda good, a bit of a mixture of pleasure and pain. You feel yourself starting to moan. Taking this as a sign you are ready, he starts to pump in and out of your ass faster, slowly but steadily picking up the pace until he is pounding you balls deep.'
+							'You moan in a groan as he fucks your ass. You can''t decide which sensation is stronger, the pain or the pleasure.'
 							gs 'arousal', 'anal', 10
 							gs 'stat'
 							act 'Cumming':
 								cls
 								'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voitrensexdisco6.mp4"></video></center>'
-								'He suddenly pulls out of your ass, at once you feel the streams of hot sperm landing on your ass, several spurts of cum cover your ass, with a sigh of satisfaction he puts his dick away as he waits, leaving your to clean the cum off your ass.'
+								'He suddenly pulls out, and at once you feel streams of hot sperm landing on your ass. With a sigh of satisfaction, he puts his dick away as he waits, leaving you to clean the cum off.'
 								gs 'arousal', 'anal', 5
 								gs 'arousal', 'end'
 								gs 'cum_call', 'butt', $boy, 1
@@ -564,7 +564,7 @@ if $ARGS[0] = 'discoSex':
 									close all
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
-									'Leaving you walk through town, as you get near your apartment, the coach stops and turns to you to say something.'
+									'Leaving, you walk through town. As you get near your apartment, the coach stops and turns to you to say something.'
 									act 'Listen to him': gt 'Voltrener', 'trener_speak'
 								end
 							end
@@ -573,7 +573,7 @@ if $ARGS[0] = 'discoSex':
 				end
 			else
 			  '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim34.jpg"></center>'
-				'Having brought you to the girls bathroom, you stop and say to him, "Not the most secluded place Mikhail," turning away, you walk off. He sighs but smiles, as he watches your tight little ass as you walk away. "Ok we can go home if this isn''t good enough."'
+				'Having been brought to the girls bathroom, you stop and say to him, "Not the most secluded place Mikhail." Turning away, you walk off. He sighs but smiles as he watches your tight little ass as you walk away. "Ok, we can go home if this isn''t good enough."'
 				act 'Go with coach':
 					Discoclose = 1
 					minut += 20
@@ -582,7 +582,7 @@ if $ARGS[0] = 'discoSex':
 					gs 'stat'
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
-					'You walk through town, as you get near your apartment, the coach stops and turns to you to say something.'
+					'You walk through town. As you get near your apartment, the coach stops and turns to you to say something.'
 					act 'Listen to him': gt 'Voltrener', 'trener_speak'
 				end
 			end
@@ -594,9 +594,9 @@ if $ARGS[0] = 'discoSex':
 			gs 'stat'
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
-			'Having brought you to the toilet, the coach opened the door and sees it is full of students. "Now that is a pity."'
-			'He looks genuinely upset and dejectedly, he offers to walk you home. You don''t think he''ll let you say no, so you agree.'
-			'You walk through town, as you get near your apartment, the coach stops and turns to you to say something.'
+			'Having brought you to the toilet, the coach opens the door and sees it is full of students. "Now that is a pity."'
+			'He looks genuinely upset and dejectedly offers to walk you home. You don''t think he''ll let you say no, so you agree.'
+			'You walk through town. As you get near your apartment, the coach stops and turns to you to say something.'
 			act 'Listen to him': gt 'Voltrener', 'trener_speak'
 		end
 	end

+ 12 - 12
locations/WorkHosp.qsrc

@@ -14,26 +14,26 @@ if $ARGS[0] = 'start':
 	'The hospital staff are hard at work, with many patients waiting in the lobbies. Doctors and nurses rush from office to office trying to keep the flow of patients going as quickly as possible.'
 	jobhosprand = rand(0, 9)
 
-	act 'Work in the Operating Room (1:00)':
+	act 'Work in the operating room (1:00)':
 		cla
 		minut += 60
 		medcn_exp += rand (0,2) 
 
 		if jobhosprand = 0:gt 'WorkHosp', '2'
 
-		'You were part of the operating team, helping the doctors with whatever tasks they requested of you.'
+		'You work as part of the operating team, helping the doctors with whatever tasks they request of you.'
 
 		act 'Move away':gt 'WorkHosp', 'start'
 	end
 
-	act 'Help the doctor at the Emergency Room (1:00)':
+	act 'Help the doctors in the emergency room (1:00)':
 		cla
 		minut += 60
 		medcn_exp += rand (0,2)
 
 		if jobhosprand = 0:gt 'WorkHosp', '3'
 
-		'You spent a frenzied hour helping patients that came into the Emergency room.'
+		'You spend a frenzied hour helping patients that come into the emergency room.'
 
 		act 'Move away':gt 'WorkHosp', 'start'
 	end
@@ -79,7 +79,7 @@ if $ARGS[0] = 'start':
 
 		if npc_rel['A219'] > 60 and military = 0:gt 'WorkHosp', 'milit'
 
-		'You spent some time chatting with Kat.'
+		'You spend some time chatting with Kat.'
 
 
 		if npc_rel['A219'] > 50:
@@ -102,7 +102,7 @@ end
 if $ARGS[0] = 'milit':
 	cla
 	military = 1
-	'"Listen, I am scheduled to work this weekend, but I have plans. Here''s the deal, War games are often held not far from the city and well, according to the rules, they need doctors on site before they can begin. Don''t worry, you will have a doctor with you, so the most you''ll need to do is apply some bandages. If you feel up to it, on Saturday you can catch a bus at the clinic between 6 and 9. Oh yeah, I almost forgot! The pay for two days is 5000 <b>₽</b>. So what do you say?" asks Kat.'
+	'"Listen, I am scheduled to work this weekend, but I have plans. Here''s the deal: war games are often held not far from the city and, well, according to the rules, they need doctors on site before they can begin. Don''t worry, you will have a doctor with you, so the most you''ll need to do is apply some bandages. If you feel up to it, on Saturday you can catch a bus at the clinic between 6 and 9. Oh yeah, I almost forgot! The pay for two days is 5000 <b>₽</b>. So what do you say?" asks Kat.'
 
 	act 'Move away':gt 'WorkHosp', 'start'
 end
@@ -118,7 +118,7 @@ if $ARGS[0] = '0':
 		xgt 'lezbsex', 'var'
 	elseif katprorand = 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex7.jpg"></center>'
-		'You and Kat just began to fondle each other when a patient entered the room. You backed away from her trying to pretend that nothing was happening. On the contrary, Kat did not hesitate and was lying on the couch with her legs spread wide, proudly showing off her wet pussy. She guides you back down to her pussy, leaving no doubt what she expects your tongue to be doing, while looking hungrily at the guy and inviting him to join in the fun.'
+		'You and Kat have just begun to fondle each other when a patient enters the room. You back away from her, trying to pretend that nothing was happening. In contrast, Kat does not hesitate and lies down on the couch with her legs spread wide, proudly showing off her wet pussy. She guides you back down to her pussy, leaving no doubt what she expects your tongue to be doing, while looking hungrily at the guy and inviting him to join in the fun.'
 		gs 'arousal', 'cuni_give', 10, 'lesbian'
 		gs 'stat'
 		act 'Leave':gt 'WorkHosp', 'start'
@@ -139,7 +139,7 @@ if $ARGS[0] = '0':
 		end
 	elseif katprorand = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex8.jpg"></center>'
-		'While Kat and you are in full swing, two doctors enter the room. You are both engrossed with each other, that you didn''t even notice them until they started to caress you. You both spread your legs wider, inviting them to join the fun.'
+		'While Kat and you are in full swing, two doctors enter the room. You are both so engrossed with each other that you don''t even notice them until they started to caress you. You both spread your legs wider, inviting them to join the fun.'
 
 		act 'Entertain them':
 			gang += 1
@@ -169,7 +169,7 @@ if $ARGS[0] = '1':
 
 	if mastrrand = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex9.jpg"></center>'
-		'As you masturbate, you totally abandon yourself to the pleasure of your coming orgasm. A doctor enters the room but you are so absorbed in your own pleasure that you only notice him when his hand starts to guide your head to his erect cock.'
+		'As you masturbate, you totally abandon yourself to the pleasure of your coming orgasm. A doctor enters the room, but you are so absorbed in your own pleasure that you only notice him when his hand starts to guide your head to his erect cock.'
 		gs 'arousal', 'masturbate', 10
 		gs 'stat'
 		
@@ -195,7 +195,7 @@ if $ARGS[0] = '1':
 	else
 		picrand = rand(12, 13)
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex10.jpg"></center>'
-		'As you lose yourself in pleasure, two doctors come into the room. You are so distracted, that you only notice them when they start to openly masturbate in front of you.'
+		'As you lose yourself in pleasure, two doctors come into the room. You are so distracted that you only notice them when they start to openly masturbate in front of you.'
 		gs 'arousal', 'masturbate', 10
 		gs 'stat'
 					
@@ -234,7 +234,7 @@ if $ARGS[0] = '2':
 	*clr & cla
 	picrand = rand(13, 15)
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex11.jpg"></center>'
-	'A patient comes through the door and takes off his pants to show you his flaccid penis. He asks you to help him, as he can''t seem to get an erection and it''s causing him depression. You realize that it''s all just a silly game and that he hopes to fuck you, but you still feel sorry for him. You wonder what caused him to come up with this plan, and decide it might just be that he has no luck with girls, and if today is not his lucky day, he may jump out of the window.'
+	'A patient comes through the door and takes off his pants to show you his flaccid penis. He asks you to help him, as he can''t seem to get an erection and it''s causing him depression. You realize that it''s all just a silly game and that he hopes to fuck you, but you still feel sorry for him. You wonder what caused him to come up with this plan and decide it might just be that he has no luck with girls, and if today is not his lucky day, he may jump out of the window.'
 	
 	act 'Oust him':
 		medcn_exp += rand (0,1) 
@@ -256,7 +256,7 @@ end
 if $ARGS[0] = '3':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex12.jpg"></center>'
-	'A pretty patient comes into the room and the doctor tries to examine her. Then she touches his trousers near his poorly hidden erection. The doctor glances at you with a question in his eyes.'
+	'A pretty patient comes into the room, and the doctor tries to examine her. Then she touches his trousers near his poorly hidden erection. The doctor glances at you with a question in his eyes.'
 	
 	act 'Ask if she actually needs treatment':medcn_exp += rand (0,1) & gt 'WorkHosp', 'start'
     

+ 2 - 1
locations/_attributes_coco_outfits.qsrc

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

+ 8 - 8
locations/_attributes_fetish.qsrc

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

+ 1 - 1
locations/_attributes_moncheri.qsrc

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

+ 2 - 3
locations/_attributes_swimwear.qsrc

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

+ 0 - 2
locations/_attributes_uniform.qsrc

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

+ 55 - 55
locations/_clothing_name.qsrc

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

+ 10 - 10
locations/alexandriaEv.qsrc

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

+ 8 - 8
locations/andreihunter.qsrc

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

+ 3 - 2
locations/andrey.qsrc

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

+ 8 - 8
locations/artstudia.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'bodimod1':
 	gs'stat'
 	'<center><b><font color = maroon>Patio</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/artsudvor.jpg"></center>'
-	'A small open court yard, which is often used by the art school for outdoor projects. Occasionally some of the students spend time here relaxing or smoking.'
+	'A small open courtyard, which is often used by the art school for outdoor projects. Occasionally, some of the students spend time here relaxing or smoking.'
 	act 'Leave':gt'ugol'
 	
 	if arts = 1:
@@ -23,12 +23,12 @@ if $ARGS[0] = 'bodimod2':
 	gs'stat'
 	'<center><b><font color = maroon>The studio of the artist</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/artscor.jpg"></center>'
-	'The walls of the hallway leading to the art school are decorated in a variety of art, even if the sign out front did not indicate this was the school, this hallway would be a dead give away.'
+	'The walls of the hallway leading to the art school are decorated in a variety of art. Even if the sign out front did not indicate this was the school, this hallway would be a dead give away.'
     act 'Leave':gt'artstudia','bodimod1'
 	
 	if rand(0,2) = 0 and arts_day ! daystart:
-		'There is a number of students gathered here, some of them have removed their clothes and have already been painted by Masya.'
-		'One of the girls calls you over, "Hello again, I''m so glad you came to join us again. Quick, get your clothes off, Masya nearly finished painting Emilia."'
+		'There are a number of students gathered here. Some of them have removed their clothes and have already been painted by Masya.'
+		'One of the girls calls you over, "Hello again, I''m so glad you came to join us again. Quick, get your clothes off. Masya has nearly finished painting Emilia."'
 		act 'Strip off and join in':
 			arts_day = daystart
 			if rand(0,1) = 0:
@@ -46,8 +46,8 @@ if $ARGS[0] = 'bodimod3':
     gs'stat'
 	'<center><b><font color = maroon>The studio of the artist</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/artstudio/downud.jpg"></center>'
-	'After agreeing to join one of the projects, you strip naked and have most of your body painted along with several other students. Once all of you are painted you are sent to one of the busier streets in old town to model the art.'
-	'After several hours and more than a bit of harassment from some of the men, the project is over and you all head back to the studio.'
+	'After agreeing to join one of the projects, you strip naked and have most of your body painted along with several other students. Once all of you are painted, you are sent to one of the busier streets in the Old Town to model the art.'
+	'After several hours and more than a bit of harassment from some of the men, the project is over, and you all head back to the studio.'
 	act 'Leave': gt'artstudia','bodimod2'
 end
 
@@ -57,8 +57,8 @@ if $ARGS[0] = 'bodimod4':
     gs'stat'
 	'<center><b><font color = maroon>The studio of the artist</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/artstudio/downud.jpg"></center>'
-	'After agreeing to join one of the projects, you strip naked and have most of your body painted along with several other students. Once all of you are painted you are sent to one of the busier streets in the city center to model the art.'
-	'After several hours and more than a bit of harassment from some of the men, the project is over and you all head back to the studio.'
+	'After agreeing to join one of the projects, you strip naked and have most of your body painted along with several other students. Once all of you are painted, you are sent to one of the busier streets in the city center to model the art.'
+	'After several hours and more than a bit of harassment from some of the men, the project is over, and you all head back to the studio.'
 	act 'Leave': gt'artstudia','bodimod2'
 end
 

+ 70 - 460
locations/autosalonF.qsrc

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

+ 16 - 10
locations/autoservisF.qsrc

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

+ 64 - 219
locations/autotraidF.qsrc

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

+ 4 - 5
locations/avt.qsrc

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

+ 2 - 2
locations/backwater.qsrc

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

+ 1 - 1
locations/belpicknick.qsrc

@@ -467,7 +467,7 @@ if $ARGS[0] = 'gang':
 		spafinloc = 12
 		gs 'cum_manage'
 		gs 'boyStat', 'A116'
-		$boydesc = $npc_usedname['A114']
+		$boydesc = $npc_usedname['A116']
 		sexpartkno = 1
 		spafinloc = 12
 		gs 'cum_manage'

+ 49 - 26
locations/bordel.qsrc

@@ -7,6 +7,8 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'<center><b>Brothel</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/bordel.jpg"></center>'
 
+	'The brothel madam looks you over as you enter.'
+
 	if pcs_apprnc < 0:
 		'"You look half dead, get yourself treated."'
 
@@ -16,7 +18,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 		act 'Leave':gt 'city_industrial', 'redlight'
 	else
-		act 'In the room':gt 'bordel', 'brothel'
+		'"You can work tonight, head to your room and get ready."'
+
+		act 'Go to your room':gt 'bordel', 'brothel'
 	end
 end
 
@@ -34,9 +38,9 @@ if $ARGS[0] = 'brothel':
 	gs 'stat'
 	'<center><b>Your room in a brothel</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/borroom.jpg"></center>'
-	'This is your room in the brothel. In the middle is a huge bed and not much else, there is a small side door to the <a href="exec:gt ''bordel'', ''dysh''">bathroom</a>.'
+	'This is your room in the brothel. In the middle is a huge bed and not much else. There is a small side door to the <a href="exec:gt ''bordel'', ''dysh''">bathroom</a>.'
 	*nl
-	'In a brothel there is a lot of competition, in order to avoid a massacre they introduced a rule - no more than two clients per day'
+	'In a brothel there is a lot of competition. In order to avoid a massacre, they introduced a rule - no more than two clients per day.'
 
 	act 'Leave':
 		if $clothingworntype ! 'nude':
@@ -49,21 +53,23 @@ if $ARGS[0] = 'brothel':
 		end
 	end
 
-	act 'Go to the reception room and wait for customers':
+	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!"'
+			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'
+			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'
+				act 'Go to the bathroom':gt 'bordel', 'dysh'
+			else
+				gt 'bordel', 'var'
+			end
 		end
 	end
 end
@@ -84,7 +90,7 @@ if $ARGS[0] = 'dysh':
 
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/bordysh.jpg"></center>'
 	'The bathroom is well fitted and clean as customers can access it and hygiene is very important in a brothel.'
-	'Your room is so dedicated to it purpose that your clothes are stored in here.'
+	'Your room is so dedicated to its purpose that your clothes are stored in here.'
 	*nl
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 	
@@ -118,7 +124,8 @@ if $ARGS[0] = 'var':
 	borrand = rand(0, 10)
 
 	if borrand = 0:
-		'Customer orders one girl (1,000 <b>₽</b>).'
+		bordelpay *= 100
+		'A customer orders you (<<bordelpay>> <b>₽</b>).'
 		
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -134,7 +141,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 100 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -146,7 +153,8 @@ if $ARGS[0] = 'var':
 			gt 'sex', 'start'
 		end
 	elseif borrand = 1:
-		'Customer orders two girls (1,000 <b>₽</b>).'
+		bordelpay *= 100
+		'A customer orders you and another girl (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -162,7 +170,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 100 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -173,7 +181,8 @@ if $ARGS[0] = 'var':
 			gt 'podrsex', 'start'
 		end
 	elseif borrand = 2:
-		'Two clients book one girl (1,500 <b>₽</b>).'
+		bordelpay *= 150
+		'Two clients book you (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -189,7 +198,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 150 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -202,7 +211,8 @@ if $ARGS[0] = 'var':
 			gt 'sexdvoe', 'start'
 		end
 	elseif borrand = 3:
-		'Two clients book two girls (1,500 <b>₽</b>).'
+		bordelpay *= 150
+		'Two clients book you and another girl (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -218,7 +228,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 150 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -231,7 +241,8 @@ if $ARGS[0] = 'var':
 			gt 'sexdvanadva', 'start'
 		end
 	elseif borrand = 4:
-		'Group of customers order one girl, price 2,000 <b>₽</b>.'
+		bordelpay *= 200
+		'A group of customers order you (<<bordelpay>> <b>₽</b>).'
 
 		gs 'willpower', 'sex', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -247,7 +258,7 @@ if $ARGS[0] = 'var':
 
 		act 'Agree':
 			borsexkol += 1
-			money += 200 * bordelpay
+			money += bordelpay
 			slutty += 1
 			bordelslutty += 1
 			minut += 10
@@ -273,5 +284,17 @@ if $ARGS[0] = 'var':
 	end
 end
 
+if $ARGS[0] = 'is_open':
+	RESULT = hour >= func('bordel', 'open_hour') or hour <= func('bordel', 'close_hour')
+end
+
+if $ARGS[0] = 'open_hour':
+	RESULT = 20
+end
+
+if $ARGS[0] = 'close_hour':
+	RESULT = 3
+end
+
 --- bordel ---------------------------------
 

+ 28 - 28
locations/bordelv.qsrc

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

+ 94 - 272
locations/carF.qsrc

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

+ 49 - 662
locations/carF1.qsrc

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

+ 4 - 4
locations/changingroom.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = 'view_swim_list':
 		i = 1
 		h = 0
 		:loopswimwear
-			if swimwear[i] = 1 and swimwearS[i] = 0 and ($clothingworntype ! 'swimwear' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''swimwear'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/12swimwear/<<i>>.jpg" 	height="250" /></a>'
+			if swimwear[i] = 1 and swimwear_s[i] = 0 and ($clothingworntype ! 'swimwear' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''swimwear'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/12swimwear/<<i>>.jpg" 	height="250" /></a>'
 			i += 1
 		if i <= ARRSIZE('swimwear'):jump 'loopswimwear'
 
@@ -30,7 +30,7 @@ if $ARGS[0] = 'view_swim_list':
 		i = 1
 		h = 0
 		:loopbeach
-			if beach[i] = 1 and beachS[i] = 0 and ($clothingworntype ! 'beach' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''beach'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/15beachbabe/<<i>>.jpg" 	height="250" /></a>'
+			if beach[i] = 1 and beach_s[i] = 0 and ($clothingworntype ! 'beach' or clothingwornnumber ! i):h += 1 & *p '<a href="exec:gt ''changingroom'', ''view_swim_item'', ''beach'', <<i>>"><img <<$set_imgh>> src="images/pc/clothing/15beachbabe/<<i>>.jpg" 	height="250" /></a>'
 			i += 1
 		if i <= ARRSIZE('beach'):jump 'loopbeach'
 
@@ -104,7 +104,7 @@ if $ARGS[0] = 'count_swim_item':
 	if $ARGS[1] = 'swim' or $ARGS[1] = '':
 		i = 1
 		:loopcountswimwear
-			if swimwear[i] = 1 and swimwearS[i] = 0 :h += 1
+			if swimwear[i] = 1 and swimwear_s[i] = 0 :h += 1
 			i += 1
 		if i <= ARRSIZE('swimwear'):jump 'loopcountswimwear'
 	end
@@ -112,7 +112,7 @@ if $ARGS[0] = 'count_swim_item':
 	if $ARGS[1] = 'beach' or $ARGS[1] = '':
 		i = 1
 		:loopcountbeach
-			if beach[i] = 1 and beachS[i] = 0 :h += 1
+			if beach[i] = 1 and beach_s[i] = 0 :h += 1
 			i += 1
 		if i <= ARRSIZE('beach'):jump 'loopcountbeach'
 	end

+ 1 - 1
locations/cikl.qsrc

@@ -159,7 +159,7 @@ Clothingstock[i] = rand (0,500)
 i += 1
 if i <= 147:jump 'loopprice'
 
-if coatH[defaultcoat] <= 0: defaultcoat = 0
+if coat_h[defaultcoat] <= 0: defaultcoat = 0
 
 !! Abortion and pregnancy recovery resets if finished
 

+ 24 - 6
locations/city_industrial.qsrc

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

+ 8 - 8
locations/cloakroom.qsrc

@@ -18,13 +18,13 @@ $coat_list_line = {
 
 	$RESULT +='<TD><a href="exec:gt ''cloakroom'', ''view_coat_item'', <<ARGS[0]>>"><img src="<<FUNC(''$clothing_image'', ''coat'', ARGS[0])>>" width="<<clothing_temp>>"></a></TD>'
 
-	$RESULT += '<TD>Coat # <<ARGS[0]>><br>strength: ' + dyneval '$RESULT += coatH[<<ARGS[0]>>]'+'</TD>'
+	$RESULT += '<TD>Coat # <<ARGS[0]>><br>strength: ' + dyneval '$RESULT += coat_h[<<ARGS[0]>>]'+'</TD>'
 
 	$RESULT += '<TD>' + FUNC('$clothing_name', 'coat', ARGS[0]) + '</TD>'
 
 	$RESULT += '<TD><a href="exec:gt ''cloakroom'', ''view_coat_item'', <<ARGS[0]>>">View</a></TD>'
 
-	if coatH[i] > 0:
+	if coat_h[i] > 0:
 		$RESULT += '<TD><a href="exec:defaultcoat = ''<<i>>'' & gt ''cloakroom'', ''view_coat_list''">Wear</a></TD>'
 	end
 
@@ -35,19 +35,19 @@ $coat_list_line = {
 	$RESULT += '</TD>'
 
 	$RESULT += '<TD>'
-	if dyneval('RESULT = coatS[<<ARGS[0]>>]') = 0:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest'', <<ARGS[0]>>">Keep</a>'
-	if dyneval('RESULT = coatS[<<ARGS[0]>>]') = 2:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest1'', <<ARGS[0]>>">Unwanted</a>'
+	if dyneval('RESULT = coat_s[<<ARGS[0]>>]') = 0:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest'', <<ARGS[0]>>">Keep</a>'
+	if dyneval('RESULT = coat_s[<<ARGS[0]>>]') = 2:$RESULT += ' <a href="exec:gt ''cloakroom'', ''dest1'', <<ARGS[0]>>">Unwanted</a>'
 	$RESULT += '</TD>'}
 
 if $ARGS[0] = 'dest':
 	*clr
-	dynamic 'coatS[<<ARGS[1]>>] = 2'
+	dynamic 'coat_s[<<ARGS[1]>>] = 2'
 	gt 'cloakroom', 'view_coat_list'
 end
 
 if $ARGS[0] = 'dest1':
 	*clr
-	dynamic 'coatS[<<ARGS[1]>>] = 0'
+	dynamic 'coat_s[<<ARGS[1]>>] = 0'
 	gt 'cloakroom', 'view_coat_list'
 end
 
@@ -113,12 +113,12 @@ if $ARGS[0] = 'view_coat_item':
 
 
 	$RESULT = '(strength '
-	dynamic '$RESULT += coatH[<<ARGS[1]>>]'
+	dynamic '$RESULT += coat_h[<<ARGS[1]>>]'
 	$RESULT += ')'
 	'<<$RESULT>>'
 
 	!! if the clothing is worn out
-	if dyneval('RESULT = coatH[<<ARGS[1]>>]') <= 0:
+	if dyneval('RESULT = coat_h[<<ARGS[1]>>]') <= 0:
 		'This item is worn and is not suitable for further wear.'
 		act 'Throw it away':
 			dynamic 'coat[<<ARGS[1]>>] = 0'

+ 3 - 3
locations/clothing.qsrc

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

+ 1 - 1
locations/clothing_QV.qsrc

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

+ 6 - 0
locations/cum_call.qsrc

@@ -5,6 +5,8 @@
 'arms' - 'face' - 'mouth' - 'hands' - 'stomach' - 'breasts' - 'hair' - 'internalcondom' - 'precum' - 'mouth_swallow'
 	'precum' - is for whenever Sveta has unprotected vaginal sex. It will automatically set the volume to 1.
 	'mouth_swallow' does the same as mouth but increaments swallow for the cum eater trait
+	'feet' redirects to 'legs'
+	'anal' redirects to 'anus' (prevents further errors)
 $ARGS[1] is for the name of the sexual partner
 ARGS[2] is a for knowing the partner. Defaults to 0. If this is not set to 1 the status window message will mention "some guy" instead of his name.
 	0 - unknown sex partner (his name may be known, but she newer saw him before, and likely won't ever again, or she won't remeber it)
@@ -88,6 +90,8 @@ if $ARGS[0] ! 'precum':
 		spafinloc = 2
 	elseif $ARGS[0] = 'anus':
 		spafinloc = 3
+	elseif $ARGS[0] = 'anal':
+		spafinloc = 3
 	elseif $ARGS[0] = 'butt':
 		spafinloc = 4
 	elseif $ARGS[0] = 'pantyrear':
@@ -100,6 +104,8 @@ if $ARGS[0] ! 'precum':
 		spafinloc = 8
 	elseif $ARGS[0] = 'legs':
 		spafinloc = 9
+	elseif $ARGS[0] = 'feet':
+		spafinloc = 9
 	elseif $ARGS[0] = 'arms':
 		spafinloc = 10
 	elseif $ARGS[0] = 'face':

+ 29 - 24
locations/dibodi.qsrc

@@ -6,11 +6,11 @@ if $ARGS[0] = 'os1':
 	*clr & cla
 	gs'stat'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/artstudio/downud1.jpg"></center>'
-    'You are taken back by all the naked people, with their bodies only covered by body paint.'
-    'One of the painted naked girls approaches you. "Hello, sorry, for being so forward but we could really use your participation right now and perhaps if you like it, we could even take you to participate in some of our other shows."'
-    '"Huozhnik Moses Kruzhinsky, is a very talented artist. As you can see it''s not just us girls participating, there are guys here too." She said pointing out some of the naked guys covered in body paint.'
+    'You are taken aback by all the naked people, with their bodies only covered by body paint.'
+    'One of the painted naked girls approaches you. "Hello, sorry for being so forward, but we could really use your participation right now, and perhaps if you like it, we could even take you to participate in some of our other shows."'
+    '"Huozhnik Moses Kruzhinsky is a very talented artist. As you can see, it''s not just us girls participating. There are guys here too," she says pointing some of them out.'
     '"So what do you say? Would you like to join us?"'
-	if pcs_inhib < 50:'You are considering it, having your naked body painted and then walking around in public, sounds a little shameful, but it''d be really interesting too.'
+	if pcs_inhib < 50:'You consider it. Having your naked body painted and then walking around in public sounds a little shameful, but it''d be really interesting too.'
 	act 'Decline':gt'ugol' & bodimodel1 = 1
 	act 'Doubt':gt 'dibodi', 'bodiart1'
 	if pcs_inhib > 30: act 'Agree':gt 'dibodi', 'bodiart'
@@ -21,11 +21,15 @@ if $ARGS[0] = 'bodiart':
 	gs'stat'
 	bodimodel = 1
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/artstudio/downud1.jpg"></center>'
-    '"I''m so glad, you agreed. Moses Kruzhinsky is the artist, everyone just calls him Masya." She pointed at a man painting a girl. "My name is Galina."'
-    'Then she turned back to the artist waving her arms and cried. "Masya, there is a new girl here that would be perfect for your work." The artist looked up and then stared at you with an appraising look, after a moment he nodded and went back to his current work.'
-    if lesbian > 0:'She chatted about a variety of things, using her hands to gesture often, which caused her breasts to move in pleasant ways, you barely pay attention to what she says as you find yourself staring at her chest.'
-    'After a few minutes, perhaps noticing you paying more attention to her body than to what she is saying she falls silent.'
-    'Several minutes of silence pass before she speaks again. "Our place is in the old town, you can come anytime, it was nice meeting you, but I need to get back to work."'
+    '"I''m so glad, you agreed. That''s Moses Kruzhinsky over there, though everyone just calls him Masya," she says, pointing at a man painting a girl. "My name is Galina."'
+    'She turns back to the artist waving her arms and cries, "Masya, there is a new girl here that would be perfect for your work." The artist looks up and then stares at you with an appraising look. After a moment, he nods and goes back to his current work.'
+    if lesbian > 0:
+    	'Galina chats about a variety of things, using her hands to gesture often, which causes her breasts to move in pleasant ways. You barely pay attention to what she says as you find yourself staring at her chest.'
+    	'After a few minutes, perhaps noticing you paying more attention to her body than to what she is saying she falls silent.'
+ 	   'Several minutes of silence pass before she speaks again. "Our place is in the Old Town. You can come visit anytime. It was nice meeting you, but I need to get back to work."'
+ 	else
+ 		'Galina chats about a variety of things, using her hands to gesture often. However after a few minutes, she tells you, "Our place is in the Old Town. You can come visit anytime. It was nice meeting you, but I need to get back to work."'
+    end
 	act 'Leave': gt'ugol'
 end
 
@@ -34,20 +38,21 @@ if $ARGS[0] = 'bodiart1':
 	gs'stat'
 	bodimodel = 1
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/artstudio/downud1.jpg"></center>'
-    '"I understand your reluctance, but you shouldn''t be worried. Moses Kruzhinsky is a great artist, everyone just calls him Masya." She pointed at a man painting a girl. "My name is Galina."'
-    'You listen to her and tell her. "I have done photo shoots before, but this." Indicating the other models. "This is a bit different being naked in public in a crowd of people."'
-    '"Don''t worry about it." said Galina "Even if we are completely naked, you don''t have to worry about rape or anything like that happening to you. We all watch out for one another and we will make sure no one bothers you, we all make sure no one bothers anyone, we are we almost like one big family."'
-    'Then she turned back to the artist waving her arms and cried. "Masya, there is a new girl for your work, who in my opinion would be perfect." The artist looked up and then stared at you with an appraising look, after a moment he nodded and went back to his work.'
+    '"I understand your reluctance, but you shouldn''t be worried. Moses Kruzhinsky is a great artist,"
+     she says, pointing to a man painting a girl. "Everyone just calls him Masya though. My name is Galina."'
+    'You listen to her and tell her, "I have done photo shoots before, but this," you gesture at the other models, "this is a bit different. I''m not sure I''m ok being naked in public in a crowd of people."'
+    '"Don''t worry about it," says Galina, "even if we are completely naked, you don''t have to worry about rape or anything like that happening to you. We all watch out for one another, and we will make sure no one bothers you. We all make sure no one bothers anyone. We are we almost like one big family."'
+    'Then she turns back to the artist waving her arms and cries, "Masya, there is a new girl for your work who in my opinion would be perfect." The artist looks up and then stares at you with an appraising look. After a moment, he nods and goes back to his work.'
     if lesbian > 0:
-        'She chatted about a variety of things, using her hands to gesture often, which caused her breasts to move in pleasant ways, you barely pay attention to her as you find yourself starting at her chest.'
-        'After a bit, perhaps noticing you watching her body more than paying attention to her she falls silent.'
-        'Several minutes of silence pass before she speaks up again. "Our place is in the old town, you can come visit anytime, it was nice meeting you, but I need to get back to work."'
-		act 'Refuse':gt'ugol' & bodimodel1 = 1
-	    act 'I''ll think about it':gt'ugol' & bodimodel2 = 1
-	     if pcs_inhib > 30: act 'Agree':gt'ugol'
+        'She chats about a variety of things, using her hands to gesture often, which causes her breasts to move in pleasant ways. You barely pay attention to her as you find yourself staring at her chest.'
+        'After a bit, perhaps noticing you watching her body more than paying attention to her, she falls silent.'
+        'Several minutes of silence pass before she speaks up again. "Our place is in the Old Town. You can come visit anytime. It was nice meeting you, but I need to get back to work."'
 	else
-		act 'Continue': gt'liames'
+ 		'Galina chats about a variety of things, using her hands to gesture often. However after a few minutes, she tells you, "Our place is in the Old Town. You can come visit anytime. It was nice meeting you, but I need to get back to work."'
 	end
+	act 'Refuse':gt'ugol' & bodimodel1 = 1
+    act 'I''ll think about it':gt'ugol' & bodimodel2 = 1
+    if pcs_inhib > 30: act 'Agree':gt'ugol'
 end
 
 if $ARGS[0] = 'sgtusa':
@@ -55,8 +60,8 @@ if $ARGS[0] = 'sgtusa':
 	gs'stat'
 	tusa = 1
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/photo.jpg"></center>'
-    'You walked over to a group of girls and boys talking and introduced yourself.'
-    'You were surprisingly well received.'
+    'You walk over to a group of girls and boys talking and introduce yourself.'
+    'You are surprisingly well received.'
 	act 'Continue': gt'liames'
 end
 
@@ -66,7 +71,7 @@ if $ARGS[0] = 'sotusa':
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/photo.jpg"></center>'
 	if sttan = 0 and $pantyworntype = 'none':
 	    sttan = 1
-	    '"Hey <<$pcs_nickname>> what''s with the no panties?" The crowd laughed out loud, noticing your lack of panties.'
+	    '"Hey <<$pcs_nickname>>, what''s with the no panties?" The crowd laughs out loud, noticing your lack of underwear.'
 	    act 'Continue':gt'liames'
 	end
 end
@@ -77,7 +82,7 @@ if $ARGS[0] = 'sptusa':
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/oldtown/marinka/marinka.jpg"></center>'
-	'You asked Marinka whether Masya''s studio was around here. In response Marinka shook her head, "I don''t know."'
+	'You ask Marinka whether Masya''s studio is around here. In response, Marinka nods her head, "Yes, it''s in the courtyard at the other end of that passage over there."'
 	act 'You live around here?':
 		cla
 		'"Yes," Marinka says.'

+ 30 - 29
locations/din_pav.qsrc

@@ -7,7 +7,7 @@ $pavserjil = {
 	
 	set pavserhom = 1
 	'<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil2.jpg" ></center>'
-    'It is not clear why you you are drawn to him but you can barely take you eyes off him.'
+    'It is not clear why you you are drawn to him, but you can barely take you eyes off him.'
 	act 'Overnutsya':gt'lug', 'start'
 }
 
@@ -18,11 +18,11 @@ $koncepodos = {
 	set koncepo = 0
 	pcs_mood -= 10
 	'<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod.jpg" ></center>'
-    act '"I''m enquiring about the apartment", You mumble. "On the advert outside"':
+    act '"I''m inquiring about the apartment," You mumble. "On the advert outside"':
         cls
         '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod.jpg" ></center>'
         '"Sorry darling, but the apartment is not for rent" Says the old man, reluctantly.'
-        act 'Sorry, but there is an ad on the door':
+        act 'Sorry, but why is there an ad on the door?':
             cls
             gs'stat'
             set koncepo = 1
@@ -42,20 +42,20 @@ $koncepodos1 = {
     pcs_horny = 0
     gs'stat'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/koncepod.jpg" ></center>'
-    'You walk into a large dimly lit lobby, in the corner sits the concierge. He looks like a kind old man, who looks at you with indifference.'
-    '"I''m enquiring about the apartment", You mumble. "On the advert outside"'
-    '"There''s an advert?" Asks the old man seeming upset. "That''s odd, no one said anything to me about it being up for rent."'
+    'You walk into a large, dimly lit lobby. In the corner sits the concierge, an old man who looks at you with indifference.'
+    '"I''m inquiring about the apartment," You mumble. "On the advert outside"'
+    '"There''s an advert?" Asks the old man, seeming upset. "That''s odd, no one said anything to me about it being up for rent."'
     '"So can I have a look at it?" You say, wondering why you''re having to work so hard in this conversation.'
     '"You want to rent it"?'
-    '"I want to look at it first. If it''s too much hassle to do your job I can leave."'
+    '"I want to look at it first. If it''s too much hassle to do your job, I can leave."'
     '"OK then you can go look at the apartment. It''s upstairs, room 17. I will not go with you, my legs ache."'
     'What an unpleasant man. He has you sign a registrar and then says, "Follow me <<$pcs_firstname>>."'
-    'You follow him through the dimly lit lobby and down a corridor. You can hear barely discernible sounds from various apartments, merging into ghostly mutterings that ste the hair on the back of your neck on end. You hear what sounds like a whisper, "Run."'
-    'Stopping by an old dresser the old man rummages through a drawer, "Looks like you are in luck, my dear..."'
-    'The old man puts a key in hand, "Here."'
+    'You follow him through the dimly lit lobby and down a corridor. You can hear barely discernible sounds from various apartments, merging into ghostly mutterings that set the hair on the back of your neck on end. You hear one that almost sounds like it''s whispering, "Run."'
+    'Stopping by an old dresser, the old man rummages through a drawer, "Looks like you are in luck my dear..."'
+    'The old man puts a key in your hand, "Here."'
     'You instinctively jerk your hand away at the touch of his dry, cold, almost deathly fingers. The concierge grabs your arm and breaks into a mad smile, revealing dark, rotten teeth.'
-    '"So young and pretty..."'
-    'You break his grip and running toward the stairs, hearing the laughter behind from the old man, echoing up the stair well it sounds like a thousand doors creaking.'
+    '"So young and pretty...."'
+    'You break his grip and run toward the stairs, hearing his laughter behind you. Echoing up the stairwell, it sounds like a thousand doors creaking.'
     
     act 'Get out of here fast':pavserhom = 3 & psiha = 1 & gt'dvor'
     act 'View apartment':gt'koncepod1','krr2x1'
@@ -66,23 +66,25 @@ $pavser = {
     if pcs_hairbsh = 1:pcs_hairbsh = 0
 	pcs_mood -= 10
     gs'stat'
-    'You entered the room and bowed, after graduating from a deep curtsey.' 
-    'Tryahshuv head, swept... hair... colors, came to the middle of the room and did a pirouette - slowly-slowly raised his hands in voskhoschenii room and devouring glance.'
+    'For some reason when you enter the room, you decide to bow before graduating  and bow, after graduating from a deep curtsy.' 
+    'Shaking head, swept... hair... colors, came to the middle of the room and do a pirouette - slowly-slowly raised your hands in exaltation.'
     'You blinded sunny <<$pcs_nickname>> rained out of the window and the shade seemed to get closer.'
-    'And then you notice it. He sat behind the couch against the wall, his face buried in his knees.You cried and,involuntarily raised his hand to his mouth, bit, fingers.'
-	act 'Speak':dynamic $pavser1
-	act 'Leave':pavserhom = 3 & psiha = 1 & gt'dvor'
+    'And then you notice him: a man sitting behind the couch against the wall, his face buried in his knees. You cry out and involuntarily raise your hand to your mouth, bit, fingers.'
+	act 'Look closer':dynamic $pavser1
+	act 'Run away':pavserhom = 3 & psiha = 1 & gt'dvor'
 }
 
 $pavser2 = {
 	menu_off = 1
     psi1day = 0
-    'Closing the door siboy you expect to see all, anything. Terribly narrow and gloomy hallway with old wallpaper on the walls, decorated and rather obscure streaks Settle and a long corridor'
-    'And silence. Dead to silence tinnitus,'
-    ' - No, it does not happen,that''s bullshit. Anytime and anywhere, at least some, but the sounds, and then silence - Thought you - As in the coffin.'
-    'You once visited a chill, prbezhav skin. Dark and empty, that even sounds left this place. A dust lying everywhere talked about, that people do not live here a long time.'
-    'Definitely someone here-he died, - We think you - and I''ll find a mother. No, Well this is my delirium, inflamed imagination.'
-    'All these thoughts and still spinning in your head, and you were hesitating to do at least step.'
+    'Closing the gray door, you''re prepared to see, well, anything. You find yourself in a terribly narrow and gloomy hallway.'
+    'The first thing you notice is the wallpaper. It''s covered in a rather strange pattern and clearly very old.'
+    'Then you notice the silence. The dead silence.'
+    '"No place is this quiet," you think to yourself. "It''s like I''m in a coffin."'
+    'You feel a chill run down your spine. A dark and empty place that even sound has left, dust lying everywhere. People clearly have not lived here in a long time.'
+    '"Maybe not just that," you think. "Maybe someone died here."'
+    '"No," you reassure yourself, "that''s just my imagination running wild."'
+    'Still with all these thoughts still spinning in your head, you hesitate, unsure whether you want to further look around.'
     act 'Leave':pavserhom = 3 & psiha = 1 & gt'dvor' 
 }
 
@@ -93,23 +95,22 @@ $pavser1 = {
     pcs_mana -= 30
     gs'stat'
     '<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil.jpg" ></center>'
-    'Before you appeared no longer a young man. From him it emanated a savage force and evidence were the dimensions of the body, barely distinguishable from-a beige raincoat and crumpled.'
-    act 'Who you are?':
+    'Before you, appeared no longer a young man. From him it emanated a savage force and evidence were the dimensions of his body, barely distinguishable from-a beige raincoat and crumpled.'
+    act 'Who are you?':
         *clr & cla        
         pcs_mana -= 30
         gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
         '<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil.jpg" ></center>'
-        '-exhaled, slowly retreating to the door and tried to pull myself together. - You scared me, - continued You,trying to stop shaking voice.At this point, you have learned it:man in the park on the lawn - How did you get here? '
-        '- Through the door.'
-        'His voice was deep and sonorous. You stopped at the door. Paul did not move; you have only to leave, but why-then hesitated.'
+        'You exhale, slowly retreating to the door and trying to pull yourself together. "You scared me," you continue, trying to stop your voice from shaking. At this point, you have learned it:man in the park on the lawn - How did you get here? '
+        '"Through the door" he replies, his voice was deep and sonorous. You stopped at the door. Paul did not move; you have only to leave, but why-then hesitated.'
         act 'I''m a fool Fool...':
             *clr & cla            
             gs'stat'
 			'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
             '<center><img <<$set_imgh>> src="images/characters/oldtown/pavser/pavserjil.jpg" ></center>'
             '- Leave the door open. But I did not hear, you entered.'
-            '- I went before. - His voice slipped a note zveschaya.'
+            '"I went before." His voice screeched a little.'
             'As you arouse the curiosity - Like this? A key, and then you took it...'
             '- He told me he gave it to me, - he corrected, continuing to look at you quizzically.'
             'Her surprised, that it is so easy to communicate with him, and not gone directly from this Strange.'

+ 2 - 2
locations/dorm.qsrc

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

+ 3 - 3
locations/etoexhib.qsrc

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

+ 1 - 1
locations/fame.qsrc

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

+ 5 - 5
locations/gadforest_event.qsrc

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

+ 16 - 16
locations/gameover.qsrc

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

+ 2 - 2
locations/gschool_boys_bathroom.qsrc

@@ -297,7 +297,7 @@ if $ARGS[0] = 'boy2_sub':
 			gs 'stat'
 			act 'Finish':
 				*clr & cla
-				gs 'cum_call', 'anal', $boy
+				gs 'cum_call', 'anus', $boy
 				gs 'arousal', 'end'
 				gs 'stat'
 				'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'
@@ -948,7 +948,7 @@ if $ARGS[0] = 'boy6_sub':
 						gs 'cum_call', 'labia', $boy, 1, '', '', 8
 						gs 'cum_call', 'butt', $boy, 1, '', '', 8
 						gs 'cum_call', 'face', $boy, 1, '', '', 8
-						gs 'cum_call', 'breast', $boy, 1, '', '', 8
+						gs 'cum_call', 'breasts', $boy, 1, '', '', 8
 						gs 'cum_call', 'hair', $boy, 1, '', '', 8
 						bathroomindex += 1
 						if bathroomindex < 3:

+ 36 - 36
locations/gschool_cheerleading.qsrc

@@ -224,10 +224,10 @@ if $ARGS[0] = 'afterschool_practice':
 		end
 	else
 		act 'Skip practice (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end if
+	end
 	if cheerleadingQW['skipped'] > 1:
 		act 'Quit cheerleading squad': gt 'gschool_cheerleading', 'Quit'
-	end if
+	end
 end
 
 if $ARGS[0] = 'afterschool_game':
@@ -303,11 +303,11 @@ if $ARGS[0] = 'practice':
 						cheerleadingQW['quest_stage'] = 3
 					else 
 						'The squad is already out practicing when you arrive at the locker room and change. You don''t have the privelege of owning a uniform and instead train in your sports clothing.'
-					end if
-				end if
+					end
+				end
 			else
 				'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their outfits while chatting to each other. You head to your locker and and strip down. You pull your uniform out and start getting dressed. You just finish tying your shoes when Albina gives the order to head out into the PE hall.'
-			end if
+			end
 		end
 
 		act 'Follow the others into the hall':
@@ -337,7 +337,7 @@ if $ARGS[0] = 'practice':
 					'Albina heads over to you and cheerfully greets you. "Don''t you just look delightful!" She then explains what your role in the squad will be and leads you over to the group.'
 					'"It''s all really simple. Just follow our lead and you''ll be fine. From the top girls!"'
 					'You take your place and Albina begins. You practice tumbling and flips and manage not only to impress Albina, but the rest of the squad too. "Not bad for your first time <<$pcs_nickname>>. I expect great things from you."'
-				end if
+				end
 			else
 				if cheerleadingQW['quest_stage'] = 2:
 					!! Backup variant
@@ -351,7 +351,7 @@ if $ARGS[0] = 'practice':
 							'You finish practicing the last of your moves as Albina heads your way. "<<$pcs_firstname>>, one of the girls has just gone and busted her ankle. I need you to stand in for her at the game tomorrow. Don''t get ahead of yourself, you''re only serving your purpose. So be here tomorrow after school."'
 							'Albina walks away, but your excited eagerness is suddenly shattered when she turns and glares directly at you. "Don''t make me regret choosing you!"'
 							'You are left with a slight feeling of dread within you.'
-						end if
+						end
 					elseif rand(0,8) = 0:
 						if cheerleadingQW['practice_count'] > 4 and week = 4:
 							*nl
@@ -360,7 +360,7 @@ if $ARGS[0] = 'practice':
 							You stare at her and she quickly reassures you. "Don''t worry, this isn''t a prank. I have... other things that need my attention tomorrow and Albina is fine with you covering for me. It''s your job after all!" she giggles.
 							You laugh and agree. She smiles and thanks you before whispering in your ear. "I''m going out with Vanya tomorrow, but Albina wouldn''t like that, so I told her I had to go to the doctor."
 							She then taps her nose at you, silently asking you to keep her secret, before she cheerfully bounces off to get changed.'
-						end if
+						end
 					elseif rand(0,7) = 0: 
 						if (cheerleadingQW['backup_game'] ! 1) and (npc_grupTipe['A18'] ! 5):
 							*clr & cla
@@ -368,7 +368,7 @@ if $ARGS[0] = 'practice':
 							gs 'stat'
 							
 							act 'Go take a shower': gt 'gschool_cheerleading', 'shower'
-						end if 
+						end
 					elseif rand(0,6) = 0:
 						*nl
 						'As you are practicing in the corner, you notice a boy with a phone run up to one of the girls and pull her skirt up to take a panty shot. He and his group of friends flee before anyone can stop them. After fixing her clothing, the girl assures everyone she is fine and the session continues.'
@@ -389,8 +389,8 @@ if $ARGS[0] = 'practice':
 						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.'
-						end if
-					end if
+						end
+					end
 				else
 					!! Regular variant
 					if pcs_cheer < 20:
@@ -411,14 +411,14 @@ if $ARGS[0] = 'practice':
 					else
 						gs 'npc_relationship', 'modify', 'A23', 'love'
 						'Once in the hall, you take your place as Albina explains what you will be practicing and has you begin. Your skill having drastically improved, Albina now considers you one of her best girls and uses you as an example to the others.'
-					end if
+					end
 
 					if rand(0,9) = 0:
 						if npc_grupTipe['A18'] ! 5:
 							*nl
 							'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. <<$pcs_nickname>>, help 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 you and Vicky from carrying Lariska over to the benches to rest her injured foot. Albina then has the group finish the practice session without her. 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.'
-						end if
+						end
 					elseif rand(0,8) = 0:
 						*nl
 						'As you practice, you notice a group of boys watching you and whispering among themselves, one of them holding a phone in his hand. You ignore them and continue practicing when, in the corner of your eye, you see the boy with the phone run up to you. Before you can react, he pulls your skirt up and holds the phone underneath you. You hear the click of the camera before he lets go and the group flees before anyone can stop them. You fix your clothing and assure everyone that you''re fine before the session continues.'
@@ -441,10 +441,10 @@ if $ARGS[0] = 'practice':
 						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.'
-						end if
-					end if
-				end if
-			end if
+						end
+					end
+				end
+			end
 			gs 'stat'
 			
 			act 'Go take a shower': gt 'gschool_cheerleading', 'shower'
@@ -470,26 +470,26 @@ if $ARGS[0] = 'game':
 			'<center><video autoplay loop src="images/locations/pavlovsk/school/afterschool/cheerleading/opening.mp4"></video></center>'
 			!! double cheer_exp so it progresses faster given that Sveta cant get it anywhere else
 			!! the events could differ according to the season
-			if month =>10:
+			if month >= 10:
 				if first_time_outside_in_cold_weather=0:
 					'There is a chill in the air and you shudder as you step outside in your thin outfit that does little to protect you from the elements. Despite the girls'' pleas, the football teams prefer the outdoor field to playing indoors and you are forced to perform outside, even during cold weather. Thankfully, performing your routine and then cheering from the sidelines helps keep you somewhat warm as you persevere with the vicious cold.'
 					first_time_outside_in_cold_weather=1
 				else
 					'The cold chill in the air stings with a bitter fury as you step outside. For whatever reason, a few of your fellow cheerleaders have chosen not to wear a bra and their solid nipples are poking through the thin fabric of their outfits. You soldier through the biting cold and perform your routine before cheering from the sidelines for the rest of the game, which helps keep you somewhat warm.'
-				end if
+				end
 			elseif month <=3:
 				if first_time_doing_basketball=0:
 					'Thankfully, the football team is now on its winter break and you are now safely in the warm indoors performing for the basketball team. While performing your opening routine, you notice some of the players and spectators checking you and the other girls out. Some of them are just appreciating the show while others are hungrily undressing you with their eyes. They continue eying you up for the rest of the game as you cheer from the sidelines. You ignore them as best as you can, thankful that you are indoors and warm at least.'
 					first_time_doing_basketball=1
 				else
 					'You head out into the hall and perform your opening routine for the crowd before the game starts and you cheer from the sidelines. You notice a few guys checking you and the other girls out, some of them undressing you with their eyes. You try your best to ignore them as the game continues.'
-				end if
+				end
 			elseif month = 4:
 				if first_time_spring_football_match=0:
 					'Football has started back up and you''re thankful that the weather has improved somewhat. You are no longer chilled to the bone, but the temperature picking up means you sweat a little more doing your routines. You''re grateful for the bottles of refreshing cold water being passed out and relish as you quench your thirst.'
 					first_time_spring_football_match=1
-				end if
-			end if
+				end
+			end
 
 			gs 'exercise', 'tier2', 0, 'agil_exp', 'vital_exp', 'cheer_exp', 'cheer_exp', 'danc_exp'
 			'Out on the field, you and the girls perform your opening routine flawlessly under Albina''s direction and spend the rest of the game chanting and cheering your team. You see some guys in the crowd appreciating the view of your ass as you are performing right in front of them.'
@@ -505,7 +505,7 @@ if $ARGS[0] = 'game':
 					'You let out a sigh of relief when the game ends and after performing your closing routine, you all huddle together and make a dash for the warmth of the locker room.'
 				else
 					'The game ends and you perform your closing routine to the crowd as the players leave the field. You soon join them in returning to the locker room.'
-				end if
+				end
 				'Once in the locker room, you strip from your uniform and head into the showers.'
 
 				!! Resets the flag letting backups attend games
@@ -609,7 +609,7 @@ if $ARGS[0] = 'shower':
 					end
 				end
 			end
-		end if
+		end
 	elseif rand(0,4) = 0:
 		if (cheerleadingQW['practice_count'] < 3) and (npc_grupTipe['A18'] ! 5):
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/afterschool/cheerleading/events/christina_ambush.jpg"></center>'
@@ -648,7 +648,7 @@ if $ARGS[0] = 'shower':
 					gs 'stat'
 
 					act 'Leave school': gt 'gschool_grounds', 'main'
-				end if
+				end
 			end
 
 			act 'Refuse':
@@ -683,9 +683,9 @@ if $ARGS[0] = 'shower':
 					gs 'stat'
 
 					act 'Leave school': gt 'gschool_grounds', 'main'
-				end if
+				end
 			end
-		end if
+		end
 	elseif rand(0,4) = 0 and cheerleadingQW['quest_stage'] = 3 :
 		if First_time_3some_with_Lazar = 0:
 			First_time_3some_with_Lazar = 1
@@ -867,8 +867,8 @@ if $ARGS[0] = 'shower':
 					end
 				end
 			end
-		end if
-	end if
+		end
+	end
 	if $CURACTS = '':
 		'You get dressed, place your uniform back in your locker and get ready to leave.'
 		gs 'stat'
@@ -877,8 +877,8 @@ if $ARGS[0] = 'shower':
 			if rand(0,5) = 0: gt 'gschool_cheerleading', 'Bella'
 			gt 'gschool_grounds', 'main'
 		end
-	end if
-end if
+	end
+end
 
 if $ARGS[0] = 'Bella':
 	*clr & cla
@@ -979,7 +979,7 @@ if $ARGS[0] = 'Bella':
 
 				act 'Leave':gt 'gschool_grounds', 'main'
 			end
-		end if
+		end
 	elseif bellawatch = 2:
 		'As you walk past the boys'' locker room, you can hear Bella and her friend going at it again.'
 		gs 'stat'
@@ -1050,7 +1050,7 @@ if $ARGS[0] = 'Bella':
 						gs 'stat'
 
 						act 'Leave':gt 'gschool_grounds', 'main'
-					end if
+					end
 				end
 			end
 
@@ -1062,8 +1062,8 @@ if $ARGS[0] = 'Bella':
 				act 'Leave':gt 'gschool_grounds', 'main'
 			end
 		end
-	end if
-end if
+	end
+end
 
 
 
@@ -1151,7 +1151,7 @@ if $ARGS[0] = 'Quit':
 	else
 		!!IF cheerleader- 
 		'Albina gives you an even bigger puzzled stare. "What? Why? Never mind. If you want to leave, then I won''t stop you. Just know that I thought you had some real potential here <<$pcs_nickname>>. And thanks for telling me and not just disappearing like <i>some other people</i> have." she adds. You breathe a sigh of relief as she gathers the girls and leaves, letting you go on your way.'
-	end if
+	end
 	minut += 2
 	gs 'stat'
 

+ 1 - 1
locations/hunter_ambient.qsrc

@@ -295,7 +295,7 @@ if $ARGS[0] = 'bring_food':
 		act 'Further': gt 'swamp_yard', 'start'
 	else
 		gt 'swamp_yard', 'start'
-	end if
+	end
 end
 
 

+ 2 - 2
locations/hunter_favors.qsrc

@@ -86,7 +86,7 @@ if $ARGS[0] = 'housekeeping_request':
 		end
 	else
 		gt 'swamp_yard', 'start'
-	end if
+	end
 end
 
 if $ARGS[0] = 'yard_cleanup':
@@ -126,7 +126,7 @@ if $ARGS[0] = 'dirty_swamphouse':
 	else
 		minut += 180
 		gs 'sweat', 'add', 30
-	end if
+	end
 	if huntersAndreiQw < 15:huntersAndreiQw += 1
 	if huntersIgorQw < 15:huntersIgorQw += 1
 	if huntersSergeiQw < 15:huntersSergeiQw += 1

+ 13 - 13
locations/hunter_interactions.qsrc

@@ -92,7 +92,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 
 								act 'Return to the table': gs 'swamphouse', 'meal_table'
 							end
-						end if
+						end
 					else
 						'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 						*nl
@@ -120,8 +120,8 @@ if $ARGS[0] = 'smoke_with_hunters':
 
 								act 'Return to the table': gs 'swamphouse', 'meal_table'
 							end
-						end if
-					end if
+						end
+					end
 				else
 					'<center><img <<$set_imgh>> src="images/characters/shared/photos/big172.jpg"></center>'
 					*nl
@@ -132,8 +132,8 @@ if $ARGS[0] = 'smoke_with_hunters':
 					gs 'stat'
 
 					act 'Go': gs 'swamphouse', 'huntersmokBJ'
-				end if
-			end if
+				end
+			end
 		end
 	elseif temp_sh = 3:
 		'<center><img <<$set_imgh>> src="images/characters/shared/photos/big174.jpg"></center>'
@@ -170,7 +170,7 @@ if $ARGS[0] = 'smoke_with_hunters':
 
 			act 'Return to the table': gs 'swamphouse', 'meal_table'
 		end
-	end if
+	end
 	act 'Refuse': gs 'swamphouse', 'meal_table'
 end
 
@@ -192,7 +192,7 @@ if $ARGS[0] = 'chat_with_hunters':
 		end
 	end
 
-end if
+end
 
 if $ARGS[0] = 'chat_with_hunters_theme':
 	*clr & cla
@@ -218,7 +218,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 		else
 			hunter_collective_opinion -= 2
 			hunter_sexual_comfort += 5
-		end if
+		end
 		gs 'arousal', -5, 'flashlite'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -249,11 +249,11 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 					end
 				else
 					act 'Maybe another time boys (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end if
+				end
 				gs 'stat'
 
 				act 'Approach the hunters to find out': gt 'hunter_favors', 'nighttime_entertainment'
-			end if
+			end
 		end
 		act 'No, not really':
 			cla
@@ -289,7 +289,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 				!if hunter_collective_opinion > 30 and alko < 4: act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
 				!act 'You get up and start getting into rhythm with some imaginary music': gt 'hunter_interactions', 'dance_show', 'nude'
 				act 'Maybe another time boys, not feeling it now': gt 'swamp_yard', 'start'
-			end if
+			end
 		end
 		act 'Uhh... kinda...':
 			cla
@@ -306,7 +306,7 @@ if $ARGS[0] = 'chat_with_hunters_theme':
 				!end
 
 				!act 'You oblige, feeling your pussy already getting wet': gs 'hunter_interactions', 'nighttime_entertainment'
-			end if
+			end
 		end
 	elseif $ARGS[1] = 'nude':
 		*clr & cla
@@ -1429,7 +1429,7 @@ if $ARGS[0] = 'naked_encounter':
 		end
 	else
 		gt 'swamp_yard', 'start'
-	end if
+	end
 end
 
 ! if $ARGS[0] = 'dance_show':

+ 12 - 12
locations/igorhunter.qsrc

@@ -133,7 +133,7 @@ else
 
 						act'Further':gt $loc, $loc_arg
 					end
-				end if
+				end
 			end
 			act 'No':
 				*clr & cla
@@ -171,8 +171,8 @@ else
 					'<<$boydesc>> is your boyfriend.'
 				else
 					'<<$boydesc>> is your husband.'
-				end if
-			end if
+				end
+			end
 			gs 'stat'
 
 			act 'Chat (0:30)':
@@ -240,7 +240,7 @@ else
 
 											act'Continue':gt $loc, $loc_arg
 										end
-									end if
+									end
 								end
 								act 'To remove the face':
 									*clr & cla
@@ -253,7 +253,7 @@ else
 									act'Leave':gt $loc, $loc_arg
 								end
 							end
-						end if
+						end
 						act'Leave':gt $loc, $loc_arg
 					end
 				else
@@ -287,7 +287,7 @@ else
 
 							act 'Go':gt 'hunterLoveSex','Igor'
 						end
-					end if
+					end
 					if rand(0,6) = 0:
 						act 'Break up with Igor':
 							*clr & cla
@@ -302,13 +302,13 @@ else
 
 							act 'Leave':gt $loc, $loc_arg
 						end
-					end if
-				end if
-			end if
+					end
+				end
+			end
 			act'Depart':gt $loc, $loc_arg
-		end if
-	end if
-end if
+		end
+	end
+end
 
 --- igorhunter ---------------------------------
 

+ 61 - 73
locations/ivanRoom.qsrc

@@ -3,23 +3,23 @@
 
 menu_off = 1
 
-if StoryLine = 0 or altQS = 1:
-	clr
+clr
+minut += 5
+gs 'stat'
+gs 'themes', 'indoors'
+'<center><b><font color="maroon">Apartment manager Ivan</font></b></center>'
+'<center><img <<$set_imgh>> src="images/locations/shared/apartment/podezdhr.jpg"></center>'
+'Ivan''s apartment door is made of steel and held in place with strong locks.'
+
+act 'Leave':
+	cla
 	minut += 5
-	gs 'stat'
-	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">Apartment manager Ivan</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/podezdhr.jpg"></center>'
-	'Ivan''s apartment door made of steel with good locks.'
-
-	act 'Leave':
-		cla
-		minut += 5
-		gt 'city_industrial'
-	end
+	gt 'city_industrial'
+end
 
+if StoryLine = 0 or altQS = 1:
 	if poverKAR = 1:
-		'As you approach the door you hear a faint rustling behind you. You turn and see Juugo. He walks up to you and said, "This is Ivan''s apartment. You to take this camera and film. Now we''ll get him."'
+		'As you approach the door, you hear a faint rustling behind you. You turn and see Gustav. He walks up to you and says, "This is Ivan''s apartment. Take this camera and film. Now we''ll get him."'
 
 		act 'Come on we''ll get this monster':
 			cls
@@ -28,19 +28,19 @@ if StoryLine = 0 or altQS = 1:
 			minut += 15
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/apartment/gun.jpg"></center>'
-			'As Juugo approaches to the door, you notice the tattoos on his face move seemingly having a life of their own, you notice them growing and twisting covering his face in black designs. As the designs settle on his face you notice his fists have increased in size and appear as if they are made of stone. With a  growl he launches a rock hard fist at the door bending the steel door inwards. Grabbing one of the exposed edges of the now damaged door Juugo tears the door from its frame and off its hinges. You run into the apartment after Juugo and see Ivan standing in the room holding a gun. Ivan fired a shot and Juugo twitched, then Ivan fired again and again. Juugo fell to the floor. The gun empty Ivan began frantically reloading the gun.'
+			'As Gustav approaches the door, you notice the tattoos on his face move. Seemingly having a life of their own, they grow and twist, covering his face in black designs. As the designs settle on his face, you notice his fists have increased in size and appear as if they are made of stone. With a  growl, he launches a rock hard fist at the door, bending the steel inwards. Grabbing one of the exposed edges of the now damaged door, Gustav tears it from its frame and off its hinges. You run into the apartment after Gustav and see Ivan standing in the room holding a gun. Ivan fires a shot and Gustav twitches, then Ivan fires again and again. Gustav falls to the floor. The gun empty, Ivan begins frantically reloading.'
 
-			act 'Embed Ivan':
+			act 'Attack Ivan':
 				cls
 				gs 'stat'
 				!!'<center><img <<$set_imgh>> src="images/locations/city/industrial/apartment/gun.jpg"></center>'
-				'You ran at Ivan attempting to kick him while he reloads the gun. Ivan suddenly jumped back into a bedroom and slams the door in your face.  Your inertia carries you into the solid interior door and you rebound off of it just as another shot explodes thru the door splintering the wood and narrowly misses hitting you. As you push yourself up from the floor you see Juugo, the black designs swirling all over his exposed skin, he growls low and dangerous in his chest and you see the bullet wounds expelling the bullets from his body and closing right before your eyes. His body almost totally black now with the magical tattoos you see horns sprout from his forehead. Juugo shouts furiously "NOW YOU DIE!" and charges at the wooden door that Ivan is hiding behind, lowering his head and shoulders for the impact he doesn''t even slow as he crashes through the solid wood sending splinters and shards flying inward into the room. You follow close behind entering the room and skidding to a halt. Ivan has been thrown backwards and to the ground, he''s bleeding badly from several areas with many wooden spikes impaling his body in various parts.  No sign of his gun he must have dropped it when the door exploded on him. Juugo still in a rage falls upon the prone body and with an inhuman roar begins to pummel the unconscious man. Small lightning bolts arc through the body as Juugo continues to pound the body quickly reducing Ivan to little more then pulp.'
+				'You run at Ivan, attempting to kick him while he reloads the gun. Ivan suddenly jumps back into a bedroom and slams the door in your face. Your inertia carries you into the solid interior door, and you rebound off of it just as another shot explodes through it, splintering the wood and narrowly missing hitting you. As you push yourself up from the floor, you see Gustav. The black designs swirling all over his exposed skin, he growls low and dangerous in his chest, and you see the bullet wounds expelling the bullets from his body and closing right before your eyes. His body almost totally black now with the magical tattoos, you see horns sprout from his forehead. Gustav shouts furiously, "NOW YOU DIE!" and charges at the wooden door that Ivan is hiding behind. Lowering his head and shoulders for the impact, he doesn''t even slow as he crashes through the solid wood, sending splinters and shards flying inward into the room. You follow close behind, entering the room and skidding to a halt. Ivan has been thrown backwards and to the ground. He''s bleeding badly from several areas with many wooden spikes impaling his body in various parts. No sign of his gun, he must have dropped it when the door exploded on him. Gustav, still in a rage, falls upon the prone body and, with an inhuman roar, begins to pummel the unconscious man. Small lightning bolts arc through Ivan as Gustav continues to pound his body, quickly reducing him to little more then pulp.'
 
 				act 'Run':
 					cls
 					gs 'stat'
 					!!'<center><img <<$set_imgh>> src="images/locations/city/industrial/apartment/gun.jpg"></center>'
-					'You turn and run out of the apartment at seeing Juugo fall. Just as you near the entrance you hear and feel a powerful explosion shake the house, hit from behind by the force your flung out the front door.  With ears ringing and aches and pains all over you look around and realize that Ivan''s apartment has collapsed, bits of wood and concrete litter the area around where you were thrown.'
+					'At the sight of the carnage, you turn and run out of the apartment. Just as you near the entrance, you hear and feel a powerful explosion shake the house. Hit from behind by the force, you''re flung out the front door.  With ears ringing and aches and pains all over, you look around and realize that Ivan''s apartment has collapsed. Bits of wood and concrete litter the area around where you were thrown.'
 
 					act 'Run away from the entrance':gt 'city_industrial'
 				end
@@ -50,13 +50,13 @@ if StoryLine = 0 or altQS = 1:
 				cls
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/apartment/gun.jpg"></center>'
-				'Your frozen in horror as you take in the scene. Juugo is lying in a pool of his own blood, numerous bullet wounds cover his chest and one hole in his forehead. Ivan has reloaded and is now pointing the gun at you. Juugo suddenly rolls over on the floor and you watch as his wounds expell the bullets and close before your eyes. The black designs on his face now cover most of his body swirling and thickening as he heals. In a panic Ivan begins to fire more rounds at Juugo, as if his body has hardened to stone the rounds are now bouncing off his body ricocheting off his body and swirling back towards Ivan. Juugo''s transformation complete a black skinned horned monster stands in front of Ivan now. "NOW YOU DIE!" he roars.  Ivan tries to back away from the creature reloading his weapon again. Juugo quick as lightning jumped on him and hit Ivan so hard it through him across the room like a rag doll. You cross the room to Ivan''s broken bleeding body, you kick the gun away from Ivan''s hand where it had fallen from his limp hand. Juugo with a triumphant cry rushed to Ivan and became pummeling Ivan''s head small arcs of lightning pass into the body as Juugo''s fists turn the head to pulp. You lay your hand caefully on Juugo''s powerful shoulder calming him and stopping the carnage.'
+				'You freeze in horror as you take in the scene. Gustav is lying in a pool of his own blood, numerous bullet wounds covering his chest and one hole in his forehead. Ivan has reloaded and is now pointing the gun at you. Gustav suddenly rolls over on the floor, and you watch as his wounds expel the bullets and close before your eyes. The black designs on his face now cover most of his body, swirling and thickening as he heals. In a panic, Ivan begins to fire more rounds at Gustav, but as if his body has hardened to stone, the rounds now bounce off his body, ricocheting off and swirling back towards Ivan. Gustav''s transformation complete, a black skinned horned monster stands in front of Ivan now. "NOW YOU DIE!" he roars.  Ivan tries to back away from the creature, reloading his weapon again. Gustav, quick as lightning, jumps on him and hits Ivan so hard it throws him across the room like a rag doll, knocking the gun from his limp hand. You cross the room to Ivan''s broken bleeding body and kick the gun out of reach. Gustav, with a triumphant cry, rushes to Ivan and begins pummeling his head. Small arcs of lightning pass into his body as Gustav''s fists turn his head to pulp. You lay your hand carefully on Gustav''s powerful shoulder, calming him and stopping the carnage.'
 
 				act 'Run':
 					cls
 					gs 'stat'
 					!!'<center><img <<$set_imgh>> src="images/locations/city/industrial/apartment/gun.jpg"></center>'
-					'You turn and run out of the apartment at seeing Juugo fall. Just as you near the entrance you hear and feel a powerful explosion shake the house, hit from behind by the force your flung out the front door.  With ears ringing and aches and pains all over you look around and realize that Ivan''s apartment has collapsed, bits of wood and concrete litter the area around where you were thrown.'
+					'You turn and run out of the apartment. Just as you near the entrance, you hear and feel a powerful explosion shake the house. Hit from behind by the force, you''re flung out the front door.  With ears ringing and aches and pains all over, you look around and realize that Ivan''s apartment has collapsed. Bits of wood and concrete litter the area around where you were thrown.'
 
 					act 'Run away from the entrance':gt 'city_industrial'
 				end
@@ -65,14 +65,14 @@ if StoryLine = 0 or altQS = 1:
 	end
 
 	if softKAR = 1:
-		'You arrive at Ivan''s apartment, you see Tatiana is already there. She adjusts her glasses and says. "Ivan is in his apartment."'
+		'You arrive at Ivan''s apartment and see Tatiana is already there. She adjusts her glasses and says, "Ivan is in his apartment."'
 
 		act 'What''s the plan?':
 			cls
 			pcs_horny = 0
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-			'Tatiana began to explain, "I can cast a temporary spell on you. Ivan will not recognize you. We can seduce him, and get him talking and maybe have a few drinks. Then when he''s in our power we get him to write out a confession. "'
+			'Tatiana begins to explain, "I can cast a temporary spell on you. Ivan will not recognize you. We can seduce him and get him talking and maybe have a few drinks. Then when he''s in our power, we get him to write out a confession. "'
 
 			act 'Let''s get down':
 				cls
@@ -80,7 +80,7 @@ if StoryLine = 0 or altQS = 1:
 				pcs_horny += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-				'Tatiana speaks the words to the spell softly and touches your face with her hand. She removes her hand and says, "Here hold this bottle. It''s a strong aphrodisiac that works by inhaling the fumes. Becareful because it will effect us as well." Tatiana gave you a signal and sprinkle a little on the frame of the front door, trying not to inhale the aroma. Tatiana rang the bell and you wait for Ivan to answer. Ivan opens the door and stands in the threshold, he looking a t you little bewildered. Tatiana smiles sweetly at Ivan "Hello we are conducting a survey, can we ask you a few questions? And maybe show you a few products" Ivan stands aside and gestures you into the apartment.'
+				'Tatiana speaks the words to the spell softly and touches your face with her hand. She removes her hand and says, "Here hold this bottle. It''s a strong aphrodisiac that works by inhaling the fumes. Be careful because it will affect us as well." Tatiana gave you a signal and sprinkles a little on the frame of the front door, trying not to inhale the aroma. Tatiana rings the bell, and you wait for Ivan to answer. Ivan opens the door and stands in the threshold. He looks at you a little bewildered. Tatiana smiles sweetly at Ivan, "Hello we are conducting a survey. Can we ask you a few questions, and maybe show you a few products?" Ivan stands aside and gestures you into the apartment.'
 
 				act 'Enter the apartment':
 					cls
@@ -88,15 +88,15 @@ if StoryLine = 0 or altQS = 1:
 					pcs_horny += 50
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-					'Together with Tatiana you entered the apartment and follow Ivan into his living room. The room was clean and cozy. Ivan invited you to sit on the sofa and sat down in a chair in front of you. Tatiana began to ask questions about his sex life and desires. Ivan looked surprisingly calm despite the aphrodisiacs effects. You tried not to breathe it in, but you can still feel its impact. Tatiana elbows you and remembering your posing as salespeople you display the vial as if it''s the latest greatest product.'
+					'Together with Tatiana, you enter the apartment and follow Ivan into his living room. The room is clean and cozy. Ivan invites you to sit on the sofa and sits down in a chair in front of you. Tatiana begins to ask questions about his sex life and desires. Ivan looks surprisingly calm despite the aphrodisiac''s effects. You try not to breathe it in, but you can still feel its impact. Tatiana elbows you, and remembering you''re posing as salespeople, you display the vial as if it''s the latest, greatest product.'
 
 					act 'Splash secretly':
 						cls
 						minut += 5
 						pcs_horny += 25
 						gs 'stat'
-					'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-					'Tatiana distracts Ivan leaning forward displaying her cleavage, as she does this you discretely splash the  aphrodisiac around the area, as the scent rises you feel the effects and begin to get aroused. Tatiana being all alluring and seductive continues to talk with Ivan trying to seduce him, you notice her cheeks are flushed. But Ivan doesn''t seem to be reacting to the aphrodisiac, his calmy sitting there listening to her seemly not even interested in the show shes putting on. Tatiana again pokes you in the ribs.'
+						'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
+						'Tatiana distracts Ivan, leaning forward displaying her cleavage. As she does this, you discretely splash the aphrodisiac around the area. As the scent gets stronger, you feel the effects and begin to get aroused. Tatiana, being all alluring and seductive, continues to talk with Ivan, trying to seduce him. You notice her cheeks are flushed. But Ivan doesn''t seem to be reacting to the aphrodisiac, calmly sitting there listening to her seemly not even interested in the show she''s putting on. Tatiana again pokes you in the ribs.'
 
 						act 'Splash again':
 							cls
@@ -104,14 +104,14 @@ if StoryLine = 0 or altQS = 1:
 							pcs_horny += 25
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-							'Tatiana got up from the sofa, turns around and kneels beside the couch rummaging thru her bag seductively arching her back. Ivan stared at her ass for a few seconds then calmy looks away. You splash some more again and feel the effects as your pussy gets wet swollen youwiggle a little in your seat as your pussy starts to demand attention. Tatiana resumes her seat on the sofa. It was evident that an aphrodisiac is working on her as well. She licks lips, and is breathing a bit harder, her cheeks and neck are flushed and she fidgets in her seat as if trying to scratch an itch. Ivan looks at you both with interest, but again, no sign of arousal shows. Tatiana takes the vial from your hand, stands and approaches Ivan asking him to smell this perfume.  Ivan smiled at her and said, "Sorry, I seem to be coming down with something my nose is rather stuffed right now I can''t smell a thing. Tatiana helplessly sits on the couch again all her cunning plans with magic and alchemy collapseing in front of her due to a cold.'
+							'Tatiana gets up from the sofa, turns around and kneels beside the couch, rummaging through her bag seductively arching her back. Ivan stares at her ass for a few seconds then calmly looks away. You splash some more again and feel the effects as your pussy swells and begins to get wet. You wiggle a little in your seat as it starts to demand attention. Tatiana resumes her seat on the sofa. It is evident that the aphrodisiac is working on her as well. She is licking her lips and breathing a bit harder, her cheeks and neck are flushed, and she is fidgeting in her seat as if trying to scratch an itch. Ivan looks at you both with interest, but again, no sign of arousal shows. Tatiana takes the vial from your hand, stands and approaches Ivan, asking him to smell this perfume. Ivan smiles at her and says, "Sorry, I seem to be coming down with something. My nose is rather stuffed right now, I can''t smell a thing. Tatiana helplessly sits on the couch again, all her cunning plans with magic and alchemy collapsing in front of her due to a cold.'
 
 							act 'Suggest a drink':
 								cls
 								minut += 5
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-								'After a short conversation where Tatiana asked quite a few very personal questions of Ivan, all the while displaying her cleavage, you take your que and ask if Ivan would like to have a drink with you and Tatiana. He chuckled, "Girls, I do not know what you''re up to here, but I think this is over." You start to protest but he cuts you off. ""No. Two good looking but strange girls, come to my house, asking me stupid questions, trying to entice me, then you want to drink, then what, I pass out? Then you rob my house as I sleep?" Tatiana is noticeably flustered realizing that her plan has unravelled at the seams. Ivan gets up from the couch and asks you to leave the apartment. Tatiana tries to think of something else but Ivan is already holding the door open for you have nothing left to do but to leave.'
+								'After a short conversation where Tatiana asks quite a few very personal questions of Ivan, all the while displaying her cleavage, you take your cue and ask if Ivan would like to have a drink with you and Tatiana. He chuckles, "Girls, I do not know what you''re up to here, but I think this is over." You start to protest, but he cuts you off. ""No. Two good looking but strange girls come to my house, asking me stupid questions, trying to entice me, then you want to drink, then what, I pass out? Then you rob my house as I sleep?" Tatiana is noticeably flustered realizing that her plan has unravelled at the seams. Ivan gets up from the couch and asks you to leave the apartment. Tatiana tries to think of something else, but Ivan is already holding the door open for you, and you have nothing left to do but leave.'
 
 								act 'Leave the apartment':
 									cls
@@ -130,7 +130,7 @@ if StoryLine = 0 or altQS = 1:
 								minut += 5
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome.jpg"></center>'
-								'You fall silent trying to think of something else, but Tatiana spoke before you could think. "Stuffy nose? I know the perfect remedy for a cold." Tatiana approached Ivan and put her hand on his face beginning to massage his face and around his nose. Looking at his eyes you could tell that some of the scent was penetrating into his sinus cavity and he was starting to feel some effect from the aphrodisiac. Ivan grabbed Tatiana and drew her to him. She tried resisting, but the very powerful effects of the aphrodisiac, caught her as well and she began to kiss him. Ivan waved you over to them as they kissed and under the effects you comply and embrace them both. The effects and the scene before you really turn you on'
+								'You fall silent, trying to think of something else, but Tatiana speaks before you can. "Stuffy nose? I know the perfect remedy for a cold." Tatiana approaches Ivan and puts her hand on his face, beginning to massage around his nose. Looking at his eyes, you can tell that some of the scent is penetrating into his sinus cavity and he is starting to feel some effect from the aphrodisiac. Ivan grabs Tatiana and draws her to him. She tries resisting, but the very powerful effects of the aphrodisiac catch her as well, and she begins to kiss him. Ivan waves you over to them as they kiss, and under the effects, you comply and embrace them both. The effects and the scene before you really turn you on.'
 
 								act 'Continue':
 									cls
@@ -138,7 +138,7 @@ if StoryLine = 0 or altQS = 1:
 									softKAR = 2
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome1.jpg"></center>'
-									'As Tatiana is kissing Ivan she reaches down and unbuttons his pants. Finally springing his hard cock to your view. Tatiana drops to her knees in front of Ivan and takes his penis into her mouth and began to suck. Ivan locks you his grip kissing you hard and passionately on the lips as Tatiana greedily sucks his cock. Ivan grabs your hair and forces you to your knees before him as well.'
+									'As Tatiana is kissing Ivan, she reaches down and unbuttons his pants, springing his hard cock into view. Tatiana drops to her knees in front of Ivan, takes his penis into her mouth and begins to suck. Ivan locks you in his grip, kissing you hard and passionately on the lips as Tatiana greedily sucks his cock. Ivan grabs your hair and forces you to your knees before him as well.'
 
 									act 'Suck a cock together with Tatiana':
 										cls
@@ -149,7 +149,7 @@ if StoryLine = 0 or altQS = 1:
 										gang += 1
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome2.jpg"></center>'
-										'Kneeling beside Tatiana you happily share Ivan''s cock between you. One sucking his cock while the other tongues his balls.  Then changing positions so you can both share him between kissing each other around his cock.'
+										'Kneeling beside Tatiana, you happily share Ivan''s cock between you, one sucking his cock while the other tongues his balls, then changing positions, kissing each other in between.'
 										gs 'arousal', 'bj', 5, 'group'
 										gs 'stat'
 
@@ -159,13 +159,13 @@ if StoryLine = 0 or altQS = 1:
 
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome3.jpg"></center>'
-											'Tatiana pulls Ivan down onto his back and tearing off her clothes jumps on to his cock. While Tatiana furiously rides his dick, you caress his balls and stroke Tatiana''s back and ass.'
+											'Tatiana pulls Ivan down onto his back and, tearing off her clothes, jumps onto his cock. While Tatiana furiously rides his dick, you caress his balls and stroke Tatiana''s back and ass.'
 
 											act 'Sit on Ivan''s face':
 												cls
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome4.jpg"></center>'
-												'While Tatiana continues to ride his dick, you expose your pussy and sit down on Ivan''s face. Ivan begins to lick your pussy, incredible bliss envelopes you. After several minutes and several small orgasms you climb off Ivan''s face pushing Tatiana off Ivan. You push her down on the floor next to Ivan and lower yourself onto her.'
+												'While Tatiana continues to ride his dick, you expose your pussy and sit down on Ivan''s face. Ivan begins to lick your pussy, and incredible bliss envelops you. After several minutes and several small orgasms, you climb off Ivan''s face, pushing Tatiana off Ivan. You push her down on the floor next to Ivan and lower yourself onto her.'
 
 												gs 'arousal', 'cuni', 5, 'group'
 												gs 'stat'
@@ -175,7 +175,7 @@ if StoryLine = 0 or altQS = 1:
 													pcs_vag += 1
 													gs 'stat'
 													'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome5.jpg"></center>'
-													'You lower your face to Tatiana''s pussy and begin licking her as her tongue licks furiously at your clit. Your extremely turned on when a hard cock parts the folds of your pussy and fills you up from behind, your overwhelmed from the feeling of being penetrated as your clit is worked out from below.  You give your all to Tatiana licking her pussy fast and hard as Ivan pounds into you from behind.  In no time your begin to shudder with convulsions as a huge orgasm spikes through your body, you hear Tatiana cry out with you as she hugs your body close her own orgasm roaring through her.  The two of you feel as one being and your both moaning loudly and with that Ivan roars and buries himself deep inside you shooting his hot semen into your quivering pussy. For one moment the three of you spasm together then Ivan pulls out of you and slides his dick into Tatiana''s mouth shooting the last bit of his sperm into her mouth, as he falls back away from you feel Tatiana licking the sperm from your pussy.'
+													'You lower your face to Tatiana''s pussy and begin licking her as her tongue licks furiously at your clit. You''re extremely turned on when Ivan''s hard cock parts the folds of your pussy and fills you up from behind, the feeling of being penetrated as your clit is worked out from below overwhelming you. You give your all to Tatiana, licking her pussy fast and hard as Ivan pounds into you. In no time, you begin to shudder with convulsions as a huge orgasm spikes through your body. You hear Tatiana cry out with you as she hugs your body close, her own orgasm roaring through her. The two of you feel as one being, and you''re both moaning loudly. With that, Ivan roars and buries himself deep inside you, shooting his hot semen into your quivering pussy. For one moment, the three of you spasm together, then Ivan pulls out of you and slides his dick into Tatiana''s mouth, shooting the last bit of his sperm into her. As he falls away, you feel Tatiana licking the sperm from your pussy.'
 
 													$orgasm_or = 'yes'
 													gs 'arousal', 'cuni_give', 5, 'group'
@@ -183,16 +183,16 @@ if StoryLine = 0 or altQS = 1:
 													minut -= 5
 													gs 'stat'
 
-													act 'On your knees':
+													act 'Get on your knees':
 														cls
 														minut += 5
 														facial += 1
 														cumface += 1
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/shared/sex/group/cum/threesome6.jpg"></center>'
-														'You knelt together with Tatiana as Ivan begins to jerk off in front of your faces. Suddenly Ivan clenches up and cum flies out of his cock and hot jet of sperm hits you both in the face. Ivan finally dried out, retreats to the couch trying to catch his breath. You take a few minutes to lick the cum off of each others faces. Tatiana whispers to you, cameras ready.'
+														'You kneel together with Tatiana as Ivan begins to jerk off in front of your faces. Suddenly, Ivan clenches up, and cum flies out of his cock, hot jets of sperm hitting you both in the face. Ivan, finally dried out, retreats to the couch trying to catch his breath. You take a few minutes to lick the cum off of each other''s faces. Tatiana whispers to you, cameras ready.'
 
-														act 'Cooking chamber':
+														act 'Interrogate Ivan':
 															cls
 															softKAR = 10
 															BurgerQW['IvanQWEvidence'] = 1
@@ -200,7 +200,7 @@ if StoryLine = 0 or altQS = 1:
 															cumface = 0
 															gs 'stat'
 															'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-															'You secretly prepared a camera filming through a hole in her purse at Ivan. Tatiana meanwhile handed him a glass of water, thirsty Ivan drank the water as Tatiana asked him. Tell me how you stole from his boss. Ivan grinned "Elementary, I lost big time at the casino and I urgently needed the money. I knew this old asshole kept his bribe money in the safe. And he really liked the dumb slut dishwasher. And I came up with a brilliant plan. I convinced her to distract the manger. He would have done anything she asked he was so hot for her. I convinced her to get the keys for me and stood where the cameras could not see me and took what I wanted. Then I had the cleaning woman take the money out and return it to me outside of work for a small cut. "And where is the money now?" Ivan said sadly "It''s all gone I paid off my casino debt and some other bills." Tatiana grinned, "It''s done Ivan you go to sleep." Ivan was immediately snoring on the couch. Tatiana turned to you. "That was close we almost screwed up because of his cold. Good lesson for you. Everything can not go according to plan. Thought I would have to paralyze him, but I have tried that once. Paralyzed object can choke if you''re not careful. Okay, let''s get out of here we got what we need." You quickly wash up in the bathroom with Tatiana, washing the left over sperm from each others faces and chests. She smiles at you while looking into yours and gets the last of the sperm off your chin and together you return to the street.'
+															'You secretly prepare a camera, filming through a hole in your purse. Tatiana meanwhile hands Ivan a glass of water. Thirsty, he drinks the water as Tatiana asks him, "Tell me how you stole from your boss." Ivan grins, "Elementary, I lost big time at the casino, and I urgently needed the money. I knew this old asshole kept his bribe money in the safe and he really liked this dumb slut dishwasher, so I came up with a brilliant plan. I convinced her to distract the manager. He would have done anything she asked he was so hot for her. I convinced her to get the keys for me and stood where the cameras could not see me and took what I wanted. Then I had the cleaning woman take the money out and return it to me outside of work for a small cut." "And where is the money now?" Ivan says sadly, "It''s all gone. I paid off my casino debt and some other bills." Tatiana grins, "It''s done Ivan, you go to sleep." Ivan is immediately snoring on the couch. Tatiana turns to you. "That was close. We almost screwed up because of his cold. Good lesson for you. Everything can not go according to plan. Thought I would have to paralyze him, but I have tried that once. Paralyzed object can choke if you''re not careful. Okay, let''s get out of here. We got what we need." You quickly wash up in the bathroom with Tatiana, washing the leftover sperm from each other''s faces and chests. She smiles at you while looking you over and gets the last of the sperm off your chin. Together, you return to the street.'
 
 															gs 'arousal', 'end'
 															gs 'stat'
@@ -221,60 +221,48 @@ if StoryLine = 0 or altQS = 1:
 		end
 	end
 else
-	clr
-	minut = minut + 5
-	gs'stat'
-	gs 'themes', 'indoors'
-	'<center><b><font color = maroon>Apartment manager Ivan</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/shared/apartment/podezdhr.jpg"></center>'
-	'Ivan''s apartment door made of steel with good locks.'
-	act 'Logout':
-		cla
-		minut = minut + 5
-		gt'city_industrial'
-	end
 	if softKAR = 1:
-		'You arrive at Ivan''s apartment, you see Tanya is already there. She adjusts her glasses and says. "Ivan is in his apartment. Well, ready?"'
-		act 'What plan?':
+		'You arrive at Ivan''s apartment and see Tanya is already there. She adjusts her glasses and says, "Ivan is in his apartment. Well, ready?"'
+		act 'What''s the plan?':
 			cls
 			pcs_horny = 0
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-			'Tanya started to explain "In your disguise Ivan won''t recognize you. We have to seduce him, for that I have the means,this aphrodisiac is enough strong and he just has to smell it, and immediately he''ll be horny. The main thing we keep ourselves out of the vapor. Then when he is ready to offer him a drink, that shoul untie his tongue. We record his confession on camera. And thats it."'
+			'Tanya starts to explain, "In your disguise, Ivan won''t recognize you. We have to seduce him. For that, I have the means. This aphrodisiac is strong enough he just has to smell it and immediately he''ll be horny. The main thing is we need to keep ourselves out of the vapor. Then when he is ready, we''ll offer him a drink. That should untie his tongue. We''ll record his confession on camera, and that''s it."'
 			act 'Let''s begin':
 				cls
 				minut += 5
 				pcs_horny += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-				'Tanya said "Here, take this bottle, it''s the aphrodisiac. Carefull with that remember it will affect us as well." Tanya gives you the bottle and you splash a little on the frame of the door, trying not to inhale the aroma. Tanya rang the bell and waited a few minutes for him to answer it. On the threshold appeared Ivan, he looked a little perplexed at you. Tanya smiled sweetly Ivan "We conducting a social survey, Can we ask you a few questions?" Ivan stands aside inviting you to go to the apartment.'
-				act 'Go in to the apartment':
+				'Tanya says, "Here, take this bottle, it''s the aphrodisiac. Careful with that. Remember it will affect us as well." Tanya gives you the bottle, and you splash a little on the frame of the door, trying not to inhale the aroma. Tanya rings the bell and waits a few minutes for Ivan to answer it. Appearing on the threshold, he looks a little perplexed at you. Tanya smiles sweetly at Ivan, "We are conducting a social survey. Can we ask you a few questions?" Ivan stands aside, inviting you to go into the apartment.'
+				act 'Go into the apartment':
 					cls
 					minut += 5
 					pcs_horny += 50
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-					'Together with Tanya you entered the apartment and followed Ivan into his living room. The room was clean and comfortable. Ivan asked you to sit down on the sofa and sat down in front of you in another chair. Tanya began to ask Ivan questions about sex. Ivan looked surprisingly calm for a man under the impact of an aphrodisiac. You tried not to breathe and could still feel its effects. Tanya nudged you with her elbow and looked toward your bottle.'
+					'Together with Tanya, you enter the apartment and follow Ivan into his living room. The room is clean and comfortable. Ivan asks you to sit down on the sofa and sits down in front of you in another chair. Tanya begins to ask Ivan questions about sex. Ivan looks surprisingly calm for a man under the impact of an aphrodisiac. You try not to breathe and can still feel its effects. Tanya nudges you with her elbow and looks toward your bottle.'
 					act 'Drizzle secretly':
 						cls
 						minut += 5
 						pcs_horny += 25
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-						'While Tanya was distracting Ivan showing him your neckline, you still discretely spread the  aphrodisiac in the air and felt yourself become excited. Tanya all the more tempting and seductive talked with Ivan trying to seduce him, you even noticed her cheeks flushed. But Ivan reacted rather calmly to what is happening, he looked at you with interest but we did not notice any signs of excitement. Meanwhile Tanya again, jabbing you with an elbow in the ribs.'
+						'While Tanya is distracting Ivan showing him her neckline, you discretely spread the  aphrodisiac in the air and feel yourself become excited. Tanya, all the more tempting and seductive, talks with Ivan, trying to seduce him. You even noticed her cheeks flush. But Ivan reacts rather calmly to what is happening. He looks at you with interest, but you do not notice any signs of excitement. Meanwhile, Tanya again jabs you with an elbow in the ribs.'
 						act 'Splash again':
 							cls
 							minut += 5
 							pcs_horny += 25
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-							'Tanya got up from the sofa and turned back to Ivan bent down and started fumbling in her bag seductively stretching. Ivan looked approvingly at Tanya''s ass and but calmly looked away after a casual viewing. You spread more of the aphrodisiac and felt more aroused, as your pussy swelled and began to get wet. Tanya meanwhile sat back down on the sofa. You could tell Tanya was being affected as well her face was flushed her breathing harder and she fidgeted in her seat as if trying to scratch an itch. Ivan looked at you with interest, but again, no signs of excitement. Tanya broke down and grabbed the bottle from your hands. She stood up and asked Ivan to smell her perfume, and tell her that he thought of it. Ivan smiled at it and said, "Sorry, I have a stuffy nose, I can''t smell a thing." Tanya helplessly sat down on the sofa, all of her cunning plan collapsed due to a stuffy nose.'
-							act 'Suggest drink':
+							'Tanya gets up from the sofa and turns back to Ivan, bending down and starting fumbling in her bag seductively stretching. Ivan looks approvingly at Tanya''s ass, but calmly looks away after a casual viewing. You spread more of the aphrodisiac and feel more aroused, your pussy swelling and beginning to get wet. Tanya meanwhile sits back down on the sofa. You can tell Tanya is being affected as well, her face is flushed, her breathing is harder, and she is fidgeting in her seat as if trying to scratch an itch. Ivan looks at you with interest, but again, no signs of excitement. Tanya breaks down and grabs the bottle from your hands. She stands up and asks Ivan to smell her perfume and tell her that he thinks of it. Ivan smiles and says, "Sorry, I have a stuffy nose, I can''t smell a thing." Tanya helplessly sits down on the sofa, all of her cunning plan collapsing due to a stuffy nose.'
+							act 'Suggest a drink':
 								cls
 								minut += 5
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-								'After a short conversation where Tanya asked quite a few very personal questions of Ivan, all the while displaying her cleavage, you take your que and ask if Ivan would like to have a drink with you and Tanya. He chuckled, "Girls, I do not know what you''re up to here, but I think this is over." You start to protest but he cuts you off. ""No. Two good looking but strange girls, come to my house, asking me stupid questions, trying to entice me, then you want to drink, then what, I pass out? Then you rob my house as I sleep? " Tanya is noticeably flustered realizing that her plan has unravelled at the seams. Ivan gets up from the couch and asks you to leave the apartment. Tanya tries to think of something else but Ivan is already holding the door open for you have nothing left to do but to leave.'
+								'After a short conversation where Tanya asks, quite a few very personal questions of Ivan, all the while displaying her cleavage, you take your cue and ask if Ivan would like to have a drink with you and Tanya. He chuckles, "Girls, I do not know what you''re up to here, but I think this is over." You start to protest, but he cuts you off. "No. Two good looking but strange girls come to my house, asking me stupid questions, trying to entice me, then you want to drink, then what, I pass out? Then you rob my house as I sleep?" Tanya is noticeably flustered, realizing that her plan has unravelled at the seams. Ivan gets up from the couch and asks you to leave the apartment. Tanya tries to think of something else, but Ivan is already holding the door open for you, and you have nothing left to do but leave.'
 
 								act 'Get out of the apartment':
 									cls
@@ -282,32 +270,32 @@ else
 									softKAR = 0
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-									'Together with Tanya you left the apartment and Ivan closed the door behind you. Tanya in anger she slammed her fist against the palm of her hand. "I can''t believe it all my plans defeated by a common cold"'
+									'Together with Tanya, you leave the apartment, and Ivan closes the door behind you. Tanya in anger slams her fist against the palm of her hand. "I can''t believe it. All my plans defeated by a common cold."'
 									act 'Go out of the door':gt 'city_industrial'
 								end
 							end
-							act 'To be silent':
+							act 'Be silent':
 								cls
 								minut += 5
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome.jpg"></center>'
-								'You fall silent trying to think of something else, but Tanya spoke before you could think. "Stuffy nose? I know the perfect remedy for a cold." Tanya approached Ivan and put her hand on his face beginning to massage his face and around his nose. Looking at his eyes you could tell that some of the scent was penetrating into his sinus cavity and he was starting to feel some effect from the aphrodisiac. Ivan grabbed Tanya and drew her to him. She tried resisting, but the very powerful effects of the aphrodisiac, caught her as well and she began to kiss him. Ivan waved you over to them as they kissed and under the effects you comply and embrace them both. The effects and the scene before you really turn you on'
+								'You fall silent trying to think of something else, but Tanya speaks before you can. "Stuffy nose? I know the perfect remedy for a cold." Tanya approaches Ivan, and puts her hand on his face, beginning to massage around his nose. Looking at his eyes, you can tell that some of the scent is penetrating into his sinus cavity and he is starting to feel some effect from the aphrodisiac. Ivan grabs Tanya and draws her to him. She tries resisting, but the very powerful effects of the aphrodisiac catch her as well, and she begins to kiss him. Ivan waves you over to them as they kiss, and under the effects, you comply and embrace them both. The effects and the scene before you really turn you on.'
 								act 'Continue':
 									cls
 									minut += 5
 									softKAR = 2
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome1.jpg"></center>'
-									'As Tanya is kissing Ivan she reaches down and unbuttons his pants. Finally springing his hard cock to your view. Tanya drops to her knees in front of Ivan and takes his penis into her mouth and began to suck. Ivan locks you his grip kissing you hard and passionately on the lips as Tanya greedily sucks his cock. Ivan grabs your hair and forces you to your knees before him as well.'
+									'As Tanya is kissing Ivan, she reaches down and unbuttons his pants, springing his hard cock into view. Tanya drops to her knees in front of Ivan, takes his penis into her mouth and begins to suck. Ivan locks you in his grip, kissing you hard and passionately on the lips as Tanya greedily sucks his cock. Ivan grabs your hair and forces you to your knees before him as well.'
 
-									act 'To suck cock together with Tanya':
+									act 'Suck cock together with Tanya':
 										cls
 										guy += 1
 										if TatianaSex = 0:TatianaSex = 1 & girl += 1
 										gang += 1
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome2.jpg"></center>'
-										'Kneeling beside Tanya you happily share Ivan''s cock between you. One sucking his cock while the other tongues his balls.  Then changing positions so you can both share him between kissing each other around his cock."'
+										'Kneeling beside Tanya, you happily share Ivan''s cock between you, one sucking his cock while the other tongues his balls, then changing positions, kissing each other in between.'
 										gs 'arousal', 'bj', 5, 'group'
 										gs 'arousal', 'bj', 5, 'group'
 										gs 'stat'
@@ -316,12 +304,12 @@ else
 											minut += 5
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome3.jpg"></center>'
-											'Tanya pulls Ivan down onto his back and tearing off her clothes jumps on to his cock. While Tanya furiously rides his dick, you caress his balls and stroke Tanya''s back and ass.'
+											'Tanya pulls Ivan down onto his back and, tearing off her clothes, jumps onto his cock. While Tanya furiously rides his dick, you caress his balls and stroke Tanya''s back and ass.'
 											act 'Sit on Ivan''s face':
 												cls
 												gs 'stat'
 												'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome4.jpg"></center>'
-												'While Tanya continues to ride his dick, you expose your pussy and sit down on Ivan''s face. Ivan begins to lick your pussy, incredible bliss envelopes you. After several minutes and several small orgasms you climb off Ivan''s face pushing Tanya off Ivan. You push her down on the floor on her back next to Ivan and lower yourself onto her.'
+												'While Tanya continues to ride his dick, you expose your pussy and sit down on Ivan''s face. Ivan begins to lick your pussy, and incredible bliss envelops you. After several minutes and several small orgasms, you climb off Ivan''s face, pushing Tanya off Ivan. You push her down on the floor on her back next to Ivan and lower yourself onto her.'
 												gs 'arousal', 'cuni', 5, 'group'
 												gs 'stat'
 												act '69 Tanya':
@@ -329,28 +317,28 @@ else
 													pcs_vag += 1
 													gs 'stat'
 													'<center><img <<$set_imgh>> src="images/locations/city/industrial/aptmanagers/sex/threesome5.jpg"></center>'
-													'You lower your face to Tanya''s pussy and begin licking her as her tongue licks furiously at your clit. Your extremely turned on when a hard cock parts the folds of your pussy and fills you up from behind, your overwhelmed from the feeling of being penetrated as your clit is worked out from below.  You give your all to Tanya licking her pussy fast and hard as Ivan pounds into you from behind.  In no time your begin to shudder with convulsions as a huge orgasm spikes through your body, you hear Tanya cry out with you as she hugs your body close her own orgasm roaring through her.  The two of you feel as one being and your both moaning loudly and with that Ivan roars and buries himself deep inside you shooting his hot semen into your quivering pussy. For one moment the three of you spasm together then Ivan pulls out of you and slides his dick into Tanya''s mouth shooting the last bit of his sperm into her mouth, as he falls back away from you feel Tanya licking the sperm from your pussy.'
+													'You lower your face to Tanya''s pussy and begin licking her as her tongue licks furiously at your clit. You''re extremely turned on when a hard cock parts the folds of your pussy and fills you up from behind, the feeling of being penetrated as your clit is worked out from below overwhelming you. You give your all to Tanya, licking her pussy fast and hard as Ivan pounds into you from behind.  In no time, you begin to shudder with convulsions as a huge orgasm spikes through your body. You hear Tanya cry out with you as she hugs your body close, her own orgasm roaring through her. The two of you feel as one being, and you''re both moaning loudly. With that, Ivan roars and buries himself deep inside you, shooting his hot semen into your quivering pussy. For one moment, the three of you spasm together, then Ivan pulls out of you and slides his dick into Tanya''s mouth, shooting the last bit of his sperm into her. As he falls away, you feel Tanya licking the sperm from your pussy.'
 													$orgasm_or = 'yes'
 													gs 'arousal', 'cuni_give', 5, 'group'
 													gs 'arousal', 'vaginal', 5, 'group'
 													minut -= 5
 													gs 'stat'
-													act 'On knees':
+													act 'Get on your knees':
 														cls
 														minut += 5
 														facial += 1
 														cumface += 1
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/shared/sex/group/cum/threesome6.jpg"></center>'
-														'You knelt together with Tanya as Ivan begins to jerk off in front of your faces. Suddenly Ivan clenches up and cum flies out of his cock and hot jet of sperm hits you both in the face. Ivan finally dried out, retreats to the couch trying to catch his breath. You take a few minutes to lick the cum off of each others faces. Tanya whispers to you, get the camera ready.'
-														act 'Cooking chamber':
+														'You kneel together with Tanya as Ivan begins to jerk off in front of your faces. Suddenly, Ivan clenches up and cum flies out of his cock, hot jets of sperm hitting you both in the face. Ivan, finally dried out, retreats to the couch trying to catch his breath. You take a few minutes to lick the cum off of each other''s faces. Tanya whispers to you, get the camera ready.'
+														act 'Interrogate Ivan':
 															cls
 															softKAR = 10
 															BurgerQW['IvanQWEvidence'] = 1
 															cumface = 0
 															gs 'stat'
 															'<center><img <<$set_imgh>> src="images/system/intro/shared/karinpre.jpg"></center>'
-															'You secretly prepared a camera filming through a hole in her purse at Ivan. Tanya meanwhile handed him a glass of water after putting something into it,  thirsty Ivan drank the water as Tanya asked him. Tell me how you stole from his boss. Ivan grinned "Elementary, I lost big time at the casino and I urgently needed the money. I knew this old asshole kept his bribe money in the safe. And he really liked the dumb slut dishwasher. And I came up with a brilliant plan. I convinced her to distract the manger. He would have done anything she asked he was so hot for her. I convinced her to get the keys for me and stood where the cameras could not see me and took what i wanted. Then I had the cleaning woman take the money out and return it to me outside of work for a small cut. "And where is the money now?" Ivan said sadly "It''s all gone I paid off my casino debt and some other bills." Tanya grinned, "it''s done Ivan, go to sleep." Ivan was immediately snoring on the couch. Tanya turned to you. "That was close we almost screwed up because of his cold. Good lesson for you. Everything can not go according to plan. Thought I would have to paralyze him, but I have tried that once. Paralyzed object can choke if you''re not careful. Okay, let''s get out of here we got what we need." You quickly wash up in the bathroom with Tanya, washing the left over sperm from each others faces and chests. She smiles at you while looking into yours and gets the last of the sperm off your chin and together you return to the street.'
+															'You secretly prepare a camera filming through a hole in your purse. Tanya meanwhile hands him a glass of water after putting something into it. Thirsty, Ivan drinks the water as Tanya asks him, "Tell me how you stole from your boss." Ivan grins, "Elementary, I lost big time at the casino, and I urgently needed the money. I knew this old asshole kept his bribe money in the safe and he really liked the dumb slut dishwasher, so I came up with a brilliant plan. I convinced her to distract the manager. He would have done anything she asked he was so hot for her. I convinced her to get the keys for me and stood where the cameras could not see me and took what I wanted. Then I had the cleaning woman take the money out and return it to me outside of work for a small cut." "And where is the money now?" Ivan says sadly, "It''s all gone. I paid off my casino debt and some other bills." Tanya grins, "It''s done Ivan, go to sleep." Ivan is immediately snoring on the couch. Tanya turns to you. "That was close. We almost screwed up because of his cold. Good lesson for you. Everything can not go according to plan. Thought I would have to paralyze him, but I have tried that once. Paralyzed object can choke if you''re not careful. Okay, let''s get out of here. We got what we need." You quickly wash up in the bathroom with Tanya, washing the leftover sperm from each other''s faces and chests. She smiles at you while looking you over and gets the last of the sperm off your chin. Together, you return to the street.'
 															gs 'arousal', 'end'
 															gs 'stat'
 															act 'Leave':gt'city_industrial'

+ 1 - 1
locations/journal_quests.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'start':
 	'<center><h1>Quests</h1></center>'
 
 !!to check Sveta is at school. All school quests must pass this and it should become a category as we expand
-	if SchoolAtestat = 0 and SchoolBlock = 0:
+	if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0:
 		!! 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.'

+ 8 - 8
locations/katjaEv.qsrc

@@ -1145,7 +1145,7 @@ if $ARGS[0] = 'kathan1':
 
 			if dummy >pcs_icesktng and dummy <51:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KS1.jpg"></center>'
-				'Skating is fun! Skating is easy for Russians! Now, after trying to dance with the redhead and failing painfully, horribly and awkwardly, you sit on your aching and cold butt with what appears to be half of pavlovsk looking at you.'
+				'Skating is fun! Skating is easy for Russians! Now, after trying to dance with the redhead and failing painfully, horribly and awkwardly, you sit on your aching and cold butt with what appears to be half of Pavlovsk looking at you.'
 				'"<<$pcs_nickname>>! Snort... You are... I mean... Te-he!"'
 				'Fuck skating! Fuck fun! Is easy for Russians?! Your ass!'
 				'"Fuck you, bitch! Are you going to help me or will you continue standing there laughing at me?!"'
@@ -2807,7 +2807,7 @@ if $ARGS[0] = 'kathan20':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT8.jpg"></center>'
-	'Being young and pretty, attracting attention, is inevitable, and in fact, that is one of the reasons you accompany Katja. To show off to the world, the incredibly fabulous couple you are. As you do your best to seem like two "common" girls, knowing at your core that is a lie, your extensively choreographed walk takes you around pavlovsk, so the boys and girls can have something to talk about. And some really talk.'
+	'Being young and pretty, attracting attention, is inevitable, and in fact, that is one of the reasons you accompany Katja. To show off to the world, the incredibly fabulous couple you are. As you do your best to seem like two "common" girls, knowing at your core that is a lie, your extensively choreographed walk takes you around Pavlovsk, so the boys and girls can have something to talk about. And some really talk.'
 
 	if random_event = 1:
 		'"If you were a vegetable, you''d be a cute-cumber."'
@@ -2868,7 +2868,7 @@ if $ARGS[0] = 'kathan21':
 	grupvalue[1] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/reactions/disgust.jpg"></center>'
-	'Being young and pretty, attracting attention, is inevitable, and in fact, that is one of the reasons you accompany Katja. To show off to the world, the incredibly fabulous couple that you are. As you do your best to seem like two "common" girls, knowing at your core that is a lie, your extensively choreographed walk takes you around pavlovsk so the boys and girls can have something to talk about. And some really talk.'
+	'Being young and pretty, attracting attention, is inevitable, and in fact, that is one of the reasons you accompany Katja. To show off to the world, the incredibly fabulous couple that you are. As you do your best to seem like two "common" girls, knowing at your core that is a lie, your extensively choreographed walk takes you around Pavlovsk so the boys and girls can have something to talk about. And some really talk.'
 
 	if random_event = 1:
 		'"So if we shag tonight, can my mate join in? I''ve got to text him soon so I need to know."'
@@ -2955,7 +2955,7 @@ if $ARGS[0] = 'kathan22':
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT8.jpg"></center>'
-		'There isn''t much to say. You and Katja just hang around pavlovsk talking, looking for cuties, showing off, and in general doing friend stuff. It is probably best if you find something interesting to do anyway.'
+		'There isn''t much to say. You and Katja just hang around Pavlovsk talking, looking for cuties, showing off, and in general doing friend stuff. It is probably best if you find something interesting to do anyway.'
 
 		if hour >= 20:
 			act 'It''s too late, acompany Katja to her home':minut += 5 & gt 'pav_residential'
@@ -2972,7 +2972,7 @@ if $ARGS[0] = 'kathan23':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT17.jpg"></center>'
-	'Your walks take you around pavlovsk until you hear someone calling you.'
+	'Your walks take you around Pavlovsk until you hear someone calling you.'
 	'"Hey! Katja! Over here!"'
 	'Turning towards the voice, you see Svyatoslav waving some distance away. Katja groans, grabs your arm and look nervously around for some escape route.'
 	'"Oh fuck! <<$pcs_nickname>>! Please, you must do something! Just do something!"'
@@ -2996,7 +2996,7 @@ if $ARGS[0] = 'kathan23':
 				'"Hm. You''re welcome <<$pcs_nickname>>! Slavik I''m sorry, but I have things to do!"'
 				'The jock tries to pry his arm away from your embrace, but before he can exert any strength, you pull him in the opposite direction of Katja, showering him with a bombardment of words worthy of Lizaveta''s admiration.'
 				'"Oh come on Slavik! You can talk with Katja later! We need to discuss the team schedule! I''m not fond of the one Christina is "suggesting"! If you ask me she is sex deprived! You must do something for the girls! Oh! I saw your last match! It''s was cool! Hey we can..."'
-				'Slavik is taken back by your performance, and not knowing how to get rid of the hold in his arm, reluctantly follows you/is dragged around pavlovsk for a maddening half hour until you are sure that Katja has got away. After that and giving you an evil-eyed goodbye, he leaves you alone.'
+				'Slavik is taken back by your performance, and not knowing how to get rid of the hold in his arm, reluctantly follows you/is dragged around Pavlovsk for a maddening half hour until you are sure that Katja has got away. After that and giving you an evil-eyed goodbye, he leaves you alone.'
 			elseif grupTipe = 5:
 				'Smiling nervously, you unhook your arm from the redhead, and feeling insecure, stride towards the approaching Svyatoslav.'
 				'"Hey Slavik! I..."'
@@ -3005,7 +3005,7 @@ if $ARGS[0] = 'kathan23':
 				'You then whine and put on scared eyes for all the people on the street''s enjoyment, and in that instant, the atmosphere changes as around you, the pedestrians instantly form a dislike to the BIG BAD BULLY threatening the SCARED CUTE GIRL'
 				'"Fuck you <<$pcs_nickname>>! Why don''t you go and fuck your therapist? Just leave Katja and I alone for a minute!"'
 				'"Nope!" you angrily answer and grab his arm "And if you don''t follow me, I will begin to scream about how your bullying has made me need one!"'
-				'Taking advantage of your distraction, Katja quickly sneaks away, leaving you with a pissed off Svyatoslav who, not knowing how to get rid of the hold on his arm without embarrassing himself, angrily follows you/is dragged around pavlovsk for a maddening half hour, until you are sure that Katja has got away. After that and giving you an evil-eyed goodbye, he leaves you alone.'
+				'Taking advantage of your distraction, Katja quickly sneaks away, leaving you with a pissed off Svyatoslav who, not knowing how to get rid of the hold on his arm without embarrassing himself, angrily follows you/is dragged around Pavlovsk for a maddening half hour, until you are sure that Katja has got away. After that and giving you an evil-eyed goodbye, he leaves you alone.'
 			else
 				'You swoop, scoop & split your boobs, letting then show slightly through your cleavage. You are a hot girl and he a hormonal teen. Time to use your "boob magic" to distract the poor chap. He won''t know what hit him!'
 				'"Look Katja! Slavik! What a coincidence to meet him here!"'
@@ -3013,7 +3013,7 @@ if $ARGS[0] = 'kathan23':
 				'"Hm. <<$pcs_nickname>> I have things to do! Slavik, please take care of her!"'
 				'With that, he tries to follow the redhead, but in the seconds that it takes him to react, you are tangled around his well-toned body and giving him a good view of your puppies.'
 				'"Oh come on Slavik! You are always after Christina or Katja! That is unfair! I''m jealous! Let''s do something fun!"'
-				'"Eh? What? Hu?" are the words that escape his mouth as you take the surprised teen away from Katja, and not knowing how to get rid of the hold on his arm, reluctantly follows you/is dragged around pavlovsk for a maddening half hour until you are sure that Katja has got away. After that and giving you a somewhat confused goodbye, he leaves you alone.'
+				'"Eh? What? Hu?" are the words that escape his mouth as you take the surprised teen away from Katja, and not knowing how to get rid of the hold on his arm, reluctantly follows you/is dragged around Pavlovsk for a maddening half hour until you are sure that Katja has got away. After that and giving you a somewhat confused goodbye, he leaves you alone.'
 			end
 			act 'Continue':minut += 5 & gt 'pav_residential'
 		end

+ 6 - 6
locations/liam.qsrc

@@ -37,9 +37,9 @@ else
 	end
 end
 
-'The old part of the city, usually called Old Town. A few of centuries ago, this was the village of Pushkin.'
-'Later, the rich bought the land off the poor and knocked down the wooden shacks and farm houses to build large estates. The city began to grow rapidly and it became a desirable suburb.'
-'Since then, even the old houses have been improved, extended, and modernized. The old buildings and beautiful park made it popular with tourists, and it has became part of Pavlovsk.'
+'The old part of the city, usually called Old Town. A few centuries ago, this was the village of Pushkin.'
+'Later, the rich bought the land off the poor and knocked down the wooden shacks and farm houses to build large estates. The city began to grow rapidly, and it became a desirable suburb.'
+'Since then, even the old houses have been improved, extended, and modernized. The old buildings and beautiful park made it popular with tourists, and it has become part of Pavlovsk.'
 
 'Not far from here is the quiet <a href="exec:gt ''liames'',''start''">High Street</a>.'
 'Close by is a narrow street leading to a <a href="exec:gt ''dvor'',''start''">vacant house</a>.'
@@ -56,13 +56,13 @@ if hour >= 13 and hour <= 15 and bodimodel = 1 and arts = 0 and tusa = 1:
 		gs'dibodi'
 
 		'<center><img <<$set_imgh>> src="images/characters/oldtown/marinka/marinka.jpg"></center>'
-		'While standing at the door, you notice a girl from the local hangout, Marinka.'
+		'You notice a girl from the local hangout, Marinka, standing in a doorway nearby.'
 
-		act 'Ask':gt 'dibodi', 'sptusa'
+		act 'Ask Marinka about the art studio':gt 'dibodi', 'sptusa'
 	end
 end
 
-if arts = 1:'<a href="exec:gt ''Marin'',''start''">Marina''s Apartment</a>'
+if arts = 1:'<a href="exec:gt ''Marin'',''start''">Marinka''s Apartment</a>'
 
 act 'Walk to the train station (0:15)':minut += 15 & nroad = 15 & gt 'pav_train'
 act 'Walk to Pavlovsk park (0:10)':minut += 10 & nroad = 10 & gt 'pav_park', 'start'

+ 0 - 93
locations/loadg.qsrc

@@ -1,99 +1,6 @@
 # loadg
 
 gs 'saveupdater'
-gs 'din_npc'
-
-!!-------------------Above this line to be kept-------------------
-
-clrbelo += suhbelo
-clrbelo += suhbelo2
-killvar'suhbelo'
-killvar'suhbelo2'
-
-
-!!-------------------------- above this line can be removed for 0.7.1 ---------------------------------
-
-if dounspell = 1: dounsplkil = 2 & gs 'body_shape', 'hardreset'
-
-!!adding default shoes and assigning them
-
-sgandm[6] = 1
-strainers[21] = 1
-
-if $cheapshoetype ! '':
-	killvar '$cheapshoetype'
-	killvar '$averageshoetype'
-	killvar '$expensiveshoetype'
-	killvar '$formalshoetype'
-	killvar '$officeshoetype'
-	killvar '$schoolshoetype'
-	killvar '$exerciseshoetype'
-	killvar '$fetishshoetype'
-	killvar '$exhibitshoetype'
-	killvar '$uniformshoetype'
-	killvar '$burlesqueshoetype'
-	killvar '$alternativeshoetype'
-end
-
-if pavlin > 0:
-	npc_rel['A217'] = npc_rel['A217'] + pavlin
-	pavlin = 0
-end
-
-if bag = 1 and $currentpursetype = '':
-	gm_purses[1] = 1
-	$currentpursetype = 'gm'
-	currentpursenumber = 1
-end
-
-if cheap_purse[1] = 1:gm_purses[1] = 1
-
-if npc_dick['A55'] = 23: npc_dick['A55'] = 30
-
-!!Fixes for changes to clothing system and removal of dirty underwear
-if $pantyworntype = '':
-	if tanga = 1: $pantyworntype = 'cheap'
-	if tanga = 0: $pantyworntype = 'none'
-end
-
-if $braworntype = '': $braworntype = 'cheap'
-
-if clrbelo > 0:
-	cheap_panties[37] = 1
-	cheap_bras[11] = 1
-	clrbelo = 0
-	if $pantyworntype = 'cheap':
-		pantywornnumber = 37
-	end
-	if $braworntype = 'cheap':
-		brawornnumber = 11
-	end
-	killvar 'clrbelo'
-	killvar 'clrbra'
-	killvar 'washingbelo'
-	killvar 'washingbra'
-	killvar 'dirtbelo'
-	killvar 'dirtbra'
-end
-
-if arrsize('$phonetheme_name') = 0: gs 'telefon', 'setup'
-
-if housr = 1:
-	home_owned[1] = 1
-elseif housr = 2:
-	home_owned[4] = 1
-end
-if BuyHous = 1: home_owned[1] = 2
-if placeMansion > 0: home_owned[5] = placeMansion
-if dachaest > 0: home_owned[3] = dachaest
-killvar 'placemansion'
-killvar 'dachaest'
-killvar 'housr'
-killvar 'BuyHous'
-
-if alko < 0: alko = 0
-if pranik < 0: pranik = 0
-if poroshok < 0: poroshok = 0
 
 gs 'nichUtil','onLoad'
 

+ 18 - 32
locations/metro.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 		'<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': 
-		'<center><b><font color="maroon">Vasilievsky Island</font></b></center>'
+		'<center><b><font color="maroon">Vasilyevsky Island</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/platisland.jpg"></center>'
 	end
 
@@ -82,7 +82,7 @@ if $ARGS[0] = 'start':
 		end
 
 		if $loc ! 'city_island':
-			act 'Go to the <b>Vasilievsky Island</b> (16 <b>₽</b>)':
+			act 'Go to the <b>Vasilyevsky Island</b> (16 <b>₽</b>)':
 				$loc = 'city_island'
 				$loc_arg = ''
 				money -= 16
@@ -91,12 +91,12 @@ if $ARGS[0] = 'start':
 			end
 		end
 	else
-	'You don''t have enough money to pay for the metro.'
+		'You don''t have enough money to pay for the metro.'
 	end
 	
 	if pusher = 1 and dealer = 0:
 		dealer = 1
-		'You see a tall, emaciated man leaning against the wall next to tracks, looking very shady.<br>He notices you looking and beckons you to come closer.'
+		'You see a tall, emaciated man leaning against the wall next to the tracks, looking very shady.<br>He notices you looking and beckons you to come closer.'
 		act 'Talk to the man':gt 'metro', 'dealer'
 	elseif dealer ! 0:
 		'You see the dealer lurking around the station.'
@@ -115,46 +115,34 @@ if $ARGS[0] = 'vagon':
 	'<center><b><font color="maroon">Metro car</font></b></center>'
 	if hour < 7 or hour >=22:
 		if rand(0, 100) >= 70:gt 'metro_events', 'frot'
-		if rand(0,1) = 0:
-			metro_busy = 0
-		else
-			metro_busy = 1
-		end
+		metro_busy = rand(0,1)
 	elseif (hour >= 9 and hour < 16) or (hour >= 18 and hour < 22):
 		if rand(0, 100) >= 80:gt 'metro_events', 'frot'
-		if rand(0,1) = 0:
-			metro_busy = 1
-		else
-			metro_busy = 2
-		end
+		metro_busy = rand(1,2)
 	else
 		if rand(0, 100) >= 90:gt 'metro_events', 'frot'
-		if rand(0,1) = 0:
-			metro_busy = 2
-		else
-			metro_busy = 3
-		end
+		metro_busy = rand(2,3)
 	end
 
 	if metro_busy = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metroempty.jpg"></center>'
-		'The car is almost completely empty, one or two other passengers are in the car with you. It seems a bit odd and a little creepy seeing the car this empty. You have practically the whole car to yourself and pick the cleanest spot to sit.'
+		'The car is almost completely empty. One or two other passengers are in the car with you. It seems a bit odd and a little creepy seeing the car this empty. You have practically the whole car to yourself and pick the cleanest spot to sit.'
 	elseif metro_busy = 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metro.jpg"></center>'
-		'The car is mostly empty, leaving you a choice of seats. You easily find a place for yourself, leaving you plenty of room to get comfortable. The few other people on the car, mind their own business, leaving you to your own thoughts.'
+		'The car is mostly empty, leaving you a choice of seats. You easily find a place for yourself, leaving you plenty of room to get comfortable. The few other people on the car mind their own business, leaving you to your own thoughts.'
 	elseif metro_busy = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metrofull<<rand(1,5)>>.jpg"></center>'
-		'The car is full of people, all of the seats are taken, but only a few people are forced to stand. You easily find a place for yourself, at least it is not packed, leaving you plenty of room to get comfortable.'
+		'The car is full of people. All of the seats are taken, but only a few people are forced to stand. At least it is not packed. You easily find a place for yourself, leaving you plenty of room to get comfortable.'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metropacked.jpg"></center>'
-		'The car is packed with people, most of them are forced to stand, as there is not enough seats. It is so tightly packed that people are crammed tight up against each other either in the seats or standing up. You manage to squeeze yourself in among the people, you can feel other bodies pressed up tightly against yours, it is very uncomfortable and hot.'
+		'The car is packed with people. Most of them are forced to stand, as there are not enough seats. It is so tightly packed that people are crammed tight up against each other either in the seats or standing up. You manage to squeeze yourself in among the people. You can feel other bodies pressed up tightly against yours. It is very uncomfortable and hot.'
 	end
 
 	if sosedQW >= 1:
 		if hour = 7 or hour = 15:
 			sosedMetroRand = rand(0, 100)
 
-			if sosedMetroRand >= 60 and sosedMetroDay ! daystart:'You notice your neighbor <a href="exec:gt ''TimofeiMetro''">Timothy</a>, in the metro car.'
+			if sosedMetroRand >= 60 and sosedMetroDay ! daystart:'You notice your neighbor <a href="exec:gt ''TimofeiMetro''">Timofei</a> in the metro car.'
 		end
 	end
 
@@ -182,7 +170,7 @@ if $ARGS[0] = 'shop':
 	menu_off = 1
 	gs 'stat'
 	'<b>What''s it gonna be?</b>'
-	'He shows you a small box filled with red and blue pills. There is about two dozen of each pill inside.'
+	'He shows you a small box filled with red and blue pills. There are about two dozen of each pill inside.'
 	act 'Leave':gt 'metro','start'
 	if money >= 1000:
 		'<a href="exec:money -= 1000 & mentats_have += 20 & gt ''metro'', ''shop''">Buy neuroboosters</a> 1000 <b>₽</b>'
@@ -197,7 +185,7 @@ if $ARGS[0] = 'shop':
 		'Buy steroids 500 <b>₽</b> (You do not have enough money)'
 	end
 	'Uses left: <<steroid_have>>'
-	'Paste tube with two pictures of a woman. In latter one she sports an enormous bust.'
+	'Paste tube with two pictures of a woman. In the latter one, she sports an enormous bust.'
 	if money >= 500:
 		'<a href="exec:money -= 500 & bcream_have += 5 & gt ''metro'', ''shop''">Buy breast cream</a> 500 <b>₽</b>'
 	else
@@ -205,7 +193,7 @@ if $ARGS[0] = 'shop':
 	end
 	'Uses left: <<bcream_have>>'
 	if MagikDostup = 0:
-		'Packet of pink chewing gums. There are 10 in one package.'
+		'Packet of pink chewing gum. There are 10 in one package.'
 		if money >= 200:
 			'<a href="exec:money -= 200 & aphrodisiac_have += 10 & gt ''metro'', ''shop''">Buy aphrodisiacs</a> 200 <b>₽</b>'
 		else
@@ -215,18 +203,16 @@ if $ARGS[0] = 'shop':
 	end
 	if money >= 250:
 		'Buy enough <a href="exec:money -= 250 & joint += 5 & gt ''metro'', ''shop''">weed</a> for 5 joints for 250 <b>₽</b>'
-	elseif money >= 500:
-		'Buy enough <a href="exec:money -= 250 & joint += 5 & gt ''metro'', ''shop''">weed</a> for 5 joints for 250 <b>₽</b>'
-		'Buy enough <a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">weed</a> for 5 joints for 500 <b>₽</b>'
+		if money >= 500:'Buy enough <a href="exec:money -= 500 & joint += 10 & gt ''metro'', ''shop''">weed</a> for 10 joints for 500 <b>₽</b>'
 	else
-		'Buy a enough weed for 5 joints for 250 <b>₽</b> (You do not have enough money)'
+		'Buy enough weed for 5 joints for 250 <b>₽</b> (You do not have enough money)'
 	end
 end
 
 if $ARGS[0] = 'dealer':
 	*clr & cla
 	menu_off = 1
-	'He sizes you up with suspicion.<br><b>"Hey miss, saw you buying Lady in the park."</b> <br>He clears his throat and spits onto the tracks.<b> "That shit will mess you up."</b><br>He opens his coat and you flinch thinking he is going to flash you, but instead you see he is wearing a business suit beneath.<br>He gestures at numerous pockets lining insides of his coat. They are filled to bursting with various packages, pills and ampules.<br><b>"Here, my products are of a much better quality. You''ll have a great times and I guarantee they won''t kill you."</b>'
+	'He sizes you up with suspicion.<br><b>"Hey miss, saw you buying Lady in the park."</b> <br>He clears his throat and spits onto the tracks.<b> "That shit will mess you up."</b><br>He opens his coat, and you flinch thinking he is going to flash you, but instead you see he is wearing a business suit beneath.<br>He gestures at numerous pockets lining the insides of his coat. They are filled to bursting with various packages, pills and ampules.<br><b>"Here, my products are of a much better quality. You''ll have a great time, and I guarantee they won''t kill you."</b>'
 	act 'Continue':gt 'metro','shop'
 end
 

+ 1 - 0
locations/moncheri.qsrc

@@ -60,6 +60,7 @@ if $ARGS[0] = 'start':
 		if coat[11] < 1:
 			if coat[11] = 0:dynamic 'act ''Look at designer coat 11'':gt ''clothing'', ''view_clothing_item'', ''shop'', ''coat'', 11, 50000'
 		end
+		if coat[9] = 1 and coat[11] = 1: *nl & 'You already own both available coats from this boutique.'
 	end
 
 end

+ 2 - 2
locations/npcstatic2.qsrc

@@ -349,8 +349,8 @@ npc_dick['A<<npctemp>>'] = 17
 
 npctemp = 77
 $npc_dna['A<<npctemp>>'] = '1971687970 1162271469 1942122372 1675574199 1926720739 1720477118 2120304425'
-$npc_firstname['A<<npctemp>>'] = 'Timothy'
-$npc_usedname['A<<npctemp>>'] = 'Timothy'
+$npc_firstname['A<<npctemp>>'] = 'Timofei'
+$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'

+ 2 - 2
locations/npcstatic5.qsrc

@@ -331,9 +331,9 @@ npctemp = 220
 $npc_dna['A<<npctemp>>'] = '6675506212 5051737442 5740356104 9947679629 3042231652 6247569074 1233026260'
 $npc_firstname['A<<npctemp>>'] = 'Vika'
 $npc_nickname['A<<npctemp>>'] = 'Vika'
-$npc_lastname['A<<npctemp>>'] = 'Kirilov'
+$npc_lastname['A<<npctemp>>'] = 'Kirilova'
 $npc_usedname['A<<npctemp>>'] = 'Vika'
-$npc_notes['A<<npctemp>>'] = 'Vika goes to the local university. She came from a town in a truly remote part of Russia. Her familiy is poor. She pays for her studies by working in a brothel in the city center.'
+$npc_notes['A<<npctemp>>'] = 'Vika goes to the local university. She comes from a town in a truly remote part of Russia. Her family is poor. She pays for her studies by working in a brothel in the city center.'
 npc_dob['A<<npctemp>>'] = pcs_dob - 10000
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'

+ 15 - 15
locations/obroom.qsrc

@@ -17,30 +17,30 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	gs 'stat'
 	'<center><b>Your room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obroom.jpg"></center>'
-	'This is your room which you share with another girl named Vika Zhurova.'
-	'At the right of the entrance you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
+	'This is your room which you share with another girl named Vika Kirilova.'
+	'At the right of the entrance, you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
 	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
 	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
-	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> laying on your bed.'
+	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> lying on your bed.'
 	*nl
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
 	gs 'exercise', 'start'
 	''
-	if hour > 14 and hour < 20 and npc_rel['A220']>=60 and birthday = day and birthmonth = month and vikaslut = 1 and bordel = 1 and slutty > 0 and b_vika_present_Day!day:
+	if hour > 14 and hour < func('bordel', 'open_hour'):
 		vika_sleep = 0
-		'<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you, trying to hide a box behind her back.'
-	elseif hour > 14 and hour < 20:
-		vika_sleep = 0
-		'<a href="exec:gt''Vika''">Vika</a> is laying on her bed.'
-	end
-	if hour > 3 and hour < 8 and vikaslut = 0:
-		vika_sleep = 1
-		'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after being out the whole night.'
-	end
-	if hour > 3 and hour < 8 and vikaslut = 1:
+		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
+			'<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you, trying to hide a box behind her back.'
+		else
+			'<a href="exec:gt''Vika''">Vika</a> is lying on her bed.'
+		end
+	elseif hour > func('bordel', 'close_hour') and hour < 8:
 		vika_sleep = 1
-		'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
+		if vikaslut = 0:
+			'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after being out the whole night.'
+		elseif vikaslut = 1:
+			'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
+		end
 	end
 
 	act 'Walk out in the corridor':

+ 1 - 1
locations/parkBimbo.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'pos2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/sex/parkbimbo2.jpg"></center>'
 	'You grab hold of the old man''s hand, pull him up and over to a tree. You drop to your knees and start sucking his cock at once. He was taken aback at first and started to protest but as your warm wet mouth began sucking his cock, he stopped protesting.'
 	'You begin sucking him with earnest and fondling his balls with your hand.'
-	'You don''t have long to wait when you feel the hot spurts of his seamen shooting into your mouth.'
+	'You don''t have long to wait when you feel the hot spurts of his semen shooting into your mouth.'
 	
 	gs 'arousal', 'bj', 10, 'sub'
 	gs 'stat'

+ 2 - 2
locations/pav_aptcourtev.qsrc

@@ -1623,7 +1623,7 @@ if $ARGS[0] = 'two_boys':
 						act 'Back on your knees':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/ncum.jpg"></center>'
-							'Several minutes go by until they both starting grunting, obviously getting close to cumming. They pull out of you as one of them tells you. "Get on your knees whore and open your mouth." You do as you are told, they both step up close with the dicks right in your facing jerking them a few times. Both of them starting cumming at almost the same time, some of it going in your mouth and on your tongue, most of the rest splattering your face with strains of thick seamen. Once they finish cumming on you, the first one grabs you by the arm and pulls you to your feet. Drags you over to the door, while his friend opens it and then they shove you out into the hall naked, with your face covered in their cum. "Get lost whore!" With that, they close the door in your face.'
+							'Several minutes go by until they both starting grunting, obviously getting close to cumming. They pull out of you as one of them tells you. "Get on your knees whore and open your mouth." You do as you are told, they both step up close with the dicks right in your facing jerking them a few times. Both of them starting cumming at almost the same time, some of it going in your mouth and on your tongue, most of the rest splattering your face with strains of thick semen. Once they finish cumming on you, the first one grabs you by the arm and pulls you to your feet. Drags you over to the door, while his friend opens it and then they shove you out into the hall naked, with your face covered in their cum. "Get lost whore!" With that, they close the door in your face.'
 							gs 'arousal', 'foreplay', 2, 'sub', 'group', 'humiliation'
 							if pavapt_boyrand = 1:
 								gs 'cum_call', 'face', 'A122', 1
@@ -1689,7 +1689,7 @@ if $ARGS[0] = 'two_boys':
 									act 'Back on your knees':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/ncum.jpg"></center>'
-										'Several minutes go by until they both starting grunting, obviously getting close to cumming. They pull out of you as one of them tells you. "Get on your knees whore and open your mouth." You do as you are told, they both step up close with the dicks right in your facing jerking them a few times. Both of them starting cumming at almost the same time, some of it going in your mouth and on your tongue, most of the rest splattering your face with strains of thick seamen. Once they finish cumming on you, the first one grabs you by the arm and pulls you to your feet. Drags you over to the door, while his friend opens it and then they shove you out into the hall naked, with your face covered in their cum. "Get lost whore!" With that, they close the door in your face.'
+										'Several minutes go by until they both starting grunting, obviously getting close to cumming. They pull out of you as one of them tells you. "Get on your knees whore and open your mouth." You do as you are told, they both step up close with the dicks right in your facing jerking them a few times. Both of them starting cumming at almost the same time, some of it going in your mouth and on your tongue, most of the rest splattering your face with strains of thick semen. Once they finish cumming on you, the first one grabs you by the arm and pulls you to your feet. Drags you over to the door, while his friend opens it and then they shove you out into the hall naked, with your face covered in their cum. "Get lost whore!" With that, they close the door in your face.'
 										gs 'arousal', 'foreplay', 2, 'sub', 'group', 'humiliation'
 										if pavapt_boyrand = 1:
 											gs 'cum_call', 'face', 'A122', 1

+ 4 - 2
locations/pav_park.qsrc

@@ -209,7 +209,7 @@ if $ARGS[0] = 'start':
 		end		
 	end
 
-	if month >= 6 and month <=8 and TourGuide = 0 and work = 0:
+	if month >= 6 and month <=8 and TourGuide = 0 and (work = 0 or cheatWork = 1):
 		if hour >= 8 and hour <= 18:
 			act 'Apply for the Tour Guide job (0:30)':gt 'tour_guide', 'tourstart'
 		end
@@ -217,9 +217,11 @@ if $ARGS[0] = 'start':
 		if hour >= 8 and hour <= 12:
 			act 'Work as Tour Guide (6:00)':gt 'tour_guide', 'tourstart'
 		end
-	elseif month >= 9 and month <= 5 and TourGuide = 1 and work = 1:
+	elseif month >= 9 and month <= 5 and TourGuide = 1:
 		TourGuide = 0
 		work = 0
+	elseif month >= 9 and month <= 5 and TourGuide = 3:
+		TourGuide = 0
 	end
 
 	if mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart:

+ 4 - 3
locations/pav_residential.qsrc

@@ -186,10 +186,11 @@ if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 	end
 end
 
-if StoryLine ! 0 and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and sosedday ! daystart:
+!!Uncle Misha is npcstatic number 54
+if StoryLine ! 0 and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and npcdaycheck[54] ! daystart:
 	menu_off = 1
 	*clr & cla
-	sosedday = daystart
+	npcdaycheck[54] = daystart
 	gs 'stat'
 
 	if sosedknow = 0:
@@ -209,7 +210,7 @@ if pcs_magik >= 1 and mainQW = 0 and altQS = 1:
 	mainQW = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main.jpg"></center>'
-	'At the entrance to the apartment building you see Tatiana and Juugo. Tatiana adjusts her glasses and looks around, while Juugo seems to have his head in the clouds not really paying attention to his surroundings. His tattoos are not visible.'
+	'At the entrance to the apartment building you see Tatiana and Gustav. Tatiana adjusts her glasses and looks around, while Gustav seems to have his head in the clouds not really paying attention to his surroundings. His tattoos are not visible.'
 	'Tatiana closely looks around you: "I felt a burst of energy. Were you attacked by a magician?"'
 	act 'No?':gt 'mainQW'
 

+ 2 - 2
locations/podval_rape.qsrc

@@ -100,8 +100,8 @@ elseif podvalrape = 1:
 
 				act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pav_residential'
 			end  	
-		end if 
-	end if
+		end
+	end
 end
 
 --- podval_rape ---------------------------------

+ 15 - 27
locations/portnoi.qsrc

@@ -69,6 +69,18 @@ selltot = 0
 		i += 1
 	if i <= ARRSIZE('bomba_dress'):jump 'bomba_dressmet'
 
+	i = 1
+	:cats_outfitsmet
+		if cats_outfits[i] = 1 and cats_outfits_s[i] = 2:dynamic($batch_sell, 'cats_outfits', i)
+		i += 1
+	if i <= ARRSIZE('cats_outfits'):jump 'cats_outfitsmet'
+
+	i = 1
+	:cats_dressmet
+		if cats_dress[i] = 1 and cats_dress_s[i] = 2:dynamic($batch_sell, 'cats_dress', i)
+		i += 1
+	if i <= ARRSIZE('cats_dress'):jump 'cats_dressmet'
+
 	i = 1
 	:coco_outfitsmet
 		if coco_outfits[i] = 1 and coco_outfits_s[i] = 2:dynamic($batch_sell, 'coco_outfits', i)
@@ -143,19 +155,19 @@ selltot = 0
 
 	i = 1
 	:coatmet
-		if coat[i] = 1 and coatS[i] = 2:dynamic($batch_sell, 'coat', i)
+		if coat[i] = 1 and coat_s[i] = 2:dynamic($batch_sell, 'coat', i)
 		i += 1
 	if i <= ARRSIZE('coat'):jump 'coatmet'
 
 	i = 1
 	:swimwearmet
-		if swimwear[i] = 1 and swimwearS[i] = 2:dynamic($batch_sell, 'swimwear', i)
+		if swimwear[i] = 1 and swimwear_s[i] = 2:dynamic($batch_sell, 'swimwear', i)
 		i += 1
 	if i <= ARRSIZE('swimwear'):jump 'swimwearmet'
 
 	i = 1
 	:beachmet
-		if beach[i] = 1 and beachS[i] = 2:dynamic($batch_sell, 'beach', i)
+		if beach[i] = 1 and beach_s[i] = 2:dynamic($batch_sell, 'beach', i)
 		i += 1
 	if i <= ARRSIZE('beach'):jump 'beachmet'
 
@@ -165,30 +177,6 @@ selltot = 0
 		i += 1
 	if i <= ARRSIZE('fancy_burlesque'):jump 'fancy_burlesquemet'
 
-	i = 1
-	:dolls_outfitsmet
-		if dolls_outfits[i] = 1 and dolls_outfits_s[i] = 2:dynamic($batch_sell, 'dolls_outfits', i)
-		i += 1
-	if i <= ARRSIZE('dolls_outfits'):jump 'dolls_outfitsmet'
-
-	i = 1
-	:dolls_dressmet
-		if dolls_dress[i] = 1 and dolls_dress_s[i] = 2:dynamic($batch_sell, 'dolls_dress', i)
-		i += 1
-	if i <= ARRSIZE('dolls_dress'):jump 'dolls_dressmet'
-
-	i = 1
-	:bomba_outfitsmet
-		if bomba_outfits[i] = 1 and bomba_outfits_s[i] = 2:dynamic($batch_sell, 'bomba_outfits', i)
-		i += 1
-	if i <= ARRSIZE('bomba_outfits'):jump 'bomba_outfitsmet'
-
-	i = 1
-	:bomba_dressmet
-		if bomba_dress[i] = 1 and bomba_dress_s[i] = 2:dynamic($batch_sell, 'bomba_dress', i)
-		i += 1
-	if i <= ARRSIZE('bomba_dress'):jump 'bomba_dressmet'
-
 killvar 'batch_sell'
 
 'You sold <<poshvalldrop>> items of unwanted clothing for a total of <<selltot>> <b>₽</b>.'

+ 10 - 16
locations/portnoi2.qsrc

@@ -59,14 +59,14 @@ i = 1
 :yofficemet
 	if gm_office[i] = 1 and ((gm_office_b[i] > pcs_hips + 8) or (gm_office_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('office'):jump 'yofficemet'
+if i <= ARRSIZE('gm_office'):jump 'yofficemet'
 
 i = 1
 :yschoolmet
 	if gm_school[i] = 1 and ((gm_school_b[i] > pcs_hips + 8) or (gm_school_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 	if i = 6: i = 7
-if i <= ARRSIZE('school'):jump 'yschoolmet'
+if i <= ARRSIZE('gm_school'):jump 'yschoolmet'
 
 i = 1
 :yfetishmet
@@ -84,17 +84,17 @@ i = 1
 :yuniformmet
 	if gm_uniform[i] = 1 and ((gm_uniform_b[i] > pcs_hips + 8) or (gm_uniform_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
-if i <= ARRSIZE('uniform'):jump 'yuniformmet'
+if i <= ARRSIZE('gm_uniform'):jump 'yuniformmet'
 
 i = 1
 :yswimwearmet
-	if swimwear[i] = 1 and ((swimwearB[i] > pcs_hips + 8) or (swimwearB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if swimwear[i] = 1 and ((swimwear_b[i] > pcs_hips + 8) or (swimwear_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('swimwear'):jump 'yswimwearmet'
 
 i = 1
 :ybeachmet
-	if beach[i] = 1 and ((beachB[i] > pcs_hips + 8) or (beachB[i] < pcs_hips - 8)):poshvalldrop += 1
+	if beach[i] = 1 and ((beach_b[i] > pcs_hips + 8) or (beach_b[i] < pcs_hips - 8)):poshvalldrop += 1
 	i += 1
 if i <= ARRSIZE('beach'):jump 'ybeachmet'
 
@@ -155,12 +155,6 @@ elseif money >= poshvalldrop:
 		i += 1
 	if i <= ARRSIZE('cats_dress'):jump 'xcats_dressmet'
 
-	i = 1
-	:xcats_dressmet
-		if cats_dress[i] = 1 and ((cats_dress_b[i] > pcs_hips + 8) or (cats_dress_b[i] < pcs_hips - 8)):cats_dress_b[i] = pcs_hips
-		i += 1
-	if i <= ARRSIZE('cats_dress'):jump 'xcats_dressmet'
-
 	i = 1
 	:xcats_outfitsmet
 		if cats_outfits[i] = 1 and ((cats_outfits_b[i] > pcs_hips + 8) or (cats_outfits_b[i] < pcs_hips - 8)):cats_outfits_b[i] = pcs_hips
@@ -207,14 +201,14 @@ elseif money >= poshvalldrop:
 	:xofficemet
 		if gm_office[i] = 1 and ((gm_office_b[i] > pcs_hips + 8) or (gm_office_b[i] < pcs_hips - 8)):gm_office_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('office'):jump 'xofficemet'
+	if i <= ARRSIZE('gm_office'):jump 'xofficemet'
 
 	i = 1
 	:xschoolmet
 		if gm_school[i] = 1 and ((gm_school_b[i] > pcs_hips + 8) or (gm_school_b[i] < pcs_hips - 8)):gm_school_b[i] = pcs_hips
 		i += 1
 		if i = 6: i = 7
-	if i <= ARRSIZE('school'):jump 'xschoolmet'
+	if i <= ARRSIZE('gm_school'):jump 'xschoolmet'
 
 	i = 1
 	:xfetishmet
@@ -232,17 +226,17 @@ elseif money >= poshvalldrop:
 	:xuniformmet
 		if gm_uniform[i] = 1 and ((gm_uniform_b[i] > pcs_hips + 8) or (gm_uniform_b[i] < pcs_hips - 8)):gm_uniform_b[i] = pcs_hips
 		i += 1
-	if i <= ARRSIZE('uniform'):jump 'xuniformmet'
+	if i <= ARRSIZE('gm_uniform'):jump 'xuniformmet'
 
 	i = 1
 	:xswimwearmet
-		if swimwear[i] = 1 and ((swimwearB[i] > pcs_hips + 8) or (swimwearB[i] < pcs_hips - 8)):swimwearB[i] = pcs_hips
+		if swimwear[i] = 1 and ((swimwear_b[i] > pcs_hips + 8) or (swimwear_b[i] < pcs_hips - 8)):swimwear_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('swimwear'):jump 'xswimwearmet'
 
 	i = 1
 	:xbeachmet
-		if beach[i] = 1 and ((beachB[i] > pcs_hips + 8) or (beachB[i] < pcs_hips - 8)):beachB[i] = pcs_hips
+		if beach[i] = 1 and ((beach_b[i] > pcs_hips + 8) or (beach_b[i] < pcs_hips - 8)):beach_b[i] = pcs_hips
 		i += 1
 	if i <= ARRSIZE('beach'):jump 'xbeachmet'
 

+ 12 - 12
locations/preCUST.qsrc

@@ -394,8 +394,8 @@ if $ARGS[0] = 'Done':
 		gm_dress_h[11] = 100
 		gm_dress_b[11] = pcs_hips
 		swimwear[3] = 1
-		swimwearH[3] = 60
-		swimwearB[3] = pcs_hips
+		swimwear_h[3] = 60
+		swimwear_b[3] = pcs_hips
 		sportsclothingnumber = 29
 		gs 'clothing', 'wear', 'gm_dress', 370
 	elseif goth_clothing = 1:
@@ -560,23 +560,23 @@ if $ARGS[0] = 'Done':
 		gm_dress_h[149] = 100
 		gm_dress_b[149] = pcs_hips
 		swimwear[24] = 1
-		swimwearH[24] = 60
-		swimwearB[24] = pcs_hips
+		swimwear_h[24] = 60
+		swimwear_b[24] = pcs_hips
 		sportsclothingnumber = 58
 		gs 'clothing', 'wear', 'gm_dress', 149
 	end
 	if swim_start = 58:
 		swimwear[58] = 1
-		swimwearH[58] = 60
-		swimwearB[58] = pcs_hips
+		swimwear_h[58] = 60
+		swimwear_b[58] = pcs_hips
 	elseif swim_start = 98:
 		swimwear[98] = 1
-		swimwearH[98] = 60
-		swimwearB[98] = pcs_hips
+		swimwear_h[98] = 60
+		swimwear_b[98] = pcs_hips
 	elseif swim_start = 69:
 		swimwear[69] = 1
-		swimwearH[69] = 60
-		swimwearB[69] = pcs_hips
+		swimwear_h[69] = 60
+		swimwear_b[69] = pcs_hips
 	end
 	
 !!setting default exercise outfit and setting coats
@@ -590,7 +590,7 @@ if $ARGS[0] = 'Done':
 		$sportsbratype = 'kats'
 		$sportspantytype = 'kats'
 		coat[14] = 1
-		coatH[14] = 200
+		coat_h[14] = 200
 		defaultcoat = 14
 		sportscoat = 14
 	else
@@ -604,7 +604,7 @@ if $ARGS[0] = 'Done':
 		$sportsbratype = 'cheap'
 		$sportspantytype = 'cheap'
 		coat[5] = 1
-		coatH[5] = 200
+		coat_h[5] = 200
 		defaultcoat = 5
 		sportscoat = 5
 		if school_clothing = 2:

+ 5 - 5
locations/preSYS2.qsrc

@@ -263,7 +263,7 @@ if $ARGS[0] = 'modpur':
 		'<center><img src="images/locations/city/citycenter/mall/gm.png"></center>'
 		i = 1
 		:loopcheappurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''cheap'', <<i>>"><img src="images/pc/purses/cheap/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''cheap'', <<i>>"><img src="images/pc/items/gm/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 14:jump 'loopcheappurses'
 	end	
@@ -272,7 +272,7 @@ if $ARGS[0] = 'modpur':
 		'<center><img src="images/locations/city/island/dolls.png"></center>'
 		i = 1
 		:loopdollspurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''dolls'', <<i>>"><img src="images/pc/purses/dolls/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''dolls'', <<i>>"><img src="images/pc/items/dolls/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 22:jump 'loopdollspurses'
 	end
@@ -281,7 +281,7 @@ if $ARGS[0] = 'modpur':
 		'<center><img src="images/locations/city/citycenter/mall/fashionista.png"></center>'
 		i = 1
 		:loopfashionistapurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''fashionista'', <<i>>"><img src="images/pc/purses/fashionista/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''fashionista'', <<i>>"><img src="images/pc/items/fashionista/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 15:jump 'loopfashionistapurses'
 	end
@@ -290,7 +290,7 @@ if $ARGS[0] = 'modpur':
 		'<center><img src="images/locations/city/citycenter/mall/pussycat.png"></center>'
 		i = 1
 		:loopkatspurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''kats'', <<i>>"><img src="images/pc/purses/kats/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''kats'', <<i>>"><img src="images/pc/items/cats/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 14:jump 'loopkatspurses'
 	end
@@ -299,7 +299,7 @@ if $ARGS[0] = 'modpur':
 		'<center><img src="images/locations/city/citycenter/mall/moncheri.png"></center>'
 		i = 1
 		:loopboutiquepurses
-		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''boutique'', <<i>>"><img src="images/pc/purses/moncheri/<<i>>.jpg" 	height="300" /></a>'
+		*p '<a href="exec:gt ''preSYS2'', ''modpur'', ''boutique'', <<i>>"><img src="images/pc/items/moncheri/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 17:jump 'loopboutiquepurses'
 	end

+ 4 - 4
locations/psiklin.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0]='start':
 	else
 		'One of the most impressive buildings is your newly built mansion.'
 		act 'Visit your mansion': gt 'youplace'
-	end if
+	end
 	act 'View the insane asylum': minut += 2 & gt 'psiklin', 'ps1'
 	act 'View the creepy old building': minut += 2 & gt 'psiklin', 'ps2'
 
@@ -42,9 +42,9 @@ if $ARGS[0]='start':
 			end
 		else
 			act 'Look for Alexandria''s direction (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end if
-	end if
-end if
+		end
+	end
+end
 
 if $ARGS[0]='ps1':
 	cla

+ 4 - 1
locations/saveg.qsrc

@@ -1,4 +1,7 @@
 # saveg
-
+version_major = 0
+version_minor = 8
+version_revision = 2
+version_patch = 2
 --- saveg ---------------------------------
 

+ 824 - 893
locations/saveupdater.qsrc

@@ -1,943 +1,874 @@
 # saveupdater
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080202:
 
-!!{if $pcs_dna = '':
-	$npc_dna['A1'] = '1594378993 1607632682 1428796224 1448474566 1775134737 1909315069 1882255348'
-	$npc_dna['A2'] = '1993665716 1616738815 1589755494 1229942753 1120816404 1371564141 1910586302'
-	$npc_dna['A3'] = '1580777525 1747887345 8321006077 1970922187 1029352130 7921283143 7765736018'
-	$npc_dna['A4'] = '1438762189 1855175944 1123617000 1817906848 1390916310 1459640815 1436321833'
-	$npc_dna['A5'] = '1379973003 1196687437 1136761140 2107449234 1973361988 1939869341 1786180096'
-	$npc_dna['A6'] = '1490744069 1013739636 1009283243 1951857582 1559659111 1792925326 1086487692'
-	$npc_dna['A7'] = '1689930319 1973226357 2129134392 2090450913 1513523102 2063456541 1533040976'
-	$npc_dna['A8'] = '1004746288 1743479356 1890053138 1336365224 1893621358 1730538237 1325162654'
-	$npc_dna['A9'] = '1851794364 1224420951 1300723572 1628306107 1809003038 1301990921 1253822208'
-	$npc_dna['A10'] = '2049084127 1470960834 1280333156 1706598464 1268389504 1227431573 2132916352'
-	$npc_dna['A11'] = '2092485270 1750615492 1357552191 1799649757 1558588590 1808035750 1644370082'
-	$npc_dna['A12'] = '1898622449 1904538322 8321006077 1825474042 1063577851 7921283143 7765736018'
-	$npc_dna['A13'] = '1731087833 1604487809 1464859113 1561062144 1440871037 1347904523 1150306572'
-	$npc_dna['A14'] = '1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
-	$npc_dna['A15'] = '1743820731 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
-	$npc_dna['A16'] = '1119464721 1614037462 1646642112 1959746313 1085890273 1009333823 1238937878'
-	$npc_dna['A17'] = '1736016429 1462897715 2010810526 1845581584 1266092607 1950870951 1153689245'
-	$npc_dna['A18'] = '1695885007 2098494473 1893236781 1197776866 1613803510 1095093401 1877459340'
-	$npc_dna['A19'] = '1868882449 1367396730 1179635869 1781589830 2141637715 1988698459 1710383168'
-	$npc_dna['A20'] = '1851794365 1224420951 1300723572 1628306107 1809003038 1301990921 1253822208'
-	$npc_dna['A21'] = '1027294118 1526664895 1047167563 1146573782 1562782691 2063456541 1533040976'
-	$npc_dna['A22'] = '2099547924 1046564078 1433794796 1591674416 1440637551 1386979191 1773169648'
-	$npc_dna['A23'] = '1410862429 1854775733 1705291842 1147504758 1609009238 1203561941 1602837590'
-	$npc_dna['A24'] = '1989757424 1370351107 1337196420 1362464918 1383218762 1045638336 1960389781'
-	$npc_dna['A25'] = '1633731691 1389436996 1448312616 1738900889 1051507305 1144473144 1251857548'
-	$npc_dna['A26'] = '1047167563 2063456541 1533040976 1303801542 1620497680 1042269021 1659592524'
-	$npc_dna['A27'] = '1526664895 1146573782 1562782691 1262684992 1354837515 1727531312 2004326261'
-	$npc_dna['A28'] = '1085730943 1931034853 1979821791 1720869809 1405982728 2119519439 2110201703'
-	$npc_dna['A29'] = '1545843327 1962976090 1780199176 1930957336 1888703623 1843607237 1675779774'
-	$npc_dna['A30'] = '1545843328 1962976090 1780199176 1930957336 1888703623 1843607237 1675779774'
-	$npc_dna['A31'] = '1843607237 1942499229 1221585640 1038127602 1700766678 1100784200 1819267918'
-	$npc_dna['A32'] = '1675779774 1167755546 1500737294 1443097159 1423316671 1056299351 1530143067'
-	$npc_dna['A33'] = '1429755064 1545843327 1198040660 1962976090 1780199176 1936146603 2049979334'
-	$npc_dna['A34'] = '1588599246 1545843327 1085730943 1962976090 1780199176 1931034853 1979821791'
-	$npc_dna['A35'] = '1198040660 1936146603 2049979334 1276791698 1325847789 1379325296 1029736884'
-	$npc_dna['A36'] = '1902637322 1870968508 1231095894 1330096941 1541087381 1973617911 1386337081'
-	$npc_dna['A37'] = '1389808807 1404442169 1642165848 1673620649 1531597159 1430968975 1536241074'
-	$npc_dna['A38'] = '1226305314 1430928850 1144576786 1435600997 1537092669 1301461802 1167005269'
-	$npc_dna['A39'] = '1792509661 1994108013 1588492806 1200642788 1785136518 1482855645 1903324752'
-	$npc_dna['A40'] = '1378982990 1311934118 1904514436 1282506111 1725049043 1341280625 1250233099'
-	$npc_dna['A41'] = '1331452063 2012109105 1708557162 1857346873 1496187449 1611414481 1133537624'
-	$npc_dna['A42'] = '1684075531 1825751910 1655527813 1683610108 1813375771 2012109105 1708557162'
-	$npc_dna['A43'] = '1707750779 1605673218 1243222430 1619197534 1698231949 1043436410 1967334561'
-	$npc_dna['A44'] = '1313155229 1195459649 1517554507 1714940250 1195812044 1410182720 1106787557'
-	$npc_dna['A45'] = '2120036389 1608902916 1608360250 1348006946 1295114181 1691995142 1058262054'
-	$npc_dna['A46'] = '1730012364 1640374953 1450067760 1963836408 1594339112 1081934143 1987109342'
-	$npc_dna['A47'] = '1093558586 1874182199 1860051813 1894735696 2013967885 1566236664 1861552325'
-	$npc_dna['A48'] = '1399171137 1247493113 1072511322 1204732676 1430581863 1194553758 1926427252'
-	$npc_dna['A49'] = '1801121147 1596587819 1688642091 1202650974 1577509272 1059659374 1678770230'
-	$npc_dna['A50'] = '1435367511 1891990398 1521901210 1459906326 1825460937 1413691134 1744017772'
-	$npc_dna['A51'] = '1852796600 2106532432 1184050637 1847025401 1606707948 1039681085 1957750328'
-	$npc_dna['A52'] = '1571713339 1381421911 1129274296 1580593240 1693511984 1798824352 1655802955'
-	$npc_dna['A53'] = '1987201506 1646392419 1036777300 1820041031 1625967645 1373112497 1790005211'
-	$npc_dna['A54'] = '2134980269 1704535752 1434251081 1076620970 1443727294 1838260118 1205245791'
-	$npc_dna['A55'] = '1160422782 1599231242 1170518020 1844217422 1970929518 1568598475 1217564731'
-	$npc_dna['A56'] = '1731740316 1035407288 1124546006 1260253434 1082292496 1455110922 1434089976'
-	$npc_dna['A57'] = '1173276062 1427985989 1736266892 1028816280 1824359669 1132882533 1134471109'
-	$npc_dna['A58'] = '1443401856 1151112047 8321006077 1153217734 1305220298 7921283143 7765736018'
-	$npc_dna['A59'] = '1670044870 1746541889 1939734844 1792989216 1320934850 1111430962 2142228809'
-	$npc_dna['A60'] = '1277459319 1572128651 2011848683 1766614432 1751115695 2053109941 2123319868'
-	$npc_dna['A61'] = '1674740055 1616332471 1238320018 1885547841 1948804143 1271878978 1383881679'
-	$npc_dna['A62'] = '1461313531 1705318453 1315320361 1648677747 1742189125 1337017581 1188201934'
-	$npc_dna['A63'] = '1262037798 1489580076 1482201365 1230199953 1331830585 1923429750 1570327975'
-	$npc_dna['A64'] = '2011848683 2053109941 2123319868 1126381092 1930867160 1481040265 1607304091'
-	$npc_dna['A65'] = '1407717462 1572128651 2011848683 1766614432 1751115695 2053109941 2123319868'
-	$npc_dna['A66'] = '3769808989 3791424895 3388660888 3670612592 3668879713 3274794097 3877226585'
-	$npc_dna['A67'] = '1770994710 1045056456 1630291439 1823144512 2022969490 1003713468 1769557695'
-	$npc_dna['A68'] = '1180829350 1861722783 1533731343 2060083553 1474192936 1030861215 1441974536'
-	$npc_dna['A69'] = '1497408906 2062794580 1954918340 1284438971 1189615485 1330569260 1356806209'
-	$npc_dna['A70'] = '1625103852 1058929809 1950538836 1778016905 1380420827 1079863842 1745265049'
-	$npc_dna['A71'] = '2132719934 1311181050 1171683829 1946919542 1528886114 2035827969 1077439399'
-	$npc_dna['A72'] = '1416935739 1965395103 1375203982 1925522281 1102922011 2030344556 1049774393'
-	$npc_dna['A73'] = '2012922376 1037502234 1553944791 1481530732 1811451079 1396452842 1984210226'
-	$npc_dna['A74'] = '1770755490 1681513008 1124194992 1296486173 1065745146 1634914638 1526211903'
-	$npc_dna['A75'] = '2039225506 1786885929 1179834057 1525285053 1729741476 1870377171 1879004056'
-	$npc_dna['A76'] = '1008510370 1518299135 1584717411 1093601930 1547392081 1332335506 1589745960'
-	$npc_dna['A77'] = '1971687970 1162271469 1942122372 1675574199 1926720739 1720477118 2120304425'
-	$npc_dna['A78'] = '1129198910 2123899265 2070826103 1263408683 1266342598 1852602642 1659580757'
-	$npc_dna['A79'] = '1493775493 1711020559 1913087213 1896156768 1664736488 1487004190 1687464440'
-	$npc_dna['A80'] = '1043237462 1787303410 2015535291 1536406969 1119401804 1423821092 1202659815'
-	$npc_dna['A81'] = '1781969758 1233736852 1968991800 1271757488 1003619294 1186735786 1089618370'
-	$npc_dna['A82'] = '1518919857 1263522764 1853362558 1903972455 1560042249 1858587108 1920541253'
-	$npc_dna['A83'] = '1473539500 1300272748 1849153490 1148245338 1587757384 1435094984 1944660918'
-	$npc_dna['A84'] = '2106927598 1295208699 1791495642 1377661124 2006483992 1113518034 1579903219'
-	$npc_dna['A85'] = '1938942779 2106314839 1289521515 1217866816 2023591880 1519928587 1939169723'
-	$npc_dna['A86'] = '1292901057 1445078354 1576836749 1579962358 1713996320 2046365622 1579166032'
-	$npc_dna['A87'] = '1847378236 1162293273 1556619643 1329175895 1349109199 1613614049 1534225588'
-	$npc_dna['A88'] = '1072747711 1893613779 1095190471 1168304377 1119586478 1317838894 1161492926'
-	$npc_dna['A89'] = '1686681956 1037303803 1438812408 1000615186 1838310950 1945611800 1031199730'
-	$npc_dna['A90'] = '1551794736 1037303803 1438812408 1000615186 1838310950 1945611800 1031199730'
-	$npc_dna['A91'] = '1091682576 2037714665 1534661263 1602294938 1206288726 1612990215 1456060861'
-	$npc_dna['A92'] = '1215179226 1132967920 1233565533 2074043785 1042603573 1361029355 2138150185'
-	$npc_dna['A93'] = '1419539166 1635112879 1449039561 1653076316 1282274667 1815783068 1891294665'
-	$npc_dna['A94'] = '1867223522 1532675696 1762275784 1308084289 2089817449 1807718763 1325197727'
-	$npc_dna['A95'] = '1665716568 1089177521 1951416857 1629130965 1139147327 1335392254 1729246241'
-	$npc_dna['A96'] = '1460502649 1673367532 1417003328 1868999426 1609397406 1943603327 1181997081'
-	$npc_dna['A97'] = '1094943856 1353290235 1572450107 1956501688 1542692525 1988448865 1619643443'
-	$npc_dna['A98'] = '1236168432 1165329555 1245952733 1661287661 1117236841 1677164094 1151987548'
-	$npc_dna['A99'] = '1510466089 1004233017 1279999730 1803351444 1641046743 1766586587 1960434703'
-	
-	$npc_dna['A101'] = '1316262053 1139860599 1054558181 1564591207 1897612229 1770085065 1904973185'
-	$npc_dna['A102'] = '1543553151 1178430341 1325302453 1973698959 1957668534 1742596417 1164209202'
-	$npc_dna['A103'] = '1067395578 2076484645 1105399915 1907879678 1427565612 1490215506 1150379156'
-	$npc_dna['A104'] = '1043823602 2024518232 1177653510 1378276310 1952592877 1519571965 1344291245'
-	$npc_dna['A105'] = '1142923155 1109221512 1878952508 1385940310 1720623901 2002904662 1060291391'
-	$npc_dna['A106'] = '1417673067 1028156270 1577447008 1963640062 1937710404 1257008617 1439724726'
-	$npc_dna['A107'] = '1844078701 1752959121 1178966198 1524261234 1583340322 1917049302 1492514745'
-	$npc_dna['A108'] = '1643991188 1952232493 1071028063 2074038111 1147795375 2118341095 1847972590'
-	$npc_dna['A109'] = '1746569371 1346237388 1813218844 1467700105 1086609823 1654865621 1715437717'
-	$npc_dna['A110'] = '1382385133 2015745814 1777689033 1679307387 1776217771 1917449428 2071160465'
-	$npc_dna['A111'] = '1089725928 1899475061 1329520737 1102315698 1749072929 1621723771 1753154554'
-	$npc_dna['A112'] = '1357552191 1808035750 1644370082 1970842460 1776176573 1211917555 1776040163'
-	$npc_dna['A113'] = '1774396206 1848301631 1697225452 1143268439 1252055647 2110725762 1260967419'
-	$npc_dna['A114'] = '1774396205 1848301631 1697225452 1143268439 1252055647 2110725762 1260967419'
-	$npc_dna['A115'] = '1074209213 1187173282 1211031753 1535474248 1134590256 1026540873 1721369948'
-	$npc_dna['A116'] = '1542399937 1905241817 1701426477 1002823534 1464267474 1011697976 1988839911'
-	$npc_dna['A117'] = '4542399937 4905241817 4701426477 4002823534 4464267474 4011697976 4988839911'
-	$npc_dna['A118'] = '1705291842 1203561941 1602837590 1811774530 1215541632 1893678025 1991423109'
-	$npc_dna['A119'] = '2031631571 1995569440 1450381571 1372658726 1715345534 1718505125 1736791711'
-	$npc_dna['A120'] = '1288672090 1312650625 1126852365 1579537441 1050383706 1530771556 1757833025'
-	$npc_dna['A121'] = '1145156791 1748081183 1137690401 1121192373 1440194064 1029860550 1346974726'
-	$npc_dna['A122'] = '2130577244 1640932093 1191659262 1340043332 1009313498 1205807037 1759548391'
-	$npc_dna['A123'] = '1213144477 1393767889 1853481730 1216131062 1625069235 1446669832 1709998708'
-	$npc_dna['A124'] = '1665174694 1988944116 1807917594 1254176734 2064239242 1643819573 1392786112'
-	$npc_dna['A125'] = '1782310214 1854425806 1138563924 1277981120 1771674321 1225102514 1034678700'
-	$npc_dna['A126'] = '1464522854 1308604424 1705249327 1562011617 1043225628 1849417361 1015855202'
-	$npc_dna['A127'] = '1797467433 2003489967 1798597247 1058757155 1598996372 1954728943 1657496532'
-	$npc_dna['A128'] = '1329445270 1353015030 1000782701 1036165668 1639583614 1529658078 1975679453'
-	$npc_dna['A129'] = '1440577620 1404493595 1159165013 1229533074 1597914660 1301026307 1275667543'
-	$npc_dna['A130'] = '1726870149 1624130023 1044618711 1429525298 1800638929 1340956737 1405979189'
-	$npc_dna['A131'] = '1290761368 1731705745 1556198951 1402252861 1318878286 1783536035 1235327987'
-	$npc_dna['A132'] = '1845705457 1671776475 1432615990 2143340423 1777183626 1122316963 1021792548'
-	$npc_dna['A133'] = '1771221536 2027750396 2089544713 1734369517 1759135620 1433377965 1088177703'
-	$npc_dna['A134'] = '1837796316 1436860618 1699933821 1423519204 1271493655 1566380915 1482989416'
-	$npc_dna['A135'] = '1482962188 1063482733 1488899248 1806709653 1901966276 1373982700 1143695253'
-	$npc_dna['A136'] = '1323009327 1170828061 1350671739 1453635383 1122377435 1922441585 1637692781'
-	$npc_dna['A137'] = '1366158823 1463494144 1620282105 1806630761 1949066883 1679902075 1297964182'
-	$npc_dna['A138'] = '1041262937 1103319358 1212009691 1617547174 1655867289 1930930487 1952353548'
-	$npc_dna['A139'] = '1194676974 1594146631 1238391630 1274433221 1950748802 1727312584 8321006077'
-	$npc_dna['A140'] = '1388957981 1104285969 1184925418 1994156965 1456422790 2095370094 1430302038'
-	$npc_dna['A141'] = '2132183395 1401313649 8321006077 1434417039 2321026077 7921283143 7765736018'
-	$npc_dna['A142'] = '1972767054 1454786801 1222281674 1247981358 1828806656 1613393781 2115243730'
-	$npc_dna['A143'] = '1483702075 1521949936 1508959207 1971565483 1258438946 1771252769 1861114888'
-	$npc_dna['A144'] = '1273241012 2077038465 1275739884 1535053248 1434891447 1879708703 1237809681'
-	$npc_dna['A145'] = '1353721655 1926973992 1103624951 1850596792 1430454682 1886117868 1618747491'
-	$npc_dna['A146'] = '1970425464 1559405118 2117548142 1930104143 1673957846 1166458305 1888536480'
-	$npc_dna['A147'] = '1457300123 1918120099 1967335170 1056889039 1290544338 1170828061 1350671739'
-	$npc_dna['A148'] = '1110871039 1215316528 1439574498 1881549627 1043257862 2062098828 1713844818'
-	$npc_dna['A149'] = '1299436863 1261698091 1686799294 1465620552 1949917866 1150154188 1072586683'
-	$npc_dna['A150'] = '1912077115 1054317172 1216715520 1272636005 1666248718 2044828734 1577551516'
-	$npc_dna['A151'] = '1668638992 1214865459 1808776698 1612495094 1514793001 1654481226 1823327274'
-	$npc_dna['A152'] = '1786501093 1834879963 1390361698 1051572151 1608736325 1790512075 1070782218'
-	$npc_dna['A153'] = '1907002748 2085207351 1100129632 1342689598 1745456331 1873513432 1485648419'
-	$npc_dna['A154'] = '1942572074 1700154733 1692821756 1194715785 1803063877 2081935270 2014274394'
-	$npc_dna['A155'] = '1153126939 1063403218 1979820912 1002904260 1380666059 1009730022 1657156801'
-	$npc_dna['A156'] = '1108429212 1130146285 1800931785 1571774683 1841942137 1677995681 1796981560'
-	$npc_dna['A157'] = '1663800525 1510572542 1424729633 1976950271 1830743114 1783648027 1763271904'
-	$npc_dna['A158'] = '1776510699 1586206108 1731953841 1110012478 1584998429 1767532419 1060614101'
-	$npc_dna['A159'] = '1426757610 1675195614 1268203516 1506174629 1153117090 1007713575 1605966541'
-	$npc_dna['A160'] = '1428796224 1909315069 1882255348 1835514071 1201593987 2123583560 1823246593'
-	$npc_dna['A161'] = '1259280312 1641879774 1467473525 1487343721 1544500481 1151521798 1048594742'
-	$npc_dna['A162'] = '1582727702 1056494408 1939172326 1376797215 1875600726 1724112980 1453206350'
-	$npc_dna['A163'] = '1748187802 2032789191 1711627574 1292957633 1111654803 1788616009 1772047830'
-	$npc_dna['A164'] = '1034557513 1185767528 1251220411 1486489711 1093403292 1015320258 1011612550'
-	$npc_dna['A165'] = '1081104871 1359076800 1939413889 1911496040 1098487725 1546780075 1860974284'
-	$npc_dna['A166'] = '3081104871 3359076800 3939413889 3911496040 3098487725 3546780075 3860974284'
-	$npc_dna['A167'] = '1784699091 1203401906 1216561919 1916388994 1239904750 1929086392 1148871462'
-	$npc_dna['A168'] = '4784699091 4203401906 4216561919 4916388994 4239904750 4929086392 4148871462'
-	$npc_dna['A169'] = '1772564507 1547200105 1796704229 1583509569 1596894846 1745220169 1973652650'
-	$npc_dna['A170'] = '1526522684 1795996217 1368402599 1642220203 1021143397 1273163614 1531835829'
-	$npc_dna['A171'] = '1014091374 1918559552 1896341252 1052968279 1674912040 1758379740 1721466153'
-	$npc_dna['A172'] = '2035042362 1045516320 1994842543 1052417530 1977000071 1331823092 1986866420'
-	$npc_dna['A173'] = '1140758667 1773455079 2123382286 1650309847 1391480172 1829299044 1187608522'
-	$npc_dna['A174'] = '1008006962 1236637588 1489896373 1580273620 1293163913 1709107929 1173381311'
-	$npc_dna['A175'] = '1762171071 1281651668 1794224566 1962137201 1525806840 1010897683 1463472358'
-	$npc_dna['A176'] = '1006991833 1781290821 1894478819 1893358116 2127290034 1137830776 1241388413'
-	$npc_dna['A177'] = '2002591333 1925818575 1969997487 1060579504 1586877100 1553666549 1966601880'
-	$npc_dna['A178'] = '1144646462 1823244872 1843355586 1217893778 1897895542 1393527413 1969377528'
-	$npc_dna['A179'] = '1346361049 1328639709 1291363881 1317513795 1888589910 1014862870 1205798028'
-	$npc_dna['A180'] = '4346361049 4328639709 4291363881 4317513795 4888589910 4014862870 4205798028'
-	$npc_dna['A181'] = '1546478363 1040873558 1970652586 1531682310 1996463487 1293805943 1036689614'
-	$npc_dna['A182'] = '1020750214 1760012487 1196272894 1622978428 1628391634 2022138491 2071033872'
-	$npc_dna['A183'] = '1372778085 1912011495 1743459319 1874701039 1361625511 1281898844 1820485903'
-	$npc_dna['A184'] = '1102236119 1140436145 1903631040 1307987303 1672604281 1932459933 1381024294'
-	$npc_dna['A185'] = '1688667877 1444143245 1971085394 1614262160 1304657108 2094208929 1374312201'
-	$npc_dna['A186'] = '8321006077 7921283143 7765736018 1382438126 1034093203 1265299630 1118945982'
-	$npc_dna['A187'] = '1828318755 1912110768 1763625475 1700953844 1635556809 1788400335 1891647424'
-	$npc_dna['A188'] = '1437373624 1498180021 1914707319 1923163911 1520364264 2110725762 1260967419'
-	$npc_dna['A189'] = '1492342621 1736208516 1680470700 1919367231 1804680320 1756178566 1187568265'
-	$npc_dna['A190'] = '1492342626 1736208516 1680470700 1919367231 1804680320 1756178566 1187568265'
-
-	$npc_dna['A192'] = '1893727481 1167237604 1303192980 1478078827 1870699157 1379809405 1569436993'
-	$npc_dna['A193'] = '7140667332 7978651826 7440682263 1631105202 2145357995 1540785413 1172036362'
-	$npc_dna['A194'] = '7008670756 7958693370 7059741341 1566986214 1732880506 1281239619 1634169768'
-	$npc_dna['A195'] = '1086487692 7476661390 7698010724 1870038241 1870978496 1236988759 1677200479'
-	$npc_dna['A196'] = '7955917440 7472108604 7013900784 1016721320 1968096832 1240781467 1387541183'
-	$npc_dna['A197'] = '7169919752 7587835065 7871488903 1779229534 1159101193 1247015884 1571810481'
-	
-	if StoryLine = 1:
-		$pcs_dna = func('dna','generate',$npc_dna['A29'],$npc_dna['A35'])
-	else
-		$pcs_dna = func('dna','create')
+	Msg 'Your save comes from some of previous versions of the game.<br>If it comes from ver. 0.8.1 or older, be prepare to buy new clothes.'
+	if housr = 1:
+		home_owned[1] = 1
+	elseif housr = 2:
+		home_owned[4] = 1
 	end
-	
-	a = arrsize('npc_dob')
-	w = 0
-	:NpcDnaLoop
-		if $npc_pic['B<<w>>'] ! '':$npc_dna['B<<w>>'] = func('DNA','create')
-		if $npc_pic['C<<w>>'] ! '':$npc_dna['C<<w>>'] = func('DNA','create')
-	if w < a:w += 1 & jump 'NpcDnaLoop'
-	killvar 'w'
-	killvar 'a'
-	
-	if arrsize('$ChildFath') > 0:
-		i = 0
-		x = 0
-		j = arrsize('$ChildFath')-1
-		:kidDNAloop
-			$ChildFathDNA[i] = $npc_dna[$ChildFath[i]]
-			if $childtype[i] ! 'identical twin':
-				$kid_dna[i] = func('dna','generate',$pcs_dna,$ChildFathDNA[i])
-			elseif x = 0:
-				x = 1
-				$kid_dna[i] = func('dna','generate',$pcs_dna,$ChildFathDNA[i])
-			else
-				$kid_dna[i] = $kid_dna[i-1]
-				x = 0
-			end
-		if i < j: i += 1 & jump 'kidDNAloop'
-		killvar 'i'
-		killvar 'j'
-		killvar 'x'
+	if BuyHous = 1: home_owned[1] = 2
+	if placeMansion > 0: home_owned[5] = placeMansion
+	if dachaest > 0: home_owned[3] = dachaest
+	killvar 'placemansion'
+	killvar 'dachaest'
+	killvar 'housr'
+	killvar 'BuyHous'
+
+	if alko < 0: alko = 0
+	if pranik < 0: pranik = 0
+	if poroshok < 0: poroshok = 0
+
+
+	!! set $home_town variable and remove consequential obsolete variables
+	if $home_town = '':
+		gs 'set_home', curr_home
+		killvar 'svidboykino'
+		killvar 'svidboypark'
+		killvar 'svidboypark1'
+		killvar 'svidboypark2'
+		killvar 'svidboykafe'
 	end
-end
-}
-
-!! set $home_town variable and remove consequential obsolete variables
-if $home_town = '':
-	gs 'set_home', curr_home
-	killvar 'svidboykino'
-	killvar 'svidboypark'
-	killvar 'svidboypark1'
-	killvar 'svidboypark2'
-	killvar 'svidboykafe'
-end
 
-!! exhibition to inhib
-if pcs_exhibition ! 0:
-	pcs_inhib = pcs_exhibition
-	inhib_exp = exhibition_exp
-	inhib_lvlst = pcs_exhibition
-	inhib_lvl = pcs_exhibition
-	killvar 'pcs_exhibition'
-	killvar 'exhibition_exp'
-end
+	!! exhibition to inhib
+	if pcs_exhibition ! 0:
+		pcs_inhib = pcs_exhibition
+		inhib_exp = exhibition_exp
+		inhib_lvlst = pcs_exhibition
+		inhib_lvl = pcs_exhibition
+		killvar 'pcs_exhibition'
+		killvar 'exhibition_exp'
+	end
 
-!! adds pregnancy progression images to saves that did not have them previously.
-if arrsize('$bodimgsets') = 30:
-	$bodimgsets[30] = 'pregnant, but not showing'
-	$bodimgsets[31] = 'glowing'
-	$bodimgsets[32] = 'starting to show'
-	$bodimgsets[33] = 'clearly showing'
-	$bodimgsets[34] = 'fairly pregnant'
-	$bodimgsets[35] = 'quite pregnant'
-	$bodimgsets[36] = 'very pregnant'
-	$bodimgsets[37] = 'extremely pregnant'
-	$bodimgsets[38] = 'ready to pop'
-	$bodimgsets[39] = 'default_preg'
-end
+	!! adds pregnancy progression images to saves that did not have them previously.
+	if arrsize('$bodimgsets') = 30:
+		$bodimgsets[30] = 'pregnant, but not showing'
+		$bodimgsets[31] = 'glowing'
+		$bodimgsets[32] = 'starting to show'
+		$bodimgsets[33] = 'clearly showing'
+		$bodimgsets[34] = 'fairly pregnant'
+		$bodimgsets[35] = 'quite pregnant'
+		$bodimgsets[36] = 'very pregnant'
+		$bodimgsets[37] = 'extremely pregnant'
+		$bodimgsets[38] = 'ready to pop'
+		$bodimgsets[39] = 'default_preg'
+	end
 
-!! reorganizes old spell variables into new arrrays
-if spell_update = 0:
-	spell_update = 1
-
-	if spelltuman = 1:spellKnown['fog'] = 1
-	if spellklon = 1:spellKnown['clone'] = 1
-	if spellstun = 1:spellKnown['stun'] = 1
-	if spellweap = 1:spellKnown['weapon'] = 1
-	if spellwind = 1:spellKnown['wind'] = 1
-	if spellklon2 = 1:spellKnown['multiclone'] = 1
-	if spellinit = 1:spellKnown['haste'] = 1
-	if spellhel = 1:spellKnown['heal'] = 1
-	if spellfire0 = 1:spellKnown['scaldingtouch'] = 1
-	if spellfire2 = 1:spellKnown['burninghands'] = 1
-	if spellfire3 = 1:spellKnown['firebarrier'] = 1
-	if spellfire4 = 1:spellKnown['firestorm'] = 1
-	if spellfire5 = 1:spellKnown['flameshield'] = 1
-	if spellele0 = 1:spellKnown['shock'] = 1
-	if spellele2 = 1:spellKnown['lightning'] = 1
-	if spellele3 = 1:spellKnown['electricbarrier'] = 1
-	if spellele4 = 1:spellKnown['1000birds'] = 1
-	if spellele5 = 1:spellKnown['dancingsphere'] = 1
-	if spellert0 = 1:spellKnown['quicksand'] = 1
-	if spellert2 = 1:spellKnown['earthshield'] = 1
-	if spellert3 = 1:spellKnown['abyss'] = 1
-	if spellert4 = 1:spellKnown['earthguardian'] = 1
-	if spellert5 = 1:spellKnown['sando'] = 1
-	if spellwind0 = 1:spellKnown['windgust'] = 1
-	if spellwind2 = 1:spellKnown['pressure'] = 1
-	if spellwind3 = 1:spellKnown['vacuum'] = 1
-	if spellwind4 = 1:spellKnown['vacuumshells'] = 1
-	if spellwind5 = 1:spellKnown['devouringvacuum'] = 1
-	if spellwater0 = 1:spellKnown['leechmana'] = 1
-	if spellwater2 = 1:spellKnown['flood'] = 1
-	if spellwater3 = 1:spellKnown['blister'] = 1
-	if spellwater4 = 1:spellKnown['sharkrockets'] = 1
-	if spellwater5 = 1:spellKnown['greatflood'] = 1
-end
+	!! reorganizes old spell variables into new arrrays
+	if spell_update = 0:
+		spell_update = 1
+
+		if spelltuman = 1:spellKnown['fog'] = 1
+		if spellklon = 1:spellKnown['clone'] = 1
+		if spellstun = 1:spellKnown['stun'] = 1
+		if spellweap = 1:spellKnown['weapon'] = 1
+		if spellwind = 1:spellKnown['wind'] = 1
+		if spellklon2 = 1:spellKnown['multiclone'] = 1
+		if spellinit = 1:spellKnown['haste'] = 1
+		if spellhel = 1:spellKnown['heal'] = 1
+		if spellfire0 = 1:spellKnown['scaldingtouch'] = 1
+		if spellfire2 = 1:spellKnown['burninghands'] = 1
+		if spellfire3 = 1:spellKnown['firebarrier'] = 1
+		if spellfire4 = 1:spellKnown['firestorm'] = 1
+		if spellfire5 = 1:spellKnown['flameshield'] = 1
+		if spellele0 = 1:spellKnown['shock'] = 1
+		if spellele2 = 1:spellKnown['lightning'] = 1
+		if spellele3 = 1:spellKnown['electricbarrier'] = 1
+		if spellele4 = 1:spellKnown['1000birds'] = 1
+		if spellele5 = 1:spellKnown['dancingsphere'] = 1
+		if spellert0 = 1:spellKnown['quicksand'] = 1
+		if spellert2 = 1:spellKnown['earthshield'] = 1
+		if spellert3 = 1:spellKnown['abyss'] = 1
+		if spellert4 = 1:spellKnown['earthguardian'] = 1
+		if spellert5 = 1:spellKnown['sando'] = 1
+		if spellwind0 = 1:spellKnown['windgust'] = 1
+		if spellwind2 = 1:spellKnown['pressure'] = 1
+		if spellwind3 = 1:spellKnown['vacuum'] = 1
+		if spellwind4 = 1:spellKnown['vacuumshells'] = 1
+		if spellwind5 = 1:spellKnown['devouringvacuum'] = 1
+		if spellwater0 = 1:spellKnown['leechmana'] = 1
+		if spellwater2 = 1:spellKnown['flood'] = 1
+		if spellwater3 = 1:spellKnown['blister'] = 1
+		if spellwater4 = 1:spellKnown['sharkrockets'] = 1
+		if spellwater5 = 1:spellKnown['greatflood'] = 1
+	end
 
-if spell_update < 2:
-	spell_update = 2
-	killvar '$basicSpells'
-end
-gs 'spellList'
-
-if spell_update < 3:
-	spell_update = 3
-	! Fix Spell learn avaiability for Kakuzu if needed
-	if tobiQW = 3:
-		if stihia = 1:
-			gs 'spellList','addAvailableSpells','fireSpells', 20
-		end
-		if stihia = 2:
-			gs 'spellList','addAvailableSpells','electSpells', 20
-		end
-		if stihia = 3:
-			gs 'spellList','addAvailableSpells','earthSpells', 20
-		end
-		if stihia = 4:
-			gs 'spellList','addAvailableSpells','airSpells', 20
+	if spell_update < 2:
+		spell_update = 2
+		killvar '$basicSpells'
+	end
+	gs 'spellList'
+
+	if spell_update < 3:
+		spell_update = 3
+		! Fix Spell learn avaiability for Kakuzu if needed
+		if tobiQW = 3:
+			if stihia = 1:
+				gs 'spellList','addAvailableSpells','fireSpells', 20
+			end
+			if stihia = 2:
+				gs 'spellList','addAvailableSpells','electSpells', 20
+			end
+			if stihia = 3:
+				gs 'spellList','addAvailableSpells','earthSpells', 20
+			end
+			if stihia = 4:
+				gs 'spellList','addAvailableSpells','airSpells', 20
+			end
+			if stihia = 5:
+				gs 'spellList','addAvailableSpells','waterSpells', 20
+			end
 		end
-		if stihia = 5:
-			gs 'spellList','addAvailableSpells','waterSpells', 20
+		! Fix Library spells found if needed
+		if arrsize('$ResearchingSP')>0:
+			gs 'spellList','addAvailableSpells','librarySpells', arrsize('$ResearchingSP')
 		end
 	end
-	! Fix Library spells found if needed
-	if arrsize('$ResearchingSP')>0:
-		gs 'spellList','addAvailableSpells','librarySpells', arrsize('$ResearchingSP')
-	end
-end
-gs 'spellList'
-
-
-if array_updater = 0:
-	array_updater = 1
-	$oldnpcvars[0] = 'npc_app'
-	$oldnpcvars[1] = 'npc_hair'
-	$oldnpcvars[2] = 'npc_int'
-	$oldnpcvars[3] = 'npc_lipstick'
-	$oldnpcvars[4] = 'npc_mag'
-	$oldnpcvars[5] = 'npc_undies'
-	$oldnpcvars[6] = 'npc_Qstlvl'
-	$oldnpcvars[7] = 'npc_spirit'
-	$oldnpcvars[8] = 'npc_str'
-	$oldnpcvars[9] = 'npc_vit'
-	
-	$newnpcvars[0] = 'npc_apprnc'
-	$newnpcvars[1] = 'npc_hairbsh'
-	$newnpcvars[2] = 'npc_intel'
-	$newnpcvars[3] = 'npc_lipbalm'
-	$newnpcvars[4] = 'npc_magik'
-	$newnpcvars[5] = 'npc_pantys'
-	$newnpcvars[6] = 'npc_QW'
-	$newnpcvars[7] = 'npc_sprt'
-	$newnpcvars[8] = 'npc_stren'
-	$newnpcvars[9] = 'npc_vital'
-
-	i = 0
-	:npcvarloop
-	$oldnpcvar = $oldnpcvars[i]
-	if i < arrsize($oldnpcvars):
-		if 1 > arrsize('oldnpcvar'):i += 1 & jump 'npcvarloop'
-		$newnpcvar = $newnpcvars[i]
-		COPYARR 'newnpcvar', 'oldnpcvar'
-		i += 1
-		jump 'npcvarloop'
-	end
-	killvar 'npc_app'
-	killvar 'npc_hair'
-	killvar 'npc_int'
-	killvar 'npc_lipstick'
-	killvar 'npc_mag'
-	killvar 'npc_undies'
-	killvar 'npc_Qstlvl'
-	killvar 'npc_spirit'
-	killvar 'npc_str'
-	killvar 'npc_vit'
-	killvar 'oldnpcvar'
-	killvar 'newnpcvar'
-	killvar '$oldnpcsvars'
-	killvar '$newnpcvars'
-end
+	gs 'spellList'
+
+
+	if array_updater = 0:
+		array_updater = 1
+		$oldnpcvars[0] = 'npc_app'
+		$oldnpcvars[1] = 'npc_hair'
+		$oldnpcvars[2] = 'npc_int'
+		$oldnpcvars[3] = 'npc_lipstick'
+		$oldnpcvars[4] = 'npc_mag'
+		$oldnpcvars[5] = 'npc_undies'
+		$oldnpcvars[6] = 'npc_Qstlvl'
+		$oldnpcvars[7] = 'npc_spirit'
+		$oldnpcvars[8] = 'npc_str'
+		$oldnpcvars[9] = 'npc_vit'
+		
+		$newnpcvars[0] = 'npc_apprnc'
+		$newnpcvars[1] = 'npc_hairbsh'
+		$newnpcvars[2] = 'npc_intel'
+		$newnpcvars[3] = 'npc_lipbalm'
+		$newnpcvars[4] = 'npc_magik'
+		$newnpcvars[5] = 'npc_pantys'
+		$newnpcvars[6] = 'npc_QW'
+		$newnpcvars[7] = 'npc_sprt'
+		$newnpcvars[8] = 'npc_stren'
+		$newnpcvars[9] = 'npc_vital'
 
-!!Updates for the old school code
-if NatBelLernQW > 0 and NatbelQW['QWstage'] = 0: NatbelQW['QWstage'] = NatBelLernQW & NatBelLernQW = 0
+		i = 0
+		:npcvarloop
+		$oldnpcvar = $oldnpcvars[i]
+		if i < arrsize($oldnpcvars):
+			if 1 > arrsize('oldnpcvar'):i += 1 & jump 'npcvarloop'
+			$newnpcvar = $newnpcvars[i]
+			COPYARR 'newnpcvar', 'oldnpcvar'
+			i += 1
+			jump 'npcvarloop'
+		end
+		killvar 'npc_app'
+		killvar 'npc_hair'
+		killvar 'npc_int'
+		killvar 'npc_lipstick'
+		killvar 'npc_mag'
+		killvar 'npc_undies'
+		killvar 'npc_Qstlvl'
+		killvar 'npc_spirit'
+		killvar 'npc_str'
+		killvar 'npc_vit'
+		killvar 'oldnpcvar'
+		killvar 'newnpcvar'
+		killvar '$oldnpcsvars'
+		killvar '$newnpcvars'
+	end
 
+	!!Updates for the old school code
+	if NatBelLernQW > 0 and NatbelQW['QWstage'] = 0: NatbelQW['QWstage'] = NatBelLernQW & NatBelLernQW = 0
 
-if npc_grupTipe['A133'] = 0: npc_grupTipe['A133'] = 6
-if grupTipe[25] ! 0: 
-	if npc_grupTipe['A25'] = 0: npc_grupTipe['A25'] = grupTipe[25]
-	grupTipe[25] = 0
-end
-if grupTipe[5] ! 0: 
-	if npc_grupTipe['A5'] = 0: npc_grupTipe['A5'] = grupTipe[5]
-	grupTipe[5] = 0
-end
-if grupTipe[61] ! 0: 
-	if npc_grupTipe['A189'] = 0: npc_grupTipe['A189'] = grupTipe[61]
-	grupTipe[61] = 0
-end
 
-if npcSex[1] > 0: npcSex[1] = 0 & npc_sex['A1'] = 1
-if npcSex[2] > 0: npcSex[2] = 0 & npc_sex['A2'] = 1
-if npcSex[3] > 0: npcSex[3] = 0 & npc_sex['A3'] = 1
-if npcSex[4] > 0: npcSex[4] = 0 & npc_sex['A4'] = 1
-if npcSex[6] > 0: npcSex[6] = 0 & npc_sex['A6'] = 1
-if npcSex[9] > 0: npcSex[10] = 0 & npc_sex['A9'] = 1
-if npcSex[10] > 0: npcSex[10] = 0 & npc_sex['A10'] = 1
-if npcSex[11] > 0: npcSex[11] = 0 & npc_sex['A11'] = 1
-if npcSex[14] > 0: npcSex[14] = 0 & npc_sex['A14'] = 1
-if npcSex[16] > 0: npcSex[16] = 0 & npc_sex['A16'] = 1
-if npcSex[23] > 0: npcSex[23] = 0 & npc_sex['A23'] = 1
-
-if telefon_rev < 2:
-	killvar '$contact'
-	killvar '$contactIcon'
-	killvar '$contactOCode'
-	killvar '$contactOSche'
-	killvar '$contactICode'
-	killvar '$contactISche'
-	gs 'telefon', 'AddContact', 'A29', 'icon_npc1',"gs 'telefon', 'Phone_call'","hour >= 8 and hour <= 20"
-	if telkat > 0:
-		gs 'telefon', 'AddContact', 'A219', 'icon_kat',"$telsob = 'Kate' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20"
+	if npc_grupTipe['A133'] = 0: npc_grupTipe['A133'] = 6
+	if grupTipe[25] ! 0: 
+		if npc_grupTipe['A25'] = 0: npc_grupTipe['A25'] = grupTipe[25]
+		grupTipe[25] = 0
 	end
-	if npc_QW['A192'] > 0:
-		gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'","hour >= 8 and hour <= 20"
+	if grupTipe[5] ! 0: 
+		if npc_grupTipe['A5'] = 0: npc_grupTipe['A5'] = grupTipe[5]
+		grupTipe[5] = 0
 	end
-	telefon_rev = 2
-end
-
-if pee > 0: stat['pee'] += pee & killvar 'pee'
-! Since the arousal calls are seeded in all the scenes where these two variables occur, once they''ve been added to the stat, they should always be less or equal to it.
-if NatbelQW['pee'] > stat['pee_give']: stat['pee_give'] += NatbelQW['pee']
-if mistpiss > stat['pee_give'] - NatbelQW['pee']: stat['pee_give'] += mistpiss
-
-if thpic ! 0: killvar 'thpic'
-if puspic ! 0: killvar 'puspic'
-
-if $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''christina''"><<$npc_usedname[''A18'']>></a>': $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''christina''"><<$npc_usedname[''A18'']>></a>'
-
-
-!! Replacing some of the natasha variables with NatbelQW['QWstage'] levels.
-killvar 'natsub'
-killvar 'natotrab'
-killvar 'natfuck'
-
-
-if StoryLine = 1:
-
-	if fuckornot_update = 0:
-		fuckornot_update = 1
-		hotcat_rating['A22'] = 9
-		hotcat_rating['A17'] = 9
-		hotcat_rating['A23'] = 8
-		hotcat_rating['A144'] = 8
-		hotcat_rating['A19'] = 7
-		hotcat_rating['A18'] = 7
-		hotcat_rating['A14'] = 7
-		hotcat_rating['A12'] = 7
-		hotcat_rating['A140'] = 7
-		hotcat_rating['A141'] = 7
-		hotcat_rating['A15'] = 7
-		hotcat_rating['A143'] = 6
-		hotcat_rating['A13'] = 6
-		hotcat_rating['A16'] = 6
-		hotcat_rating['A25'] = 6
-		hotcat_rating['A139'] = 6
-		hotcat_rating['A20'] = 6
-		hotcat_rating['A21'] = 6
-		hotcat_rating['A24'] = 5
-		hotcat_rating['A142'] = 5
-		hotcat_rating['A145'] = 4
-	elseif fuckornot_update = 1:
-		fuckornot_update = 2
-		hotcat_rating['A145'] = 4
-		hotcat_movement['A145'] = 0
-	elseif fuckornot_update = 2:
-		fuckornot_update = 3
-		hotcat_rating['A1'] = 8
-		hotcat_rating['A2'] = 6
-		hotcat_rating['A3'] = 7
-		hotcat_rating['A4'] = 5
-		hotcat_rating['A5'] = 7
-		hotcat_rating['A6'] = 4
-		hotcat_rating['A7'] = 1
-		hotcat_rating['A8'] = 7
-		hotcat_rating['A9'] = 5
-		hotcat_rating['A10'] = 6
-		hotcat_rating['A11'] = 4
-		hotcat_rating['A34'] = 7
-		hotcat_rating['A58'] = 4
-		hotcat_rating['A59'] = 6
-		hotcat_rating['A146'] = 8
-		hotcat_rating['A147'] = 8
-		hotcat_rating['A148'] = 6
-		hotcat_rating['A149'] = 7
-		hotcat_rating['A152'] = 6
-		hotcat_rating['A153'] = 4
-		hotcat_rating['A154'] = 7
-		hotcat_rating['A155'] = 7
-		hotcat_rating['A156'] = 5
-		hotcat_rating['A157'] = 5
-		hotcat_rating['A158'] = 6
-		hotcat_rating['A159'] = 1
+	if grupTipe[61] ! 0: 
+		if npc_grupTipe['A189'] = 0: npc_grupTipe['A189'] = grupTipe[61]
+		grupTipe[61] = 0
 	end
 
-	if grigoryEV ! 0:
-		npc_qw['A221'] = grigoryEV
-		killvar 'grigoryEV'
+	if npcSex[1] > 0: npcSex[1] = 0 & npc_sex['A1'] = 1
+	if npcSex[2] > 0: npcSex[2] = 0 & npc_sex['A2'] = 1
+	if npcSex[3] > 0: npcSex[3] = 0 & npc_sex['A3'] = 1
+	if npcSex[4] > 0: npcSex[4] = 0 & npc_sex['A4'] = 1
+	if npcSex[6] > 0: npcSex[6] = 0 & npc_sex['A6'] = 1
+	if npcSex[9] > 0: npcSex[10] = 0 & npc_sex['A9'] = 1
+	if npcSex[10] > 0: npcSex[10] = 0 & npc_sex['A10'] = 1
+	if npcSex[11] > 0: npcSex[11] = 0 & npc_sex['A11'] = 1
+	if npcSex[14] > 0: npcSex[14] = 0 & npc_sex['A14'] = 1
+	if npcSex[16] > 0: npcSex[16] = 0 & npc_sex['A16'] = 1
+	if npcSex[23] > 0: npcSex[23] = 0 & npc_sex['A23'] = 1
+
+	if telefon_rev < 2:
+		killvar '$contact'
+		killvar '$contactIcon'
+		killvar '$contactOCode'
+		killvar '$contactOSche'
+		killvar '$contactICode'
+		killvar '$contactISche'
+		gs 'telefon', 'AddContact', 'A29', 'icon_npc1',"gs 'telefon', 'Phone_call'","hour >= 8 and hour <= 20"
+		if telkat > 0:
+			gs 'telefon', 'AddContact', 'A219', 'icon_kat',"$telsob = 'Kate' & gt 'telefon', 'mobilaraz'","hour >= 8 and hour <= 20"
+		end
+		if npc_QW['A192'] > 0:
+			gs 'telefon', 'AddContact', 'A192', 'icon_nastja',"gs 'telefon', 'start'","hour >= 8 and hour <= 20"
+		end
+		telefon_rev = 2
 	end
 
-	if SchoolAtestat = 0 and SchoolBlock = 0 and $schbrand = '':$schbrand = 'school'
-end
+	if pee > 0: stat['pee'] += pee & killvar 'pee'
+	! Since the arousal calls are seeded in all the scenes where these two variables occur, once they''ve been added to the stat, they should always be less or equal to it.
+	if NatbelQW['pee'] > stat['pee_give']: stat['pee_give'] += NatbelQW['pee']
+	if mistpiss > stat['pee_give'] - NatbelQW['pee']: stat['pee_give'] += mistpiss
 
-if wombfather_update = 0: wombfather_update = 1 & gs 'din_bad'
-
-!! This will unlock the Anushka photos if a player has already done the event.
-if showerphotos = 1 and showerphotosupdater = 0:
-	showerphotosupdater = 1
-	anushkaphoto[1] = 1
-	anushkaphoto[2] = 1
-	anushkaphoto[3] = 1
-	anushkaphoto[4] = 1
-	anushkaphoto[5] = 1
-	anushkaphoto[6] = 1
-end
+	if thpic ! 0: killvar 'thpic'
+	if puspic ! 0: killvar 'puspic'
 
-!! Changes to the pregnancy due date dynamic format
-if pregdateupdate = 0:
-    gs 'din_bad'
-    pregdateupdate = 1
-end
+	if $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats2'',''christina''"><<$npc_usedname[''A18'']>></a>': $npcGoSchool['A<<npctemp>>'] = '<a href="exec:gt ''gschool_chats1'',''christina''"><<$npc_usedname[''A18'']>></a>'
 
-if $npc_usedname['A<<npctemp>>'] = 'Inna': $npc_usedname['A<<npctemp>>'] = 'Irina'
 
-!! Killing some useless variables used to trigger the Pavlin storyline
-if totalmon ! 0:
-	montake = totalmon
-	killvar 'totalmon'
-	killvar 'mongiveback'
-end
+	!! Replacing some of the natasha variables with NatbelQW['QWstage'] levels.
+	killvar 'natsub'
+	killvar 'natotrab'
+	killvar 'natfuck'
+
 
-if cyc_update = 0:
-	cyc_update = 1
-	daylastperiod = firstmens
-	if difficulty = 4:
-		cyccustom = 0
-	else
-		cyccustom = 1
+	if StoryLine = 1:
+
+		if fuckornot_update = 0:
+			fuckornot_update = 1
+			hotcat_rating['A22'] = 9
+			hotcat_rating['A17'] = 9
+			hotcat_rating['A23'] = 8
+			hotcat_rating['A144'] = 8
+			hotcat_rating['A19'] = 7
+			hotcat_rating['A18'] = 7
+			hotcat_rating['A14'] = 7
+			hotcat_rating['A12'] = 7
+			hotcat_rating['A140'] = 7
+			hotcat_rating['A141'] = 7
+			hotcat_rating['A15'] = 7
+			hotcat_rating['A143'] = 6
+			hotcat_rating['A13'] = 6
+			hotcat_rating['A16'] = 6
+			hotcat_rating['A25'] = 6
+			hotcat_rating['A139'] = 6
+			hotcat_rating['A20'] = 6
+			hotcat_rating['A21'] = 6
+			hotcat_rating['A24'] = 5
+			hotcat_rating['A142'] = 5
+			hotcat_rating['A145'] = 4
+		elseif fuckornot_update = 1:
+			fuckornot_update = 2
+			hotcat_rating['A145'] = 4
+			hotcat_movement['A145'] = 0
+		elseif fuckornot_update = 2:
+			fuckornot_update = 3
+			hotcat_rating['A1'] = 8
+			hotcat_rating['A2'] = 6
+			hotcat_rating['A3'] = 7
+			hotcat_rating['A4'] = 5
+			hotcat_rating['A5'] = 7
+			hotcat_rating['A6'] = 4
+			hotcat_rating['A7'] = 1
+			hotcat_rating['A8'] = 7
+			hotcat_rating['A9'] = 5
+			hotcat_rating['A10'] = 6
+			hotcat_rating['A11'] = 4
+			hotcat_rating['A34'] = 7
+			hotcat_rating['A58'] = 4
+			hotcat_rating['A59'] = 6
+			hotcat_rating['A146'] = 8
+			hotcat_rating['A147'] = 8
+			hotcat_rating['A148'] = 6
+			hotcat_rating['A149'] = 7
+			hotcat_rating['A152'] = 6
+			hotcat_rating['A153'] = 4
+			hotcat_rating['A154'] = 7
+			hotcat_rating['A155'] = 7
+			hotcat_rating['A156'] = 5
+			hotcat_rating['A157'] = 5
+			hotcat_rating['A158'] = 6
+			hotcat_rating['A159'] = 1
+		end
+
+		if grigoryEV ! 0:
+			npc_qw['A221'] = grigoryEV
+			killvar 'grigoryEV'
+		end
+
+		if SchoolAtestat = 0 and SchoolBlock = 0 and $schbrand = '':$schbrand = 'school'
 	end
-end
 
-! Switching from tracking relationship with Rex from rex to npc_rel['A57']
-if rex > 0 and rex > npc_rel['A57']: npc_rel['A57'] = rex & killvar 'rex'
-
-!!------------------------------village variable clean up/translation---------------------------------------
-if findvel > 0: BikeLoc = findvel & killvar 'findvel'
-!!------------------------------grandparent variable clean up---for 0.8.0 release---------------------------
-!!---Grandpa
-If grandpa_bilberry > 0: grandpaQW['chore_berry_quantity'] = grandpa_bilberry & killvar 'grandpa_bilberry'
-If grandpa_boletus > 0: grandpaQW['chore_mushroom_quantity'] = grandpa_boletus & killvar 'grandpa_boletus'
-If grandpahelpday > 0: grandpaQW['last_day_helped'] = grandpahelpday & killvar 'grandpahelpday'
-If grandpahelping > 0: grandpaQW['chore_type'] = grandpahelping & killvar 'grandpahelping'
-If grandpatalk > 0: grandpaQW['last_hour_talked'] = grandpatalk & killvar 'grandpatalk'
-If grandpatalkday > 0: grandpaQW['last_day_talked'] = grandpatalkday & killvar 'grandpatalkday'
-If grandpatalkforest > 0: grandpaQW['talked_about_forest'] = grandpatalkforest & killvar 'grandpatalkforest'
-If comb_horse > 0: grandpaQW['chore_brush_horse'] = comb_horse & killvar 'comb_horse'
-If cow_field > 0: grandpaQW['chore_lead_cow_to_field'] = cow_field & killvar 'cow_field'
-If feed_boar > 0: grandpaQW['chore_feed_boar'] = feed_boar & killvar 'feed_boar'
-If feed_cow > 0: grandpaQW['chore_feed_cow'] = feed_cow & killvar 'feed_cow'
-If feed_horse > 0: grandpaQW['chore_feed_horse'] = feed_horse & killvar 'feed_horse'
-If graze_cow > 0: grandpaQW['chore_herd_cattle'] = graze_cow & killvar 'graze_cow'
-If graze_cow_exp > 0: grandpaQW['chore_herd_cattle_experience'] = graze_cow_exp & killvar 'graze_cow_exp'
-If haying_time > 0: grandpaQW['chore_bale_hay'] = haying_time & killvar 'haying_time'
-If horse_field > 0: grandpaQW['chore_lead_horse_to_field'] = horse_field & killvar 'horse_field'
-If horse_river > 0: grandpaQW['chore_bathe_horse'] = horse_river & killvar 'horse_river'
-If go_in_bilberry > 0: grandpaQW['chore_gather_berries'] = go_in_bilberry & killvar 'go_in_bilberry'
-If go_in_boletus > 0: grandpaQW['chore_gather_mushrooms'] = go_in_boletus & killvar 'go_in_boletus'
-If go_in_boletus_bilberry > 0: grandpaQW['chore_gather_both'] = go_in_boletus_bilberry & killvar 'go_in_boletus_bilberry'
-!!---Grandma
-If grandma_trouble > 0: grandmaQW['nudity_trouble'] = grandma_trouble & killvar 'grandma_trouble'
-If grandmastory > 0: grandmaQW['last_day_asked_for_story'] = grandmastory & killvar 'grandmastory'
-If grandmatalk > 0: grandmaQW['last_hour_talked'] = grandmatalk & killvar 'grandmatalk'
-If grandmatalkday > 0: grandmaQW['last_day_talked'] = grandmatalkday & killvar 'grandmatalkday'
-If grandmatalkgad > 0: grandmaQW['talked_about_gadukino'] = grandmatalkgad & killvar 'grandmatalkgad'
-If monthbabkapay > 0: grandmaQW['last_month_paid'] = monthbabkapay & killvar 'monthbabkapay'
-If grandmahelpday > 0: grandmaQW['last_day_helped'] = grandmahelpday & killvar 'grandmahelpday'
-If grandmahelp > 0: grandmaQW['help_amount'] = grandmahelp & killvar 'grandmahelp'
-If grandmahelping > 0: grandmaQW['chore_type'] = grandmahelping & killvar 'grandmahelping'
-If collect_strawberries > 0: grandmaQW['chore_collect_strawberries'] = collect_strawberries & killvar 'collect_strawberries'
-If feed_chickens > 0: grandmaQW['chore_feed_chickens'] = feed_chickens & killvar 'feed_chickens'
-If fruit_collect > 0: grandmaQW['chore_collect_fruit'] = fruit_collect & killvar 'fruit_collect'
-If harvest_garden > 0: grandmaQW['chore_harvest_garden'] = harvest_garden & killvar 'harvest_garden'
-If milk_cow > 0: grandmaQW['chore_milk_cow'] = milk_cow & killvar 'milk_cow'
-If water_garden > 0: grandmaQW['chore_water_garden'] = water_garden & killvar 'water_garden'
-If work_garden > 0: grandmaQW['chore_work_in_garden'] = work_garden & killvar 'work_garden'
-!!---------------------------end of grandparent variable clean up---for 0.8.0 release-----------------------
-
-!! ----- Natasha story variables migrated to array ----- 0.8.0
-! Natasha''s mom NPC data for existing saves
-if $npc_firstname['A191'] ! 'Isabella':
-	npctemp = 191
-	$npc_dna['A<<npctemp>>'] = '1614037462 1959746313 1085890273 0326112989 0869737602 6676723523 3590292041'
-	$npc_firstname['A<<npctemp>>'] = 'Isabella'
-	$npc_nickname['A<<npctemp>>'] = 'Bella'
-	$npc_lastname['A<<npctemp>>'] = 'Belova'
-	$npc_usedname['A<<npctemp>>'] = 'Isabella'
-	$npc_notes['A<<npctemp>>'] = 'Your classmate Natasha''s mother, Isabella Belova.'
-	npc_dob['A<<npctemp>>'] = 19820922
-	npc_gender['A<<npctemp>>'] = 1
-	gs 'npcstaticdefaults', 'defaults'
-	npc_bust['A<<npctemp>>'] = 23
-end
-killvar '$NatashaMotherName' & killvar '$NatashaMotherNickname'
-
-if NatashaQW > 0: 				NatbelQW['QWstage'] = NatashaQW & killvar 'NatashaQW'
-if natbelXP > 0: 				NatbelQW['natbelXP'] = natbelXP & killvar 'natbelXP'
-if NatBelBestFrend > 0: 		NatbelQW['BestFriend'] = NatBelBestFrend & killvar 'NatBelBestFrend'
-if BeInNatBelHome > 0: 			NatbelQW['VisitedHome'] = BeInNatBelHome & killvar 'BeInNatBelHome'
-if natashaFirstvisit > 0: 		NatbelQW['FirstVisit'] = natashaFirstvisit & killvar 'natashaFirstvisit'
-if NatNoTV > 0: 				NatbelQW['NoTV'] = NatNoTV & killvar 'NatNoTV'
-if ShowRand > 0: 				NatbelQW['TVshow'] = ShowRand & killvar 'ShowRand'
-if $ShowMsg ! '': 				$NatbelQW['TVmsg'] = $ShowMsg & killvar '$ShowMsg'
-if NatashaWatchedYourPorn > 0: 	NatbelQW['WatchedYourPorn'] = NatashaWatchedYourPorn & killvar 'NatashaWatchedYourPorn'
-if NatDolg > 0: 				NatbelQW['Debt'] = NatDolg & killvar 'NatDolg'
-if NatDolgDay > 0: 				NatbelQW['DebtDay'] = NatDolgDay & killvar 'NatDolgDay'
-if nattimeleft > 0: 			NatbelQW['DebtTimeLeft'] = nattimeleft & killvar 'nattimeleft'
-if NatashaMoneyGivenTimes > 0: 	NatbelQW['MoneyGivenTimes'] = NatashaMoneyGivenTimes & killvar 'NatashaMoneyGivenTimes'
-if NatashaHW > 0: 				NatbelQW['homework'] = NatashaHW & killvar 'NatashaHW'
-if natdoingHW > 0: 				NatbelQW['doingHW'] = natdoingHW & killvar 'natdoingHW'
-if NatashaNakedHW > 0: 			NatbelQW['nakedHW'] = NatashaNakedHW & killvar 'NatashaNakedHW'
-if natunderwear > 0: 			NatbelQW['underwear'] = natunderwear & killvar 'natunderwear'
-if natund > 0: 					NatbelQW['underwearShop'] = natund & killvar 'natund'
-if natseethrough > 0: 			NatbelQW['seethrough'] = natseethrough & killvar 'natseethrough'
-if natseethroughwearing > 0: 	NatbelQW['seethroughwearing'] = natseethroughwearing & killvar 'natseethroughwearing'
-if natseethroughworn > 0: 		NatbelQW['seethroughworn'] = natseethroughworn & killvar 'natseethroughworn'
-if natseehtroughkitchen > 0: 	NatbelQW['seethroughkitchen'] = natseehtroughkitchen & killvar 'natseehtroughkitchen'
-if natmomrobe > 0: 				NatbelQW['momrobe'] = natmomrobe & killvar 'natmomrobe'
-if nattraining > 0:				NatbelQW['training'] = nattraining & killvar 'nattraining'
-if natlesb > 0:					NatbelQW['lesbian'] = natlesb & killvar 'natlesb'
-if natpee > 0:					NatbelQW['pee'] = natpee & killvar 'natpee'
-if HaveCucumber > 0:			NatbelQW['cucumber'] = HaveCucumber & killvar 'HaveCucumber'
-if natkolkatease > 0:			NatbelQW['KolkaTease'] = natkolkatease & killvar 'natkolkatease'
-if kolkawantsnat > 0:			NatbelQW['KolkaWantsNat'] = kolkawantsnat & killvar 'kolkawantsnat'
-if natfuckday > 0:				NatbelQW['KolkaFuckDay'] = natfuckday & killvar 'natfuckday'
-if NatKolkaSex > 0: 			NatbelQW['KolkaSex'] = NatKolkaSex & killvar 'NatKolkaSex'
-if natbj > 0: 					NatbelQW['bj'] = natbj & killvar 'natbj'
-if NatKolkaFootjob > 0: 		NatbelQW['KolkaFootjob'] = NatKolkaFootjob & killvar 'NatKolkaFootjob'
-if natcp > 0: 					NatbelQW['KolkaCP'] = natcp & killvar 'natcp'
-	! Adding all previous creampies to the new vaginal sex tracker so it can start above 0 if possible
-if NatbelQW['KolkaCP'] > 0 and NatbelQW['vaginal'] = 0: 	NatbelQW['vaginal'] += NatbelQW['KolkaCP']
-if natanal > 0: 				NatbelQW['anal'] = natanal & killvar 'natanal'
-if natpregday > 0: 				NatbelQW['pregday'] = natpregday & killvar 'natpregday'
-if nataskedbaby > 0: 			NatbelQW['askedbaby'] = nataskedbaby & killvar 'nataskedbaby'
-if natbabycount > 0: 			NatbelQW['babycount'] = natbabycount & killvar 'natbabycount'
-
-if MetNatMother > 0: 			NatbelQW['MetMother'] = MetNatMother & killvar 'MetNatMother'
-	! These can be set to 0, so wiping them in any case to get rid of them
-								NatbelQW['MotherHome'] = NatashaMotherHome & killvar 'NatashaMotherHome'
-								NatbelQW['MotherDoor'] = DoorOpenBy & killvar 'DoorOpenBy'
-								NatbelQW['MotherState'] = NatashaMotherState & killvar 'NatashaMotherState'
-								NatbelQW['MotherStateMsg'] = NatashaMotherStateMsg & killvar 'NatashaMotherStateMsg'
-								NatbelQW['MotherStateKeep'] = NatashaMotherStateKeep & killvar 'NatashaMotherStateKeep'
-if SeenNatMomHitachi > 0: 		NatbelQW['SeenNatMomHitachi'] = SeenNatMomHitachi & killvar 'SeenNatMomHitachi'
-if CaughtByNatMomHitachi > 0: 	NatbelQW['CaughtByNatMomHitachi'] = CaughtByNatMomHitachi & killvar 'CaughtByNatMomHitachi'
-if $NatMomVibName ! '': 		$NatbelQW['NatMomVibName'] = $NatMomVibName & killvar '$NatMomVibName'
-
-	! typos found in the natasha files & other cleaning up
-if nhib_exp > 0: inhib_exp += nhib_exp & killvar 'nhib_exp'
-killvar 'natsleeprand'
-killvar 'imgrand'
-
-!! ----- Natasha story variables migrated to array ----- 0.8.0
-
-! ----- Parrot story variables migrated to array
-if saveparQW > 0:       ParrotQW['Level'] = saveparQW & killvar 'saveparQW'
-if popugai > 0:         ParrotQW['Owned1'] = popugai & killvar 'popugai'
-if popugai2 > 0:        ParrotQW['Owned2'] = popugai2 & killvar 'popugai2'
-if saveparjourQW > 0:   ParrotQW['Day'] = saveparjourQW & killvar 'saveparjourQW'
-if parbuydate > 0:      ParrotQW['BuyDate'] = parbuydate & killvar 'parbuydate'
-if sisrelparday > 0:    ParrotQW['SisterReleaseParrotDay'] = sisrelparday & killvar 'sisrelparday'
-if saveparQWfailed > 0: ParrotQW['Failed'] = saveparQWfailed & killvar 'saveparQWfailed'
-If sispopconf > 0:      ParrotQW['SisKeepParrot'] = sispopconf & killvar 'sispopconf'
-if $namepopu ! '':      $ParrotQW['Name1'] = $namepopu & killvar '$namepopu'
-if $namepopu2 ! '':     $ParrotQW['Name2'] = $namepopu2 & killvar '$namepopu2'
-! ----- Parrot story variables migrated to array
-
-! ----- Diner Bystroeshka (burger) story variables migrated to array
-if BankPapper > 0:         BurgerQW['BankTask'] = BankPapper & killvar 'BankPapper'
-if BistroBoss > 0:         BurgerQW['BossSlut'] = BistroBoss & killvar 'BistroBoss'
-if BistroBossDay > 0:      BurgerQW['BossSlutLastServed'] = BistroBossDay & killvar 'BistroBossDay'
-if bistroQW > 0:           BurgerQW['Level'] = bistroQW & killvar 'bistroQW'
-if $burgerIvanText ! '':   $BurgerQW['IvanSecurityCamDesc'] = $burgerIvanText & killvar '$burgerIvanText'
-if BuSWworkEnd > 0:        BurgerQW['SaunaWhoreKnown'] = BuSWworkEnd & killvar 'BuSWworkEnd'
-if dayBankPapper > 0:      BurgerQW['BankTaskDay'] = dayBankPapper & killvar 'dayBankPapper'
-if DayTerminalPapper > 0:  BurgerQW['TerminalTaskDay'] = DayTerminalPapper & killvar 'DayTerminalPapper'
-if gossipBU > 0:           BurgerQW['SlutReputation'] = gossipBU & killvar 'gossipBU'
-if IvanEvidence > 0:       BurgerQW['IvanQWEvidence'] = IvanEvidence & killvar 'IvanEvidence'
-if ivanFilmBJ > 0:         BurgerQW['IvanQWBJFilmed'] = ivanFilmBJ & killvar 'ivanFilmBJ'
-if IvanKvartira > 0:       BurgerQW['IvanQWTatianaHelp'] = IvanKvartira & killvar 'IvanKvartira'
-if IvanPodstavaDay > 0:    BurgerQW['IvanQWDay'] = IvanPodstavaDay & killvar 'IvanPodstavaDay'
-if IvanPodstavaQW > 0:     BurgerQW['IvanQW'] = IvanPodstavaQW & killvar 'IvanPodstavaQW'
-if kompromatBlackMail > 0: BurgerQW['IvanQWBlackmail'] = kompromatBlackMail & killvar 'kompromatBlackMail'
-if $kompromatFoto ! '':    $BurgerQW['IvanQWBlackmailPhoto'] = $kompromatFoto & killvar '$kompromatFoto'
-if NoBistroWork > 0:       BurgerQW['WorkBlocked'] = NoBistroWork & killvar 'NoBistroWork'
-if PersSecWork > 0:        BurgerQW['Secretary'] = PersSecWork & killvar 'PersSecWork'
-if PersSecWorkTimes > 0:   BurgerQW['SecretaryTimesWorked'] = PersSecWorkTimes & killvar 'PersSecWorkTimes'
-if PodpiskaNeviezd > 0:    BurgerQW['IvanQWPoliceDayCount'] = PodpiskaNeviezd & killvar 'PodpiskaNeviezd'
-if posuda > 0:             BurgerQW['WashDishesCount'] = posuda & killvar 'posuda'
-if posudaA > 0:            BurgerQW['WashFloorCount'] = posudaA & killvar 'posudaA'
-if posudaday > 0:          BurgerQW['WashedDishesLastDay'] = posudaday & killvar 'posudaday'
-if posudaAday > 0:         BurgerQW['WashFloorLastDay'] = posudaAday & killvar 'posudaAday'
-if PSBBtimes > 0:          BurgerQW['WorkShift'] = PSBBtimes & killvar 'PSBBtimes'
-if sergeyPQW > 0:          BurgerQW['sergeyQW'] = sergeyPQW & killvar 'sergeyPQW'
-if soplakTimes > 0:        BurgerQW['sergeyQWServiced1'] = soplakTimes & killvar 'soplakTimes'
-if soplakTimes1 > 0:       BurgerQW['sergeyQWServiced2'] = soplakTimes1 & killvar 'soplakTimes1'
-if TerminalPapper > 0:     BurgerQW['TerminalTask'] = TerminalPapper & killvar 'TerminalPapper'
-! ----- Diner Bystroeshka (burger) story variables migrated to array
-
-! ----- Albina story variables migrated to array
-if AlbFather > 0:          AlbinaQW['AlbFatherQW'] = AlbFather & killvar 'AlbFather'
-if AlbFrend > 0:           AlbinaQW['Friends'] = AlbFrend & killvar 'AlbFrend'
-if ZvezdEnd > 0:           AlbinaQW['StarletsShutDown'] = ZvezdEnd & killvar 'ZvezdEnd'
-if DanceWhore > 0:         AlbinaQW['StarletsWhore'] = DanceWhore & killvar 'DanceWhore'
-if beinalbinahome > 0:     AlbinaQW['KnowsHouse'] = beinalbinahome & killvar 'beinalbinahome' 
-if albsportday > 0:        AlbinaQW['SportDay'] = albsportday & killvar 'albsportday' 
-if albsporthome > 0:       AlbinaQW['SportHome'] = albsporthome & killvar 'albsporthome' 
-if gamebet > 0:            AlbinaQW['gamebet'] = gamebet & killvar 'gamebet' 
-if stardance > 0:          AlbinaQW['ShowTriggerCount'] = stardance & killvar 'stardance' 
-if albrideday > 0:         AlbinaQW['albrideday'] = albrideday & killvar 'albrideday' 
-if albinaQWdance > 0:      AlbinaQW['StarletsJoined'] = albinaQWdance & killvar 'albinaQWdance' 
-if AlbZverHelp > 0:        AlbinaQW['ChristinaHelp'] = AlbZverHelp & killvar 'AlbZverHelp' 
-if alb_father_meeting > 0: AlbinaQW['ParkRally'] = alb_father_meeting & killvar 'alb_father_meeting' 
-if alb_father_day > 0:     AlbinaQW['ParkRallyDay'] = alb_father_day & killvar 'alb_father_day' 
-if AlbFaterBlackTime > 0:  AlbinaQW['ElectionCampaignTime'] = AlbFaterBlackTime & killvar 'AlbFaterBlackTime' 
-if startletsday > 0:       AlbinaQW['startletsday'] = startletsday & killvar 'startletsday' 
-! ----- Albina story variables migrated to array
-
-!! Updating npc_bust[] array to the new values ----- 0.8.0
-if npc_bust['A12'] = 9: npc_bust['A12'] = 23
-if npc_bust['A13'] = 9: npc_bust['A13'] = 8
-if npc_bust['A14'] = 9: npc_bust['A14'] = 20
-if npc_bust['A15'] = 9: npc_bust['A15'] = 18
-if npc_bust['A16'] = 9: npc_bust['A16'] = 26
-if npc_bust['A17'] = 9: npc_bust['A17'] = 34
-if npc_bust['A18'] = 9: npc_bust['A18'] = 21
-if npc_bust['A19'] = 9: npc_bust['A19'] = 14
-if npc_bust['A20'] = 9: npc_bust['A20'] = 22
-if npc_bust['A21'] = 9: npc_bust['A21'] = 18
-if npc_bust['A22'] = 9: npc_bust['A22'] = 27
-if npc_bust['A23'] = 9: npc_bust['A23'] = 14
-if npc_bust['A24'] = 9: npc_bust['A24'] = 20
-if npc_bust['A25'] = 9: npc_bust['A25'] = 21
-if npc_bust['A29'] = 9: npc_bust['A29'] = 25
-if npc_bust['A30'] = 9: npc_bust['A30'] = 18
-if npc_bust['A33'] = 9: npc_bust['A33'] = 19
-if npc_bust['A134'] = 9: npc_bust['A134'] = 20
-if npc_bust['A135'] = 9: npc_bust['A135'] = 13
-if npc_bust['A136'] = 9: npc_bust['A136'] = 30
-if npc_bust['A137'] = 9: npc_bust['A137'] = 34
-if npc_bust['A138'] = 9: npc_bust['A138'] = 18
-if npc_bust['A139'] = 9: npc_bust['A139'] = 22
-if npc_bust['A140'] = 9: npc_bust['A140'] = 13
-if npc_bust['A141'] = 9: npc_bust['A141'] = 20
-if npc_bust['A142'] = 9: npc_bust['A142'] = 13
-if npc_bust['A143'] = 9: npc_bust['A143'] = 7
-if npc_bust['A144'] = 9: npc_bust['A144'] = 24
-if npc_bust['A145'] = 9: npc_bust['A145'] = 31
-!! Updating npc_bust[] array to the new values ----- 0.8.0
-
-!!-----------Adding pube colours for 0.8.0-----------
-
-if pcs_pubecol[1] = 0: pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1 & pcs_pubecol[2] = pcs_haircol
-
-!!-----------Adding pube colours for 0.8.0-----------
-
-!! ----- Mom, Luda & Olu stuff ----- 0.8.0
-killvar 'olufirst'
-killvar 'tetyafirst'
-killvar 'oluuosegunday_count'
-killvar 'oluuosegunday_day'
-!! ----- Mom, Luda & Olu stuff ----- 0.8.0
-
-!!trait update
-if traits['update_1'] = 0:
-	traits['update_1'] = 1
-	
-	traits['alko_day'] = alko_trait_day 
-	traits['alko_points'] = alko_trait_counter
-	traits['alko_status'] = alko_trait
-	
-	killvar 'alko_trait_day'
-	killvar 'alko_trait_counter'
-	killvar 'alko_trait'
-end
+	if wombfather_update = 0: wombfather_update = 1 & gs 'din_bad'
+
+	!! This will unlock the Anushka photos if a player has already done the event.
+	if showerphotos = 1 and showerphotosupdater = 0:
+		showerphotosupdater = 1
+		anushkaphoto[1] = 1
+		anushkaphoto[2] = 1
+		anushkaphoto[3] = 1
+		anushkaphoto[4] = 1
+		anushkaphoto[5] = 1
+		anushkaphoto[6] = 1
+	end
 
-!! ----- Other bug fixes and cleanup ----- 0.8.0
-if pcs_gaming_exp > 0: gaming_exp += pcs_gaming_exp & killvar 'pcs_gaming_exp'
-if nerd_night_game ! 0: killvar 'nerd_night_game'
-if nerd_night_game_day ! 0: nerd_game['game_day'] = nerd_night_game_day & killvar 'nerd_night_game_day'
-
-!!Masturbation check wasn''t being cleared
-mastrOnce = 0
-!! ----- Other bug fixes and cleanup ----- 0.8.0
-
-!!--------0.8.0.1---school social group adjustment
-if gruptipe[9000] = 0:
-	gruptipe[9000] = 1
-	grupvalue[1] = grupvalue[1] * 10
-	grupvalue[2] = grupvalue[2] * 10
-	grupvalue[3] = grupvalue[3] * 10
-	grupvalue[4] = grupvalue[4] * 10
-end
-!!--------0.8.0.1---school social group adjustment
-
-
-!!--------0.8.1--- Music variable names changed
-if ml_update_1 = 0:
-	ml_guitar['hasguitar'] = ml_guitar
-	ml_guitar['carried'] = ml_guitarWithMe
-	ml_performance['performed_minutes'] = ml_performed_minutes
-	ml_performance['max_perform_minutes'] = ml_max_perform_minutes
-	ml_guitar['chordbook'] = ml_chordbook
-
-	ml_guitarlesson['lessoncount'] = ml_lessoncount
-	ml_guitarlesson['lessonday'] = ml_lessonday
-	$ml_guitarlesson['lessonday'] = $ml_lessonday
-	ml_guitarlesson['lessonhour'] = 15
-	ml_guitarlesson['nextlesson'] = daystart + (ml_guitarlesson['lessonday'] + 7 - week)
-	ml_guitarlesson['advertisement'] = ml_guitarlessonadv
-	ml_guitarlesson['enquired'] = ml_enquired
-
-	if age < 18: 
-		ml_guitarlesson['lessoncost'] = 300
-	else
-		ml_guitarlesson['lessoncost'] = 500
+	!! Changes to the pregnancy due date dynamic format
+	if pregdateupdate = 0:
+		gs 'din_bad'
+		pregdateupdate = 1
 	end
 
-	killvar 'ml_guitarWithMe'
-	killvar 'ml_performed_minutes'
-	killvar 'ml_max_perform_minutes'
-	killvar 'ml_guitarlessonadv'
-	killvar 'ml_enquired'
-	killvar 'ml_lessonday'
-	killvar '$ml_lessonday'
-	killvar 'ml_lessoncost'
+	if $npc_usedname['A<<npctemp>>'] = 'Inna': $npc_usedname['A<<npctemp>>'] = 'Irina'
+
+	!! Killing some useless variables used to trigger the Pavlin storyline
+	if totalmon ! 0:
+		montake = totalmon
+		killvar 'totalmon'
+		killvar 'mongiveback'
+	end
+
+	if cyc_update = 0:
+		cyc_update = 1
+		daylastperiod = firstmens
+		if difficulty = 4:
+			cyccustom = 0
+		else
+			cyccustom = 1
+		end
+	end
+
+	! Switching from tracking relationship with Rex from rex to npc_rel['A57']
+	if rex > 0 and rex > npc_rel['A57']: npc_rel['A57'] = rex & killvar 'rex'
+
+	!!------------------------------village variable clean up/translation---------------------------------------
+	if findvel > 0: BikeLoc = findvel & killvar 'findvel'
+	!!------------------------------grandparent variable clean up---for 0.8.0 release---------------------------
+	!!---Grandpa
+	If grandpa_bilberry > 0: grandpaQW['chore_berry_quantity'] = grandpa_bilberry & killvar 'grandpa_bilberry'
+	If grandpa_boletus > 0: grandpaQW['chore_mushroom_quantity'] = grandpa_boletus & killvar 'grandpa_boletus'
+	If grandpahelpday > 0: grandpaQW['last_day_helped'] = grandpahelpday & killvar 'grandpahelpday'
+	If grandpahelping > 0: grandpaQW['chore_type'] = grandpahelping & killvar 'grandpahelping'
+	If grandpatalk > 0: grandpaQW['last_hour_talked'] = grandpatalk & killvar 'grandpatalk'
+	If grandpatalkday > 0: grandpaQW['last_day_talked'] = grandpatalkday & killvar 'grandpatalkday'
+	If grandpatalkforest > 0: grandpaQW['talked_about_forest'] = grandpatalkforest & killvar 'grandpatalkforest'
+	If comb_horse > 0: grandpaQW['chore_brush_horse'] = comb_horse & killvar 'comb_horse'
+	If cow_field > 0: grandpaQW['chore_lead_cow_to_field'] = cow_field & killvar 'cow_field'
+	If feed_boar > 0: grandpaQW['chore_feed_boar'] = feed_boar & killvar 'feed_boar'
+	If feed_cow > 0: grandpaQW['chore_feed_cow'] = feed_cow & killvar 'feed_cow'
+	If feed_horse > 0: grandpaQW['chore_feed_horse'] = feed_horse & killvar 'feed_horse'
+	If graze_cow > 0: grandpaQW['chore_herd_cattle'] = graze_cow & killvar 'graze_cow'
+	If graze_cow_exp > 0: grandpaQW['chore_herd_cattle_experience'] = graze_cow_exp & killvar 'graze_cow_exp'
+	If haying_time > 0: grandpaQW['chore_bale_hay'] = haying_time & killvar 'haying_time'
+	If horse_field > 0: grandpaQW['chore_lead_horse_to_field'] = horse_field & killvar 'horse_field'
+	If horse_river > 0: grandpaQW['chore_bathe_horse'] = horse_river & killvar 'horse_river'
+	If go_in_bilberry > 0: grandpaQW['chore_gather_berries'] = go_in_bilberry & killvar 'go_in_bilberry'
+	If go_in_boletus > 0: grandpaQW['chore_gather_mushrooms'] = go_in_boletus & killvar 'go_in_boletus'
+	If go_in_boletus_bilberry > 0: grandpaQW['chore_gather_both'] = go_in_boletus_bilberry & killvar 'go_in_boletus_bilberry'
+	!!---Grandma
+	If grandma_trouble > 0: grandmaQW['nudity_trouble'] = grandma_trouble & killvar 'grandma_trouble'
+	If grandmastory > 0: grandmaQW['last_day_asked_for_story'] = grandmastory & killvar 'grandmastory'
+	If grandmatalk > 0: grandmaQW['last_hour_talked'] = grandmatalk & killvar 'grandmatalk'
+	If grandmatalkday > 0: grandmaQW['last_day_talked'] = grandmatalkday & killvar 'grandmatalkday'
+	If grandmatalkgad > 0: grandmaQW['talked_about_gadukino'] = grandmatalkgad & killvar 'grandmatalkgad'
+	If monthbabkapay > 0: grandmaQW['last_month_paid'] = monthbabkapay & killvar 'monthbabkapay'
+	If grandmahelpday > 0: grandmaQW['last_day_helped'] = grandmahelpday & killvar 'grandmahelpday'
+	If grandmahelp > 0: grandmaQW['help_amount'] = grandmahelp & killvar 'grandmahelp'
+	If grandmahelping > 0: grandmaQW['chore_type'] = grandmahelping & killvar 'grandmahelping'
+	If collect_strawberries > 0: grandmaQW['chore_collect_strawberries'] = collect_strawberries & killvar 'collect_strawberries'
+	If feed_chickens > 0: grandmaQW['chore_feed_chickens'] = feed_chickens & killvar 'feed_chickens'
+	If fruit_collect > 0: grandmaQW['chore_collect_fruit'] = fruit_collect & killvar 'fruit_collect'
+	If harvest_garden > 0: grandmaQW['chore_harvest_garden'] = harvest_garden & killvar 'harvest_garden'
+	If milk_cow > 0: grandmaQW['chore_milk_cow'] = milk_cow & killvar 'milk_cow'
+	If water_garden > 0: grandmaQW['chore_water_garden'] = water_garden & killvar 'water_garden'
+	If work_garden > 0: grandmaQW['chore_work_in_garden'] = work_garden & killvar 'work_garden'
+	!!---------------------------end of grandparent variable clean up---for 0.8.0 release-----------------------
+
+	!! ----- Natasha story variables migrated to array ----- 0.8.0
+	! Natasha''s mom NPC data for existing saves
+	if $npc_firstname['A191'] ! 'Isabella':
+		npctemp = 191
+		$npc_dna['A<<npctemp>>'] = '1614037462 1959746313 1085890273 0326112989 0869737602 6676723523 3590292041'
+		$npc_firstname['A<<npctemp>>'] = 'Isabella'
+		$npc_nickname['A<<npctemp>>'] = 'Bella'
+		$npc_lastname['A<<npctemp>>'] = 'Belova'
+		$npc_usedname['A<<npctemp>>'] = 'Isabella'
+		$npc_notes['A<<npctemp>>'] = 'Your classmate Natasha''s mother, Isabella Belova.'
+		npc_dob['A<<npctemp>>'] = 19820922
+		npc_gender['A<<npctemp>>'] = 1
+		gs 'npcstaticdefaults', 'defaults'
+		npc_bust['A<<npctemp>>'] = 23
+	end
+	killvar '$NatashaMotherName' & killvar '$NatashaMotherNickname'
+
+	if NatashaQW > 0: 				NatbelQW['QWstage'] = NatashaQW & killvar 'NatashaQW'
+	if natbelXP > 0: 				NatbelQW['natbelXP'] = natbelXP & killvar 'natbelXP'
+	if NatBelBestFrend > 0: 		NatbelQW['BestFriend'] = NatBelBestFrend & killvar 'NatBelBestFrend'
+	if BeInNatBelHome > 0: 			NatbelQW['VisitedHome'] = BeInNatBelHome & killvar 'BeInNatBelHome'
+	if natashaFirstvisit > 0: 		NatbelQW['FirstVisit'] = natashaFirstvisit & killvar 'natashaFirstvisit'
+	if NatNoTV > 0: 				NatbelQW['NoTV'] = NatNoTV & killvar 'NatNoTV'
+	if ShowRand > 0: 				NatbelQW['TVshow'] = ShowRand & killvar 'ShowRand'
+	if $ShowMsg ! '': 				$NatbelQW['TVmsg'] = $ShowMsg & killvar '$ShowMsg'
+	if NatashaWatchedYourPorn > 0: 	NatbelQW['WatchedYourPorn'] = NatashaWatchedYourPorn & killvar 'NatashaWatchedYourPorn'
+	if NatDolg > 0: 				NatbelQW['Debt'] = NatDolg & killvar 'NatDolg'
+	if NatDolgDay > 0: 				NatbelQW['DebtDay'] = NatDolgDay & killvar 'NatDolgDay'
+	if nattimeleft > 0: 			NatbelQW['DebtTimeLeft'] = nattimeleft & killvar 'nattimeleft'
+	if NatashaMoneyGivenTimes > 0: 	NatbelQW['MoneyGivenTimes'] = NatashaMoneyGivenTimes & killvar 'NatashaMoneyGivenTimes'
+	if NatashaHW > 0: 				NatbelQW['homework'] = NatashaHW & killvar 'NatashaHW'
+	if natdoingHW > 0: 				NatbelQW['doingHW'] = natdoingHW & killvar 'natdoingHW'
+	if NatashaNakedHW > 0: 			NatbelQW['nakedHW'] = NatashaNakedHW & killvar 'NatashaNakedHW'
+	if natunderwear > 0: 			NatbelQW['underwear'] = natunderwear & killvar 'natunderwear'
+	if natund > 0: 					NatbelQW['underwearShop'] = natund & killvar 'natund'
+	if natseethrough > 0: 			NatbelQW['seethrough'] = natseethrough & killvar 'natseethrough'
+	if natseethroughwearing > 0: 	NatbelQW['seethroughwearing'] = natseethroughwearing & killvar 'natseethroughwearing'
+	if natseethroughworn > 0: 		NatbelQW['seethroughworn'] = natseethroughworn & killvar 'natseethroughworn'
+	if natseehtroughkitchen > 0: 	NatbelQW['seethroughkitchen'] = natseehtroughkitchen & killvar 'natseehtroughkitchen'
+	if natmomrobe > 0: 				NatbelQW['momrobe'] = natmomrobe & killvar 'natmomrobe'
+	if nattraining > 0:				NatbelQW['training'] = nattraining & killvar 'nattraining'
+	if natlesb > 0:					NatbelQW['lesbian'] = natlesb & killvar 'natlesb'
+	if natpee > 0:					NatbelQW['pee'] = natpee & killvar 'natpee'
+	if HaveCucumber > 0:			NatbelQW['cucumber'] = HaveCucumber & killvar 'HaveCucumber'
+	if natkolkatease > 0:			NatbelQW['KolkaTease'] = natkolkatease & killvar 'natkolkatease'
+	if kolkawantsnat > 0:			NatbelQW['KolkaWantsNat'] = kolkawantsnat & killvar 'kolkawantsnat'
+	if natfuckday > 0:				NatbelQW['KolkaFuckDay'] = natfuckday & killvar 'natfuckday'
+	if NatKolkaSex > 0: 			NatbelQW['KolkaSex'] = NatKolkaSex & killvar 'NatKolkaSex'
+	if natbj > 0: 					NatbelQW['bj'] = natbj & killvar 'natbj'
+	if NatKolkaFootjob > 0: 		NatbelQW['KolkaFootjob'] = NatKolkaFootjob & killvar 'NatKolkaFootjob'
+	if natcp > 0: 					NatbelQW['KolkaCP'] = natcp & killvar 'natcp'
+		! Adding all previous creampies to the new vaginal sex tracker so it can start above 0 if possible
+	if NatbelQW['KolkaCP'] > 0 and NatbelQW['vaginal'] = 0: 	NatbelQW['vaginal'] += NatbelQW['KolkaCP']
+	if natanal > 0: 				NatbelQW['anal'] = natanal & killvar 'natanal'
+	if natpregday > 0: 				NatbelQW['pregday'] = natpregday & killvar 'natpregday'
+	if nataskedbaby > 0: 			NatbelQW['askedbaby'] = nataskedbaby & killvar 'nataskedbaby'
+	if natbabycount > 0: 			NatbelQW['babycount'] = natbabycount & killvar 'natbabycount'
+
+	if MetNatMother > 0: 			NatbelQW['MetMother'] = MetNatMother & killvar 'MetNatMother'
+		! These can be set to 0, so wiping them in any case to get rid of them
+									NatbelQW['MotherHome'] = NatashaMotherHome & killvar 'NatashaMotherHome'
+									NatbelQW['MotherDoor'] = DoorOpenBy & killvar 'DoorOpenBy'
+									NatbelQW['MotherState'] = NatashaMotherState & killvar 'NatashaMotherState'
+									NatbelQW['MotherStateMsg'] = NatashaMotherStateMsg & killvar 'NatashaMotherStateMsg'
+									NatbelQW['MotherStateKeep'] = NatashaMotherStateKeep & killvar 'NatashaMotherStateKeep'
+	if SeenNatMomHitachi > 0: 		NatbelQW['SeenNatMomHitachi'] = SeenNatMomHitachi & killvar 'SeenNatMomHitachi'
+	if CaughtByNatMomHitachi > 0: 	NatbelQW['CaughtByNatMomHitachi'] = CaughtByNatMomHitachi & killvar 'CaughtByNatMomHitachi'
+	if $NatMomVibName ! '': 		$NatbelQW['NatMomVibName'] = $NatMomVibName & killvar '$NatMomVibName'
+
+		! typos found in the natasha files & other cleaning up
+	if nhib_exp > 0: inhib_exp += nhib_exp & killvar 'nhib_exp'
+	killvar 'natsleeprand'
+	killvar 'imgrand'
+
+	!! ----- Natasha story variables migrated to array ----- 0.8.0
+
+	! ----- Parrot story variables migrated to array
+	if saveparQW > 0:       ParrotQW['Level'] = saveparQW & killvar 'saveparQW'
+	if popugai > 0:         ParrotQW['Owned1'] = popugai & killvar 'popugai'
+	if popugai2 > 0:        ParrotQW['Owned2'] = popugai2 & killvar 'popugai2'
+	if saveparjourQW > 0:   ParrotQW['Day'] = saveparjourQW & killvar 'saveparjourQW'
+	if parbuydate > 0:      ParrotQW['BuyDate'] = parbuydate & killvar 'parbuydate'
+	if sisrelparday > 0:    ParrotQW['SisterReleaseParrotDay'] = sisrelparday & killvar 'sisrelparday'
+	if saveparQWfailed > 0: ParrotQW['Failed'] = saveparQWfailed & killvar 'saveparQWfailed'
+	If sispopconf > 0:      ParrotQW['SisKeepParrot'] = sispopconf & killvar 'sispopconf'
+	if $namepopu ! '':      $ParrotQW['Name1'] = $namepopu & killvar '$namepopu'
+	if $namepopu2 ! '':     $ParrotQW['Name2'] = $namepopu2 & killvar '$namepopu2'
+	! ----- Parrot story variables migrated to array
+
+	! ----- Diner Bystroeshka (burger) story variables migrated to array
+	if BankPapper > 0:         BurgerQW['BankTask'] = BankPapper & killvar 'BankPapper'
+	if BistroBoss > 0:         BurgerQW['BossSlut'] = BistroBoss & killvar 'BistroBoss'
+	if BistroBossDay > 0:      BurgerQW['BossSlutLastServed'] = BistroBossDay & killvar 'BistroBossDay'
+	if bistroQW > 0:           BurgerQW['Level'] = bistroQW & killvar 'bistroQW'
+	if $burgerIvanText ! '':   $BurgerQW['IvanSecurityCamDesc'] = $burgerIvanText & killvar '$burgerIvanText'
+	if BuSWworkEnd > 0:        BurgerQW['SaunaWhoreKnown'] = BuSWworkEnd & killvar 'BuSWworkEnd'
+	if dayBankPapper > 0:      BurgerQW['BankTaskDay'] = dayBankPapper & killvar 'dayBankPapper'
+	if DayTerminalPapper > 0:  BurgerQW['TerminalTaskDay'] = DayTerminalPapper & killvar 'DayTerminalPapper'
+	if gossipBU > 0:           BurgerQW['SlutReputation'] = gossipBU & killvar 'gossipBU'
+	if IvanEvidence > 0:       BurgerQW['IvanQWEvidence'] = IvanEvidence & killvar 'IvanEvidence'
+	if ivanFilmBJ > 0:         BurgerQW['IvanQWBJFilmed'] = ivanFilmBJ & killvar 'ivanFilmBJ'
+	if IvanKvartira > 0:       BurgerQW['IvanQWTatianaHelp'] = IvanKvartira & killvar 'IvanKvartira'
+	if IvanPodstavaDay > 0:    BurgerQW['IvanQWDay'] = IvanPodstavaDay & killvar 'IvanPodstavaDay'
+	if IvanPodstavaQW > 0:     BurgerQW['IvanQW'] = IvanPodstavaQW & killvar 'IvanPodstavaQW'
+	if kompromatBlackMail > 0: BurgerQW['IvanQWBlackmail'] = kompromatBlackMail & killvar 'kompromatBlackMail'
+	if $kompromatFoto ! '':    $BurgerQW['IvanQWBlackmailPhoto'] = $kompromatFoto & killvar '$kompromatFoto'
+	if NoBistroWork > 0:       BurgerQW['WorkBlocked'] = NoBistroWork & killvar 'NoBistroWork'
+	if PersSecWork > 0:        BurgerQW['Secretary'] = PersSecWork & killvar 'PersSecWork'
+	if PersSecWorkTimes > 0:   BurgerQW['SecretaryTimesWorked'] = PersSecWorkTimes & killvar 'PersSecWorkTimes'
+	if PodpiskaNeviezd > 0:    BurgerQW['IvanQWPoliceDayCount'] = PodpiskaNeviezd & killvar 'PodpiskaNeviezd'
+	if posuda > 0:             BurgerQW['WashDishesCount'] = posuda & killvar 'posuda'
+	if posudaA > 0:            BurgerQW['WashFloorCount'] = posudaA & killvar 'posudaA'
+	if posudaday > 0:          BurgerQW['WashedDishesLastDay'] = posudaday & killvar 'posudaday'
+	if posudaAday > 0:         BurgerQW['WashFloorLastDay'] = posudaAday & killvar 'posudaAday'
+	if PSBBtimes > 0:          BurgerQW['WorkShift'] = PSBBtimes & killvar 'PSBBtimes'
+	if sergeyPQW > 0:          BurgerQW['sergeyQW'] = sergeyPQW & killvar 'sergeyPQW'
+	if soplakTimes > 0:        BurgerQW['sergeyQWServiced1'] = soplakTimes & killvar 'soplakTimes'
+	if soplakTimes1 > 0:       BurgerQW['sergeyQWServiced2'] = soplakTimes1 & killvar 'soplakTimes1'
+	if TerminalPapper > 0:     BurgerQW['TerminalTask'] = TerminalPapper & killvar 'TerminalPapper'
+	! ----- Diner Bystroeshka (burger) story variables migrated to array
+
+	! ----- Albina story variables migrated to array
+	if AlbFather > 0:          AlbinaQW['AlbFatherQW'] = AlbFather & killvar 'AlbFather'
+	if AlbFrend > 0:           AlbinaQW['Friends'] = AlbFrend & killvar 'AlbFrend'
+	if ZvezdEnd > 0:           AlbinaQW['StarletsShutDown'] = ZvezdEnd & killvar 'ZvezdEnd'
+	if DanceWhore > 0:         AlbinaQW['StarletsWhore'] = DanceWhore & killvar 'DanceWhore'
+	if beinalbinahome > 0:     AlbinaQW['KnowsHouse'] = beinalbinahome & killvar 'beinalbinahome' 
+	if albsportday > 0:        AlbinaQW['SportDay'] = albsportday & killvar 'albsportday' 
+	if albsporthome > 0:       AlbinaQW['SportHome'] = albsporthome & killvar 'albsporthome' 
+	if gamebet > 0:            AlbinaQW['gamebet'] = gamebet & killvar 'gamebet' 
+	if stardance > 0:          AlbinaQW['ShowTriggerCount'] = stardance & killvar 'stardance' 
+	if albrideday > 0:         AlbinaQW['albrideday'] = albrideday & killvar 'albrideday' 
+	if albinaQWdance > 0:      AlbinaQW['StarletsJoined'] = albinaQWdance & killvar 'albinaQWdance' 
+	if AlbZverHelp > 0:        AlbinaQW['ChristinaHelp'] = AlbZverHelp & killvar 'AlbZverHelp' 
+	if alb_father_meeting > 0: AlbinaQW['ParkRally'] = alb_father_meeting & killvar 'alb_father_meeting' 
+	if alb_father_day > 0:     AlbinaQW['ParkRallyDay'] = alb_father_day & killvar 'alb_father_day' 
+	if AlbFaterBlackTime > 0:  AlbinaQW['ElectionCampaignTime'] = AlbFaterBlackTime & killvar 'AlbFaterBlackTime' 
+	if startletsday > 0:       AlbinaQW['startletsday'] = startletsday & killvar 'startletsday' 
+	! ----- Albina story variables migrated to array
+
+	!! Updating npc_bust[] array to the new values ----- 0.8.0
+	if npc_bust['A12'] = 9: npc_bust['A12'] = 23
+	if npc_bust['A13'] = 9: npc_bust['A13'] = 8
+	if npc_bust['A14'] = 9: npc_bust['A14'] = 20
+	if npc_bust['A15'] = 9: npc_bust['A15'] = 18
+	if npc_bust['A16'] = 9: npc_bust['A16'] = 26
+	if npc_bust['A17'] = 9: npc_bust['A17'] = 34
+	if npc_bust['A18'] = 9: npc_bust['A18'] = 21
+	if npc_bust['A19'] = 9: npc_bust['A19'] = 14
+	if npc_bust['A20'] = 9: npc_bust['A20'] = 22
+	if npc_bust['A21'] = 9: npc_bust['A21'] = 18
+	if npc_bust['A22'] = 9: npc_bust['A22'] = 27
+	if npc_bust['A23'] = 9: npc_bust['A23'] = 14
+	if npc_bust['A24'] = 9: npc_bust['A24'] = 20
+	if npc_bust['A25'] = 9: npc_bust['A25'] = 21
+	if npc_bust['A29'] = 9: npc_bust['A29'] = 25
+	if npc_bust['A30'] = 9: npc_bust['A30'] = 18
+	if npc_bust['A33'] = 9: npc_bust['A33'] = 19
+	if npc_bust['A134'] = 9: npc_bust['A134'] = 20
+	if npc_bust['A135'] = 9: npc_bust['A135'] = 13
+	if npc_bust['A136'] = 9: npc_bust['A136'] = 30
+	if npc_bust['A137'] = 9: npc_bust['A137'] = 34
+	if npc_bust['A138'] = 9: npc_bust['A138'] = 18
+	if npc_bust['A139'] = 9: npc_bust['A139'] = 22
+	if npc_bust['A140'] = 9: npc_bust['A140'] = 13
+	if npc_bust['A141'] = 9: npc_bust['A141'] = 20
+	if npc_bust['A142'] = 9: npc_bust['A142'] = 13
+	if npc_bust['A143'] = 9: npc_bust['A143'] = 7
+	if npc_bust['A144'] = 9: npc_bust['A144'] = 24
+	if npc_bust['A145'] = 9: npc_bust['A145'] = 31
+	!! Updating npc_bust[] array to the new values ----- 0.8.0
+
+	!!-----------Adding pube colours for 0.8.0-----------
+
+	if pcs_pubecol[1] = 0: pcs_pubecol = pcs_haircol & pcs_pubecol[1] = 1 & pcs_pubecol[2] = pcs_haircol
+
+	!!-----------Adding pube colours for 0.8.0-----------
+
+	!! ----- Mom, Luda & Olu stuff ----- 0.8.0
+	killvar 'olufirst'
+	killvar 'tetyafirst'
+	killvar 'oluuosegunday_count'
+	killvar 'oluuosegunday_day'
+	!! ----- Mom, Luda & Olu stuff ----- 0.8.0
+
+	!!trait update
+	if traits['update_1'] = 0:
+		traits['update_1'] = 1
+		
+		traits['alko_day'] = alko_trait_day 
+		traits['alko_points'] = alko_trait_counter
+		traits['alko_status'] = alko_trait
+		
+		killvar 'alko_trait_day'
+		killvar 'alko_trait_counter'
+		killvar 'alko_trait'
+	end
+
+	!! ----- Other bug fixes and cleanup ----- 0.8.0
+	if pcs_gaming_exp > 0: gaming_exp += pcs_gaming_exp & killvar 'pcs_gaming_exp'
+	if nerd_night_game ! 0: killvar 'nerd_night_game'
+	if nerd_night_game_day ! 0: nerd_game['game_day'] = nerd_night_game_day & killvar 'nerd_night_game_day'
+
+	!!Masturbation check wasn''t being cleared
+	mastrOnce = 0
+	!! ----- Other bug fixes and cleanup ----- 0.8.0
+
+	!!--------0.8.0.1---school social group adjustment
+	if gruptipe[9000] = 0:
+		gruptipe[9000] = 1
+		grupvalue[1] = grupvalue[1] * 10
+		grupvalue[2] = grupvalue[2] * 10
+		grupvalue[3] = grupvalue[3] * 10
+		grupvalue[4] = grupvalue[4] * 10
+	end
+	!!--------0.8.0.1---school social group adjustment
+
+
 	!!--------0.8.1--- Music variable names changed
+	if ml_update_1 = 0:
+		ml_guitar['hasguitar'] = ml_guitar
+		ml_guitar['carried'] = ml_guitarWithMe
+		ml_performance['performed_minutes'] = ml_performed_minutes
+		ml_performance['max_perform_minutes'] = ml_max_perform_minutes
+		ml_guitar['chordbook'] = ml_chordbook
+
+		ml_guitarlesson['lessoncount'] = ml_lessoncount
+		ml_guitarlesson['lessonday'] = ml_lessonday
+		$ml_guitarlesson['lessonday'] = $ml_lessonday
+		ml_guitarlesson['lessonhour'] = 15
+		ml_guitarlesson['nextlesson'] = daystart + (ml_guitarlesson['lessonday'] + 7 - week)
+		ml_guitarlesson['advertisement'] = ml_guitarlessonadv
+		ml_guitarlesson['enquired'] = ml_enquired
+
+		if age < 18: 
+			ml_guitarlesson['lessoncost'] = 300
+		else
+			ml_guitarlesson['lessoncost'] = 500
+		end
 
-	ml_update_1 = 1
-end
+		killvar 'ml_guitarWithMe'
+		killvar 'ml_performed_minutes'
+		killvar 'ml_max_perform_minutes'
+		killvar 'ml_guitarlessonadv'
+		killvar 'ml_enquired'
+		killvar 'ml_lessonday'
+		killvar '$ml_lessonday'
+		killvar 'ml_lessoncost'
+		!!--------0.8.1--- Music variable names changed
+
+		ml_update_1 = 1
+	end
 
-!! changed $metkaM to $locM_arg and $metka to $loc_arg in the code - needed for correction saves saved prior to version 0.8.1
-if arrsize('$metkaM') > 0 or arrsize('$metka') > 0:
-	$locM_arg = $metkaM
-	$loc_arg = $metka
-	killvar '$metkaM'
-	killvar '$metka'
-end
-!!---------------------------------------------------------------
+	!! changed $metkaM to $locM_arg and $metka to $loc_arg in the code - needed for correction saves saved prior to version 0.8.1
+	if arrsize('$metkaM') > 0 or arrsize('$metka') > 0:
+		$locM_arg = $metkaM
+		$loc_arg = $metka
+		killvar '$metkaM'
+		killvar '$metka'
+	end
+	!!---------------------------------------------------------------
 
-!! fixes the variable for Christina getting outcasted, so she will show up in the journal correctly
+	!! fixes the variable for Christina getting outcasted, so she will show up in the journal correctly
 
-if zverSlutQW = 2:
-	npc_grupTipe['A18'] = 5
-end
+	if zverSlutQW = 2:
+		npc_grupTipe['A18'] = 5
+	end
 
-!!---------------------------------------------------------------
+	!!---------------------------------------------------------------
 
-!!model age addition
+	!!model age addition
 
-if model['age'] = 0 and model > 0:
-	model['status'] = 1
-	if age >= 18:
-		model['age'] = age
-	else
-		model['age'] = 18
+	if model['age'] = 0 and model > 0:
+		model['status'] = 1
+		if age >= 18:
+			model['age'] = age
+		else
+			model['age'] = 18
+		end
+		model = 0
 	end
-	model = 0
-end
 
-!! Fixing Katja and Natasha relationship
-if npc_sex['A14'] > 1: npc_sex['A14'] = 1
-if npc_sex['A16'] > 1: npc_sex['A16'] = 1
+	!! Fixing Katja and Natasha relationship
+	if npc_sex['A14'] > 1: npc_sex['A14'] = 1
+	if npc_sex['A16'] > 1: npc_sex['A16'] = 1
 
-!! University related vars update
-if student >= 0:
-	gs 'uniutil', 'transfer_legacy_vars'
-end
+	!! University related vars update
+	if student >= 0:
+		gs 'uniutil', 'transfer_legacy_vars'
+	end
 
-!!---------------------------------------------------------------
+	!!---------------------------------------------------------------
 
-!! Lariska story variables migrated to array
-if KotovZverHelp > 0:    LariskaQW['VitekHelp'] = KotovZverHelp & killvar 'KotovZverHelp'
-if IvanZverHelp > 0:     LariskaQW['IvanHelp'] = IvanZverHelp & killvar 'IvanZverHelp'
-if FyodorZverHelp > 0:   LariskaQW['FedorHelp'] = FyodorZverHelp & killvar 'FyodorZverHelp'
-if lariskaHelp > 0:      LariskaQW['LariskaHelp'] = lariskaHelp & killvar 'lariskaHelp'
-if lariskaHelp_end > 0:  LariskaQw['LariskaHelpEnd'] = lariskaHelp_end & killvar 'lariskaHelp_end'
-!!---------------------------------------------------------------
+	!! Lariska story variables migrated to array
+	if KotovZverHelp > 0:    LariskaQW['VitekHelp'] = KotovZverHelp & killvar 'KotovZverHelp'
+	if IvanZverHelp > 0:     LariskaQW['IvanHelp'] = IvanZverHelp & killvar 'IvanZverHelp'
+	if FyodorZverHelp > 0:   LariskaQW['FedorHelp'] = FyodorZverHelp & killvar 'FyodorZverHelp'
+	if lariskaHelp > 0:      LariskaQW['LariskaHelp'] = lariskaHelp & killvar 'lariskaHelp'
+	if lariskaHelp_end > 0:  LariskaQw['LariskaHelpEnd'] = lariskaHelp_end & killvar 'lariskaHelp_end'
+	!!---------------------------------------------------------------
 
-!! Lariska variables removed, no longer needed - 2020/11/30
-if beInLariskaHome = 1:
-	LariskaHomeIn = 2
-	killvar 'beInLariskaHome'
-end
-if doorlocked > 0: killvar 'doorlocked'
-if doorpeek > 0: killvar 'doorpeek'
-if lariskaBDSM > 0: killvar 'lariskaBDSM'
-!!---------------------------------------------------------------
-
-
-!! Shave updater
-if shave_update ! 1:
-	if pubestyle = 1:
-		shave_length = 2
-		shave_trigger = 4
-	elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
-		shave_length = 16
-		shave_trigger = 21
-	elseif pubestyle = 10:
-		shave_length = 26
-		shave_trigger = 31
-	elseif pubestyle = 11:
-		shave_length = 2
-		shave_trigger = 10
+	!! Lariska variables removed, no longer needed - 2020/11/30
+	if beInLariskaHome = 1:
+		LariskaHomeIn = 2
+		killvar 'beInLariskaHome'
+	end
+	if doorlocked > 0: killvar 'doorlocked'
+	if doorpeek > 0: killvar 'doorpeek'
+	if lariskaBDSM > 0: killvar 'lariskaBDSM'
+	!!---------------------------------------------------------------
+
+
+	!! Shave updater
+	if shave_update ! 1:
+		if pubestyle = 1:
+			shave_length = 2
+			shave_trigger = 4
+		elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
+			shave_length = 16
+			shave_trigger = 21
+		elseif pubestyle = 10:
+			shave_length = 26
+			shave_trigger = 31
+		elseif pubestyle = 11:
+			shave_length = 2
+			shave_trigger = 10
+		end
+		shave_update = 1
+	end
+
+	!! 0.8.2 clothing package for old saves ---------------------------------------
+
+	if ARRSIZE('cheapH') > 0 or ARRSIZE('averageH') > 0 or ARRSIZE('expensiveH') > 0 or ARRSIZE('formalH') > 0 or ARRSIZE('officeH') > 0 or ARRSIZE('schoolH') > 0 or ARRSIZE('exerciseH') > 0 or ARRSIZE('uniformH') > 0 or ARRSIZE('exhibitH') > 0 or ARRSIZE('alternativeH') > 0 or ARRSIZE('fetishH') > 0 or ARRSIZE('burlesqueH') > 0:
+
+
+		$batch_sell = {
+			poshvalldrop += 1
+			dynamic 'RESULT = <<$ARGS[0]>>H[<<ARGS[1]>>]'
+			if RESULT > 100:
+				dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
+				dynamic '<<$ARGS[0]>>S[<<ARGS[1]>>] = 0'
+				money += 750
+				selltot += 750
+			elseif RESULT > 45:
+				dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
+				dynamic '<<$ARGS[0]>>S[<<ARGS[1]>>] = 0'
+				money += 500
+				selltot += 500
+			elseif RESULT > 30:
+				dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
+				dynamic '<<$ARGS[0]>>S[<<ARGS[1]>>] = 0'
+				money += 300
+				selltot += 300
+			elseif RESULT > 0:
+				dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
+				dynamic '<<$ARGS[0]>>S[<<ARGS[1]>>] = 0'
+				money += 100
+				selltot += 100
+			else
+				dynamic '<<$ARGS[0]>>[<<ARGS[1]>>] = 0'
+				dynamic '<<$ARGS[0]>>S[<<ARGS[1]>>] = 0'
+			end
+			dynamic '<<$ARGS[0]>>H[<<ARGS[1]>>] = 0'
+		}
+
+
+		poshvalldrop = 0
+		selltot = 0
+
+		i = 1
+			:cheapmet
+			if cheap[i] = 1 and cheapH[i] > 0:dynamic($batch_sell, 'cheap', i)
+			i += 1
+			if i <= 419:jump 'cheapmet'
+
+			i = 1
+			:averagemet
+				if average[i] = 1 and averageH[i] > 0:dynamic($batch_sell, 'average', i)
+				i += 1
+			if i <= 541:jump 'averagemet'
+
+			i = 1
+			:expensivemet
+				if expensive[i] = 1 and expensiveH[i] > 0:dynamic($batch_sell, 'expensive', i)
+				i += 1
+			if i <= 442:jump 'expensivemet'
+
+			i = 1
+			:formalmet
+				if formal[i] = 1 and formalH[i] > 0:dynamic($batch_sell, 'formal', i)
+				i += 1
+			if i <= 185:jump 'formalmet'
+
+			i = 1
+			:officemet
+				if office[i] = 1 and officeH[i] > 0:dynamic($batch_sell, 'office', i)
+				i += 1
+			if i <= 140:jump 'officemet'
+
+			i = 1
+			:schoolmet
+				if school[i] = 1 and schoolH[i] > 0:dynamic($batch_sell, 'school', i)
+				i += 1
+			if i <= 80:jump 'schoolmet'
+
+			i = 1
+			:exercisemet
+				if exercise[i] = 1 and exerciseH[i] > 0:dynamic($batch_sell, 'exercise', i)
+				i += 1
+			if i <= 260:jump 'exercisemet'
+
+			i = 1
+			:fetishmet
+				if fetish[i] = 1 and fetishH[i] > 0:dynamic($batch_sell, 'fetish', i)
+				i += 1
+			if i <= 240:jump 'fetishmet'
+
+			i = 1
+			:burlesquemet
+				if burlesque[i] = 1 and burlesqueH[i] > 0:dynamic($batch_sell, 'burlesque', i)
+				i += 1
+			if i <= 22:jump 'burlesquemet'
+
+			i = 1
+			:exhibitmet
+				if exhibit[i] = 1 and exhibitH[i] > 0:dynamic($batch_sell, 'exhibit', i)
+				i += 1
+			if i <= 125:jump 'exhibitmet'
+
+			i = 1
+			:uniformmet
+				if uniform[i] = 1 and uniformH[i] > 0:dynamic($batch_sell, 'uniform', i)
+				i += 1
+			if i <= 60:jump 'uniformmet'
+
+			i = 1
+			:swimwearmet
+				if swimwear[i] = 1 and swimwearH[i] > 0:dynamic($batch_sell, 'swimwear', i)
+				i += 1
+			if i <= 213:jump 'swimwearmet'
+
+			i = 1
+			:beachmet
+				if beach[i] = 1 and beachH[i] > 0:dynamic($batch_sell, 'beach', i)
+				i += 1
+			if i <= 103:jump 'beachmet'
+
+			i = 1
+			:alternativemet
+				if alternative[i] = 1 and alternativeH[i] > 0:dynamic($batch_sell, 'alternativer', i)
+				i += 1
+			if i <= 129:jump 'alternativemet'
+
+		killvar 'batch_sell'
+
+		killvar 'alternativeH' & killvar 'alternativeS' & killvar 'alternative'
+		killvar 'averageH' & killvar 'averageS' & killvar 'average'
+		killvar 'burlesqueH' & killvar 'burlesqueS' & killvar 'burlesque'
+		killvar 'cheapH' & killvar 'cheapS' & killvar 'cheap'
+		killvar 'exerciseH' & killvar 'exerciseS'
+		killvar 'exhibitH' & killvar 'exhibitS'
+		killvar 'expensiveH' & killvar 'expensiveS' & killvar 'expensive'
+		killvar 'fetishH' & killvar 'fetishS'
+		killvar 'formalH' & killvar 'formalS' & killvar 'formal'
+		killvar 'officeH' & killvar 'officeS' & killvar 'office'
+		killvar 'schoolH' & killvar 'schoolS' & killvar 'school'
+		killvar 'uniformH' & killvar 'uniformS' & killvar 'uniform'
+		killvar 'beachS' & killvar 'beachH' & killvar 'beachB'
+		killvar 'swimwearS' & killvar 'swimwearH' & killvar 'swimwearB'
+		killvar 'coatS' & killvar 'coatH'
+
+		gm_outfits[50] = 1
+		gm_outfits_h[50] = 100
+		gm_outfits_b[50] = pcs_hips
+		gs 'clothing', 'wear', 'gm_outfits', 50
 	end
-	shave_update = 1
 end
 
 --- saveupdater ---------------------------------

+ 10 - 10
locations/sergeihunter.qsrc

@@ -53,7 +53,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 			'You have a mutual crush on each other.'
 		else
 			if huntersSergeiLove = 1:'You two love each other.' else 'You have an unrequited love for him.'
-		end if
+		end
 		gs 'stat'
 
 		act 'Chat (0:30)':
@@ -121,7 +121,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 
 										act'Continue':gt $loc, $loc_arg
 									end
-								end if
+								end
 							end
 							act 'Move away':
 								*clr & cla
@@ -134,7 +134,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 								act'Leave':gt $loc, $loc_arg
 							end
 						end
-					end if
+					end
 					act'Leave':gt $loc, $loc_arg
 				end
 			else
@@ -165,7 +165,7 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 
 						act 'Go':gt 'hunterLoveSex','Sergei'
 					end
-				end if
+				end
 				if rand(0,6) = 0:
 					act 'Break up with Sergei':
 						*clr & cla
@@ -178,11 +178,11 @@ if huntersSergeiLove = 0 or (huntersSergeiQw >= 10 and huntersSergeiQw <= 50):
 
 						act 'Leave':gt $loc, $loc_arg
 					end
-				end if
-			end if
-		end if
+				end
+			end
+		end
 		act'Depart':gt $loc, $loc_arg
-	end if
+	end
 else
 	if huntersSergeiQw < 10:
 		*clr & cla
@@ -210,8 +210,8 @@ else
 		gs 'stat'
 
 		act 'Leave':gt $loc, $loc_arg
-	end if
-end if
+	end
+end
 
 --- sergeihunter ---------------------------------
 

+ 2 - 2
locations/sexshop.qsrc

@@ -729,7 +729,7 @@ if $ARGS[0] = 'panties':
 	i = 1
 
 	:loopsexshop_panties
-		if sexshop_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''panties2''"><img src="images/pc/panties/sexshop/<<i>>.jpg"	height="150" /></a> '
+		if sexshop_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''panties2''"><img src="images/pc/panties/sexshop/<<i>>.jpg"	height="250" /></a> '
 		i += 1
 	if i <= 43:jump 'loopsexshop_panties'
 end
@@ -759,7 +759,7 @@ if $ARGS[0] = 'bras':
 	i = 1
 
 	:loopsexshop_bras
-		if sexshop_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''bras2''"><img src="images/pc/bras/sexshop/<<i>>.jpg"	height="150" /></a> '
+		if sexshop_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sexshop'', ''bras2''"><img src="images/pc/bras/sexshop/<<i>>.jpg"	height="250" /></a> '
 		i += 1
 	if i <= 27:jump 'loopsexshop_bras'
 end

+ 3 - 3
locations/shop.qsrc

@@ -389,8 +389,8 @@ if $shoplocation = 'clothing':
 						cla
 						money -= 1000
 						swimwear[4] = 1
-						swimwearH[4] = 60
-						swimwearB[4] = pcs_hips
+						swimwear_h[4] = 60
+						swimwear_b[4] = pcs_hips
 						gt 'shop', '<font color="green">You bought <b>swimwear 4</b>.</font>'
 					end
 				end
@@ -413,7 +413,7 @@ if $shoplocation = 'clothing':
 						cla
 						money -= 1400
 						coat[1] = 1
-						coatH[1] = 60
+						coat_h[1] = 60
 						gt 'shop', '<font color="green">You bought <b>coat 1</b>.</font>'
 					end
 				end

+ 2 - 2
locations/shop_fashionista.qsrc

@@ -315,7 +315,7 @@ if $ARGS[0] = 'panties':
 	i = 1
 
 	:loopfashionista_panties
-		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
+		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''panties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 79:jump 'loopfashionista_panties'
 end
@@ -348,7 +348,7 @@ if $ARGS[0] = 'bras':
 	i = 1
 
 	:loopfashionista_bras
-		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
+		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_fashionista'', ''bras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 42:jump 'loopfashionista_bras'
 end

+ 2 - 2
locations/shop_pussycats.qsrc

@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'panties':
 	i = 1
 
 	:loopkats_panties
-		if kats_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''panties2''"><img src="images/pc/panties/kats/<<i>>.jpg" 	height="150" /></a> '
+		if kats_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''panties2''"><img src="images/pc/panties/kats/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 72:jump 'loopkats_panties'
 end
@@ -1226,7 +1226,7 @@ if $ARGS[0] = 'purses':
 	i = 1
 
 	:loopcats_purses
-		if cats_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''purses2''"><img src="images/pc/items/cats/purses/<<i>>.jpg" 	height="150" /></a> '
+		if cats_purses[i] = 0:*p '<a href="exec: i = <<i>> & gt ''shop_pussycats'', ''purses2''"><img src="images/pc/items/cats/purses/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 20:jump 'loopcats_purses'
 end

+ 17 - 17
locations/sister.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'pav_commcenter':
 	if npc_rel['A33'] < 20:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 		'"What do you want? Fuck off!" Anya and her friends laugh and point at you until you leave them alone.'
-		act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+		act 'Move away': gt $loc, $loc_arg
 	! Showing up after party invite
 	elseif week = 5 and (daystart / 7) mod 2 = 0 and sisterQW['party'] = 1 and daystart - sisterQW['partyday'] < 5:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma2.jpg"></center>'
@@ -58,7 +58,7 @@ if $ARGS[0] = 'pav_commcenter':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 				'You meet Anya''s friends, who are all her former classmates. There''s the small and nimble Lusya, the ditzy Ira, a tall athletic guy whom everyone calls "Rex" and a lanky, red-haired guy named Roma. After the introductions, you sit down with them, drinking beer and chatting with Anya and her friends.'
 			end
-			act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+			act 'Move away': gt $loc, $loc_arg
 		end
 		gs 'willpower', 'drink', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
@@ -76,18 +76,18 @@ if $ARGS[0] = 'partyanswer':
 			if mesec > 0:
 				'"Sorry Anya, I''m not in the mood today. You go without me."'
 				'"What, are you on the rag today? You should have told me! Alright, go home and get some rest."'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			elseif pcs_mood < 25:
 				'"Sorry Anya, I''m not in the mood today. You go without me."'
 				'"You do look a little pale sis. Go home and get some rest."'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			elseif alko >= 3:
 				'"<<$pcs_nickname>>, how the hell did you get so drunk already? I was going to invite you to a party, but you look like you have already been to one. Go home and sleep it off!"'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			else
 				'Her smile fades and she seems confused for a moment before a look of disgust appears on her blushing face. "My God, why are you walking around with cum all over your face!? You''ll get yourself a reputation! Go home and wash that off, quickly!" She then shoos you away as her friends stare at you.'
 				'You feel a little ashamed that you have embarrassed yourself and your sister by walking around like this in public.'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 		else
 			act 'Decline':
@@ -98,7 +98,7 @@ if $ARGS[0] = 'partyanswer':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_sister_1.jpg"></center>'
 				'"I''d love to, but I have a lot of homework to do. I''m sorry."'
 				'"Don''t worry. Maybe you can come next time?"'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 			act 'Go to the party': if sisterQW['partycount'] > 0: gt 'sbReksHome', 'party' else gt 'sister_party', 'sisboyQW_party'
 		end
@@ -114,22 +114,22 @@ if $ARGS[0] = 'partyanswer':
 				'"I don''t know what came over me. I wasn''t myself. Please, forgive me if you can."'
 				'"Listen, everything''s OK, but let''s just be friends and forget being together. Okay?"'
 				'"Okay..."'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			else
 				'"Shit <<$pcs_nickname>>, is that cum?" He leans in to get a better look then recoils in disgust.'
 				'Your hand goes up to the dried cum on your face that you forgot to wipe off. "I don''t know what came over me, I wasn''t myself. Please, forgive me if you can."'
 				'"Whatever slut. Just get away from me." He moves away from you and you see everyone giving you either a disgusted or angry look.'
 				'"Okay..." Not knowing what else to say, you walk away disheartened.'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 		elseif mesec > 0 or pcs_mood < 50:
 			'"Sorry sweetie, but I''m not feeling too good today. You go without me."'
 			'"Babe, I don''t want to leave you alone, but I need to go with the guys. Take care and do not be sad."'
 			'Rex gives you a gentle kiss on the cheek and leaves.'
-			act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+			act 'Move away': gt $loc, $loc_arg
 		elseif alko >= 3:
 			'"<<$pcs_nickname>>, are you drunk? I wanted to invite you to the party, but you look like you just left one. Go home and sleep it off."'
-			act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+			act 'Move away': gt $loc, $loc_arg
 		else
 			'"Babe, let''s go to my place. I''m throwing another one of my parties."'
 			act 'Decline':
@@ -139,7 +139,7 @@ if $ARGS[0] = 'partyanswer':
 				gs 'stat'
 				'"Sorry Rex, but I have a lot of homework. I''d love to come, but I don''t want to fail my exams."'
 				'"Well, go on then. But you''re definitely coming next time, okay?"'
-				act 'Move away': SiSgdk = 0 & gt $loc, $loc_arg
+				act 'Move away': gt $loc, $loc_arg
 			end
 			act 'Accept': gt 'sbReksHome', 'party'
 		end
@@ -430,7 +430,7 @@ if $ARGS[0] = 'scene1':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_3.jpg"></center>'
 				'You turn down the invitation.'
 				'"Sorry Roma, I would love to, but I can''t get behind at school. I have homework to do and books to read, you know what it''s like."'
-				act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+				act 'Finish': gt 'sister', 'pav_commcenter'
 			end
 			if razradbeg > 0:
 				act 'No (training)':
@@ -439,7 +439,7 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_4.jpg"></center>'
 					'You turn down the invitation.'
 					'"I would love to, but I have a competition to prepare for. I have to train."'
-					act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+					act 'Finish': gt 'sister', 'pav_commcenter'
 				end
 			end
 			if volleysostav = 1 or volleysostav = 2:
@@ -449,7 +449,7 @@ if $ARGS[0] = 'scene1':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/sisboyqwparty_5.jpg"></center>'
 					'You turn down the invitation.'
 					'"Sorry, but I can''t. The coach doesn''t allow me to stay out late and drinking is also prohibited."'
-					act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+					act 'Finish': gt 'sister', 'pav_commcenter'
 				end
 			end
 			act 'Yes':
@@ -459,7 +459,7 @@ if $ARGS[0] = 'scene1':
 				'You agree to go to the party.'
 				'"Awesome <<$pcs_nickname>>, it''ll be fun. We will meet here. Just don''t forget to be here before 18:00, otherwise we will leave without you."'
 				'Anya gives Roma a dirty look, but he just shrugs it off.'
-				act 'Finish':SiSgdk = 0 & gt 'sister', 'pav_commcenter'
+				act 'Finish': gt 'sister', 'pav_commcenter'
 			end
 		end
 	end
@@ -471,7 +471,7 @@ if $ARGS[0] = 'scene2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/community/anyaroma1.jpg"></center>'
 	'The bottles of beer are quickly drained and everyone seems a little tipsy at this point. Soon everyone gets up and staggers inside. As they go, they all shout goodbye at you, so you wave to them and head on your way.'
-	act 'Leave':SiSonWork = 0 & SiSgdk = 0 & gt 'pav_commcenter'
+	act 'Leave': gt 'pav_commcenter'
 end
 
 --- sister ---------------------------------

+ 131 - 1
locations/sister_chat.qsrc

@@ -761,7 +761,7 @@ if $ARGS[0] = 'sister_chat':
 					act 'Keep talking': gt 'sister_chat', 'sister_chat'
 				end
 			
-				if sisterLesb => 7 and $loc = 'bedrPar':
+				if sisterLesb >= 7 and $loc = 'bedrPar':
 					act 'Tell her you want to have sex':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sister_chat.jpg"></center>'
@@ -1066,6 +1066,69 @@ if $ARGS[0] = 'sister_chat':
 						end
 					end
 				end
+				!! talk about the twin sex request
+				if npc_rel['A33'] >= 80 and sisterknowslut > 0 and TwinQW >= 1 and TwinQW <= 5:
+					!! Note: the original code had "and sisterdialog < 2" but that var seems depricated
+					if TwinQW < 5:
+						if tmp_TwinQW_AskedToday < daystart:
+							tmp_TwinQW_AskedToday = daystart
+							act 'Talk about the twin request':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
+								if TwinQW < 3:
+									if TwinQW = 1:
+										'"Sis, I have a confession to make.... I have been selling my body in the Pavlovsk hotel." You wince inwardly as the admission leaves your mouth, worried what your sister will think.'
+										'Your sister''s face turns to shock and she shakes her head. "<<$pcs_nickname>>, really? Why would you do something like that? If people find out you''ll be ruined! I know I sleep around, but there''s a big difference between being a slut and being a whore."'
+										'You roll your eyes at her. "Please. That''s just <<$npc_nickname[''A29'']>> talking. If you''re going to sleep around, you might as well get paid for it while you''re still hot! Besides, nobody will find out, there is a guy there who takes care of everything. And look at all the money I have been making!"'
+										'You open your wallet and show your sister all the cash you have on you, <<money>> <b>₽</b>.'
+									else
+										'You bring up your prostitution job again to your sister and show off your wallet.'
+									end
+									if money < 5000:
+										'Your sister furrows her brow, looking at your meager amount of money. "Wait, how many times have you prostituted yourself so far?"'
+										'You think for a second before responding. "I don''t know. About <<pavproscount>> times?"'
+										'You sister gives you a concerned look. "<<pavproscount>> times and this is all you have to show for it?"'
+										'Your sister approaches you and gives you a hug, squeezing you tightly. "I really hope you can stop what you are doing, it is not worth it <<$pcs_nickname>>! Not for this pittance! Can''t you see that this asshole is taking advantage of you?"'
+										'<br>'
+										'You lower your head in shame and walk away from your sibling. You didn''t even get the chance to bring up the twin request. It looks like you''ll have to convince your sister that the work you do is worth the risks.'
+										TwinQW = 2
+									else
+										'"Ok, I must admit, that looks like a lot. Do you know how many hours I''d have to work in the supermarket to earn this kind of money? Still, it seems very risky to me." Your sister says.' 
+										'She''s still trying to sound responsible, but you can practically see her salivating at the sight of cold, hard, cash.'
+										'"How would you like to earn some of this and spend some time with your favorite sister at the same time?" You ask, raising your eyebrows playfully while waving the money back and forth.'
+										'"What do you mean, <<$pcs_nickname>>?" Anya asks, finally dropping any act of disapproval.'
+										'You explain the twins request to your sister.'
+										if sisboyparty = 0:
+											'"Sorry, <<$pcs_nickname>>. You know I love you, but my boyfriend would never allow this. And I could never do something like this behind his back. Anyway, thanks for confiding in me. Please stay safe and tell me if you get in over your head. Can''t have my little sis in danger." Anya gives you a little smile and a warm hug.'
+											'You''re happy that Anya has a boyfriend she loves, but right now you would give anything to be rid of him.'
+											TwinQW = 3
+										else
+											'"Ha! That actually sounds like a lot of fun." Your sister seems to consider everything for a moment before continuing. "Ok, I''ll do it! When do we leave?"'
+											'"Well, first I have to make myself look more like you so we''ll pass as twins. I''ll come and get you when I am ready."'
+											TwinQW = 5
+										end
+									end
+								elseif TwinQW = 3:
+									if sisboyparty = 0:
+										'You bring up the twins request again but Anya still refuses, claiming Roma would be heartbroken if he found out.'
+									else
+										'You bring up the twins request again. Since her relationship with Roma is a little different now, she seems a lot more receptive.'
+										'"Ha, that actually sounds like a lot of fun. Ok, I''ll do it! When do we leave?"'
+										'"Well, first I have to make myself look more like you so we''ll pass as twins. I''ll come and get you when I am ready."'
+										TwinQW = 5
+									end
+								end
+								act 'Finish': gt 'sister_chat', 'sister_chat'
+								if TwinQW = 5: killvar 'tmp_TwinQW_AskedToday' & delact 'Talk about the twin request'
+							end
+						end
+					end
+					if TwinQW = 5:
+						act 'Compare yourself with your sister':
+							gt 'sister_chat', 'twincompare'
+						end
+					end
+				end
 			end
 		end
 	else
@@ -1075,6 +1138,73 @@ if $ARGS[0] = 'sister_chat':
 	end
 end
 
+if $ARGS[0] = 'twincompare':
+	!!! <summary>compare yourself with your sister</summary>
+	!!! <continues>
+	!!! gt 'HotelHole','Twins' if you are similar enough and Pavlin is at the hotel
+	!!! otherwise: gt 'sister_chat', 'sister_chat'
+	!!! </continues>
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
+	'Your sister has straight blonde hair. Her hair reaches her shoulders with several strands going just beyond.'
+	'She has good looks. Men and women check her out when they think she isn''t looking.'
+	'<br>'
+	'<<$hair>>'
+	'<<$pcs_apprnc>>'
+	'<<$pcs_makeup>>'
+	'<br>'
+	tmp_twinsiscompare = 0
+	if pcs_hairlng > 160 and pcs_hairlng <= 260:
+		'<font color=#008000>Your hair is the correct length</font>'
+		tmp_twinsiscompare +=1
+	elseif pcs_hairlng <= 160:
+		'<font color=#FF0000>Your hair is to short.</font>'
+	else
+		'<font color=#FF0000>Your hair is to long.</font>'
+	end
+	if pcs_hairbsh = 0:
+		'<font color=#FF0000>You need to brush your hair.</font>'
+	else
+		tmp_twinsiscompare +=1
+	end
+	if pcs_haircol = 3:
+		'<font color=#008000>Your hair is the correct color.</font>'
+		tmp_twinsiscompare +=1
+	else
+		'<font color=#FF0000>Your hair is not the correct color.</font>'
+	end
+	if curly = 0:
+		'<font color=#008000>Your hair is straight, which is a match for your sister''s.</font>'
+		tmp_twinsiscompare +=1
+	else
+		'<font color=#FF0000>Your hair is too curly</font>'
+	end
+	if pcs_apprnc >= 60 and pcs_apprnc <= 120:
+		'<font color=#008000>Your looks matches your sister''s.</font>'
+		tmp_twinsiscompare +=1
+	else
+		'<font color=#FF0000>Your looks are too different from your sister''s. You are at <<pcs_apprnc>>. You need a score between 60 and 120 </font>'
+	end
+	if pcs_makeup = 4:
+		'<font color=#008000>Your make up hides the last differences between you and your sister.</font>'
+		tmp_twinsiscompare +=1
+	else
+		'<font color=#FF0000>You need some more make up to make you look more like your sister.</font>'
+	end
+	act 'Finish': gt 'sister_chat', 'sister_chat'
+	if tmp_twinsiscompare >= 6:
+		act 'Go to the hotel and have some twin fun':
+			if hour >= 12 and hour < 20:
+				gt 'HotelHole','Twins'
+			else
+				delact 'Go to the hotel and have some twin fun'
+				'Pavlin is usually in the hotel lobby between 12:00 and 20:00, No reason to go now.'
+			end
+		end
+	end
+	killvar 'tmp_twinsiscompare'
+end
+
 if $ARGS[0] = 'pargone':
 	*clr & cla
 	gs 'stat'

+ 2 - 2
locations/sister_party.qsrc

@@ -438,10 +438,10 @@ if $ARGS[0] = 'anya_kit':
 					if hour < 22:
 						minut += ((21 - hour) * 60) + (60 - minut)
 						gs 'arousal', 'end'
-						act 'Leave': SiSonWork = 0 & SiSgdk = 0 & gt 'bedrPar'
+						act 'Leave': gt 'bedrPar'
 					else
 						gs 'arousal', 'end'
-						act 'Leave': SiSonWork = 0 & SiSgdk = 0 & minut += 15 & gt 'bedrPar'
+						act 'Leave': minut += 15 & gt 'bedrPar'
 					end
 				end
 			end

+ 13 - 13
locations/sitrPar.qsrc

@@ -42,7 +42,7 @@ if $ARGS[0] = '':
 			wipo += 1000
 			gs 'food', 'l_meal'
 			gs 'stat'
-			'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table people strike up a conversation and common problems are forgotten for a while, everyone is having fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside. Your <<$npc_nickname[''A29'']>> gives you an envelope with a greeting card and 5000 <b>₽</b>. For a while you continue to watch TV, enjoying the champagne and company of your family, but after a while everyone is kind of tired and one by one they go to bed.'
+			'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table, people strike up a conversation and common problems are forgotten for a while, everyone is having fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside. Your <<$npc_nickname[''A29'']>> gives you an envelope with a greeting card and 5000 <b>₽</b>. For a while, you continue to watch TV, enjoying the champagne and company of your family, but eventually, everyone is kind of tired and one by one they go to bed.'
 
 			act 'Leave':gt $loc, $loc_arg
 		end
@@ -63,7 +63,7 @@ if $ARGS[0] = '':
 
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/food/leftovers.jpg"></center>'
-			'You have finished the leftovers remaining on the table from the holidays.'
+			'You finish the leftovers remaining on the table from the holidays.'
 
 		act 'Get up from the table':gt $loc, $loc_arg
 
@@ -72,22 +72,22 @@ if $ARGS[0] = '':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka1.jpg"></center>'
 		if kanikuli = 0 and StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 			if CloStyle2 = 4:
-				'As you walk into the living room you see your mother sweeping the floor. She looks up at and gives you a disappointed look. "What are you still doing home? Go to school, now!" With that she practically pushes you out of the apartment and closes the door. As she does she adds ones more. "Go to school."' 
+				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing home? Go to school, now!" With that, she practically pushes you out of the apartment and closes the door. As she does, she adds once more, "Go to school."' 
 				act 'Continue': gt'pod_ezd','etaj_2'
 			else
 				gs 'wardrobe', 'school_outfit'
-				'As you walk into the living room you see your mother sweeping the floor. She looks up at and gives you a disappointed look. "What are you still doing home? Why are you not wearing your unifrom? Go get changed and go to school, now!" She follows you back to your room and watches as you change into your uniform, after that she practically pushes you out of the apartment and closes the door. As she does she adds ones more. "Go to school."' 
+				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing home? Why are you not wearing your uniform? Go get changed and go to school, now!" She follows you back to your room and watches as you change into your uniform. After that, she practically pushes you out of the apartment and closes the door. As she does, she adds once more, "Go to school."' 
 				act 'Continue':  gt'pod_ezd','etaj_2'
 			end
 		else
-			'As you walk into the living room you see your mother sweeping the floor. She hasn''t noticed you, she is intent on cleaning.'
+			'As you walk into the living room, you see your mother sweeping the floor. She hasn''t noticed you, she is intent on cleaning.'
 			act 'leave': gt 'korrPar'
 		end
 		exit
 	elseif momloc = 19:
 		!! Watches TV with Vladimir
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladtv.jpg"></center>'
-		'As you walk into the living room you see your <<$npc_nickname[''A29'']>> and Vladimir sitting on the couch watching tv, while Kolka sits in the armchair watching tv.'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladTV.jpg"></center>'
+		'As you walk into the living room, you see your <<$npc_nickname[''A29'']>> and Vladimir sitting on the couch watching TV, while Kolka sits in the armchair doing the same.'
 		act 'leave':gt 'korrPar'
 		
 		act 'Join them':
@@ -98,8 +98,8 @@ if $ARGS[0] = '':
 			npc_rel['A29'] += 1
 			npc_rel['A34'] += 1
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
-			'You move over to join them and your <<$npc_nickname[''A29'']>> scoots away from Vladmir and pat the spot between her and him. You take a seat between them, Vlad barely even glances as you with a brief smile before he goes back to watching tv. Kolka never even looks up, your <<$npc_nickname[''A29'']>> pats you on the shoulder before returning her attention to the tv, apparently happy the family is spending time together.'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familyTV.jpg"></center>'
+			'You move over to join them, and your <<$npc_nickname[''A29'']>> scoots away from Vladimir and pats the spot between her and him. You take a seat between them. Vlad barely even glances at you with a brief smile before he goes back to watching TV, and Kolka never even looks up. Your <<$npc_nickname[''A29'']>> pats you on the shoulder before returning her attention to the TV, apparently happy the family is spending time together.'
 			act 'leave':gt 'korrPar'
 			
 			act 'Keep watching':gt 'sitrPar', 'TVmom'
@@ -125,8 +125,8 @@ if $ARGS[0] = 'TVmom':
 	minut += 30
 	gs 'family_schedule'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
-	'You continue to watch tv with the family, everyone seems very engrossed in the program and almost never says much. Though Kolka occasional makes a crack about what is happening, often getting shushed by Vlad or <<$npc_nickname[''A29'']>>.'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familyTV.jpg"></center>'
+	'You continue to watch TV with the family. Everyone seems very engrossed in the program and almost never says anything, though Kolka occasionally makes a crack about what is happening, often getting shushed by Vlad or <<$npc_nickname[''A29'']>>.'
 	if momloc = 19: act'Keep watching TV with your family': gt 'sitrPar', 'TVmom'
 	act 'Finish watching':gt 'sitrPar', 'TVend'
 end
@@ -134,8 +134,8 @@ end
 if $ARGS[0] = 'TVend':
 	cla & *clr
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
-	'Once the show is over Vladimir picks up the remote and turns the tv off, he gets up. Then he stretches, before he turns and walks out of the room, likely heading to bed. <<$npc_nickname[''A29'']>> gets up and says to you. "You should go to bed or at least go to your room so your brother can get his rest." She then turns to Kolka and says to him. "Don''t stay up, go to bed." With that she also leaves, after making sure you leave as well. As you walk out, you see Kolka putting his pillow and sheet on the couch.'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familyTV.jpg"></center>'
+	'Once the show is over, Vladimir picks up the remote and turns the TV off. He gets up then stretches before he turns and walks out of the room, likely heading to bed. <<$npc_nickname[''A29'']>> gets up and says to you, "You should go to bed or at least go to your room so your brother can get his rest." She then turns to Kolka and says to him, "Don''t stay up, go to bed." With that, she also leaves after making sure you leave as well. As you walk out, you see Kolka putting his pillow and sheet on the couch.'
 	act 'leave':gt 'korrPar'
 end
 

+ 37 - 46
locations/sny.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = '3':
 	end
 
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa3.jpg"></center>'
-	'The whole class went to Dimka home. He house had music playing and lots of alcohol to drink, you go up to a table with a couple of the other girls and get a glass of vodka. Soon everyone is drinking and celebrating the new year.'
+	'The whole class went to Dimka''s home. He has house music playing and lots of alcohol to drink. You go up to a table with a couple of the other girls and get a glass of vodka. Soon, everyone is drinking and celebrating the new year.'
 
 	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
@@ -50,7 +50,7 @@ if $ARGS[0] = '4':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa3.jpg"></center>'
-	'Boys and girls start to relax and break up into groups to talk. Someone poured more vodka into a glass and handed you another glass of vodka.'
+	'Boys and girls start to relax and break up into groups to talk. Someone pours more vodka into a glass and hands it to you.'
 
 	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
@@ -74,7 +74,7 @@ if $ARGS[0] = '4':
 		gs 'drugs', 'alcohol', 'vodka', 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/drunk.jpg"></center>'
-		'You down the glass of vodka'
+		'You down the glass of vodka.'
 
 		act 'Nostrovia!': minut += 5 & gt 'sny', '5'
 	end
@@ -84,7 +84,7 @@ if $ARGS[0] = '5':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa5.jpg"></center>'
-	'Albina went into the center of the room and began to dance, she is a very talented dancer and knows how to move her body. She was quickly joined by Katja and her sister Vicky. While you are watching the girls, someone hands you another glass of vodka.'
+	'Albina goes into the center of the room and begins to dance. She is a very talented dancer and knows how to move her body. She is quickly joined by Katja and her sister Vicky. While you are watching the girls, someone hands you another glass of vodka.'
 	
 	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
@@ -108,7 +108,7 @@ if $ARGS[0] = '5':
 		gs 'drugs', 'alcohol', 'vodka', 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/drunk.jpg"></center>'
-		'You drink down the shoot of vodka and feel it burn all the way down.'
+		'You drink down the shot of vodka and feel it burn all the way down.'
 
 		act 'Nostrovia!': minut += 5 & gt 'sny', '6'
 	end
@@ -118,7 +118,7 @@ if $ARGS[0] = '6':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa6.jpg"></center>'
-	'Albina and Katja are dancing face to face in the middle of the room. Suddenly Albina kisses Katja on the lips. The room erupts into howling kids encouraging them to continuing. Someone hands you another glass of vodka.'
+	'Albina and Katja are dancing face to face in the middle of the room. Suddenly, Albina kisses Katja on the lips. The room erupts into howling kids encouraging them to continuing. Someone hands you another glass of vodka.'
 
 	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
@@ -142,7 +142,7 @@ if $ARGS[0] = '6':
 		gs 'drugs', 'alcohol', 'vodka', 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/drunk.jpg"></center>'
-		'You drink down the shoot of vodka and feel it burn all the way down.'
+		'You drink down the shot of vodka and feel it burn all the way down.'
 
 		act 'Nostrovia!': minut += 5 & gt 'sny', '7'
 	end
@@ -153,7 +153,7 @@ if $ARGS[0] = '7':
 	gs 'stat'
 	if alko >= 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/vomit.jpg"></center>'
-		'You start feeling dizzy and sick to your stomach, you mutter something about throwing up and Dale helps you rush to the toilet.'
+		'You start feeling dizzy and sick to your stomach. You mutter something about throwing up, and Dimka helps you rush to the toilet.'
 
 		act 'Barf':
 			*clr & cla
@@ -168,34 +168,34 @@ if $ARGS[0] = '7':
 				gs 'cum_manage'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/vom.jpg"></center>'
-				'You wake up on the bed in Dimka''s room. Your head hurts, your whole body aches and you feel a wet spot on your panties. Turning your head you see some sort of white mucus. You poke a finger in the mucus and hold the finger to your nose, the pungent smell of sperm hits you. At this moment Dimka enters the room. Seeing your panties smeared with sperm he begins to laugh "Dammit. I thought no one else would get you before I got back, but hell, it looks like someone already fucked you."'
+				'You wake up on the bed in Dimka''s room. Your head hurts, your whole body aches and you feel a wet spot on your panties. Turning your head, you see some sort of white mucus. You poke a finger in the mucus and hold the finger to your nose. The pungent smell of sperm hits you. At this moment, Dimka enters the room. Seeing your panties smeared with sperm, he begins to laugh "Dammit. I thought no one else would get you before I got back, but hell, it looks like someone already fucked you."'
 
 				act 'Leave':gt 'pav_residential'
 			elseif NosovRevenge = 1:
 				'<center><img <<$set_imgh>> src="images/pc/body/tattoos/pubic/tatvag6.jpg"></center>'
-				'You wake up lying on a chair that is fully reclined, with difficulty you raise your head and look around at the place, you are unfamiliar with it. You feel a burning sensation in your bikini pubic area. Looking down you see your panties have been pulled down to expose your pussy. Just above it is a tattoo.'
+				'You wake up lying on a chair that is fully reclined. With difficulty, you raise your head and look around at the place. You are unfamiliar with it. You feel a burning sensation in your pubic area. Looking down, you see your panties have been pulled down to expose your pussy. Just above it is a tattoo.'
 
 				if tatvag ! 0:'It looks like your old tattoo has been covered up with a new one.'
 
 				tatvag = 6
 				pcs_pubes = 0
 				gs 'stat'
-				'Looking closer you read the word SLUT, on the letters lay tattooed girl in stockings. You finally notice the man cleaning his tattoo station up and you demand. "What the hell? Why did you tattoo me?" The man rolled his eyes "Oh God, you came in drunk and then wonder why. Here is a sketch of the tattoo and your signature on the release form." You looked at the signature, indeed it is yours.'
+				'Looking closer, you read the word SLUT. On top of the letters lies a tattooed girl in stockings. You finally notice the man cleaning his tattoo station up, and you demand, "What the hell? Why did you tattoo me?" The man rolls his eyes. "Oh God, you came in drunk and then wonder why. Here is a sketch of the tattoo and your signature on the release form." You looks at the signature. Indeed, it is yours.'
 
 				act 'Leave':gt 'pav_residential'
 			end
 		end
 	elseif alko >= 6:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tit.jpg"></center>'
-		'You are quite drunk and not thinking straight. Someone''s hand pulls you into the center of the room with the dancing boys and girls. Nosov suddenly pulls your top down, exposing your breasts to everyone in the room. You sluggish pull your top back up. Dimka takes you by the hand and drags you out of the room.'
+		'You are quite drunk and not thinking straight. Someone''s hand pulls you into the center of the room with the dancing boys and girls. Dimka suddenly pulls your top down, exposing your breasts to everyone in the room. You sluggishly pull your top back up. Dimka takes you by the hand and drags you out of the room.'
 
 		act 'Hey! Where are you dragging me?': minut += 5 & gt 'sny', '10'
 	elseif alko > 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/alb.jpg"></center>'
 		if fedorKozlovQW = 0:
-			'You are a little drunk, but having fun. When you notice, Albina sitting on the couch and kissing Ivan, while Fedor paws at her breasts. Looking around you some more you notice that Katja nowhere to be seen.'
+			'You are a little drunk but having fun when you notice Albina sitting on the couch and kissing Ivan while Fedor paws at her breasts. Looking around you some more, you notice that Katja is nowhere to be seen.'
 		else	
-			'You are a little drunk, but having fun. When you notice, Albina sitting on the couch and kissing Ivan. Looking around you some more you notice that Katja nowhere to be seen.'
+			'You are a little drunk but having fun when you notice Albina sitting on the couch and kissing Ivan. Looking around you some more, you notice that Katja is nowhere to be seen.'
 		end
 		
 		act 'Search for Katja':
@@ -205,7 +205,7 @@ if $ARGS[0] = '7':
 			KatjaSlut += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/sex/kat.jpg"></center>'
-			'You began to walk around the apartment looking for Katja, behind one of the doors you hear woman moaning and creaking of a bed. You open the door just a little to peek inside. On the edge of the bed Katja is on her knees with her head against the mattress, Slavik stands behind her and is hammering her. His cock going balls deep in her, with the slapping of flesh, barely heard over Katja''s moaning. Slavik finally growled and pumps his sperm inside of her, as he finished he leaned over her and whispered. "Katja, I''ve been in love with you for a long time, do not think I am just using you." Katja muttered something and seems completely out of it.'
+			'You begin to walk around the apartment looking for Katja. Behind one of the doors, you hear a woman moaning and the creaking of a bed. You open the door just a little to peek inside. On the edge of the bed, Katja is on her knees with her head against the mattress. Slavik stands behind her and is hammering her, his cock going balls deep in her, with the slapping of flesh barely heard over Katja''s moaning. Slavik finally growls and pumps his sperm inside of her. As he finishes, he leans over her and whispers, "Katja, I''ve been in love with you for a long time, do not think I am just using you." Katja mutters something and seems completely out of it.'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -213,7 +213,7 @@ if $ARGS[0] = '7':
 		end
 	elseif alko > 0:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/idi.jpg"></center>'
-		'You are a bit tipsy and feel fairly relaxed at the party. There''s some vodka shots lined up so you could have another drink or maybe it''s time to head home?'
+		'You are a bit tipsy and feel fairly relaxed at the party. There''s some vodka shots lined up, so you could have another drink, or maybe it''s time to head home?'
 
 		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
@@ -231,7 +231,7 @@ if $ARGS[0] = '7':
 			gs 'drugs', 'alcohol', 'vodka', 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/drunk.jpg"></center>'
-			'You down the shoot of vodka and feel its warmth in your chest.'
+			'You down the shot of vodka and feel its warmth in your chest.'
 
 			act 'Nostrovia!': minut += 5 & gt 'sny', '7'
 		end
@@ -247,17 +247,17 @@ if $ARGS[0] = '8':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa8.jpg"></center>'
-	'Back in the main room, you saw, that most continue to drink and dance. Albina, Ivan and Fedor are no where to be seen anymore. Some of the girls are getting wild in the middle of the room Christina even pulls down her pants showing off her bare ass.'
+	'Back in the main room, you see that most continue to drink and dance. Albina, Ivan and Fedor are nowhere to be seen anymore. Some of the girls are getting wild in the middle of the room. Christina even pulls down her pants, showing off her bare ass.'
 
-	act 'Search Albina':
+	act 'Search for Albina':
 		*clr & cla
 		seeAlbinaFuck = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/alb.jpg"></center>'
 		if fedorKozlovQW = 0:
-			'You began to walk around the apartment in search of Albina, behind one of the doors you hear woman moaning and a creaking bed. Peeking in the door you see Fedor and Ivan fucking Albina hard. Albina is covered in sweat, with smeared makeup on her face, muffled moans or groans it is hard to tell come from Albina. Fedor has his cock stuffed in her mouth, while Ivan is taking her from behind. Judging by the height and angle it looks like he is fucking her in the ass and just tearing it up.'
+			'You begin to walk around the apartment in search of Albina. Behind one of the doors, you hear a woman moaning and a creaking bed. Peeking in the door, you see Fedor and Ivan fucking Albina hard. Albina is covered in sweat with smeared makeup on her face and is letting out muffled moans or groans - it is hard to tell which. Fedor has his cock stuffed in her mouth, while Ivan is taking her from behind. Judging by the height and angle, it looks like he is fucking her in the ass and just tearing it up.'
 		else
-			'You began to walk around the apartment in search of Albina, behind one of the doors you hear woman moaning and a creaking bed. Peeking in the door you see Lazar and Ivan fucking Albina hard. Albina is covered in sweat, with smeared makeup on her face, muffled moans or groans it is hard to tell come from Albina. Lazar has his cock stuffed in her mouth, while Ivan is taking her from behind. Judging by the height and angle it looks like he is fucking her in the ass and just tearing it up.'
+			'You begin to walk around the apartment in search of Albina. Behind one of the doors, you hear a woman moaning and a creaking bed. Peeking in the door, you see Lazar and Ivan fucking Albina hard. Albina is covered in sweat with smeared makeup on her face and is letting out muffled moans or groans - it is hard to tell which. Lazar has his cock stuffed in her mouth, while Ivan is taking her from behind. Judging by the height and angle, it looks like he is fucking her in the ass and just tearing it up.'
 		end
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
@@ -270,7 +270,7 @@ if $ARGS[0] = '9':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/tusa9.jpg"></center>'
-	'Virtually everyone is passed on the floor, some in varies stats of undress. Dimka comes over to you "And you''re still on your feet? Good for you, the others have already left or passed out, let''s go, I need you to help me with something."'
+	'Virtually everyone is passed out on the floor, some in various states of undress. Dimka comes over to you. "And you''re still on your feet? Good for you, the others have already left or passed out, let''s go, I need you to help me with something."'
 
 	gs 'willpower', 'misc', 'resist'
 	if will_cost <= pcs_willpwr:
@@ -279,7 +279,7 @@ if $ARGS[0] = '9':
 			minut += 15
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			'You tell Dimka, you had to leave.'
+			'You tell Dimka, you have to leave.'
 
 			act 'Leave':gt 'pav_residential'
 		end
@@ -294,24 +294,15 @@ if $ARGS[0] = '10':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/sex/kiss/kiss1.jpg"></center>'
-	'He takes you into another room, one the two of you are alone. Dimka began to paw at your chest and gave you a long slobbery kiss.'
+	'He takes you into another room. Once the two of you are alone, Dimka begins to paw at your chest and gives you a long, slobbery kiss.'
 
+	act 'Kiss him':gt 'sny', 'kiss'
 	if fedorKozlovQW >= 10:
-		act 'Kiss him':gt 'sny', 'kiss'
 		act 'Push him away':gt 'FedorMisc', 'Dimka Party'
 	elseif fedorKozlovQW = -15:
-		act 'Kiss him':gt 'sny', 'kiss'
 		act 'Push him away':gt'FedorMisc', 'Dimka Party 2'		
-	elseif NosovRevenge = 1:
-		act 'Kiss him':gt 'sny', 'kiss'
+	elseif NosovRevenge = 1 or dimaFilm ! 1:
 		act 'Push him away':gs 'sny', 'no'
-	else
-		if dimaFilm = 1:
-			act 'Kiss him':gt 'sny', 'kiss'
-		else
-			act 'Kiss him':gt 'sny', 'kiss'
-			act 'Push him away':gs 'sny', 'no'
-		end
 	end
 end
 
@@ -319,7 +310,7 @@ if $ARGS[0] = 'kiss':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/sex/pett.jpg"></center>'
-	'You kiss Dimka and he slowly undresses you down to your underwear. He gently wraps his hands around you, he sits down on the arm of the couch and pulls you down till you are leaning back against him. His hand reaches around and starts rubbing your clit with his fingers.'
+	'You kiss Dimka, and he slowly undresses you down to your underwear. He gently wraps his hands around you, then sits down on the arm of the couch and pulls you down till you are leaning back against him. His hand reaches around, and he starts rubbing your clit with his fingers.'
 	gs 'arousal', 'kiss', 5
 	gs 'arousal', 'foreplay', 5
 	minut -= 5
@@ -330,7 +321,7 @@ if $ARGS[0] = 'kiss':
 		gs 'boyStat', 'A1'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/sex/pett2.jpg"></center>'
-		'After he rubs your clits, you start moaning. You feel your pussy getting wet and he can feel your wetness through your panties after several minutes of this. He gets up and pulls you around to the front of the couch, he turns you to face the couch with your back to him. He pulls down your panties and pushes you down on your knees and bends you over till your body is resting on the couch. He slips his <<dick>>cm <<$dick_girth>> cock into your wet pussy and starts fucking you slow and gentle.'
+		'After he rubs your clit, you start moaning. You feel your pussy getting wet, and he can feel your wetness through your panties after several minutes of this. He gets up and pulls you around to the front of the couch, turning you to face the couch with your back to him. He pulls down your panties and pushes you down on your knees, bending you over till your body is resting on the couch. He slips his <<dick>>cm <<$dick_girth>> cock into your wet pussy and starts fucking you slow and gentle.'
 		gs 'arousal', 'vaginal', 5
 		gs 'arousal', 'foreplay', 5
 		minut -= 5
@@ -345,7 +336,7 @@ if $ARGS[0] = 'kiss':
 			gs 'dinSex', 'wear_condom'
 			gs 'dinsex','vaginal_sex',10
 			!gs 'dinsex','sexcum'
-			'Suddenly, Dimka''s friend Gosha comes into the room and sits down next to you on the couch, he pulls out his dick and starts jerking off while he is watching Dimka fuck you.'
+			'Suddenly, Dimka''s friend Gosha comes into the room and sits down next to you on the couch. He pulls out his dick and starts jerking off while he watches Dimka fuck you.'
 			gs 'arousal', 'vaginal', 5, 'sub'
 			gs 'stat'
 			act 'Suck him':
@@ -370,7 +361,7 @@ if $ARGS[0] = 'kiss':
 					facial += 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/fa2.jpg"></center>'
-					'You suck on Gosha''s dick while Dimka fucks your pussy from behind, after awhile Gosha takes his dick out of your mouth and a jet of sperm hits you in the face, several more spurts join the first, splattering your face with his cum.'
+					'You suck on Gosha''s dick while Dimka fucks your pussy from behind. After a while, Gosha takes his dick out of your mouth, and a jet of sperm hits you in the face. Several more spurts join the first, splattering your face with his cum.'
 					gs 'arousal', 'vaginal', 5, 'sub', 'group'
 					gs 'arousal', 'bj', 5, 'sub', 'group'
 					minut -= 5
@@ -383,7 +374,7 @@ if $ARGS[0] = 'kiss':
 							gs 'cum_manage'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/newyear/sex/cond.jpg"></center>'
-							'A few moments later Dimka pulls out of you, takes off his condom and squeezes out the cum on your face.'
+							'A few moments later, Dimka pulls out of you, takes off his condom and squeezes out his cum on your face.'
 						
 							act 'Wipe your eyes':gt 'sny', 'end'
 						end
@@ -395,7 +386,7 @@ if $ARGS[0] = 'kiss':
 							gs 'cum_manage'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial22.jpg"></center>'
-							'A few moments later Dimka pulls out of you, walks around to your face. He jerks his dick a couple of times and then it starts spewing sperm all over your face, mixing with Gosha''s sperm, coving most of your face between the two of them.'
+							'A few moments later, Dimka pulls out of you and walks around to your face. He jerks his dick a couple of times, and then it starts spewing sperm all over your face, mixing with Gosha''s, covering most of your face between the two of them.'
 				
 							act 'Wipe your eyes':gt 'sny', 'end'
 						end
@@ -418,7 +409,7 @@ if $ARGS[0] = 'no':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				'You pushed yourself from Dimka "hey! Beat it! Are you, crazy or something?"'
+				'You push yourself from Dimka. "Hey! Beat it! Are you crazy or something?"'
 				act 'Leave':gt 'pav_residential'
 			end
 		else
@@ -426,11 +417,11 @@ if $ARGS[0] = 'no':
 		end	
 		act 'Give in':
 			*clr & cla
-			'You want to push Dimka away, but soaking wet pussy, burning desire to get fucked, makes you give in. Despite your better judgment.'
+			'You want to push Dimka away, but your soaking wet pussy and burning desire to get fucked make you give in despite your better judgment.'
 			act 'Kiss him':gt 'sny', 'kiss'
 		end
 	else
-		'In your drunken state you mutter something unintelligible.'
+		'In your drunken state, you mutter something unintelligible.'
 		act 'Kiss him':gt 'sny', 'kiss'
 	end
 end
@@ -441,13 +432,13 @@ if $ARGS[0] = 'end':
 	SNYnoseGang += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial'+rand(1,23)+'.jpg"></center>'
-	'Having wiped cum from your eyes you see Dimka walk over to the table and take out a hidden camera. He stopped the recording and looked at his friend, "Hey Gosha, the vid came out perfect."'
+	'Having wiped cum from your eyes, you see Dimka walk over to the table and take out a hidden camera. He stops the recording and looks at his friend, "Hey Gosha, the vid came out perfect."'
 	if DimaRudeQW = 0: DimaRudeQW += 1
 	if dimafilm = 0: dimaFilm = 1
 	if NosovRevenge = 1:
 		NosovRevenge = 2
 		daynosovrevenge = daystart
-		'Dimka turned to you, "Well, slut, you sure fucked up this time."'
+		'Dimka turns to you, "Well, slut, you sure fucked up this time."'
 	end
 
 	act 'Leave':

+ 1 - 1
locations/soniadisco.qsrc

@@ -1466,7 +1466,7 @@ if $ARGS[0] = 'followsonia':
 			'She gives you a look of disbelief. "NO, I''m not ok. You saw what happened, everyone is going to think I''m a slut now, hell I am a slut." She says between sobs.'
 			'You nod a bit. "I know, but I tried to help you and I wish I could have done more." You tell her.'
 			'She nods a bit. "I know, god I was so stupid." She says before she start sobbing harder.'
-		elseif soniaencourage > 0 and npc_rel['A25'] => 50:
+		elseif soniaencourage > 0 and npc_rel['A25'] >= 50:
 			npc_rel['A25'] -= 10
 			'As you walk up she turns and sees you. "I thought you were my friend, why would you do that to me?"'
 		elseif soniaencourage > 0:

+ 80 - 80
locations/spell.qsrc

@@ -185,7 +185,7 @@ if $ARGS[0] = 'regenerate':
 		killvar 'regenVal'
 		killvar 'regenArrIdx'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -194,7 +194,7 @@ if $ARGS[0] = 'painblock':
 		pain['killer'] = 1
 		'<b><font color = <<$SplTxtColGood>>>Your pain recedes into a dull throb.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -215,9 +215,9 @@ if $ARGS[0] = 'curedisease':
 		pain['vaginal'] += 10
 		! You do not feel good
 		pcs_mood -= 30
-		'<b><font color = <<$SplTxtColGood>>>You burst into a high fever.  You feel terrible, but you know you are now healthy.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You burst into a high fever. You feel terrible, but you know you are now healthy.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -226,9 +226,9 @@ if $ARGS[0] = 'curewounds':
 		! Remove some pain
 		gs 'medical_din','healthTreatment'
 		gs 'medical_din','healthTreatment'
-		'<b><font color = <<$SplTxtColGood>>>You feel yourself coursing with life.  You feel better already.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel yourself coursing with life. You feel better already.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -237,9 +237,9 @@ if $ARGS[0] = 'curewounds2':
 		! Remove all pain
 		killvar 'pain'
 		pcs_health = pcs_vital * 10 + pcs_stren * 5 + 1000
-		'<b><font color = <<$SplTxtColGood>>>You feel yourself coursing with life.  All pain is gone.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel yourself coursing with life. All pain is gone.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -287,7 +287,7 @@ if $ARGS[0] = 'berserk':
 		end
 		'<b><font color = <<$SplTxtColGood>>>You feel a huge adrenalin surge. You begin looking for someone to battle.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 	killvar 'spellArrIdx'
 	killvar 'berserkCode'
@@ -305,7 +305,7 @@ if $ARGS[0] = 'shower':
 		pcs_breath = 1
 		'<b><font color = <<$SplTxtColGood>>>You feel clean and refreshed.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -319,9 +319,9 @@ if $ARGS[0] = 'glamour':
 		!	CompCode = 'pcs_apprncbase -= 150' Remove bonus
 		!	TickCode = ''  Do nothing
 		gs 'spellTimer', 'add', 'glamour', 120, 'pcs_apprncbase -= 150', ''
-		'<b><font color = <<$SplTxtColGood>>>You feel gorgeous.  People will love you.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You feel gorgeous. People will love you.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -329,9 +329,9 @@ if $ARGS[0] = 'alterself':
 	if SuccessValue > 0:
 		! Stop Reputation accumulation.
 		!TODO
-		'<b><font color = <<$SplTxtColGood>>>Your feature change.  Your own mother wouldn''t recognize you.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Your feature change. Your own mother wouldn''t recognize you.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -364,7 +364,7 @@ if $ARGS[0] = 'makeup':
 		killvar '$MakeupArg'
 		'<b><font color = <<$SplTxtColGood>>>makeup is applied to your face.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -409,7 +409,7 @@ if $ARGS[0] = 'cosmetica':
 
 		'<b><font color = <<$SplTxtColGood>>>You feel beautiful.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -423,7 +423,7 @@ if $ARGS[0] = 'fog':
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '+', 10 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>A Fog materializes around, obscuring <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from enemies.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -435,7 +435,7 @@ if $ARGS[0] = 'clone':
 		dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '-', 1
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! A <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> clone disappears.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -445,19 +445,19 @@ if $ARGS[0] = 'stun':
 		dynamic $spellFunc['UpdateAttrib'], 'stun', $TargetType, TargetNumber, '+', rand(2,5)+ SuccessValue
 		'<b><font color = <<$SplTxtColGood>>><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> is stunned.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'weapon':
 	!{if SuccessValue > 0:
 		magweapbonus = weapbonus * 4 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>Your Weapon now feels more powerful.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Your weapon now feels more powerful.</font></b>'
 	elseif SuccessValue < 0:
 		magweapbonus = weapbonus * -1
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Your weapon seems weaker.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 }
 	"weapon"
@@ -466,23 +466,23 @@ end
 if $ARGS[0] = 'wind':
 	if SuccessValue = 2:
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-		'<b><font color = <<$SplTxtColGood>>>A wind blows through the area eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A wind blows through the area, eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
 	elseif SuccessValue = 1:
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $CasterType, CasterNumber, '=', 0
-		'<b><font color = <<$SplTxtColGood>>>A wind blows through the area eliminating all fog on the battlefield.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A wind blows through the area, eliminating all fog on the battlefield.</font></b>'
 	elseif SuccessValue = -1:
 		dynamic $spellFunc['UpdateAttrib'], 'fog', $CasterType, CasterNumber, '=', 0
-		'<b><font color = <<$SplTxtColBad>>>A wind blows through the area eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>A wind blows through the area, eliminating the fog around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> from the battlefield.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'multiclone':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '+', SuccessValue * 3
-		'<b><font color = <<$SplTxtColGood>>><<SuccessValue * 3>> clone<<iif(SuccessValue>1,"s","")>> of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> springs forth confusing the enemy.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>><<SuccessValue * 3>> clone<<iif(SuccessValue>1,"s","")>> of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> springs forth, confusing the enemy.</font></b>'
 	elseif SuccessValue < 0 and klon > 0:
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') < 3:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
@@ -491,7 +491,7 @@ if $ARGS[0] = 'multiclone':
 		end
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Some clones of <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> disappear.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -500,7 +500,7 @@ if $ARGS[0] = 'energo':
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 100
 		'<b><font color = <<$SplTxtColGood>>>An energy shield materializes around <<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>>, granting protection from enemies.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -509,7 +509,7 @@ if $ARGS[0] = 'haste':
 		dynamic $spellFunc['UpdateAttrib'], 'init', $TargetType, TargetNumber, '+', SuccessValue * 120
 		'<b><font color = <<$SplTxtColGood>>><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> feels mind and body race though a sluggish world.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -518,7 +518,7 @@ if $ARGS[0] = 'heal':
 		dynamic $spellFunc['UpdateAttrib'], 'health', $TargetType, TargetNumber, '+', SuccessValue * 400
 		'<b><font color = <<$SplTxtColGood>>><<dyneval($spellFunc["GetCombatantName"], $TargetType, TargetNumber)>> surges with life, feeling much stronger.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -533,7 +533,7 @@ if $ARGS[0] = 'hand':
 		killvar 'TargetStrenDelta'
 		killvar 'TargetStrenBase'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -542,7 +542,7 @@ if $ARGS[0] = 'scaldingtouch':
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>Flames spring from your hands.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -551,38 +551,38 @@ if $ARGS[0] = 'burninghands':
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250 * SuccessValue
 		'<b><font color = <<$SplTxtColGood>>>A torrent of flames jets from your hands.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'firebarrier':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 200
-		'<b><font color = <<$SplTxtColGood>>>A flaming barrier has sprung up between you and your opponents.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A flaming barrier springs up between you and your opponents.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'firestorm':
 	if SuccessValue > 0:
 		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, (200 * SuccessValue)
-		'<b><font color = <<$SplTxtColGood>>>Uncountable glowing embers steak down upon the foes of <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>>.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Uncountable glowing embers streak down upon the foes of <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>>.</font></b>'
 	elseif SuccessValue < 0:
 		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 200
 		dynamic $spellFunc['ApplyDamageToAll'], $CasterType, 100
-		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Uncountable glowing embers steak down upon the battlefield burning everyone.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Uncountable glowing embers streak down upon the battlefield, burning everyone.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'flameshield':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 250
-		'<b><font color = <<$SplTxtColGood>>>A Shield made of Flames interposes itself between <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>> and the enemy.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A Shield made of flames interposes itself between <<dyneval($spellFunc["GetCombatantName"], $CasterType, CasterNumber)>> and the enemy.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -594,19 +594,19 @@ if $ARGS[0] = 'shock':
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! You manage to zap yourself with a static charge.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'lightning':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 200 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>You shoot a lightning bolt from your hand zapping your opponent.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You shoot a lightning bolt from your hand, zapping your opponent.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 100
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! You manage to zap yourself with lightning.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -615,7 +615,7 @@ if $ARGS[0] = 'electricbarrier':
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 250
 		'<b><font color = <<$SplTxtColGood>>>A wall of dancing lightning springs up around yourself.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -627,117 +627,117 @@ if $ARGS[0] = '1000birds':
 	elseif SuccessValue < 0:
 		dynamic $spellFunc['ApplyDamageToAll'], $TargetType, 100
 		dynamic $spellFunc['ApplyDamageToAll'], $CasterType, 100
-		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Hundreds of small lightning bolts curl toward the battlefield shocking everyone.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Hundreds of small lightning bolts curl toward the battlefield, shocking everyone.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'dancingsphere':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 500
-		'<b><font color = <<$SplTxtColGood>>>A large field of lightning dances around you blocking attacks.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A large field of lightning dances around you, blocking attacks.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'quicksand':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>You have trapped your opponent in quicksand.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You trap your opponent in quicksand.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! You are both trapped in quicksand.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'earthshield':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 100 + 250
-		'<b><font color = <<$SplTxtColGood>>>Tendrils of Earth rise to defend you.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Tendrils of earth rise to defend you.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'abyss':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>The Earth opens up beneath your opponents feet, slamming shut damaging him and depriving him of the ability to move.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>The Earth opens up beneath your opponent''s feet, slamming shut damaging him and depriving him of the ability to move.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 250
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 200
-		'<b><font color = <<$SplTxtColBad>>>The spell backfires! The Earth opens up beneath your opponents feet, slamming shut damaging him and depriving him of the ability to move.  You are also caught.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! The Earth opens up beneath your opponent''s feet, slamming shut damaging him and depriving him of the ability to move. You are also caught.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'earthguardian':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 500
-		'<b><font color = <<$SplTxtColGood>>>The Earth itself comes alive defending you from attacks.  It draws from the power of the land to regenerate itself every round. You now have <<defence>> protection units.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>The Earth itself comes alive defending you from attacks. It draws from the power of the land to regenerate itself every round. You now have <<defence>> protection units.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'sando':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, (250 * SuccessValue)
-		'<b><font color = <<$SplTxtColGood>>>Two huge plates of earth colapse together crushing the enemy and depriving him of the ability to move.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Two huge plates of earth collapse together, crushing the enemy and depriving him of the ability to move.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
-		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Two huge plates of earth colapse together with crushing force, but the enemy is missed and you are instead caught.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Two huge plates of earth collapse together with crushing force, but the enemy is missed and you are instead caught.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'windgust':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 100 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>You have created a gust of wind.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You create a gust of wind.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
 			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 		if dyneval('result=<<$TargetType>>_fog[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-			'<b><font color = <<$SplTxtColGood>>>Enemy Fog is torn to shreds by the wind.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy fog is torn to shreds by the wind.</font></b>'
 		end
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'pressure':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 200 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>You dramatically raised the air pressure.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You dramatically raise the air pressure.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
 			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 		if dyneval('result=<<$TargetType>>_fog[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-			'<b><font color = <<$SplTxtColGood>>>Enemy Fog is torn to shreds by the wind.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy fog is torn to shreds by the wind.</font></b>'
 		end
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'vacuum':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', SuccessValue * 250
-		'<b><font color = <<$SplTxtColGood>>>A turbulent sphere of vacuum surrounds you blocking incoming attacks. You now have <<defence>> protection units.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A turbulent sphere of vacuum surrounds you, blocking incoming attacks. You now have <<defence>> protection units.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -751,19 +751,19 @@ if $ARGS[0] = 'vacuumshells':
 		end
 		if dyneval('result=<<$TargetType>>_fog[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'fog', $TargetType, TargetNumber, '=', 0
-			'<b><font color = <<$SplTxtColGood>>>Enemy Fog is torn to shreds by the wind.</font></b>'
+			'<b><font color = <<$SplTxtColGood>>>Enemy fog is torn to shreds by the wind.</font></b>'
 		end
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'devouringvacuum':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '=', 0
-		'<b><font color = <<$SplTxtColGood>>>A devouring vacuum sucks away your enemys defenses.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>A devouring vacuum sucks away your enemy''s defenses.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -777,7 +777,7 @@ if $ARGS[0] = 'leechmana':
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 50
 		'<b><font color = <<$SplTxtColBad>>>The spell backfires! Ouch!</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -787,9 +787,9 @@ if $ARGS[0] = 'flood':
 		'<b><font color = <<$SplTxtColGood>>>A surge of water rises towards your enemy.</font></b>'
 	elseif SuccessValue < 0:
 		gs 'fight', 'applyDamage', $CasterType, CasterNumber, 100
-		'<b><font color = <<$SplTxtColBad>>>The spell backfires! A surge of water rises towards your enemy, but missed and hits you.</font></b>'
+		'<b><font color = <<$SplTxtColBad>>>The spell backfires! A surge of water rises towards your enemy, but misses and hits you.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
@@ -798,33 +798,33 @@ if $ARGS[0] = 'blister':
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', 500
 		'<b><font color = <<$SplTxtColGood>>>A protective sphere of water surrounds you.</font></b>'
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'sharkrockets':
 	if SuccessValue > 0:
 		gs 'fight', 'applyDamage', $TargetType, TargetNumber, 150 * SuccessValue
-		'<b><font color = <<$SplTxtColGood>>>Blobs of Water shaped like sharks fly towards your enemy stiking them.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>Blobs of water shaped like sharks fly towards your enemy, striking them.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
 			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 
 if $ARGS[0] = 'greatflood':
 	if SuccessValue > 0:
 		dynamic $spellFunc['UpdateAttrib'], 'shield', $TargetType, TargetNumber, '+', 1000
-		'<b><font color = <<$SplTxtColGood>>>You have filled the whole neighborhood with water protecting you and devouring enemy mana.</font></b>'
+		'<b><font color = <<$SplTxtColGood>>>You have filled the whole neighborhood with water, protecting you and devouring enemy mana.</font></b>'
 		if dyneval('result=<<$TargetType>>_clone[<<TargetNumber>>]') > 0:
 			dynamic $spellFunc['UpdateAttrib'], 'clone', $TargetType, TargetNumber, '=', 0
 			'<b><font color = <<$SplTxtColGood>>>Enemy clones are vaporized.</font></b>'
 		end
 	else
-		'<b>The spell fizzles.  Nothing seems to happen.</b>'
+		'<b>The spell fizzles. Nothing seems to happen.</b>'
 	end
 end
 

+ 25 - 25
locations/spellList.qsrc

@@ -66,7 +66,7 @@ spellMana['curewounds'] = 1000
 spellTime['curewounds'] = 30
 spellDiff['curewounds'] = 25
 $spellName['curewounds'] = 'Cure Wounds'
-$spellDesc['curewounds'] = 'You feel your bodys wounds begin to heal.'
+$spellDesc['curewounds'] = 'You feel your body''s wounds begin to heal.'
 $spellTarget['curewounds'] = 'team'
 !curewounds2
 spellMana['curewounds2'] = 10000
@@ -159,7 +159,7 @@ spellTime['glamour'] = 1
 spellDiff['glamour'] = 30
 $spellName['glamour'] = 'Glamour'
 $spellTarget['glamour'] = 'self'
-$spellDesc['glamour'] = 'Become undefinablely beautiful.  Your eyes sparkle just so.  Your hair has a perfect luster.  Your curves are undefinablely perfect.'
+$spellDesc['glamour'] = 'Become undefinably beautiful. Your eyes sparkle just so. Your hair has a perfect luster. Your curves are undefinably perfect.'
 !glamour
 spellMana['alterself'] = 500
 spellTime['alterself'] = 1
@@ -187,7 +187,7 @@ spellMana['clone'] = 15
 spellTime['clone'] = 0
 spellDiff['clone'] = 1
 $spellName['clone'] = 'Create Clone'
-$spellDesc['clone'] = 'You can create an exact clone of yourself, and slip out of sight of the enemy.'
+$spellDesc['clone'] = 'You can create an exact clone of yourself and slip out of sight of the enemy.'
 $spellTarget['clone'] = 'self'
 !stun
 spellMana['stun'] = 20
@@ -201,7 +201,7 @@ spellMana['weapon'] = 20
 spellTime['weapon'] = 0
 spellDiff['weapon'] = 0
 $spellName['weapon'] = 'Empower Weapon'
-$spellDesc['weapon'] = 'Magically power a weapon causing greater damage.'
+$spellDesc['weapon'] = 'Magically empower a weapon, causing it to deal greater damage.'
 $spellTarget['weapon'] = 'self'
 !wind
 spellMana['wind'] = 40
@@ -215,7 +215,7 @@ spellMana['multiclone'] = 45
 spellTime['multiclone'] = 0
 spellDiff['multiclone'] = 2
 $spellName['multiclone'] = 'Multi-Clone'
-$spellDesc['multiclone'] = 'Summon three clones of yourself and slip out of the enemys sight.'
+$spellDesc['multiclone'] = 'Summon three clones of yourself and slip out of the enemy''s sight.'
 $spellReq['multiclone'] = 'clone'
 $spellTarget['multiclone'] = 'self'
 !energo
@@ -223,7 +223,7 @@ spellMana['energo'] = 50
 spellTime['energo'] = 0
 spellDiff['energo'] = 3
 $spellName['energo'] = 'Energy Shield'
-$spellDesc['energo'] = 'Create an energy shield to absorb incoming damage.  You gain 100 defense.'
+$spellDesc['energo'] = 'Create an energy shield to absorb incoming damage. You gain 100 defense.'
 $spellTarget['energo'] = 'self'
 !haste
 spellMana['haste'] = 60
@@ -244,7 +244,7 @@ spellMana['hand'] = 100
 spellTime['hand'] = 0
 spellDiff['hand'] = 0
 $spellName['hand'] = 'Quivering Palm'
-$spellDesc['hand'] = 'Add energy from your mana to your hand for a devistating strike.'
+$spellDesc['hand'] = 'Add energy from your mana to your hand for a devastating strike.'
 $spellTarget['wind'] = 'enemy'
 !scaldingtouch
 spellMana['scaldingtouch'] = 10
@@ -266,21 +266,21 @@ spellMana['firebarrier'] = 150
 spellTime['firebarrier'] = 0
 spellDiff['firebarrier'] = 8
 $spellName['firebarrier'] = 'Fire Barrier'
-$spellDesc['firebarrier'] = 'You are shielded by a wall of flames.  Adds 750 defense.'
+$spellDesc['firebarrier'] = 'You are shielded by a wall of flames. Adds 750 defense.'
 $spellTarget['firebarrier'] = 'self'
 !firestorm
 spellMana['firestorm'] = 250
 spellTime['firestorm'] = 0
 spellDiff['firestorm'] = 9
 $spellName['firestorm'] = 'Fire Storm'
-$spellDesc['firestorm'] = 'Super heated embers rain down upon your enemies.'
+$spellDesc['firestorm'] = 'Superheated embers rain down upon your enemies.'
 $spellTarget['firestorm'] = 'enemy'
 !flameshield
 spellMana['flameshield'] = 500
 spellTime['flameshield'] = 0
 spellDiff['flameshield'] = 10
 $spellName['flameshield'] = 'Flame Shield'
-$spellDesc['flameshield'] = 'A Shield made of Flames interposes itself between you and your enemy, absorbing 2500 damage to defend you.'
+$spellDesc['flameshield'] = 'A Shield made of flames interposes itself between you and your enemy, absorbing 2500 damage to defend you.'
 $spellTarget['flameshield'] = 'self'
 !shock
 spellMana['shock'] = 10
@@ -316,14 +316,14 @@ spellMana['dancingsphere'] = 500
 spellTime['dancingsphere'] = 0
 spellDiff['dancingsphere'] = 10
 $spellName['dancingsphere'] = 'Dancing Sphere'
-$spellDesc['dancingsphere'] = 'Lightning dances around you blocking attacks coming toward you.'
+$spellDesc['dancingsphere'] = 'Lightning dances around you, blocking attacks coming toward you.'
 $spellTarget['dancingsphere'] = 'self'
 !quicksand
 spellMana['quicksand'] = 10
 spellTime['quicksand'] = 0
 spellDiff['quicksand'] = 6
 $spellName['quicksand'] = 'Quicksand'
-$spellDesc['quicksand'] = 'Opponent is caught in a quicksand trap.'
+$spellDesc['quicksand'] = 'Your opponent is caught in a quicksand trap.'
 $spellTarget['quicksand'] = 'enemy'
 !earthshield
 spellMana['earthshield'] = 100
@@ -337,56 +337,56 @@ spellMana['abyss'] = 150
 spellTime['abyss'] = 0
 spellDiff['abyss'] = 8
 $spellName['abyss'] = 'Abyss'
-$spellDesc['abyss'] = 'The Earth opens up beneath your opponents feet, slamming shut damaging him and depriving him of the ability to move.'
+$spellDesc['abyss'] = 'The Earth opens up beneath your opponent''s feet, slamming shut damaging him and depriving him of the ability to move.'
 $spellTarget['abyss'] = 'enemy'
 !earthguardian
 spellMana['earthguardian'] = 250
 spellTime['earthguardian'] = 0
 spellDiff['earthguardian'] = 9
 $spellName['earthguardian'] = 'Earth Guardian'
-$spellDesc['earthguardian'] = 'The Earth itself comes alive defending you from attacks.  It draws from the power of the land to regenerate itself every round.'
+$spellDesc['earthguardian'] = 'The Earth itself comes alive defending you from attacks. It draws from the power of the land to regenerate itself every round.'
 $spellTarget['earthguardian'] = 'self'
 !sando
 spellMana['sando'] = 500
 spellTime['sando'] = 0
 spellDiff['sando'] = 10
 $spellName['sando'] = 'Sando'
-$spellDesc['sando'] = 'Two huge plates of earth colapse together crushing the enemy and depriving him of the ability to move.'
+$spellDesc['sando'] = 'Two huge plates of earth collapse together, crushing the enemy and depriving him of the ability to move.'
 $spellTarget['sando'] = 'enemy'
 !windgust
 spellMana['windgust'] = 10
 spellTime['windgust'] = 0
 spellDiff['windgust'] = 6
 $spellName['windgust'] = 'Wind Gust'
-$spellDesc['windgust'] = 'a huge gust of wind rips past you killing clones and removing fog.'
+$spellDesc['windgust'] = 'a huge gust of wind rips past you, killing clones and removing fog.'
 $spellTarget['windgust'] = 'enemy'
 !pressure
 spellMana['pressure'] = 100
 spellTime['pressure'] = 0
 spellDiff['pressure'] = 7
 $spellName['pressure'] = 'Horrific Pressure'
-$spellDesc['pressure'] = 'Enormous air pressure surrounds your enemy causing damage as well as killing clones and removing fog.'
+$spellDesc['pressure'] = 'Enormous air pressure surrounds your enemy, causing damage as well as killing clones and removing fog.'
 $spellTarget['pressure'] = 'enemy'
 !vacuum
 spellMana['vacuum'] = 150
 spellTime['vacuum'] = 0
 spellDiff['vacuum'] = 8
 $spellName['vacuum'] = 'Vacuum Sphere'
-$spellDesc['vacuum'] = 'A turbulent sphere of vacuum surrounds you blocking incoming attacks.'
+$spellDesc['vacuum'] = 'A turbulent sphere of vacuum surrounds you, blocking incoming attacks.'
 $spellTarget['vacuum'] = 'self'
 !vacuumshells
 spellMana['vacuumshells'] = 250
 spellTime['vacuumshells'] = 0
 spellDiff['vacuumshells'] = 9
 $spellName['vacuumshells'] = 'Vacuum Shells'
-$spellDesc['vacuumshells'] = 'Turbulent spheres of vacuum bombard your enemy destroying clones and removing fog.'
+$spellDesc['vacuumshells'] = 'Turbulent spheres of vacuum bombard your enemy, destroying clones and removing fog.'
 $spellTarget['vacuumshells'] = 'enemy'
 !devouringvacuum
 spellMana['devouringvacuum'] = 500
 spellTime['devouringvacuum'] = 0
 spellDiff['devouringvacuum'] = 10
 $spellName['devouringvacuum'] = 'Devouring Vacuum'
-$spellDesc['devouringvacuum'] = 'A devouring vacuum sucks away your enemys defensive shields.'
+$spellDesc['devouringvacuum'] = 'A devouring vacuum sucks away your enemy''s defensive shields.'
 $spellTarget['devouringvacuum'] = 'enemy'
 !leechmana
 spellMana['leechmana'] = 10
@@ -407,21 +407,21 @@ spellMana['blister'] = 150
 spellTime['blister'] = 0
 spellDiff['blister'] = 8
 $spellName['blister'] = 'Blister'
-$spellDesc['blister'] = 'Create a protective sphere of water.  Some of the damage absorbed is converted into mana for you.'
+$spellDesc['blister'] = 'Create a protective sphere of water. Some of the damage absorbed is converted into mana for you.'
 $spellTarget['blister'] = 'enemy'
 !sharkrockets
 spellMana['sharkrockets'] = 250
 spellTime['sharkrockets'] = 0
 spellDiff['sharkrockets'] = 9
 $spellName['sharkrockets'] = 'Shark Rockets'
-$spellDesc['sharkrockets'] = 'Blobs of Water shaped like sharks fly towards your enemy stiking them for 1500 damage and abosorbing 2500 mana for you.  Clones are destroyed'
+$spellDesc['sharkrockets'] = 'Blobs of Water shaped like sharks fly towards your enemies, striking them for 1500 damage and absorbing 2500 mana for you. Clones are destroyed.'
 $spellTarget['sharkrockets'] = 'enemy'
 !greatflood
 spellMana['greatflood'] = 500
 spellTime['greatflood'] = 0
 spellDiff['greatflood'] = 10
 $spellName['greatflood'] = 'Great Flood'
-$spellDesc['greatflood'] = 'A huge flood of water fills the area absorbing mana from the enemy and giving you additional protection.'
+$spellDesc['greatflood'] = 'A huge flood of water fills the area, absorbing mana from the enemy and giving you additional protection.'
 $spellTarget['greatflood'] = 'enemy'
 
 
@@ -616,10 +616,10 @@ if $ARGS[0] = 'teacherActions':
 					spellLearn['<<$ThisSpellName>>'] += rand(1, 100/<<spellDifficulty>>)
 
 					if spellLearn['<<$ThisSpellName>>'] < 100:
-						'You diligently study the spell for an hour, but could not grasp it.'
+						'You diligently study the spell for an hour, but cannot grasp it.'
 					else
 						spellKnown['<<$ThisSpellName>>'] = 1
-						'Finally you are able to grasp and learn the spell.'
+						'Finally, you are able to grasp and learn the spell.'
 						*nl
 						'<<$spellName[$ThisSpellName]>>: <<$spellDesc[$ThisSpellName]>>'
 					end

+ 3 - 3
locations/sportShop.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">Danilovich sporting goods</font></b></center>'
 	'<center><img src="images/locations/city/citycenter/mall/sportshop/sportshop.jpg"></center>'
 	*nl
-	'As soon as you enter, a high energy song with a thumping baseline fills your eardrums, making you feeling pumped and awake. The store is sleek and professional, the walls and floors advertising all different kinds of sporting equipment and attire. The room is filled with beautifully fit people shopping, their bodies varying from big and muscular to lean and trim. If they don''t inspire you to want to work out, the posters advertising past and present famous athletes is motivating as hell.'
+	'As soon as you enter, a high energy song with a thumping baseline fills your eardrums, making you feel pumped and awake. The store is sleek and professional, the walls and floors advertising all different kinds of sporting equipment and attire. The room is filled with beautifully fit people shopping, their bodies varying from big and muscular to lean and trim. If they don''t inspire you to want to work out, the posters advertising past and present famous athletes are motivating as hell.'
 	*nl
 	if refillable_bottle = 0 and money >= 1000 and bag > 0: 
 		'You could buy a high-quality <a href="exec:minut += 5 & money -= 1000 & refillable_bottle = 1 & gt ''sportShop'', ''start''">water bottle (1000 <b>₽</b>)</a> that you can carry around in your purse.'
@@ -209,7 +209,7 @@ if $ARGS[0] = 'panties':
 	i = 1
 
 	:loopsport_panties
-		if sport_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''panties2''"><img src="images/pc/panties/sport/<<i>>.jpg" 	height="150" /></a> '
+		if sport_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''panties2''"><img src="images/pc/panties/sport/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 8:jump 'loopsport_panties'
 end
@@ -241,7 +241,7 @@ if $ARGS[0] = 'bras':
 	i = 1
 
 	:loopsport_bras
-		if sport_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''bras2''"><img src="images/pc/bras/sport/<<i>>.jpg" 	height="150" /></a> '
+		if sport_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''sportShop'', ''bras2''"><img src="images/pc/bras/sport/<<i>>.jpg" 	height="250" /></a> '
 		i += 1
 	if i <= 8:jump 'loopsport_bras'
 end

+ 11 - 11
locations/stallion.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
 	act 'Run away':
 		*clr & cla
 		'You quickly sort yourself out and get out of the stall. You try the bathroom door. It''s locked. There is no handle, and the lock is just a keyhole.'
-		'"It''s no use. You are trapped." The strange man says.'
+		'"It''s no use. You are trapped," The strange man says.'
 		'A naked middle aged man exits the other stall and walks towards you.'
 		gs 'stallion', 'fight'
 	end
@@ -60,13 +60,13 @@ if $ARGS[0] = 'rape':
 	'The man pushes you down, and you fall on your ass. He advances towards you, grabs a hold of your clothes and rips them open. He falls on top of you. You feel his hot breath against your face as he ruthlessly grabs your arms. You feel his penis poking you in the leg.'
 	'"So you know what''s coming next, don''t you my little <<$pcs_nickname>>?"'
 	if pcs_horny < 30:
-		'You feel his cock stab you in the unprepared vagina, not even the slightest slowed down by the lack of lubrication. It''s rough and raw, pulling at your skin and pressing against your sensitive flesh painfully. You can''t help but cry out.'		
+		'You feel his cock stab you in your unprepared vagina, not even the slightest slowed down by the lack of lubrication. It''s rough and raw, pulling at your skin and pressing against your sensitive flesh painfully. You can''t help but cry out.'		
 	elseif pcs_horny < 50:
 		'You feel his cock stab you in the vagina. It''s not very well lubricated, and it rubs painfully against your sensitive flesh as it penetrates you.'
 	elseif pcs_horny < 70:
 		'You feel his cock stab you in the vagina. It slides into your lubricated entryway, penetrating you.'
 	else
-		'You feel his hard cock enter your wet vagina, easily entering you.'
+		'You feel his hard cock push against your wet vagina, easily entering you.'
 	end
 	if pcs_vag = 0: 'It brings tears to your eyes as he painfully rips your hymen, taking your virginity.'
 	gs 'arousal', 'vaginal', 30, 'rough', 'sub'
@@ -88,12 +88,12 @@ if $ARGS[0] = 'rape':
 			'You feel a tingling in your body. He places a powerful enchantment on you, increasing your fertility and binding your life force to the fruit of your womb. You realize with horror that he has practically guaranteed all sexual encounters will result in pregnancy in the future. Furthermore, your life is now tied to your womb. An abortion will result in your death.'
 		end
 		act 'What have you done to me?':
-			'"I have given you a gift, sweet <<$pcs_nickname>>. I have turned you into a broodmare." He replied as he continued to repeatedly thrust into you.'
+			'"I have given you a gift, sweet <<$pcs_nickname>>. I have turned you into a broodmare," he replies as he continues to repeatedly thrust into you.'
 		end
 	end
 	gs 'willpower', 'misc', 'self', 'easy'
 	if will_cost <= pcs_willpwr:
-		act 'Beg for Mercy (<<will_cost>> Willpower)':
+		act 'Beg for mercy (<<will_cost>> Willpower)':
 			cla
 			gs 'willpower', 'misc', 'self', 'easy'
 			gs 'willpower', 'pay', 'self'
@@ -108,14 +108,14 @@ if $ARGS[0] = 'rape':
 			end
 			if broodcurse = 0:
 				'Stallion smiles as you plead for him not to cum inside you.'
-				'"I''m sure you''ll manage to bear my child just fine." He says as he continues to thrust into you.' 
+				'"I''m sure you''ll manage to bear my child just fine," he says as he continues to thrust into you.' 
 			else
 				'Stallion smiles. "I''m not lifting the curse. You should accept your fate. It will be easier on you in the long run."'
 			end
 			act 'Continue': gt 'stallion', 'finish'
 		end
 	else
-		act 'Beg for Mercy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		act 'Beg for mercy (<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', 'skill', 'resist', 'stren_lvl'
 	if will_cost <= pcs_willpwr:
@@ -124,7 +124,7 @@ if $ARGS[0] = 'rape':
 			gs 'willpower', 'skill', 'resist', 'stren_lvl'
 			gs 'willpower', 'pay', 'resist'
 			'You attempt to throw him off you, but he is able to resist your efforts.'
-			'"Tightening up like that, makes it feel so good." He says as he continues to thrust into you.'
+			'"Tightening up like that makes it feel so good," he says as he continues to thrust into you.'
 			act 'Continue': gt 'stallion', 'finish'
 		end
 	else
@@ -140,9 +140,9 @@ end
 if $ARGS[0] = 'finish':
 	cla
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/sex/klof10.jpg"></center>'
-	'Stallion moaned. "I''m cumming!"'
+	'Stallion moans, "I''m cumming!"'
 	'He twitches on top of you, and you feel him fill you with his seed.'
-	'"Give birth to a cute baby for me, <<$pcs_nickname>>. But don''t you dare kill it. You won''t survive it long. Ta ta!" He said, pulling out.'
+	'"Give birth to a cute baby for me, <<$pcs_nickname>>. But don''t you dare kill it. You won''t survive it long. Ta ta!" He says, pulling out.'
 	act 'Continue': gt 'stallion', 'end'
 end
 
@@ -159,7 +159,7 @@ end
 if $ARGS[0] = 'awaken':
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/publictoilet.jpg"></center>'
 	minut += 160
-	'You come to several hours later laying on the cold bathroom floor. Your clothing is folded neatly in a pile nearby.'
+	'You come to several hours later lying on the cold bathroom floor. Your clothing is folded neatly in a pile nearby.'
 	if bag > 0: 
 		'Your handbag is sitting on top of the clothing. You check it for missing items.'
 		if money > 0: 'You have <<money>> rubles.'

+ 2 - 2
locations/start.qsrc

@@ -16,7 +16,7 @@ $counter = 'counter'
 $usercom = 'inputProcessing'
 $fname = 'Tahoma'
 fsize = 12
-$version = '0.8.1.3 Bug fix 3 for "0.8.1 The key people left and we had to wing it one."'
+$version = '0.8.2.2 bug fix 2 for "The I broke all your lovely clothes and I''m not even sorry about it version."'
 
 opPRE = 1
 
@@ -37,7 +37,7 @@ opPRE = 1
 *nl
 '<b><a href="exec:gt ''version''">Change log</a> and <a href="exec:gt ''history''">Game history</a></b>'
 *nl
-'<b>* Wiki hosted by Wikia available <a href="http://girl-life.wikia.com/wiki/Girl_life_Wiki">here</a> (External link) *</center></b>'
+'<b>* Wiki hosted by Google sites available <a href="https://sites.google.com/view/girllifewiki/home">here</a> (External link) *</center></b>'
 '<center>Feel free to contribute.</center>'
 
 gs 'themes', 'indoors'

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