160 次代碼提交 f18d4cba27 ... 4f491ce7c7

作者 SHA1 備註 提交日期
  bgkjdgbizgblzdgbr 4f491ce7c7 [fixed] More cut and paste errors 3 月之前
  bgkjdgbizgblzdgbr 3c35866318 [fixed] Cut and paste error is the nursing exam files. 3 月之前
  anjuna krokus 28fd511b2e [fixed] missing $ 3 月之前
  anjuna krokus 5fa3df5dd6 [changed] layout changes, removed a random cikl call that should not be there 3 月之前
  anjuna krokus 7db1651834 [added] better comments 3 月之前
  anjuna krokus f2a2c077a1 [changed] layout change 3 月之前
  anjuna krokus 6cd743cde9 [changed/added] Massive change in how piercings and tattoos are handled. 3 月之前
  bgkjdgbizgblzdgbr eb7ef09e48 [added] Feedback on weekly progrees for uni classes added in journal. 3 月之前
  Awesome 1fe71051ef [Fixed] made Havana prices more consistent 3 月之前
  bgkjdgbizgblzdgbr 8f177b8a75 [fixed] Missing ' ' for sting indexes spotted by Siubhan 3 月之前
  Kevin_Smarts 4d18c7f755 Merge remote-tracking branch 'Anjuna/master' 3 月之前
  anjuna krokus 74dbf8ffb2 [fixed] wrong (non-existing) starting coat. Reported by Vladzilla 3 月之前
  Awesome 1336cea802 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 月之前
  Vengeance_11 65b6039a69 Albina now properly hates all gopnik starts 3 月之前
  Awesome d57c6e0e2a [Added] Artem strapon events by Nutluck 3 月之前
  Awesome 3d303ad1ec Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 月之前
  Kevin_Smarts a230e227a5 [fixed] Bimbo is meant to, like, be a bimbo 3 月之前
  Awesome 727fec5175 [Added] Igor strapon event by Nutluck 3 月之前
  Awesome d44076480d [Text edit] Spelling and grammar fixes 3 月之前
  Kevin_Smarts 8e4cf589bc Merge remote-tracking branch 'Awesome/master' 3 月之前
  Kevin_Smarts b07c18a212 Merge remote-tracking branch 'Hooded_Silence/master' 3 月之前
  Awesome 72214a160f [Fixed] Threesome Artem/Anushka - teleport to the city 3 月之前
  Myles Croft (Hooded Silence) 206d20ffb9 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 月之前
  Awesome 85ea754e34 [Fixed] an old variable and a variable, that was cleared too early also wrong variable usage 3 月之前
  anjuna krokus bd74d540f4 [fixed] My code simplification broke it, because not all calls are good 3 月之前
  Kevin_Smarts c269ccc7e2 Merge remote-tracking branch 'Anjuna/master' 3 月之前
  Kevin_Smarts d5e3197d23 Merge remote-tracking branch 'acien/master' 3 月之前
  anjuna krokus c0c7c4e8c7 [changed] Moved Exercise clothing to `CloStyle2 = 6` and `ShoStyle2 = 2`. Moved stripper shoe style to `ShoStyle2 = 1`. 3 月之前
  acien f36b2016ba [fixed] tampon cheat and period tracking had the enabled disabled backwards 3 月之前
  anjuna krokus cdc0eb56ae [changed] moved office clothes tag from `(P)CLoStyle3 = 4` to `(P)CloStyle2 = 5` 3 月之前
  anjuna krokus 2a2c8c9321 [fixed] another Clo to PClo 3 月之前
  anjuna krokus 3097e1bc36 [fixed] forgotten Clo to PClo 3 月之前
  anjuna krokus 439e119952 Merge remote-tracking branch 'master/master' 3 月之前
  anjuna krokus 5ecd569ef9 [fixed] multiple places were not refering to the clothes you were wearing, but to the last clothes you've looked at 3 月之前
  Kevin_Smarts f95f5333b6 Merge remote-tracking branch 'Hooded_Silence/master' 3 月之前
  Myles Croft (Hooded Silence) ca756cca7d Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 月之前
  anjuna krokus 551cc90a54 [changed/removed] `karta` now automatically includes the deb limit. You're in debt when `karta < bankDebtLimit`. You've reached you maximum at `karta = 0`. Removed unneeded shortgs functions do to this simplifying checks 3 月之前
  anjuna krokus 04b226d38d [merge] Files from Myles weren't merged yet? 3 月之前
  anjuna krokus cb1e166dc8 [added] missing Clostyle3 tags for 3 eroto dresses 3 月之前
  anjuna krokus 9f76cf674b [fixed] gameovers through stat caused a crash + small layout changes 3 月之前
  anjuna krokus 648efec765 [fixed] max level not properly working 3 月之前
  anjuna krokus 2a16ee479e [fixed] error in obj_din. Reported by Sten Mogon 3 月之前
  Kevin_Smarts ea9fa314e7 [fixed] No sort options in Fashionista as spotted by Skylah 3 月之前
  anjuna krokus f5f997b3af [fixed] forgotten $ was destroying makeup 3 月之前
  Kevin_Smarts afecaa68c4 [fixed] clothing set gave wrong size message if no outfit in the set and a use of none where it should be nude 3 月之前
  Kevin_Smarts c7571ccb4d Merge remote-tracking branch 'Anjuna/master' 3 月之前
  Kevin_Smarts 477003e19b [aded] Bimbo flag after suggestions for adding from Siubhan 3 月之前
  anjuna krokus df1b5ed31c Merge remote-tracking branch 'master/master' 3 月之前
  Kevin_Smarts b0ede374bf Merge remote-tracking branch 'Hooded_Silence/master' 3 月之前
  Kevin_Smarts be00eb5e97 Merge remote-tracking branch 'Hornguy6/master' 3 月之前
  Kevin_Smarts 0108d6cb72 Merge remote-tracking branch 'Anjuna/master' 3 月之前
  anjuna krokus b2bf1a6f4c Merge remote-tracking branch 'master/master' 3 月之前
  anjuna krokus 1a00040668 [Added/changed] Introduced `pcs_buttsize` as a parallel to `pcs_cupsize`. Done away with `bodyVars['butt_other']` as part of the standard calculation and introduced `bodyVars['bust_other']` as a pair of permanent bonuses/penalties to bust and butt. 3 月之前
  Myles Croft (Hooded Silence) 00db2ff0d3 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 月之前
  Myles Croft (Hooded Silence) cc387b08c7 [Image Migration] move grandparents dacha images into their own folder - from /gadukino/village/ to images/locations/gadukino/gp_dacha/, chores to be reviewed at a future date. 3 月之前
  Kevin_Smarts 05855149d8 [fixed] Its clearly a Ferrari as Siubhan pointed out 3 月之前
  hornguy6 e36da440e2 [fixed] variable was not getting set 3 月之前
  anjuna krokus f32ab0b737 [changed] minor code changes 3 月之前
  Kevin_Smarts da50081a9f Merge remote-tracking branch 'Awesome/master' 3 月之前
  Kevin_Smarts 773220c651 Merge remote-tracking branch 'Hooded_Silence/master' 3 月之前
  Kevin_Smarts 7a6cfc23ca Merge remote-tracking branch 'Anjuna/master' 3 月之前
  Awesome f805f66788 [Fixed] Missing `:` 3 月之前
  Myles Croft (Hooded Silence) 8e4937c8e3 [Code cleanup] Code and variable clean up 3 月之前
  Myles Croft (Hooded Silence) c7232a998c Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 月之前
  anjuna krokus a77cfdf717 [fixed] buying trainpass not working properly. Reported by retlifeforme 3 月之前
  Stephan Fuchs f7529e2e57 [qsrc2tw] Keep all version numbers of a savegame for bug reporting. 3 月之前
  Stephan Fuchs 7c9d6e1baa [qsrc2tw] Make Debug Tools slightly less painful to look at. 3 月之前
  Stephan Fuchs 5d6fa11e32 [qsrc2tw] Display Version Number to Players and add more power to the profiling by adding `gsAnal`. 3 月之前
  Kevin_Smarts ac05630b88 Merge remote-tracking branch 'Anjuna/master' 3 月之前
  Kevin_Smarts e01582b1dc Merge remote-tracking branch 'Hooded_Silence/master' 3 月之前
  Kevin_Smarts 61619afd6f Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 3 月之前
  anjuna krokus 9cec143501 [fixed] more fixes to xpprv 3 月之前
  anjuna krokus 60317ffb05 [fixed] skills broken on new saves (I think) 3 月之前
  Stephan Fuchs d587faa1d9 [qsrc2tw] Whitescreen after multiple gts fixed. 3 月之前
  anjuna krokus 7d5b6950dd [changed] leftover array back into an if-else statement to conserve memory and computing power. Reported by Steuchs 3 月之前
  anjuna krokus 0e340f7664 [fixed] Used string variable for npc_gender. Found by Myles 3 月之前
  anjuna krokus 889fc2250e [changed/fixed] moved $stat_day_suffix to the time handler, changed evt_day_suffix into the function get_number_suffix and changed convert_dob into a function (that doesn't break the game). 3 月之前
  Myles Croft (Hooded Silence) a6b8530c75 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 月之前
  Kevin_Smarts a456731318 [fixed] removing caps step2 3 月之前
  Kevin_Smarts ad02fbb51e [removing caps] step1 3 月之前
  Kevin_Smarts a706dbbb6b Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 3 月之前
  Stephan Fuchs d18ef26c5a [qsrc2tw] Fix `\` not being escpaded. Also pretty up the output and introduce `<<image>>`. 3 月之前
  Stephan Fuchs d7cf3bd75e [qsrc2tw] remove unnecessary import in `npcInit` 3 月之前
  Vengeance_11 501ad71cd4 Added chat option to Albina scene 3 月之前
  Vengeance_11 c2409332bc Have things proofed before they're added to the game 3 月之前
  Myles Croft (Hooded Silence) c4feec35b7 [Code migration] moved evt_day_suffix function from emp_functions and added new convert_dob function to shortgs to make NPC human legible from a int NPC id - outputs $display_dob. 3 月之前
  Myles Croft (Hooded Silence) 3d33032fed Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 月之前
  Kevin_Smarts 6760f84f09 Merge remote-tracking branch 'Anjuna/master' 3 月之前
  anjuna krokus dd743b0846 [fixed] Updated Barn alarm to new format. Removed unneeded comment from yard 3 月之前
  anjuna krokus ba3f1ad360 [changed] minor layout changes and a forgotten update to the alarmsystem 3 月之前
  anjuna krokus 1aa965fa50 [changed] moved the time display to `time` simplified a lot of repeated code by moving it to alarm clock 3 月之前
  anjuna krokus 106916ef2b [fixed] layout 3 月之前
  anjuna krokus e2a6bf10db [changed] more runtime optimizations 3 月之前
  anjuna krokus 3510f04076 [added] You can buy bus/train tickets with your card (cash is prioritised). Requested by Skylah 3 月之前
  anjuna krokus 1c76b57d70 [changed] custom and default body image sets now fully implimented with a new sleek layout 3 月之前
  anjuna krokus d871654927 [changed] running validating and qgen through the makeQSP.bat no longer closes the window 3 月之前
  anjuna krokus d3fc4d9ce4 [fixed] Extra safeguard against divide by 0 error 3 月之前
  Myles Croft (Hooded Silence) 742569aa06 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 月之前
  Myles Croft (Hooded Silence) abe957b39c no message 3 月之前
  anjuna krokus 3d0fc343b9 [fixed] typo 3 月之前
  anjuna krokus 2066061b51 [added] more options to set descriptions of custom images 3 月之前
  anjuna krokus c58343a294 [fixed] tiny layout change 3 月之前
  anjuna krokus bdf0a9d719 [changed] Changed backend code behind the fixed body images. Giving more options to custom sets and removing references to the old system 3 月之前
  anjuna krokus f8b1f6c3e1 [fixed] extre `'` 3 月之前
  anjuna krokus 089fbcca8e [changed] 'daystart' to a general 'time' location, which is called by stat and calls hourly_events and cikl. As well as containing multiple functions related to date and time 3 月之前
  anjuna krokus 94282ff0f0 Merge remote-tracking branch 'master/master' 3 月之前
  anjuna krokus 8bd4e25c76 [fixed] body images would sometimes be broken 3 月之前
  Stephan Fuchs 74ae52fafb [qsrc2tw] Introducing `setup.NPCs`. 3 月之前
  Stephan Fuchs 762de7924b [qsrc2tw] Fix: `$args` and `args` is not the same thing. 3 月之前
  Stephan Fuchs 04a3bbe617 [qsrc2tw] Style the `h2` and `img` slightly prettier. 3 月之前
  Stephan Fuchs 1024cb3aeb [qsrc2tw] Fix missing symbols in the top bar by using svgs. 3 月之前
  Kevin_Smarts f358364c4c Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 3 月之前
  Kevin_Smarts f9543d07aa Merge remote-tracking branch 'Hornguy6/master' 3 月之前
  Stephan Fuchs 7cce23e17e [qsrc2tw] Fixed `setup.qsp_copyarr`. It now accepts start-and length-values. 3 月之前
  Stephan Fuchs df17e53751 [qsrc2tw] All your cores are belong to us. 3 月之前
  hornguy6 331c11dcc0 [text edit] words 3 月之前
  hornguy6 54771a6ef0 [fixed] dead ends in peeping on Lazar and Albina 3 月之前
  Stephan Fuchs 9ebbf588bf [qsrc2tw] Fixed critical `QSPPARSER.js`-bug 3 月之前
  Stephan Fuchs 36c7eaf325 Revert "[qsrc2tw] Automatically have webpack move `QSPPARSER.js` to the appropriate folder." 3 月之前
  Stephan Fuchs a92784ab0c [qsrc2tw] Fix qsrc-native pushs not being parsed. `COMPILER UPDATE`! 3 月之前
  Stephan Fuchs 8ae3207399 [changed] Address the string `$np_pages` as a string in `newspaper.cikl` function-calls. 3 月之前
  Stephan Fuchs 60e081ffc1 [qsrc2tw] Fix `setup.qsp_arrsize` to take both strings and integers into account at the same time. 3 月之前
  Stephan Fuchs 9bf078e5c3 [qsrc2tw] Automatically have webpack move `QSPPARSER.js` to the appropriate folder. 3 月之前
  Stephan Fuchs 895b12b485 [qsrc2tw] overwrite `pcs_has_attr`.`and`,`or`,`nor` and `nand` 3 月之前
  anjuna krokus 0eb6c28b9b [added] additional warnings 3 月之前
  anjuna krokus b7d50031da [added] XOR now takes an optional parameter (ARGS[2]) which indicates exactly how many of the traits need to be true 3 月之前
  anjuna krokus 3372b790ba [Added] XOR gate to `pcs_has_attr` 3 月之前
  anjuna krokus 833b7a9cee [fixed/added] NAND and NOR should now output the correct logic output. Reported by Steuchs. Added comments to better explain what AND, OR, NAND, NOR does 3 月之前
  anjuna krokus 96b994044f [fixed] gamebreaking bug 3 月之前
  anjuna krokus e24105dcbd [changed] activated the new body images in preparation to their full addition, moved the actual but images to `$body_image` to give better access to it by other locations and open the potential to have mutliple butt images 3 月之前
  anjuna krokus 5cd0d72c20 [fixed] Wrong filename, changed spaces to tabs, multiple bug fixes 3 月之前
  Kevin_Smarts 1fe8882af2 Merge remote-tracking branch 'Anjuna/master' 3 月之前
  anjuna krokus fb95e36711 [changed] `loverGender[lover_number]` to `npc_gender[$lover[lover_number]]` 3 月之前
  anjuna krokus 279c23d534 [changed] Pav appartment now uses shortgs setloc and small layout changes 3 月之前
  anjuna krokus b8a5764311 [changed] Gad bath now mostly relies on `din_van`. 3 月之前
  Stephan Fuchs 417b985a7e Merge remote-tracking branch 'kevinsmarts/master' into QSRC2TW 3 月之前
  Stephan Fuchs d09fdd97dd [qsrc2tw] fixed the `CHOOSE GAME START`-table 3 月之前
  Kevin_Smarts 5fd5223b59 Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 3 月之前
  Kevin_Smarts 29f716e700 Merge remote-tracking branch 'Awesome/master' 3 月之前
  Kevin_Smarts fb457c8933 Merge remote-tracking branch 'Hooded_Silence/master' 3 月之前
  Kevin_Smarts 8815af79e5 Merge remote-tracking branch 'Anya/master' 3 月之前
  Stephan Fuchs 1af15c8317 [qsrc2tw] fixed backwards compatibility for proficiencies: QSP still doesn't understand floats 3 月之前
  Awesome 1fd9e1d2ee [Changed] Dynamic -> ARGS 3 月之前
  Awesome 8b09bfd4ef [Fixed] Variable getting reset before getting displayed 3 月之前
  Awesome 43cdd847bb [Fixed] Artem strapon block not working 3 月之前
  Myles Croft (Hooded Silence) 3506406d28 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 3 月之前
  anjuna krokus 021ebf1c56 [changed] Gschool break girls bathroom bully event now discards the worn clothes. And various small changes and 3 月之前
  anjuna krokus 38313a787f [changed] some small code optimizations 3 月之前
  anjuna krokus bb0297795b [changed] added a safeguard just in case 3 月之前
  anjuna krokus f3f8090a76 [changed] `stat_sklattrib` should non only do calculations for attributes and skills that have changed that day 3 月之前
  anjuna krokus 0b490b0f01 [fixed] blank screen after in a certain combination of pav_pharamacy events. Reported by Damian 3 月之前
  anjuna krokus ca88f26575 [fixed] text formatting. Reported by Damian 3 月之前
  Myles Croft (Hooded Silence) f01996fb76 [Bug fix and Beta] Fixed ballet letter not appearing due to the recent daystart change. 3 月之前
  anjuna krokus b421f31ff1 [fixed] Enforced lvl floor 3 月之前
  anjuna krokus 3b4fe2c916 [changed] Used relative skill change for bimbo inhib 3 月之前
  anjuna krokus 23acb9cf47 Ensured that the start of `bordelv` wasn't set repeatedly only to be immediately wiped 3 月之前
  anjuna krokus 6f903e8f67 [changed] more setloc routing 3 月之前
  anjuna krokus 2916145aeb [changed] added setloc functions instead of raw $loc setting 3 月之前
  anjuna krokus e5a37d052f [changed] more intro changes 3 月之前
  anjuna krokus 67efea5efe [fixed] typo in `gad_gpyard`. Reported by Skylah 3 月之前
共有 100 個文件被更改,包括 7186 次插入4893 次删除
  1. 8 8
      MakeQSP.bat
  2. 15 4
      glife.qproj
  3. 7 7
      locations/BDsex.qsrc
  4. 46 46
      locations/BurgerTip.qsrc
  5. 432 307
      locations/Cheatmenu_din.qsrc
  6. 20 20
      locations/JuliaMilHome.qsrc
  7. 4 4
      locations/KGstart.qsrc
  8. 33 35
      locations/Komp.qsrc
  9. 36 36
      locations/LCwork.qsrc
  10. 6 5
      locations/LariskaHome.qsrc
  11. 2 2
      locations/LariskaSex.qsrc
  12. 23 23
      locations/MartinSex.qsrc
  13. 154 156
      locations/MartinSex2.qsrc
  14. 48 48
      locations/MartinSex3.qsrc
  15. 27 27
      locations/Serge_kuh.qsrc
  16. 1 1
      locations/Terminal.qsrc
  17. 61 61
      locations/TerminalOffice.qsrc
  18. 1 1
      locations/Zvereva_Sly_sex.qsrc
  19. 149 149
      locations/_attributes_coco_dress.qsrc
  20. 163 163
      locations/_attributes_coco_outfits.qsrc
  21. 150 0
      locations/_attributes_danilovich_outfits.qsrc
  22. 40 0
      locations/_attributes_danilovich_shoes.qsrc
  23. 59 59
      locations/_attributes_dolls_shoes.qsrc
  24. 116 113
      locations/_attributes_eroto_dress.qsrc
  25. 162 162
      locations/_attributes_fashionista_dress.qsrc
  26. 39 39
      locations/_attributes_fashionista_outfits.qsrc
  27. 152 152
      locations/_attributes_gm_dress.qsrc
  28. 139 139
      locations/_attributes_gm_outfits.qsrc
  29. 34 34
      locations/_attributes_moncheri_dress.qsrc
  30. 77 77
      locations/_attributes_office.qsrc
  31. 1 0
      locations/_attributes_salacious_dress.qsrc
  32. 64 32
      locations/_attributes_scandalicious_shoes.qsrc
  33. 38 0
      locations/_body_image.qsrc
  34. 5 2
      locations/_shoe_description2.qsrc
  35. 4 4
      locations/agentned.qsrc
  36. 19 5
      locations/alarmclock.qsrc
  37. 99 87
      locations/albina_chat.qsrc
  38. 28 28
      locations/albina_school_sex.qsrc
  39. 88 85
      locations/albina_sex_scenes.qsrc
  40. 9 1
      locations/albina_wine_event.qsrc
  41. 1 1
      locations/anushapt.qsrc
  42. 1 1
      locations/anushapt_city.qsrc
  43. 19 7
      locations/anushka.qsrc
  44. 18 6
      locations/anushkachat.qsrc
  45. 9 3
      locations/anushkachat_city.qsrc
  46. 92 92
      locations/anushkaev1.qsrc
  47. 67 67
      locations/anushkaev2.qsrc
  48. 108 33
      locations/artem_dorm.qsrc
  49. 3 3
      locations/artem_nush_sex.qsrc
  50. 527 86
      locations/artem_sex.qsrc
  51. 537 81
      locations/artem_sex_uni.qsrc
  52. 202 126
      locations/artemhome.qsrc
  53. 94 94
      locations/auditions.qsrc
  54. 55 55
      locations/autosalonF.qsrc
  55. 78 46
      locations/bank.qsrc
  56. 1 1
      locations/bdsm_dressing.qsrc
  57. 4 4
      locations/bdsm_mansion.qsrc
  58. 0 0
      locations/bdsm_training.qsrc
  59. 1 1
      locations/bed2.qsrc
  60. 2 6
      locations/bedr.qsrc
  61. 1 1
      locations/bedr2x.qsrc
  62. 2 1
      locations/bedrPar.qsrc
  63. 8 16
      locations/bedrPar2.qsrc
  64. 9 8
      locations/begin.qsrc
  65. 186 0
      locations/beta_journal_quests.qsrc
  66. 16 22
      locations/body.qsrc
  67. 476 169
      locations/body_desc.qsrc
  68. 322 360
      locations/body_structure.qsrc
  69. 44 51
      locations/bordelv.qsrc
  70. 2 2
      locations/bras.qsrc
  71. 55 57
      locations/brother.qsrc
  72. 1 1
      locations/brother_voyeur.qsrc
  73. 12 13
      locations/buklinik.qsrc
  74. 22 21
      locations/burger.qsrc
  75. 1 1
      locations/cardgame_durak.qsrc
  76. 1 15
      locations/cikl.qsrc
  77. 39 519
      locations/city_clinic.qsrc
  78. 27 27
      locations/city_hotel.qsrc
  79. 15 18
      locations/city_house_res_misc.qsrc
  80. 1 1
      locations/city_mall.qsrc
  81. 30 30
      locations/city_mansion_entrance.qsrc
  82. 1 1
      locations/city_market.qsrc
  83. 412 412
      locations/city_musicstore_stock.qsrc
  84. 1 1
      locations/city_nightclub.qsrc
  85. 2 2
      locations/city_park.qsrc
  86. 1 1
      locations/city_sauna.qsrc
  87. 1 1
      locations/city_saunawhore.qsrc
  88. 764 0
      locations/clinic_functions.qsrc
  89. 28 24
      locations/clothing.qsrc
  90. 164 128
      locations/clothing_attributes.qsrc
  91. 1 1
      locations/coats.qsrc
  92. 2 2
      locations/core_library.qsrc
  93. 64 50
      locations/costuming_outfits1.qsrc
  94. 4 4
      locations/dachamy.qsrc
  95. 12 19
      locations/dimaEv.qsrc
  96. 2 2
      locations/dimaHome.qsrc
  97. 1 1
      locations/dimaRevenge.qsrc
  98. 74 74
      locations/dimalina.qsrc
  99. 1 1
      locations/din_bad.qsrc
  100. 3 1
      locations/din_van.qsrc

+ 8 - 8
MakeQSP.bat

@@ -75,16 +75,16 @@ set /p action=Choose an action:
 
 if defined QSPFILE (
 	if %action% == b goto build
-	if %action% == d goto build_debug
-	if %action% == r goto run
-	if %action% == f goto build
-	if %action% == v goto parser
-	if %action% == q goto qgen
 	if %action% == B goto build
+	if %action% == d goto build_debug
 	if %action% == D goto build_debug
+	if %action% == r goto run
 	if %action% == R goto run
+	if %action% == f goto build
 	if %action% == F goto build
+	if %action% == v goto parser
 	if %action% == V goto parser
+	if %action% == q goto qgen
 	if %action% == Q goto qgen
 )
 
@@ -132,7 +132,8 @@ goto menu
 echo.
 echo Running ...
 if defined CP_TO ( start %QGEN% %CP_TO%\%QSPFILE% ) else ( start %QGEN% %QSPFILE% )
-goto exit
+pause
+goto menu
 
 :parser
 echo.
@@ -141,9 +142,8 @@ echo validating...
 @ECHO ON
 "%BATDir%%QSPParser%" --level warn "%BATDir%glife.txt" > "%BATDir%validation.log"
 @ECHO off
-echo Done - Exiting.
 pause
-goto exit
+goto menu
 
 :run
 echo.

+ 15 - 4
glife.qproj

@@ -36,14 +36,14 @@
 	</Folder>
 	<Folder name="Stats">
 		<Location name="DNA"/>
+		<Location name="time"/>
+		<Location name="stat"/>
+		<Location name="hourly_events"/>
 		<Location name="cikl"/>
-		<Location name="daystart"/>
 		<Location name="yearstart"/>
 		<Location name="dina"/>
 		<Location name="MenuMainLoc"/>
 		<Location name="starenie"/>
-		<Location name="stat"/>
-		<Location name="hourly_events"/>
 		<Location name="stat_display"/>
 		<Location name="stat_sklattrib"/>
 		<Location name="stat_sklattrib_lvlset"/>
@@ -55,6 +55,8 @@
 		<Location name="kid"/>
 		<Location name="pattest"/>
 		<Location name="subkid"/>
+	</Folder>
+	<Folder name="Homes">
 		<Location name="homes_properties"/>
 		<Location name="homes_properties_attr"/>
 	</Folder>
@@ -82,6 +84,7 @@
 		<Location name="grades"/>
 		<Location name="internet_mobile"/>
 		<Location name="library_functions"/>
+		<Location name="clinic_functions"/>
 	</Folder>
 	<Folder name="Sleep">
 		<Location name="pre_sleep"/>
@@ -105,6 +108,7 @@
 		<Location name="medical_din"/>
 		<Location name="sweat"/>
 		<Location name="piercing_management"/>
+		<Location name="tattoo_management"/>
 		<Location name="$face_image"/>
 		<Location name="$body_image"/>
 	</Folder>
@@ -126,11 +130,12 @@
 	</Folder>
 	<Folder name="Clothing">
 		<Location name="wardrobe"/>
+		<Location name="changingroom"/>
+		<Location name="outfit"/>
 		<Location name="clothing"/>
 		<Location name="clothing_QV"/>
 		<Location name="$clothing_image"/>
 		<Location name="$pcs_outfit_image"/>
-		<Location name="changingroom"/>
 		<Location name="clothing_attributes"/>
 		<Location name="clothing_descriptions"/>
 		<Location name="$short_description"/>
@@ -1408,6 +1413,12 @@
 		<Location name="pushkin_theatre"/>
 		<Location name="city_canals"/>
 	</Folder>
+	<Folder name="npc_quests">
+		<Location name="quest_data_a274"/>
+	</Folder>
+	<Folder name="beta_code">
+		<Location name="beta_journal_quests"/>
+	</Folder>
 	<Location name="cleanHTML"/>
 	</Structure>
 </QGen-project>

+ 7 - 7
locations/BDsex.qsrc

@@ -7,19 +7,19 @@ if $ARGS[0] = 'start':
 	!!gs 'BDsex', 'start'
 
 	if NoGuy = 0:guy += 1
-	
+
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/sex/pet/petting1.jpg"></center>'
 
 	if harakBoy = 0:
 		'<<$boydesc>> hugs you and gently caresses your breasts.'
-		
+
 		gs 'willpower', 'cuni', 'force'
 		if will_cost <= pcs_willpwr:
 			act 'Order him to lick you (<<will_cost>> Willpower)':gs 'willpower', 'pay', 'force' & gt 'BDsex', 'kuni'
 		else
 			act 'Order him to lick you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 		act 'Stroke his cock':gt 'BDsex', 'hj'
 		act 'Suck his dick':gt 'BDsex', 'minet'
 		act 'Lie on your back and spread your legs ':gt 'BDsex', 'sex'
@@ -51,10 +51,10 @@ if $ARGS[0] = 'start':
 
 			act 'Stroke his cock':gt 'BDsex', 'hj'
 			act 'Take by mouth':gt 'BDsex', 'minet'
-			act 'Tell him you prefer to lay down and happily spreading your legs for him':gt 'BDsex', 'sex'
+			act 'Tell him you prefer to lay down and happily spread your legs for him':gt 'BDsex', 'sex'
 		end
 	elseif harakBoy = 2:
-		'<<$boydesc>> hugs you and passionately caress your breasts.'
+		'<<$boydesc>> hugs you and passionately caresses your breasts.'
 		gs 'arousal', 'foreplay', 5
 		gs 'stat'
 		tmpbrand = rand(0, 100)
@@ -123,7 +123,7 @@ if $ARGS[0] = 'kuni':
 		$orgasm_or = 'custom'
 		gs 'stat'
 	else
-		'His tongue work is exciting, but after awhile, you begin to grow bored.'
+		'His tongue work is exciting, but After a while, you begin to grow bored.'
 	end
 
 	act 'Stroke his cock':gt 'BDsex', 'hj'
@@ -454,7 +454,7 @@ if $ARGS[0] = 'minet':
 end
 
 if $ARGS[0] = 'facial':
-	
+
 	minut += 3
 	'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial<<rand(11, 15)>>.jpg"></center>'
 	if protect = 1:

+ 46 - 46
locations/BurgerTip.qsrc

@@ -46,13 +46,13 @@ if $ARGS[0] = 'work':
 			if bossrand = 0:
 				killvar'bossrand'
 				'When you enter Anatoly''s office he glances up and says, "<<$pcs_nickname>>, bring me a cup of coffee."'
-				
+
 				act 'Fetch him a coffee':
 					*clr&cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work3.jpg"></center>'
 					'You deliver him a coffee on a little tray, with cream and sugar on the side. He doesn''t comment on your extra effort.'
-				
+
 					if BurgerQW['WorkShift'] = 1:
 						act 'Have your lunch': gt 'burgerWork', 'work'
 					elseif BurgerQW['WorkShift'] = 2:
@@ -68,7 +68,7 @@ if $ARGS[0] = 'work':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work9.jpg"></center>'
 					'You hand the papers over to the accountant. Lena mutters something under her breath, before reading though them and signing. "OK, back to Anatoly, girl," she says, handing you the documents.'
-					
+
 					act 'Back to Anatoly':
 						*clr&cla
 						gs 'stat'
@@ -119,7 +119,7 @@ if $ARGS[0] = 'work':
 				if bossexrand = 1:'His hand slides down your stomach, and crawls under your skirt. You moan softly when his hand begins to caress your pussy.'
 				if bossexrand = 2:'He grabs your ass, and lifting up your skirt begins to knead your ass like dough.'
 				if bossexrand = 3:'He puts his hands on your hips, and slowly raises your skirt.'
-				killvar'bossexrand' 
+				killvar'bossexrand'
 				gs 'boyStat', 'A74'
 
 				act 'Kiss him':
@@ -132,9 +132,9 @@ if $ARGS[0] = 'work':
 					gs 'arousal', 'foreplay', 5, 'sub'
 					minut -= 5
 					gs 'stat'
-					
+
 					act 'Suck his dick': gt 'BurgerTip', 'bj'
-					
+
 					if stat['think_virgin'] = 0 or pcs_ass > 0:
 						act 'Have sex':
 							*clr&cla
@@ -146,16 +146,16 @@ if $ARGS[0] = 'work':
 
 							gs 'arousal', 'vaginal_finger', 5, 'sub'
 							gs 'stat'
-						
+
 							if bosstipsexrand >= 3:
 								act 'Moan': gt 'BurgerTip', 'sex2'
 							elseif bosstipsexrand < 3:
 								killvar'bosstipsexrand'
 								'His hand goes further finding your sphincter with one of his fingers. The probing of his finger leaves no doubt about what he wants.'
-								
+
 								gs 'arousal', 'anal_finger', 5, 'sub'
 								gs 'stat'
-							
+
 								act 'Take it in the ass':gt 'BurgerTip', 'anal2'
 							end
 						end
@@ -176,7 +176,7 @@ if $ARGS[0] = 'work':
 
 						gs 'arousal', 'foreplay', 5, 'sub'
 						gs 'stat'
-						
+
 						act 'Suck his dick': gt 'BurgerTip', 'bj'
 					end
 
@@ -259,7 +259,7 @@ if $ARGS[0] = 'work':
 				if bburand = 0:
 					killvar'bburand'
 					'The senior manager Ilyushkin shows up in your office.'
-					
+
 					if $BurgerQW['IlyQWBlackmailPhoto'] = '' or BurgerQW['IlyQWBlackmail'] > 1:
 						'Ilyushkin grins, "Honey, I need you to put your stamp on these papers." You give Ilyushkin a skeptical look, as you find your company stamp. Then you put your stamp on the papers, and hand the back to Ilyushkin.'
 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'work':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/kafe.jpg"></center>'
 								'Sergei takes you to a local restaurant not far from work. He orders food and drinks for both of you, after you find a table. Soon you are chatting, eating and drinking wine with Sergei. Before you realize it, you start feeling a little tipsy, but the conversation is still pleasant enough. When you are finished Sergei pays for everything, and invites you back to his place.'
-						
+
 								act 'Let him down easy':
 									*clr&cla
 									minut += 15
@@ -377,16 +377,16 @@ if $ARGS[0] = 'work':
 						act 'Go to the sauna':
 							*clr&cla
 							gs 'stat'
-							
+
 							if SaunaWhore > 0:
-								
+
 								BurgerQW['SaunaWhoreKnown'] = 1
-								'When you enter the sauna and stop dead in your tracks when you see the madam."<<$pcs_nickname>>, what a surprise are you coming back to work for us."' 
+								'When you enter the sauna and stop dead in your tracks when you see the madam."<<$pcs_nickname>>, what a surprise are you coming back to work for us."'
 								'Anatoly says, "Whats going on here?"'
 								'"Oh, you don''t know? Little <<$pcs_nickname>> is one of the best little cocksuckers I''ve ever had work for me, and her pussy is a goldmine," she laughs.'
 								'Anatoly is furious: "How? <<$pcs_nickname>>? You''re just a common whore?" If that''s the case you can stay here, and ply your trade. I guess I was wrong about you." He storms off, and moments later you here the screech of his car tires as he drives away.'
 								'The madam continues: "<<$pcs_nickname>>, you''re a whore. You will always be a whore. If you do manage to trick some nice man your past will eventually catch up with you. Consider this a free lesson."'
-								
+
 								act 'Leave':gt 'city_residential'
 							elseif SaunaWhore = 0:
 								'You head into the sauna, and up to your luxury room. Anatoly doesn''t waste anytime undressing, and motions for you to do the same. When you are both naked, he motions for you to come to him. You know just what to do.'
@@ -395,17 +395,17 @@ if $ARGS[0] = 'work':
 									*clr&cla
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/city/anatoly/sex/bossbjs.jpg"></center>'
-									'You kneel before your Anatoly, and shower his groin with gentle kisses and little licks. He is rock-hard and ready in no time. You tease him a little by sucking on just the tip of his cock, for awhile. When it looks like he can''t take it anymore, you slide his entire cock into your mouth. You bob your head up and down vigorously, savoring the taste of the boss''s cock. Before you can finish him, he pulls himself from your mouth, and motions for you to follow him to the bench.'
+									'You kneel before your Anatoly, and shower his groin with gentle kisses and little licks. He is rock-hard and ready in no time. You tease him a little by sucking on just the tip of his cock, for a while. When it looks like he can''t take it anymore, you slide his entire cock into your mouth. You bob your head up and down vigorously, savoring the taste of the boss''s cock. Before you can finish him, he pulls himself from your mouth, and motions for you to follow him to the bench.'
 
 									gs 'arousal', 'bj', 5, 'sub'
 									gs 'stat'
-									
+
 									if pcs_vag = 0:
 										'Wait! You''ve never had sex before!'
 										'Anatoly grins and says, "It''s not that big of a deal just lay down on this bench and relax. All secretaries do it for their bosses from time to time."'
 										'He continues, "Now just spread your legs a little. I promise you''ll enjoy this, just maybe not as much as me."'
 									end
-									
+
 									act 'Further':
 										*clr&cla
 										minut += 5
@@ -446,7 +446,7 @@ if $ARGS[0] = 'work':
 										gs 'arousal', 'vaginal', 15, 'sub'
 										gs 'arousal', 'end'
 										gs 'stat'
-						
+
 										act 'Leave':gt 'city_residential'
 									end
 								end
@@ -463,11 +463,11 @@ if $ARGS[0] = 'work':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/city/anatoly/sex/bossbjcar.jpg"></center>'
 							'Determined to send Anatoly home with a smile, you lean over and unzip his pants. You wrap your <<$pc_desc[''lips'']>> lipss around his flaccid penis, and start working your magic. Soon your mouth is full of hard throbbing cock. You make an effort to get him home quickly, and suck like a woman possessed with the need for seed. He does finish quickly, and you slurp it all down with a smile. Anatoly gets himself back in his pants, and sends you on your way saying, "Thanks babe, you''re the best."'
-							
+
 							gs 'arousal', 'bj', 5, 'sub'
 							gs 'arousal', 'end'
 							gs 'stat'
-						
+
 							act 'Leave':gt 'city_center'
 						end
 					end
@@ -583,7 +583,7 @@ if $ARGS[0] = 'work':
 
 		if BurgerQW['SlutReputation'] < 10:
 			'The lady looks at you scornfully and asks, "Is he in there?" You nod your head meekly. Without knocking she marches into Anatoly''s office. A short time later they both come back out. "Yes dear, I''ll see you at your mothers house later, I promise," he says, as he ushers her out the door. After she is gone, he chuckles, "My wife is a rare bitch."'
-		
+
 			if BurgerQW['WorkShift'] = 1:
 				act 'Have your lunch': gt 'burgerWork', 'work'
 			elseif BurgerQW['WorkShift'] = 2:
@@ -594,7 +594,7 @@ if $ARGS[0] = 'work':
 		if BurgerQW['SlutReputation'] >= 10:
 			'She looks at you with contempt, and storms into Anatoly''s office. You can here her screaming through the door: "I know all about your adventures with that slut out there. If you don''t send your whore packing immediately I''m leaving you, and taking you for everything you''re worth." With that she storms out of the office, and spits on you on her way out the door.'
 			'A few minutes later Anatoly comes out, and says, "<<$pcs_nickname>>, I''m sorry, I can''t afford to lose my marriage over you. I''m going to have to insist on your resignation."'
-			
+
 			act 'Write a letter of resignation':
 				*clr&cla
 				work = 0
@@ -631,7 +631,7 @@ if $ARGS[0] = 'bj':
 
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
-	
+
 	if wantrand = 3:
 		'After a short time, Anatoly takes his cock from your mouth and says, "<<$pcs_nickname>>, I want all of you."'
 		if stat['think_virgin'] = 0 or pcs_ass > 0:
@@ -721,7 +721,7 @@ if $ARGS[0] = 'toilet_wash':
 	gs 'cum_cleanup'
 	cumspclnt = 6
 	gs 'cum_cleanup'
-				
+
 	'You go into the bathroom, and turn the water on in the sink. <<$deytoibur>><<$deytoibur2>>'
 	killvar'$deytoibur'
 	killvar'$deytoibur2'
@@ -764,27 +764,27 @@ if $ARGS[0] = 'bj_cum':
 
 		gs 'arousal', 'hj', 5, 'sub'
 		gs 'stat'
-		
+
 		act 'Go to the toilet': gt 'BurgerTip', 'toilet'
 	elseif reaktrand > 5 and reaktrand < 9:
 		gs 'cum_call', 'clothes', 'A74', 1
 		'<center><img <<$set_imgh>> src="images/characters/city/anatoly/sex/bossbjcum2.jpg"></center>'
 		'Not wanting a mouth full of cum, you decide to jerk Anatoly to completion. Oh dear, it looks like your clever plan backfired. Anatoly managed to shoot his load all over your pretty outfit. It looks sexy, but you better head to the bathroom before it stains.'
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Go to the toilet': gt 'BurgerTip', 'toilet'
 	elseif reaktrand >= 9:
 		gs 'cum_call', 'face', 'A74', 1
 		gs 'cum_call', 'clothes', 'A74', 1
-		
+
 		'<center><img <<$set_imgh>> src="images/characters/city/anatoly/sex/bossbjcum3.jpg"></center>'
 		'Not wanting a mouth full of cum, you decide to jerk Anatoly to completion. You realize your error when jets of semen splatter against your face and clothes. You manage to get most of it off your face with a tissue, but you better get to the little girls room before it stains your top.'
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Go to the toilet': gt 'BurgerTip', 'toilet'
 	end
 
@@ -800,7 +800,7 @@ if $ARGS[0] = 'bj2':
 
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
-		
+
 	act 'Show him how full your mouth is':
 		*clr&cla
 		gs 'stat'
@@ -820,10 +820,10 @@ if $ARGS[0] = 'bj2':
 			gs 'cum_call', 'clothes', 'A74', 1
 			gs 'stat'
 			'Afterword, you notice you got some of his semen on your blouse.'
-			
+
 			gs 'arousal', 'end'
 			gs 'stat'
-		
+
 			act 'Go to the toilet': gt 'BurgerTip', 'toilet'
 		end
 	end
@@ -880,7 +880,7 @@ if $ARGS[0] = 'sex':
 	'You urge him on with your moans, and a little wiggle of your hips.'
 	!!gs 'dinsex','sexcum'
 	bosswantrand = rand(0, 10)
-	
+
 	gs 'arousal', 'vaginal', 10, 'sub'
 	gs 'cum_call', 'precum', 'A74', 1
 	gs 'stat'
@@ -889,10 +889,10 @@ if $ARGS[0] = 'sex':
 		killvar'bosswantrand'
 		gs 'cum_call', 'butt', 'A74', 1
 		'<<$boydesc>> withdraws his cock, and shoots hot streams of semen all over your naked ass.'
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		if BurgerQW['WorkShift'] = 1:
 			act 'Have your lunch': gt 'burgerWork', 'work'
 		elseif BurgerQW['WorkShift'] = 2:
@@ -916,7 +916,7 @@ if $ARGS[0] = 'anal':
 	gs 'arousal', 'auto_lube', 'anal'
 	gs 'cum_call', 'butt', 'A74', 1
 	'He finishes by giving you a little smack on the ass and a "good girl".'
-	
+
 	gs 'arousal', 'anal', 10, 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -948,10 +948,10 @@ if $ARGS[0] = 'sex2':
 		killvar'bosswantrand'
 		gs 'cum_call', 'stomach', 'A74', 1
 		'<<$boydesc>> withdraws his cock, and shoots hot streams of semen all over your naked ass.'
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		if BurgerQW['WorkShift'] = 1:
 			act 'Have your lunch': gt 'burgerWork', 'work'
 		elseif BurgerQW['WorkShift'] = 2:
@@ -991,8 +991,8 @@ end
 if $ARGS[0] = 'ily_work':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/work.jpg"></center>'
 	'The senior manager Ilyushkin shows up in your office.'
-	'Ilyushkin grins, "<<$pcs_nickname>>, <<$pcs_nickname>>, I would have never imagined this from a sweet young thing like you." He puts a photo on your desk. You pick it up, and take a look. <<$BurgerQW[''IlyQWBlackmailPhoto'']>>. Ilyushkin is looking at you like a cat about to catch a mouse: "<<$pcs_nickname>>, we can''t have this our boss has aims at a career in politics. If something like this were to get out it would it would... well we can''t let that happen. I''m afraid you are just going to have to quit. Anatoly can''t be known as a man who keeps a slutty secretary."' 
-	
+	'Ilyushkin grins, "<<$pcs_nickname>>, <<$pcs_nickname>>, I would have never imagined this from a sweet young thing like you." He puts a photo on your desk. You pick it up, and take a look. <<$BurgerQW[''IlyQWBlackmailPhoto'']>>. Ilyushkin is looking at you like a cat about to catch a mouse: "<<$pcs_nickname>>, we can''t have this our boss has aims at a career in politics. If something like this were to get out it would it would... well we can''t let that happen. I''m afraid you are just going to have to quit. Anatoly can''t be known as a man who keeps a slutty secretary."'
+
 	act 'Plead with him not to show the pictures': gt 'BurgerTip', 'ily_work2'
 
 	act 'Keep silent':
@@ -1037,7 +1037,7 @@ if $ARGS[0] = 'ily_work2':
 				*clr&cla
 				BurgerQW['IlyQWBlackmail'] = 2
 				gs 'cum_call', 'face', 'A76', 1
-				
+
 				guy += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/ilyushkin/sex/ilyfacial.jpg"></center>'
@@ -1063,7 +1063,7 @@ if $ARGS[0] = 'ily_work2':
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	gs 'willpower', 'misc', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
@@ -1075,7 +1075,7 @@ if $ARGS[0] = 'ily_work2':
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 end
 
 if $ARGS[0] = 'ily_work3':

+ 432 - 307
locations/Cheatmenu_din.qsrc

@@ -81,10 +81,9 @@ end
 $cheatmenu['quicktime'] = "gs 'Cheatmenu_din', 'quicktime', ARGS[0]"
 if $ARGS[0] = 'quicktime':
 	minut += ARGS[1]
-	gs 'daystart'
 	gs 'outdoors', 'weather'
-	gs 'stat'
 	gs 'fertility', 'cum_arrcheat'
+	gs 'stat'
 	*clr & cla
 end
 
@@ -422,8 +421,8 @@ if $ARGS[0] = 'permanent':
 	'Set arousal to always be at 50 or more: <a href="exec:		cheatVars[''always_horny'']			= iif(cheatVars[''always_horny''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''always_horny'']			, ''Enabled'', ''Disabled'')>></a>'
 	'Periods (and pregnancies): <a href="exec:								dynamic $cheatmenu[''slutshot'']											& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_periods'']			, ''Disabled'', ''Enabled'')>></a>'
 	if cheatVars['no_periods'] = 0:
-		'  Automatic cheat on Tampon: <a href="exec:			cheatVars[''auto_tampons'']			= iif(cheatVars[''auto_tampons''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''auto_tampons'']			, ''Enabled'', ''Disabled'')>></a>'
-		'  Automatic period tracking: <a href="exec:			cheatVars[''track_period'']			= iif(cheatVars[''track_period''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''track_period'']			, ''Enabled'', ''Disabled'')>></a>'
+		'  Automatic cheat on Tampon: <a href="exec:			cheatVars[''auto_tampons'']			= iif(cheatVars[''auto_tampons''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''auto_tampons'']			, ''Disabled'', ''Enabled'')>></a>'
+		'  Automatic period tracking: <a href="exec:			cheatVars[''track_period'']			= iif(cheatVars[''track_period''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''track_period'']			, ''Disabled'', ''Enabled'')>></a>'
 		'  Impregnation: <a href="exec:							cheatVars[''no_pregnancy'']			= iif(cheatVars[''no_pregnancy''], 0, 1)			& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><<iif(cheatVars[''no_pregnancy'']			, ''Disabled'', ''Enabled'')>></a>'
 		if cheatVars['no_pregnancy'] = 0:
 			'    Pregnancy speed multiplier: <a href="exec:		cheatVars[''preg_speed'']			= iif(cheatVars[''preg_speed''] < 3, cheatVars[''preg_speed''] + 1, 0)	& dynamic $cheatmenu[$cheatmenu[''this_menu'']]"><b><<cheatVars[''preg_speed''] + 1>></b></a>'
@@ -454,8 +453,9 @@ end
 
 $cheatmenu['bank_money'] = "gs 'Cheatmenu_din', 'bank_money'"
 if $ARGS[0] = 'bank_money':
-	karta = input ("How much money do you want to have in the bank?")
+	karta = input("How much money do you want to have in the bank?")
 	if karta < 0: karta = 0
+	karta += bankDebtLimit
 	dynamic $cheatmenu['state']
 end
 
@@ -570,7 +570,7 @@ if $ARGS[0] = 'state':
 	'<a href="exec:money = 0 & dynamic $cheatmenu[''state''] & gs ''stat''">Zero money</a>'
 	if bankAccount = 1:
 		'<a href="exec:dynamic $cheatmenu[''bank_money''] & gs ''stat''">Change money in the bank</a>'
-		'<a href="exec: karta = 0 & dynamic $cheatmenu[''state''] & gs ''stat''">Zero money in the bank</a>'
+		'<a href="exec: karta = bankDebtLimit & dynamic $cheatmenu[''state''] & gs ''stat''">Zero money in the bank</a>'
 	else
 		'<b>You need to open a bank account before getting access to change money in the bank</b>'
 	end
@@ -858,38 +858,38 @@ if $ARGS[0] = 'looks':
 	if tits < 11 and pcs_mass['bust_gen'] < 50:'<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_bust'', 5">Enlarge breasts (natural)</a>'
 	if pcs_mass['bust'] => 6 and pcs_mass['bust_gen'] => 6: '<a href="exec: titreduc = 1 & gs ''Cheatmenu_din'', ''change_pcs_mass_bust'', -5">Shrink breasts (natural)</a>'
 	*nl
-	if pcs_butt <= 14:
-		$pcs_butt[1] = 'flat'
-	elseif pcs_butt <= 25:
-		$pcs_butt[1] = 'average'
-	elseif pcs_butt <= 40:
-		$pcs_butt[1] = 'pert'
-	elseif pcs_butt <= 59:
-		$pcs_butt[1] = 'heart-shaped'
+	if pcs_buttsize <= 14:
+		$cmd_temp_butt_desc = 'flat'
+	elseif pcs_buttsize <= 25:
+		$cmd_temp_butt_desc = 'average'
+	elseif pcs_buttsize <= 40:
+		$cmd_temp_butt_desc = 'pert'
+	elseif pcs_buttsize <= 59:
+		$cmd_temp_butt_desc = 'heart-shaped'
 	else
-		$pcs_butt[1] = 'bubble'
+		$cmd_temp_butt_desc = 'bubble'
 	end
-	'You have a <<$pcs_butt[1]>> butt'
-	if pcs_butt < 50: '<a href="exec: bodyVars[''butt_silicone''] += 10 & dynamic $cheatmenu[''looks'']">Enlarge butt (silicone)</a>'
+	'You have a <<$cmd_temp_butt_desc>> butt'
+	if pcs_buttsize < 50: '<a href="exec: bodyVars[''butt_silicone''] += 10 & dynamic $cheatmenu[''looks'']">Enlarge butt (silicone)</a>'
 	if bodyVars['butt_silicone'] => 1: '<a href="exec: bodyVars[''butt_silicone''] = max(0, bodyVars[''butt_silicone'']-10) & dynamic $cheatmenu[''looks'']">Shrink butt (silicone)</a>'
 	if pcs_mass['butt'] < 50 and pcs_mass['butt_gen'] < 50: '<a href="exec: gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', 10">Enlarge butt (natural)</a>'
 	if pcs_mass['butt'] => 6 and pcs_mass['butt_gen'] => 6: '<a href="exec: assreduc = 1 & gs ''Cheatmenu_din'', ''change_pcs_mass_butt'', -10">Shrink butt (natural)</a>'
-
-	!! if pcs_butt < 20:'<a href="exec: bodyVars[''butt_cheat''] += 2 & dynamic $cheatmenu[''looks'']">Enlarge butt</a>'
-	!! if pcs_butt > 1:'<a href="exec: bodyVars[''butt_cheat''] -= 2 & dynamic $cheatmenu[''looks'']">Shrink butt</a>'
+	killvar '$cmd_temp_butt_desc'
+	!! if pcs_buttsize < 20:'<a href="exec: bodyVars[''butt_cheat''] += 2 & dynamic $cheatmenu[''looks'']">Enlarge butt</a>'
+	!! if pcs_buttsize > 1:'<a href="exec: bodyVars[''butt_cheat''] -= 2 & dynamic $cheatmenu[''looks'']">Shrink butt</a>'
 	!! if bodyVars['butt_cheat'] ! 0:'<a href="exec: bodyVars[''butt_cheat''] = 0 & dynamic $cheatmenu[''looks'']">Reset butt shape to default</a>'
 	*nl
-	'<<$lip>>'
+	'<<$pc_descFull[''lip'']>>'
 	if pcs_lip < 4:'<a href="exec:pcs_lip += 1 & dynamic $cheatmenu[''looks'']">Enlarge lips</a>'
 	if pcs_lip > 0:'<a href="exec:pcs_lip -= 1 & dynamic $cheatmenu[''looks'']">Shrink lips</a>'
 	*nl
-	'<<$skin>>'
+	'<<$pc_descFull[''skin'']>>'
 	if pcs_skin < 900: '<a href="exec:pcs_skin += 200 & gs ''AppearanceSystem'', ''UpdateBaseAppearance'' & dynamic $cheatmenu[''looks'']">Improve skin</a>'
 	if pcs_skin > 0: '<a href="exec:pcs_skin -= 200 & gs ''AppearanceSystem'', ''UpdateBaseAppearance'' & dynamic $cheatmenu[''looks'']">Worsen skin</a>'
 	if pcs_tan >= 0:'<a href="exec:pcs_tan += 10 & dynamic $cheatmenu[''looks'']">Become tanned</a>'
 	if pcs_tan > 0:'<a href="exec:pcs_tan = 0 & dynamic $cheatmenu[''looks'']">Remove tan</a>'
 	*nl
-	'<<$pcs_throat>>'
+	'<<$pc_descFull[''throat'']>>'
 	if pcs_throat <= 31:'<a href="exec:pcs_throat += 5 & dynamic $cheatmenu[''looks'']">Increase throat capacity</a>'
 	if pcs_throat >= 5:'<a href="exec:pcs_throat -= 5 & dynamic $cheatmenu[''looks'']">Decrease throat capacity</a>'
 	if dounspell = 1:
@@ -958,7 +958,7 @@ if $ARGS[0] = 'looks':
 	if hairgrowcht = 0:'<a href="exec:hairgrowcht = 1 & dynamic $cheatmenu[''looks'']">Stop hair growth</a>'
 	if hairgrowcht = 1:'<a href="exec:hairgrowcht = 0 & dynamic $cheatmenu[''looks'']">Allow hair growth</a>'
 	*nl
-	'<<$glaza>>'
+	'<<$pc_descFull[''eyes'']>>'
 	if pcs_naturallashes < 2:'<a href="exec:pcs_naturallashes += 1 & dynamic $cheatmenu[''looks'']">Enlarge lashes</a>'
 	if pcs_naturallashes > 0:'<a href="exec:pcs_naturallashes -= 1 & dynamic $cheatmenu[''looks'']">Shrink lashes</a>'
 	if pcs_eyesize < 3:'<a href="exec:pcs_eyesize += 1 & dynamic $cheatmenu[''looks'']">Increase the size of the eye</a>'
@@ -1603,41 +1603,32 @@ if $ARGS[0] = 'reputation':
 	'<font color="blue"><b>Nicholas'' Family</b></font>'
 	'<a href="exec:gt ''nichUtil'', ''debug''">Storyline Debug Menu</a>'
 
-	if pcs_lovers[0] = 1:
-		*nl
-		'You are dating <<$loverdesc[0]>>.'
-		if loverrelation[0] < 0: loverrelation[0] = 0
-		if loverdays[0] < 0: loverdays[0] = 0
-		if haraklover[0] > 2: haraklover[0] = 0
-		if loverizvrat[0] > 1: loverizvrat[0] = 0
-		'Change lover''s personality: <a href="exec:haraklover[0] += 1 & dynamic $cheatmenu[''reputation'']"><<haraklover[0]>></a>'
-		'Change lover''s perversion: <a href="exec:loverizvrat[0] += 1 & dynamic $cheatmenu[''reputation'']"><<loverizvrat[0]>></a>'
-		'Relationship: <<loverrelation[0]>> <a href="exec:loverrelation[0] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:loverrelation[0] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
-		'You''ve been dating for <<loverdays[0]>> days. <a href="exec:loverdays[0] += 5 & dynamic $cheatmenu[''reputation'']">+5</a> <a href="exec:loverdays[0] -= 5 & dynamic $cheatmenu[''reputation'']">-5</a>'
-	end
-	if pcs_lovers[1] = 1:
-		*nl
-		'You are dating <<$loverdesc[1]>>.'
-		if loverrelation[1] < 0: loverrelation[1] = 0
-		if loverdays[1] < 0: loverdays[1] = 0
-		if haraklover[1] > 2: haraklover[1] = 0
-		if loverizvrat[1] > 1: loverizvrat[1] = 0
-		'Change lover''s personality: <a href="exec:haraklover[1] += 1 & dynamic $cheatmenu[''reputation'']"><<haraklover[1]>></a>'
-		'Change lover''s perversion: <a href="exec:loverizvrat[1] += 1 & dynamic $cheatmenu[''reputation'']"><<loverizvrat[1]>></a>'
-		'Relationship: <<loverrelation[1]>> <a href="exec:loverrelation[1] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:loverrelation[1] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
-		'You''ve been dating for <<loverdays[1]>> days. <a href="exec:loverdays[1] += 5 & dynamic $cheatmenu[''reputation'']">+5</a> <a href="exec:loverdays[1] -= 5 & dynamic $cheatmenu[''reputation'']">-5</a>'
-	end
-	if pcs_lovers[2] = 1:
-		*nl
-		'You are dating <<$loverdesc[2]>>.'
-		if loverrelation[2] < 0: loverrelation[2] = 0
-		if loverdays[2] < 0: loverdays[2] = 0
-		if haraklover[2] > 2: haraklover[2] = 0
-		if loverizvrat[2] > 1: loverizvrat[2] = 0
-		'Change lover''s personality: <a href="exec:haraklover[2] += 1 & dynamic $cheatmenu[''reputation'']"><<haraklover[2]>></a>'
-		'Change lover''s perversion: <a href="exec:loverizvrat[2] += 1 & dynamic $cheatmenu[''reputation'']"><<loverizvrat[2]>></a>'
-		'Relationship: <<loverrelation[2]>> <a href="exec:loverrelation[2] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec:loverrelation[2] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
-		'You''ve been dating for <<loverdays[2]>> days. <a href="exec:loverdays[2] += 5 & dynamic $cheatmenu[''reputation'']">+5</a> <a href="exec:loverdays[2] -= 5 & dynamic $cheatmenu[''reputation'']">-5</a>'
+	temp_cmd_i = 0
+	:loverrelationshiploop
+	if temp_cmd_i < arrsize('$lover'):
+		if pcs_lovers[temp_cmd_i] = 1:
+			$temp_npcid = $lover[temp_cmd_i]
+			*nl
+			'You are dating <<$npc_usedname[$temp_npcid]>>.'
+			if loverrelation[temp_cmd_i] < 0: loverrelation[temp_cmd_i] = 0
+			if loverdays[temp_cmd_i] < 0: loverdays[temp_cmd_i] = 0
+			if npc_gentle[$temp_npcid] = 1:
+				'Change lover''s personality: <a href="exec: npc_gentle[<<$temp_npcid>>] = 0 & dynamic $cheatmenu[''reputation'']">Gentle</a>'
+			elseif npc_rough[$temp_npcid] = 0:
+				'Change lover''s personality: <a href="exec: npc_rough[<<$temp_npcid>>] = 1 & dynamic $cheatmenu[''reputation'']">Normal</a>'
+			else
+				'Change lover''s personality: <a href="exec: npc_rough[<<$temp_npcid>>] = 0 & npc_gentle[<<$temp_npcid>>] = 1 & dynamic $cheatmenu[''reputation'']">Rough</a>'
+			end
+			if npc_pervert[$temp_npcid] = 0:
+				'Change lover''s perversion: <a href="exec: npc_pervert[<<$temp_npcid>>] = 1 & dynamic $cheatmenu[''reputation'']">Not perverted</a>'
+			else
+				'Change lover''s perversion: <a href="exec: npc_pervert[<<$temp_npcid>>] = 0 & dynamic $cheatmenu[''reputation'']">Perverted</a>'
+			end
+			'Relationship: <<loverrelation[temp_cmd_i]>> <a href="exec: loverrelation[<<temp_cmd_i>>] += 10 & dynamic $cheatmenu[''reputation'']">+10</a> <a href="exec: loverrelation[<<temp_cmd_i>>] -= 10 & dynamic $cheatmenu[''reputation'']">-10</a>'
+			'You''ve been dating for <<loverdays[temp_cmd_i]>> days. <a href="exec:loverdays[<<temp_cmd_i>>] += 5 & dynamic $cheatmenu[''reputation'']">+5</a> <a href="exec: loverdays[<<temp_cmd_i>>] -= 5 & dynamic $cheatmenu[''reputation'']">-5</a>'
+		end
+		temp_cmd_i += 1
+		jump 'loverrelationshiploop'
 	end
 	*nl
 	if fame['pav_slut'] >= 50:
@@ -1743,8 +1734,8 @@ if $ARGS[0] = 'week':
 	gs 'stat'
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	*nl
-	'Current time: <b><<$week[week]>></b>, <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
-	'Target time: <b><<$week[temp_week]>></b>, <b><<temp_day>></b>. day of <b><<$temp_month>></b>, <b><<temp_year>></b>, <<$temptime>>'
+	'Current time: <b><<$week[week]>></b>, <b><<day>></b> of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
+	'Target time: <b><<$week[temp_week]>></b>, <b><<temp_day>></b> of <b><<$temp_month>></b>, <b><<temp_year>></b>, <<$temptime>>'
 	*nl
 	'<a href="exec:temp_daystart += 1 - temp_week & dynamic $cheatmenu[''time'']">Monday</a>'
 	'<a href="exec:temp_daystart += 2 - temp_week & dynamic $cheatmenu[''time'']">Tuesday</a>'
@@ -1761,8 +1752,8 @@ if $ARGS[0] = 'month':
 	gs 'stat'
 	'<center><a href="exec:dynamic $cheatmenu[''index'']"><b>Cheat menu</b></a> - <a href="exec:dynamic $cheatmenu[''time'']"><b>Time</b></a></center>'
 	*nl
-	'Current time: <b><<$week[week]>></b>, <b><<day>></b>. day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
-	'Target time: <b><<$week[temp_week]>></b>, <b><<temp_day>></b>. day of <b><<$temp_month>></b>, <b><<temp_year>></b>, <<$temptime>>'
+	'Current time: <b><<$week[week]>></b>, <b><<day>></b>,  of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
+	'Target time: <b><<$week[temp_week]>></b>, <b><<temp_day>></b>, of <b><<$temp_month>></b>, <b><<temp_year>></b>, <<$temptime>>'
 	*nl
 	'<a href="exec:dynamic $cheatmenu[''month2''], 1">January</a>'
 	'<a href="exec:dynamic $cheatmenu[''month2''], 2">February</a>'
@@ -1780,28 +1771,22 @@ end
 
 $cheatmenu['month2'] = "gs 'Cheatmenu_din', 'month2', $ARGS[0]"
 if $ARGS[0] = 'month2':
-	gs 'daystart', 'to_daystart', 1, ARGS[1], temp_year
+	gs 'time', 'to_daystart', 1, ARGS[1], temp_year
 	temp_daystart = dateVars['daystart']
 	dynamic $cheatmenu['time']
 end
 
 $cheatmenu['time'] = "gs 'Cheatmenu_din', 'time'"
 if $ARGS[0] = 'time':
-	gs 'daystart', 'to_date', temp_daystart
+	gs 'time', 'to_date', temp_daystart
 	temp_day = dateVars['day']
 	temp_week = dateVars['week']
 	temp_month = dateVars['month']
 	$temp_month = $dateVars['month_text']
 	temp_year = dateVars['year']
+	$temp_day_suffix = $dateVars['suffix']
 	!! Set transients as gs to emp_functions unreliable for checking day
-	transient_evt_day = day
-	gs 'emp_functions', 'evt_day_suffix', day
-	$day_suffix = $evt_suffix
-	transient_evt_day = temp_day
-	gs 'emp_functions', 'evt_day_suffix', temp_day
-	$temp_day_suffix = $evt_suffix
-	killvar '$evt_suffix'
-	gs 'daystart'
+	gs 'time', 'update_date'
 	gs 'outdoors', 'temp_set'
 	gs 'stat'
 
@@ -1840,8 +1825,8 @@ if $ARGS[0] = 'time':
 		if hour > 9: $tempcurtime = '<b><<hour>>:0<<minut>></b>' else $tempcurtime = '<b>0<<hour>>:0<<minut>></b>'
 	end
 
-	'Current time: <b><<$week[week]>></b>, <b><<day>><<$day_suffix>></b>, day of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
-	'Target time: <b><<$week[temp_week]>></b>, <b><<temp_day>><<$temp_day_suffix>></b>, day of <b><<$temp_month>></b>, <b><<temp_year>></b>, <<$temptime>>'
+	'Current time: <b><<$week[week]>></b>, <b><<day>><<$day_suffix>></b>, of <b><<$month>></b>, <b><<year>></b>, <<$tempcurtime>>'
+	'Target time: <b><<$week[temp_week]>></b>, <b><<temp_day>><<$temp_day_suffix>></b>, of <b><<$temp_month>></b>, <b><<temp_year>></b>, <<$temptime>>'
 	'Daychange: <<temp_daystart - daystart>>'
 	*nl
 	'Year:	<a href="exec:temp_daystart += 365 & dynamic $cheatmenu[''time'']">+1 Year</a>	<a href="exec:temp_daystart -= 365 & dynamic $cheatmenu[''time'']">-1 Year</a>'
@@ -3072,287 +3057,427 @@ if $ARGS[0] = 'fame':
 
 end
 
+
+
+
 !!----------------------------------------------------------------------------------------------------------------------------
 !! Body Image Sets
 !!----------------------------------------------------------------------------------------------------------------------------
 
-$cheatmenu['bdimcstaddpro'] = "gs 'Cheatmenu_din', 'bdimcstaddpro'"
-if $ARGS[0] = 'bdimcstaddpro':
-	$tmpstrg = input("Enter folder name, do not include ''\''")
-	if $tmpstrg = '':
-		killvar '$tmpstrg'
-		dynamic $cheatmenu['bdimcstadd']
-	else
-		bodsetcnt += 1
-		cyci1 = 0
-		:addcyc
-		$bodimgsets[((bodsetcnt * 10) + cyci1)] = $bodimgsets[(10 + cyci1)]
-		cyci1 += 1
-		if cyci1 < 9: jump 'addcyc'
-		$bodimgsets[((bodsetcnt * 10) + 9)] = $tmpstrg
-		imgset6ovr[bodsetcnt] = 0
-		imgset7ovr[bodsetcnt] = 0
-		killvar '$tmpstrg'
-		killvar 'cyci1'
-		dynamic $cheatmenu['bdimmain']
-	end
-end
 
-$cheatmenu['bdimcstadd'] = "gs 'Cheatmenu_din', 'bdimcstadd'"
-if $ARGS[0] = 'bdimcstadd':
+$cheatmenu['bdimmain'] = "gs 'Cheatmenu_din', 'bdimmain'"
+if $ARGS[0] = 'bdimmain':
 	*clr & cla
-	'<center><b>Body Image Set Addition</b></center>'
-	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimmain'']"><b>Go Back</b></a>'
-	*nl
-	'This is where you can add a new image set to a game.'
-	'To add an image set, create a folder in images/pc/body/shape/ and name it anything you want (shorter will be easier to remember). Then put in it any images you want named 1.jpg, 2.jpg, etc. up 5, 6, or 7. Just make sure it contains images 1 to 5. Once you have done that, click the link below and put in your folder name to add that set.'
-	'Note: This will only be for this instance/save of the game and you will have to redo the click the link step if you want to add the same folder to a different instance/save.'
+	gs 'stat'
+	gs 'obj_din', 'cheattabs'
+	'<center><h1>Cheat Menu - Body Image Sets</h1></center>'
+	$cheatmenu['table_start']
+	'<center><b>Body Image Controls</b></center>'
 	*nl
-	'<a href="exec:dynamic $cheatmenu[''bdimcstaddpro'']">Add Image Set</a>'
-end
+	if cheatVars['fix_bodyimg'] = 1:
+		$temp_text = 'You are currently using set: '
+		if cheatVars['fix_bi_set'] < 10:
+			$temp_text += $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_folder']
+		else
+			$temp_text += 'default '
+			if cheatVars['fix_bi_set'] mod 10 = 0:
+				$temp_text += 'low '
+			elseif cheatVars['fix_bi_set'] mod 10 = 1:
+				$temp_text += 'mid '
+			elseif cheatVars['fix_bi_set'] mod 10 = 2:
+				$temp_text += 'high '
+			end
 
-$cheatmenu['bdimcstdesed'] = "gs 'Cheatmenu_din', 'bdimcstdesed'"
-if $ARGS[0] = 'bdimcstdesed':
-	$tmpstrg = input("Enter a new descriptor")
-	if $tmpstrg = '':
-		killvar 'chmbddes'
-		killvar '$tmpstrg'
+			if cheatVars['fix_bi_set'] / 10 = 19:
+				$temp_text += 'strength'
+			else
+				$temp_text += func('body_structure', 'body_desc_from_class', (cheatVars['fix_bi_set'] / 10 mod 10) * 100)
+			end
+		end
+		'<<$temp_text>>'
+		killvar '$temp_text'
 	else
-		$bodimgsets[((chmbodset * 10) + chmbddes)] = $tmpstrg
-		killvar 'chmbddes'
-		killvar '$tmpstrg'
-		dynamic $cheatmenu['bdimdisplay']
+		'You are currently not using a fixed set.'
 	end
-end
-
-$cheatmenu['bdimdisplay'] = "gs 'Cheatmenu_din', 'bdimdisplay'"
-if $ARGS[0] = 'bdimdisplay':
-	*clr & cla
-	gs 'stat'
-	'<center><h1>Cheat menu</h1></center>'
 	*nl
-	'<center><b>Body Image Set Display</b></center>'
-	'<a href="exec:killvar ''chmbodset'' & dynamic $cheatmenu[''bdimmain'']"><b>Go Back</b></a>'
+	'These are the default body image sets:'
 	*nl
-	if bdsetlock = 1 and chmbodset = fixbodset:
-		'This is the currently locked set.'
-		'<a href="exec:bdsetlock = 0 & bodset = 1 & killvar ''fixbodset'' & dynamic $cheatmenu[''bdimdisplay'']"><b>Clear the lock.</b></a>'
-	else
-		'<a href="exec:bdsetlock = 1 & bodset = chmbodset & fixbodset = chmbodset & dynamic $cheatmenu[''bdimdisplay'']"><b>Use this set only.</b></a>'
-	end
+	func('cheatmenu_din', 'get_default_bi_table')
 	*nl
-	if chmbodset <= 3:
-		'Folder: <<$bodimgsets[((chmbodset * 10) + 9)]>>'
-		'Descriptors:'
+	*nl
+	'<center><b>Custom Image Sets</b></center>'
+	temp_cm_bi_flag = 0
+	gs 'cheatmenu_din', 'bdcustfolddisplay', 0
+	gs 'cheatmenu_din', 'bdcustfolddisplay', 1
+	gs 'cheatmenu_din', 'bdcustfolddisplay', 2
+	gs 'cheatmenu_din', 'bdcustfolddisplay', 3
+	gs 'cheatmenu_din', 'bdcustfolddisplay', 4
+	gs 'cheatmenu_din', 'bdcustfolddisplay', 5
+	gs 'cheatmenu_din', 'bdcustfolddisplay', 6
+	gs 'cheatmenu_din', 'bdcustfolddisplay', 7
+	gs 'cheatmenu_din', 'bdcustfolddisplay', 8
+	gs 'cheatmenu_din', 'bdcustfolddisplay', 9
+
+	if temp_cm_bi_flag < 10:
 		*nl
-		if chmbodset = 3:
-			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/0.jpg''"><<$bodimgsets[((chmbodset * 10) + 0)]>></a>'
+		'<a href="exec: gs ''cheatmenu_din'', ''bdimcstadd''"><b>Add new set</b></a>'
+	end
+	killvar 'temp_cm_bi_flag'
+
+	$cheatmenu['table_end']
+end
+
+if $ARGS[0] = 'get_default_bi_table':
+	$temp_table = '<table cellpadding="25" cellspacing="0">'
+	$temp_table +=	'<tr>'
+	$temp_table +=		'<td></td>'
+	$temp_table +=		'<td></td>'
+	$temp_table +=		'<th colspan=3><b>Strength</b></th>'
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		'<td></td>'
+	$temp_table +=		'<th><a href="exec: gs ''cheatmenu_din'', ''unlock_img_set'', 199 & gs ''Cheatmenu_din'', ''bdimmain''"><b>RESET</b></a></th>'
+	$temp_table +=		'<th valign="bottom" style="border-bottom: 1px solid black">'
+	if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] mod 10 = 0:
+		$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_din'', ''unlock_img_set'', 190 & gs ''Cheatmenu_din'', ''bdimmain''"><b>Low</b></a>'
+	else
+		$temp_table +=		'<a href="exec: gs ''cheatmenu_din'', ''lock_img_set'', 190 & gs ''Cheatmenu_din'', ''bdimmain''"><b>Low</b></a>'
+	end
+	$temp_table +=		'</th>'
+	$temp_table +=		'<th valign="bottom" style="border-bottom: 1px solid black">'
+	if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] mod 10 = 1:
+		$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_din'', ''unlock_img_set'', 191 & gs ''Cheatmenu_din'', ''bdimmain''"><b>Mid</b></a>'
+	else
+		$temp_table +=		'<a href="exec: gs ''cheatmenu_din'', ''lock_img_set'', 191 & gs ''Cheatmenu_din'', ''bdimmain''"><b>Mid</b></a>'
+	end
+	$temp_table +=		'</th>'
+	$temp_table +=		'<th valign="bottom" style="border-bottom: 1px solid black">'
+	if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] mod 10 = 2:
+		$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_din'', ''unlock_img_set'', 192 & gs ''Cheatmenu_din'', ''bdimmain''"><b>High</b></a></th>'
+	else
+		$temp_table +=		'<a href="exec: gs ''cheatmenu_din'', ''lock_img_set'', 192 & gs ''Cheatmenu_din'', ''bdimmain''"><b>High</b></a></th>'
+	end
+	$temp_table +=		'</th>'
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		'<th rowspan=9><b>BMI</b></th>'
+	temp_cmd_i = 0
+	:default_table_loop
+		if temp_cmd_i ! 0: $temp_table +=	'<tr>'
+		$temp_table +=		'<th align="right" style="border-right: 1px solid black">'
+		if cheatVars['fix_bi_set'] > 10 and cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i:
+			$temp_table +=		'<a style="color:#00FF00" href="exec: gs ''cheatmenu_din'', ''unlock_img_set'', 1<<temp_cmd_i>>9 & gs ''Cheatmenu_din'', ''bdimmain''"><b><<func(''body_structure'', ''body_desc_from_class'', temp_cmd_i * 100)>></a></b>'
 		else
-			'<a href="exec:view ''images/pc/body/shape/0.jpg''"><<$bodimgsets[((chmbodset * 10) + 0)]>></a>'
+			$temp_table +=		'<a href="exec: gs ''cheatmenu_din'', ''lock_img_set'', 1<<temp_cmd_i>>9 & gs ''Cheatmenu_din'', ''bdimmain''"><b><<func(''body_structure'', ''body_desc_from_class'', temp_cmd_i * 100)>></b></a>'
 		end
-		*nl
-		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/1.jpg''"><<$bodimgsets[((chmbodset * 10) + 1)]>></a>'
-		*nl
-		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/2.jpg''"><<$bodimgsets[((chmbodset * 10) + 2)]>></a>'
-		*nl
-		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/3.jpg''"><<$bodimgsets[((chmbodset * 10) + 3)]>></a>'
-		*nl
-		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/4.jpg''"><<$bodimgsets[((chmbodset * 10) + 4)]>></a>'
-		*nl
-		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/5.jpg''"><<$bodimgsets[((chmbodset * 10) + 5)]>></a>'
-		*nl
-		if chmbodset = 3:
-			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/6.jpg''"><<$bodimgsets[((chmbodset * 10) + 6)]>></a>'
-		else
-			'<a href="exec:view ''images/pc/body/shape/6.jpg''"><<$bodimgsets[((chmbodset * 10) + 6)]>></a>'
+		$temp_table +=		'</th>'
+		$temp_table +=		'<td align="center" valign="center">'
+		temp_cmd_colorflag = 0
+		if cheatVars['fix_bi_set'] > 10 and (cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i or cheatVars['fix_bi_set'] / 10 mod 10 = 9) and (cheatVars['fix_bi_set'] mod 10 = 0 or cheatVars['fix_bi_set'] mod 10 = 9):
+			temp_cmd_colorflag = 1
 		end
-		*nl
-		if chmbodset = 3:
-			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/7.jpg''"><<$bodimgsets[((chmbodset * 10) + 7)]>></a>'
-		else
-			'<a href="exec:view ''images/pc/body/shape/7.jpg''"><<$bodimgsets[((chmbodset * 10) + 7)]>></a>'
+		$temp_table +=			'<<func(''Cheatmenu_din'', ''get_bodyimg_desc_link'', temp_cmd_i * 100 + 2, temp_cmd_colorflag)>>'
+		$temp_table +=		'</td>'
+		$temp_table +=		'<td align="center" valign="center">'
+		temp_cmd_colorflag = 0
+		if cheatVars['fix_bi_set'] > 10 and (cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i or cheatVars['fix_bi_set'] / 10 mod 10 = 9) and (cheatVars['fix_bi_set'] mod 10 = 1 or cheatVars['fix_bi_set'] mod 10 = 9):
+			temp_cmd_colorflag = 1
 		end
-		*nl
-		if chmbodset = 3:
-			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/8.jpg''"><<$bodimgsets[((chmbodset * 10) + 8)]>></a>'
+		$temp_table +=			'<<func(''Cheatmenu_din'', ''get_bodyimg_desc_link'', temp_cmd_i * 100 + 6, temp_cmd_colorflag)>>'
+		$temp_table +=		'</td>'
+		$temp_table +=		'<td align="center" valign="center">'
+		temp_cmd_colorflag = 0
+		if cheatVars['fix_bi_set'] > 10 and (cheatVars['fix_bi_set'] / 10 mod 10 = temp_cmd_i or cheatVars['fix_bi_set'] / 10 mod 10 = 9) and (cheatVars['fix_bi_set'] mod 10 = 2 or cheatVars['fix_bi_set'] mod 10 = 9):
+			temp_cmd_colorflag = 1
 		end
-		*nl
+		$temp_table +=			'<<func(''Cheatmenu_din'', ''get_bodyimg_desc_link'', temp_cmd_i * 100 + 8, temp_cmd_colorflag)>>'
+		$temp_table +=		'</td>'
+		$temp_table +=	'</tr>'
+		temp_cmd_i += 1
+	if temp_cmd_i < 9: jump 'default_table_loop'
+
+	$temp_table += '</table>'
+
+	$result = $temp_table
+	killvar '$temp_table'
+	killvar 'temp_cmd_colorflag'
+end
+
+
+
+if $ARGS[0] = 'lock_img_set':
+	cheatVars['fix_bodyimg'] = 1
+	if ARGS[1] < 10:
+		cheatVars['fix_bi_set'] = ARGS[1]
 	else
-		'Folder: <<$bodimgsets[((chmbodset * 10) + 9)]>>'
-		'Descriptors: (Displayed as "You are:")'
-		if imgset0ovr[chmbodset] = 1:
-			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/0.jpg''"><<$bodimgsets[((chmbodset * 10) + 0)]>></a> -- <a href="exec:chmbddes = 0 & dynamic $cheatmenu[''bdimcstdesed'']">Edit this</a>'
-			*nl
-			'You are using a <a href="exec:imgset0ovr[chmbodset] = 0 & dynamic $cheatmenu[''bdimdisplay'']">custom image 0</a> for this set.'
-			*nl
+		ARGS[1] = ARGS[1] mod 100
+		if cheatVars['fix_bi_set'] < 10: cheatVars['fix_bi_set'] = 199
+
+		if ARGS[1] mod 10 ! 9:
+			cheatVars['fix_bi_set'] = (cheatVars['fix_bi_set'] / 10) * 10 + (ARGS[1] mod 10)
 		else
-			'<a href="exec:view ''images/pc/body/shape/0.jpg''"><<$bodimgsets[((chmbodset * 10) + 0)]>></a>'
-			*nl
-			'You are using the <a href="exec:imgset0ovr[chmbodset] = 1 & dynamic $cheatmenu[''bdimdisplay'']">default image 0</a> for this set.'
-			*nl
+			cheatVars['fix_bi_set'] = 100 + (ARGS[1] / 10) * 10 + (cheatVars['fix_bi_set'] mod 10)
 		end
-		*nl
-		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/1.jpg''"><<$bodimgsets[((chmbodset * 10) + 1)]>></a> -- <a href="exec:chmbddes = 1 & dynamic $cheatmenu[''bdimcstdesed'']">Edit this</a>'
-		*nl
-		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/2.jpg''"><<$bodimgsets[((chmbodset * 10) + 2)]>></a> -- <a href="exec:chmbddes = 2 & dynamic $cheatmenu[''bdimcstdesed'']">Edit this</a>'
-		*nl
-		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/3.jpg''"><<$bodimgsets[((chmbodset * 10) + 3)]>></a> -- <a href="exec:chmbddes = 3 & dynamic $cheatmenu[''bdimcstdesed'']">Edit this</a>'
-		*nl
-		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/4.jpg''"><<$bodimgsets[((chmbodset * 10) + 4)]>></a> -- <a href="exec:chmbddes = 4 & dynamic $cheatmenu[''bdimcstdesed'']">Edit this</a>'
-		*nl
-		'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/5.jpg''"><<$bodimgsets[((chmbodset * 10) + 5)]>></a> -- <a href="exec:chmbddes = 5 & dynamic $cheatmenu[''bdimcstdesed'']">Edit this</a>'
-		*nl
-		if imgset6ovr[chmbodset] = 1:
-			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/6.jpg''"><<$bodimgsets[((chmbodset * 10) + 6)]>></a> -- <a href="exec:chmbddes = 6 & dynamic $cheatmenu[''bdimcstdesed'']">Edit this</a>'
-			*nl
-			'You are using a <a href="exec:imgset6ovr[chmbodset] = 0 & dynamic $cheatmenu[''bdimdisplay'']">custom image 6</a> for this set.'
-			*nl
-		else
-			'<a href="exec:view ''images/pc/body/shape/6.jpg''"><<$bodimgsets[((chmbodset * 10) + 6)]>></a>'
-			*nl
-			'You are using the <a href="exec:imgset6ovr[chmbodset] = 1 & dynamic $cheatmenu[''bdimdisplay'']">default image 6</a> for this set.'
-			*nl
+	end
+	gs 'body', 'UpdateBodyImage'
+end
+
+if $ARGS[0] = 'unlock_img_set':
+	if cheatVars['fix_bi_set'] < 10:
+		cheatVars['fix_bodyimg'] = 0
+		cheatVars['fix_bi_set'] = 0
+	else
+		ARGS[1] = ARGS[1] mod 100
+		if ARGS[1] mod 10 = 9: cheatVars['fix_bi_set'] = 190 + (cheatVars['fix_bi_set'] mod 10)
+		if ARGS[1] / 10 = 9: cheatVars['fix_bi_set'] = (cheatVars['fix_bi_set'] / 10) * 10 + 9
+
+		if cheatVars['fix_bi_set'] = 199:
+			cheatVars['fix_bodyimg'] = 0
+			cheatVars['fix_bi_set'] = 0
 		end
-		if imgset7ovr[chmbodset] = 1:
-			'<a href="exec:view ''images/pc/body/shape/<<$bodimgsets[((chmbodset * 10) + 9)]>>/7.jpg''"><<$bodimgsets[((chmbodset * 10) + 7)]>></a> -- <a href="exec:chmbddes = 7 & dynamic $cheatmenu[''bdimcstdesed'']">Edit this</a>'
-			*nl
-			'You are using a <a href="exec:imgset7ovr[chmbodset] = 0 & dynamic $cheatmenu[''bdimdisplay'']">custom image 7</a> for this set.'
-			*nl
-		else
-			'<a href="exec:view ''images/pc/body/shape/7.jpg''"><<$bodimgsets[((chmbodset * 10) + 7)]>></a>'
-			*nl
-			'You are using the <a href="exec:imgset7ovr[chmbodset] = 1 & dynamic $cheatmenu[''bdimdisplay'']">default image 7</a> for this set.'
+	end
+	gs 'body', 'UpdateBodyImage'
+end
+
+
+if $ARGS[0] = 'get_bodyimg_desc_link':
+	$result = '<a <<iif(ARGS[2] = 0, '''', ''style="color:#00FF00"'')>> href="exec: view ''' + func('body_structure', 'body_img_from_class', ARGS[1], 0) + '''">' + func('body_structure', 'body_desc_from_class', ARGS[1]) + '</a>'
+end
+
+
+
+
+if $ARGS[0] = 'bdcustfolddisplay':
+	if $cheatVars['fix_biset_<<ARGS[1]>>_folder'] ! '':
+		if temp_cm_bi_flag = 0:
 			*nl
+			'You may edit aspects of a custom image set by clicking on their folder names below.'
 		end
-		'<a href="exec:dynamic $cheatmenu[''bdimcstdel'']">Delete this set.</a>'
+		*nl
+		'<a <<iif((cheatVars[''fix_bodyimg''] = 1 and cheatVars[''fix_bi_set''] = ARGS[1]), ''style="color:#00FF00"'', '''')>> href="exec: gs ''Cheatmenu_din'', ''bdimdisplay'', <<ARGS[1]>>"><b><<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>></b></a>'
+		temp_cm_bi_flag += 1
 	end
 end
 
-$cheatmenu['bdimcstdel'] = "gs 'Cheatmenu_din', 'bdimcstdel'"
-if $ARGS[0] = 'bdimcstdel':
+
+$cheatmenu['bdimdisplay'] = "gs 'Cheatmenu_din', 'bdimdisplay', ARGS[0]"
+if $ARGS[0] = 'bdimdisplay':
 	*clr & cla
-	'<center><b>Body Image Set Removal</b></center>'
-	'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimdisplay'']"><b>Go Back</b></a>'
+	gs 'stat'
+	'<center><h1>Cheat menu</h1></center>'
 	*nl
-	'This is where you remove a body image set from use, please note it does not delete anything, it just clears the custom set from this game instance/save.'
-	if klsetask = 1:
-		'<a href="exec:klsetask = 2 & dynamic $cheatmenu[''bdimcstdel'']"><b>Are you sure you want to remove set <<$bodimgsets[((chmbodset * 10) + 9)]>>?</b></a>'
-	elseif klsetask = 2:
-		if chmbodset <= 2:
-			'You have encoutered error 1'
-			'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimdisplay'']"><b>Go Back</b></a>'
-			exit
-		end
-		if bdsetlock = 1 and fixbodset >= chmbodset: bdsetlock = 0 & killvar 'fixbodset'
-		if bodsetcnt > chmbodset:
-			cyci1 = 0
-			cyci2 = chmbodset
+	'<center><b>Body Image Set Display</b></center>'
 
-			:overwriter1
+	$cheatmenu['table_start']
 
-			$bodimgsets[((cyci2 * 10) + cyci1)] = $bodimgsets[(((cyci2 + 1) * 10) + cyci1)]
-			cyci1 += 1
-			if cyci1 < 10: jump 'overwriter1'
-			imgset6ovr[cyci2] = imgset6ovr[(cyci2 + 1)]
-			imgset7ovr[cyci2] = imgset7ovr[(cyci2 + 1)]
-			cyci1 = 0
-			cyci2 += 1
-			if cyci2 < bodsetcnt: jump 'overwriter1'
-			killvar 'cyci1' & killvar 'cyci2'
-		elseif bodsetcnt < chmbodset:
-			'You have encoutered error 2'
-			'<a href="exec:killvar ''klsetask'' & dynamic $cheatmenu[''bdimdisplay'']"><b>Go Back</b></a>'
-			exit
-		end
-		cyci1 = 9
+	act 'Go Back': gs 'cheatmenu_din', 'bdimmain'
+	'<a href="exec: gs ''cheatmenu_din'', ''bdimmain''"><b>Go Back</b></a>'
+	*nl
+	if cheatVars['fix_bodyimg'] = 1 and ARGS[1] = cheatVars['fix_bi_set']:
+		'This is the currently locked set.'
+		'<a href="exec: gs ''cheatmenu_din'', ''unlock_img_set'' & gs ''Cheatmenu_din'', ''bdimdisplay'', <<ARGS[1]>>"><b>Clear the lock.</b></a>'
+	else
+		'<a href="exec: gs ''cheatmenu_din'', ''lock_img_set'', <<ARGS[1]>> & gs ''Cheatmenu_din'', ''bdimdisplay'', <<ARGS[1]>>"><b>Use this set only.</b></a>'
+	end
+	*nl
+
+	'"Edit image" allows you to set the image file name (only use .jpg images)'
+	'"Edit description" allows you to set the description of the image'
+
+	'Folder: <<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>'
+
+	'Descriptors: (Displayed as "You are:")'
+
+	$temp_base_folder = 'images/pc/body/shape/<<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>'
+
+	$temp_table = '<table cellpadding = "10">'
+	$temp_table +=	'<tr>'
+	$temp_table +=		'<th></th>'
+	$temp_table +=		'<th>Currently using</th>'
+	$temp_table +=		'<th></th>'
+	$temp_table +=		'<th></th>'
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 0)
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 1)
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 2)
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 3)
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 4)
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 5)
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 6)
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 7)
+	$temp_table +=	'</tr>'
+	$temp_table +=	'<tr>'
+	$temp_table +=		func('cheatmenu_din', 'get_custom_bodyimg_desc_link', ARGS[1], 8)
+	$temp_table +=	'</tr>'
+	$temp_table += '</table>'
+
+	'<<$temp_table>>'
+	'<a href="exec: gs ''cheatmenu_din'', ''bdimcstdel'', <<ARGS[1]>>">Delete this set.</a>'
+	killvar '$temp_table'
 
-		:poofer1
+	$cheatmenu['table_end']
+end
 
-		killvar 'bodimgsets', ((bodsetcnt * 10) + cyci1)
-		cyci1 -= 1
-		if cyci1 >= 0: jump 'poofer1'
-		killvar 'cyci1'
-		killvar 'imgset6ovr', bodsetcnt
-		killvar 'imgset7ovr', bodsetcnt
-		bodsetcnt -= 1
-		killvar 'klsetask'
-		dynamic $cheatmenu['bdimmain']
+if $ARGS[0] = 'get_custom_bodyimg_desc_link':
+	$temp_cmd_img_name = $cheatVars['fix_biset_<<ARGS[1]>>_img_<<ARGS[2]>>']
+	$temp_cmd_desc = $cheatVars['fix_biset_<<ARGS[1]>>_desc_<<ARGS[2]>>']
+
+	if $temp_cmd_img_name = '':
+		$temp_cmd_image = func('body_structure', 'body_img_from_class', ARGS[2] * 100, 0)
+		$temp_cmd_img_addon = 'Default image'
 	else
-		'<a href="exec:klsetask = 1 & dynamic $cheatmenu[''bdimcstdel'']">Remove set <<$bodimgsets[((chmbodset * 10) + 9)]>>?</a>'
+		$temp_base_folder = 'images/pc/body/shape/<<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>'
+		$temp_cmd_image = '<<$temp_base_folder>>/<<$temp_cmd_img_name>>.jpg'
+		$temp_cmd_img_addon = '<<$temp_cmd_img_name>>.jpg (<a href="exec: gs ''Cheatmenu_din'', ''bdimcstimgdefault'', <<ARGS[2]>>">Use default image</a>)'
+		killvar '$temp_base_folder'
+	end
+
+	if $temp_cmd_desc = '':
+		$temp_cmd_desc = func('body_structure', 'body_desc_from_class', ARGS[2] * 100)
 	end
+
+	$result = '<td><a href="exec: view ''<<$temp_cmd_image>>''"><<$temp_cmd_desc>></a></td>'
+	$result += '<td><<$temp_cmd_img_addon>></td>'
+	$result += '<td><a href="exec: gs ''Cheatmenu_din'', ''bdimcstimged'', <<ARGS[1]>>, <<ARGS[2]>>">Edit image</a></td>'
+	$result += '<td><a href="exec: gs ''Cheatmenu_din'', ''bdimcstdesed'', <<ARGS[1]>>, <<ARGS[2]>>">Edit description</a></td>'
+
+	killvar '$temp_cmd_image'
+	killvar '$temp_cmd_desc'
+	killvar '$temp_cmd_img_addon'
+	killvar '$temp_cmd_img_name'
 end
 
-$cheatmenu['bdimmain'] = "gs 'Cheatmenu_din', 'bdimmain'"
-if $ARGS[0] = 'bdimmain':
+
+$cheatmenu['bdimcstadd'] = "gs 'Cheatmenu_din', 'bdimcstadd'"
+if $ARGS[0] = 'bdimcstadd':
 	*clr & cla
-	gs 'stat'
-	gs 'obj_din', 'cheattabs'
-	'<center><h1>Cheat Menu - Body Image Sets</h1></center>'
+	'<center><b>Body Image Set Addition</b></center>'
 	$cheatmenu['table_start']
-	'<center><b>Body Image Controls</b></center>'
-	*nl
-	'You are currently using set: <<$bodimgsets[((bodset * 10) + 9)]>>'
-	if bdsetlock = 1:
-		'The set used is locked to current.'
-	else
-		'The set used is unlocked.'
-	end
-	*nl
-	'This is the current default and custom (if any) body image sets:'
-	*nl
-	'<a href="exec:chmbodset = 0 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[9]>></b></a>'
-	*nl
-	'<a href="exec:chmbodset = 1 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[19]>></b></a>'
+	act 'Go Back': killvar 'klsetask' & gs 'cheatmenu_din', 'bdimmain'
+	'<a href="exec:killvar ''klsetask'' & gs ''cheatmenu_din'', ''bdimmain''"><b>Go Back</b></a>'
 	*nl
-	'<a href="exec:chmbodset = 2 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[29]>></b></a>'
+	'This is where you can add a new image set to a game.'
+	'To add an image set, create a folder in images/pc/body/shape/ and name it anything you want (shorter will be easier to remember). Then put in it any images you want. Once you have done that, click the link below and put in your folder name to add that set.'
+	'Note: This will only be for this instance/save of the game and you will have to redo the click the link step if you want to add the same folder to a different instance/save.'
 	*nl
-	if bodsetcnt >= 4:
-		'You may edit aspects of a custom image set by clicking on their folder names below.'
-		*nl
-		'<a href="exec:chmbodset = 4 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[49]>></b></a>'
-		*nl
-	elseif bodsetcnt = 3:
-		'<a href="exec:dynamic $cheatmenu[''bdimcstadd'']"><b>Add new set</b></a>'
-		*nl
-	end
-	if bodsetcnt >= 5:
-		'<a href="exec:chmbodset = 5 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[59]>></b></a>'
-		*nl
-	elseif bodsetcnt = 4:
-		'<a href="exec:dynamic $cheatmenu[''bdimcstadd'']"><b>Add new set</b></a>'
-		*nl
-	end
-	if bodsetcnt >= 6:
-		'<a href="exec:chmbodset = 6 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[69]>></b></a>'
-		*nl
-	elseif bodsetcnt = 5:
-		'<a href="exec:dynamic $cheatmenu[''bdimcstadd'']"><b>Add new set</b></a>'
-		*nl
+	'<a href="exec: gs ''Cheatmenu_din'', ''bdimcstaddpro''">Add Image Set</a>'
+	$cheatmenu['table_end']
+end
+
+$cheatmenu['bdimcstaddpro'] = "gs 'Cheatmenu_din', 'bdimcstaddpro'"
+if $ARGS[0] = 'bdimcstaddpro':
+	$tmpstrg = input("Enter folder name, do not include ''\''")
+	if $tmpstrg = '':
+		killvar '$tmpstrg'
+		gs 'Cheatmenu_din', 'bdimcstadd'
+	else
+		cyci1 = 0
+		:addcyc1
+		if $cheatVars['fix_biset_<<cyci1>>_folder'] ! '': cyci1 += 1 & jump 'addcyc1'
+		if cyci1 > 9:
+			'You have encoutered error 1'
+			'<a href="exec: gs ''cheatmenu_din'', ''bdimmain''"><b>Go Back</b></a>'
+			exit
+		end
+		ARGS[1] = cyci1
+
+		if mid($tmpstrg, len($tmpstrg)) = '/' or mid($tmpstrg, len($tmpstrg)) = '\':
+			$tmpstrg = mid($tmpstrg, 1, len($tmpstrg)-1)
+		end
+
+		cyci1 = 0
+		:addcyc2
+			$cheatVars['fix_biset_<<ARGS[1]>>_desc_<<cyci1>>'] = func('body_structure', 'body_desc_from_class', cyci1 * 100)
+			cyci1 += 1
+		if cyci1 < 9: jump 'addcyc2'
+
+		$cheatVars['fix_biset_<<ARGS[1]>>_folder'] = $tmpstrg
+		killvar '$tmpstrg'
+		killvar 'cyci1'
+
+		gs 'Cheatmenu_din', 'bdimdisplay', ARGS[1]
 	end
-	if bodsetcnt >= 7:
-		'<a href="exec:chmbodset = 7 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[79]>></b></a>'
-		*nl
-	elseif bodsetcnt = 6:
-		'<a href="exec:dynamic $cheatmenu[''bdimcstadd'']"><b>Add new set</b></a>'
-		*nl
+end
+
+$cheatmenu['bdimcstdesed'] = "gs 'Cheatmenu_din', 'bdimcstdesed', ARGS[0], ARGS[1]"
+if $ARGS[0] = 'bdimcstdesed':
+	$tmpstrg = input("Enter a new descriptor")
+	if $tmpstrg ! '':
+		$cheatVars['fix_biset_<<ARGS[1]>>_desc_<<ARGS[2]>>'] = $tmpstrg
+		if cheatVars['fix_bi_set'] = ARGS[1]: gs 'body', 'UpdateBodyImage'
 	end
-	if bodsetcnt >= 8:
-		'<a href="exec:chmbodset = 8 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[89]>></b></a>'
-		*nl
-	elseif bodsetcnt = 7:
-		'<a href="exec:dynamic $cheatmenu[''bdimcstadd'']"><b>Add new set</b></a>'
-		*nl
+
+	killvar '$tmpstrg'
+	gs 'Cheatmenu_din', 'bdimdisplay', ARGS[1]
+end
+
+if $ARGS[0] = 'bdimcstimged':
+	$tmpstrg = input("Enter a new image name (Leave empty to not change the image. Example: 1). Exclude the '.jpg'")
+	if $tmpstrg ! '':
+		if mid($tmpstrg, len($tmpstrg)-3) = '.jpg':
+			$tmpstrg = mid($tmpstrg, 1, len($tmpstrg)-4)
+		end
+		$cheatVars['fix_biset_<<ARGS[1]>>_img_<<ARGS[2]>>'] = $tmpstrg
+		if cheatVars['fix_bi_set'] = ARGS[1]: gs 'body', 'UpdateBodyImage'
 	end
-	if bodsetcnt >= 9:
-		'<a href="exec:chmbodset = 9 & dynamic $cheatmenu[''bdimdisplay'']"><b><<$bodimgsets[99]>></b></a>'
-		*nl
-	elseif bodsetcnt = 8:
-		'<a href="exec:dynamic $cheatmenu[''bdimcstadd'']"><b>Add new set</b></a>'
-		*nl
+
+	killvar '$tmpstrg'
+	gs 'Cheatmenu_din', 'bdimdisplay', ARGS[1]
+end
+
+if $ARGS[0] = 'bdimcstimgdefault':
+	$cheatVars['fix_biset_<<ARGS[1]>>_img_<<ARGS[2]>>'] = ''
+	gs 'Cheatmenu_din', 'bdimdisplay', ARGS[1]
+end
+
+
+$cheatmenu['bdimcstdel'] = "gs 'Cheatmenu_din', 'bdimcstdel', ARGS[0]"
+if $ARGS[0] = 'bdimcstdel':
+	*clr & cla
+	'<center><b>Body Image Set Removal</b></center>'
+	$cheatmenu['table_start']
+
+	'<a href="exec: killvar ''klsetask'' & gs ''Cheatmenu_din'', ''bdimdisplay'', <<ARGS[1]>>"><b>Go Back</b></a>'
+	*nl
+	'This is where you remove a body image set from use, please note it does not delete anything, it just clears the custom set from this game instance/save.'
+	if klsetask = 1:
+		'<a href="exec:klsetask = 2 & gs ''Cheatmenu_din'', ''bdimcstdel'', <<ARGS[1]>>"><b>Are you sure you want to remove set <<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>?</b></a>'
+	elseif klsetask = 2:
+		if cheatVars['fix_bodyimg'] = 1 and cheatVars['fix_bi_set'] = ARGS[1]: cheatVars['fix_bodyimg'] = 0 & cheatVars['fix_bi_set'] = 0
+
+		cyci1 = 0
+		:del_bodimgset_loop
+			gs 'shortgs', 'remove_array_element', 'cheatVars', 'fix_biset_<<ARGS[1]>>_img_<<cyci1>>'
+			gs 'shortgs', 'remove_array_element', 'cheatVars', 'fix_biset_<<ARGS[1]>>_desc_<<cyci1>>'
+			cyci1 += 1
+		if cyci1 < 9: jump 'del_bodimgset_loop'
+		gs 'shortgs', 'remove_array_element', 'cheatVars','fix_biset_<<ARGS[1]>>_folder'
+
+		killvar 'cyci1'
+		killvar 'klsetask'
+		gs 'cheatmenu_din', 'bdimmain'
+	else
+		'<a href="exec: klsetask = 1 & gs ''Cheatmenu_din'', ''bdimcstdel'', <<ARGS[1]>>">Remove set <<$cheatVars[''fix_biset_<<ARGS[1]>>_folder'']>>?</a>'
 	end
 	$cheatmenu['table_end']
 end
 
+
 !!----------------------------------------------------------------------------------------------------------------------------
 !! About Window
 !!----------------------------------------------------------------------------------------------------------------------------

+ 20 - 20
locations/JuliaMilHome.qsrc

@@ -158,7 +158,7 @@ if $ARGS[0] = 'fridge':
 	else
 		$julia_sanw = ''
 	end
-	
+
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/fridge.jpg"></center>'
 	'You open the fridge and see:<<$julia_tea>><<$julia_water>><<$julia_sup>><<$julia_lefto>><<$julia_sanw>>'
@@ -207,8 +207,8 @@ if $ARGS[0] = 'fridge':
 			pcs_breath = 0
 			minut += 5
 			gs 'stat'
-			
-			
+
+
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/shared/food/tea.jpg"></center>'
 			'You find some tea and make it.'
@@ -216,7 +216,7 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'JuliaMilHome', 'kitchen'
 		end
 	elseif juliawater_count >= 0:
-		act 'Have some water': 
+		act 'Have some water':
 			juliafood_day = daystart
 			juliawater_count -= 1
 			pcs_health += 10
@@ -291,7 +291,7 @@ if $ARGS[0] = 'fridge':
 			act 'Continue': gt 'JuliaMilHome', 'kitchen'
 		end
 	end
-end 
+end
 
 if $ARGS[0] = 'bathroom':
 	CLOSE ALL
@@ -306,7 +306,7 @@ if $ARGS[0] = 'bathroom':
 	menu_off = 0
 	minut += 1
 	gs 'stat'
-	
+
 	*clr & cla
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/juliahome/bathroom.jpg"></center>'
@@ -314,7 +314,7 @@ if $ARGS[0] = 'bathroom':
 	'The toilet sits along the wall next to a small bathtub.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0: '<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	gs 'piercing_management', 'set_manage_string'
 	act 'Leave the bathroom': gt 'JuliaMilHome','hallway'
 	act 'Take a shower':
 		menu_off = 1
@@ -322,7 +322,7 @@ if $ARGS[0] = 'bathroom':
 		noshampoo = 1
 		dynamic $showerdin
 		gs 'stat'
-		
+
 		*clr & cla
 		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
@@ -368,7 +368,7 @@ if $ARGS[0] = 'julia_room':
 				gs 'grades', 'homework', 'school', 'yes', 1, 1, 'A12'
 			end
 			juliaQW['homework_day'] = daystart
-			gs 'npc_relationship', 'modify', 'A12', 'love' 
+			gs 'npc_relationship', 'modify', 'A12', 'love'
 			lern += rand(3,6)
 			gs 'exp_gain', 'intel', rand(1,2) + rand(0, drugVars['mentats_dose'])
 			gs 'stat'
@@ -442,7 +442,7 @@ if $ARGS[0] = 'julia_room':
 								act '"Oh, really? Do tell!"':
 									minut += 5
 									gs 'arousal', 'verbal_erotica', -10
-									gs 'npc_relationship', 'modify', 'A12', 'love' 
+									gs 'npc_relationship', 'modify', 'A12', 'love'
 									gs 'stat'
 
 									*clr & cla
@@ -463,7 +463,7 @@ if $ARGS[0] = 'julia_room':
 								act '"Go on, keep going!"':
 									minut += 5
 									gs 'arousal', 'verbal_erotica', -10
-									gs 'npc_relationship', 'modify', 'A12', 'love' 
+									gs 'npc_relationship', 'modify', 'A12', 'love'
 									gs 'stat'
 
 									*clr & cla
@@ -492,7 +492,7 @@ if $ARGS[0] = 'julia_room':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/sex/jultit.jpg"></center>'
 										'Julia bares your chest and slowly lowers her kisses, slowly trailing her way down to your chest. You do your best to stifle your moans when she takes your nipple in her mouth, gently biting it as her fingers rub the other one. Then her fingers find their way down between your legs, pulling your clothes to the side.'
-										gs 'npc_relationship', 'modify', 'A12', 'adore' 
+										gs 'npc_relationship', 'modify', 'A12', 'adore'
 										gs 'arousal', 'foreplay', 5, 'lesbian'
 										gs 'stat'
 
@@ -518,7 +518,7 @@ if $ARGS[0] = 'julia_room':
 										end
 									end
 
-									act 'Ask her to please stop touching you': 
+									act 'Ask her to please stop touching you':
 										gs 'npc_relationship', 'modify', 'A12', 'hate'
 										gs 'arousal', 'end'
 										gt 'JuliaMilHome', 'julia_room'
@@ -526,7 +526,7 @@ if $ARGS[0] = 'julia_room':
 								end
 
 								act 'Whoa! Tell her to stop right now!':
-									gs 'npc_relationship', 'modify', 'A12', 'loathe' 
+									gs 'npc_relationship', 'modify', 'A12', 'loathe'
 									gt 'JuliaMilHome', 'julia_room'
 								end
 							end
@@ -542,7 +542,7 @@ if $ARGS[0] = 'julia_chat':
 	menu_off = 1
 	minut += 2
 	gs 'stat'
-	
+
 	*clr & cla
 	if npc_sex['A12'] = 1 and juliaQW['date'] = 0:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
@@ -642,7 +642,7 @@ if $ARGS[0] = 'julia_chat':
 			act 'Go to the University':
 				gs 'npc_relationship', 'modify', 'A12', 'like'
 				gs 'stat'
-				
+
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
 				'You get a bit excited. "I am planning to attend the University too. Now I will for sure know someone there."'
@@ -657,7 +657,7 @@ if $ARGS[0] = 'julia_chat':
 			minut += 5
 			gs 'npc_relationship', 'modify', 'A12', 'like'
 			gs 'stat'
-			
+
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
 			'You ask her, "So what have you been up to lately?"'
@@ -673,7 +673,7 @@ if $ARGS[0] = 'julia_chat':
 				gs 'npc_relationship', 'modify', 'A12', -30
 				minut += 15
 				gs 'stat'
-				
+
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/juliacry.jpg"></center>'
 				'You quietly walk in and sit on the bed next to Julia.'
@@ -693,7 +693,7 @@ if $ARGS[0] = 'julia_chat':
 	end
 end
 
-		!!I commented this out for now as it needs to be more meaningful, like dating her for awhile
+		!!I commented this out for now as it needs to be more meaningful, like dating her for a while
 		!!if tiprand = 0:
 			!!'Julia mentions in passing that she used to be friends with Julia Milov, but cut the ties after Julia kept borrowing money despite not being able to pay any of it back. Julia frowns, and you can tell they used to get along quite well.'
 			!!if julia[SexTalkJulia] = 4 and NatbelQW['QWstage'] > 8 and julia[JuliaNatSexProposed] = 0:
@@ -738,7 +738,7 @@ end
 
 if $ARGS[0] = 'leave_apartment':
 
-	gt 'pod_ezd','etaj_3'	
+	gt 'pod_ezd','etaj_3'
 end
 
 --- JuliaMilHome ---------------------------------

+ 4 - 4
locations/KGstart.qsrc

@@ -107,7 +107,7 @@ if KFOnLineReaga > 0:
 		end
 	end
 
-	if karta + bankDebtLimit >= 1000:
+	if karta >= 1000:
 		act 'Payment akkuaunta':
 			karta -= 1000
 			KFOnLineReaga += 30
@@ -115,12 +115,12 @@ if KFOnLineReaga > 0:
 		end
 	end
 
-	if karta + bankDebtLimit > 0:
+	if karta > 0:
 		act 'Buy game coins (1 ₽ = 1 Game Coin)':
 			cla
 			KGOLdonat = input("How many coins do you wish to purchase?")
 
-			if KGOLdonat <= 0 or KGOLdonat > karta:
+			if KGOLdonat <= 0 or karta < KGOLdonat:
 				msg 'Not valid operation'
 			else
 				karta -= KGOLdonat
@@ -135,7 +135,7 @@ else
 	'Welcome to the online game Vertep World'
 	'To play this game you have to pay 1, 000 <b>₽</b> for 30 days via online banking.'
 
-	if karta + bankDebtLimit >= 1000:
+	if karta >= 1000:
 		act 'Payment':
 			karta -= 1000
 			KFOnLineReaga += 30

+ 33 - 35
locations/Komp.qsrc

@@ -9,13 +9,13 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 	'Your computer boots up and you''re soon looking at your operating system''s main screen.'
 
-	act 'Shut your computer down': 
+	act 'Shut your computer down':
 		killvar '$subs'
 		killvar 'access'
 		gt 'komp', 'fin'
 	end
 	act 'Play Solitaire (0:20)': gt 'komp', 'pasians'
-	
+
 	if AlbinaQW['flashdrive'] = 1:
 		if $loc = 'dachain' or $loc = 'sitr' or $loc = 'bedr' or $loc = 'bedr2x' or ($loc = 'uni_dorm' and $loc_arg = 'dorm_room') or ($loc = 'city_mansion_residence_2' and $loc_arg = 'yoffice') or ($loc = 'pav_shared_apt' and $loc_arg = 'pcsRoom') or ($loc = 'mey_home' and $loc_arg = 'guest_bedroom') or ($loc = 'city_house_res_misc' and $loc_arg = 'livroom') or $loc = 'nichBedroomServant' or (locat['Anya_inroom'] = 0 and $loc = 'bedrPar'):
 			act 'Check Albina''s flash drive': gt 'albina_house_events', 'flash_drive'
@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 	!! arrived here from mobile net.
 	!! Sveta can access the internet if > 0
 	if subscription[$subs] > 0:
-		if access['metered'] = 0: 
+		if access['metered'] = 0:
 			act 'Browse the internet': gt 'komp', 'browse'
 		else
 			act 'Browse the internet - You have <<subscription[$subs]>> minutes of access left': gt 'komp', 'browse'
@@ -54,9 +54,9 @@ if $ARGS[0] = 'browse':
 	*clr & cla
 	gs 'stat'
 	menu_off = 0
-	
+
 	act 'Close the browser': gt 'komp','start'
-	
+
 	!! TODO: Update
 	!! check if the original account still valid?
 	!! if account_used > 0
@@ -119,7 +119,7 @@ end
 if $ARGS[0] = 'sale':
 	*clr & cla
 	!! TODO: Update time and internet
-	
+
 	!! IMPORTANT: What happens if an activity takes more time than the minutes Sveta has? We just say "You tried, but could not finish"?
 	if access['metered'] and subscription[$subs] < 15:
 		'You check the website, but realize that <<subscription[$subs]>> minutes won''t be enough to fill out all the forms.'
@@ -176,13 +176,13 @@ if $ARGS[0] = 'porno':
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 		'You go to a porn site and browse through videos for a few minutes.'
-		
-		if fame['city_porn'] >= 100: 
+
+		if fame['city_porn'] >= 100:
 			act 'Watch one of your own videos':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/porno.jpg"></center>'
-				'You find a video you like the look of and click on it before getting comfortable. When the video loads up, you''re surprised to find that the girl starring in it is you!' 
+				'You find a video you like the look of and click on it before getting comfortable. When the video loads up, you''re surprised to find that the girl starring in it is you!'
 				act 'Watch it':
 					cla
 					elektro += 3
@@ -203,19 +203,19 @@ if $ARGS[0] = 'porno':
 
 					act 'The video ends': gt 'komp', 'porno'
 				end
-				
+
 				act 'Turn it off':
 					cla
 					minut += 5
 					gs 'stat'
 					'You immediately turn the video off and leave the website. If you found that video yourself, then how many people have seen you?'
-					
+
 					act 'Leave this website': gt 'komp', 'browse'
 				end
 			end
 		end
-		
-		
+
+
 		act 'Watch vanilla porn':
 			*clr & cla
 			elektro += 3
@@ -231,7 +231,7 @@ if $ARGS[0] = 'porno':
 
 			act 'The video ends': gt 'komp', 'porno'
 		end
-		
+
 		act 'Watch anal porn':
 			*clr & cla
 			elektro += 3
@@ -247,7 +247,7 @@ if $ARGS[0] = 'porno':
 
 			act 'The video ends': gt 'komp', 'porno'
 		end
-		
+
 		act 'Watch lesbian porn':
 			*clr & cla
 			elektro += 3
@@ -260,10 +260,10 @@ if $ARGS[0] = 'porno':
 			gs 'arousal', 'porn', 30
 			minut -= 30
 			gs 'stat'
-		
+
 			act 'The video ends': gt 'komp', 'porno'
 		end
-		
+
 		act 'Watch BBC porn':
 			*clr & cla
 			elektro += 3
@@ -315,7 +315,7 @@ if $ARGS[0] = 'masturbate':
 		end
 
 		act 'Stop masturbating': divanmastr = 0 & gt 'komp', 'porno'
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
 
@@ -579,10 +579,10 @@ if $ARGS[0] = 'rabota':
 				'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore1.jpg"></center>'
 				'You click the button and get taken to the full job description.'
 				'<i>You will be required to expose your body in front of viewers and fulfil their every wish. Payment is based on a tip system: Customers on the website buy tokens which they can use to tip girls they enjoy watching.'
-				'The website will cover all costs during your shows, but how much money you make is up to you: The better you are at attracting viewers, and the more you''re willing to do to please them, the more likely they will be to tip you.' 
+				'The website will cover all costs during your shows, but how much money you make is up to you: The better you are at attracting viewers, and the more you''re willing to do to please them, the more likely they will be to tip you.'
 				'Any tokens you earn will be converted to rubles and paid into your bank account immediately after a session ends. The website also hides your stream for viewers from your region, so the chance of you being recognized by someone you know in real life is very low.'
 				'If you''re interested, please fill in the questionnaire below.</i>'
-				
+
 				if bankAccount = 0:
 					'You need a valid bank account to be able to register for this job.'
 				else
@@ -629,7 +629,7 @@ if $ARGS[0] = 'rabota':
 				'A quick search of the listed address tells you that it''s located somewhere in the red light district of the city.'
 				if pornstudio = 0: 'You''ve heard rumors that an underground porn studio is located somewhere in that area.'
 				if pornstudio = 1: 'The porn studio is located in that area. This job listing suddenly makes more sense to you.'
-				
+
 				if pcs_inhib >= 40:
 					act 'Write down the address':
 						cla
@@ -684,11 +684,11 @@ if $ARGS[0] = 'agent' :
 	*nl
 	'<b>Property listing</b>:'
 	if func('homes_properties', 'is_property_of_status', 'rented', 'city_apartment') :
-		if func('homes_properties', 'get_rent_days', 'city_apartment') > 0: 
+		if func('homes_properties', 'get_rent_days', 'city_apartment') > 0:
 			'You have <B><<func(''homes_properties'', ''get_rent_days'', ''city_apartment'')>> days</B> remaining on the rental of your St. Petersburg apartment.'
 			*nl
 		end
-		if karta + bankDebtLimit >= func('homes_properties', 'get_rent_amount', 'city_apartment'):
+		if karta >= func('homes_properties', 'get_rent_amount', 'city_apartment'):
 			act 'Pay rent on St. Petersburg':
 				cla
 				gs 'homes_properties', 'pay_rent', 'city_apartment', 'card'
@@ -707,14 +707,14 @@ if $ARGS[0] = 'agent' :
 		'Current sale price is listed at: <<func(''homes_properties'', ''get_property_sales_price'', ''village_cottage'')>> <b>₽</b>.'
 		*nl
 	end
-	
+
 	if func('homes_properties', 'is_property_of_status', 'rented', 'old_town_apartment'):
-		if func('homes_properties', 'get_rent_days', 'old_town_apartment') >= 0: 
+		if func('homes_properties', 'get_rent_days', 'old_town_apartment') >= 0:
 			'You have <B><<func(''homes_properties'', ''get_rent_days'', ''old_town_apartment'')>> days</B> remaining on the rental of your Pushkin apartment.'
 			*nl
 		end
-		
-		if karta + bankDebtLimit >= func('homes_properties', 'get_rent_amount', 'old_town_apartment'):
+
+		if karta >= func('homes_properties', 'get_rent_amount', 'old_town_apartment'):
 			act 'Pay rent on Pushkin':
 				cla
 				gs 'homes_properties', 'pay_rent', 'old_town_apartment', 'card'
@@ -739,19 +739,17 @@ end
 
 if $ARGS[0] = 'bank':
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/online_bank.jpg"></center>'
-	if karta + bankDebtLimit >= 10:
+	if karta >= 10:
 		*pl
-
 		'You can buy prepaid internet access online through your bank account. 1 hour of internet only costs 10 <b>₽</b>! *'
-
 		*pl
 
-		if karta >= 0:
-			'You have <<karta>> <b>₽</b> in your account.'
+		if karta >= bankDebtLimit:
+			'You have <<karta - bankDebtLimit>> <b>₽</b> in your account.'
 			'You have an overdraft limit of <font color="blue"><<bankDebtLimit>></font>!'
 		else
-			'You are overdrawn by <font color="red"><<-1 * karta>> <b>₽</b></font>.'
-			'You have a remaining credit limit of <font color="blue"><<bankDebtLimit + karta>></font>!'
+			'You are overdrawn by <font color="red"><<bankDebtLimit - karta>> <b>₽</b></font>.'
+			'You have a remaining credit limit of <font color="blue"><<karta>></font>!'
 		end
 
 		*pl
@@ -761,7 +759,7 @@ if $ARGS[0] = 'bank':
 			cla
 			intinp = input ("How many hours of internet access do you wish to purchase? (1hr = 10 <b>₽</b>)")
 
-			if intinp <= 0 or intinp * 10 > karta + bankDebtLimit:
+			if intinp <= 0 or karta < intinp * 10:
 				'Invalid amount.'
 			else
 				karta -= intinp * 10

+ 36 - 36
locations/LCwork.qsrc

@@ -3,7 +3,7 @@ if $ARGS[0] = 'start1':
 	cla
 	*clr
 	horand = rand(1, 100)+ 40
-	
+
 	gs 'dinSex', 'std_trigger_oral'
 	gs 'dinSex', 'std_trigger'
 	randLCpay = 1000
@@ -21,7 +21,7 @@ if $ARGS[0] = 'start1':
 	gs 'arousal', 'foreplay', 10, 'sub', 'gangbang', 'prostitution'
 	minut -= 10
 	gs 'stat'
-	
+
 	act 'Continue':
 		*clr
 		cla
@@ -33,7 +33,7 @@ if $ARGS[0] = 'start1':
 		gs 'arousal', 'vaginal', 120, 'sub', 'gangbang', 'prostitution'
 		minut -= 240
 		gs 'stat'
-		
+
 	    if horand <= pcs_horny:pcs_horny = 0 & orgasm += 1 & 'You reach an orgasm throughout their rough treatment of you, and lay quivering while they continue to pound you mercilessly.'
 		$orgasm_or = 'yes'
 	    if horand > pcs_horny:pcs_horny += 10 & 'The guys are too focused on their own pleasure to give you any, and you leave unsatisfied.'
@@ -60,7 +60,7 @@ if $ARGS[0] = 'start2':
 	cla
 	*clr
 	horand = rand(1, 100)
-	
+
 	spafinloc = 11
 	gs 'cum_manage'
 	randLCpay = 500
@@ -74,10 +74,10 @@ if $ARGS[0] = 'start2':
 	'The older man gives you a dirty grin, and ogles your body for a few seconds before he says: "Very good, you will do. Follow me."'
 	'You get into a van with the older man, and are a bit surprised when he enters a narrow side road that leads into the woods. You''re in the middle of nowhere here!'
 	'He stops the van, and tells you to get out of the van and undress. He lays you on your back in the open side door of his van. As soon as your legs are apart he shoves his old dick in your cunt and starts fucking it. He never says a word, or touches you in any other way, he just fucks your pussy.'
-	
+
 	gs 'arousal', 'vaginal', 120, 'sub', 'prostitution'
-	
-	if horand <= pcs_horny:pcs_horny = 0 & orgasm += 1 & 'The old man is a skilful lover, and he brings you to a spectacular orgasm. Since you''re in the middle of the woods and no one can hear you anyway, you fully surrender yourself to him and moan loudly when he keeps fucking you throughout your orgasm, making it all the more intense.'
+
+	if horand <= pcs_horny:pcs_horny = 0 & orgasm += 1 & 'The old man is a skillful lover, and he brings you to a spectacular orgasm. Since you''re in the middle of the woods and no one can hear you anyway, you fully surrender yourself to him and moan loudly when he keeps fucking you throughout your orgasm, making it all the more intense.'
 	$orgasm_or = 'yes'
 	if horand > pcs_horny:pcs_horny += 10 & 'The old man focuses solely on his own pleasure, and doesn''t do much to try and get you off too. You''re not satisfied.'
 
@@ -92,7 +92,7 @@ if $ARGS[0] = 'start2':
 
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Get out of his van':money += randLCpay & gt 'city_residential'
 	end
 end
@@ -101,7 +101,7 @@ if $ARGS[0] = 'start3':
 	cla
 	*clr
 	horand = rand(1, 100) + 20
-	
+
 	spafinloc = 11
 	gs 'cum_manage'
 	spafinloc = 12
@@ -123,7 +123,7 @@ if $ARGS[0] = 'start3':
 	gs 'arousal', 'vaginal', 120, 'sub', 'group', 'prostitution', 'rough'
 	minut -= 120
 	gs 'stat'
-	
+
 	if horand <= pcs_horny:pcs_horny = 0 & orgasm += 1 & 'The intensity at which they were fucking your pussy and ass at the same time makes your own orgasm all the more intense. Your loud groans cause some disturbed knocking on the walls, from neighbours complaining about the noise. Oops...'
 	$orgasm_or = 'yes'
 	if horand > pcs_horny:pcs_horny += 10 & 'The guys are mostly focused on their own pleasure, using your body as if you were a sex doll of some kind. It doesn''t feel unpleasant, but they don''t stimulate you enough to reach orgasm.'
@@ -132,13 +132,13 @@ if $ARGS[0] = 'start3':
 		cls
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/sex/3b.jpg"></center>'
-		'Finally in a small mercy they both pull out of you and put you on your knees where they jerk off, covering your face and tits with their sperm. As soon as they finish, before you even have a chance to do anything, one of them grabs you roughly by the hair and drags you out of the apartment naked, while the other throws your clothes out into the hallway. With that done, they toss <<randLCpay>> <b>₽</b> out and slam the door. Leaving you standing naked, with your clothes and money scattered around the hall floor and your ass and pussy aching from the rough fucking.'
+		'Finally, in a moment of mercy they both pull out of you and put you on your knees where they jerk off, covering your face and tits with their sperm. As soon as they finish, before you even have a chance to do anything, one of them grabs you roughly by the hair and drags you out of the apartment naked, while the other throws your clothes out into the hallway. With that done, they toss <<randLCpay>> <b>₽</b> out and slam the door. Leaving you standing naked, with your clothes and money scattered around the hall floor and your ass and pussy aching from the rough fucking.'
 		'Wincing you gather up the money and put on your clothes, then you head down the stairs out of the apartment.'
 
 		gs 'arousal', 'bj', 20, 'sub', 'group', 'prostitution', 'rough'
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Leave the apartment building':money += randLCpay & gt 'city_industrial'
 	end
 end
@@ -157,7 +157,7 @@ if $ARGS[0] = 'start4':
 
 	gs 'dinSex', 'std_trigger'
 	gs 'dinSex', 'std_trigger_oral'
-	
+
 	if lcwork_counter = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/sex/4a.jpg"></center>'
 		'As you walk up to the couple, you notice the guy grinning deviously while his girlfriend''s face is a deep shade of red. Before you can get a word in, the guy looks at his girl and grins: "What do you say, babe? She''s cute, right?"'
@@ -165,15 +165,15 @@ if $ARGS[0] = 'start4':
 		'They live in the residential area of the city, and it''s a short drive there. You''re fairly sure the guy is the one in charge of this relationship, and when you arrive at their home, you''re proven right.'
 		'He acts like a director, telling you and the other girl to do all sorts of acts on one another while he watches, and then has the two of you please him together.'
 		'He''s particularly interested in your ass. "I hope you like anal, sweetie..." he whispers in your ear after a while. "Because my girlfriend won''t take anything up there, you''ll have to take it for the both of you!"'
-		'Fortunately he takes it slow, and it doesn''t feel all that unpleasant. The girl is very fascinated by it all, and asks you a few questions while she absent-mindedly rubs your clit and kisses your boobs as if you''re doing her a huge favor. After all: as long as her boyfriend enjoys your ass, her''s can remain unfucked.'
+		'Fortunately, he takes it slow, and it doesn''t feel all that unpleasant. The girl is very fascinated by it all and asks you a few questions while she absent-mindedly rubs your clit and kisses your boobs as if you''re doing her a huge favor. After all: as long as her boyfriend enjoys your ass, her''s can remain unfucked.'
 
 		gs 'arousal', 'cuni', 120, 'sub', 'prostitution', 'lesbian'
 		gs 'arousal', 'vaginal_finger', 120, 'sub', 'prostitution', 'lesbian'
 		gs 'arousal', 'anal', 120, 'sub', 'prostitution'
 		minut -= 240
 		gs 'stat'
-		
-		
+
+
 		if horand <= pcs_horny:pcs_horny = 0 & orgasm += 1 & 'You were already fairly turned on before going with them, and the girl turns out to be an expert at pleasing other women! She has you begging and moaning in no time, and licks you to an intense orgasm within moments.'
 		$orgasm_or = 'yes'
 		if horand > pcs_horny:pcs_horny += 10 & 'The guy is so demanding, you and the other girl don''t get to focus much on your own pleasure but only cater to his desires. You were not satisfied.'
@@ -187,23 +187,23 @@ if $ARGS[0] = 'start4':
 			'After some time the guy pulls out of your ass and shoots his hot load all over your stomach. The girl laps some of it up, but leaves most of it on you and politely thanks you for a lovely evening. She''s adorable!'
 			'As you get up, the guy is very happy. He grins and says: "Thanks, you were great! She''s still a bit shy, but at this rate it won''t be long before I can properly introduce her to my buddies, if you know what I mean."'
 			'He walks you out of the bedroom, after you get dressed, leaving her behind. "Maybe we can do it again next week and you can help me talk her into trying anal." He gives you a dirty wink and gives you <<randLCpay>> <b>₽</b> as he walks you out.'
-			
+
 			gs 'arousal', 'anal', 20, 'sub', 'prostitution'
 			gs 'arousal', 'end'
 			gs 'stat'
-			
+
 			act 'Leave their apartment building':money += randLCpay & gt 'city_residential'
 		end
 	else
 		!!second visit, only happens if you have seen them once.
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/sex/couple.jpg"></center>'
 		'As you walk up to the couple, you remember them from before. The guy grins at you and the girl smiles. "Told you we would be back, are you ready to go?"'
-		'They live in the residential area of the city, and it''s a short drive there. You remember it form last time, they inform you, she is ready to try anal, but wants you to coach her through it and get her ready.'
+		'They live in the residential area of the city, and it''s a short drive there. You remember it from last time, they inform you, she is ready to try anal, but wants you to coach her through it and get her ready.'
 		'Once inside he watches the two of you have fun. He waits until you bring his girlfriend to an orgasm.'
-	
+
 		gs 'arousal', 'cuni_give', 60, 'sub', 'prostitution', 'lesbian'
 		gs 'stat'
-		
+
 		if horand <= pcs_horny:pcs_horny = 0 & orgasm += 1 & 'You were already fairly turned on before going with them, and the girl turns out to be an expert at pleasing other women! She has you begging and moaning in no time, and licks you to an intense orgasm within moments.'
 		$orgasm_or = 'yes'
 		if horand > pcs_horny:pcs_horny += 10 & 'The guy is so demanding, you and the other girl don''t get to focus much on your own pleasure but only cater to his desires. You were not satisfied.'
@@ -213,25 +213,25 @@ if $ARGS[0] = 'start4':
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/sex/couple1.jpg"></center>'
 			'At that point he comes over and sits on the couch with the two of you. He lubes up his dick, while you lube up her asshole. You help her ease down on his dick, he is very gentle with her and lets her lead the action. You help by licking her clit while she rides his dick with her ass.'
 			'By the sounds of it, you can tell she kinda likes it but also finds it a bit painful. Before long she gets off him and says she can''t take anymore and applogises to him. He tells her it''s ok they can try again some other time. With that he bends you over the couch and starts to fuck you in the ass. He is fairly gentle with you, but not nearly as much as he was with his girlfriend, which is kinda sweet.'
-			
+
 			gs 'arousal', 'cuni_give', 60, 'sub', 'prostitution', 'lesbian'
 			gs 'arousal', 'anal', 60, 'sub', 'prostitution'
-		    minut -= 20 
+		    minut -= 20
 			gs 'stat'
-			
+
 			act 'Continue':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/sex/couple2.jpg"></center>'
 				'After an extended period of fucking your ass, she watches obviously a bit envious by how easily you are taking his anal fucking.'
-				'Some time later the guy shoots his load deep in your ass, pulling his dick out, she catches a few drops of sperm from his dick with her tongue.'
-				'After you get dressed and he walks you to the door, he grins and says: "Thanks, you were great! She''s still a bit shy, but at this rate it won''t be long before I can properly introduce her to my buddies, if you know what I mean. Maybe we can do it again next week and you can help her get use to anal." He gives you a dirty wink and gives you <<randLCpay>> <b>₽</b> as he walks you out.'
+				'Sometime later the guy shoots his load deep in your ass, pulling his dick out, she catches a few drops of sperm from his dick with her tongue.'
+				'After you get dressed and he walks you to the door, he grins and says: "Thanks, you were great! She''s still a bit shy, but at this rate it won''t be long before I can properly introduce her to my buddies, if you know what I mean. Maybe we can do it again next week and you can help her get used to anal." He gives you a dirty wink and gives you <<randLCpay>> <b>₽</b> as he walks you out.'
 
 				gs 'arousal', 'anal', 20, 'sub', 'prostitution'
 				gs 'arousal', 'end'
 				gs 'cum_call', 'anus', $boy
 				gs 'stat'
-				
+
 				act 'Leave their apartment building':money += randLCpay & gt 'city_residential'
 				!!end of expanded scene
 			end
@@ -255,8 +255,8 @@ if $ARGS[0] = 'start5':
 
 	gs 'arousal', 'foreplay', 90, 'sub', 'prostitution', 'lesbian'
 	gs 'arousal', 'anal_finger', 90, 'sub', 'prostitution', 'lesbian'
-	minut -= 90 
-	
+	minut -= 90
+
 	if horand <= pcs_horny:Set pcs_horny = 0 & orgasm += 2 & 'Even though the girl had no prior experience with women, she touches you in all the right places and you reach an orgasm more than once during your session.'
 	$orgasm_or = 'yes'
 	if horand > pcs_horny:Set pcs_horny += 10 & 'You mostly focus on making this a pleasurable experience for her, and don''t orgasm yourself. That''s fine, though... the ecstatic look in her eyes when you gave her the third orgasm of the evening more than makes up for it!'
@@ -273,7 +273,7 @@ if $ARGS[0] = 'start6':
 	cla
 	*clr
 	horand = rand(1, 100)
-	
+
 	randLCpay = 500
 	guy += 1
 
@@ -288,11 +288,11 @@ if $ARGS[0] = 'start6':
 
 	gs 'arousal', 'bj', 90, 'sub', 'prostitution'
 	gs 'arousal', 'vaginal', 90, 'sub', 'prostitution'
-	minut -= 90 
-	
+	minut -= 90
+
 	if horand <= pcs_horny:Set pcs_horny = 0 & orgasm += 1 & 'The guy brings you to a mind-blowing orgasm! You wouldn''t think it at first given his posture but he''s a great and experienced lover, knowing exactly what he has to do to make a woman feel good.'
 	$orgasm_or = 'yes'
-	if horand > pcs_horny:Set pcs_horny += 10 & 'The man is making you very aware of the fact that he hired you, and that his needs always come before yours. As a result you don''t get to even think about getting off yourself, and are left unsatisfied.'
+	if horand > pcs_horny:pcs_horny += 10 & 'The man is making you very aware of the fact that he hired you, and that his needs always come before yours. As a result you don''t get to even think about getting off yourself, and are left unsatisfied.'
 
 	act 'Continue':
 		cls
@@ -301,8 +301,8 @@ if $ARGS[0] = 'start6':
 		'Finally, the man''s cock erupts in your mouth, and he doesn''t explain when you take his cock out of your mouth after a few spurts and release the rest onto your boobies.'
 		'He gives you a satisfied grin and lets you use his shower to clean yourself up before you go. He peeks into the shower once or twice while you''re washing yourself, but you don''t care, it''s not like he hasn''t seen you naked before!'
 		'He gives you <<randLCpay>> <b>₽</b>, and walks you to the door when you''re all freshened up.'
-		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'	
-		
+		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+
 		gs 'arousal', 'end'
 		gs 'stat'
 
@@ -314,7 +314,7 @@ if $ARGS[0] = 'toiletsex':
 	gs 'npcgeneratec', 0, 'Stranger from the diner restroom', rand(18,32)
 	gs 'boyStat', $npclastgenerated
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bbq/sex/toiletsexend.jpg"></center>'
-	'You come up from behind the man, and suddenly wrap your arms around him. He''s startled for a moment, but relaxes when you whisper: "That''s a nice cock you have there! I bet we could have some fun together, you and I..."'
+	'You come up from behind the man and suddenly wrap your arms around him. He''s startled for a moment, but relaxes when you whisper: "That''s a nice cock you have there! I bet we could have some fun together, you and I..."'
 	'The man gives you a toothy grin when he feels you wrap your fingers around his cock, but he wants more. He takes you by the hand and guides you to the rear entrance of the diner, into the back alley. He positions you against the dumpsters and eagerly shoves his cock inside you.'
 	gs 'dinsex', 'vaginal_sex', 6, 'unknown'
 	'Not a surprise, he barely lasts any time at all, with in a few minutes he grunts and pulls out of your pussy and shoots his load all over your ass and without a further word he goes back into the cafe.'

+ 6 - 5
locations/LariskaHome.qsrc

@@ -170,7 +170,7 @@ if $ARGS[0] = 'livingroom_exercise_1':
 	menu_off = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_exercise_1.jpg"></center>'
-	'You find Lariska stretching in front of her tv. Since you don''t feel like working out right now, you simply keep her company for awhile.'
+	'You find Lariska stretching in front of her tv. Since you don''t feel like working out right now, you simply keep her company for a while.'
 	minut += 20
 	gs 'npc_relationship', 'modify', 'A13', 'like'
 	pcs_mood += 5
@@ -358,7 +358,7 @@ if $ARGS[0] = 'bathroom_join_2':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_shower_2.jpg"></center>'
 	'You quickly strip your clothing off, and gently tap on the shower door. Startled, she turns to see you standing there, before smiling shyly and opening the door for you.'
-	
+
 	act 'Finish the shower':
 		noshampoo = 1
 		dynamic $showerdin
@@ -384,7 +384,7 @@ if $ARGS[0] = 'bathroom_join_3':
 	menu_off = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/lariska_shower_3.jpg"></center>'
-	'Doesn''t take long before long before washing her back leads to kissing her neck. She turns and wraps her arms around you, and kisses your lips. You tease each other for awhile, taking your time.'
+	'Doesn''t take long before long before washing her back leads to kissing her neck. She turns and wraps her arms around you, and kisses your lips. You tease each other for a while, taking your time.'
 	'Pulling back she smiles sweetly at you and goes to her knees in front of you. She starts by kissing your feet softly, keeping her eyes locked on yours as she slowly works her way up your legs.'
 	minut += 10
 	pcs_horny += 10
@@ -481,7 +481,8 @@ if $ARGS[0] = 'lariska_bedroom':
 		'Her bed sits directly on the floor, without space underneath.'
 	end
 
-	'<table><tr><td valign="top">Your <a href="exec:gt ''alarmclock'', ''start''">phone alarm</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+	'<table><tr><td valign="top">'
+	func('alarmclock', 'base_alarmclock_text')
 	*nl
 	if locat['Lariska'] = 1:'<a href="exec:gt ''LariskaHome'', ''lariska_asleep_1''">Lariska</a> is sound asleep, curled up and wrapped in blankets.'
 	if locat['Lariska'] = 2:'<a href="exec:gt ''LariskaHome'', ''lariska_dressing_1''">Lariska</a> is getting dressed right now.'
@@ -557,7 +558,7 @@ if $ARGS[0] = 'lariska_bedroom':
 				lariskalove += 1
 				gs 'arousal', 'kiss', 5, 'lesbian'
 				gs 'stat'
-			else 
+			else
 				'No longer shy around you, she wraps her hands around your waist and starts kissing you. You move your left hand down to the top of her butt while putting your right on her stomach and start rubbing in circular motions. You slowly start leaning back, pulling her with you until you are both laying on your sides, and her tongue slips between your lips and starts playing with yours. You feel her left hand slide down from your waist and starts rubbing your butt before working its way down from there to your thigh. Hooking her hand around it, she pulls your leg up and over her own before going back to massaging your butt again. Eventually she pulls back from your tongue fight, face flushed a deep red and panting from lack of breath. She gives you a long, hungry look, telling you without words she wants, no, NEEDS, to keep going.'
 				gs 'npc_relationship', 'modify', 'A13', 'like'
 				lariskalove += 1

+ 2 - 2
locations/LariskaSex.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'undressed2':
 	if lariskalove >= 18 and mc_inventory['strapon'] > 0:
 		act 'Lariska wears the Strap-on': gt 'LariskaSex', 'bj_1'
 	end
-	act 'Get dressed': 
+	act 'Get dressed':
 		if analplugout = 1: gs 'dinsex', 'after_anal'
 		if vibratorOUT = 1:
 			vibratorIN = 1
@@ -274,7 +274,7 @@ if $ARGS[0] = 'anal_dog_give_1':
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/lariska/sex/home/strapgive_6.mp4"></video></center>'
 	'You flip her over and pull her ass into the air and place the head of your strap-on against her asshole. As you ease the dildo in, already wet from her mouth, she groans in pain and pleasure, clearly enjoying it.'
 	'She lets out deep moans with each thrust as her asshole stretches to accommodate the rubber dick. Satisfied she can take it, you lean over her and push down on her back with your left hand, and reach around with your right to rub her pussy.'
-	'Staying away from her sensitive clit for now, you give her long, deep strokes with the strap-on, letting her enjoy the double sensation for awhile. Her hands grip the blankets of her bed as she moans and groans below you, loving every minute.'
+	'Staying away from her sensitive clit for now, you give her long, deep strokes with the strap-on, letting her enjoy the double sensation for a while. Her hands grip the blankets of her bed as she moans and groans below you, loving every minute.'
 	'She stay down as you draw your left hand back and start lightly spanking her, alternating between each cheek, until there is a nice pink spot on each side. With every smack she squeals in pleasure, then begs you to do it again.'
 	'Reaching back up to her head, you grab a fistful of hair, focus your right hand onto her clit, and start pounding her ass as hard as you can. The screams she makes make you wonder if all of Pavlovsk can hear her, but you don''t relent, forcing her closer and closer to an orgasm.'
 	'The multiple sensations of hair pulling, frigging her clit, and fucking her ass prove to be too much, and she lets out one long, loud scream as she starts shaking and flopping around. Keeping her pinned, you ride out the orgasm until she finally stops moving.'

+ 23 - 23
locations/MartinSex.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = '':
 		else
 			*nl
 			'As nice as this exchange is, something is different about this, you can tell. You have been chatting with him for a while now and yet you have never felt this... tense before, as if you were mentally preparing for something.'
-			'But it''s not just you: You have had plenty of time to watch him while he worked, seen the way he looks at the women who come to the bar, even the attractive ones: He is appreciative of beauty but self-confident enough to not try to hide his brief stare. The way his eyes jump down to your curves, lingering on your' + iif(tatback>0,'tattooed ','') + 'back, ass,' + iif(tatupb>0,' the tramp stamp in between,','') + ' and ' + iif(tatleg>0,'tattooed ','') + 'legs for a moment before jumping back, as if he couldn''t keep himself from doing it but didn''t want you to notice... It''s almost like he''s a different man. And not an unattractive one at that...'
+			'But it''s not just you: You have had plenty of time to watch him while he worked, seen the way he looks at the women who come to the bar, even the attractive ones: He is appreciative of beauty but self-confident enough to not try to hide his brief stare. The way his eyes jump down to your curves, lingering on your <<$pc_desc[''back'']>> back, ass,' + iif(pcs_tattoos['tramp'] > 0,' the tramp stamp in between,','') + ' and  <<$pc_desc[''legs'']>> legs for a moment before jumping back, as if he couldn''t keep himself from doing it but didn''t want you to notice... It''s almost like he''s a different man. And not an unattractive one at that...'
 
 			act 'Leave the bar':
 				cla
@@ -353,7 +353,7 @@ if $ARGS[0] = '':
 				'"I don''t know what I''ll want a year from now," you answer honestly, "I don''t even know what I''ll want a week from now, but I know that, right now, I want you."'
 				'For a few seconds, nothing happens - Martin seems indecisive, a feeling you know all too well.'
 				*nl
-				'Then, all of a sudden, you feel his lips against yours, showing without a doubt which side of him won the argument, and you kiss him back with a passion, your <<$pcdesc_tongue>> finally united with his.'
+				'Then, all of a sudden, you feel his lips against yours, showing without a doubt which side of him won the argument, and you kiss him back with a passion, your <<$pc_desc[''tongue'']>> tongue finally united with his.'
 				gs 'arousal', 'kiss', 5
 				gs 'stat'
 
@@ -375,7 +375,7 @@ if $ARGS[0] = '':
 					*nl
 					'"Okay, then I''ll see you soon?"'
 					'"Yeah. You know where to find me, corazón." Martin gives you the most lighthearted smile you have ever seen on him - it''s strange how that can make a man look younger, and how that can make you weak in the knees.'
-					'With a goofy smile of your own plastered on your ' + iif(tatfce>0,'tattooed ','') + 'face, you turn around and leave the bar.'
+					'With a goofy smile of your own plastered on your  <<$pc_desc[''face'']>> face, you turn around and leave the bar.'
 					gs 'arousal', 'end'
 					gs 'stat'
 
@@ -415,7 +415,7 @@ if $ARGS[0] = '':
 			*nl
 			'You share a kiss, and a fondle or two, but you don''t wanna make this <b>harder</b> on him than it already is, so you finally step away, smiling inwardly at your stupid pun.'
 			'"Be careful on your way home," Martin admonishes, as usual.'
-			'You raise your <<$pcdesc_eyebrowrandom>> at that, but there''s no helping it - he''s gonna worry anyway.'
+			'You raise your <<$pc_descRandom[''brow'']>> eyebrow at that, but there''s no helping it - he''s gonna worry anyway.'
 			'"Always am," you reassure him, turn around and leave the bar, wondering if, maybe instead of leaving, you should have fucked Martin''s brains out.'
 
 			act 'Leave': gt 'city_industrial'
@@ -478,7 +478,7 @@ if $ARGS[0] = 'MartinTease1':
 	'Martin is utterly perplexed by that. "<<$pcs_firstname>>, what are you-"'
 	'"Oops, I seem to have accidentally pulled my panties down," you say innocently, giving him a broad smile.'
 	*nl
-	'Most of your crotch is revealed to him, but your ' + iif(tatvag>0,'tattooed ','') + 'pussy is only vaguely perceptible. Still, you can already tell that the situation is entirely different from how it was a minute ago - the suave barkeeper is on the defensive. And you are just getting started...'
+	'Most of your crotch is revealed to him, but your  <<$pc_desc[''pussy'']>> pussy is only vaguely perceptible. Still, you can already tell that the situation is entirely different from how it was a minute ago - the suave barkeeper is on the defensive. And you are just getting started...'
 	gs 'clothing', 'strip'
 	gs 'arousal', 'foreplay', 1, 'exhibitionism'
 	gs 'stat'
@@ -488,7 +488,7 @@ if $ARGS[0] = 'MartinTease1':
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/tease2.jpg"></center>'
 		'You pull your panties all the way down to your knees and spin around for a moment to let him look at you from all sides. Spotting a growing bulge in his pants, you turn your back to Martin and bend over a nearby table.'
 		*nl
-		'"Well?" You ask flirtatiously over your shoulder, your <<$pcdesc_genitals>> and asshole completely revealed to him. "Do I still look too young to you? Or... just old enough?"'
+		'"Well?" You ask flirtatiously over your shoulder, your pussy and asshole completely revealed to him. "Do I still look too young to you? Or... just old enough?"'
 		'His speechlessness is all the answer you need.'
 		'And you can''t blame him for this reaction - you went from being a friendly flirt to showing him your pussy in under a minute, so most men would need a second to catch up with a reality that has gone utterly mad.'
 
@@ -510,14 +510,14 @@ if $ARGS[0] = 'MartinTease1':
 		act 'Climb on the table':
 			cls
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/tease3.jpg"></center>'
-			'Deciding to make full use of the table being there, you climb on top of it and sit down, spreading your legs to give Martin a good view of your ' + iif(pirsG>0,'pierced ','') + 'pussy.'
+			'Deciding to make full use of the table being there, you climb on top of it and sit down, spreading your legs to give Martin a good view of your <<$pc_desc[''pussy'']>> pussy.'
 			*nl
 			'"You could do more than just look, you know." The flirtatious tone is gone now - anything but being openly sultry just wouldn''t do this porno-esque situation justice.'
-			'Plus, Martin isn''t the only one getting turned on by this, and both of you can see it. "This <<$pc_desc[''pubes'']>> <<$pc_desc[''pussy'']>> <<$pcdesc_genitals>> could be yours."'
+			'Plus, Martin isn''t the only one getting turned on by this, and both of you can see it. "This <<$pc_desc[''pubes'']>> <<$pc_desc[''pussy'']>> pussy could be yours."'
 			*nl
 			'Maybe something you said shook him out of his reverie, or maybe enough time has passed for him to snap out of it, but Martin seems to have regained the ability to speak. But he just loves saying things you don''t want to hear, doesn''t he?'
 			'"<<$pcs_firstname>>, I''m trying to be <b>sensible</b> here. This is not a good idea. You should cover yourself and go."'
-			'It''s telling that his mouth says one thing while his eyes are transfixed with your glistening <<$pcdesc_genitals>>.'
+			'It''s telling that his mouth says one thing while his eyes are transfixed with your glistening pussy.'
 			gs 'arousal', 'foreplay', 1, 'exhibitionism'
 			gs 'stat'
 
@@ -566,7 +566,7 @@ if $ARGS[0] = 'MartinTease2':
 		'It wouldn''t be nice to tease Martin with a sight like that and keep him guessing if the carpets do indeed match the drapes.'
 		*nl
 		'Without putting the glass down, you turn your side to Martin and bare your lower half with your free hand. You can feel Martin''s eyes linger on your <<$pc_desc[''legs'']>> legs, but you know what he really wants to see, as much as he''d deny it.'
-		'Feeling ready to burn whatever bridge there''s left behind you, you face Martin, revealing your <<$pc_desc[''pubes'']>> <<$pcdesc_genitals>> to him. He seems shocked by your boldness; not just by you stripping for him, right here in the empty bar - although that must be a big part of it - but also by the fact that you had been walking around commando like there was nothing to it.'
+		'Feeling ready to burn whatever bridge there''s left behind you, you face Martin, revealing your <<$pc_desc[''pubes'']>> pussy to him. He seems shocked by your boldness; not just by you stripping for him, right here in the empty bar - although that must be a big part of it - but also by the fact that you had been walking around commando like there was nothing to it.'
 		*nl
 		'"Like what you see?"'
 		'You don''t know if he was even physically capable of saying no, given that he just barely managed to croak a "yes" - still, it was nice that he was being honest with you and himself.'
@@ -579,7 +579,7 @@ if $ARGS[0] = 'MartinTease2':
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease3.jpg"></center>'
 			'With an audience as appreciative as this, how could you possibly stop now?'
 			*nl
-			'Setting the glass, your trusty prop, aside, you pull down what little covers your ' + iif(tatbrst > 0,'tattooed ','') + 'chest and ' + iif(tatblly > 0 and tatbrst = 0,'tattooed ','') +'belly, giving Martin a good look at your <<$pc_desc[''breast'']>> tits, your <<$pc_desc[''nipples'']>> nipples standing hard thanks to the chilly, smoky air... and maybe also due to his intense stares.'
+			'Setting the glass, your trusty prop, aside, you pull down what little covers your <<$pc_desc[''chest'']>> chest and <<$pc_desc[''belly'']>> belly, giving Martin a good look at your <<$pc_desc[''breast'']>> tits, your <<$pc_desc[''nipples'']>> nipples standing hard thanks to the chilly, smoky air... and maybe also due to his intense stares.'
 			*nl
 			'You lift your arms a little, playing with your <<$pc_descWordy[''hair length'']>> and sticking out your breasts even more.'
 			'No, you <b>really</b> aren''t making it easy for Martin to adhere to his principles regarding celibacy and sexy young women, or whatever it is that''s holding him back from bending you over and nailing you into the fucking counter.'
@@ -601,7 +601,7 @@ if $ARGS[0] = 'MartinTease2':
 				'"Really?" You look at your leg, confused. "Yeah, I guess you''re right."'
 				*nl
 				'You momentarily see something like hope or relief flare up in his eyes. You are not feeling very merciful tonight, though:'
-				'You put one of your hands on your ass and pull slightly, completely revealing what little of your <<$pcdesc_genitals>> and <<$pc_desc[''anus'']>> asshole wasn''t already visible to him.'
+				'You put one of your hands on your ass and pull slightly, completely revealing what little of your pussy and <<$pc_desc[''anus'']>> asshole wasn''t already visible to him.'
 				'"There, better now?"'
 
 				if analplugin = 1:
@@ -621,14 +621,14 @@ if $ARGS[0] = 'MartinTease2':
 				act 'Just one last push...':
 					cls
 					'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease5.jpg"></center>'
-					'Ridding yourself of what little items you have still left on you, you put your leg up on the bar and bend over. Your ass and <<$pcdesc_genitals>> aren''t just visible to Martin - they are also very much accessible.'
+					'Ridding yourself of what little items you have still left on you, you put your leg up on the bar and bend over. Your ass and pussy aren''t just visible to Martin - they are also very much accessible.'
 					*nl
 					'"<<$pcs_firstname>>-" But you cut him off.'
 					'"If you are gonna say anything but ''I want to fuck you so bad right now'', I''m going to scream." You''re not sound very playful now, to be honest. All the cards are on the table, and you went about a million extra miles to show Martin just how much you want him. If he doesn''t finally take a hint, you''re going to-'
 					*nl
 					'But before you can even finish the thought, Martin kissing you, hard, his hands are roaming your body and exploring every mound and every crevice.'
 					'"Alright, you asked for it," he growls, "but I''m not gonna play nice."'
-					'"I never wanted you to," you moan, his fingers stroking your <<$pcdesc_genitals>> and clit.'
+					'"I never wanted you to," you moan, his fingers stroking your pussy and clit.'
 					*nl
 					'You don''t know if his zipper exploded at your last words or if he was just that damn good with his hands that you didn''t even notice when he opened it to reveal his <<dick>>cm <<$dick_girth>> dick, but you cannot wait to feel him inside you and, judging by how he''s now taking position behind you, neither can he.'
 
@@ -663,7 +663,7 @@ if $ARGS[0] = 'MartinTease3':
 		'You pull your panties all the way down to your knees and spin around for a moment, to let him look at you from all sides... and to bar him from seeing your exposed crotch right away. Still, you quickly spot the growing bulge in his pants - knowing that you are half-naked and seeing you in glorious, pantiless profile seems to be enough to get his engine going.'
 		*nl
 		'You ever so slowly turn your back to Martin and lasciviously bend over a nearby table.'
-		'"Well?" You ask flirtatiously over your shoulder, your <<$pc_desc[''pubes'']>> <<$pcdesc_genitals>> and asshole completely revealed to him. "Enjoying the view?"'
+		'"Well?" You ask flirtatiously over your shoulder, your <<$pc_desc[''pubes'']>> pussy and asshole completely revealed to him. "Enjoying the view?"'
 		'"You have no idea," he breathes, a lustful glint in his eyes.'
 
 		if analplugin = 0:
@@ -743,7 +743,7 @@ if $ARGS[0] = 'MartinTease3':
 					'At first, Martin probably thinks you''re joking, but seeing as you''re putting your other clothes back on as well, he gets up, frowning.'
 					'"You''d leave me here, alone, in this state?" He points towards his crotch where his dick is straining against the fabric of his pants. "You couldn''t possibly be this cruel."'
 					*nl
-					'You walk up to Martin, put your ' + iif(tatarm>0,'tattooed ','') + 'arms around his neck and give him a soft kiss. When you break it, you whisper: "If I wasn''t cruel at least once in a while, you wouldn''t appreciate it when I''m not."'
+					'You walk up to Martin, put your <<$pc_desc[''arms'']>> arms around his neck and give him a soft kiss. When you break it, you whisper: "If I wasn''t cruel at least once in a while, you wouldn''t appreciate it when I''m not."'
 					*nl
 					'With that, you quickly move out of his range, towards the door, blow the perplexed barkeeper a final kiss and make off like a bandit.'
 					'... A horny bandit.'
@@ -785,7 +785,7 @@ if $ARGS[0] = 'MartinTease4':
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease2.jpg"></center>'
 		'Without putting the glass down, you turn your side to Martin and bare your lower half with your free hand, making it blatantly obvious that you were indeed going commando. You can feel Martin''s eyes linger on your <<$pc_desc[''legs'']>> legs, but you know what he really wants to see - he wants you to confirm what he already knows.'
 		*nl
-		'You slowly turn to face Martin, revealing your <<$pc_desc[''pubes'']>> <<$pcdesc_genitals>> to him. Your boldness to strip for him, right here in the empty bar, and to walk around without underwear seem to turn him on immensely, if the bulge in his pants is any indication.'
+		'You slowly turn to face Martin, revealing your <<$pc_desc[''pubes'']>> pussy to him. Your boldness to strip for him, right here in the empty bar, and to walk around without underwear seem to turn him on immensely, if the bulge in his pants is any indication.'
 		*nl
 		'"Like what you see?" You ask, taking another small sip of wine.'
 		'"You little minx", is all he says, sounding as incredulous as he does admiring - not to mention horny.'
@@ -798,7 +798,7 @@ if $ARGS[0] = 'MartinTease4':
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/nopanties_tease3.jpg"></center>'
 			'With an audience as appreciative as this, how could you possibly stop now?'
 			*nl
-			'Setting the glass aside, you pull down what little covers your ' + iif(tatbrst > 0,'tattooed ','') + 'chest and ' + iif(tatblly > 0 + tatbrst = 0,'tattooed ','') +'belly, giving Martin a good look at your <<$pc_desc[''breast'']>> tits, your <<$pc_desc[''nipples'']>> nipples standing hard thanks to the chilly, smoky air... and maybe also due to his intense stares.'
+			'Setting the glass aside, you pull down what little covers your <<$pc_desc[''chest'']>> chest and <<$pc_desc[''belly'']>> belly, giving Martin a good look at your <<$pc_desc[''breast'']>> tits, your <<$pc_desc[''nipples'']>> nipples standing hard thanks to the chilly, smoky air... and maybe also due to his intense stares.'
 			*nl
 			'You lift your arms a little, playing with your <<$pc_descWordy[''hair length'']>> and sticking out your breasts even more.'
 			'Honestly, it wouldn''t have surprised you if he had just bent you over and nailed you into the fucking counter then and there - his eyes are certainly burning with desire enough to tell you that he wants to.'
@@ -820,7 +820,7 @@ if $ARGS[0] = 'MartinTease4':
 				'When you look up from the stool, you are stunned to see Martin give you a look of indifference. "That''s okay, I guess."'
 				*nl
 				'You almost burst into laughter after your brain has caught up with his challenge, but you are only too happy to indulge him, if it''s an even sexier display he wants.'
-				'You put one of your hands on your ass and pull slightly, completely revealing what little of your <<$pcdesc_genitals>> and <<$pc_desc[''anus'']>> asshole wasn''t already visible to him.'
+				'You put one of your hands on your ass and pull slightly, completely revealing what little of your pussy and <<$pc_desc[''anus'']>> asshole wasn''t already visible to him.'
 				'"Just okay, huh?"'
 
 				if analplugin = 0:
@@ -917,7 +917,7 @@ if $ARGS[0] = 'MartinTeaseDildo':
 	gs 'boyStat', 'A216'
 	inhib_exp += rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/tease/teasedildo1.jpg"></center>'
-	'You roll to your ' + iif(tatside>0,'tattooed ','') + 'side. Grinning like a Cheshire cat, you rummage through your purse and, under the curious looks of Martin, pull out your ' + iif(dildo = 1,'10cm','15cm') + ' dildo.'
+	'You roll to your <<$pc_desc[''side'']>> side. Grinning like a Cheshire cat, you rummage through your purse and, under the curious looks of Martin, pull out your ' + iif(dildo = 1,'10cm','15cm') + ' dildo.'
 	*nl
 	'"Whatever am I going to do with this?" you wonder out loud, locking eyes with Martin as you give the tip of the dildo a lick or three.'
 	'"Yes, whatever indeed," he muses, his pants stretched to their limit around his crotch.'
@@ -936,7 +936,7 @@ if $ARGS[0] = 'MartinTeaseDildo':
 		'Your smile fades fast as lust overtakes you.'
 		'Time moves different when you are aroused like this, when every sensation is like a shockwave in your head and every nerve of your body is on edge. A giant crowd could have been watching you right now and you wouldn''t even care - no, actually, at this point it would probably only make this more intense.'
 		*nl
-		'You can sense every tiny movement of the dildo inside your <<$pc_desc[''pussy'']>> <<$pcdesc_genitals>> as you shift around, move it in and out, rubbing it against this wall and that and making sure to brush against your clit every now and then.'
+		'You can sense every tiny movement of the dildo inside your <<$pc_desc[''pussy'']>> pussy as you shift around, move it in and out, rubbing it against this wall and that and making sure to brush against your clit every now and then.'
 		'There are plenty of instances when you wouldn''t be able to cum without rubbing your sensitive nub, but this situation is so hot that you have no trouble at all getting yourself off.'
 		$orgasm_txt = 'no'
 		gs 'arousal', 'vaginal_dildo', 5, 'exhibitionism'
@@ -982,9 +982,9 @@ if $ARGS[0] = 'MartinTeaseDildo':
 				'At first, Martin probably thinks you''re joking, but seeing as you''re putting your other clothes back on as well, he gets up, frowning.'
 				'"You''d leave me here, alone, in this state?" He points towards his crotch where his dick is straining against the fabric of his pants. "You couldn''t possibly be this cruel."'
 				*nl
-				'You walk up to Martin, put your arms around his neck and give him a soft kiss, the taste of your ' + iif(pirsG>0,'pierced ','') + 'pussy on your ' + iif(tatlip>0,'tattooed ','') + 'lips and tongue. When you break it, you whisper: "If I wasn''t cruel at least once in a while, you wouldn''t appreciate it when I''m not."'
+				'You walk up to Martin, put your arms around his neck and give him a soft kiss, the taste of your <<$pc_desc[''pussy'']>> pussy on your <<$pc_desc[''lips'']>> lips and tongue. When you break it, you whisper: "If I wasn''t cruel at least once in a while, you wouldn''t appreciate it when I''m not."'
 
-				if $pantyworntype ! 'none':
+				if $pantyworntype = 'none':
 					'"Besides," you add with a naughty smile, "you just saw me cum really hard, so I think you''ll cum immediately when I''m out that door once you realize that I''m going commando again."'
 					*nl
 					'With that, you quickly move out of his range, towards the door, blow the perplexed barkeeper a final kiss and make off like a bandit.'

+ 154 - 156
locations/MartinSex2.qsrc

@@ -7,8 +7,8 @@ menu_off = 1
 if $ARGS[0] = 'MartinSexPrep':
 	*clr & cla
 	gs 'boyStat', 'A216'
-	
-	if $martinpos = 'cowgirl':	
+
+	if $martinpos = 'cowgirl':
 		'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cowgirl/cowgirl_rub.mp4"></center>'
 	elseif $martinpos = 'rev_cowgirl':
 		'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/rev_cowgirl/rev_cowgirl_rub.mp4"></center>'
@@ -19,70 +19,70 @@ if $ARGS[0] = 'MartinSexPrep':
 	elseif $martinpos = 'sideways':
 		'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/sideways/sideways_rub.mp4"></center>'
 	end
-	
+
 	if MartinPussyLick = 1:
 		'With your pussy thoroughly eaten out, you wet and ready for the real thing.'
 	else
 		'You could certainly tease Martin more, arouse him and yourself until the slightest touch could set you off, but you want his hard dick inside you and you want it <b>now</b>.'
 	end
-	
+
 	if $clothingworntype ! 'nude':
 		*nl
 		'Giving Martin a saucy look, you quickly strip down, completely exposing yourself to the bartender. Now that you''re dressed for the occasion, nothing''s standing between you and a night to remember.'
 		gs 'clothing', 'strip_all'
-	
+
 	else
 		'And your little show earlier not only removed all possible obstacles but got you and your lover all hot and bothered.'
 	end
-	
+
 	*nl
 	if $martinpos = 'cowgirl' or $martinpos = 'rev_cowgirl':
 		'"Lie down," you say, sounding a little more forceful than you really wanted to, "I want to ride you."'
 		'Martin smiles. "If you insist." He unceremoniously rids himself of his pants and lies down quickly, knowing better than to argue with a horny woman.'
 		*nl
-		'Without delay, you climb on top of him, ' + iif($martinpos='rev_cowgirl','facing away from him','face to face with him') + ', his <<dick>>cm <<$dick_girth>> cock tantalizingly close to your wet <<$pcdesc_genitals>>' + iif($martinpos='rev_cowgirl',' and giving him a fantastic view of your ass','') + ' as you rub your slit along his length, sending ripples of pleasure through your body.'
-	
+		'Without delay, you climb on top of him, ' + iif($martinpos='rev_cowgirl','facing away from him','face to face with him') + ', his <<dick>>cm <<$dick_girth>> cock tantalizingly close to your wet pussy' + iif($martinpos='rev_cowgirl',' and giving him a fantastic view of your ass','') + ' as you rub your slit along his length, sending ripples of pleasure through your body.'
+
 	elseif $martinpos = 'doggystyle':
-		'You bend over, giving Martin unrestricted access to your exposed <<$pcdesc_genitals>> and a sexy view of your <<$pc_desc[''anus'']>> anus.'
+		'You bend over, giving Martin unrestricted access to your exposed pussy and a sexy view of your <<$pc_desc[''anus'']>> anus.'
 		'Martin smiles, clearly pleased with your shamelessness and urgency. He unceremoniously rids himself of his pants and comes up behind you, his erect penis so close to your wet folds you can feel the warmth it emanates. Not being able to see everything he does really turns you on.'
 		*nl
 		'To say that you are ready would be an understatement, which is probably the reason Martin... doesn''t penetrate you. Instead, he rubs his dick up and down the length of your slit, spreading your juices all around your lips and teasing you with the tip of his <<dick>>cm <<$dick_girth>> cock until you are about ready to scream.'
-	
+
 	elseif $martinpos = 'missionary':
-		'You get on your back and spread your legs, giving Martin a lovely view of your <<$pcdesc_genitals>> and a smoldering ''come hither'' look.'
+		'You get on your back and spread your legs, giving Martin a lovely view of your pussy and a smoldering ''come hither'' look.'
 		'Martin smiles, clearly pleased with the urgency and horniness you''re showing. He unceremoniously rids himself of his pants and comes up to you, his erect penis so close to your wet folds you can feel the warmth it emanates. Being face to face with him like this, nothing but air separating his dick from your wet hole, arouses you to no end.'
 		*nl
 		'It''s painfully obvious how much you want him to fuck you, which is probably why Martin... doesn''t penetrate you. Instead, he whips his dick against your slit, sending tiny shockwaves through your body each time he hits your clit and teasing you with the tip of his <<dick>>cm <<$dick_girth>> cock until you are about ready to scream.'
-	
+
 	elseif $martinpos = 'sideways':
-		'You lie down on your side, pulling on your ass and thigh to expose your wet <<$pcdesc_genitals>> to Martin and looking at him with unashamed want.'
+		'You lie down on your side, pulling on your ass and thigh to expose your wet pussy to Martin and looking at him with unashamed want.'
 		'Martin smiles, your urgency pleasing and arousing him. He unceremoniously rids himself of his pants and comes up to you, his erect penis so close to your wet folds you can feel the warmth it emanates.'
 		*nl
-		'To say that you are ready would be an understatement, but Martin doesn''t seem to care because... he doesn''t penetrate you. Instead, he flips you on your back, pushes your legs back and rubs the length of his <<dick>>cm <<$dick_girth>> dick along your slit. You reach down to push his cock against your <<pcs_vag>> sex, increasing the friction of each thrust, both relishing and cursing this pleasurable torture.'
+		'To say that you are ready would be an understatement, but Martin doesn''t seem to care because... he doesn''t penetrate you. Instead, he flips you on your back, pushes your legs back and rubs the length of his <<dick>>cm <<$dick_girth>> dick along your slit. You reach down to push his cock against your <<$pc_desc[''pussy'']>> sex, increasing the friction of each thrust, both relishing and cursing this pleasurable torture.'
 	end
-	
+
 	*nl
 	if stat['think_virgin'] = 1:
 		'But before either of you can make another move, a nagging thought that''s been floating around the back of your head pushes to the foreground of your mind: You are a virgin. Is Martin <i>really</i> the man you want to have your first time with? Not to mention all the risks involved if you didn''t take all necessary precautions against pregnancy...'
-	elseif mc_inventory['equipped_condoms'] > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
+	elseif mc_inventory['equipped_condoms'] > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0:
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex without condoms, but...', ' ')
-	elseif mc_inventory['equipped_condoms'] > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000: 
+	elseif mc_inventory['equipped_condoms'] > 0 and preziktype ! 2 and tabletkishot < 1 and pillcon2 < 30000:
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. Today isn''t really a dangerous day, but it might be better to be safe than sorry. And while Martin doesn''t seem like the type who fucks random sluts, you can never be entirely sure of that, can you? You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the condoms sitting in it materializing before your inner eye.' + iif(preziktype=1,' You usually prefer to have sex sans condoms, but...', ' ')
-	elseif mc_inventory['equipped_condoms'] > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
+	elseif mc_inventory['equipped_condoms'] > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0:
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the sabotaged condoms sitting in it materializing before your inner eye. You could put one on Martin and get pregnant, and he would be none the wiser...'
-	elseif mc_inventory['equipped_condoms'] > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000: 
+	elseif mc_inventory['equipped_condoms'] > 0 and preziktype = 2 and tabletkishot < 1 and pillcon2 < 30000:
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. Today isn''t really a dangerous day, so the odds of that are relatively small, but still... You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', the sabotaged condoms sitting in it materializing before your inner eye. You could put one on Martin and get pregnant, and he would be none the wiser...'
-	elseif mc_inventory['equipped_condoms'] = 0 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0: 
+	elseif mc_inventory['equipped_condoms'] = 0 and tabletkishot < 1 and pillcon2 < 30000 and ovulate > 0:
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. And unless your count is off, today is a dangerous day to boot. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', only to realize that you don''t have any condoms anyway. You could stop this, of course... but then again, could you really, with his beautiful dick just inches from your pussy?'
-	elseif mc_inventory['equipped_condoms'] = 0 and tabletkishot < 1 and pillcon2 < 30000: 
+	elseif mc_inventory['equipped_condoms'] = 0 and tabletkishot < 1 and pillcon2 < 30000:
 		'But before either of you can make another move, a simple, powerful thought crosses your mind: You could get pregnant. You take a tentative look at your ' + iif(bag > 0,'purse','pocket') + ', only to realize that you don''t have any condoms anyway. You could stop this, of course... but then again, could you really, with his beautiful dick just inches from your pussy?'
-	elseif mc_inventory['equipped_condoms'] > 0 and preziktype ! 2: 
+	elseif mc_inventory['equipped_condoms'] > 0 and preziktype ! 2:
 		'But before either of you can make another move, your eyes come to rest on your ' + iif(bag > 0,'purse','pocket') + ' and you remember the condoms sitting inside it. Sure, you don''t really need to use them since you can''t get pregnant thanks to the birth control' + iif(tabletkishot > 0,' shot',' pills') + ', but it might be less of a mess if Martin wore one. Then again, it would also be a little less intense.'
 	end
 	gs 'arousal', 'foreplay', 1
 	killvar 'MartinPussyLick'
 	gs 'stat'
-	
+
 	act 'Stop and get dressed':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/industrial/bar/gettingdressed.mp4"></center>'
@@ -101,10 +101,10 @@ if $ARGS[0] = 'MartinSexPrep':
 		gs 'clothing', 'wear_last_worn'
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Leave the bar': gt 'city_industrial'
 	end
-	
+
 	act 'Get him off with your mouth':MartinSexStop = 1 & gt 'MartinSex3','MartinBlowjob'
 	act 'Have anal sex instead':MartinSurpAnal = 1 & gt 'MartinSex2', 'MartinAnalDyn'
 	act 'Ask Martin to wear a condom':MartinPrezik = 1 & gt 'MartinSex2', 'MartinSexDyn'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'MartinSexPrep':
 		act '"Fuck me, Martin"':gt 'MartinSex2','MartinSexDyn'
 	end
 end
-	
+
 if $ARGS[0] = 'MartinSexDyn':
 	*clr & cla
 	gs 'boyStat', 'A216'
@@ -123,8 +123,8 @@ if $ARGS[0] = 'MartinSexDyn':
 	else
 		pic_rand = rand(1,3)
 	end
-	
-	if $martinpos = 'cowgirl':	
+
+	if $martinpos = 'cowgirl':
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/cowgirl/cowgirl<<pic_rand>>.jpg"></center>'
 	elseif $martinpos = 'rev_cowgirl':
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/rev_cowgirl/rev_cowgirl<<pic_rand>>.jpg"></center>'
@@ -135,7 +135,7 @@ if $ARGS[0] = 'MartinSexDyn':
 	elseif $martinpos = 'sideways':
 		'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/sideways/sideways<<pic_rand>>.jpg"></center>'
 	end
-		
+
 	if MartinPrezik = 1:
 		'You reach into your ' + iif(bag > 0,'purse','pocket') + ', quickly finding a condom.'
 		'You decide that, if you''re gonna ask, you might as well get it over with quickly - like ripping off a bandage, except the bandage is a condom and it''s being put on.'
@@ -143,21 +143,21 @@ if $ARGS[0] = 'MartinSexDyn':
 		'"Can we use this today?"'
 		'His disappointment is clear as day. There''s not a man in the world who likes to be asked that question, and right when the fun is about to start and he''s inches away from his prize too. But after a second or two, he recovers, probably remembering that sex is, after all, still sex, rubber or not, and takes the condom from you, wrapping his shaft in latex with practiced ease.'
 		*nl
-		
-		if preziktype = 2: 
+
+		if preziktype = 2:
 			'You could have just let him go bareback, of course; the condom is about as fit to catch sperm as a sieve, and has about as many holes in it, too.'
 			*nl
 			'But... maybe he would have pulled out. Maybe he would have held himself back.'
 			'With ''protection'' like this, he has no reason to. Before he knows it, he''ll have filled your pussy with his cum, and that mental image makes you feel giddy with anticipation as you reach for his dick.'
-		
-		elseif preziktype = 0 and tabletkishot < 1 and pillcon2 < 30000: 
+
+		elseif preziktype = 0 and tabletkishot < 1 and pillcon2 < 30000:
 			'You were tempted to just put him inside you. He was so tantalizingly close... but the prospect of getting pregnant was scary enough to hold you back.'
 			*nl
 			'Sure, he could have pulled out, and he still can, but you know that the only way to make sure you don''t get pregnant is to take the pill or use a condom, and lacking a hormonal solution, this is what you and your lover will have to put up with.'
 			*nl
 			'You sigh inwardly and bite your lip when your mind wanders, revisiting the sight of his bare cock, tempting you... but you''ve made your choice and almost defiantly reach for his rubber-wrapped cock.'
-		
-		elseif preziktype = 0: 
+
+		elseif preziktype = 0:
 			'You could have just let him go bareback, of course. There''s no way you could get pregnant right now, just no way...'
 			*nl
 			'But when you think about his cum dripping out and running down your legs, going to the "bathroom" to clean yourself up, and still having the stuff drip out of you for at least another hour or two... You''re just not in the mood for that.'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'MartinSexDyn':
 			'Sure, condoms make it feel a little muted, and you could just let him cum elsewhere - still can, but this way, all your options are on the table and you can just enjoy it without having to worry about a messy clean-up... unless that''s what strikes your fancy when you''re in the moment.'
 		end
 	end
-	
+
 	*nl
 	if $martinpos = 'cowgirl':
 		'Your hand feels small around his cock as you hold him in place, teasingly rubbing him against your pussy lips a few times and shooting him a quick glance before impaling yourself on him.'
@@ -179,7 +179,7 @@ if $ARGS[0] = 'MartinSexDyn':
 		'Martin is all too happy to finally put an end to the teasing: He flips you on your side again and deftly guides the tip of his cock to your wet hole and enters you, pushing his length deeper and deeper inside you with this first, slow stroke.'
 	end
 	*nl
-	
+
 	if pcs_vag = 0:
 		npc_rel['A216'] -= 2
 		'The trickle of blood from your broken hymen doesn''t escape his sharp eyes, though, and he brings your carnal act to a grinding halt.'
@@ -188,7 +188,7 @@ if $ARGS[0] = 'MartinSexDyn':
 		'"<i>Was</i>," you correct proudly, "I <i>was</i> a virgin. Now I''m a woman." You can feel some pain from having his throbbing <<$dick_girth>> cock where that small membrane used to be, but while neither of you move, it''s bearable.'
 		*nl
 		'You certainly don''t want to stop, though - not halfway into your first time.'
-		
+
 		if ($martinpos = 'cowgirl' or $martinpos = 'rev_cowgirl'):
 			'In fact, before Martin can get any ideas, like pulling out, you go back to impaling your pussy on your first proper cock, although you''re not sure he''s completely over the fact that he took your virginity.'
 		else
@@ -196,23 +196,23 @@ if $ARGS[0] = 'MartinSexDyn':
 		end
 		*nl
 	end
-	
-	if pcs_vag < dick and ($martinpos = 'cowgirl' or $martinpos = 'rev_cowgirl'): 
-		'And it really does feel like you are impaling yourself: You aren''t wide enough to accommodate a dick of Martin''s size just like that and you groan in pain as you take more and more of him inside. Your wetness and arousal make it bearable and you don''t want to stop, but it takes a little while until you have fully adapted to his size.' 
+
+	if pcs_vag < dick and ($martinpos = 'cowgirl' or $martinpos = 'rev_cowgirl'):
+		'And it really does feel like you are impaling yourself: You aren''t wide enough to accommodate a dick of Martin''s size just like that and you groan in pain as you take more and more of him inside. Your wetness and arousal make it bearable and you don''t want to stop, but it takes a little while until you have fully adapted to his size.'
 		*nl
 		'With the pain slowly fading, you start moving up and down. Martin must have picked up on your discomfort, because he gently strokes your leg and doesn''t make any attempt to speed things up until you yourself are ready for it. Soon, sooner than you expected, the pain is... no, not gone, but overtaken by that familiar, wonderful heat.'
-	elseif pcs < dick and ($martinpos = 'doggystyle' or $martinpos = 'missionary' or $martinpos = 'sideways'):
-		'But despite his obvious restraint, there''s no helping the fact that your pussy isn''t wide enough to accommodate a dick of Martin''s size just like that, and you groan in pain as he parts your inner walls. Your wetness and arousal make it bearable and you don''t want him to stop, nor does he seem capable of it, now that he is finally inside you. Still, it takes a little while until you have fully adapted to his size.' 
+	elseif pcs_vag < dick and ($martinpos = 'doggystyle' or $martinpos = 'missionary' or $martinpos = 'sideways'):
+		'But despite his obvious restraint, there''s no helping the fact that your pussy isn''t wide enough to accommodate a dick of Martin''s size just like that, and you groan in pain as he parts your inner walls. Your wetness and arousal make it bearable and you don''t want him to stop, nor does he seem capable of it, now that he is finally inside you. Still, it takes a little while until you have fully adapted to his size.'
 		*nl
 		'With the pain slowly fading, you start to relax and focus on the pleasant sensations he is giving you. When you open your eyes - which you had unconsciously screwed shut at the pain - and turn your head to face to him, you see Martin give you a comforting look, and you notice that he had slowed down almost to a stop. You give him a tender smile and move against him to show that you are fine. He picks up the pace again and soon, sooner than you expected, the pain is... no, not gone, but overtaken by that familiar, wonderful heat.'
 	end
-	
-	*nl	
-	if tabletkishot < 1 and pillcon2 < 30000: 
+
+	*nl
+	if tabletkishot < 1 and pillcon2 < 30000:
 		'The thought that you could get pregnant is still present in the back of your head, now that Martin''s dick is deep inside you, but you have long passed the point of no return. <<$OpenInnerThought>>I can always have him pull out,<<$CloseInnerThought>> you think to yourself and allow the thought to fade as you give in to the sensations that flood your senses.'
 	end
-	
-	*nl	
+
+	*nl
 	if $martinpos = 'cowgirl':
 		'Feeling Martin''s <<dick>>cm <<$dick_girth>> cock slowly move inside you as you lift yourself up and fall back down is incredible; the control you have over the situation makes it even more satisfying. You moan softly as you ever so slightly speed up your movements, looking at Martin from under hooded eyes and enjoying the sight of his slightly parted lips, or the intense look with which he focuses on your swaying breasts - he is completely under your spell.'
 	elseif $martinpos = 'rev_cowgirl':
@@ -224,7 +224,7 @@ if $ARGS[0] = 'MartinSexDyn':
 	elseif $martinpos = 'sideways':
 		'Feeling Martin''s <<dick>>cm <<$dick_girth>> cock move inside you as he enters you and withdraws is wonderful. You have little control over the situation, now that everything''s said and done and the barkeeper is balls-deep inside you, and that is exactly what makes you moan so loud. You look up at him and find his eyes moving back and forth between your face, your swaying breasts and ass - you can see him and what he''s doing to you and yet this position makes you feel wonderfully vulnerable and exposed.'
 	end
-	
+
 	*nl
 	$orgasm_txt = 'You only lasted a few minutes, that''s how horny you were. You and Martin haven''t even really had the time to get into a proper rhythm before you feel your orgasm build up and sweep you off your feet. You cum with loud moans, your insides quivering around Martin''s cock as you buck against your lover and desperately try to keep up your movements. But you fail and have to stop after a few seconds because your legs feel like jelly. After a short break in Martin''s arms, you start moving once again, shifting here and there to allow Martin to explore every inch of your now tightened pussy.'
 	if $martinpos = 'cowgirl' or $martinpos = 'rev_cowgirl':
@@ -234,9 +234,8 @@ if $ARGS[0] = 'MartinSexDyn':
 	end
 	$orgasm_txt = ''
 	minut += 3
-	killvar 'MartinPrezik'
-	gs 'stat'	
-	
+	gs 'stat'
+
 	if $martinpos = 'rev_cowgirl' or $martinpos = 'doggystyle':
 		if $martinpos = 'doggystyle':
 			act '"Fuck my ass, Martin"':gt 'MartinSex2', 'MartinAnalDyn'
@@ -254,7 +253,7 @@ if $ARGS[0] = 'MartinSexDyn':
 			pic_rand2 = rand(4,5)
 		end
 		if pic_rand = pic_rand2:jump 'pic_loop'
-			
+
 		if $martinpos = 'cowgirl' or $martinpos = 'rev_cowgirl':
 			if $martinpos = 'cowgirl':
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/cowgirl/cowgirl<<pic_rand2>>.jpg"></center>'
@@ -264,52 +263,52 @@ if $ARGS[0] = 'MartinSexDyn':
 			'You are moving ever faster, trying to take Martin''s wonderful cock deeper into your <<$pc_desc[''pussy'']>> pussy, fucking him harder, moaning louder as you go. It may have started off gently but there''s no gentleness left to be found here anymore: You are riding this man in the middle of his bar, giving him a fantastic view of your ' + iif($martinpos='rev_cowgirl','ass','tits') + ' in the same spot some guys talked about their shitty jobs and marital problems a few hours ago.'
 			*nl
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody else is here right now.'
-			
+
 			if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'This idea, and the memories of your previous exhibitionist acts manifest themselves in a small fantasy: You imagine what it would be like if the bar wasn''t empty but bustling with people, what it might be like to fuck the bartender right here in the center, with all of their eyes on you...' & pcs_horny += 10
 			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pc_desc[''pussy'']>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
 			'Martin, who has been relatively passive so far, leaving you in control, shakes you out of your reverie when his hands move to your hips. No doubt he intends to take a little more initiative.'
 			*nl
-			$orgasm_txt = 'Your sense of ' + iif(dominance > 20,'control over','submission to') + ' Martin and the intense feeling of him moving inside your ' + iif(pirsG>0,'pierced ','') + 'pussy drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over, your pussy massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him. The orgasm lasts for what feels like an eternity, but when it has passed' + iif($martinpos='rev_cowgirl',' and you look back at him','') + ', Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
-			
+			$orgasm_txt = 'Your sense of ' + iif(dominance > 20,'control over','submission to') + ' Martin and the intense feeling of him moving inside your <<$pc_desc[''pussy'']>> pussy drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over, your pussy massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him. The orgasm lasts for what feels like an eternity, but when it has passed' + iif($martinpos='rev_cowgirl',' and you look back at him','') + ', Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
+
 			!!if pcs_dom > 20:
-				!!'But you are having none of it: You lay your own hands on Martin''s and pull them away again, giving Martin a coquette smile' + iif($martinpos='rev_cowgirl',' over your shoulder','') + ' as you do. You demonstratively lift yourself up, up, until only the tip of his <<$dick_girth>> penis is still inside your <<$pcdesc_genitals>>, and hold it there. The message is all too clear: You are in charge right now and you intend to keep it that way.'
+				!!'But you are having none of it: You lay your own hands on Martin''s and pull them away again, giving Martin a coquette smile' + iif($martinpos='rev_cowgirl',' over your shoulder','') + ' as you do. You demonstratively lift yourself up, up, until only the tip of his <<$dick_girth>> penis is still inside your '+$pc_desc['pubes']+' pussy, and hold it there. The message is all too clear: You are in charge right now and you intend to keep it that way.'
 				!!*nl
 				!!'Martin, understanding completely, chuckles and lays back. "This is how you wanna play it, huh? Show me what you''ve got, then."'
 				!!'You comply, slamming down on him, taking his entire length inside once more, evoking a soft groan from your lover. You lift yourself up and, again, slam down in one hard stroke that ' + iif($martinpos='rev_cowgirl','causes your ass to meet Martin''s crotch with an audible slap','bounces your <<$pc_desc[''breast'']>> breasts up and down as well') + '. Again and again, you penetrate yourself on his <<dick>>cm dick like this, speeding up as you go, filling the empty bar with the sounds of a hard fuck, as well as your and Martin''s moans of pleasure.'
 				!!gs 'arousal', 'vaginal', 8, 'dom'
 				!!gs 'stat'
-			
+
 			!!else
 				'And you could have resisted him; surely you could have stayed in control. But the simple fact of the matter was that you didn''t want to. You were on top of him, you had proven to yourself and to him that you could make him do what you want. And now, you <b>want</b> him to take charge of you again.'
 				*nl
-				'With no resistance from you, Martin grabs onto your hips and stops your movement, only the tip of his <<$dick_girth>> penis still inside your <<$pcdesc_genitals>>. You want him inside you again, but he doesn''t let you move, forcing you to look' + iif($martinpos='rev_cowgirl',' over your shoulder','') + ' at your lover, feeling both aroused and vulnerable.'
+				'With no resistance from you, Martin grabs onto your hips and stops your movement, only the tip of his <<$dick_girth>> penis still inside your pussy. You want him inside you again, but he doesn''t let you move, forcing you to look' + iif($martinpos='rev_cowgirl',' over your shoulder','') + ' at your lover, feeling both aroused and vulnerable.'
 				'"Do you want it?" He asks imperiously.'
 				'"Yes, please," you pant.'
 				'"Please what?"'
 				'"Please fuck me with your hard cock again. I need it!"'
 				*nl
-				'That was all he wanted to hear. In the blink of an eye, Martin is balls-deep inside you again, his pelvis slamming into your <<$pc_desc[''pussy'']>> hole from below. You cannot move, his strong arms firmly holding you in place, and are helpless to let him fuck you from below.' 
+				'That was all he wanted to hear. In the blink of an eye, Martin is balls-deep inside you again, his pelvis slamming into your <<$pc_desc[''pussy'']>> hole from below. You cannot move, his strong arms firmly holding you in place, and are helpless to let him fuck you from below.'
 				'And you are loving every second of it.'
 				gs 'arousal', 'vaginal', 8, 'sub'
 				gs 'stat'
 			!!end
-		
+
 		elseif $martinpos = 'doggystyle':
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/doggystyle/doggy<<pic_rand2>>.jpg"></center>'
 			'Martin is pounding you from behind like he''s possessed. He may have started off gently but there''s no gentleness left in him: Your lover is fucking you like a whore, right in the middle of his own establishment where only a few hours ago people were talking about their shitty jobs and martial problems.'
 			*nl
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody''s here now.'
-			
+
 			if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'This idea, and the memories of your previous exhibitionist acts manifest themselves in a small fantasy: You imagine what it would be like if the bar wasn''t empty but bustling with people, what it might be like to be fuck by the bartender right here in the center, with all of their eyes on you...' & pcs_horny += 10
 			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pc_desc[''pussy'']>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
 			'Martin was firmly in control so far, but it seems like it''s not enough for him: All of a sudden, you can feel his hand at your neck, grabbing you, forcing you to look at him and increasing both his leverage and sense of power over you.'
 			*nl
-			$orgasm_txt = iif(dominance > 20,'Wresting control from','Submitting to') + ' Martin and the intense feeling of him moving inside your ' + iif(pirsG>0,'pierced ','') + 'pussy drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over, your pussy massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him as he fucks you. The orgasm lasts for what feels like an eternity and makes your legs feel like jelly, but when it has passed and you look back at him, Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
-			
+			$orgasm_txt = iif(dominance > 20,'Wresting control from','Submitting to') + ' Martin and the intense feeling of him moving inside your <<$pc_desc[''pussy'']>> pussy drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over, your pussy massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him as he fucks you. The orgasm lasts for what feels like an eternity and makes your legs feel like jelly, but when it has passed and you look back at him, Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
+
 			!!if pcs_dom > 20:
 				!!'But despite how much you''ve enjoyed what he has been doing to you so far, you are still longing for a bit of control yourself. You aren''t the kind of girl who will just roll over and let anybody fuck her however they want - you <b>like</b> being in charge and you want to have a say in how this fuck is going to continue.'
 				!!*nl
@@ -332,22 +331,22 @@ if $ARGS[0] = 'MartinSexDyn':
 				gs 'arousal', 'vaginal', 8, 'sub'
 				gs 'stat'
 			!!end
-		
+
 		elseif $martinpos = 'missionary':
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/missionary/missionary<<pic_rand2>>.jpg"></center>'
 			'Martin is giving your <<$pc_desc[''pubes'']>> pussy a good pounding and what few kisses he gives you are rough and demanding. He may have started off gently but there''s no gentleness left in him: Your lover is fucking you possessively, right in the middle of his establishment where only a few hours ago people were talking about their shitty jobs and martial problems.'
 			*nl
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody''s here now.'
-			
+
 			if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'This idea, and the memories of your previous exhibitionist acts manifest themselves in a small fantasy: You imagine what it would be like if the bar wasn''t empty but bustling with people, what it might be like to be fuck by the bartender right here in the center, with all of their eyes on you...' & pcs_horny += 10
 			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pc_desc[''pussy'']>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
 			'Martin was firmly in control so far, but it seems like it''s not enough to him: All of a sudden, you can feel his hand at your neck, grabbing you, forcing you to look at him and increasing both his leverage and sense of power over you.'
 			*nl
-			$orgasm_txt = iif(dominance > 20,'Wresting control from','Submitting to') + ' Martin and the intense feeling of him moving inside your ' + iif(pirsG>0,'pierced ','') + 'pussy drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over, your pussy massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him as he fucks you. The orgasm lasts for what feels like an eternity, but when it has passed and you look up at him, Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
-			
-		
+			$orgasm_txt = iif(dominance > 20,'Wresting control from','Submitting to') + ' Martin and the intense feeling of him moving inside your <<$pc_desc[''pussy'']>> pussy drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over, your pussy massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him as he fucks you. The orgasm lasts for what feels like an eternity, but when it has passed and you look up at him, Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
+
+
 			!!if pcs_dom > 20:
 				!!'But despite how much you''ve enjoyed what he has been doing to you so far, you are still longing for a bit of control yourself. You aren''t the kind of girl who will just roll over and let anybody fuck her however they want - you <b>like</b> being in charge and you want to have a say in how this fuck is going to continue.'
 				!!*nl
@@ -357,7 +356,7 @@ if $ARGS[0] = 'MartinSexDyn':
 				!!'The only difference is that you aren''t just lying down and taking it - you are matching Martin thrust for thrust and giving as hard as you''re getting... not that either of you is complaining.'
 				!!gs 'arousal', 'vaginal', 8, 'dom'
 				!!gs 'stat'
-			
+
 			!!else
 				'Sure, you could have resisted him, but... you choosing this position had already been a submission in and of itself. You <b>wanted</b> him to take charge of you, to fuck you any way he wanted, treat you as he pleased. And the kinky side of you was curious about where he was going with this.'
 				*nl
@@ -375,21 +374,21 @@ if $ARGS[0] = 'MartinSexDyn':
 				gs 'arousal', 'vaginal', 8, 'sub'
 				gs 'stat'
 			!end
-			
+
 		elseif $martinpos = 'sideways':
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/sideways/sideways<<pic_rand2>>.jpg"></center>'
-			'Martin has been slowly picking up the pace but he is clearly getting frustrated. You don''t know if it''s the position, personal preference or something else entirely, but when he pulls you to your feet, these questions are quickly swept aside:' 
+			'Martin has been slowly picking up the pace but he is clearly getting frustrated. You don''t know if it''s the position, personal preference or something else entirely, but when he pulls you to your feet, these questions are quickly swept aside:'
 			'In a few swift motions, he has lifted your <<$pc_desc[''legs'']>> leg and entered you again from behind, fucking you sideways... only standing up. All this may have started off gently but there''s no gentleness left in him: Martin is fucking you possessively, right in the middle of his establishment where only a few hours ago, people were talking about their shitty jobs and martial problems.'
 			*nl
 			'It only adds to the excitement of it all to know that this is a public place, even if nobody''s here now.'
-			
+
 			if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'This idea, and the memories of your previous exhibitionist acts manifest themselves in a small fantasy: You imagine what it would be like if the bar wasn''t empty but bustling with people, what it might be like to be fuck by the bartender right here in the center, with all of their eyes on you...' & pcs_horny += 10
 			$orgasm_txt = 'And it''s this fantasy that sets you off, causing you to cry out in heat and your <<$pc_desc[''pussy'']>> pussy to quiver around Martin''s cock as you imagine how strangers jerk off to your fucking. As you come down from your high, you feel like a pervert... but that''s not a bad thing, right?'
 			gs 'arousal', 'vaginal', 3, 'exhibitionism'
 			*nl
 			'Martin was firmly in control so far, and his switch of position only served to emphasize that, but it seems like it''s not enough to him: All of a sudden, you can feel one of his hands leave your hips and grab your neck, forcing you to look back at him and increasing both his leverage and sense of power over you.'
-			$orgasm_txt = iif(dominance > 20,'Wresting control from','Submitting to') + ' Martin and the intense feeling of him moving inside your ' + iif(pirsG>0,'pierced ','') + 'pussy drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over, your pussy massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him as he fucks you. The orgasm lasts for what feels like an eternity and your legs feel so weak that Martin has to support you, but when it has passed and you look back at him, Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
-			
+			$orgasm_txt = iif(dominance > 20,'Wresting control from','Submitting to') + ' Martin and the intense feeling of him moving inside your <<$pc_desc[''pussy'']>> pussy drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over, your pussy massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him as he fucks you. The orgasm lasts for what feels like an eternity and your legs feel so weak that Martin has to support you, but when it has passed and you look back at him, Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
+
 			!!if pcs_dom > 20:
 				!!'But despite how much you''ve enjoyed what he has been doing to you so far, you are still longing for a bit of control yourself. You''ve given him free reign over you so far, but you don''t want to anymore - it''s time to take back the initiative.'
 				!!*nl
@@ -415,14 +414,13 @@ if $ARGS[0] = 'MartinSexDyn':
 				gs 'stat'
 			!end
 		end
-		
+
 		*nl
 		'Unsurprisingly, Martin cannot withstand this kind of pleasure for too long: After a few minutes of this, he groans your name and you know that he is about to cum.'
 		gs 'stat'
 		$orgasm_txt = ''
 		killvar 'pic_rand2'
-		killvar 'MartinPrezik'
-	
+
 		act 'Let him cum in your mouth':gt 'MartinSex2', 'MartinCumshot_Mouth'
 		act 'Let him cum on your face':gt 'MartinSex2', 'MartinCumshot_Face'
 		act 'Let him cum on your tits':gt 'MartinSex2', 'MartinCumshot_Tits'
@@ -436,7 +434,7 @@ if $ARGS[0] = 'MartinSexDyn':
 				else
 					gs 'cum_call', '', $boy, 1, 3
 				end
-			
+
 			else
 				if $martinpos = 'cowgirl':
 					'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_cowgirl.mp4"></center>'
@@ -450,41 +448,41 @@ if $ARGS[0] = 'MartinSexDyn':
 					'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_sideways.mp4"></center>'
 				end
 				'But you make no attempts to pull him out of you and after a few more moments, you feel Martin tense and his penis grow inside you even more; two or three seconds later, he groans and cums, filling your pussy with hot sperm.'
-				gs 'cum_call', '', $boy, 1	
+				gs 'cum_call', '', $boy, 1
 			end
 			*nl
 			gs 'stat'
-			
+
 			if $martinpos = 'cowgirl':
 				'"Did you enjoy yourself?" You ask coquettishly, leaning forward onto his chest.'
 				'Martin smiles up at you, and pulls you down to give you a kiss. "I think you know the answer."'
-				'"Perhaps..." You grin and lift yourself off, feeling his softening <<dick>>cm <<$dick_girth>> cock slide out of your <<$pc_desc[''pussy'']>> pussy.' 
-			
+				'"Perhaps..." You grin and lift yourself off, feeling his softening <<dick>>cm <<$dick_girth>> cock slide out of your <<$pc_desc[''pussy'']>> pussy.'
+
 			elseif $martinpos = 'rev_cowgil':
 				'"Did you enjoy yourself?" You ask coquettishly, wiggling your butt as you look back over your shoulder.'
 				'Martin smiles up at you, and gives your ass a resounding smack. "I think you know the answer."'
 				'"Perhaps..." You grin and lift yourself off, feeling his softening <<dick>>cm <<$dick_girth>> cock slide out of your <<$pc_desc[''pussy'']>> pussy.'
-			
+
 			else
 				if $martinpos = 'doggystyle':
 					'Martin is still catching his breath when you look at him over your shoulder and grin when you see the expression of bliss on his face.'
 					*nl
 					'"<<$pcs_firstname>>, you are something else." Martin chuckles and pats your ass.'
 					'"So, I guess it was good for you."'
-				
+
 				elseif $martinpos = 'missionary':
 					'You pull Martin in for a tender kiss, enjoying the afterglow of all the sex and orgasming.'
 					*nl
 					'"<<$pcs_firstname>>, you are something else." Martin chuckles and gives you another kiss.'
 					'"So, I guess it was good for you."'
-				
+
 				elseif $martinpos = 'sideways':
 					'Martin lets go of your leg and both your feet stand firmly on the ground again. You feel sore, but if every workout was like this, you wouldn''t mind feeling sore every night.'
 					*nl
 					'"<<$pcs_firstname>>, you are something else." Martin chuckles and pats your ass.'
 					'"So, I guess it was good for you."'
 				end
-				
+
 				!!if pcs_dom > 20:
 					!!'"Yes, I''ll admit... you knew what you were doing."'
 					!!'"You''re welcome," you tease.'
@@ -494,27 +492,27 @@ if $ARGS[0] = 'MartinSexDyn':
 				!!end
 			end
 			*nl
-			
+
 			if MartinPrezik = 1:
 				if sexcontra = 3:
 					'Martin pulls the condom off and ties it together at the end. It seems to have done its job admirably.'
-				elseif sexcontra = 4 and preziktype = 0 and tabletkishot < 1 and pillcon2 < 30000: 
+				elseif sexcontra = 4 and preziktype = 0 and tabletkishot < 1 and pillcon2 < 30000:
 					'"Shit, I think the condom broke," Martin curses under his breath. A shiver runs through you as you realize that, despite your precautions, you could just have been impregnated after all.'
-				elseif sexcontra = 4 and preziktype = 0: 
-					'"Shit, I think the condom broke," Martin curses under his breath.' 
+				elseif sexcontra = 4 and preziktype = 0:
+					'"Shit, I think the condom broke," Martin curses under his breath.'
 					'"Don''t worry," you say with a comforting smile, "I''m on the pill."'
-				elseif sexcontra = 5 and preziktype = 0 and tabletkishot < 1 and pillcon2 < 30000: 
+				elseif sexcontra = 5 and preziktype = 0 and tabletkishot < 1 and pillcon2 < 30000:
 					'"Shit, I think the condom slipped off," Martin curses under his breath. A shiver runs through you as you realize that you have an used condom stuck inside you and could just have been impregnated after all.'
-				elseif sexcontra = 5 and preziktype = 0: 
-					'"Shit, I think the condom slipped off," Martin curses under his breath.' 
+				elseif sexcontra = 5 and preziktype = 0:
+					'"Shit, I think the condom slipped off," Martin curses under his breath.'
 					'"Don''t worry," you say with a comforting smile, "I''m on the pill." <<$OpenInnerThought>>Still need to get that condom out of my vagina though,<<$CloseInnerThought>> you think to yourself.'
 				elseif sexcontra = 7:
-					'"Shit, I think the condom broke," Martin curses under his breath.' 
+					'"Shit, I think the condom broke," Martin curses under his breath.'
 					'"Don''t worry," you say with a comforting smile, "I''m on the pill." It was a blatant lie, of course - you poked those holes into the condom and no hormone would get in the way of that sperm.'
 					*nl
 					'Whether you''d actually get pregnant, though, was a different question entirely.'
 				end
-			
+
 			else
 				if $martinpos = 'cowgirl' or $martinpos = 'rev_cowgirl':
 					'You shiver when you feel the trickle of sperm dripping down on Martin and running down your thigh. He really filled you up good.'
@@ -524,13 +522,13 @@ if $ARGS[0] = 'MartinSexDyn':
 					'You look ' + iif($martinpos='missionary','up at him','back at him') + ' and roll your eyes in mock-exasperation. "What is it with men and your fascination with your own sperm?"'
 					'"Just admiring my work, corazón, that''s all," Martin replies and ' + iif($martinpos='missionary','gives you a kiss that silences any further response.','gives your butt a resounding slap.')
 				end
-				
-				if tabletkishot < 1 and pillcon2 < 30000: 
+
+				if tabletkishot < 1 and pillcon2 < 30000:
 					*nl
 					'Odds are that you just got yourself pregnant, but your brain is still too preoccupied with the ebbing ripples of the pleasure that you experienced until a few short moments ago to really register what consequences this could have.'
 				end
 			end
-			
+
 			act 'Get cleaned up':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/city/industrial/bar/gettingdressed.mp4"></center>'
@@ -546,7 +544,7 @@ if $ARGS[0] = 'MartinSexDyn':
 				gs 'arousal', 'end'
 				killvar 'MartinPrezik'
 				gs 'stat'
-				
+
 				act 'Leave the bar':gt 'city_industrial'
 			end
 		end
@@ -558,20 +556,20 @@ if $ARGS[0] = 'MartinAnalDyn':
 	gs 'boyStat', 'A216'
 	pic_rand = rand(1,3)
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/anal/anal_fore<<pic_rand>>.jpg"></center>'
-	
+
 	if cycle = 0 or MartinPussyLick = 1:
 		if cycle = 0:
-			'Since you are on your period, regular sex would be a pretty messy option, so you do what any good girl who''s not an anal virgin would for her lover:' 
+			'Since you are on your period, regular sex would be a pretty messy option, so you do what any good girl who''s not an anal virgin would for her lover:'
 			'You give Martin an innocent smile and say, "I''m on my period right now. Would you like to put your hard cock in my ass instead?"'
 		else
 			'Martin has taken such good care of your pussy that you feel like rewarding him... or are you really just rewarding yourself with different experience? No matter, what you tell Martin remains the same:'
 			'You give Martin an innocent smile and say, "I think you deserve a special treat tonight. Would you like to put your hard cock in my ass?"'
 		end
 		*nl
-		'"Yes, a thousand times yes," he replies, smiling.' 
+		'"Yes, a thousand times yes," he replies, smiling.'
 		'Any other day, you''d have him to work up to it, fuck your pussy first, let him ''earn'' anal, but you really want to feel him in your puckered hole right now.'
 		*nl
-		
+
 		if $clothingworntype ! 'nude':
 			'Giving Martin a saucy look, you quickly strip down, completely exposing yourself to the bartender. Now that you''re dressed for the occasion, nothing''s standing between you and a night to remember.'
 			gs 'clothing', 'strip_all'
@@ -579,46 +577,46 @@ if $ARGS[0] = 'MartinAnalDyn':
 			'And your little show earlier not only removed all possible obstacles but got you and your lover all hot and bothered.'
 		end
 		*nl
-		
+
 		if $martinpos = 'rev_cowgirl':
 			'You tell Martin to lay down and get on top of him, facing away from him, his dick tantalizingly close to your nether holes.'
 		else
 			'You bend over, wiggling your ass invitingly and spreading your cheeks a little to give Martin a good look at the <<$pcs_ass>> hole he is about to fill.'
 		end
-	
+
 	elseif MartinSurpAnal = 1:
 		'Your change of heart is a little sudden, no doubt, but when you tell Martin that you want him to fuck your ass instead, he doesn''t look unhappy about it. After all, what man would refuse an offer like that?'
 	else
 		'With your <<$pc_desc[''pussy'']>> pussy thoroughly plowed, you moan: "I want your hard cock in my ass right now!"'
 		'"You and me both, corazón," Martin murmurs as he pulls out.'
 	end
-	
+
 	if $martinpos = 'rev_cowgirl':
 		'You take Martin''s cock and gently slap it against your ass cheeks a couple of times, enjoying how hard Martin is at the prospect of penetrating your ass.'
 	else
 		'Martin rubs his cock against your ass, obviously liking what he sees. He gives your ass a soft smack, eliciting a surprised yelp from you.'
 	end
 	*nl
-	
+
 	if mc_inventory['lubricant'] > 0:
 		if $martinpos = 'rev_cowgirl':
-			'You grab the lube from your bag and put a generous amount on your puckered hole, Martin''s finger and your own hand. Your hand quickly finds Martin''s penis and you immediately start coating it in lubricant.' 
+			'You grab the lube from your bag and put a generous amount on your puckered hole, Martin''s finger and your own hand. Your hand quickly finds Martin''s penis and you immediately start coating it in lubricant.'
 			*nl
-			'Martin is more teasing, first rubbing against your asshole for a while before pushing inside. You don''t know if it''s his experience or the way his finger or, after a minute, finger<b>s</b> feel, but you find your free hand wandering down to your pussy and stroking it absentmindedly, enjoying the sensations from your ass.' 
+			'Martin is more teasing, first rubbing against your asshole for a while before pushing inside. You don''t know if it''s his experience or the way his finger or, after a minute, finger<b>s</b> feel, but you find your free hand wandering down to your pussy and stroking it absentmindedly, enjoying the sensations from your ass.'
 			'If you were wet before, you are sopping wet now, quivering with excitement and more than ready to take a dick up your ass, or so you hope.'
 			*nl
 			'It just so happens that the <<$dick_girth>> dick you''ve been stroking is ready for penetration.'
 		else
-			'You grab the lube from your bag and put a generous amount on your puckered hole, Martin''s finger and your own hand. Your hand quickly finds Martin''s penis and you immediately start coating it in lubricant. Martin is more teasing, first rubbing against your asshole for a while before pushing inside.' 
+			'You grab the lube from your bag and put a generous amount on your puckered hole, Martin''s finger and your own hand. Your hand quickly finds Martin''s penis and you immediately start coating it in lubricant. Martin is more teasing, first rubbing against your asshole for a while before pushing inside.'
 			*nl
 			'After two or three minutes, you are content with how slick Martin''s dick is, but he is still driving his finger, now joined by a second one, in and out of your anus, and you are enjoying the sensation. You don''t even notice how one of your hands wanders down between your legs and starts rubbing your clit. You can hear yourself moan, and you''re getting sopping wet...'
 			*nl
 			'Your mind is still trying to catch up with how a little lubrication turned into foreplay while Martin seems pleased with himself, though. "You like it when I play with your ass, huh?"'
 			'Suffice to say, your ass is ready for anything... or so you hope.'
 		end
-			
+
 	elseif pcs_ass >= dick:
-		'That''s when you realize that neither of you have any lube handy.' 
+		'That''s when you realize that neither of you have any lube handy.'
 		'But honestly, you''re not too worried. Your asshole has already seen a bit of dick (rubber or otherwise) and while Martin isn''t exactly small and might not fit perfectly, he is not going to break you by any <i>stretch</i> of imagination.'
 		*nl
 		'Feeling almost like a pornstar, you put a little spit on your fingers and rub it around your asshole and the tip of his dick.'
@@ -626,17 +624,17 @@ if $ARGS[0] = 'MartinAnalDyn':
 		'His free hand isn''t idle, though, reaching around to rub your tits and stroke your pussy as he prepares your asshole.'
 		*nl
 		'You are definitely ready for him now.'
-			
+
 	else
-		'That''s when you realize that neither of you have any lube handy.' 
+		'That''s when you realize that neither of you have any lube handy.'
 		'That alone might not have been a problem, but even through the rose-tinted glasses of horniness, you realize that his dick may well be too big for your poor butthole.'
 		*nl
-		'But you don''t let that frighten you and try to lubricate your ass and the tip of his <<$dick_girth>> cock with a little bit of spit.' 
+		'But you don''t let that frighten you and try to lubricate your ass and the tip of his <<$dick_girth>> cock with a little bit of spit.'
 		'Martin seems to notice that you''re a little worried because he not only does his spit-covered finger take your finger''s place at and, after a few minutes of careful prodding, inside your rear entrance, but he also reaches around you and strokes your pussy to help you relax.'
 		*nl
 		'You are enjoying what he''s doing so much that it takes a minute or so before you remember to stroke the dick in your hand, getting him nice and hard for what you are about to do.'
 	end
-		
+
 	*nl
 	$orgasm_txt = 'But that will have to wait another minute or two, because Martin''s fingers seem to know exactly which way they have to bend inside your ass, touching you in all the right places, and he''s not letting up. It certainly wasn''t your intention to cum during foreplay but your intentions mean very little now: Your anal orgasm hits like a truck and while it lasts, your ass clenches so hard around Martin''s fingers that you could swear you heard him sigh with relief when you finally release them.'
 	if mc_inventory['lubricant'] > 0:
@@ -653,7 +651,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 	end
 	gs 'stat'
 	$orgasm_txt = ''
-	
+
 	act 'Time for anal':
 		*clr & cla
 		killvar 'MartinPussyLick'
@@ -664,12 +662,12 @@ if $ARGS[0] = 'MartinAnalDyn':
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/anal/anal_doggy<<pic_rand>>.jpg"></center>'
 		end
-		
-		if $martinpos = 'rev_cowgirl':	
+
+		if $martinpos = 'rev_cowgirl':
 			if anal_slip > 0:
 				'With lubrication taken care off, you lower yourself onto Martin''s dick, teasingly rubbing and tapping its tip against your rosebud a few times before straightening your back and pushing down.'
 				*nl
-				
+
 				if pcs_ass < dick:
 					'It''s still a tight fit though, lubed up or not, so once the tip of his cock has made it past your sphincter, you move more sideways than up and down at first. Sure, you could have gone full pornstar and tried to take his dick inside your ass in one fell swoop, but odds are that would have hurt. A lot.'
 					*nl
@@ -685,14 +683,14 @@ if $ARGS[0] = 'MartinAnalDyn':
 					*nl
 					'<<$OpenInnerThought>>You ain''t seen nothing yet<<$CloseInnerThought>>, you think to yourself and lift yourself up. This time, however, you push down faster. Up again and, encouraged by the lack of pain the first time around, you slam your ass down, slapping against Martin''s hips as you take him balls-deep again.'
 				end
-		
-			elseif pcs_ass >= dick:	
+
+			elseif pcs_ass >= dick:
 				'With your ass as prepared as it''ll ever be tonight, you lower yourself onto his cock. You have to move carefully, given the lack of proper lubrication, but given your anal experience, his size really is a non-issue. All it takes is a little bit of time and moaning until his cock is completely inside your ass, your cheeks resting against Martin''s pelvis.'
-				*nl			
+				*nl
 				'You feel incredibly full, and a single look over the shoulder confirms that Martin is no less pleased: He is looking at where you are connected, spell-bound by the sight of his cock hilted in your ass.'
 				*nl
 				'<<$OpenInnerThought>>You ain''t seen nothing yet<<$CloseInnerThought>>, you think to yourself and lift yourself up. This time, however, you push down faster. Up again and, encouraged by the lack of pain the first time around, you slam your ass down, slapping against Martin''s hips as you take him balls-deep again.'
-		
+
 			else
 				gt 'MartinSex2', 'PainalDyn'
 			end
@@ -703,14 +701,14 @@ if $ARGS[0] = 'MartinAnalDyn':
 			gs 'arousal', 'anal', 5, 'dom'
 			gs 'stat'
 			$orgasm_txt = ''
-		
+
 		else
 			if anal_slip > 0:
 				'You are definitely done with foreplay and wiggle your ass invitingly as you look back at your lover. Martin looks like he wants to make a remark about your impatience, but you are having none of it.'
 				'"Shut up and fuck my ass already," you say, huskily, and spread your ass cheeks for him.'
 				*nl
 				'He knows better than to leave a lady waiting. Martin pulls his fingers out and, with lubrication taken care off, rubs his cock up and down your slit and asshole a few times, a final tease to emphasize his position behind and over you, before he starts pushing forward.'
-				
+
 				if pcs_ass < dick:
 					'It''s a tight fit though, lubed up or not, and Martin seems very concerned with not hurting you, so once the tip of his cock has made it past your sphincter, his movements slow down to a crawl, giving you time to adjust to the foreign object in your ass.'
 					'Grateful but also a little impatient as you are, you ignore the pain of being stretched out like that as best you can and ever so gently push back against Martin, meeting his tentative thrusts, inching along his cock with your ass a little farther each time. The sensation of him sliding in and out more than makes up for the pain, and knowing that he can do what he wants with you, that he could stop being gentle and start punishing your ass at a moment''s notice to pleasure himself with your ass, really turns you on and causes you to coo softly as you go.'
@@ -723,7 +721,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 					*nl
 					'After a start like that, you know that the time for gentleness has passed. Indeed, Martin pulls back, but this time, he meets your ass with a resounding smack and a soft moan escapes you. Encouraged by these sounds, Martin withdraws again and hilts himself into your ass again, his balls smacking against your pussy as you meet him halfway.'
 				end
-			
+
 			elseif pcs_ass >= dick:
 				'As much as you enjoyed the foreplay, you are about ready to move on to the main course. With your ass as ready as it''ll ever be tonight, you tell Martin to stop teasing you and fill your hole.'
 				'Who is he to deny a lady''s request?'
@@ -732,7 +730,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 				'Your ass feels incredibly full, and a single look over the shoulder confirms that Martin is no less pleased: He is looking at where you are connected, spell-bound by the sight of his cock deep inside your ass and probably no less amazed that you took him inside in a single, slow thrust.'
 				*nl
 				'After a start like that, you know that the time for gentleness has passed. Indeed, Martin pulls back, but this time, he meets your ass with a resounding smack and a soft moan escapes you. Encouraged by these sounds, Martin withdraws again and hilts himself into your ass again, his balls smacking against your pussy as you meet him halfway.'
-			
+
 			else
 				gt 'MartinSex2', 'PainalDyn'
 			end
@@ -744,11 +742,11 @@ if $ARGS[0] = 'MartinAnalDyn':
 			gs 'stat'
 			$orgasm_txt = ''
 		end
-		
+
 		act 'Continue':
 			*clr & cla
 			$orgasm_txt = iif(dominance > 20,'Wresting control from','Submitting to') + ' Martin and the intense feeling of him filling your ass drive you ever closer to the edge until you can no longer take it. You cum loudly, shivering all over' + iif(exhibitionist_lvl > 1 or exhibitionism['pref']>50,' as your mind basks in your exhibitionist fantasy','') + ', your ass clenching around and massaging Martin''s cock with its contractions as if it wanted to squeeze the cum out of him as' + iif($martinpos='doggystyle',' he fucks you',' you fuck him') + '. Your anal orgasm lasts for what feels like an eternity, but when it has passed and you look back at him, Martin gives you a smug, self-satisfied look that makes you chuckle. You''re not done with each other yet, though, and before long, you''ve resumed your fast, hard rhythm.'
-			
+
 			if $martinpos = 'rev_cowgirl':
 				'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/anal/anal_rev.mp4"></center>'
 				*nl
@@ -761,7 +759,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 					!!'You are having none of it, though: <i>You</i> decided that you wanted him in your ass. <i>You</i> decided that you were going to fuck him, not the other way around. Here, today, you have no intention of letting him take control.'
 					!!'Gently, yet resolutely, you remove his hands from your sides and move them up to your breasts so he can play with your tits - a consolation price, but certainly not one he can complain about. You are going to give Martin the fuck of a lifetime and show him what a woman can do with her ass.'
 					!!*nl
-					!!'With your roles reestablished, you change your angle slightly for more leverage and increase your pace, really slamming down now, almost drowning the sound of your own moaning as you go - you love this: Love this position, the sense of power, the hard dick in your <<$pc_desc['anus']>> ass, his fingers brushing against your ' + iif(pirsF>0,'pierced ','') + 'nipples, and doing all that right here in the middle of an empty bar...' 
+					!!'With your roles reestablished, you change your angle slightly for more leverage and increase your pace, really slamming down now, almost drowning the sound of your own moaning as you go - you love this: Love this position, the sense of power, the hard dick in your <<$pc_desc['anus']>> ass, his fingers brushing against your <<$pc_desc[''nipples'']>> nipples, and doing all that right here in the middle of an empty bar...'
 !!else
 					'You originally decided on this position because you wanted to be in control, wanted to be on top... but you cannot say that you really mind him taking a more active role in this.'
 					'Sensing no resistance, Martin tightens his grip and starts moving, pounding up into your <<$pc_desc[''anus'']>> ass, his balls slapping against your pussy lips every time. You can do little more than hold on for dear life, moving to meet him a little bit and moaning like a slut.'
@@ -772,7 +770,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 				if exhibitionist_lvl > 1 or exhibitionism['pref'] > 50: 'This final thought, and the memories of your previous exhibitionist acts manifest themselves in a small fantasy: You imagine what it would be like if the bar wasn''t empty but bustling with people, what it might be like to take the bartender''s cock up your ass right here in the center, with all of their eyes on you...' & pcs_horny += 10
 				*nl
 				gs 'arousal', 'anal', 10
-			
+
 			else
 				'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/anal/anal_doggy.mp4"></center>'
 				*nl
@@ -802,7 +800,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 			'But nobody, not even your Latin lover, can resist the tightness of your ass forever, especially not when you two are fucking like rabbits, and when you sense a change in his movements, you know that he''s very close to coming.'
 			gs 'stat'
 			$orgasm_txt = ''
-		
+
 			act 'Let him cum in your mouth':gt 'MartinSex2', 'MartinCumshot_Mouth'
 			act 'Let him cum on your face':gt 'MartinSex2', 'MartinCumshot_Face'
 			act 'Let him cum on your tits':gt 'MartinSex2', 'MartinCumshot_Tits'
@@ -817,7 +815,7 @@ if $ARGS[0] = 'MartinAnalDyn':
 				gs 'arousal', 'anal', 1
 				$orgasm_txt = ''
 				gs 'stat'
-				
+
 				act 'Get cleaned up':gt 'MartinSex2', 'MartinCleanup'
 			end
 		end
@@ -834,7 +832,7 @@ if $ARGS[0] = 'PainalDyn':
 	'You could probably force it inside, but without lube, that''s bound to be painful...'
 	'Maybe you could finish Martin off with your mouth instead, if you''re not feeling too horny or adventurous anymore tonight.'
 	'Or... well, maybe you don''t want to continue at all?'
-			
+
 	act 'Force his dick inside your ass':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/anal/painal2.mp4"></center>'
@@ -842,11 +840,11 @@ if $ARGS[0] = 'PainalDyn':
 			'No, you don''t want to quit, not now. Maybe it''s because of the position you''re in, just a bad angle for penetration, right? You climb off Martin and bend over in front of him. When you look back at him to give him an inviting look, you do feel a little intimidated by his size, though...'
 			'Maybe this wasn''t such a good idea after all?'
 			*nl
-		end		
+		end
 		iif($martinpos='rev_cowgirl','But f','F') + 'eeling both stubborn and horny, you think <<$OpenInnerThought>>fuck it, I can do this<<$CloseInnerThought>>, literally, anally.'
 		'Trying to help move things along with a little more spit, you push against Martin''s cock once more, ignoring the unpleasant sensations that go with it. You succeed, too: His cock slips inside your asshole.'
 		*nl
-		
+
 		if maso['pref'] >= 60:
 			'The only problem is that your butthole feels like somebody has given it the sandpaper treatment. It genuinely hurts and itches, but it''s the pain, of all things, that makes you want to continue.'
 			*nl
@@ -861,7 +859,7 @@ if $ARGS[0] = 'PainalDyn':
 			$orgasm_txt = 'no'
 			gs 'arousal', 'anal', 3, 'maso'
 			gs 'stat'
-			
+
 			act 'Continue':
 				*clr & cla
 				'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/anal/painal3.mp4"></center>'
@@ -870,7 +868,7 @@ if $ARGS[0] = 'PainalDyn':
 				'Your lover starts moving on his own. At first, he is gentle, careful, only adding a tiny bit of extra sensation to your mutual experience, but with ever stroke, he loses his inhibitions and turns more and more into an animal, possessed by the need to destroy your ass and fill it with cum.'
 				'But he''s not being inconsiderate: As soon as his pace quickens, he reaches around to your pussy, rubbing your clit as he drills your <<$pc_desc[''anus'']>> asshole, adding a more familiar note of lust to the sharp pain from your butt.'
 				*nl
-				'The conflicting sensations rack you, hurting and arousing and bewildering all at once.' 
+				'The conflicting sensations rack you, hurting and arousing and bewildering all at once.'
 				'You cannot tell how long this maelstrom tosses to and fro, the pain getting stronger the longer you keep going. All you know is that, eventually, Martin hammers his cock into your ass with abandon and finally, loudly, fills your bowels with his sperm.'
 				*nl
 				$orgasm_txt = 'Even though you were enjoying the pain, you didn''t think you would actually orgasm. But the feeling of Martin''s hot cum in your ass seems to flip a switch inside you, setting all the nerves in your ass on edge and flooding your brain with pleasure. You cum, your yelps of pain mixing with moans of pleasure as your mind goes blank.'
@@ -880,7 +878,7 @@ if $ARGS[0] = 'PainalDyn':
 				$orgasm_txt = ''
 				minut -= 5
 				gs 'stat'
-				
+
 				act 'Get cleaned up':
 					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/industrial/bar/gettingdressed.mp4"></center>'
@@ -895,17 +893,17 @@ if $ARGS[0] = 'PainalDyn':
 					gs 'clothing', 'wear_last_worn'
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Leave the bar': gt 'city_industrial'
 				end
 			end
-			
+
 		else
 			'The only problem is that your butthole feels like somebody has given it the sandpaper treatment. It genuinely hurts and itches, and even though you really wanted to have anal sex with Martin a minute, you are not feeling in a super sexy mood anymore.'
 			*nl
 			'You are slightly startled when you feel Martin''s hand on your shoulder. You realize only now that you were muttering "Ow" under your breath over and over again.'
 			'You give your lover an awkward look, but he doesn''t say anything. He moves back slightly, withdrawing from your ass, and hugs you.'
-			'His questions - "Do you need anything?", "Does it hurt much?" et cetera - only make you feel more awkward, but his genuine worry is endearing.' 
+			'His questions - "Do you need anything?", "Does it hurt much?" et cetera - only make you feel more awkward, but his genuine worry is endearing.'
 			*nl
 			'After a few minutes, you say: "I''m sorry I killed the mood. I could take care of you though."'
 			'But he just shakes his head. "Don''t worry about me, mi amor. I''m fine. Let''s get you cleaned, shall we?"'
@@ -914,13 +912,13 @@ if $ARGS[0] = 'PainalDyn':
 			minut += 4
 			gs 'pain', 2, 'asshole', 'tear'
 			pcs_horny -= 30
-					
+
 			act 'Get cleaned up':gt 'MartinSex2', 'MartinCleanup'
 		end
 	end
-	
+
 	act 'Get him off with your mouth':MartinSexStop = 1 & gt 'MartinSex3', 'MartinBlowjob'
-			
+
 	act 'Stop and get dressed':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/industrial/bar/gettingdressed.mp4"></center>'
@@ -939,9 +937,9 @@ if $ARGS[0] = 'PainalDyn':
 		gs 'clothing', 'wear_last_worn'
 		gs 'arousal', 'end'
 		gs 'stat'
-					
+
 		act 'Leave the bar': gt 'city_industrial'
-	end	
+	end
 end
 
 if $ARGS[0] = 'MartinCumshot_Mouth':
@@ -958,7 +956,7 @@ if $ARGS[0] = 'MartinCumshot_Mouth':
 	$orgasm_txt = ''
 	pcs_energy += 5
 	gs 'cum_call', 'mouth', $boy, 1
-	
+
 	act 'Get cleaned up':gt 'MartinSex2', 'MartinCleanup'
 end
 
@@ -966,16 +964,16 @@ if $ARGS[0] = 'MartinCumshot_Face':
 	*clr & cla
 	gs 'boyStat', 'A216'
 	'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/cumshot/cum_facial.mp4"></center>'
-	
+
 	!Variation for pic and text sticking out your tongue for the cumshot
 	if $martinpos ! 'MartinBlowjob_dressed' or $martinpos ! 'MartinBlowjob_undressed': 'You quickly move off Martin''s cock and get on your knees in front of him, taking his dick into your mouth and savoring the taste of yourself on your man as you help him finish.'
-	'He pulls out, about ready for the moneyshot.' 
+	'He pulls out, about ready for the moneyshot.'
 	*nl
 	'For a moment, you think about saying something dirty, like asking him to cum all over your face, but by the time this thought has manifested, Martin has already complied with it, shooting his hot sperm all over your cheek and forehead. You flinch a little, screwing your eyes shut as you feel his spurt hit you right at the corner of one of them, but you are acutely aware of how hot it feels, literally and figuratively, to have Martin''s sperm run down your face.'
 	*nl
 	'It takes a moment or three until Martin stops painting your face white, but when you tentatively open your eyes, you are met with a smile of self-satisfaction and adoration.'
 	gs 'cum_call', 'face', $boy, 1
-	
+
 	act 'Get cleaned up':gt 'MartinSex2', 'MartinCleanup'
 end
 
@@ -987,9 +985,9 @@ if $ARGS[0] = 'MartinCumshot_Tits':
 	'"Go ahead", you whisper in your sultriest voice, "Cum all over my tits, baby."'
 	'That''s all the invitation Martin needs: With a final moan, the first hot jet of cum hits your breasts, soon followed by another, and another. By the time his cock stops twitching, your breast and chin are covered in sperm. Cleaning up is gonna take a while, but with a single look at Martin and the satisfied boyish grin the sight of you puts on his face, you know that it''s worth it.'
 	gs 'cum_call', 'breasts', $boy, 1
-	
+
 	act 'Get cleaned up':gt 'MartinSex2', 'MartinCleanup'
-end	
+end
 
 if $ARGS[0] = 'MartinCleanup':
 	*clr & cla
@@ -1004,7 +1002,7 @@ if $ARGS[0] = 'MartinCleanup':
 	gs 'clothing', 'wear_last_worn'
 	gs 'arousal', 'end'
 	gs 'stat'
-			
+
 	act 'Leave the bar': gt 'city_industrial'
 end
 

+ 48 - 48
locations/MartinSex3.qsrc

@@ -7,7 +7,7 @@ menu_off = 1
 if $ARGS[0] = 'MartinBlowTease':
 	cls
 	gs 'boyStat', 'A216'
-!!{	
+!!{
 	if pcs_dom > 20:
 		if $clothingworntype = 'nude' and $pantyworntype = 'none':
 			$martinpos = 'MartinBlowjob_undressed'
@@ -30,14 +30,14 @@ if $ARGS[0] = 'MartinBlowTease':
 			'"Come on. Suck it like you mean it, <<$pcs_firstname>>," he growls instead.'
 			*nl
 			$orgasm_txt = 'The sense of complete control over Martin is fanning the flames your striptease has lighted and you are starting to lose yourself in them. The heat spreads inside your belly, building up like a wave and, finally, washing over you. You cum without ever laying a hand on yourself, your moans muffled by Martin''s cock in your mouth.'
-		
+
 		elseif MartinConvinceBJ = 1:
 			$martinpos = 'MartinBlowjob_dressed'
 			pic_rand = rand(1,2)
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/martinconvincebj<<pic_rand>>.jpg"></center>'
 			'Honestly, you are tired of talking, of subtle hints, of waiting for Martin to notice what you''re getting at. You want him, plain and simple, and you are confident and just slutty enough to chose the easy way to get him.'
 			*nl
-			'Without another, you take a step back and bare your <<$pc_desc[''breast'']>> breasts to the bartender. Ignoring the sounds he makes, you immediately take the next step and reveal your <<$pc_desc[''pubes'']>> pussy as well before you as much as take a glance at him.' 
+			'Without another, you take a step back and bare your <<$pc_desc[''breast'']>> breasts to the bartender. Ignoring the sounds he makes, you immediately take the next step and reveal your <<$pc_desc[''pubes'']>> pussy as well before you as much as take a glance at him.'
 			'The look of utter amazement he gives you is priceless, but you are not done yet, not in the slightest.'
 			*nl
 			if pic_rand = 1:
@@ -47,12 +47,12 @@ if $ARGS[0] = 'MartinBlowTease':
 				'Before he can recover from that first blow, you have already pushed him back to sit on a stool as you bend over his zipper.'
 				'"<<$pcs_firstname>>," Martin begins, but as you release his hardening <<dick>>cm <<$dick_girth>> cock from its prison, you doubt that he''s actually going to resist you when he''s only an inch away from your mouth.'
 			end
-			'He says your name again, more urgent, but whatever he intended to say next turns into a groan as the tip of your ' + iif(pirsA>0,'pierced ','') + 'tongue meets the tip of his dick for the first time and enthusiastically explores it.'
+			'He says your name again, more urgent, but whatever he intended to say next turns into a groan as the tip of your <<$pc_desc[''tongue'']>> tongue meets the tip of his dick for the first time and enthusiastically explores it.'
 			*nl
 			'Whatever thoughts or doubts he might have had didn''t survive that first contact, that much is clear. The longer you play with his dick, the more he relaxes his body and hardens between your lips. He''s given himself up to your licks and kisses, to your perfect little torture, and you doubt he''ll be able to go back to keeping his distance after you are done with him...'
 			*nl
 			$orgasm_txt = 'Maybe it''s the sense of control you have right now, maybe you were just really horny to begin with; whatever the reason, you find that familiar heat in your lower abdomen rising and spilling over, causing you to cum without ever laying a hand on yourself, your moans muffled by his cock in your mouth.'
-			
+
 		else
 			$martinpos = 'MartinBlowjob_dressed'
 			'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/dressdom_bjtease.mp4"></center>'
@@ -61,7 +61,7 @@ if $ARGS[0] = 'MartinBlowTease':
 			'You give Martin a lingering kiss, wiping any conscious thought from his mind, then slowly get down on your knees. Every man knows what that means, no matter where they were born. You look up at Martin, smiling seductively as you''re opening his fly and freeing his <<dick>>cm <<$dick_girth>> dick from its textile prison.'
 			'Taking his cock into your hand, you can feel the heat emanating from it, can see it growing to its full size before your eyes. It''s a wondrous sight... but not so much so that it would make you forget what you intended to do.'
 			*nl
-			'The key is to tease before you please: You lick the tip, kiss it, take a little of it inside your mouth, then most of it... but you do so delicately and quickly, doing barely more than brushing against his cock with your lips and retreating immediately, only to start all over again.' 
+			'The key is to tease before you please: You lick the tip, kiss it, take a little of it inside your mouth, then most of it... but you do so delicately and quickly, doing barely more than brushing against his cock with your lips and retreating immediately, only to start all over again.'
 			*nl
 			'At the end of each ''cycle'', you look up at him, gauging his reaction. It''s a torture alright, but judging by his closed eyes and low groans, he would gladly submit himself to it any day.'
 			*nl
@@ -70,7 +70,7 @@ if $ARGS[0] = 'MartinBlowTease':
 		gs 'arousal', 'bj', 5, 'dom'
 		$orgasm_txt = ''
 		gs 'stat'
-	
+
 	else}
 		if $clothingworntype = 'nude' and $pantyworntype = 'none':
 			$martinpos = 'MartinBlowjob_undressed'
@@ -80,7 +80,7 @@ if $ARGS[0] = 'MartinBlowTease':
 			else
 				'Teasing Martin was fun, but rather than being a merciless cock tease, you''d like him to see you as a generous sex goddess, or at least a girl who isn''t afraid to put her mouth where the money shot comes from (or however that saying goes).'
 				*nl
-				'Feeling Martin''s eyes on your more or less naked body, you get up and move up to him, swaying your hips as you go. The strange thing is how the situation changes as you cross that short distance: Out of his reach, you were the undisputed queen of this bar and master of his destiny - but now, a few steps closer, you seem to have crossed a mystical barrier into his domain, and in it, you are subject to his will.' 
+				'Feeling Martin''s eyes on your more or less naked body, you get up and move up to him, swaying your hips as you go. The strange thing is how the situation changes as you cross that short distance: Out of his reach, you were the undisputed queen of this bar and master of his destiny - but now, a few steps closer, you seem to have crossed a mystical barrier into his domain, and in it, you are subject to his will.'
 			end
 			*nl
 			'The kiss you give him is demure, compared to your performance mere seconds ago - it is his passion that heats it up and cements his reign. Sex goddess or not, you are his to take now.'
@@ -89,13 +89,13 @@ if $ARGS[0] = 'MartinBlowTease':
 			'You undo his fly, liberating his <<dick>>cm <<$dick_girth>> cock, rock-hard from the show you put on for him. You feel drawn to it, mesmerized by his display of manliness, but strangely enough, the hand you feel at the back of your head seems to hold you back rather than push you down.'
 			'He wants you to take it slowly, tease him a little bit more... or has he sensed your impatience and is it really him that''s teasing <b>you</b>?'
 			*nl
-			'Whichever it is, you submit, grasping his cock at its base and sticking out your <<$pcdesc_tongue>>, licking around the head of his dick like pleasing Martin was your only concern in life.'
+			'Whichever it is, you submit, grasping his cock at its base and sticking out your <<$pc_desc[''tongue'']>> tongue, licking around the head of his dick like pleasing Martin was your only concern in life.'
 			'How long you lose yourself in this task, how long he withstands the temptation of fucking your mouth you don''t know. What you <b>do</b> know is that, suddenly, his grip on your <<$pc_desc[''hair length'']>> <<$pcs_haircol>> hair tightens.'
 			*nl
 			'"Go on. Suck it like you mean it, <<$pcs_firstname>>," he commands.'
 			*nl
 			$orgasm_txt = 'This sense of complete obedience fans the flames your striptease has lighted. The familiar heat of lust spreads inside your belly, building up like a wave and then washing over you. You cum without ever laying a hand on yourself, your moans muffled by Martin''s cock in your mouth.'
-		
+
 		else
 			$martinpos = 'MartinBlowjob_dressed'
 			'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/dresssub_bjtease.mp4"></center>'
@@ -106,7 +106,7 @@ if $ARGS[0] = 'MartinBlowTease':
 			'You look up at Martin, smiling devotedly as you''re opening his fly and freeing his <<dick>>cm <<$dick_girth>> dick from its textile prison. You could feel in charge if it wasn''t for his hand at the back of your head, it''s weight reassuring in a way but leaving no doubt as to who is giving the orders.'
 			'Taking his cock into your hand, you can feel the heat emanating from it, can see it growing to its full size before your eyes. It''s a wondrous sight... but not so much so that it would make you forget what Martin wants you to do.'
 			*nl
-			'Sensing no pressure from Martin, you conclude that he wants you to surprise and tease him, so rather than crudely plunging him into your <<$pc_desc[''throat'']>> throat, you take it slow, give his cock lingering strokes and tasting the underside of the tip, then teasingly moving the your tongue around the head.' 
+			'Sensing no pressure from Martin, you conclude that he wants you to surprise and tease him, so rather than crudely plunging him into your <<$pc_desc[''throat'']>> throat, you take it slow, give his cock lingering strokes and tasting the underside of the tip, then teasingly moving the your tongue around the head.'
 			*nl
 			'You look up at Martin and find him watching you intently, a shiver running through him when your eyes meet - it must be turning him on immensely to have a girl submissively look up at him while she''s licking his cock.'
 			*nl
@@ -118,9 +118,9 @@ if $ARGS[0] = 'MartinBlowTease':
 !!	end
 	killvar 'MartinPussyLick'
 	killvar 'MartinConvinceBJ'
-		
+
 	act 'No more teasing - Blow him':gt 'MartinSex3', 'MartinBlowjob'
-	
+
 	if cycle = 0 and anal > 0:
 		act 'Let Martin fuck your ass (From behind)':$martinpos='doggystyle' & gt 'MartinSex2','MartinAnalDyn'
 		act 'Ride Martin with your ass (<b>Reverse</b> Cowgirl)':$martinpos='rev_cowgirl' & gt 'MartinSex2','MartinAnalDyn'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'MartinBlowTease':
 		act 'Tell Martin you wanna ride him (<b>Reverse</b> Cowgirl)':$martinpos='rev_cowgirl' & gt 'MartinSex2','MartinSexPrep'
 	end
 end
-		
+
 if $ARGS[0] = 'MartinBlowjob':
 	cls
 	gs 'boyStat', 'A216'
@@ -140,51 +140,51 @@ if $ARGS[0] = 'MartinBlowjob':
 		! if $clothingworntype = 'nude' and $pantyworntype = 'none':
 			! $martinpos = 'MartinBlowjob_undressed'
 			! '<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/undressdom_bj.mp4"></center>'
-			
+
 			! if MartinSexStop = 1:
 				! 'Instead of plunging Martin''s dick inside you as you originally wanted (and as your wet pussy demands), you scramble to get on your knees. His confusion at this change of heart only lasts for about two seconds - coincidentally the time you needed to take his cock into your mouth.'
 				! 'You move your head up and down, swirling your tongue around his sizable cock and enjoying the tangy taste of your own juices and the hints of precum, telltale signs of your horniness and of him enjoying your impromptu blowjob.'
 				! *nl
-				! 'Between the sight of him, his musky smell, the sounds he makes, the dick in your mouth and your regret over not getting the fuck you had been waiting for, you find your <<$pcdesc_genitals>> desperately longing for attention.'
+				! 'Between the sight of him, his musky smell, the sounds he makes, the dick in your mouth and your regret over not getting the fuck you had been waiting for, you find your pussy desperately longing for attention.'
 				! 'Snaking a hand between your <<$pc_desc[''legs'']>> legs, you run your fingers along your wet slit, the sigh that would escape you drowned by the other noises in the room. But when your eyes lock with his, there''s not a doubt in your mind that he heard it, that he knows what your other hand is doing, and that he is breathing even harder because of it.'
 				! $orgasm_txt = 'Your own frustration over denying yourself the joy of proper sex is enough for your body to seek and find pleasure where it can, namely in the blowjob you give Martin and a little bit of masturbation. The heat spreads inside your belly, building up like a wave and then washing over you. You cum, your fingers busy on your clit, your moans muffled by Martin''s cock in your mouth and feeling at least a little compensated for what you missed out on.'
-			
+
 			! else
 				! 'You''re tempted to ask what he intends to do if you don''t, but he has suffered enough. You put an end to his agony, get a firm grip an his shaft, take the tip of his <<dick>>cm <<$dick_girth>> cock into your mouth once more and give him a proper blowjob.'
 				! 'His audible exhale speaks volumes of his anticipation, of the excitement you have stirred in him, and his groans grow in volume as you bob your head up and down his length again and again.'
 				! *nl
-				! 'Between the sight of him, his musky smell, the sounds he makes, the dick in your mouth and your little performance earlier, you find your <<$pcdesc_genitals>> desperately longing for attention.'
+				! 'Between the sight of him, his musky smell, the sounds he makes, the dick in your mouth and your little performance earlier, you find your pussy desperately longing for attention.'
 				! 'Snaking a hand between your <<$pc_desc[''legs'']>> legs, you run your fingers along your wet slit, the sigh that would escape you drowned by the other noises in the room. But when your eyes lock with his, there''s not a doubt in your mind that he heard it, that he knows what your other hand is doing, and that he is breathing even harder because of it.'
 				! $orgasm_txt = 'The sense of complete control over Martin is fanning the flames your striptease has lighted and you are starting to lose yourself in them. The heat spreads inside your belly, building up like a wave and, finally, washing over you. You cum, your fingers busy on your clit, your moans muffled by Martin''s cock in your mouth.'
 			! end
-		
+
 		! else
 			! $martinpos = 'MartinBlowjob_dressed'
 			! '<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/dressdom_bj.mp4"></center>'
 			! 'Content that you have tormented him enough, you put an end to his agony, take the tip of his <<dick>>cm <<$dick_girth>> cock into your mouth and suck. His audible exhale speaks volumes of how big his anticipation must have been and it turns into a groan when you pull back only to plunge more of his cock into your hot mouth.'
-			! 'You''re not letting him get used to this, though - not yet. You pull him out of your mouth once more, brushing your <<$pc_descWordy[''lips'']>> lips and <<$pcdesc_tongue>> along the length and underside of his cock. Your shoot a quick glance up to his face and find him staring at you in rapture.'
+			! 'You''re not letting him get used to this, though - not yet. You pull him out of your mouth once more, brushing your <<$pc_descWordy[''lips'']>> lips and <<$pc_desc[''tongue'']>> tongue along the length and underside of his cock. Your shoot a quick glance up to his face and find him staring at you in rapture.'
 			! *nl
 			! 'And you''re just getting started.'
 			! 'In an instant, your lips find the tip of his cock again. You move your head up and down, swirling your tongue around his sizable cock and enjoying the faint taste of his pre-cum. You cannot bring yourself to stop, either. You are enjoying this, and so is Martin.'
 			! 'Not that there was any doubt as to that: At this point, Martin is putty in your hands(/mouth) and moaning as you are closing your lips even tighter around his dick and sucking stronger than before, determined to get him off.'
-			
+
 			! $orgasm_txt = 'Maybe it''s the sense of control you have right now, maybe you were just really horny to begin with; whatever the reason, you find that familiar heat in your lower abdomen rising and spilling over, causing you to cum without ever laying a hand on yourself, your moans muffled by his cock in your mouth.'
 		! end
-		
+
 		! if deepthroat['pref'] > 50:
 			! *nl
 			! if $clothingworntype = 'nude' and $pantyworntype = 'none':
 				! '<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/undressdom_deep.mp4"></center>'
 			! else
 				! '<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/dressdom_deep.mp4"></center>'
-			! end	
-			! 'But that''s not enough for you. You like having a dick in your mouth, but you <b>love</b> having one in your throat. Martin seems a little too gentlemanly (or intimidated by your attitude) to take what he doubtlessly wants, so when you feel his cock approach that magic threshold in the depths of your mouth again, you force your head down further than before, plunging Martin''s hard <<dick>>cm <<$dick_girth>> cock down your <<$pc_desc[''throat'']>> throat until your ' + iif(pirsD>0,'pierced ','') + 'nose almost touches his belly.'
+			! end
+			! 'But that''s not enough for you. You like having a dick in your mouth, but you <b>love</b> having one in your throat. Martin seems a little too gentlemanly (or intimidated by your attitude) to take what he doubtlessly wants, so when you feel his cock approach that magic threshold in the depths of your mouth again, you force your head down further than before, plunging Martin''s hard <<dick>>cm <<$dick_girth>> cock down your <<$pc_desc[''throat'']>> throat until your <<$pc_desc[''nose'']>> nose almost touches his belly.'
 			! 'You hold it there for a moment, reveling in the feeling of self-inflicted abuse, before you pull back, only to go right back down again. You''re not holding back, and you''re making it all too clear to Martin that you don''t want him to hold back either as you''re taking him deep again and again, all the way to its base, proud and horny at your accomplishment.'
 			! gs 'arousal', 'bj', 2, 'deepthroat', 'dom'
 		! end
 		! *nl
 		! 'Your dedication pays off: Before long, his dick seems to swell and you can hear him say your name. Martin is about to cum.'
-		
+
 		! if $clothingworntype = 'nude' and $pantyworntype = 'none':
 			! gs 'arousal', 'clit_finger', 4, 'dom', 'masturbate'
 			! minut -= 4
@@ -192,12 +192,12 @@ if $ARGS[0] = 'MartinBlowjob':
 		! gs 'arousal', 'bj', 5, 'dom'
 		! $orgasm_txt = ''
 		! gs 'stat'
-		
+
 	! else
 		if $clothingworntype = 'nude' and $pantyworntype = 'none':
 			$martinpos = 'MartinBlowjob_undressed'
 			'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/undresssub_bj.mp4"></center>'
-			
+
 			if MartinSexStop = 1:
 				'Instead of plunging Martin''s dick inside you as you originally wanted (and as your wet pussy demands), you scramble to get on your knees. His confusion at this change of heart only lasts for about two seconds - coincidentally the time you needed to take his cock into your mouth.'
 				'You move your head up and down, swirling your tongue around his sizable cock and enjoying the tangy taste of your own juices and the hints of precum, telltale signs of your horniness and of him enjoying your impromptu blowjob.'
@@ -207,23 +207,23 @@ if $ARGS[0] = 'MartinBlowjob':
 				'There is little more you can do but try to keep your teeth away from him and hold on for dear life as he''s fucking your mouth and thoroughly enjoying himself.'
 				'Well... There is something.'
 				*nl
-				'One of your hands inadvertently makes its way down south, following the heat you feel in your groin, and finds your <<$pcdesc_genitals>> dripping wet. Being used by Martin, reduced to an object for him to satisfy himself with, is arousing in ways that even you yourself have trouble understanding.'
+				'One of your hands inadvertently makes its way down south, following the heat you feel in your groin, and finds your pussy dripping wet. Being used by Martin, reduced to an object for him to satisfy himself with, is arousing in ways that even you yourself have trouble understanding.'
 				'But you don''t have to understand. All you have to do is leave your fingers to themselves and reap the rewards, moaning softly as you let your lover fuck your mouth.'
 				$orgasm_txt = 'Your brain seems to have no issue channeling your own frustration and complete sense of surrender to Martin into unbridled lust, fanned by Martin''s facefuck and you playing with yourself. The familiar heat spreads inside your belly, building up like a wave and then washing over you. You cum, your fingers busy on your clit, your moans muffled by Martin''s cock in your mouth and feeling at least a little compensated for what you missed out on.'
-			
-			else			
-				'You take the tip of his <<$dick_girth>> cock into your mouth, pausing to savour its size and texture and exploring its details with your <<$pc_desc[''lip size'']>> lips and <<$pcdesc_tongue>>, intent on giving Martin a slow and sensual blowjob.'
+
+			else
+				'You take the tip of his <<$dick_girth>> cock into your mouth, pausing to savour its size and texture and exploring its details with your <<$pc_desc[''lip size'']>> lips and <<$pc_desc[''tongue'']>> tongue, intent on giving Martin a slow and sensual blowjob.'
 				*nl
 				'But you have all but forgotten about your earlier performance while Martin absolutely hasn''t. He is well past ''sensual'' as you quickly realize when a sizable portion of his <<dick>>cm cock fills your mouth. He pulls out, only to drive it right back in, again and again in rapid succession.'
 				*nl
 				'There is little more you can do but try to keep your teeth away from him and hold on for dear life as he''s fucking your mouth and thoroughly enjoying himself.'
 				'Well... There is something.'
 				*nl
-				'One of your hands inadvertently makes its way down south, following the heat you feel in your groin, and finds your <<$pcdesc_genitals>> dripping wet. Being used by Martin, reduced to an object for him to satisfy himself with, is arousing in ways that even you yourself have trouble understanding.'
+				'One of your hands inadvertently makes its way down south, following the heat you feel in your groin, and finds your pussy dripping wet. Being used by Martin, reduced to an object for him to satisfy himself with, is arousing in ways that even you yourself have trouble understanding.'
 				'But you don''t have to understand. All you have to do is leave your fingers to themselves and reap the rewards, moaning softly as you let your lover fuck your mouth.'
 				$orgasm_txt = 'This sense of complete obedience fans the flames your striptease has lighted. The familiar heat of lust spreads inside your belly, building up like a wave and then washing over you. You cum, your fingers busy on your clit, your moans muffled by Martin''s cock in your mouth.'
 			end
-		
+
 		else
 			$martinpos = 'MartinBlowjob_dressed'
 			'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/dresssub_bj.mp4"></center>'
@@ -231,21 +231,21 @@ if $ARGS[0] = 'MartinBlowjob':
 			*nl
 			'You sensually slide your <<$pc_descWordy[''lips'']>> lips over the head of Martin''s <<$dick_girth>> dick, your eyes closed as you enjoy the sensations: His musky, manly smell; the sense of security and guidance he gives you; the texture of his cock''s tip.'
 			*nl
-			'You move back and forth, never taking him too deep - all your attention is focused on his crown, your <<$pcdesc_tongue>> circling around the head, teasing that sensitive little spot on its underside.' 
+			'You move back and forth, never taking him too deep - all your attention is focused on his crown, your <<$pc_desc[''tongue'']>> tongue circling around the head, teasing that sensitive little spot on its underside.'
 			'The faint taste of precum is the only sign of pleasure you are getting from him at the moment. He seems so focused on what you are doing to him that he is not making a sound. Or is he? Are you just too engrossed in your task to hear him?'
 			*nl
 			'No matter which it is, you couldn''t bring yourself to stop. You close your lips even tighter around his dick, suck stronger than before, move your tongue with even greater purpose, determined to get him off.'
 			$orgasm_txt = 'Maybe it''s the sense of submission you have right now, maybe you were just really horny to begin with; whatever the reason, you find that familiar heat in your lower abdomen rising and spilling over, causing you to cum without ever laying a hand on yourself, your moans muffled by his cock in your mouth.'
 		end
-		
+
 		if deepthroat['pref'] > 50:
 			*nl
 			if $clothingworntype = 'nude' and $pantyworntype = 'none':
 				'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/undresssub_deep.mp4"></center>'
 			else
 				'<center><video autoplay loop src="images/locations/city/industrial/bar/sex/bar/martin/blowjob/dresssub_deep.mp4"></center>'
-			end	
-			'But that''s not enough for him yet. Martin wants to claim all of your mouth and more, and after only a hint of a warning, he takes what he wants: One assertive push at the back of your head is all it takes to drive his hard <<dick>>cm <<$dick_girth>> cock down your <<$pc_desc[''throat'']>> throat until your ' + iif(pirsD>0,'pierced ','') + 'nose almost touches his belly...'
+			end
+			'But that''s not enough for him yet. Martin wants to claim all of your mouth and more, and after only a hint of a warning, he takes what he wants: One assertive push at the back of your head is all it takes to drive his hard <<dick>>cm <<$dick_girth>> cock down your <<$pc_desc[''throat'']>> throat until your <<$pc_desc[''nose'']>> nose almost touches his belly...'
 			*nl
 			'You can feel your gag reflex piping up, but Martin is insistent, holding you there just a few moments longer, groaning softly. You like having a dick in your mouth, but you <b>love</b> having one in your throat. There''s a sense of safety in this carefully-measured abuse, a sense of freedom in giving up control to somebody, a sense of empowerment and arousal in letting him use you for his own pleasure.'
 			*nl
@@ -254,14 +254,14 @@ if $ARGS[0] = 'MartinBlowjob':
 		end
 		*nl
 		'Your dedication pays off: Before long, his dick seems to swell and you can hear him say your name. Martin is about to cum.'
-		
+
 		$orgasm_or = 'custom'
 		gs 'arousal', 'clit_finger', -4, 'masturbate', 'sub'
 		gs 'arousal', 'bj', 5, 'sub'
 		gs 'stat'
 		killvar 'MartinSexStop'
 	!end
-	
+
 	act 'Let him cum in your mouth':gt 'MartinSex2', 'MartinCumshot_Mouth'
 	act 'Let him cum on your face':gt 'MartinSex2', 'MartinCumshot_Face'
 	if $clothingworntype = 'nude' and $pantyworntype = 'none':
@@ -275,7 +275,7 @@ if $ARGS[0] = 'MartinPussyLick':
 	gs 'boyStat', 'A216'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/sex/bar/martin/martinpussylick.jpg"></center>'
 	!!if pcs_dom > 20:
-		!!'You lift yourself up on the counter and spread your legs invitingly for Martin, your moist ' + iif(pirsG>0,'pierced ','') + 'pussy fully exposed to him.' 
+		!!'You lift yourself up on the counter and spread your legs invitingly for Martin, your moist <<$pc_desc[''pussy'']>> pussy fully exposed to him.'
 		!!'"Bartender, I think there''s something here that really ought to be cleaned," you say in your sultriest voice.'
 		!!*nl
 		!!'The smile that flashes across Martin''s face only lasts a split-second before he plays along: "Everything to please my patrons..."'
@@ -283,27 +283,27 @@ if $ARGS[0] = 'MartinPussyLick':
 		!!*nl
 		!!'You watch him, smiling inwardly at the fact that you are getting the pleasure of watching him the way most men like watching women as he is licking your wet pussy out. He seems to genuinely enjoy it, savoring your smell and taste, and the moans that escape you tell him that you are just as happy as him; so happy that you barely notice how minutes pass in utter bliss.'
 		!!*nl
-		!!$orgasm_txt = 'You told him to do this. That thought keeps flashing before your inner eye as you watch Martin lick your ' + iif(tatvag>0,'tattooed ','') + 'pussy. He is eating you out because you willed it, and hitting all the right spots, too. He is doing an amazing job, but it''s this incredible sense of power that pushes you over the edge and has you cumming all over his tongue.'
+		!!$orgasm_txt = 'You told him to do this. That thought keeps flashing before your inner eye as you watch Martin lick your <<$pc_desc[''pussy'']>> pussy. He is eating you out because you willed it, and hitting all the right spots, too. He is doing an amazing job, but it''s this incredible sense of power that pushes you over the edge and has you cumming all over his tongue.'
 		!!gs 'arousal', 'cuni', 5, 'dom'
 		!!$orgasm_txt = ''
 		!!gs 'stat'
-	
+
 	!!else
-		'He lifts you on the counter and spreads your legs, completely exposing your wet ' + iif(pirsG>0,'pierced ','') + 'pussy to him.'
+		'He lifts you on the counter and spreads your legs, completely exposing your wet <<$pc_desc[''pussy'']>> pussy to him.'
 		'"Like what you see?" You ask quietly.'
 		*nl
 		'He bends down to your slit and dives right in, his tongue moving up and down its length and finding, or rather avoiding your clit with practiced (t)ease.'
 		'"Does that answer your question?" You hear between two languid strokes of his tongue.'
 		'You chuckle softly and that chuckle turns into a moan as he flicks the tip of his tongue across your swollen nub.'
 		*nl
-		'You watch him, somewhat amazed at how hot it is to watch a man go down on you. Even if it didn''t feel as good as it does, that alone might explain why men like getting blowjobs so much. You barely even notice how minutes pass as Martin licks your ' + iif(tatvag>0,'tattooed ','') + 'pussy like an ice cream in summer.'
+		'You watch him, somewhat amazed at how hot it is to watch a man go down on you. Even if it didn''t feel as good as it does, that alone might explain why men like getting blowjobs so much. You barely even notice how minutes pass as Martin licks your <<$pc_desc[''pussy'']>> pussy like an ice cream in summer.'
 		*nl
 		$orgasm_txt = 'Strange how, despite having the ''superior'' position, you are feeling like a toy, like a leaf in the wind. Martin is eating you out because he wanted to. He has buried his face between your legs because he willed it, and even though you are looking down at him, he has full control over the situation, over you, over your body, and he knows exactly what he''s doing. You don''t know whether it''s his wonderful tongue or your sense of submission that sets you off, but he has you cumming all over his tongue in no time.'
 		gs 'arousal', 'cuni', 5, 'sub'
 		$orgasm_txt = ''
 		gs 'stat'
 	!!end
-	
+
 	act 'Return the favor (Blowjob)':gt 'MartinSex3', 'MartinBlowTease'
 	act 'Lie down on your back (On your back)':$martinpos='missionary' & gt 'MartinSex2','MartinSexPrep'
 	act 'Get up and bend over for Martin (From behind)':$martinpos='doggystyle' & gt 'MartinSex2','MartinSexPrep'
@@ -312,7 +312,7 @@ if $ARGS[0] = 'MartinPussyLick':
 	act 'Get up and tell Martin you wanna ride him (<b>Reverse</b> Cowgirl)':$martinpos='rev_cowgirl' & gt 'MartinSex2','MartinSexPrep'
 	act '"Fuck my ass, Martin"':$martinpos = 'doggystyle' & gt 'MartinSex2', 'MartinAnalDyn'
 	act 'Lower your ass onto his dick': $martinpos = 'rev_cowgirl' & gt 'MartinSex2', 'MartinAnalDyn'
-			
+
 	act 'Blueball him - Get dressed and leave':
 		cls
 		minut += 5
@@ -321,11 +321,11 @@ if $ARGS[0] = 'MartinPussyLick':
 		'<center><video autoplay loop src="images/locations/city/industrial/bar/gettingdressed.mp4"></center>'
 		'"That was wonderful," you say, pushing yourself off the counter, "but I''m afraid I have to go now."'
 		*nl
-		'At first, Martin probably thinks you''re joking, but seeing as you''re putting your other clothes back on as well, he gets up, frowning.' 
+		'At first, Martin probably thinks you''re joking, but seeing as you''re putting your other clothes back on as well, he gets up, frowning.'
 		'"You''d leave me here, alone, in this state?" He points towards his crotch where his dick is straining against the fabric of his pants. "You couldn''t possibly be this cruel."'
 		*nl
 		'You walk up to Martin, put your arms around his neck and give him a soft kiss, the taste of your pussy on your lips and tongue. When you break it, you whisper: "If I wasn''t cruel at least once in a while, you wouldn''t appreciate it when I''m not."'
-		
+
 		if $pantyworntype ! 'none':
 			'"Besides," you add with a naughty smile, "you just saw me cum really hard, so I think you''ll cum immediately when I''m out that door once you realize that I''m going commando again."'
 			*nl

+ 27 - 27
locations/Serge_kuh.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = '':
 		if sergebazarkuh_count > 0: npc_rel['A112'] +=1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/serge/serge1.jpg"></center>'
-		'Sergey is standing at the kitchen counter. He''s making soup, cutting up ingredients and throwing them into a large pan.' 
+		'Sergey is standing at the kitchen counter. He''s making soup, cutting up ingredients and throwing them into a large pan.'
 		'You don''t want to get in his way and sit down on a chair near the kitchen table, so you can have a chat with him while he keeps preparing the food.'
 		serge_textbk = rand(0,4)
 		if serge_textbk = 0:$serge_textbk = 'When you ask about Vasily''s mother, Sergey shrugs: "It''s a short story, really. I met Vasily''s mother at my graduation party. We all got drunk and she and I had some fun. When she turned out to be pregnant, we got married. We didn''t have much of a say in the matter, that''s just how it worked back then. Shulga was born a few months after that. We tried to make it work, but she got bored and left me a year later when she got offered a job abroad, leaving Shulga with me. I haven''t heard from her since. It''s fine, though... me and him managed just fine, without her."'
@@ -86,7 +86,7 @@ if $ARGS[0] = 'vodka':
 	minut += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/event/alko2.jpg"></center>'
-	'He looks at you intently and says: "No, <<$pcs_nickname>>. I''m not giving you any vodka."' 
+	'He looks at you intently and says: "No, <<$pcs_nickname>>. I''m not giving you any vodka."'
 	'"Aww, why not?" you ask him.'
 	'Sergey takes a sip of his vodka and laughs: "I''ve seen women drink... it never ends well. Besides that, you''re still a girl! I''m not giving you any, end of discussion!"'
 	act 'Leave him alone': gt 'vasilyhome', 'vasilykitchen'
@@ -259,8 +259,8 @@ if $ARGS[0] = 'posuda':
 	if sergehelppos_count > 0 or sergehelppol_count > 0 : 'Sergey smiles: "Actually, that would be nice! <<$pcs_nickname>>, if it''s not too much trouble, could you do the dishes or mop the floor?"'
 	if sergehelppos_count <= 0 and sergehelppol_count <= 0 : 'Sergey shakes his head with a smile on his face: "No need, <<$pcs_nickname>>! You''ve already helped me out a great deal today, thank you!"'
 	act 'Finish': gt 'Serge_kuh'
-	if sergehelppos_count > 0: 
-		act 'Do the dishes for Sergey': 
+	if sergehelppos_count > 0:
+		act 'Do the dishes for Sergey':
 			*clr & cla
 			if sergehelppos_count > 0:minut += 15
 			sergehelppos_day = daystart
@@ -273,7 +273,7 @@ if $ARGS[0] = 'posuda':
 		end
 	end
 	if sergehelppol_count > 0:
-		act 'Mop the floors for Sergey': 
+		act 'Mop the floors for Sergey':
 			*clr & cla
 			if sergehelppol_count > 0:minut += 15
 			sergehelppol_day = daystart
@@ -332,7 +332,7 @@ if $ARGS[0] = 'help_ev1':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/vert'+rand(1,10)+'.jpg"></center>'
 			'That was fun, but you can do better! When you bend over exaggeratedly and show him your ass, you can''t help but giggle. Oops!'
 			'Sergey sighs, realizing your game now... and feeling a bit busted at the same time.'
-			'"<<$pcs_nickname>>, stop tormenting me!" he tells you. "I''m not a robot, I''m a man with needs and desires! If you keep that up, you have no one but yourself to blame for what happens next..."'	
+			'"<<$pcs_nickname>>, stop tormenting me!" he tells you. "I''m not a robot, I''m a man with needs and desires! If you keep that up, you have no one but yourself to blame for what happens next..."'
 			gs 'arousal', 'flash', 5
 			gs 'stat'
 			if npc_rel['A112'] >= 50 and stat['think_virgin'] = 0:
@@ -478,7 +478,7 @@ if $ARGS[0] = 'izdev2':
 						'"Come here, girl. Put that mouth of yours to use", he grunts.'
 						'You quickly move over to him and drop to your knees, covering his large cock in kisses. You don''t forget his testicles either, placing kisses all over them before you slowly lick your way back up to the head of his member.'
 						'You lick it like a lollipop for a moment, before carefully taking it in your mouth. After you suck him off for a little while, he grows impatient and grabs you by the hair, fucking your throat more and more roughly.'
-						'"You thought you could just tease me like that, didn''t you? You little minx..." Sergey scolds you, right before plunging his cock all the way down your throat again.'	
+						'"You thought you could just tease me like that, didn''t you? You little minx..." Sergey scolds you, right before plunging his cock all the way down your throat again.'
 						gs 'arousal', 'bj', 5, 'sub', 'deepthroat', 'rough'
 						gs 'stat'
 						act 'Continue':
@@ -511,7 +511,7 @@ if $ARGS[0] = 'izdev2':
 								'"Time for the next part of my tour", Sergey grins. He pulls out of your pussy and switches to your ass, immediately slamming his cock in you.'
 								'You scream and wince, despite his preparation that was a bit too sudden! Just when you were about to complain, Sergey puts his hand over your throat and pulls you up against his chest. He grunts in your ear: "My tour, my rules... I warned you, I don''t play nice. Now stand there and take it."'
 								'Sergey begins to move his hips, fucking you more and more roughly in your ass while he dominates your body.'
-								'He''s much stronger than you, and you can do little more than just let it happen.'	
+								'He''s much stronger than you, and you can do little more than just let it happen.'
 								'After a few minutes he pulls out of you and demands: "Show me your ass, <<$pcs_nickname>>. Show me how it looks so far."'
 								gs 'arousal', 'anal', 5, 'sub', 'rough'
 								gs 'stat'
@@ -605,7 +605,7 @@ if $ARGS[0] = 'izdev4':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/za1-2.jpg"></center>'
-		'You turn your back to him and take the back of your dress in your hand, asking him: "Uncle Sergey, do you think this is too short?"' 
+		'You turn your back to him and take the back of your dress in your hand, asking him: "Uncle Sergey, do you think this is too short?"'
 		'Sergey coughs nervously, not really sure how to respond to that. "<<$pcs_nickname>>, stop that!" he tells you.'
 		act 'Continue':
 			*clr & cla
@@ -669,7 +669,7 @@ if $ARGS[0] = 'izdev5':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/za3-6.jpg"></center>'
 						'"Wait! I''ll just take my clothes off for you, so you can have a better look!" you suggest, and promptly begin to undress in front of him.'
-						'Realizing there''s no stopping you, Sergey just sits back in his chair and lets it all happen. You can tell he''s about to devour you, when you stand in front of him naked. You nearly have him where you want him!'	
+						'Realizing there''s no stopping you, Sergey just sits back in his chair and lets it all happen. You can tell he''s about to devour you, when you stand in front of him naked. You nearly have him where you want him!'
 						gs 'arousal', 'flash', 5, 'dom'
 						gs 'arousal', 'flashlite', 5, 'dom'
 						minut -= 5
@@ -762,7 +762,7 @@ if $ARGS[0] = 'izdev7':
 					act 'Continue':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/za11-6.jpg"></center>'
-						'You let the dress slip off your shoulder, showing Sergey your boobs too. "This dress is so annoying... stupid straps..." you mutter.'	
+						'You let the dress slip off your shoulder, showing Sergey your boobs too. "This dress is so annoying... stupid straps..." you mutter.'
 						gs 'arousal', 'flashlite', 5, 'dom'
 						gs 'stat'
 						act 'Continue':
@@ -770,7 +770,7 @@ if $ARGS[0] = 'izdev7':
 							minut += 2
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/za11-7.jpg"></center>'
-							'You forget about your dress and just pose for Sergey, who is upon you in an instant. From the large bulge in his pants, you can tell your teasing definitely had an effect on him!'				
+							'You forget about your dress and just pose for Sergey, who is upon you in an instant. From the large bulge in his pants, you can tell your teasing definitely had an effect on him!'
 							act 'Continue': gt 'Serge_kuh', $rand_kuh_sex
 						end
 					end
@@ -1003,7 +1003,7 @@ if $ARGS[0] = 'izdev10':
 						minut += 2
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/za7-6.jpg"></center>'
-						'"You want me, don''t you?" you smile at Sergey, who swallows nervously. He knows he shouldn''t, but... you''re making it very hard on him to do the right thing and say no.'	
+						'"You want me, don''t you?" you smile at Sergey, who swallows nervously. He knows he shouldn''t, but... you''re making it very hard on him to do the right thing and say no.'
 						act 'Continue':
 							*clr & cla
 							minut += 2
@@ -1014,7 +1014,7 @@ if $ARGS[0] = 'izdev10':
 							act 'Continue':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/za7-8.jpg"></center>'
-								'When you''re completely naked, you lean back against the kitchen counter and spread your legs, spreading your pussy for him. Sergey immediately gets out of his chair and follows you, greedily putting his hands on your hips.'				
+								'When you''re completely naked, you lean back against the kitchen counter and spread your legs, spreading your pussy for him. Sergey immediately gets out of his chair and follows you, greedily putting his hands on your hips.'
 								gs 'arousal', 'flash', 5, 'sub'
 								gs 'stat'
 								act 'Continue': gt 'Serge_kuh', $rand_kuh_sex
@@ -1178,7 +1178,7 @@ if $ARGS[0] = 'izdev13':
 							'After a while Sergey pulls his cock out of your mouth, grinning at the strand of spittle dripping fron the head. He then helps you up and takes your ankle in his hand, making you rest one knee on the table surface. He rubs his fingers over your pussy, and slips two fingers inside you.'
 							'"Dripping... just as I suspected", he grins. He fucks you with his fingers for a moment, and then wipes his wet fingers on your ass cheeks. You yelp in surprise when he gives you two loud slaps on your buttocks, ouch!'
 							'Without any warning, he rams his penis all the way inside you in one firm thrust. You cry out in pain from the sudden intrusion, and to your relief he begins slowly, so as to not cause you more pain. Despite his size you can take him fairly well, and soon he has you moaning and mewling on the table as he picks up the pace.'
-							'Your juices are running down your legs now, and your sopping cunt is making a loud squelching sound every time Sergey drives his dick deep into you.'				
+							'Your juices are running down your legs now, and your sopping cunt is making a loud squelching sound every time Sergey drives his dick deep into you.'
 							gs 'arousal', 'vaginal_finger', 10, 'sub'
 							gs 'arousal', 'vaginal', 10, 'sub', 'rough'
 							minut -= 10
@@ -1192,7 +1192,7 @@ if $ARGS[0] = 'izdev13':
 								'"Fuck me, uncle Sergey! Fuck me harder!" you cry out, rubbing your clitoris frantically.'
 								'He grins and does as you ask, entertained by the thought of how eager you were to please him. His balls slap against your buttocks while he pounds you hard.'
 								$orgasm_or = 'custom'
-								$orgasm_txt = 'Then your orgasm hits you: its powerful waves rip through your body, making your whole body tremble and tingle. Sergey has to actually hold you in place, to make sure you don''t fall off the table.'	
+								$orgasm_txt = 'Then your orgasm hits you: its powerful waves rip through your body, making your whole body tremble and tingle. Sergey has to actually hold you in place, to make sure you don''t fall off the table.'
 							 	act 'Continue':
 									*clr & cla
 									pcs_horny += 10
@@ -1213,12 +1213,12 @@ if $ARGS[0] = 'izdev13':
 										'When you wait for him to jerk off on your face, he smirks at you and says: "What, you thought I was going to do it? No, no. For a little slut like yourself, that''s your job... get to work."'
 										'You wrap your fingers around his erection and begin to pump your fist up and down, aiming his dick at your face when he begins to groan more intently. When you feel the first drop of sperm land on your face, you quickly take the head of his dick in your mouth and let him shoot the rest in your mouth. It''s not what he wanted, but from the satisfied look on his face, he''s not about to complain.'
 										'You swallow some of it, but wow... it''s a lot! You let the rest flow down your skin, and look up at Sergey with a sweet smile on your face while his cum slowly drips onto your boobs. You give the head of his cock one more kiss and smile: "I''m sorry for teasing you so much, uncle Sergey. I hope that made up for it?"'
-										'Sergey laughs: "It sure did, <<$pcs_nickname>>. Fair warning though: I went easy on you this time..."'	
+										'Sergey laughs: "It sure did, <<$pcs_nickname>>. Fair warning though: I went easy on you this time..."'
 										gs 'arousal', 'end'
 										gs 'stat'
 										act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 									end
-								end	
+								end
 							end
 						end
 					end
@@ -1324,7 +1324,7 @@ if $ARGS[0] = 'izdev15':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/za2-2.jpg"></center>'
 		'"Oops!" you exclaim. You excitedly cover your chest with your arm, your clothes all wet from the water.'
-		'Sergey looks intently at your nipples, that are tenting through the fabric now.' 
+		'Sergey looks intently at your nipples, that are tenting through the fabric now.'
 		act 'Continue':
 			*clr & cla
 			minut += 2
@@ -1335,7 +1335,7 @@ if $ARGS[0] = 'izdev15':
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/za2-4.jpg"></center>'
-				'With a deep sigh, you decide that you can''t keep this shirt on and decide to just pull it up. It did a very poor job of covering anything up anyway, as wet as it was.'	
+				'With a deep sigh, you decide that you can''t keep this shirt on and decide to just pull it up. It did a very poor job of covering anything up anyway, as wet as it was.'
 				gs 'arousal', 'flashlite', 5, 'sub'
 				gs 'stat'
 				act 'Continue':
@@ -1350,7 +1350,7 @@ if $ARGS[0] = 'izdev15':
 				end
 			end
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'izdev16':
@@ -1433,14 +1433,14 @@ end
 
 !=====================================================================================!
 !HELP: attitude > 50, possible rape scenes!
-!-------------------------------------------------------------------------------------! 
+!-------------------------------------------------------------------------------------!
 if $ARGS[0] = 'izn1':
 	gs 'boyStat', 'A112'
 	npc_sex['A112'] += 1
 	serge_countsex += 1
 	rape += 1
 	pcs_hairbsh = 0
-	'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/bj'+rand(1,11)+'.mp4"></video></center>' 
+	'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/bj'+rand(1,11)+'.mp4"></video></center>'
 	if $clothingworntype ! 'nude': 'Sergey roughly strips you, easily overpowering you. He tosses your clothes aside, laughing at your futile attempts to break free.'
 	'"Why do you keep flaunting your body like you''re some cheap whore, <<$pcs_nickname>>? Are you a cheap whore?" Sergey demands. He pressed you against the wall, and has one hand around your throat.'
 	'"Uncle Sergey, please! I w-" you try to explain, but he interrupts you.'
@@ -1468,7 +1468,7 @@ if $ARGS[0] = 'izn1':
 		act 'Continue':
 			*clr & cla
 			if agape < 2:agape = 2
-			'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/ra'+rand(5,7)+'.mp4"></video></center>' 
+			'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/ra'+rand(5,7)+'.mp4"></video></center>'
 			'Sergey orders you: "Stand before me with your hands behind your back, and look at the floor!"'
 			'You do as he says, not daring to look back at him. With your eyes cast down, you stand before him obediently.'
 			'Suddenly, he slaps your left boob hard, with the palm of his hand. "Ow! That hurts!" you yell, and try to reach out to massage the pain out of it.'
@@ -1521,7 +1521,7 @@ if $ARGS[0] = 'izn2':
 	serge_countsex += 1
 	rape += 1
 	pcs_hairbsh = 0
-	'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/bj'+rand(1,3)+'.mp4"></video></center>' 
+	'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/bj'+rand(1,3)+'.mp4"></video></center>'
 	'"You''re such a slut, <<$pcs_nickname>>... you''re not even wearing a bra! Everyone can see your nipples poking through your clothes!" Sergey scolds you, making you blush and lower your head in shame.'
 	'"How big are those tits of yours, anyway?" he asks.'
 	'"<<$titsize>>, uncle Sergey", you say softly.'
@@ -1561,7 +1561,7 @@ if $ARGS[0] = 'izn2':
 		act 'Continue':
 			*clr & cla
 			if agape < 1:agape = 1
-			'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/bj'+rand(4,11)+'.mp4"></video></center>' 
+			'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/gif/bj'+rand(4,11)+'.mp4"></video></center>'
 			'"Actually, I''m in a good mood", Sergey says. "You''re being such a good little slut for me today, I''ll let you lube up my cock before I fuck your ass. With your mouth, of course."'
 			'You smile at him thankfully and quickly drop to your knees before he changes his mind. That will actually help a lot! You eagerly take his cock in your mouth and begin to suck and lick it eagerly.'
 			'"You''ll never get enough saliva like that", he mutters. "Here, I''ll help."'
@@ -1674,7 +1674,7 @@ if $ARGS[0] = 'sex2':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/help/event/sex2-2.jpg"></center>'
 		'"I''m sorry, uncle Sergey... but your dick is just so beautiful!" you whisper at him. "It''s like it was made to please women! I''m so lucky!"'
-		'Sergey relaxes when you open your mouth wide and close your <<$pc_desc[''lips'']>> lips around the head of his penis. You take your time, but skilfully suck his dick to about half its length. Then a few minutes later, the whole of it is in your mouth!'
+		'Sergey relaxes when you open your mouth wide and close your <<$pc_desc[''lips'']>> lips around the head of his penis. You take your time, but skillfully suck his dick to about half its length. Then a few minutes later, the whole of it is in your mouth!'
 		'You look up at Sergey''s face intently while you try out different techniques, doing your best to make him feel wonderful. Oral sex can be so much fun! You especially remember his impressed look when you took him as deep as possible down your throat, and were licking the side of his balls with your tongue out of your mouth.'
 		'He put his hand behind your head a long time ago, but never forces you to do anything; everything you do today is because you want to please him. Even when you deepthroat him repeatedly... it''s because you want to. You''re such a slut sometimes, and you love it!'
 		gs 'arousal', 'bj', 5, 'sub', 'deepthroat'

+ 1 - 1
locations/Terminal.qsrc

@@ -79,7 +79,7 @@ $askfather = {
 						'Sitting at the table, you order food and drinks, and dad starts asking you about everything.'
 						'You reply to his questions with enthusiasm and talk about yourself, what you do, where go to school. Talk about Anya, that she did not go to the university, and works as a salesgirl in the supermarket.'
 						'You tell him about your mother, she remarried, and you now have a stepfather and half brother Kolka...'
-						'After talking for awhile your father says. "<<$pcs_nickname>> I have to go, I have a schedule to keep. I am here on weekends 12 00 to 14 00, I would be happy if you would visit me sometimes." With that he gets up, pays for lunch and kisses you on the cheek goodbye.'
+						'After talking for a while your father says. "<<$pcs_nickname>> I have to go, I have a schedule to keep. I am here on weekends 12 00 to 14 00, I would be happy if you would visit me sometimes." With that he gets up, pays for lunch and kisses you on the cheek goodbye.'
 						trfatherQW = 4
 						act 'Leave':minut += 5 & gt 'city_industrial'
 					end

+ 61 - 61
locations/TerminalOffice.qsrc

@@ -50,12 +50,12 @@ end
 !Office a Manager = 1x
 !==================================================
 if $ARGS[0] = '11':
-	
+
 	!You can buy the item if you know that you can buy
 	!Can try to give the documents from Anatoly Chubais
 	!Can I ask when running accounting
 	!Can I ask when works Director
-	
+
 	cla
 	gs 'TerminalOffice', 'TerminalOfficeScreen', 'Sales', 'terminal2'
 	'"What can I help you with?" the manager asks you.'
@@ -63,25 +63,25 @@ if $ARGS[0] = '11':
 	act 'Leave the office': minut += 1 & gt 'TerminalOffice', '00'
 
 	if verakassir > 0:
-		
+
 		!Buy goods
-		
+
 		!Flag zapolanski storage, reduction
 		!this flag allows you to go shopping
 		DoNotBuy = 2
-		
+
 		!Amount and Quantity that we can buy(store)
 		MaxQuantityA = 0
 		MaxQuantity1 = 0
 		MaxQuantity2 = 0
 		MaxCost = 0
-		
+
 		!Description size of storage
 		TovarLimitRepository1 = 30
 		TovarLimitRepository2 = 100
-		
+
 		'You talk with the Manager about buying small trinkets...'
-		
+
 		!Get current balances
 		TovarRepository1 = mc_inventory['trinkets_home']
 		if TovarRepository1 => TovarLimitRepository1:
@@ -91,7 +91,7 @@ if $ARGS[0] = '11':
 			'You have '+ TovarRepository1 +' trinkets stored in your home. You''re only able to store <<TovarLimitRepository1>> trinkets.'
 			MaxQuantity1 = TovarLimitRepository1 - TovarRepository1
 		end
-		
+
 		if YouCanGar > 0:
 			!Get the current balances in the garage
 			TovarRepository2 = mc_inventory['trinkets_garage']
@@ -103,7 +103,7 @@ if $ARGS[0] = '11':
 				MaxQuantity2 = TovarLimitRepository2 - TovarRepository2
 			end
 		end
-		
+
 		if DoNotBuy = 2:
 			'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
@@ -111,19 +111,19 @@ if $ARGS[0] = '11':
 			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)>> ' + iif(MaxQuantityA - (MaxQuantity1 + MaxQuantity2) = 1, 'trinket', 'trinkets') + '.</front></b>'
 					cla
 					act 'Leave': gt 'TerminalOffice', '11'
 				end
-				
+
 				MaxCost = MaxQuantityA * 100
-				
-				if MaxCost > money:
+
+				if money < MaxCost:
 					!If not enough money
 					'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):
+					if money + 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."'
@@ -132,11 +132,11 @@ if $ARGS[0] = '11':
 					act 'Leave': gt 'TerminalOffice', '11'
 				else
 					!If the money is written off money to fill warehouses
-						
+
 					money -= MaxCost
-					
+
 					'You''ve purchased <<MaxQuantityA>> trinkets, worth <<MaxCost>>.'
-					
+
 					!First populate channelise 1
 					if MaxQuantityA => MaxQuantity1:
 						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantity1
@@ -147,48 +147,48 @@ if $ARGS[0] = '11':
 						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantityA
 						MaxQuantityA = 0
 					end
-					
+
 					!Now fill channelise 2
 					if MaxQuantityA > 0:
 						mc_inventory['trinkets_garage'] = TovarRepository2 + MaxQuantityA
 					end
-					
-					if YouCanGar = 0 and money > 100: 
+
+					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 them all? Maybe you should ask your stepfather if you could use some free space in his garage...'
 					end
-					
+
 					cla
 					act 'Complete your purchase': gt 'TerminalOffice', '11'
-				end	
+				end
 			end
-			
+
 			act 'Buy small trinkets for 100 <b>₽</b> called "Eyeballs".':
 				!Purchase spend time
 				minut += 13
-				
+
 				MaxQuantityA = MaxQuantity1 + MaxQuantity2
 				MaxCost = MaxQuantityA * 100
-				
+
 				!Hammered warehouses
-				if MaxCost > money:
+				if money < MaxCost:
 					!If not enough money
 					'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):
+					if money + 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."'
 					end
-					
+
 					cla
 					act 'Leave': gt 'TerminalOffice', '11'
 				else
-				
+
 					!If the money is written off money to fill warehouses
-						
+
 					money -= MaxCost
-					
+
 					'You''ve purchased <<MaxQuantityA>> trinkets, worth <<MaxCost>>.'
-					
+
 					!First populate channelise 1
 					if MaxQuantityA => MaxQuantity1:
 						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantity1
@@ -199,23 +199,23 @@ if $ARGS[0] = '11':
 						mc_inventory['trinkets_home'] = TovarRepository1 + MaxQuantityA
 						MaxQuantityA = 0
 					end
-					
+
 					!Now fill channelise 2
 					if MaxQuantityA > 0:
 						mc_inventory['trinkets_garage'] = TovarRepository2 + MaxQuantityA
 					end
-					
-					if YouCanGar = 0 and money > 100: 
+
+					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 them all? Maybe you should ask your stepfather if you could use some free space in his garage...'
 					end
-					
+
 					cla
 					act 'Complete your purchase': gt 'TerminalOffice', '11'
-				end	
-			end			
+				end
+			end
 		end
 	end
-	
+
 	if YouNotOpenDoorDir = 1:
 		!Where the Director, the Door was closed dir
 		act 'Ask about the Director':
@@ -225,7 +225,7 @@ if $ARGS[0] = '11':
 			act 'Leave': YouNotOpenDoorDir = 0 & gt 'TerminalOffice', '11'
 		end
 	end
-	
+
 	!Where is the accountant? Buch the door was closed
 	if YouNotOpenDoorBuh = 1:
 		act 'Ask about the accountant':
@@ -235,7 +235,7 @@ if $ARGS[0] = '11':
 			act 'Leave': YouNotOpenDoorBuh = 0 & gt 'TerminalOffice', '11'
 		end
 	end
-	
+
 	!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?"'
@@ -247,7 +247,7 @@ if $ARGS[0] = '11':
 	end
 
 	!The GG yet topics of conversation.
-	if verakassir = 0 and YouNotOpenDoorDir = 0 and YouNotOpenDoorBuh = 0 and BurgerQW['TerminalTask'] = 0: 
+	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.'
 	end
 end
@@ -261,14 +261,14 @@ if $ARGS[0] = '21':
 
 	if TerminalOfficeBuhWorkTime = 1:
 		!You can give the documents
-		
+
 		cla
 		gs 'TerminalOffice', 'TerminalOfficeScreen', 'The accountant''s office', 'terminal3'
 		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 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.'
@@ -280,22 +280,22 @@ if $ARGS[0] = '21':
 				'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.'
 		end
-		
+
 	else
 		!Accountant is not in place
 		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, but realize that the door is locked. You''ll have to come back at a different time.'
-		
+
 		YouNotOpenDoorBuh = 1
-		
+
 	end
 end
 
@@ -307,18 +307,18 @@ if $ARGS[0] = '31':
 	if TerminalOfficeDirWorkTime  = 1:
 		!You can try to give the documents
 		!You can try to talk
-		
+
 		cla
 		gs 'TerminalOffice', 'TerminalOfficeScreen', 'The Director''s office', 'terminal1'
 		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 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: 
+
+		if AboutBussines = 0:
 			act 'Talk':
 				gs 'TerminalOffice', 'TerminalOfficeScreen', 'The Director''s office', 'terminal1'
-				
+
 				'"I was told to come and see you about a business proposal..." you start.'
 				'"I heard there was a possibility of a good, legitimate and profitable trade business going on..." you continue.'
 				'The man puts the phone to his side and irritably answers, "Can''t you see I''m in middle of a phone call? Leave!"'
@@ -326,11 +326,11 @@ if $ARGS[0] = '31':
 				delact 'Talk'
 			end
 		end
-	
+
 		if AboutDocs = 0 and BurgerQW['TerminalTask'] = 1 and BurgerQW['TerminalTaskDay'] = daystart:
 			act 'Give him the documents':
 				gs 'TerminalOffice', 'TerminalOfficeScreen', 'The Director''s office', 'terminal1'
-				
+
 				'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."'
@@ -338,18 +338,18 @@ if $ARGS[0] = '31':
 				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.'
-		
+
 	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, but realize that the door is locked. You''ll have to come back at a different time.'
-		
+
 		YouNotOpenDoorDir = 1
-		
+
 	end
 end
 --- TerminalOffice ---------------------------------

+ 1 - 1
locations/Zvereva_Sly_sex.qsrc

@@ -216,7 +216,7 @@ if $ARGS[0] = 'bj_1':
 	else
 		'Submitting to him entirely, you open your mouth as wide as you can while staring straight into his eyes. Without any hesitation, he tries to shove it straight down your throat, making your eyes water as you drool all over his cock trying to breathe.'
 	end
-	'He finds a rythm pumping it down your throat for awhile before letting go of your head and pulling it out of your mouth.'
+	'He finds a rythm pumping it down your throat for a while before letting go of your head and pulling it out of your mouth.'
 
 	if pcs_makeup > 1: pcs_makeup = 0
 	gs 'arousal', 'bj', 5, 'sub', 'deepthroat', 'rough'

File diff suppressed because it is too large
+ 149 - 149
locations/_attributes_coco_dress.qsrc


+ 163 - 163
locations/_attributes_coco_outfits.qsrc

@@ -7,127 +7,127 @@ if ARGS[1] = 1:
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 2:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 3:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 5:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 6:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 8:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 9:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 10:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 14:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 15:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 5
-	
+
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 18:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 19:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 6
@@ -135,7 +135,7 @@ elseif ARGS[1] = 21:
 	CloPantsShortness = 1
 	CloBimbo = 1
 	CloCoverTop = 3
-	
+
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 6
@@ -143,7 +143,7 @@ elseif ARGS[1] = 22:
 	CloPantsShortness = 1
 	CloStyle = 4
 	CloCoverTop = 2
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 6
@@ -151,120 +151,120 @@ elseif ARGS[1] = 23:
 	CloPantsShortness = 1
 	CloStyle = 4
 	CloCoverTop = 3
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
+	CloStyle2 = 5
 	CloCoverTop = 1
-	
+
 elseif ARGS[1] = 25:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 28:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 30:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 33:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 38:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 4
@@ -336,27 +336,27 @@ elseif ARGS[1] = 52:
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 53:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 54:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 55:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 56:
 	CloQuality = 4
 	CloThinness = 4
@@ -368,8 +368,8 @@ elseif ARGS[1] = 57:
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 4
@@ -419,57 +419,57 @@ elseif ARGS[1] = 65:
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloBimbo = 3
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 66:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 67:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 68:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 69:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 70:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 71:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 72:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 4
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 73:
 	CloQuality = 3
 	CloThinness = 4
@@ -481,27 +481,27 @@ elseif ARGS[1] = 74:
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 75:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 76:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 77:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 78:
 	CloQuality = 4
 	CloThinness = 5
@@ -513,57 +513,57 @@ elseif ARGS[1] = 79:
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 80:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 81:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 82:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 83:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 84:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 85:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 86:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 87:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 88:
 	CloQuality = 3
 	CloThinness = 4
@@ -575,13 +575,13 @@ elseif ARGS[1] = 89:
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 90:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
+	CloStyle2 = 5
 
 elseif ARGS[1] = 91:
 	CloQuality = 4
@@ -613,25 +613,25 @@ elseif ARGS[1] = 95:
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	 
+
 elseif ARGS[1] = 96:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	 
+
 elseif ARGS[1] = 97:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	 
+
 elseif ARGS[1] = 98:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 99:
 	CloQuality = 4
 	CloThinness = 4
@@ -643,129 +643,129 @@ elseif ARGS[1] = 100:
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 4
-	CloStyle3 = 4
+	CloStyle2 = 5
 
 elseif ARGS[1] = 101:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 4
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 102:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 103:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 104:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 105:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 106:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 107:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 108:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 109:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 110:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloStyle3 = 4
+	CloStyle2 = 5
 
 elseif ARGS[1] = 111:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 112:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 113:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 114:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 115:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 116:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 5
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 117:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 118:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 119:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 5
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 120:
 	CloQuality = 3
 	CloThinness = 4
@@ -777,55 +777,55 @@ elseif ARGS[1] = 121:
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 122:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 123:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 124:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 125:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 126:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 127:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 128:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 129:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 130:
 	CloQuality = 4
 	CloThinness = 5
@@ -837,55 +837,55 @@ elseif ARGS[1] = 131:
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 132:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 133:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 134:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 135:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 136:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 137:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 4
-	
+
 elseif ARGS[1] = 138:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 139:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 140:
 	CloQuality = 3
 	CloThinness = 5
@@ -897,117 +897,117 @@ elseif ARGS[1] = 141:
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 142:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 143:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 144:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 145:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 146:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 147:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 148:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 149:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 150:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 151:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 152:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 153:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 154:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 155:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 156:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 157:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 158:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 159:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 160:
 	CloQuality = 4
 	CloThinness = 4

File diff suppressed because it is too large
+ 150 - 0
locations/_attributes_danilovich_outfits.qsrc


+ 40 - 0
locations/_attributes_danilovich_shoes.qsrc

@@ -7,30 +7,35 @@ if ARGS[1] = 1:
 	ShoQuality = 7
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 2:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 4:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 5:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 6:
 	ShoStyle = 0
@@ -38,36 +43,42 @@ elseif ARGS[1] = 6:
 	ShoHeels = 1
 	ShoCut = 1
 	ShoBimbo = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 12:
 	ShoStyle = 0
@@ -75,78 +86,91 @@ elseif ARGS[1] = 12:
 	ShoHeels = 1
 	ShoCut = 1
 	ShoBimbo = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 22:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 23:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 24:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 25:
 	ShoStyle = 0
@@ -154,96 +178,112 @@ elseif ARGS[1] = 25:
 	ShoHeels = 1
 	ShoCut = 1
 	ShoBimbo = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 26:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 27:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 28:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 29:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 31:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 32:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 33:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 34:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 35:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 36:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 37:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 38:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 39:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 elseif ARGS[1] = 40:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
+	ShoStyle2 = 2
 
 end
 

+ 59 - 59
locations/_attributes_dolls_shoes.qsrc

@@ -21,7 +21,7 @@ elseif ARGS[1] = 3:
 	ShoHeels = 2
 
 elseif ARGS[1] = 4:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 2
@@ -35,7 +35,7 @@ elseif ARGS[1] = 5:
 	ShoBimbo = 1
 
 elseif ARGS[1] = 6:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 2
@@ -124,7 +124,7 @@ elseif ARGS[1] = 19:
 	ShoBimbo = 1
 
 elseif ARGS[1] = 20:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 3
@@ -144,7 +144,7 @@ elseif ARGS[1] = 22:
 	ShoBimbo = 1
 
 elseif ARGS[1] = 23:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
@@ -152,7 +152,7 @@ elseif ARGS[1] = 23:
 	ShoPunk = 1
 
 elseif ARGS[1] = 24:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
@@ -167,7 +167,7 @@ elseif ARGS[1] = 25:
 	ShoGoth = 1
 
 elseif ARGS[1] = 26:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 3
@@ -175,21 +175,21 @@ elseif ARGS[1] = 26:
 	ShoPunk = 1
 
 elseif ARGS[1] = 27:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 3
 	ShoGoth = 1
 
 elseif ARGS[1] = 28:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
 	ShoPunk = 1
 
 elseif ARGS[1] = 29:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
@@ -202,21 +202,21 @@ elseif ARGS[1] = 30:
 	ShoHeels = 1
 
 elseif ARGS[1] = 31:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
 	ShoPunk = 1
 
 elseif ARGS[1] = 32:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
 	ShoPunk = 1
 
 elseif ARGS[1] = 33:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
@@ -243,7 +243,7 @@ elseif ARGS[1] = 36:
 	ShoHeels = 1
 
 elseif ARGS[1] = 37:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
@@ -280,40 +280,40 @@ elseif ARGS[1] = 42:
 	ShoHeels = 1
 
 elseif ARGS[1] = 43:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
 	ShoPunk = 1
 
 elseif ARGS[1] = 44:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
 
 elseif ARGS[1] = 45:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
 	ShoPunk = 1
 
 elseif ARGS[1] = 46:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
 	ShoPunk = 1
 
 elseif ARGS[1] = 47:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
 
 elseif ARGS[1] = 48:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 2
@@ -321,14 +321,14 @@ elseif ARGS[1] = 48:
 	ShoPunk = 1
 
 elseif ARGS[1] = 49:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
 	ShoGoth = 1
 
 elseif ARGS[1] = 50:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
@@ -336,7 +336,7 @@ elseif ARGS[1] = 50:
 	ShoPunk = 1
 
 elseif ARGS[1] = 51:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
@@ -344,7 +344,7 @@ elseif ARGS[1] = 51:
 	ShoPunk = 1
 
 elseif ARGS[1] = 52:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
@@ -360,7 +360,7 @@ elseif ARGS[1] = 53:
 	ShoPunk = 1
 
 elseif ARGS[1] = 54:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
@@ -384,7 +384,7 @@ elseif ARGS[1] = 56:
 	ShoGoth = 1
 
 elseif ARGS[1] = 57:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 2
@@ -392,14 +392,14 @@ elseif ARGS[1] = 57:
 	ShoBimbo = 1
 
 elseif ARGS[1] = 58:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
 	ShoPunk = 1
 
 elseif ARGS[1] = 59:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
@@ -412,14 +412,14 @@ elseif ARGS[1] = 60:
 	ShoHeels = 1
 
 elseif ARGS[1] = 61:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
 	ShoPunk = 1
 
 elseif ARGS[1] = 62:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
@@ -432,7 +432,7 @@ elseif ARGS[1] = 63:
 	ShoHeels = 1
 
 elseif ARGS[1] = 64:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
@@ -459,7 +459,7 @@ elseif ARGS[1] = 67:
 	ShoGoth = 1
 
 elseif ARGS[1] = 68:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
@@ -484,7 +484,7 @@ elseif ARGS[1] = 71:
 	ShoHeels = 1
 
 elseif ARGS[1] = 72:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 2
@@ -492,7 +492,7 @@ elseif ARGS[1] = 72:
 	ShoPunk = 1
 
 elseif ARGS[1] = 73:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
@@ -537,14 +537,14 @@ elseif ARGS[1] = 79:
 	ShoHeels = 4
 
 elseif ARGS[1] = 80:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 5
 	ShoPunk = 1
 
 elseif ARGS[1] = 81:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 4
@@ -552,14 +552,14 @@ elseif ARGS[1] = 81:
 	ShoPunk = 1
 
 elseif ARGS[1] = 82:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 3
 	ShoPunk = 1
 
 elseif ARGS[1] = 83:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
@@ -567,7 +567,7 @@ elseif ARGS[1] = 83:
 	ShoPunk = 1
 
 elseif ARGS[1] = 84:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
@@ -575,7 +575,7 @@ elseif ARGS[1] = 84:
 	ShoPunk = 1
 
 elseif ARGS[1] = 85:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
@@ -583,7 +583,7 @@ elseif ARGS[1] = 85:
 	ShoPunk = 1
 
 elseif ARGS[1] = 86:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 3
@@ -591,7 +591,7 @@ elseif ARGS[1] = 86:
 	ShoPunk = 1
 
 elseif ARGS[1] = 87:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 3
@@ -606,7 +606,7 @@ elseif ARGS[1] = 88:
 	ShoGoth = 1
 
 elseif ARGS[1] = 89:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 4
@@ -614,7 +614,7 @@ elseif ARGS[1] = 89:
 	ShoPunk = 1
 
 elseif ARGS[1] = 90:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 4
@@ -622,7 +622,7 @@ elseif ARGS[1] = 90:
 	ShoPunk = 1
 
 elseif ARGS[1] = 91:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 1
@@ -630,7 +630,7 @@ elseif ARGS[1] = 91:
 	ShoPunk = 1
 
 elseif ARGS[1] = 92:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 1
@@ -666,7 +666,7 @@ elseif ARGS[1] = 96:
 	ShoGoth = 1
 
 elseif ARGS[1] = 97:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
@@ -723,7 +723,7 @@ elseif ARGS[1] = 104:
 	ShoGoth = 1
 
 elseif ARGS[1] = 105:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 2
@@ -731,7 +731,7 @@ elseif ARGS[1] = 105:
 	ShoPunk = 1
 
 elseif ARGS[1] = 106:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 2
@@ -739,7 +739,7 @@ elseif ARGS[1] = 106:
 	ShoPunk = 1
 
 elseif ARGS[1] = 107:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 2
@@ -754,7 +754,7 @@ elseif ARGS[1] = 108:
 	ShoGoth = 1
 
 elseif ARGS[1] = 109:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 5
@@ -762,7 +762,7 @@ elseif ARGS[1] = 109:
 	ShoPunk = 1
 
 elseif ARGS[1] = 110:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
@@ -770,7 +770,7 @@ elseif ARGS[1] = 110:
 	ShoPunk = 1
 
 elseif ARGS[1] = 111:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
@@ -785,7 +785,7 @@ elseif ARGS[1] = 112:
 	ShoGoth = 1
 
 elseif ARGS[1] = 113:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 2
@@ -800,28 +800,28 @@ elseif ARGS[1] = 114:
 	ShoGoth = 1
 
 elseif ARGS[1] = 115:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
 	ShoPunk = 1
 
 elseif ARGS[1] = 116:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
 	ShoPunk = 1
 
 elseif ARGS[1] = 117:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
 	ShoPunk = 1
 
 elseif ARGS[1] = 118:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
@@ -829,7 +829,7 @@ elseif ARGS[1] = 118:
 	ShoPunk = 1
 
 elseif ARGS[1] = 119:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 4
@@ -837,7 +837,7 @@ elseif ARGS[1] = 119:
 	ShoPunk = 1
 
 elseif ARGS[1] = 120:
-	ShoStyle = 2
+	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 4
 	ShoHeels = 4

File diff suppressed because it is too large
+ 116 - 113
locations/_attributes_eroto_dress.qsrc


File diff suppressed because it is too large
+ 162 - 162
locations/_attributes_fashionista_dress.qsrc


+ 39 - 39
locations/_attributes_fashionista_outfits.qsrc

@@ -7,141 +7,141 @@ if ARGS[1] = 1:
 	CloThinness = 2
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 2:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 5:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 6:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 7:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 8:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 10:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 12:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 13:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 14:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
+	CloStyle2 = 5
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 17:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 18:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 20:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
+	CloStyle2 = 5
 end
 
 --- $attributes_fashionista_outfits ---------------------------------

File diff suppressed because it is too large
+ 152 - 152
locations/_attributes_gm_dress.qsrc


File diff suppressed because it is too large
+ 139 - 139
locations/_attributes_gm_outfits.qsrc


+ 34 - 34
locations/_attributes_moncheri_dress.qsrc

@@ -1,6 +1,6 @@
 # $attributes_moncheri_dress
 !!2022/04/29
-!!Note: All items should have the wealthy style applied. 
+!!Note: All items should have the wealthy style applied.
 !!No items outside this category should be quality = 7, although not all items in it must be that quality
 
 if ARGS[1] = 1:
@@ -10,7 +10,7 @@ if ARGS[1] = 1:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 2:
 	CloQuality = 6
 	CloThinness = 4
@@ -18,8 +18,8 @@ elseif ARGS[1] = 2:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 3
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 3:
 	CloQuality = 6
 	CloThinness = 4
@@ -27,8 +27,8 @@ elseif ARGS[1] = 3:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 3
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 4:
 	CloQuality = 6
 	CloThinness = 4
@@ -36,7 +36,7 @@ elseif ARGS[1] = 4:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 5:
 	CloQuality = 6
 	CloThinness = 4
@@ -44,7 +44,7 @@ elseif ARGS[1] = 5:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 6:
 	CloQuality = 6
 	CloThinness = 4
@@ -52,7 +52,7 @@ elseif ARGS[1] = 6:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 7:
 	CloQuality = 6
 	CloThinness = 4
@@ -60,7 +60,7 @@ elseif ARGS[1] = 7:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 8:
 	CloQuality = 6
 	CloThinness = 4
@@ -68,7 +68,7 @@ elseif ARGS[1] = 8:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 9:
 	CloQuality = 6
 	CloThinness = 4
@@ -84,7 +84,7 @@ elseif ARGS[1] = 10:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 11:
 	CloQuality = 6
 	CloThinness = 4
@@ -92,7 +92,7 @@ elseif ARGS[1] = 11:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 12:
 	CloQuality = 6
 	CloThinness = 4
@@ -100,7 +100,7 @@ elseif ARGS[1] = 12:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 13:
 	CloQuality = 6
 	CloThinness = 4
@@ -108,7 +108,7 @@ elseif ARGS[1] = 13:
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 14:
 	CloQuality = 6
 	CloThinness = 4
@@ -116,7 +116,7 @@ elseif ARGS[1] = 14:
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 15:
 	CloQuality = 6
 	CloThinness = 4
@@ -124,7 +124,7 @@ elseif ARGS[1] = 15:
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 16:
 	CloQuality = 6
 	CloThinness = 4
@@ -132,7 +132,7 @@ elseif ARGS[1] = 16:
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 17:
 	CloQuality = 6
 	CloThinness = 4
@@ -183,7 +183,7 @@ elseif ARGS[1] = 23:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 6
 	CloThinness = 4
@@ -191,7 +191,7 @@ elseif ARGS[1] = 24:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 25:
 	CloQuality = 6
 	CloThinness = 4
@@ -207,7 +207,7 @@ elseif ARGS[1] = 26:
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 27:
 	CloQuality = 6
 	CloThinness = 4
@@ -260,7 +260,7 @@ elseif ARGS[1] = 33:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 34:
 	CloQuality = 6
 	CloThinness = 6
@@ -333,7 +333,7 @@ elseif ARGS[1] = 42:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 43:
 	CloQuality = 6
 	CloThinness = 4
@@ -341,7 +341,7 @@ elseif ARGS[1] = 43:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 44:
 	CloQuality = 6
 	CloThinness = 4
@@ -364,7 +364,7 @@ elseif ARGS[1] = 46:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 47:
 	CloQuality = 6
 	CloThinness = 4
@@ -394,7 +394,7 @@ elseif ARGS[1] = 50:
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 51:
 	CloQuality = 6
 	CloThinness = 4
@@ -424,7 +424,7 @@ elseif ARGS[1] = 54:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 
 elseif ARGS[1] = 55:
 	CloQuality = 6
@@ -439,7 +439,7 @@ elseif ARGS[1] = 56:
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloDress = 1
-	
+
 elseif ARGS[1] = 57:
 	CloQuality = 6
 	CloThinness = 4
@@ -475,7 +475,7 @@ elseif ARGS[1] = 61:
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 62:
 	CloQuality = 6
 	CloThinness = 4
@@ -505,7 +505,7 @@ elseif ARGS[1] = 65:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 66:
 	CloQuality = 6
 	CloThinness = 4
@@ -595,7 +595,7 @@ elseif ARGS[1] = 77:
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 78:
 	CloQuality = 6
 	CloThinness = 4
@@ -603,7 +603,7 @@ elseif ARGS[1] = 78:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 3
-	
+
 elseif ARGS[1] = 79:
 	CloQuality = 6
 	CloThinness = 4
@@ -612,7 +612,7 @@ elseif ARGS[1] = 79:
 	CloDress = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 80:
 	CloQuality = 6
 	CloThinness = 4
@@ -731,7 +731,7 @@ elseif ARGS[1] = 94:
 	CloTopCut = 2
 	CloSkirtShortness = 2
 	CloStyle = 3
-	CloStyle3 = 4
+	CloStyle2 = 5
 
 elseif ARGS[1] = 95:
 	CloQuality = 6

+ 77 - 77
locations/_attributes_office.qsrc

@@ -7,284 +7,284 @@ if ARGS[1] = 1:
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 2:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 5:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 6:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 8:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 13:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 15:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 16:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 20:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 23:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 25:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 27:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloSkirtShortness = 2
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 31:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 2
-	CloStyle3 = 4
+	CloStyle2 = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 32:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 33:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
-	CloStyle3 = 4
-	
+	CloStyle2 = 5
+
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	CloStyle3 = 4
+	CloStyle2 = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	CloStyle3 = 4
+	CloStyle2 = 5
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
-	CloStyle3 = 4
+	CloStyle2 = 5
 
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloStyle3 = 4
+	CloStyle2 = 5
 
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	CloStyle3 = 4
+	CloStyle2 = 5
 
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 5
-	CloStyle3 = 4
+	CloStyle2 = 5
 	CloStyle = 4
 	CloBimbo = 1
 
@@ -293,7 +293,7 @@ elseif ARGS[1] = 41:
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
-	CloStyle3 = 4
+	CloStyle2 = 5
 
 end
 

+ 1 - 0
locations/_attributes_salacious_dress.qsrc

@@ -256,6 +256,7 @@ elseif ARGS[1] = 26:
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloDress = 1
+	CloBimbo = 1
 	CloCoverTop = 3
 	CloCoverfront = 3
 	CloCoverBack = 3

+ 64 - 32
locations/_attributes_scandalicious_shoes.qsrc

@@ -119,142 +119,165 @@ elseif ARGS[1] = 19:
 	ShoHeels = 4
 
 elseif ARGS[1] = 20:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 21:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 2
 	ShoHeels = 5
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 22:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 2
 	ShoHeels = 5
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 23:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 24:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 25:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 26:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 27:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 28:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 29:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 30:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 31:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 32:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 33:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 34:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 35:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 36:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 37:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 38:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 39:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 40:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 41:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 42:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 43:
 	ShoStyle = 0
@@ -344,28 +367,32 @@ elseif ARGS[1] = 56:
 	ShoBimbo = 1
 
 elseif ARGS[1] = 57:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 58:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 59:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 60:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 61:
 	ShoStyle = 0
@@ -387,16 +414,18 @@ elseif ARGS[1] = 63:
 	ShoBimbo = 1
 
 elseif ARGS[1] = 64:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 65:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 66:
 	ShoStyle = 0
@@ -412,22 +441,25 @@ elseif ARGS[1] = 67:
 	ShoBimbo = 1
 
 elseif ARGS[1] = 68:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 69:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 70:
-	ShoStyle = 1
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
+	ShoStyle2 = 1
 
 elseif ARGS[1] = 71:
 	ShoStyle = 0

+ 38 - 0
locations/_body_image.qsrc

@@ -84,6 +84,44 @@ if $ARGS[0] = 'pubes' or $ARGS[0] = 'pussy':
 	$result += '.jpg'
 end
 
+if $ARGS[0] = 'ass' or $ARGS[0] = 'butt':
+	$result = 'images/pc/body/ass/'
+
+	if bodyVars['butt_silicone'] > 0:
+		$result += '9s.jpg'
+		!$body_image_msg += 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''<<$result>>''">butt</a>.'
+
+	!natural butt
+	elseif pcs_buttsize <= 7:
+		$result += '1.jpg'
+		!$body_image_msg = 'Your <a href="exec:view''<<$result>>''">ass</a> is square and as flat as a plank.'
+	elseif pcs_buttsize <= 14:
+		$result += '2.jpg'
+		!$body_image_msg = 'Your <a href="exec:view''<<$result>>''">ass</a> is square but not completely flat.'
+	elseif pcs_buttsize <= 21:
+		$result += '3.jpg'
+		!$body_image_msg = 'You have an average, feminine looking <a href="exec:view''<<$result>>''">ass</a>.'
+	elseif pcs_buttsize <= 29:
+		$result += '4.jpg'
+		!$body_image_msg = 'You have an above-average, feminine looking <a href="exec:view''<<$result>>''">ass</a>.'
+	elseif pcs_buttsize <= 36:
+		$result += '5.jpg'
+		!$body_image_msg = 'Your <a href="exec:view''<<$result>>''">ass</a> is bigger, rounder and firmer than average.'
+	elseif pcs_buttsize <= 44:
+		$result += '6.jpg'
+		!$body_image_msg = 'Your ample <a href="exec:view''<<$result>>''">ass</a> is bigger, rounder and firmer than most.'
+	elseif pcs_buttsize <= 51:
+		$result += '7.jpg'
+		!$body_image_msg = 'You have a heart-shaped <a href="exec:view''<<$result>>''">butt</a> that jiggles as you walk.'
+	elseif pcs_buttsize <= 59:
+		$result += '8.jpg'
+		!$body_image_msg = 'You have a large heart-shaped <a href="exec:view''<<$result>>''">butt</a> that jiggles and sways as you walk.'
+	else
+		$result += '9.jpg'
+		!$body_image_msg = 'You have a large bubble <a href="exec:view''<<$result>>''">butt</a> that jiggles and sways as you walk.'
+	end
+end
+
 
 if $ARGS[0] = 'coat':
 	if $coatworntype = 'none':

+ 5 - 2
locations/_shoe_description2.qsrc

@@ -50,10 +50,13 @@ else
 end
 
 if ShoStyle = 1:
-	$result += ' These shoes are considered stripper shoes.'
-elseif ShoStyle = 2:
 	$result += ' These shoes are considered alternative shoes.'
 end
+if ShoStyle2 = 1:
+	$result += ' These shoes are considered stripper shoes.'
+elseif ShoStyle2 = 2:
+	$result += ' These shoes are considered exercise shoes.'
+end
 
 killvar '$temp_shoe_desc'
 if ShoBimbo = 1:	$temp_shoe_desc[] = 'bimbo'

+ 4 - 4
locations/agentned.qsrc

@@ -115,7 +115,7 @@ if $ARGS[0] = 'buy':
 			else
 				'A(n) <<$property_display[i]>> is available for sale for <<func(''agentned'', ''format_price_string'', property_sales_price[i])>> <b>₽</b>.'
 			end
-			if karta + bankDebtLimit >= property_sales_price[i]:
+			if karta >= property_sales_price[i]:
 				if $property_code[i] = 'city_apartment': act 'Buy the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'city_apartment'
 				if $property_code[i] = 'village_cottage': act 'Buy the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'village_cottage'
 				if $property_code[i] = 'matryona_mansion': act 'Buy the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'matryona_mansion'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'finalise_sale':
 	minut += 30
 	'You spend thirty minutes filling out the paperwork for the sale of your <<$property_display[ARGS[2]]>>. <<func(''agentned'', ''format_price_string'', ( (offer*95)/100) )>><b>₽</b> has been paid into your bank account.'
 	gs 'homes_properties', 'sell_property', $ARGS[1], offer
-	karta += (offer*95)/100
+	karta += (offer * 95) / 100
 	delact 'Sell the <<$property_display[ARGS[2]]>>'
 	gs 'stat'
 	killvar 'property_display' & killvar 'property_sales_price'
@@ -289,10 +289,10 @@ if $ARGS[0] = 'view_property_details':
 	'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 	*nl
-	'<<func(''agentned'', ''get_rent_detail_dialogue'', $ARGS[1] )>> The receptionist says as he starts pulling out the paperwork, "Rent is <<func(''agentned'', ''format_price_string'', ARGS[2] )>><b>₽</b> and leases have to be renewed every 30 days. Payment will be automatically deducted from your account or you can come into the office to pay. Last, but not least, you must make pay the first month when you sign for the lease."'
+	'<<func(''agentned'', ''get_rent_detail_dialogue'', $ARGS[1])>> The receptionist says as he starts pulling out the paperwork, "Rent is <<func(''agentned'', ''format_price_string'', ARGS[2] )>><b>₽</b> and leases have to be renewed every 30 days. Payment will be automatically deducted from your account or you can come into the office to pay. Last, but not least, you must make pay the first month when you sign for the lease."'
 	'<br>He pulls out a pen and slides the paperwork onto the counter. "Interested? You can move in right away," he says calmly.'
 
-	if money >= ARGS[2] or karta+bankDebtLimit >= ARGS[2]:
+	if money >= ARGS[2] or karta >= ARGS[2]:
 		act 'Agree and pay':
 			*clr & cla
 			cls

+ 19 - 5
locations/alarmclock.qsrc

@@ -28,9 +28,23 @@ end
 
 if $ARGS[0] = 'alarm_display':
 	!! func('alarmclock', 'alarm_display', hour, minutes)
-	$result = '<b><<$mid(100 + ARGS[1], 2, 2)>>:<<$mid(100 + ARGS[2], 2, 2)>></b>'
+	$result = '<b><<func(''time'', ''get_time_string'', ARGS[1], ARGS[2])>></b>'
 end
 
+if $ARGS[0] = 'get_week_display':
+	$result = '<b><<func(''time'', ''get_time_string'', alarmVars[''timerH''], alarmVars[''timerM''])>></b>'
+end
+
+if $ARGS[0] = 'get_weekend_display':
+	$result = '<b><<func(''time'', ''get_time_string'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>></b>'
+end
+
+if $ARGS[0] = 'base_alarmclock_text':
+	$result = 'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''get_week_display'')>> during the week and <<func(''alarmclock'', ''get_weekend_display'')>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+end
+
+
+
 if $ARGS[0] = 'clear':
 	cla
 	bud1 = 0
@@ -208,11 +222,11 @@ if $ARGS[0] = 'build_table':
 	$alarmVars_table='<center><table border=0 cellpadding=0 cellspacing=5><font size="+1"<b>'
 	$alarmVars_table+='<tr><td><b><a href="exec: bud_weekend = 0 & gt ''alarmclock'', ''Reset''">Reset weekday alarm</a></b></td>'
 	$alarmVars_table+='<td><b><a href="exec: bud_weekend = 0 & gt ''alarmclock'', ''Time''">Set weekday alarm</a></b></td>'
-	$alarmVars_table+='<td><b>Currently set for <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>></b></td></tr>'
-	
+	$alarmVars_table+='<td><b>Currently set for <<func(''time'', ''get_time_string'', alarmVars[''timerH''], alarmVars[''timerM''])>></b></td></tr>'
+
 	$alarmVars_table+='<tr><td><b><a href="exec: bud_weekend = 1 & gt ''alarmclock'', ''Reset''">Reset weekend alarm</a></b></td>'
 	$alarmVars_table+='<td><b><a href="exec: bud_weekend = 1 & gt ''alarmclock'', ''Time''">Set weekend alarm</a></b></td>'
-	$alarmVars_table+='<td><b>Currently set for <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>></b></td></tr>'
+	$alarmVars_table+='<td><b>Currently set for <<func(''time'', ''get_time_string'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>></b></td></tr>'
 
 	if mid($start_type,1,2) = 'sg':
 		$alarmVars_table+='<tr><td colspan="3"><b>Use weekend alarm for holidays - ' + iif(alarmVars['alarm_holiday'] = 0, '<a href="exec: alarmVars[''alarm_holiday''] = 1 & gt ''alarmclock'', ''start''">OFF</a>', '<a href="exec:  alarmVars[''alarm_holiday''] = 0 & gt ''alarmclock'', ''start''">ON</a>') + '</b></td></tr>'
@@ -221,7 +235,7 @@ if $ARGS[0] = 'build_table':
 	$alarmVars_table+='<tr><td colspan="3"><b>Your alarm is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt ''alarmclock'', ''start''">OFF</a>', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt ''alarmclock'', ''start''">ON</a>') + '.</b></td></tr>'
 
 	if alarmVars['alarmOn'] = 1:
-		$alarmVars_table+='</table></center><center><table border=0 cellpadding=0 cellspacing=10><tr><td><b>Your Alarm is ' + iif(alarmVars['timerH'] <= 0 and alarmVars['timerM'] <= 0, 'not set', 'set to ' + func('alarmclock', 'alarm_display', alarmVars['timerH'], alarmVars['timerM'])) + ' for the weekdays ' + iif(alarmVars['timerEndH'] <= 0 and alarmVars['timerEndM'] <= 0, 'and not set', 'and set to ' + func('alarmclock', 'alarm_display', alarmVars['timerEndH'], alarmVars['timerEndM'])) + ' for the weekend' + iif(alarmVars['alarm_holiday'] = 1, ' and holidays', '') + '.</b></td></tr>'
+		$alarmVars_table+='</table></center><center><table border=0 cellpadding=0 cellspacing=10><tr><td><b>Your Alarm is ' + iif(alarmVars['timerH'] <= 0 and alarmVars['timerM'] <= 0, 'not set', 'set to ' + func('time', 'get_time_string', alarmVars['timerH'], alarmVars['timerM'])) + ' for the weekdays ' + iif(alarmVars['timerEndH'] <= 0 and alarmVars['timerEndM'] <= 0, 'and not set', 'and set to ' + func('time', 'get_time_string', alarmVars['timerEndH'], alarmVars['timerEndM'])) + ' for the weekend' + iif(alarmVars['alarm_holiday'] = 1, ' and holidays', '') + '.</b></td></tr>'
 	end
 	$alarmVars_table+='</b></font></table></center>'
 

+ 99 - 87
locations/albina_chat.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'topic_menu':
 		gs 'albina_chat','lazar_conversation'
 		gs 'albina_chat','zoya_conversation'
 	end
-	
+
 	act'Talk about life':
 		cla
 		act 'Talk about something else': cla & gs 'albina_chat','topic_menu'
@@ -90,34 +90,34 @@ if $ARGS[0] = 'job_talk1':
 	end
 	act 'Odd jobs':
 		cla & *nl
-		'"Odd jobs here and there," you shrug. "There''s a lot of things to do around town. They don''t pay very much, but it gives me some spending money. You could try doing that?"' 
+		'"Odd jobs here and there," you shrug. "There''s a lot of things to do around town. They don''t pay very much, but it gives me some spending money. You could try doing that?"'
 		'She wrinkles her nose in disgust.'
 		'"I don''t want to <i>work</i> for a living," she says, sending both of you into giggles.'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	gs 'albina_chat2','first_model_talk1'
-	
+
 	if film > 0:
 		act 'Tell her you''ve shot porn': cla & gs 'albina_chat','pornstar_talk1'
 	end
-	
-		
+
+
 	!!{if masseuse['jobtype'] ! 0:
 		act 'I work as a masseuse':
 			cla & *nl
-			
+
 			gs 'albina_chat','small_talk'
 		end
 	end}
-	
+
 	if stripdancesum > 0:
 		act 'I''m a stripper':
 			cla & *nl
 			gs 'albina_chat','stripper_talk1'
 		end
 	end
-	
+
 end
 
 if $ARGS[0] = 'stripper_talk1':
@@ -142,7 +142,7 @@ if $ARGS[0] = 'stripper_talk1':
 			gs 'albina_chat','small_talk'
 		end
 	end
-	
+
 	act 'Nonchalant':
 		cla & *nl
 		'"I do some strip dancing in the city," you say casually.'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'stripper_talk1':
 			gs 'albina_chat','small_talk'
 		end
 	end
-	
+
 	act 'Proud':
 		cla & *nl
 		'"I do some strip dancing in the city," you admit, letting a smug smile creep onto your lips.'
@@ -177,7 +177,7 @@ if $ARGS[0] = 'stripper_talk1':
 				'"I got a fake passport. Expensive, but it gets me into 18+ areas."'
 				'She grins. "Maybe I''ll come visit you at work one night..."'
 				'"I''m not giving you a free show," you smirk.'
-				'She smiles even wider. "Don''t worry, I''d happily pay to watch you shake that ass!"' 
+				'She smiles even wider. "Don''t worry, I''d happily pay to watch you shake that ass!"'
 				gs 'albina_chat','small_talk'
 			end
 		else
@@ -199,7 +199,7 @@ if $ARGS[0] = 'pornstar_talk1':
 			'"Ew! You''re doing porn?! Seriously?!" She grimaces at you in disgust.'
 			gs 'albina_chat','pornstar_talk2'
 		end
-		
+
 		act 'Casual':
 			$AlbinaQW['porn_talk'] = 'casual'
 			*clr & cla
@@ -207,11 +207,11 @@ if $ARGS[0] = 'pornstar_talk1':
 			'"I''ve been starring in pornos," you say with a casual shrug of your shoulders.'
 			'Her jaw drops and she gives you a look of utter revulsion.'
 			'"Ew! You''re doing porn?! Seriously?!"'
-			
+
 			!!'"Ew! You''re doing porn?! Seriously?! ' + iif(AlbinaQW['StarletsWhore'] > 0, 'After everything you and I went through, you let yourself get talked into being fucked on camera just for some extra cash?" She gives you a grimace of disgust before continuing on ranting. ', 'After everything I protected you from, you let yourself get talked into being fucked on camera just for some extra cash?" She gives you a grimace of disgust before continuing on ranting. ') + '"I can''t <i>imagine</i> doing porn, especially with all the underage porn of me floating around out there with my dad''s creepazoid child-fucker friends. Like I''d want to add to their collection any more. I can''t believe you''d stoop to doing something so disgusting <<$pcs_firstname>>."'
 			gs 'albina_chat','pornstar_talk2'
 		end
-		
+
 		act 'Happy':
 			$AlbinaQW['porn_talk'] = 'happy'
 			*clr & cla
@@ -295,7 +295,7 @@ if $ARGS[0] = 'pornstar_talk2.3':
 			cla & *nl
 			'"I need the money," you shrug. "It pays decently well."'
 			gs 'albina_chat','albina_porn_rant1'
-			
+
 			gs 'albina_chat','pornstar_talk3.1'
 			gs 'albina_chat','pornstar_talk3.2'
 		end
@@ -311,7 +311,7 @@ if $ARGS[0] = 'pornstar_talk2.4':
 			'"I just want to be able to afford nice things," you shrug. "The pay is pretty good and lets me buy expensive stuff. Is that so wrong?"'
 		end
 		gs 'albina_chat','albina_porn_rant2'
-		
+
 		gs 'albina_chat','pornstar_talk3.1'
 		gs 'albina_chat','pornstar_talk3.2'
 	end
@@ -326,7 +326,7 @@ if $ARGS[0] = 'pornstar_talk2.5':
 			'"It''s kind of fun actually," you smirk. "The sex is really good and it kind of makes me feel like a movie star."'
 		end
 		gs 'albina_chat','albina_porn_rant2'
-		
+
 		gs 'albina_chat','pornstar_talk3.1'
 		gs 'albina_chat','pornstar_talk3.2'
 	end
@@ -361,7 +361,7 @@ if $ARGS[0] = 'pornstar_talk3.2':
 			'"Yeah," you smile back.'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		act 'Apologize':
 			cla & *nl
 			'You take a deep breath as your adrenaline comes down.'
@@ -389,7 +389,7 @@ if $ARGS[0] = 'underwear_talk':
 			'You both laugh at that.'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		act 'I like them':
 			cla & *nl
 			'"I just like them," you shrug. "They''re cheap and comfortable, and I like the designs."'
@@ -397,7 +397,7 @@ if $ARGS[0] = 'underwear_talk':
 			gs 'albina_chat','small_talk'
 		end
 	end
-	
+
 	act 'Pussy Kats':
 		cla & *nl
 		'"I get most of my underwear from Pussy Kats," you reply.'
@@ -409,7 +409,7 @@ if $ARGS[0] = 'underwear_talk':
 			'She punctuates her acronym by drawing an inverted triangle with both her index fingers while smirking and bouncing her eyebrows at you.'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		act 'They''re cute':
 			cla & *nl
 			'"I like cute panties," you answer. "Between the cuts, designs and colors, Pussy Kats are the cutest."'
@@ -417,7 +417,7 @@ if $ARGS[0] = 'underwear_talk':
 			gs 'albina_chat','small_talk'
 		end
 	end
-	
+
 	act 'Fashionista':
 		cla & *nl
 		'"I get most of my underwear from Fashionista," you reply.'
@@ -425,7 +425,7 @@ if $ARGS[0] = 'underwear_talk':
 		'"I guess. I just like the way it looks and feels."'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'Lusso':
 		cla & *nl
 		'"I get most of my underwear from Lusso Intimo," you reply.'
@@ -434,7 +434,7 @@ if $ARGS[0] = 'underwear_talk':
 		'"Quality doesn''t matter to me as long as it''s a thong and it looks good. And they don''t sell thongs there," she grins wickedly.'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'I mostly wear sports underwear':
 		cla & *nl
 		'"I mostly buy sports underwear actually," you reply.'
@@ -445,7 +445,7 @@ if $ARGS[0] = 'underwear_talk':
 			'"Got hella V-P-O though," she says while drawing an inverted triangle with both her index fingers and bouncing her eyebrows suggestively.'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		act 'Good for dancing':
 			cla & *nl
 			'"They''re good for dancing," you shrug. "Nice and flexible, no chaffing."'
@@ -455,7 +455,7 @@ if $ARGS[0] = 'underwear_talk':
 			gs 'albina_chat','small_talk'
 		end
 	end
-	
+
 	if pcs_traits['commando_lvl'] = 3:
 		act 'I don''t wear underwear':
 			AlbinaQW['commando_know'] = 3
@@ -470,7 +470,7 @@ if $ARGS[0] = 'underwear_talk':
 				'She stares at you for a few seconds. "Slut," she replies as her face breaks into one of the biggest grins you''ve ever seen her wear.'
 				gs 'albina_chat','small_talk'
 			end
-			
+
 			act 'Casual':
 				cla & *nl
 				'"I don''t," you shrug.'
@@ -487,7 +487,7 @@ if $ARGS[0] = 'underwear_talk':
 				'She stares at you for a few seconds. "Slut," she replies as her face breaks into one of the biggest grins you''ve ever seen her wear.'
 				gs 'albina_chat','small_talk'
 			end
-			
+
 			act 'Proud':
 				cla & *nl
 				'"I don''t wear panties," you smirk.'
@@ -527,7 +527,7 @@ if $ARGS[0] = 'commando_talk':
 				gs 'albina_chat','commando_reply'
 			end
 		end
-		
+
 		if stat['commando_streak'] > 14:
 			act 'Not in weeks':
 				cla & *nl
@@ -554,7 +554,7 @@ if $ARGS[0] = 'commando_talk':
 					'"Nobody ''just forgets'' their underwear you slut!" Albina cackles loudly, gasping for breath and clutching her stomach.'
 					gs 'albina_chat','small_talk'
 				end
-				
+
 				act 'Show her (you''re not wearing any)':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -604,7 +604,7 @@ if $ARGS[0] = 'commando_reply':
 		end
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'It seemed sexy':
 		cla & *nl
 		if pcs_traits['commando_lvl'] = 3:
@@ -619,7 +619,7 @@ if $ARGS[0] = 'commando_reply':
 		end
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'Panty lines':
 		cla & *nl
 		if pcs_traits['commando_lvl'] = 3:
@@ -640,7 +640,7 @@ if $ARGS[0] = 'commando_reply':
 		end
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'Because of you (dancing)':
 		cla & *nl
 		'"Cause of you," you smirk.'
@@ -696,7 +696,7 @@ if $ARGS[0] = 'pube_talk2':
 			'"Fuck yeah!" she cheers, high-fiving you. "Smooth pussy for life!"'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		act 'It''s stylish':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -704,7 +704,7 @@ if $ARGS[0] = 'pube_talk2':
 			'"Pfft-! You''re just like Katja," she snickers. "But I won''t complain that you see it my way either. Smooth pussy revolution!" she cheers, high-fiving you.'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		act 'Boys like it':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -725,9 +725,9 @@ if $ARGS[0] = 'pube_talk2':
 			end
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		gs 'albina_chat','grow_pubes_chat1'
-		
+
 	elseif $pube_style['word'] = 'stubbly':
 		!! stubbly
 		'"What about you? You were looking pretty stubbly in the locker room the other day," she remarks with a raised eyebrow. "Forget to shave?"'
@@ -739,9 +739,9 @@ if $ARGS[0] = 'pube_talk2':
 			'"Ew. I can''t even wait a day. If I feel stubble, the wax comes out <i>that night</i>."'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		gs 'albina_chat','grow_pubes_chat1'
-		
+
 		if pubestyle = 11:
 			act 'Only once it gets bad (lazy)':
 				*clr & cla
@@ -762,7 +762,7 @@ if $ARGS[0] = 'pube_talk2':
 			'"I prefer ''hot'' over cute," she smirks back. "And nothing''s hotter than a smooth pussy."'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		act 'Shaving makes me feel young':
 			cla & *nl
 			'"I''ve tried going clean shaven before, but it just made me feel like a little girl. Like I''m back in primary school." You wrinkle your nose in disgust. "No thanks. Now I always keep a little hair down there."'
@@ -772,14 +772,14 @@ if $ARGS[0] = 'pube_talk2':
 	elseif pcs_pubes <= 25:
 		!! trimmed/styled bush
 		'"What about you?" she remarks with a raised eyebrow. "The locker room makes it pretty obvious <i>you</i> aren''t waxing. How can you stand having all that hair down there?"'
-		
+
 		act 'It''s classy':
 			cla & *nl
 			'"I think it''s classy," you smile back wryly. "A more refined, mature look."'
 			'"''Classy and mature'' is pretty much the exact opposite of what I want," she guffaws. "I want ''hot and dirty.'' Smooth pussy fits that bill."'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		act 'Shaving makes me feel young':
 			cla & *nl
 			'"I''ve tried going clean shaven before, but it just made me feel like a little girl. Like I''m back in primary school." You wrinkle your nose in disgust. "No thanks. I''ll keep some bush down there like a woman."'
@@ -789,11 +789,11 @@ if $ARGS[0] = 'pube_talk2':
 	elseif pcs_pubes <= 30:
 		!! full bush
 		'"Ugh, how can you stand having all that hair down there?" she says, a disgusted look on her face as she turns to glance down at the pubic hair covering your pussy. "Your pussy looks like a fucking hamster!"'
-		
+
 	else
 		!! untamed jungle
 		'"What about you?" she remarks with a raised eyebrow. "The locker room makes it pretty obvious <i>you</i> aren''t waxing. I mean, do you shave at all?!"'
-		
+
 	end
 end
 
@@ -804,7 +804,7 @@ if $ARGS[0] = 'grow_pubes_chat1':
 		'"I''m actually growing it out right now," you say.'
 		gs 'albina_chat','grow_pubes_chat2'
 	end
-	
+
 	act 'Thinking about growing it out':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -821,7 +821,7 @@ if $ARGS[0] = 'grow_pubes_chat2':
 		'"That''s like saying you want to drink piss instead of lemonade for a ''change of pace,''" she replies, shaking her head in disgust. "Gross."'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'Too much work':
 		cla & *nl
 		'"It''s a pain in the ass to stay smooth down there," you sigh. "Shaving is such a hassle. If I have some bush, at least the time between maintaining will increase."'
@@ -831,21 +831,21 @@ if $ARGS[0] = 'grow_pubes_chat2':
 		'"You''ll just have to find out," she smirks back.'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'Feels weird':
 		cla & *nl
 		'"It just feels weird," you say, wrinkling your nose. "Everything all smooth down there. It''s... unnatural. Gives me weird vibes."'
 		'"You just need to get used to it," she insists. "After a month, you don''t even notice it anymore."'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'Makes me feel young':
 		cla & *nl
 		'"It makes me feel like a little girl," you say, wrinkling your nose. "Everything all smooth down there... Ugh. It makes me feel like I''m back in primary school. I''m tired of it. I want to feel like a woman instead of a girl, thank you very much."'
 		'"That''s old fashioned thinking," she insists. "Plenty of women go full Brazilian. You need to get with the times. It''s <<year>>, bitch!"'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'Tired of pleasing guys':
 		cla & *nl
 		'"I''ve never enjoyed having a shaved pussy. I only ever did it because guys liked it," you sigh. "I''m tired of conforming what I do with <i>my body</i> just to please boys. I''m going bush and I''m gonna like it."'
@@ -855,9 +855,9 @@ if $ARGS[0] = 'grow_pubes_chat2':
 end
 
 if $ARGS[0] = 'pube_explain_chat1':
-	
+
 	if $pube_style['shape'] ! 'bush':
-	
+
 	end
 end
 
@@ -944,11 +944,11 @@ if $ARGS[0] = 'lover_conversation':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'You shake your head. "Not really, no..."'
-		'She shakes her head and smiles. "Don''t worry, not everyone''s interested in dating."' 
+		'She shakes her head and smiles. "Don''t worry, not everyone''s interested in dating."'
 		act 'Stop talking': gt 'albina_chat', 'chat_exit'
 		act 'Change the subject': gt 'albina_chat', 'chat'
 	end
-	
+
 	if arrsize('$fuckbuddy') = 1:
 		act 'I have a fuckbuddy':
 			*clr & cla
@@ -985,7 +985,7 @@ if $ARGS[0] = 'lover_conversation':
 			end
 		end
 	end
-	
+
 	if stat['hookup'] > 0:
 		act 'I hook up with random guys':
 			*clr & cla
@@ -994,7 +994,7 @@ if $ARGS[0] = 'lover_conversation':
 			'"Duh. I can''t go a day without some pervert catcalling me about my ass and how fuckable it looks." She gives you a sly smile. "But just because they''re right doesn''t make it any less gross."'
 			'"Well..." you wink and Albina''s jaw drops.'
 			'"You slut!" she grins.'
-			'"Hey!" you say, shoving her back with both hands but laughing anyways.'	
+			'"Hey!" you say, shoving her back with both hands but laughing anyways.'
 			'"Ow! Come on! You know I''m kidding. But seriously, do you really get off on one night stands? I like fucking Lazar because he <i>knows</i> how to fuck me. He knows exactly what to do to drive me insane and I love it. Is fucking a random guy once enough for you?"'
 			!! '"Ow! Come on! You know I''m kidding. But seriously, you would really trust a random guy you just met like that?"'
 			act 'It''s hit or miss':
@@ -1005,7 +1005,7 @@ if $ARGS[0] = 'lover_conversation':
 				act 'Stop talking': gt 'albina_chat', 'chat_exit'
 				act 'Change the subject': gt 'albina_chat', 'chat'
 			end
-			
+
 			act 'Absolutely':
 				cla & *nl
 				'"Absolutely," you grin. "I love trying new dicks! I think I''m up to <<stat[''vaginal'']>>."'
@@ -1016,7 +1016,7 @@ if $ARGS[0] = 'lover_conversation':
 			end
 		end
 	end
-	
+
 	if Rex_Love = 1 or artemQW['bf'] = 1 or kotovLoveQW = 1 or fedorKozlovQW or NikoVolkovQW >= 5 or pcs_lover > pcs_girlfriends:
 		act 'I have a boyfriend':
 			*clr & cla
@@ -1028,9 +1028,15 @@ if $ARGS[0] = 'lover_conversation':
 			gs 'albina_chat', 'lover_rex_talk'
 			i = 0
 			:lover_looop
-			if loverGender[i] ! 1: dynamic '	act ''<<$npc_usedname["<<$lover[i]>>"]>>'': gt ''albina_chat'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$lover[i]>>"]'
-			i +=1
-			if i < ARRSIZE('lover'): jump 'lover_looop'
+			if i < arrsize('lover'):
+				$temp_npcid = $lover[i]
+				if npc_gender[$temp_npcid] ! 1:
+					dynamic 'act ''<<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''albina_chat'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$temp_npcid>>"]'
+				end
+				killvar '$temp_npcid'
+				i += 1
+				jump 'lover_looop'
+			end
 			Killvar 'i'
 			act 'Stop talking': gt 'albina_chat', 'chat_exit'
 			act 'Change the subject': gt 'albina_chat', 'chat'
@@ -1094,7 +1100,7 @@ if $ARGS[0] = 'lover_artem_talk':
 			'You shake your head. "He''s sweet, and really nice to me."'
 			'She laughs, seemingly amused by your words. "Yeah, I''m sure he is ''nice'' and ''sweet''. Does he rock your world though?" she asks with a grin.'
 			'You disregard her comment. "There''s more to life than sex you know!" The amused look on her face tells you she isn''t buying it, though. "Okay fine, he''s pretty good at it... Good enough anyway."'
-			'She again laughs at your comment. "I''m sure that feedback will be well received! Whatever, he''s a nerd who''s getting some pussy. That makes him the alpha of that pack of losers," she says while shrugging her shoulders.' 
+			'She again laughs at your comment. "I''m sure that feedback will be well received! Whatever, he''s a nerd who''s getting some pussy. That makes him the alpha of that pack of losers," she says while shrugging her shoulders.'
 			act 'Stop talking': gt 'albina_chat', 'chat_exit'
 			act 'Change the subject': gt 'albina_chat', 'chat'
 		end
@@ -1124,7 +1130,7 @@ if $ARGS[0] = 'lover_kolka_talk':
 			if albina['kolka_know'] = 0:
 				'"Well..." you say. "I''ve been doing stuff with Kolka lately."'
 				'"Kolka? Who''s Kolk-" She stops mid-sentence and her eyes go wide. "Wait, you mean your <i>brother</i>?!"'
-				
+
 				if brotherSex >= 5:
 					act 'It''s just handjobs':
 						cla & *nl
@@ -1140,8 +1146,8 @@ if $ARGS[0] = 'lover_kolka_talk':
 						act 'Stop talking': gt 'albina_chat', 'chat_exit'
 						act 'Change the subject': gt 'albina_chat', 'chat'
 					end
-				end	
-				
+				end
+
 				if brotherSex >= 6:
 					act 'It''s just blowjobs':
 						cla & *nl
@@ -1157,8 +1163,8 @@ if $ARGS[0] = 'lover_kolka_talk':
 						act 'Stop talking': gt 'albina_chat', 'chat_exit'
 						act 'Change the subject': gt 'albina_chat', 'chat'
 					end
-				end	
-				
+				end
+
 				if brotherSex = 9:
 					act 'It''s just casual':
 						cla & *nl
@@ -1172,8 +1178,8 @@ if $ARGS[0] = 'lover_kolka_talk':
 						act 'Stop talking': gt 'albina_chat', 'chat_exit'
 						act 'Change the subject': gt 'albina_chat', 'chat'
 					end
-				end	
-				
+				end
+
 				if brotherSex = 10:
 					act 'I love him':
 						cla & *nl
@@ -1187,7 +1193,7 @@ if $ARGS[0] = 'lover_kolka_talk':
 						act 'Stop talking': gt 'albina_chat', 'chat_exit'
 						act 'Change the subject': gt 'albina_chat', 'chat'
 					end
-				end	
+				end
 			else
 				'"Well, still mostly Kolka, but-"'
 				'Albina shoves her hand directly into your face and clamps it over your mouth while glaring at you.'
@@ -1210,7 +1216,7 @@ if $ARGS[0] = 'zoya_conversation':
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-				'"It made her uncomfortable and after she ended up pregnant with me, things just got worse. My father never wanted children, so they argued constantly after I was born. She ended up divorcing him when I was 8 years old after she found out about the 18 year old gold digging stripper whore who was sucking his dick every chance she got. She stormed out on him and never looked back. Being forced to leave me behind broke her heart and she''s still feeling guilty about it, so please don''t mention anything about it to her."' 
+				'"It made her uncomfortable and after she ended up pregnant with me, things just got worse. My father never wanted children, so they argued constantly after I was born. She ended up divorcing him when I was 8 years old after she found out about the 18 year old gold digging stripper whore who was sucking his dick every chance she got. She stormed out on him and never looked back. Being forced to leave me behind broke her heart and she''s still feeling guilty about it, so please don''t mention anything about it to her."'
 				'"Anyway, she went to Moscow and finally got into university, where she earned her degree before she moved back here and got her dream job working at a hospital in the city, right under his nose. She''s looking into getting me into uni myself," she says with a warm smile and a twinkle in her eye. You''ve never seen her look so... happy before.'
 				'She turns to you. "So what about you? What do you want to do after school?" she asks warmly.'
 				act 'I don''t know':
@@ -1237,10 +1243,16 @@ if $ARGS[0] = 'zoya_conversation':
 				if NikoVolkovQW >= 5: act 'Get married to Niko': gt 'albina_chat', 'telling_marrige_dreams', 'Niko'
 				i = 0
 				:marrid_looop
-				if loverGender[i] ! 1: dynamic '	act ''Get married to <<$npc_usedname["<<$lover[i]>>"]>>'': gt ''albina_chat'', ''telling_marrige_dreams'', $npc_usedname["<<$lover[i]>>"]'
-				i +=1
-				if i < ARRSIZE('lover'): jump 'marrid_looop'
-				Killvar 'i'				
+				if i < arrsize('lover'):
+					$temp_npcid = $lover[i]
+					if npc_gender[$temp_npcid] ! 1:
+						dynamic 'act ''Get married to <<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''albina_chat'', ''telling_marrige_dreams'', $npc_usedname["<<$temp_npcid>>"]'
+					end
+					killvar 'temp_npcid'
+					i += 1
+					jump 'marrid_looop'
+				end
+				Killvar 'i'
 			end
 		end
 	end
@@ -1313,7 +1325,7 @@ if $ARGS[0] = 'exercise_reply':
 		'"You really ought to try though." She nudges you pointedly. "It''s good for your brain. It keeps you young and sexy," she adds with a smirk.'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'A few times a week':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -1321,7 +1333,7 @@ if $ARGS[0] = 'exercise_reply':
 		'"It''s the best way to do it," she nods.'
 		gs 'albina_chat','small_talk'
 	end
-	
+
 	act 'Every day':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -1333,7 +1345,7 @@ if $ARGS[0] = 'exercise_reply':
 			'"You can''t do that!" she says. "If you work everything every day, it''s only a matter of time before an injury happens!"'
 			gs 'albina_chat','small_talk'
 		end
-		
+
 		act 'Yes':
 			cla & *nl
 			'"Yeah, I try to do something different every day," you tell her.'
@@ -1341,7 +1353,7 @@ if $ARGS[0] = 'exercise_reply':
 			gs 'albina_chat','small_talk'
 		end
 	end
-	
+
 	act 'Every morning':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
@@ -1376,7 +1388,7 @@ if $ARGS[0] = 'pajama_talk':
 				'"You naughty girl," she replies jokingly. "I bet you shower naked too, you slut!"'
 				gs 'albina_chat','small_talk'
 			end
-			
+
 			act 'It gets hot':
 				cla & *nl
 				'"I sleep naked too," you tell her. "It gets too hot for me if I''m wearing clothes under the covers."'
@@ -1384,7 +1396,7 @@ if $ARGS[0] = 'pajama_talk':
 				gs 'albina_chat','small_talk'
 			end
 		end
-		
+
 		act 'I wear panties':
 			cla
 			act 'Same reason':
@@ -1393,7 +1405,7 @@ if $ARGS[0] = 'pajama_talk':
 				'"Prude," she replies jokingly. "I bet you turn off the lights when you masturbate too."'
 				gs 'albina_chat','small_talk'
 			end
-			
+
 			act 'It gets hot':
 				cla & *nl
 				'"I still wear panties," you tell her. "It''s too hot for me under the covers if I put on anything more than that."'
@@ -1401,7 +1413,7 @@ if $ARGS[0] = 'pajama_talk':
 				gs 'albina_chat','small_talk'
 			end
 		end
-		
+
 		!!{act'Panties and bra':
 			cla
 			act 'Same reason':
@@ -1410,7 +1422,7 @@ if $ARGS[0] = 'pajama_talk':
 				'"Prude," she replies jokingly. "I bet you turn off the lights when you masturbate too."'
 				gs 'albina_chat','small_talk'
 			end
-			
+
 			act 'It gets hot':
 				cla & *nl
 				'"I still wear panties," you tell her. "It''s too hot for me under the covers if I put on anything more than that."'
@@ -1418,7 +1430,7 @@ if $ARGS[0] = 'pajama_talk':
 				gs 'albina_chat','small_talk'
 			end
 		end}
-		
+
 		act 'Panties and a top (no bra)':
 			cla
 			act 'It''s comfy':
@@ -1427,7 +1439,7 @@ if $ARGS[0] = 'pajama_talk':
 				'"You don''t know what you''re missing out on," she grins back. "Try losing the shirt sometime. You won''t go back."'
 				gs 'albina_chat','small_talk'
 			end
-			
+
 			act 'Sleeping nude is weird':
 				cla & *nl
 				'"I sleep fully covered," you say, giving her a look. "Sleeping naked is <i>weird</i>."'
@@ -1447,7 +1459,7 @@ if $ARGS[0] = 'niko_help_talk':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'You feel Albina wrap an arm around you. "What''s up, <<$pcs_nickname>>? You''re looking pretty glum."'
 		'You collect your thoughts before replying. "Ever since I broke up with Niko, he''s been raping me at lunchtime and I..."'
-		'Her face contorts in rage. "That slimy little motherfucker''s been doing WHAT?! Don''t worry, I''ll sort him out..."' 
+		'Her face contorts in rage. "That slimy little motherfucker''s been doing WHAT?! Don''t worry, I''ll sort him out..."'
 		'She doesn''t elaborate on what she''s planning when you ask, but you give her a tight hug. "Thanks Albina, I just don''t know what to do!"'
 		act 'Continue': gt 'albinahome','bedroom'
 		end

+ 28 - 28
locations/albina_school_sex.qsrc

@@ -12,21 +12,21 @@ if $ARGS[0] = 'break_fun_1':
 	'"Come to the girls restroom now. No questions."'
 	*nl
 	'You decide not to keep her waiting and make your way to the restroom.'
-	
+
 	act 'Go to the restroom':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/bathroom/bathroom1.jpg"></center>'
 		'You enter the girls restroom to find that nobody is inside. As you walk further in, you hear Albina. "In here <<$pcs_nickname>>."'
 		'You walk over to the furthest stall and find Albina inside sitting on the toilet, her legs spread wide. She has a mischievous grin on her face and you know exactly what kind of mood she''s in.'
 		'"Don''t worry, nobody will disturb us. I made sure of it," she says with a smile and motions for you to come closer.'
-		
+
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/bathroom/bathroom2.jpg"></center>'
 			'You''re pretty certain of what she wants to do, but you decide to ask anyway.'
 			'"So what are you doing in here?" She justs laughs at your question as she stands and walks up to you.'
 			'"Come on <<$pcs_nickname>>, you''re not that stupid. I was thinking about the times we''ve had some fun and how fucking amazing your tongue felt on my pussy." She pulls up her skirt and invintingly wiggles her ass at you. "Now I''m wet and want you to eat me out."'
-			
+
 			act 'Refuse':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/maekup.jpg"></center>'
@@ -34,7 +34,7 @@ if $ARGS[0] = 'break_fun_1':
 				'She looks a little disappointed as she fixes her skirt, but walks over to you and leans in to whisper in your ear. "That''s okay, but just know that I''ll be sitting in class with a <i>very</i> wet pussy thinking about how good you are at eating it..." she says softly before walking over to the mirror and touching up her makeup before leaving. You find yourself feeling a little aroused.'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			end
-			
+
 			act 'Accept':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/bathroom/bathroom3.jpg"></center>'
@@ -42,13 +42,13 @@ if $ARGS[0] = 'break_fun_1':
 				'She wasn''t kidding. Her glistening pussy is dripping wet as you bring your head up to her crotch. She grabs you by the hair and shoves your face into her pussy, holding you tightly against her as you start licking and sucking her engorged clit, her soft moans of pleasure arousing you even further. "Mmmmhm... Yeah, that feels fucking great, <<$pcs_nickname>>. Keep going!"'
 				gs 'arousal', 'cuni_give', -5, 'lesbian'
 				gs 'stat'
-				
+
 				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/bathroom/bathroom4.jpg"></center>'
 					'This continues for a while until she pulls you away from her and shoves you down on the floor.'
 					'"I''m almost there, but I want to sit on your face first."'
-					'You lay flat on your back as she lowers herself down and plants her pussy on your face, coating you with her wetness as you resume pleasuring her. Soon, her moans become louder and she starts grinding against you as she reaches climax. "Fuck, gonna cum!!" she cries before she lifts herself off you and you''re drenched by the flood of juices that spray from her pussy.' 
+					'You lay flat on your back as she lowers herself down and plants her pussy on your face, coating you with her wetness as you resume pleasuring her. Soon, her moans become louder and she starts grinding against you as she reaches climax. "Fuck, gonna cum!!" she cries before she lifts herself off you and you''re drenched by the flood of juices that spray from her pussy.'
 					'When she finishes squirting, she drops back down and grinds against you again, smearing her wetness all over your face.'
 					gs 'arousal', 'cuni_give', -5, 'lesbian'
 					gs 'stat'
@@ -65,8 +65,8 @@ if $ARGS[0] = 'break_fun_2':
 	*clr & cla
 	if temp = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/maekup.jpg"></center>'
-		'Satisfied, she climbs off of you and helps you to your feet. "That was amazing <<$pcs_nickname>>, I really needed that," she says before pulling her thong back on and fixing her skirt. She walks over to the mirror to touch up her makeup when her phone pings with a text message and she suddenly takes off. "I''d love to return the favor, but I promised Vicky I''d do something with her before our next class. I need to go, but I owe you one!" she says and winks at you before walking out the door with some sway in her hips. You clean up at the sink and prepare to leave yourself, feeling very horny and a little disappointed that you won''t get a release.' 
-		act 'Continue': 
+		'Satisfied, she climbs off of you and helps you to your feet. "That was amazing <<$pcs_nickname>>, I really needed that," she says before pulling her thong back on and fixing her skirt. She walks over to the mirror to touch up her makeup when her phone pings with a text message and she suddenly takes off. "I''d love to return the favor, but I promised Vicky I''d do something with her before our next class. I need to go, but I owe you one!" she says and winks at you before walking out the door with some sway in her hips. You clean up at the sink and prepare to leave yourself, feeling very horny and a little disappointed that you won''t get a release.'
+		act 'Continue':
 			gs 'arousal', 'end'
 			gs 'stat'
 			gt 'gschool_lessons', 'short_break'
@@ -84,14 +84,14 @@ if $ARGS[0] = 'break_fun_2':
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/bathroom/bathroom5.jpg"></center>'
-			'You moan softly as she traces her tongue along your folds and over your clit. She does this for a few seconds before concentrating solely on your clit, expertly licking and sucking on it, her tongue piercing only adding to your pleasure. She teases you like this for only a few seconds before you feel your orgasm building, your breathing becoming more ragged.' 
+			'You moan softly as she traces her tongue along your folds and over your clit. She does this for a few seconds before concentrating solely on your clit, expertly licking and sucking on it, her tongue piercing only adding to your pleasure. She teases you like this for only a few seconds before you feel your orgasm building, your breathing becoming more ragged.'
 			$orgasm_txt = 'Albina notices this and starts swirling her tongue over your engorged bean even faster, quickly bringing you to an explosive climax. She keeps teasing your clit throughout your orgasm, increasing your pleasure even further.'
 			$orgasm_or = 'custom'
 			gs 'arousal', 'cuni', -15, 'lesbian'
 			gs 'stat'
 			'When your orgasm passes, she pulls away from you and you look down at her with an appreciative smile. She licks her lips and winks at you in response before getting to her feet and walking over to the sink to clean up. You fix your clothes and join her, your legs still rather weak. Once you''ve both cleaned up, she gives you a quick kiss before leaving with a teasing sway in her hips. You compose yourself and head out behind her.'
-			
-			act 'Continue': 
+
+			act 'Continue':
 				gs 'arousal', 'end'
 				gs 'stat'
 				gt 'gschool_lessons', 'short_break'
@@ -140,13 +140,13 @@ if $ARGS[0] = 'lunch_fun_1_2':
 	'Julia blushes and looks around for a way out as Albina smiles. "Don''t be shy, Julia. I know you love staring at my ass, and who can blame you? It''s so <i>big</i> and <i>firm</i> and you''d just love to feel it in your hands and give it a good squeeze, wouldn''t you?"'
 	'Julia blushes and squirms even more as she looks at the floor. "I, I... What are you... Talking about?"'
 	'"Don''t be like that, Julia! I''d like it, no <i>love</i> it, if you played with my ass right here, right now. '+iif(func('pcs_has_attr', 'body_ass_bubble'),'I bet you''d love to have a feel of <<$pcs_nickname>>''s big ass as well, wouldn''t you?','')+'"'
-	
+
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/threesome2.jpg"></center>'
 		'Julia sits in silence before awkwardly answering. "Ye... Yes, but please don''t tell anyone! Please, just leave me alone!"'
 		'Albina smiles. "Oh, I won''t tell anyone. It''ll be our little secret. I''ve got a far better idea." She then takes both you and Julia by surprise by sweeping Julia''s stuff off the desk and climbing over to softly kiss Julia on the lips. Julia doesn''t flinch and even starts returning the kiss. The two of them are soon passionately making out in front of you and you see Julia closing her legs tightly together.'
-		
+
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/threesome3.jpg"></center>'
@@ -156,35 +156,35 @@ if $ARGS[0] = 'lunch_fun_1_2':
 			'To your surprise, Julia actually does start playing with Albina''s ass, and with great enthusiasm. You think you see a small smile creep onto her face as Albina continues undressing and you follow her lead.'
 			gs 'arousal', 'erotic', -5, 'lesbian'
 			gs 'stat'
-			
+
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/threesome4.jpg"></center>'
 				'The two of you are soon naked and that''s when Albina stops Julia and pulls her off the table. You help Albina undress her before you and Albina climb onto the table and she leans back against you with her legs spread, presenting her wet pussy to Julia, who stares wide eyed at her. "I know you want a taste Julia, so why don''t you help me out?" Albina says teasingly.'
-				'You see another small smile on Julia''s face as she gets on her knees between Albina''s legs and, without hesitation, starts licking Albina''s pussy. "Shit, your tongue feels fucking great! Keep going!" Julia complies and soon reduces Albina to a quivering mess of loud, pleasured moans. She grabs Julia''s hair and holds her tightly against her crotch. Julia doesn''t seem to care and appears to double her efforts, which causes Albina to moan even louder.' 
+				'You see another small smile on Julia''s face as she gets on her knees between Albina''s legs and, without hesitation, starts licking Albina''s pussy. "Shit, your tongue feels fucking great! Keep going!" Julia complies and soon reduces Albina to a quivering mess of loud, pleasured moans. She grabs Julia''s hair and holds her tightly against her crotch. Julia doesn''t seem to care and appears to double her efforts, which causes Albina to moan even louder.'
 				gs 'arousal', 'erotic_nudity', -8, 'lesbian'
 				gs 'stat'
-				
+
 				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/threesome5.jpg"></center>'
-					'You feel a little left out, so you slide out from behind Albina and lay her flat before straddling her and sitting on her face. You moan loudly as she immediately starts eating your pussy. Albina gives out as much as she''s recieving and you soon find yourself growing weak from the pleasure as her pierced tongue expertly swirls around your clit.'
+					'You feel a little left out, so you slide out from behind Albina and lay her flat before straddling her and sitting on her face. You moan loudly as she immediately starts eating your pussy. Albina gives out as much as she''s receiving and you soon find yourself growing weak from the pleasure as her pierced tongue expertly swirls around your clit.'
 					$orgasm_txt = 'A few minutes of this is enough to bring you to an explosive orgasm and you muffle your screams as you cum over Albina''s face.'
 					$orgasm_or = 'custom'
 					gs 'arousal', 'cuni', -15, 'lesbian'
 					gs 'stat'
 					'Julia soon brings Albina over the edge and her muffled moans feel amazing against your sensitive clit before you climb off her and she lays on the desk in ecstasy.'
 					'"Fuck Julia, you''re an absolute pro! Only <<$pcs_nickname>> has come close to eating my pussy as good as you did!" She then sits up and looks down at the meek looking nerd, who''s clearly aroused and in need of a release. "Get up here. It''s your turn."'
-					
+
 					act 'Continue':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/threesome6.jpg"></center>'
 						'Julia seems a little stunned, and maybe afraid, by what Albina said, so you slide off the desk and pull her to her feet before getting her to climb up onto the desk and bend over.'
-						'You kneel below her now dripping wet pussy and gently run your tongue along her folds to her engorged clit. You flick your tongue over her bean, which causes her to moan loudly in pleasure. Albina spanks her before going down on her ass, rimming and tongue fucking Julia''s asshole as you concentrate on her clit.' 
+						'You kneel below her now dripping wet pussy and gently run your tongue along her folds to her engorged clit. You flick your tongue over her bean, which causes her to moan loudly in pleasure. Albina spanks her before going down on her ass, rimming and tongue fucking Julia''s asshole as you concentrate on her clit.'
 						'She covers her mouth to muffle her pleasured moans and a few seconds later, you and Albina''s combined efforts bring her over the edge. She barely contains her screams of pleasure as she cums, you and Albina continuing to please her throughout her orgasm. Once her orgasm passes, she collapses onto the desk.'
 						gs 'arousal', 'cuni_give', -5, 'lesbian'
 						gs 'stat'
-						
+
 						act 'Continue':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/threesome7.jpg"></center>'
@@ -195,7 +195,7 @@ if $ARGS[0] = 'lunch_fun_1_2':
 							'Once she''s gone, the two of you share a laugh at what just happened before you both get dressed yourselves.'
 							'"Well that certainly was fun. I suspected Julia had a thing for me, but I wasn''t expecting her to be so... enthusiastic..." Albina says with a grin as she pulls her skirt back on. "The girl''s got some great tits and an amazing ass. Shame she hangs with those geeks."'
 							'The bell rings as you finish getting dressed and you both head out to your next class.'
-							act 'Continue': 
+							act 'Continue':
 								gs 'arousal', 'end'
 								gs 'stat'
 								gt 'gschool_lessons', 'short_break'
@@ -212,19 +212,19 @@ if $ARGS[0] = 'lunch_fun_2':
 	menu_off = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/class1.jpg"></center>'
-	'After a few seconds, she breaks the kiss and smiles at you. "I hope you''re hungry because you''re having my pussy for lunch today." You can sense the lust in her voice as she pushes you onto the floor, hikes up her skirt and pulls her thong off before sitting on your face. She moans loudly in pleasure as you start eating her out.' 
+	'After a few seconds, she breaks the kiss and smiles at you. "I hope you''re hungry because you''re having my pussy for lunch today." You can sense the lust in her voice as she pushes you onto the floor, hikes up her skirt and pulls her thong off before sitting on your face. She moans loudly in pleasure as you start eating her out.'
 	'Her moans grow louder and her pussy grows wetter as she starts grinding against you, smearing her wetness across your face. After a few more seconds where she moans even louder and grinds even faster, she suddenly pulls herself off of you, her breath heavy. "I don''t want to cum just yet. I need more of that tongue first."'
 
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/class2.jpg"></center>'
-		'She pulls you up to your feet and you practically rip each other''s clothes off and make out before she lies back on a desk and spreads her legs. "Get that magic tongue of yours over here and make me cum <<$pcs_nickname>>!" You smile at her as you climb onto the desk and crawl over to her. You tease her a little by sucking on and licking her nipple before moving down to her now dripping wet pussy.' 
+		'She pulls you up to your feet and you practically rip each other''s clothes off and make out before she lies back on a desk and spreads her legs. "Get that magic tongue of yours over here and make me cum <<$pcs_nickname>>!" You smile at her as you climb onto the desk and crawl over to her. You tease her a little by sucking on and licking her nipple before moving down to her now dripping wet pussy.'
 		'She tightly wraps her legs around your head, pressing your face against her crotch as you lick and suck on her engorged clit. After a few minutes of this, her grip tightens around your head. "Oh fuck, <<$pcs_nickname>>! Don''t stop, I''m gonna...." She isn''t able to finish her sentence before she lets out a muffled cry of pleasure and starts squirting into your mouth and across your face. Once she finishes, you swallow her juices and she relaxes her grip, allowing you to sit up as she lies panting on the desk.'
-		
+
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/class3.jpg"></center>'
-			'"Oh... Oh wow. That was... Amazing... I really needed that..." she pants as she rides out her orgasm. "I should return the favor," she says before she sits up and flashes her tongue piercing at you as she motions for you to lie down. She climbs off the desk and pulls you over to the edge as you lie back. She licks her lips and immediately buries her head in your crotch, making you moan loudly as she eats you out for all she''s worth. She knows exactly what she''s doing and has you approaching orgasm within minutes.' 
+			'"Oh... Oh wow. That was... Amazing... I really needed that..." she pants as she rides out her orgasm. "I should return the favor," she says before she sits up and flashes her tongue piercing at you as she motions for you to lie down. She climbs off the desk and pulls you over to the edge as you lie back. She licks her lips and immediately buries her head in your crotch, making you moan loudly as she eats you out for all she''s worth. She knows exactly what she''s doing and has you approaching orgasm within minutes.'
 			'Seeing this, she stops licking your pussy and stands up; you barely have time to ask what''s happening before she jams her fingers deep inside you and starts fingerbanging you. "That''s right <<$pcs_nickname>>, cum for me." she whispers teasingly in your ear before making out with you. You moan loudly into her mouth as she brings you to orgasm. You lie panting on the desk as she pulls her fingers out and sucks on them. "Mhmm. You taste really fucking good, you know that?" she says teasingly with a wink.'
 			gs 'arousal', 'erotic', 6, 'lesbian'
 			gs 'stat'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'lunch_fun_2':
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/school/classroom/class4.jpg"></center>'
-				'She climbs back onto the desk and you start making out again. You can taste yourself on her lips and tongue as she reaches down and gives your sensitive clit a few teasing rubs. She then breaks the kiss and leans over the edge of the desk, fumbling around in search of something.' 
+				'She climbs back onto the desk and you start making out again. You can taste yourself on her lips and tongue as she reaches down and gives your sensitive clit a few teasing rubs. She then breaks the kiss and leans over the edge of the desk, fumbling around in search of something.'
 				gs 'arousal', 'erotic_nudity', 8, 'lesbian'
 				gs 'stat'
 
@@ -241,7 +241,7 @@ if $ARGS[0] = 'lunch_fun_2':
 					*nl
 					'Her ass is too inviting and she yelps in surprise when you smack it hard. "<<$pcs_nickname>>!! You''re so naughty!" she says while looking back and biting her lip. "You know I''d love it if you continued, but lunch is almost over and we need to get dressed before someone finds us."'
 					'You nod and start getting dressed, Albina making a show of giving you what you can only describe as a reverse striptease. Once you''re dressed, she gives you a final kiss and surprises you by spanking you back, making you jump a little as she smiles and walks out the door with some sway in her hips. You quickly hurry out behind her as the bell for your next class rings.'
-					
+
 					act 'Finish':
 						gs 'arousal', 'end'
 						gs 'stat'
@@ -254,7 +254,7 @@ if $ARGS[0] = 'lunch_fun_2':
 					*nl
 					'Her legs are slightly spread, so you move in behind her and slide your fingers inside her still wet hole. "Ooohh <<$pcs_nickname>>..." she moans softly. "While I''d love a round two, lunch is almost over and we should get dressed before someone finds us."'
 					'You nod and start getting dressed, Albina making a show of giving you what you can only describe as a reverse striptease. Once you''re dressed, she gives you a final kiss and gets her own back by pinching your nipple, making you squeal a little as she smiles and walks out the door with some sway in her hips. You quickly hurry out behind her as the bell for your next class rings.'
-				
+
 					act 'Finish':
 						gs 'arousal', 'end'
 						gs 'stat'

+ 88 - 85
locations/albina_sex_scenes.qsrc

@@ -7,19 +7,19 @@ if $ARGS[0] = 'kissing1':
 	gs 'arousal', 'foreplay', -5, 'no_orgasm_msg', 'lesbian'
 	'<center><video autoplay loop src="images/shared/sex/lesbian/kiss2.mp4"></video></center>'
 	'You kiss Albina deeply, pulling her face into yours and drinking in the taste of her tongue as your breasts smoosh against hers. Her hands wander, snaking down your back to grab at your ass.'
-	if pcs_butt <= 4:
+	if func('pcs_has_attr', 'body_ass_flat'):
 		'"You need to do some squats," she giggles. "I want more to play with back here."'
-	elseif pcs_butt <= 8:
+	elseif func('pcs_has_attr', 'body_ass_average'):
 		'"Mmmm..." she moans. "You have a nice ass..."'
-	elseif pcs_butt <= 12:
+	elseif func('pcs_has_attr', 'body_ass_big'):
 		'"Mmmm- fuck~!" she moans. "Is this what it feels like for guys when they grab my ass?"'
 	else
 		'"Mmmm- fuck~!" she moans. "I think your ass is even bigger than mine!"'
 	end
 !!	act '69 her':
-	
+
 !!	act 'Fuck her with a strapon':
-	
+
 	if stat['think_virgin'] = 1:
 		act 'Ask her to take your virginity': gs 'albina_sex_scenes', 'virgin_take1'
 	else
@@ -54,7 +54,7 @@ if $ARGS[0] = 'virgin_take1':
 		'Biting your lip, you nod once as your face flushes with heat.'
 		gs 'albina_sex_scenes', 'virgin_take2'
 	end
-	
+
 	act 'Ask openly':
 		cla & *nl
 		'"I want you to take my virginity," you say, staring straight into her eyes.'
@@ -62,7 +62,7 @@ if $ARGS[0] = 'virgin_take1':
 		'"I''m sure," you nod without hesitation. "And I want it to be you."'
 		gs 'albina_sex_scenes', 'virgin_take2'
 	end
-	
+
 end
 
 if $ARGS[0] = 'virgin_take2':
@@ -75,7 +75,7 @@ if $ARGS[0] = 'virgin_take2':
 		'You watch as Albina reaches into a drawer and pulls out a harness and pulls it up her legs, cinching it tight to her thighs. She then reaches back to pull out a dildo about <<dick>>cm long.'
 		gs 'albina_sex_scenes', 'virgin_take2.1'
 	end
-	
+
 	act 'Do as she says':
 		*clr & cla
 		!! IMAGE HERE
@@ -144,7 +144,7 @@ if $ARGS[0] = 'virgin_take3':
 					gs 'albina_sex_scenes', 'virgin_take4'
 				end
 			end
-			
+
 			act 'It feels good':
 				albinaQW['big_dildo_enjoy'] = 1
 				cla & *nl
@@ -181,7 +181,7 @@ if $ARGS[0] = 'virgin_take4':
 		end
 		*nl
 		'"That''s the whole thing," she says. "You okay?"'
-		
+
 		act 'Nod':
 			cla & *nl
 			'"Yeah," you nod, concentrating hard just to get that one syllable out.'
@@ -189,7 +189,7 @@ if $ARGS[0] = 'virgin_take4':
 			'You nod again and Albina begins to move her hips.'
 			gs 'albina_sex_scenes', 'virgin_take5'
 		end
-		
+
 		if $dick_girth = 'thick':
 			act 'It''s big':
 				cla & *nl
@@ -207,7 +207,7 @@ if $ARGS[0] = 'virgin_take4':
 			end
 		end
 	end
-	
+
 	act 'Gasp':
 		*clr & cla
 		!! IMAGE HERE
@@ -222,7 +222,7 @@ if $ARGS[0] = 'virgin_take4':
 		end
 		*nl
 		'"That''s the whole thing," she says. "You okay?"'
-		
+
 		act 'Nod':
 			cla & *nl
 			'"Yeah," you gasp again, concentrating hard just to get that one syllable out as you pant for breath.'
@@ -230,7 +230,7 @@ if $ARGS[0] = 'virgin_take4':
 			'You nod again and Albina begins to move her hips.'
 			gs 'albina_sex_scenes', 'virgin_take5'
 		end
-		
+
 		if $dick_girth = 'thick':
 			act 'It''s big':
 				cla & *nl
@@ -248,7 +248,7 @@ if $ARGS[0] = 'virgin_take4':
 			end
 		end
 	end
-	
+
 	if $dick_girth = 'thick':
 		act 'Shriek':
 			*clr & cla
@@ -264,7 +264,7 @@ if $ARGS[0] = 'virgin_take4':
 			end
 			*nl
 			'"I''m so sorry <<$pcs_nickname>>," she says morosely. "I know it hurts, just bear with it."'
-			
+
 			act 'Nod':
 				cla & *nl
 				'You nod, unable to speak lest you scream again as your pussy adjusts to having something inside it.'
@@ -272,7 +272,7 @@ if $ARGS[0] = 'virgin_take4':
 				'You nod again and Albina begins to move her hips.'
 				gs 'albina_sex_scenes', 'virgin_take5'
 			end
-			
+
 			if $dick_girth = 'thick':
 				act 'It''s big':
 					cla & *nl
@@ -324,7 +324,7 @@ if $ARGS[0] = 'virgin_take5':
 			*nl
 			'"Starting to feel good, right?" Albina smiles. You nod back, starting to go lightheaded with pleasure as she begins to roll her hips during her thrusts.'
 		end
-		
+
 		act 'Continue': gs 'albina_sex_scenes', 'virgin_take6'
 	end
 end
@@ -340,7 +340,7 @@ if $ARGS[0] = 'virgin_take6':
 	'With her technique, it''s only a few minutes before-'
 	*nl
 	'"Albina!" you gasp. "I''m-! I''m gonna-!"'
-	act 'Cum!':
+	act 'Come!':
 		$orgasm_or = 'yes'
 		gs'arousal', 'vaginal_strap', 1, 'no_orgasm_msg', 'lesbian'
 		gs 'stat'
@@ -367,7 +367,7 @@ if $ARGS[0] = 'virgin_take_after1':
 			'"Was it... Was it good?" she asks, suddenly strangely shy.'
 			gs 'albina_sex_scenes', 'virgin_take_after2'
 		end
-		
+
 		act '"That was incredible"':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/strapon/miss/after1.jpg"></center>'
@@ -398,7 +398,7 @@ if $ARGS[0] = 'virgin_take_after2':
 		'"We should probably do something else now..." she says with surprising shyness as you smile back at her.'
 		act 'Finish': gt 'albinahome', 'bedroom'
 	end
-	
+
 	act 'Kiss her':
 		gs 'arousal', 'kiss', 1, 'no_orgasm_msg', 'lesbian'
 		gs 'stat'
@@ -466,7 +466,7 @@ if $ARGS[0] = 'virgin_albina_pillow_talk_menu':
 			'"So you''re officially the one who popped my cherry," you murmur as you nuzzle into her neck. Your eyes flick to the strapon that still has the blood of your virginity running down its shaft. "When boys ask me if I''m a virgin, should I tell them you''re the one who took it?"'
 		end
 	end
-	
+
 	act 'You''re really good at fucking':
 		*clr & cla
 		!! IMAGE HERE
@@ -483,7 +483,7 @@ if $ARGS[0] = 'virgin_albina_pillow_talk_menu':
 			'She bites her lip and remains silent, unable to come up with a suitable counterargument.'
 		end
 	end
-	
+
 	act 'Do real cocks feel different?':
 		*clr & cla
 		!! IMAGE HERE
@@ -505,7 +505,7 @@ if $ARGS[0] = 'virgin_albina_pillow_talk_menu':
 			'You wink at her and she can''t help but give a shy laugh.'
 		end
 	end
-	
+
 	act '"Why are you crying?"':
 		*clr & cla
 		!! IMAGE HERE
@@ -534,7 +534,7 @@ if $ARGS[0] = 'wear_strapon':
 	'Before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me, <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
 	'She pushes you down onto the bed and lays across your lap before looking up at you. "Don''t make me beg, <<$pcs_nickname>>."'
 	'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out, and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
-	'You continue spanking her as hard as you can until the stinging in your hand becomes too much, and you have to stop. "That was fucking amazing, <<$pcs_nickname>>! I''m so fucking wet after that!" True to her word, you can feel her juices trickling down your leg. "I need you to fuck me just as hard now. Pound me until I cum!" She climbs off of you, and you stand to adjust the harness around your hips.' 
+	'You continue spanking her as hard as you can until the stinging in your hand becomes too much, and you have to stop. "That was fucking amazing, <<$pcs_nickname>>! I''m so fucking wet after that!" True to her word, you can feel her juices trickling down your leg. "I need you to fuck me just as hard now. Pound me until I cum!" She climbs off of you, and you stand to adjust the harness around your hips.'
 	gs 'arousal', 'BDSM_give', 8, 'dom', 'lesbian'
 	gs 'stat'
 
@@ -544,11 +544,11 @@ if $ARGS[0] = 'wear_strapon':
 		'"Do you mind if we use my dildo instead?" you ask, and seeing the curious look in her eye, you continue. "My dildo has fake cum and I think it would be fun to use it."'
 		'"Fake cum?" she replies curiously. "Okay, that does sound fun. Just don''t cum in my pussy. I don''t like that."'
 		'You nod as you grab your own strapon out of your purse, pleased that she bought it.'
-		*nl 
+		*nl
 		'You slide the harness on and tighten it in place, but before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me, <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
 		'She pushes you down onto the bed and lays across your lap before looking up at you. "Don''t make me beg, <<$pcs_nickname>>."'
 		'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out, and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
-		'You continue spanking her as hard as you can until the stinging in your hand becomes too much and you have to stop. She smiles up at you in satisfaction and you feel her juices trickling down your leg as she climbs off you. You stand to adjust the harness around your hips.' 
+		'You continue spanking her as hard as you can until the stinging in your hand becomes too much and you have to stop. She smiles up at you in satisfaction and you feel her juices trickling down your leg as she climbs off you. You stand to adjust the harness around your hips.'
 		gs 'arousal', 'BDSM_give', 8, 'dom', 'lesbian'
 		gs 'stat'
 		if penisEnvyVariable = 0:
@@ -574,7 +574,7 @@ if $ARGS[0] = 'wear_strapon':
 		'You slide the harness on and tighten it in place, but before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me, <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
 		'She pushes you down onto the bed and lays across your lap before looking up at you. "Don''t make me beg, <<$pcs_nickname>>."'
 		'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out, and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
-		'You continue spanking her as hard as you can until the stinging in your hand becomes too much and you have to stop. She smiles up at you in satisfaction and you feel her juices trickling down your leg as she climbs off you. You stand to adjust the harness around your hips.' 
+		'You continue spanking her as hard as you can until the stinging in your hand becomes too much and you have to stop. She smiles up at you in satisfaction and you feel her juices trickling down your leg as she climbs off you. You stand to adjust the harness around your hips.'
 		gs 'arousal', 'BDSM_give', 8, 'dom', 'lesbian'
 		gs 'stat'
 		act 'Fuck her with the strapon': gt 'albina_sex_scenes', 'fuck_albina'
@@ -592,7 +592,7 @@ if $ARGS[0] = 'fuck_albina':
 	'She laughs before she takes the dildo in her mouth and starts sucking while stroking the shaft with one hand. You spend several minutes making her suck on the dildo, getting it wet with her drool.'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Fuck her pussy':
 		*clr & cla
 		gs 'boyStat', 'D3'
@@ -602,13 +602,13 @@ if $ARGS[0] = 'fuck_albina':
 		'She straddles you and lowers herself down until the dildo easily slides inside her wet pussy, causing her to moan in pleasure. She starts riding you slowly but gradually picks up speed, moaning louder as she does.'
 		gs 'arousal', 'vaginal_strap_give', 8, 'lesbian'
 		gs 'stat'
-		
+
 		act 'Fuck her faster':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
 			'You slap her on the ass. "Come on, Albina! Ride it like you mean it!"'
 			'With your encouragement, she starts really riding you hard and fast, her ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes before she slides off the dildo, which glistens with her juices, and collapses on the bed next to you. She looks at you with an appreciative smile before she leans over and whispers in your ear.'
-			'"I want you to fuck my ass now..."' 
+			'"I want you to fuck my ass now..."'
 			'You grin as she giggles and gets on all fours to wiggle her bubble butt at you.'
 			gs 'arousal', 'vaginal_strap_give', 7, 'lesbian'
 			gs 'stat'
@@ -629,7 +629,7 @@ if $ARGS[0] = 'fuck_albina_magic':
 	'You gasp when you feel her soft lips wrap around your dick and she starts sucking. She has some serious skill and you find yourself moaning softly, especially when she swirls her tongue around the head of your dick.'
 	gs 'arousal', 'magicd_bj', 5
 	gs 'stat'
-	
+
 	act 'Fuck her pussy':
 		*clr & cla
 		gs 'stat'
@@ -639,7 +639,7 @@ if $ARGS[0] = 'fuck_albina_magic':
 		'She starts riding you slowly, but gradually picks up speed, moaning louder as she does. Soft moans escape your lips when the sensation overwhelms you, but Albina is too busy riding you to notice. Her pussy is <i>tight</i>, likely from all the working out she does, and fucking her is one of the best feelings you''ve ever experienced.'
 		gs 'arousal', 'magicd_vaginal', 8, 'dom'
 		gs 'stat'
-		
+
 		act 'Fuck her faster':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
@@ -647,7 +647,7 @@ if $ARGS[0] = 'fuck_albina_magic':
 			'With your encouragement, she starts really riding you hard and fast, her ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes before you feel a tingling sensation in your stomach and feel a pressure building within your dick. You''re about to cum!'
 			gs 'arousal', 'magicd_vaginal', 8, 'dom'
 			gs 'stat'
-			
+
 			act 'Pull out':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/smile_red1.jpg"></center>'
@@ -667,7 +667,7 @@ if $ARGS[0] = 'fuck_albina_magic':
 				gs 'stat'
 				act 'Finish': gt 'albinahome', 'bedroom'
 			end
-			
+
 			act 'Cum inside her':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after2.jpg"></center>'
@@ -699,11 +699,11 @@ if $ARGS[0] = 'fuck_albina_ass':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
 	'You grab the bottle of lube and squirt some onto the dildo. You rub it up and down the shaft until it is very slick before spreading her ass cheeks and applying a generous amount onto her asshole. You grab her ass in your hand and appreciate how firm it feels in your grip.'
-	'"Like what you see?" she giggles. You kneel down behind her, line the head of the dildo up with her asshole and slowly push forward. There is little resistance, and the large dildo slides into her ass easily, causing her to moan as you go deeper and faster. You look down and admit that her ass is fantastic, the dildo enveloping her huge, firm cheeks as you thrust in and out of her back door.' 
+	'"Like what you see?" she giggles. You kneel down behind her, line the head of the dildo up with her asshole and slowly push forward. There is little resistance, and the large dildo slides into her ass easily, causing her to moan as you go deeper and faster. You look down and admit that her ass is fantastic, the dildo enveloping her huge, firm cheeks as you thrust in and out of her back door.'
 	'You wonder what the guys in your class would do to be in your position as you continue fucking her ass. Finally, after a few minutes, you pull out of her, and she looks back over her shoulder at you.'
 	gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 	gs 'stat'
-	
+
 	act 'Keep fucking her ass':
 		*clr & cla
 		gs 'stat'
@@ -728,7 +728,7 @@ if $ARGS[0] = 'fuck_albina_ass_magic':
 	'You wonder what the guys in your class would do to be in your position as you start fucking her ass, feeling her asshole gradually loosening up as you fuck her faster and deeper. The sensation is extremely pleasurable and you force yourself to pull out of her before you blow your load.'
 	gs 'arousal', 'magicd_anal', 8
 	gs 'stat'
-	
+
 	act 'Keep fucking her ass':
 		*clr & cla
 		gs 'stat'
@@ -740,7 +740,7 @@ if $ARGS[0] = 'fuck_albina_ass_magic':
 		'"Do it!" she cries out. "Cum in my tight little ass!"'
 		gs 'arousal', 'magicd_anal', 8, 'dom'
 		gs 'stat'
-		
+
 		act 'Cum in her ass':
 			*clr & cla
 			'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/doggy_drip1.mp4"></video></center>'
@@ -775,7 +775,7 @@ if $ARGS[0] = 'receive_strapon':
 		*nl
 		'You follow her instructions and slowly run your hand up and down the dildo. "That''s it, <<$pcs_nickname>>. Just keep doing that. If you feel like it, you can also lick the shaft or suck on their balls while jerking them off. They like it when you tease them like that."'
 		'After a few minutes, Albina moves on with her lesson. "Okay <<$pcs_nickname>>, you ready?" she asks and you nod your head. "Okay. Start off with a little teasing. Run your tongue around the tip while jerking them off."'
-		'You do as she says and she makes you look up at her. "Eye contact, <<$pcs_nickname>>. They like that." You nod at her and look her in the eye as you continue jerking off her fake cock. "Good. Now some guys like taking control, but only let them do that if it''s what you want. That''s enough teasing anyway. Now I want you take as much of the shaft into your mouth as you can."' 
+		'You do as she says and she makes you look up at her. "Eye contact, <<$pcs_nickname>>. They like that." You nod at her and look her in the eye as you continue jerking off her fake cock. "Good. Now some guys like taking control, but only let them do that if it''s what you want. That''s enough teasing anyway. Now I want you take as much of the shaft into your mouth as you can."'
 		*nl
 		'You obdiently take as much of the dildo into your mouth as you can without choking. "Good," Albina says. "Now start bobbing your head up and down; imagine that you''re sucking on a popsicle while swirling your tongue around the head. And keep using your hand."'
 		'You spend the next few minutes practicing on the dildo until your arm and jaw start to ache and you stop. You pop the dildo out of your mouth and look up at Albina, who smiles. "You''re a natural, <<$pcs_nickname>>! If I had a dick, then my cum would be all over your face by now."'
@@ -813,8 +813,8 @@ if $ARGS[0] = 'albina_fucks_you':
 				gs 'boyStat', 'D3'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
-				'You give her an awkward smile in return. "I... I want you to... take me. My... virginity that is..." you tell her as your cheeks burn bright red.' 
-				'She smiles back. "Okay, don''t worry. I''ll be gentle since it''s your first time. Just lie on your back and spread your legs." You do as she commands, and she climbs onto the bed and scoots between your legs. She rubs your pussy with her fingers to make sure it''s wet enough but adds some lube to the dildo anyway. You feel it rubbing against your slit before she slowly slides it into your virgin pussy.' 
+				'You give her an awkward smile in return. "I... I want you to... take me. My... virginity that is..." you tell her as your cheeks burn bright red.'
+				'She smiles back. "Okay, don''t worry. I''ll be gentle since it''s your first time. Just lie on your back and spread your legs." You do as she commands, and she climbs onto the bed and scoots between your legs. She rubs your pussy with her fingers to make sure it''s wet enough but adds some lube to the dildo anyway. You feel it rubbing against your slit before she slowly slides it into your virgin pussy.'
 				'It''s both painful and pleasurable, and you moan softly as she starts to fuck you. After a few minutes, it starts to hurt less, and you find yourself moaning louder.'
 				*nl
 				'After a few more minutes, Albina starts growing tired and pulls out, leaving you empty. "So how was that for your first time?" she asks with a smile.'
@@ -871,7 +871,7 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 				act 'No': gt 'albina_sex_scenes', 'anal_refuse'
 			end
 		end
-		if stat['anal_fist'] = 1 or stat['self_fisting_anal'] = 1: 
+		if stat['anal_fist'] = 1 or stat['self_fisting_anal'] = 1:
 			!!The player character has had a fist (her own or another persons) in her ass
 			act 'Only a fist':
 				*clr & cla
@@ -906,7 +906,7 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 				act 'No': gt 'albina_sex_scenes', 'anal_refuse'
 			end
 		end
-	else	
+	else
 		act 'Get your ass fucked':
 			*clr & cla
 			menu_off = 1
@@ -921,7 +921,7 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 			act 'Get your ass hammered':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
-				'Once you''re comfortable with her in your ass, she stands up over you. "Get ready because now I''m really going to fuck your ass!" she laughs before slamming the dildo in and out of your ass, causing you to grip the sheets tightly. Despite this, she isn''t too rough, and you start enjoying the pleasurable sensation. Albina seemingly grows more aroused the more she fucks you.' 
+				'Once you''re comfortable with her in your ass, she stands up over you. "Get ready because now I''m really going to fuck your ass!" she laughs before slamming the dildo in and out of your ass, causing you to grip the sheets tightly. Despite this, she isn''t too rough, and you start enjoying the pleasurable sensation. Albina seemingly grows more aroused the more she fucks you.'
 				'Just as it''s starting to hurt, she lets out a loud, pleasured scream as you feel her juices spraying across your legs. You then feel the dildo slide out of you and turn to see Albina sprawled out on the bed in orgasmic bliss, her juices slowly trickling out of her soaking wet pussy as a huge wet patch soaks into the sheets. "You were such a good little buttslut, <<$pcs_nickname>>..." she says softly.'
 				'After riding through her orgasm, she pulls the harness off and tosses it aside.'
 				gs 'arousal', 'anal_strap', 10, 'lesbian'
@@ -950,7 +950,7 @@ if $ARGS[0] = 'first_anal':
 	act 'Get your ass fucked':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-		'Your heart races as you feel Albina moving in behind you. You instinctively tense up when you feel the head of the dildo pressing against your asshole. "Okay, <<$pcs_nickname>>, this is going to feel strange and definitely hurt a little, but you''re going to have to try and relax as best as you can for me," Albina tells you. You grip the sheets tightly as you do what she says.' 
+		'Your heart races as you feel Albina moving in behind you. You instinctively tense up when you feel the head of the dildo pressing against your asshole. "Okay, <<$pcs_nickname>>, this is going to feel strange and definitely hurt a little, but you''re going to have to try and relax as best as you can for me," Albina tells you. You grip the sheets tightly as you do what she says.'
 		'You feel her start slowly pushing, and the pressure builds until the tip of the dildo suddenly pops into your ass, causing you to groan and grit your teeth while gripping the sheets even tighter. It''s a painful sensation, and you instinctively feel the urge to free yourself. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks as you feel a stinging pain shooting through you.'
 		'Remembering what she said, you fight the urge to pull away and try to relax. "No, I just need a second," you reply as you look back at her, and she nods.'
 		*nl
@@ -1163,12 +1163,12 @@ if $ARGS[0] = 'albina_shower':
 				*clr & cla
 				'<center><video autoplay loop src="images/shared/sex/lesbian/shower_finger1.mp4"></video></center>'
 				'You smile and move your hand back down between her legs. Being rather flexible, Albina lifts her leg straight up and places her foot against the shower wall, giving you better access to her pussy, which is dripping wet in anticipation. You slide two fingers inside her and start finger fucking her pussy as your thumb massages her clit. She moans loudly in pleasure as she leans against you to steady herself.'
-				'A few minutes of this is enough to bring her to the edge and she starts moaning even louder. "Don''t you dare stop <<$pcs_nickname>>, I''m about to cum!" You finger her even faster and she lets out a pleasured shriek as her pussy starts squirting her juices over your arm. She steadies herself against you as she rides through the pleasure of her orgasm. You pull your fingers out of her and shove them in her mouth. She sucks on them before smiling at you.' 
+				'A few minutes of this is enough to bring her to the edge and she starts moaning even louder. "Don''t you dare stop <<$pcs_nickname>>, I''m about to cum!" You finger her even faster and she lets out a pleasured shriek as her pussy starts squirting her juices over your arm. She steadies herself against you as she rides through the pleasure of her orgasm. You pull your fingers out of her and shove them in her mouth. She sucks on them before smiling at you.'
 				'"Ohhh <<$pcs_nickname>>, that... That was amazing! Just let me finish up in here and I''ll be out."'
 				'You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
 				*nl
 				'As you dry off, you hear the water turn off and a naked Albina casually strolls into the room.'
-				'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"' 
+				'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"'
 				gs 'arousal', 'vaginal_finger_give', 5, 'lesbian'
 				gs 'stat'
 
@@ -1181,20 +1181,20 @@ if $ARGS[0] = 'albina_shower':
 					'You nod and step out of the shower, grabbing one of the nearby towels and wrapping yourself in it before walking back into her bedroom.'
 					*nl
 					'As you dry off, you hear the water turn off and a naked Albina casually strolls into the room.'
-					'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"' 
+					'"You were amazing in there and I want to return the favour." She walks over and pushes you down onto her bed. "I''m going to eat your ass until you cum. And I won''t take no for an answer!"'
 					gs 'arousal', 'rimming_give', 5, 'lesbian'
 					gs 'stat'
-					
+
 					act 'Get your ass eaten':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/bathroom/7.jpg"></center>'
-						'You get on all fours as Albina climbs in behind you and spreads your ass, giving her access to your awaiting asshole. You gasp when she eagerly plunges her face between your cheeks and starts greedily licking and rimming your backdoor before pushing her tongue inside and tongue fucking your ass while expertly teasing your clit with her fingers.' 
+						'You get on all fours as Albina climbs in behind you and spreads your ass, giving her access to your awaiting asshole. You gasp when she eagerly plunges her face between your cheeks and starts greedily licking and rimming your backdoor before pushing her tongue inside and tongue fucking your ass while expertly teasing your clit with her fingers.'
 						'You moan loudly in pleasure as you feel your orgasm building within you and Albina, apparently sensing this, grabs your hips and starts eating your ass with even more lustful desire.'
 						'"Don''t stop, I''m gonna cum!" you cry out as Albina goes even faster, rimming your asshole with reckless abandon before suddenly pinching your engorged clit, causing a powerful orgasm to wash over you. Once it passes, you flop out on the bed as Albina smiles at you in satisfaction. Once you recover, you both get dressed.'
 						gs 'arousal', 'rimming', 5, 'lesbian'
 						gs 'arousal', 'vaginal_finger', -5, 'lesbian'
 						gs 'stat'
-						
+
 						act 'Finish':
 							CLOSE ALL
 							gs 'arousal','end'
@@ -1224,18 +1224,22 @@ end
 
 
 if $ARGS[0] = 'lazar_start':
-	iif(rand(1,2) = 1, $albinaQW['lazar_cum'] = 'anal_creampie', $albinaQW['lazar_cum'] = 'facial')
+	if rand(1,2) = 1:
+		$albinaQW['lazar_cum'] = 'anal_creampie'
+	else
+		$albinaQW['lazar_cum'] = 'facial'
+	end
 	menu_off = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/maid.jpg"></center>'
 	'You enter Albina''s house and the maid politely greets you.'
 	if AlbinaQW['Lazar_Sex'] = 0:
-		'"Miss <<$pcs_firstname>>, how nice to see you. Miss Albina already has a guest, shall I tell them of your arrival?"' 
+		'"Miss <<$pcs_firstname>>, how nice to see you. Miss Albina already has a guest, shall I tell them of your arrival?"'
 		'You shake your head, knowing what Albina and her "guest" are doing upstairs. "No, it''s fine. She should be expecting me, so I''ll head up to her room if that''s okay?"'
 		'The maid just nods and continues with her duties, leaving you to head up the stairs, curious to know what "other friend" this could be as you reach the door...'
 		act 'Open the door': gt 'albina_sex_scenes', 'lazar_door_first'
 	else
-		'"Miss <<$pcs_firstname>>, how nice to see you. Miss Albina already has a guest, shall I tell them of your arrival?"' 
+		'"Miss <<$pcs_firstname>>, how nice to see you. Miss Albina already has a guest, shall I tell them of your arrival?"'
 		'From her smile, you can guess that this "guest" is Lazar again and the maid knows exactly what they''re doing.'
 		'"No, it''s fine. She should be expecting me, so I''ll head up to her room if that''s okay?"'
 		'The maid just nods and continues with her duties, leaving you to head up the stairs if you so choose.'
@@ -1293,14 +1297,13 @@ if $ARGS[0] = 'lazar_peek1':
 end
 
 if $ARGS[0] = 'lazar_peek2':
-	
 	act 'Keep watching':
 		*clr & cla
 		'<center><video autoplay loop src="images/shared/sex/vag/doggy/spit1.mp4"></video></center>'
 		'Lazar pulls out of her and forcibly flips her up onto her knees. From this angle, you can see Albina is soaking wet, but that doesn''t stop him spreading her lips and spitting directly into her pussy. Her whole body twitches in one violent flinch and you hear a muffled moan as he fingers her.'
 		'"You like it dirty, don''t you, you little whore?"'
 		'"Put it back in!" she begs. "Shove your cock in my pussy! Fuck me with your huge dick!"'
-		
+
 		act 'Continue':
 			*clr & cla
 			'<center><video autoplay loop src="images/shared/sex/vag/doggy/kotovsex10.mp4"></video></center>'
@@ -1350,7 +1353,7 @@ end
 if $ARGS[0] = 'lazar_peek_end':
 	*nl
 	'You stare at Albina''s cum-stained form for a few seconds before suddenly realizing that Lazar has almost finished dressing and is heading towards the door.'
-	
+
 	act 'Wait outside the door':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
@@ -1360,13 +1363,13 @@ if $ARGS[0] = 'lazar_peek_end':
 		'"If you''re here to assfuck her brains out, then sure," he grins back. "But I gotta get going. Gotta hit the gym." He flexes his arm with a confident smirk as he passes you and heads downstairs. "See you around."'
 		gs 'albina_sex_scenes', 'lazar_after'
 	end
-	
+
 !!	act 'Panic!':
 		!!*clr & cla
 		!!'<center><img <<$set_imgh>> src="images/.jpg"></center>'
-		
+
 !!	end
-	
+
 	act 'Run back down the stairs!':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/hallway.jpg"></center>'
@@ -1396,7 +1399,7 @@ if $ARGS[0] = 'lazar_after':
 		if $albinaQW['lazar_cum'] = 'anal_creampie':
 			'You open the door to see a completely nude Albina sitting up on her rumpled bed, hair ruffled and wild, her thighs wet with pussy juice and cum that you can see is still dripping from her asshole.'
 		elseif $albinaQW['lazar_cum'] = 'facial':
-			'You open the door to see a completely nude Albina sitting up on her rumpled bed, her thighs wet with pussy juice and her hair ruffled and stuck to the cum smeared across her face.'
+			'You open the door to see a completely nude Albina sitting up on her rumpled bed, her thighs wet with pussy juice and her wild cum-smeared hair plastered across her face.'
 		end
 		*nl
 		'"Hey <<$pcs_nickname>>," she smiles tiredly at you. "Sorry about the mess. Lazar just finished fucking my brains out."'
@@ -1416,16 +1419,16 @@ end
 if $ARGS[0] = 'lazar_peek':
 	menu_off = 1
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz1.jpg"></center>'				
-	'You glance around to make sure nobody is nearby, then crack the door open slightly to peek in. You can see Albina in her underwear, squatting in front of Lazar. She pulls his jeans down and his impressively sized and rock hard dick springs free.' 
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz1.jpg"></center>'
+	'You glance around to make sure nobody is nearby, then crack the door open slightly to peek in. You can see Albina in her underwear, squatting in front of Lazar. She pulls his jeans down and his impressively sized and rock hard dick springs free.'
 	'She starts licking and jerking it before she takes it into her mouth and starts bobbing her head up and down his shaft as she sucks his dick. After a few seconds of this, she gags as she takes it further into her mouth and down her throat, deepthroating him as far as she can before pulling her head back up and coughing. Lazar barely lets her breath before he shoves his dick back into her mouth, moaning in pleasure as he holds her down as long as possible.'
 	gs 'arousal', 'voyeur', 5
 	gs 'stat'
 	act 'Keep watching':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz2.jpg"></center>'
-		'You keep watching as she pulls his dick out of her mouth with a loud slurp, ropes of her saliva covering his shaft as she gasps for air.' 
-		'She grins up at him before standing and wiggling out of her thong. She then climbs onto the bed and gets on her back before leaning her head over the edge. You push the door open just a little more so you can see all the action.' 
+		'You keep watching as she pulls his dick out of her mouth with a loud slurp, ropes of her saliva covering his shaft as she gasps for air.'
+		'She grins up at him before standing and wiggling out of her thong. She then climbs onto the bed and gets on her back before leaning her head over the edge. You push the door open just a little more so you can see all the action.'
 		'Albina smiles and beckons Lazar over before opening her mouth wide. Lazar steps in and shoves his cock down her throat, causing her to gag before he starts face fucking her. He''s somewhat rough, yet Albina seems to be enjoying it. Despite gagging and choking, she vigorously rubs her clit and fingers herself as he slams his cock in and out of her throat.'
 		*nl
 		'Drool dribbles out of her mouth and runs down her face, getting in her hair as he continues face fucking her. He only stops when it looks like Albina is about to pass out. He pulls out and she splutters a large amount of drool down her face as she gasps for air before sucking on her soaked fingers.'
@@ -1434,23 +1437,23 @@ if $ARGS[0] = 'lazar_peek':
 		act 'Keep watching':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz3.jpg"></center>'
-			'You catch a glimpse of an aroused grin on Albina''s face as she wipes her face and slowly jerks his drool coated cock in her hands. "Enough foreplay. I want you to fuck the shit out of me."' 
-			'He climbs on the bed and gets on his back as Albina crawls over to him. She straddles him and guides his cock into her slit before sliding down onto it, moaning as it stretches her pussy.' 
+			'You catch a glimpse of an aroused grin on Albina''s face as she wipes her face and slowly jerks his drool coated cock in her hands. "Enough foreplay. I want you to fuck the shit out of me."'
+			'He climbs on the bed and gets on his back as Albina crawls over to him. She straddles him and guides his cock into her slit before sliding down onto it, moaning as it stretches her pussy.'
 			'"Fuck, I love it when you rearrange my guts like this!" she grunts and starts riding him hard, her bubble butt loudly slapping against his thighs as she lets his hands roam all over her curvy body.'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 			act 'Keep watching':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz4.jpg"></center>'
-				'After a few minutes Lazar grabs her by the hips and lifts her off his cock before dropping her on the bed. She spreads her legs and he climbs on top of her and starts fucking her missionary style, causing her to moan loudly as she wraps her legs tightly around his back. He starts fucking her harder as a result and she wraps her arms around his neck, pulling him down and making out with him as he keeps thrusting in and out of her ever wetter hole.' 
+				'After a few minutes Lazar grabs her by the hips and lifts her off his cock before dropping her on the bed. She spreads her legs and he climbs on top of her and starts fucking her missionary style, causing her to moan loudly as she wraps her legs tightly around his back. He starts fucking her harder as a result and she wraps her arms around his neck, pulling him down and making out with him as he keeps thrusting in and out of her ever wetter hole.'
 				'After a few minutes, he climbs off her and flops down on his back as Albina brushes her hair back and sucks his dick for a few seconds before popping it out of her mouth. "Mmhhm, I love tasting my pussy on your dick, but it''s time to give my other hole a turn now..." Lazar grins as she leans over and opens her nightstand, pulling out a bottle of lube and popping the cap on it.'
 				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Keep watching':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz5.jpg"></center>'			
-					'You keep watching as she sits up on her knees and squirts a plentiful amount of its contents onto her fingers and starts rubbing it into her asshole. When she feels she''s ready, she throws the bottle aside and Lazar squeezes her ass as she climbs back on top of him.' 
-					'She moans softly in pleasure as his dick slowly penetrates her ass. Once it''s inside, she slowly starts riding him, gradually taking him deeper with each thrust as they both grunt and moan in pleasure. This continues for a few minutes until his dick suddenly slides out of her ass.' 
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz5.jpg"></center>'
+					'You keep watching as she sits up on her knees and squirts a plentiful amount of its contents onto her fingers and starts rubbing it into her asshole. When she feels she''s ready, she throws the bottle aside and Lazar squeezes her ass as she climbs back on top of him.'
+					'She moans softly in pleasure as his dick slowly penetrates her ass. Once it''s inside, she slowly starts riding him, gradually taking him deeper with each thrust as they both grunt and moan in pleasure. This continues for a few minutes until his dick suddenly slides out of her ass.'
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 					act 'Keep watching':
@@ -1470,7 +1473,7 @@ if $ARGS[0] = 'lazar_peek':
 								'Albina gets back on all fours. "Just don''t cum inside me, okay?"'
 								'Lazar pushes her down on her stomach and mounts her before he shoves his cock in her pussy and starts pounding her.'
 								'After a few seconds, Albina looks back at him when he starts panting. "Pull out! PULL OUT!"'
-								'He keeps thrusting until the last second when he pulls out and starts cumming over her lower back, collapsing on the bed when he''s finished.' 
+								'He keeps thrusting until the last second when he pulls out and starts cumming over her lower back, collapsing on the bed when he''s finished.'
 								gs 'arousal', 'voyeur_sex', 5
 								gs 'stat'
 								act 'Finished':
@@ -1555,13 +1558,13 @@ if $ARGS[0] = 'join':
 	act 'Suck his cock':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some1.jpg"></center>'
-		'You strip naked as Albina sucks Lazar''s dick. Once you come over to join them, she pops his dick out of her mouth and offers it to you. You take it into your mouth and start sucking it while she licks and sucks his balls.' 
+		'You strip naked as Albina sucks Lazar''s dick. Once you come over to join them, she pops his dick out of her mouth and offers it to you. You take it into your mouth and start sucking it while she licks and sucks his balls.'
 		'You swap his cock back and forth between each other before she stops and pushes you onto the bed. She bends over and buries her head into your crotch as Lazar moves in behind her and slides his dick back into her pussy. He starts fucking her as she licks and sucks on your clit, her moans and tongue piercing adding to your pleasure.'
 		gs 'arousal', 'bj', 5, 'group'
 		gs 'stat'
 		act 'Get eaten out':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some2.jpg"></center>'	
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some2.jpg"></center>'
 			'She licks and sucks on your clit for a while before you reach down, grab the back of her head and pull her face tighter against you. You''re soaking wet, and her tongue easily slides inside your pussy. You start to rock and ride against her face, smearing it with your wetness, but just as you''re about to cum, she is pulled away by Lazar, who moves in between your legs and grinds the tip of his dick between your labia.'
 			gs 'arousal', 'cuni', 5, 'group'
 			gs 'stat'
@@ -1569,20 +1572,20 @@ if $ARGS[0] = 'join':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some3.jpg"></center>'
 				vaginal_slip = 8
-				'Albina climbs onto the bed as you spread your legs and Lazar slowly penetrates your pussy and starts fucking you. Albina watches him fuck you for a few minutes before she straddles you and sits on your face, her soaking wet pussy dripping into your mouth. You start licking and sucking her pussy and clit and occassionaly tongue fuck her while she plays with your breasts, kneading them in her hands and squeezing your nipples. She soon starts rocking her hips over your face, smearing you with her sticky wetness as Lazar starts fucking you even harder, his balls deep thrusts bottoming out inside you.'  
+				'Albina climbs onto the bed as you spread your legs and Lazar slowly penetrates your pussy and starts fucking you. Albina watches him fuck you for a few minutes before she straddles you and sits on your face, her soaking wet pussy dripping into your mouth. You start licking and sucking her pussy and clit and occassionaly tongue fuck her while she plays with your breasts, kneading them in her hands and squeezing your nipples. She soon starts rocking her hips over your face, smearing you with her sticky wetness as Lazar starts fucking you even harder, his balls deep thrusts bottoming out inside you.'
 				gs 'arousal', 'vaginal', 5, 'group'
 				gs 'stat'
 				act 'Join in sucking his dick':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some1.jpg"></center>'
-					'You don''t know how long he fucks you, but it feels amazing none the less. He eventually pulls out and Albina climbs off of you. You crawl over to the edge of the bed with her and take turns sucking his dick before Albina stops and motions for Lazar to lie back on the bed.' 
-					'As he does, she runs her hand over her asshole and finds that the lube has somewhat dried up, so she grabs the bottle, squirts a plentiful amount onto her fingers and rubs it into her asshole before fingering herself. She then squirts some lube onto Lazar''s dick and strokes it up and down his shaft which, combined with your pussy juices, gets him nice and slick.' 
+					'You don''t know how long he fucks you, but it feels amazing none the less. He eventually pulls out and Albina climbs off of you. You crawl over to the edge of the bed with her and take turns sucking his dick before Albina stops and motions for Lazar to lie back on the bed.'
+					'As he does, she runs her hand over her asshole and finds that the lube has somewhat dried up, so she grabs the bottle, squirts a plentiful amount onto her fingers and rubs it into her asshole before fingering herself. She then squirts some lube onto Lazar''s dick and strokes it up and down his shaft which, combined with your pussy juices, gets him nice and slick.'
 					gs 'arousal', 'bj', 5, 'group'
 					gs 'stat'
 					act 'Watch Albina get fucked':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/laz3some4.jpg"></center>'
-						'All lubed up, she squats above him reverse cowgirl style and guides the tip of his dick to her asshole. She relaxes and slowly slides down, moaning softly as his dick easily penetrates her backdoor. Once he''s inside her, she starts riding him, her ass slapping off his hips as she picks up speed. Lazar then grabs her knees and pulls her legs back before he really starts hammering her ass, causing her eyes to roll back in her head in pleasure.' 
+						'All lubed up, she squats above him reverse cowgirl style and guides the tip of his dick to her asshole. She relaxes and slowly slides down, moaning softly as his dick easily penetrates her backdoor. Once he''s inside her, she starts riding him, her ass slapping off his hips as she picks up speed. Lazar then grabs her knees and pulls her legs back before he really starts hammering her ass, causing her eyes to roll back in her head in pleasure.'
 						'After a few minutes of this, he pulls out of her, leaving her looking a little disappointed. "Okay, your turn <<$pcs_nickname>>," he says as he reaches over and gives your ass a firm squeeze.'
 						gs 'arousal', 'voyeur_sex', 5, 'group'
 						gs 'stat'
@@ -1636,8 +1639,8 @@ if $ARGS[0] = 'join':
 								act 'Climax':
 									*clr & cla
 									'<center><video autoplay loop  src="images/locations/city/redlight/studio_porn/sex/mff4.mp4"></center>'
-									'He starts really going at it before he grunts and moans in pleasure as you feel his warm cum coating your insides. You moan at the sensation as he continues pumping into your back door. When he finishes, he spreads your ass and pulls out. You squeeze and feel a stream of thick cum pour out of your ass and start running down the inside of your leg. Albina, having recovered from her orgasm, suddenly crawls in behind you and runs her tongue up the length of your thigh, licking up the sticky liquid on your leg before she stops underneath your ass and lets the rest of the cum flow into her mouth.' 
-									'When the stream finally stops, you turn around and watch Albina grimace as she swallows before sticking her tongue out and showing you both that she''s gulped down all of the load. Lazar then collapses back on the bed, satisfied, and you and Albina crawl over and join him. You all bask in the afterglow of your threesome.' 
+									'He starts really going at it before he grunts and moans in pleasure as you feel his warm cum coating your insides. You moan at the sensation as he continues pumping into your back door. When he finishes, he spreads your ass and pulls out. You squeeze and feel a stream of thick cum pour out of your ass and start running down the inside of your leg. Albina, having recovered from her orgasm, suddenly crawls in behind you and runs her tongue up the length of your thigh, licking up the sticky liquid on your leg before she stops underneath your ass and lets the rest of the cum flow into her mouth.'
+									'When the stream finally stops, you turn around and watch Albina grimace as she swallows before sticking her tongue out and showing you both that she''s gulped down all of the load. Lazar then collapses back on the bed, satisfied, and you and Albina crawl over and join him. You all bask in the afterglow of your threesome.'
 									gs 'arousal', 'anal', 5, 'group'
 									gs 'cum_call', 'anus', $boy, 1
 									gs 'stat'
@@ -1668,7 +1671,7 @@ if $ARGS[0] = 'keep_using_phone':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/phone.jpg"></center>'
 	'You keep using your phone and end up texting people, scrolling through social media and playing a few games to pass the time. When you finally get bored, you hear what sounds like muffled moaning and a few minutes later hear someone exiting Albina''s bedroom and walking away down the hall. When you''re sure they''re gone, you stand up and leave the bathroom.'
-	act 'Go to her room': gt 'albina_sex_scenes', 'go_to_bedroom'
+	act 'Go to her room': gt 'albina_sex_scenes', 'lazar_after'
 end
 
 if $ARGS[0] = 'watch_porn':
@@ -1684,7 +1687,7 @@ if $ARGS[0] = 'watch_porn':
 		'The idea of rubbing one out crosses your mind, but the risk of being caught is enough to discourage the thought. You keep watching the video and when it ends, you hear the sound of Albina''s door closing and someone walking away down the hall. When you''re sure they''re gone, you stand up and leave the bathroom.'
 		gs 'arousal', 'porn', 5
 		gs 'stat'
-		act 'Go to her room': gt 'albina_sex_scenes', 'go_to_bedroom'
+		act 'Go to her room': gt 'albina_sex_scenes', 'lazar_after'
 	end
 	act 'Rub one out':
 		*clr & cla
@@ -1699,7 +1702,7 @@ if $ARGS[0] = 'watch_porn':
 		gs 'arousal', 'clit_finger', 5, 'masturbate'
 		gs 'stat'
 		'When your orgasm ends, you hear the sound of Albina''s door closing and someone walking away down the hall. When you''re sure they''re gone, you pull your clothes back on and leave the bathroom.'
-		act 'Go to her room': gt 'albina_sex_scenes', 'go_to_bedroom'
+		act 'Go to her room': gt 'albina_sex_scenes', 'lazar_after'
 	end
 end
 
@@ -1714,7 +1717,7 @@ if $ARGS[0] = 'masturbate':
 	gs 'arousal', 'clit_finger', 5, 'masturbate'
 	gs 'stat'
 	'When your orgasm ends, you hear the sound of Albina''s door closing and someone walking away down the hall. When you''re sure they''re gone, you pull your clothes back on and leave the bathroom.'
-	act 'Go to her room': gt 'albina_sex_scenes', 'go_to_bedroom'
+	act 'Go to her room': gt 'albina_sex_scenes', 'lazar_after'
 end
 
 

+ 9 - 1
locations/albina_wine_event.qsrc

@@ -817,7 +817,8 @@ if $ARGS[0] = 'commando_talk':
 end
 
 if $ARGS[0] = 'stripper_talk':
-	'"Do you think I would make a good stripper?" Albina asks.'
+	'"Do you think I''d make a good stripper?" she asks.'
+	
 	act 'Probably':
 		cla & *nl
 		'"Probably?" you mumble back. "You can dance and love shoving your ass in people''s faces. Prime stripper qualities. Why do you ask?"'
@@ -825,6 +826,13 @@ if $ARGS[0] = 'stripper_talk':
 		gs 'albina_wine_event','wine_chat2'
 	end
 	
+	act 'Hell yeah':
+		cla & *nl
+		'"Hell yeah!" you laugh, almost spilling your wine on both yourself and Albina. "You''d make a killing shaking that big fat ass in guy''s faces!"'
+		'Albina silently takes a swig of her wine, but you catch a glimpse of the smug grin on her face as she looks up at you.'
+		gs 'albina_wine_event', 'wine_chat2'
+	end
+	
 	act 'Too bitchy':
 		cla & *nl
 		'"Nah." You wave your hand dismissively. "Too bitchy."'

+ 1 - 1
locations/anushapt.qsrc

@@ -399,7 +399,7 @@ if $ARGS[0] = 'bathroom':
 	'The toilet sits along the far wall. There''s also a bathtub with an old plastic shower curtain hanging from a rod above it. It also seems that the latch on the door is broken.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	gs 'piercing_management', 'set_manage_string'
 	act 'Leave the bathroom': gt 'anushapt', 'hallway'
 	act 'Take a shower':
 		*clr & cla

+ 1 - 1
locations/anushapt_city.qsrc

@@ -420,7 +420,7 @@ if $ARGS[0] = 'bathroom':
 	'The bathroom is fairly clean and larger than most apartment bathrooms you''ve seen. It has white floor tiles with dark green lower wall tiles and lighter green ones above. The one thing you notice right away is the toilet set is up, which is not a surprise with three guys living here.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	gs 'piercing_management', 'set_manage_string'
 	act 'Leave the bathroom': gt 'anushapt_city','hallway'
 	act 'Take a shower':
 		*clr & cla

+ 19 - 7
locations/anushka.qsrc

@@ -310,7 +310,7 @@ if $ARGS[0] = 'wedgie fight':
 						gs 'stat'
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/ffspank4.jpg"></center>'
-						'After a while, Miss Volkov either loses interest or forgets about you. Either way, she stops paying attention to you. Some time later, Anushka gives you a quick grin and leans over, like she wants to say something. When you lean closer to hear, you''re surprised when she kisses you instead. It''s a soft, quick kiss, but you can feel some real passion behind it. A few hours later, Miss Volkov finally speaks to you again. "Alright you two, you can get dressed and go home. I don''t want to see you in here again."'
+						'After a while, Miss Volkov either loses interest or forgets about you. Either way, she stops paying attention to you. Sometime later, Anushka gives you a quick grin and leans over, like she wants to say something. When you lean closer to hear, you''re surprised when she kisses you instead. It''s a soft, quick kiss, but you can feel some real passion behind it. A few hours later, Miss Volkov finally speaks to you again. "Alright you two, you can get dressed and go home. I don''t want to see you in here again."'
 						'You quickly gather up your clothes and get dressed again. As the two of you head out, Anushka turns to you. "Hey <<$pcs_nickname>>, you want to come by my place?"'
 						act 'Can''t':
 							*clr & cla
@@ -717,9 +717,15 @@ if $ARGS[0] = 'chatwhilewaiting':
 					end
 					i = 0
 					:lover_looop
-					if loverGender[i] ! 1: dynamic '	act ''<<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushka'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$lover[i]>>"]'
-					i +=1
-					if i < ARRSIZE('lover'): jump 'lover_looop'
+					if i < arrsize('lover'):
+						$temp_npcid = $lover[i]
+						if npc_gender[$temp_npcid] ! 1:
+							dynamic 'act ''<<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''anushka'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$temp_npcid>>"]'
+						end
+						killvar '$temp_npcid'
+						i += 1
+						jump 'lover_looop'
+					end
 					Killvar 'i'
 				end
 			end
@@ -785,9 +791,15 @@ if $ARGS[0] = 'chatwhilewaiting':
 				if NikoVolkovQW >= 5:	act 'Get married to Niko': gt 'anushka', 'telling_marrige_dreams', 'Niko'
 				i = 0
 				:marrid_looop
-				if loverGender[i] ! 1: dynamic '	act ''Get married to <<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushka'', ''telling_marrige_dreams'', $npc_usedname["<<$lover[i]>>"]'
-				i +=1
-				if i < ARRSIZE('lover'): jump 'marrid_looop'
+				if i < arrsize('lover'):
+					$temp_npcid = $lover[i]
+					if npc_gender[$temp_npcid] ! 1:
+						dynamic 'act ''Get married to <<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''anushka'', ''telling_marrige_dreams'', $npc_usedname["<<$temp_npcid>>"]'
+					end
+					killvar '$temp_npcid'
+					i += 1
+					jump 'marrid_looop'
+				end
 				Killvar 'i'
 			end
 		end

+ 18 - 6
locations/anushkachat.qsrc

@@ -318,9 +318,15 @@ if $ARGS[0] = 'chat':
 			if NikoVolkovQW >= 5:	act 'Get married to Niko': gt 'anushkachat', 'telling_marrige_dreams', 'Niko'
 			i = 0
 			:marrid_looop
-			if loverGender[i] ! 1: dynamic '	act ''Get married to <<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushkachat'', ''telling_marrige_dreams'', $npc_usedname["<<$lover[i]>>"]'
-			i +=1
-			if i < ARRSIZE('lover'): jump 'marrid_looop'
+			if i < arrsize('lover'):
+				$temp_npcid = $lover[i]
+				if npc_gender[$temp_npcid] ! 1:
+					dynamic 'act ''Get married to <<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''anushkachat'', ''telling_marrige_dreams'', $npc_usedname["<<$temp_npcid>>"]'
+				end
+				killvar '$temp_npcid'
+				i += 1
+				jump 'marrid_looop'
+			end
 			killvar 'i'
 		else
 			act 'Get married':
@@ -837,9 +843,15 @@ if $ARGS[0] = 'boyfriend_chat':
 	end
 	i = 0
 	:lover_looop
-	if loverGender[i] ! 1: dynamic '	act ''<<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushkachat'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$lover[i]>>"]'
-	i +=1
-	if i < ARRSIZE('lover'): jump 'lover_looop'
+	if i < arrsize('lover'):
+		$temp_npcid = $lover[i]
+		if npc_gender[$temp_npcid] ! 1:
+			dynamic 'act ''<<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''anushkachat'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$temp_npcid>>"]'
+		end
+		killvar '$temp_npcid'
+		i += 1
+		jump 'lover_looop'
+	end
 	killvar 'i'
 end
 

+ 9 - 3
locations/anushkachat_city.qsrc

@@ -769,9 +769,15 @@ if $ARGS[0] = 'boyfriend_chat':
 	end
 	i = 0
 	:lover_looop
-	if loverGender[i] ! 1: dynamic '	act ''<<$npc_usedname["<<$lover[i]>>"]>>'': gt ''anushkachat_city'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$lover[i]>>"]'
-	i +=1
-	if i < ARRSIZE('lover'): jump 'lover_looop'
+	if i < arrsize('lover'):
+		$temp_npcid = $lover[i]
+		if npc_gender[$temp_npcid] ! 1:
+			dynamic 'act ''<<$npc_usedname["<<$temp_npcid>>"]>>'': gt ''anushkachat_city'', ''tell_about_generic_boyfreind'', $npc_usedname["<<$temp_npcid>>"]'
+		end
+		killvar '$temp_npcid'
+		i += 1
+		jump 'lover_looop'
+	end
 	killvar 'i'
 end
 

+ 92 - 92
locations/anushkaev1.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = 'strapon1':
 													gs 'arousal', 'vaginal_strap', 2, 'lesbian'
 													if temporgasm = orgasm: 'You''re so close, but you just can''t cum. You don''t know why you, but you just can''t. You wither around faking an orgasm before pulling away from her. She gives you a look and you think she knows you faked it, but she doesn''t say anything.'
 													killvar 'temporgasm'
-													gs 'arousal','end'
+													gs 'arousal', 'end'
 													*nl
 													'Finally, sweating and panting, she pulls out of you and collapses against you. You feel the very wet and sticky dildo pressing against your ass cheeks ass she kisses and nibbles your ear as she whispers "I want to fuck your ass next time..."'
 													'You laugh, but don''t respond. The two of you just lie against each other for a few minutes before she finally gets up and starts cleaning up and getting dressed. You get up and do the same.'
@@ -146,7 +146,7 @@ if $ARGS[0] = 'strapon1':
 														gs 'arousal', 'anal_strap', 2, 'lesbian', 'sub', 'rough', 'lube'
 														if temporgasm = orgasm: 'You''re so close, but you just can''t cum. You don''t know why, but you just can''t. You wither around faking an orgasm before pulling away from her. She gives you a look and you think she knows you faked it, but she doesn''t say anything.'
 														killvar 'temporgasm'
-														gs 'arousal','end'
+														gs 'arousal', 'end'
 														gs 'stat'
 														act 'Afterglow':
 															*clr & cla
@@ -177,7 +177,7 @@ if $ARGS[0] = 'strapon1':
 														gs 'arousal', 'anal_strap', 3, 'lesbian', 'sub', 'rough', 'lube'
 														if temporgasm = orgasm: 'You''re so close, but you just can''t cum. You don''t know why, but you just can''t. You wither around faking an orgasm before pulling away from her. She gives you a look and you think she knows you faked it, but she doesn''t say anything.'
 														killvar 'temporgasm'
-														gs 'arousal','end'
+														gs 'arousal', 'end'
 														act 'Afterglow':
 															*clr & cla
 															minut += 3
@@ -288,7 +288,7 @@ if $ARGS[0] = 'strapon1':
 											gs 'arousal', 'anal_strap', 2, 'lesbian', 'sub', 'rough'
 											if temporgasm = orgasm: 'You''re so close, but you just can''t cum. You don''t know why, but you just can''t. You wither around faking an orgasm before pulling away from her. She gives you a look and you think she knows you faked it, but she doesn''t say anything.'
 											killvar 'temporgasm'
-											gs 'arousal','end'
+											gs 'arousal', 'end'
 											gs 'stat'
 											act 'Afterglow':
 												*clr & cla
@@ -319,7 +319,7 @@ if $ARGS[0] = 'strapon1':
 											gs 'arousal', 'anal_strap', 3, 'lesbian', 'sub', 'rough', 'lube'
 											if temporgasm = orgasm: 'You''re so close, but you just can''t cum. You don''t know why, but you just can''t. You wither around faking an orgasm before pulling away from her. She gives you a look and you think she knows you faked it, but she doesn''t say anything.'
 											killvar 'temporgasm'
-											gs 'arousal','end'
+											gs 'arousal', 'end'
 											act 'Afterglow':
 												*clr & cla
 												minut += 3
@@ -443,12 +443,12 @@ if $ARGS[0] = 'strapon1':
 						'Now it''s time to really show her who''s boss and fuck her.'
 						gs 'arousal', 'cuni', 3, 'lesbian', 'dom'
 						gs 'stat'
-						act 'Fuck her pussy': gt 'anushkaev1','domnush_fuckpussy'
-						act 'Fuck her ass': gt 'anushkaev1','domnush_fuckass2'
+						act 'Fuck her pussy': gt 'anushkaev1', 'domnush_fuckpussy'
+						act 'Fuck her ass': gt 'anushkaev1', 'domnush_fuckass2'
 					end
 				end
-				act 'Fuck her pussy': gt 'anushkaev1','domnush_fuckpussy'
-				act 'Fuck her ass': gt 'anushkaev1','domnush_fuckass2'
+				act 'Fuck her pussy': gt 'anushkaev1', 'domnush_fuckpussy'
+				act 'Fuck her ass': gt 'anushkaev1', 'domnush_fuckass2'
 			end
 		end
 	else
@@ -506,7 +506,7 @@ if $ARGS[0] = 'strapon_cowgirl':
 					gs 'arousal', 'cuni', 3, 'lesbian'
 					if temporgasm = orgasm: 'You''re so close, but you just can''t cum. You don''t know why, but you just can''t. You wither around faking an orgasm before pulling away from her. She gives you a look and you think she knows you faked it, but she doesn''t say anything.'
 					killvar 'temporgasm'
-					gs 'arousal','end'
+					gs 'arousal', 'end'
 					*nl
 					'Finally, she crawls up to lie beside you and leans over to give you a kiss, giving you a taste of your pussy. After a brief kiss, the two of you lie side by side for a few minutes before she gets up and starts to get cleaned up and dressed, and you do the same.'
 					gs 'stat'
@@ -548,7 +548,7 @@ if $ARGS[0] = 'strapon_cowgirl':
 						gs 'arousal', 'cuni', 3, 'lesbian', 'dom'
 						if temporgasm = orgasm: 'You''re so close, but you just can''t cum. You don''t know why, but you just can''t. You wither around faking an orgasm before pulling away from her. She gives you a look and you think she knows you faked it, but she doesn''t say anything.'
 						killvar 'temporgasm'
-						gs 'arousal','end'
+						gs 'arousal', 'end'
 						*nl
 						'Finally, she crawls up to lie beside you and leans over to give you a kiss, giving you a taste of your pussy. After a brief kiss, the two of you lie side by side for a few minutes before she gets up and starts to get cleaned up and dressed, and you do the same.'
 						gs 'stat'
@@ -587,7 +587,7 @@ if $ARGS[0] = 'strapon_cowgirl':
 						gs 'arousal', 'anal_strap_give', 3, 'lesbian', 'dom', 'rough'
 						if temporgasm = orgasm: 'You''re so close, yet are unable to cum. You''re starting to get tired, so decide to stop.'
 						killvar 'temporgasm'
-						gs 'arousal','end'
+						gs 'arousal', 'end'
 						'You pull the dildo out of her ass and hear her sigh in relief as you remove the harness before throwing it on the floor. She rolls over onto her back.'
 						gs 'stat'
 						act 'Afterglow':
@@ -625,7 +625,7 @@ if $ARGS[0] = 'strapon_cowgirl':
 								gs 'arousal', 'cuni', 3, 'lesbian'
 								if temporgasm = orgasm: 'You''re so close, but you just can''t cum. You don''t know why, but you just can''t. You wither around faking an orgasm before pulling away from her. She gives you a look and you think she knows you faked it, but she doesn''t say anything.'
 								killvar 'temporgasm'
-								gs 'arousal','end'
+								gs 'arousal', 'end'
 								*nl
 								'Finally, she crawls up to lie beside you and leans over to give you a kiss, giving you a taste of your pussy. After a brief kiss, the two of you lie side by side for a few minutes before she gets up and starts to get cleaned up and dressed, and you do the same.'
 								gs 'stat'
@@ -660,7 +660,7 @@ if $ARGS[0] = 'strapon_cowgirl':
 					gs 'arousal', 'anal_strap_give', 3, 'lesbian', 'dom'
 					if temporgasm = orgasm: 'You''re so close, yet are unable to cum. You''re starting to get tired, so decide to stop.'
 					killvar 'temporgasm'
-					gs 'arousal','end'
+					gs 'arousal', 'end'
 					'You pull the dildo out of her ass and hear her sigh in pleasure as you remove the harness before throwing it on the floor. She rolls over onto her back.'
 					gs 'stat'
 					act 'Afterglow':
@@ -698,7 +698,7 @@ if $ARGS[0] = 'strapon_cowgirl':
 							gs 'arousal', 'cuni', 3, 'lesbian'
 							if temporgasm = orgasm: 'You''re so close, but you just can''t cum. You don''t know why, but you just can''t. You wither around faking an orgasm before pulling away from her. She gives you a look and you think she knows you faked it, but she doesn''t say anything.'
 							killvar 'temporgasm'
-							gs 'arousal','end'
+							gs 'arousal', 'end'
 							*nl
 							'Finally, she crawls up to lie beside you and leans over to give you a kiss, giving you a taste of your pussy. After a brief kiss, the two of you lie side by side for a few minutes before she gets up and starts to get cleaned up and dressed, and you do the same.'
 							gs 'arousal', 'cuni', 3, 'lesbian'
@@ -800,7 +800,7 @@ if $ARGS[0] = 'strapon_cowgirl_magic':
 						*nl
 						'She doesn''t respond, but you can tell she''s getting off despite the pain, just as you feel yourself building up as your balls tighten up, not just the fucking, but being dominate is turning you on. Before too long, she has an intense orgasm that leaves her quivering for several minutes, barely able to breathe. You keep fucking her butt with your cock all the way through her orgasm, her orgasm causes her muscles  to spasm, tightening around your dick until you can''t take it anymore yourself.'
 						gs 'arousal', 'magicd_anal', 3, 'lesbian', 'dom', 'rough'
-						gs 'arousal','end'
+						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Fill her ass':
 							*clr & cla
@@ -931,7 +931,7 @@ if $ARGS[0] = 'domnush_doggy':
 			gs 'arousal', 'vaginal_strap_give', 3, 'lesbian', 'dom', 'rough'
 			if temporgasm = orgasm: 'You''re so close, but just can''t cum. You''re starting to get tired and decide to stop.'
 			killvar 'temporgasm'
-			gs 'arousal','end'
+			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Afterglow':
 				*clr & cla
@@ -943,11 +943,11 @@ if $ARGS[0] = 'domnush_doggy':
 				gs 'stat'
 				act 'Get dressed':gt 'anush_bedroom'+$returnLoc,'anushroom'
 			end
-			act 'Fuck her ass': gt 'anushkaev1','domnush_fuckass1'
+			act 'Fuck her ass': gt 'anushkaev1', 'domnush_fuckass1'
 		end
-		act 'Fuck her ass': gt 'anushkaev1','domnush_fuckass1'
+		act 'Fuck her ass': gt 'anushkaev1', 'domnush_fuckass1'
 	end
-	act 'Fuck her ass': gt 'anushkaev1','domnush_fuckass1'
+	act 'Fuck her ass': gt 'anushkaev1', 'domnush_fuckass1'
 end
 
 if $ARGS[0] = 'domnush_doggy_magic':
@@ -975,7 +975,7 @@ if $ARGS[0] = 'domnush_doggy_magic':
 			'When you finally pull your dick out of her warm wet pussy, you see your cum come running out of her. With how wet she is, you don''t even think she has noticed you pumped her twat full of your cum.'
 			gs 'arousal', 'magicd_vaginal', 3, 'lesbian', 'dom'
 			killvar 'temporgasm'
-			gs 'arousal','end'
+			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Afterglow':
 				*clr & cla
@@ -987,11 +987,11 @@ if $ARGS[0] = 'domnush_doggy_magic':
 				gs 'stat'
 				act 'Get dressed':gt 'anush_bedroom'+$returnLoc,'anushroom'
 			end
-			act 'Fuck her ass': gt 'anushkaev1','domnush_fuckass_magic1'
+			act 'Fuck her ass': gt 'anushkaev1', 'domnush_fuckass_magic1'
 		end
-		act 'Fuck her ass': gt 'anushkaev1','domnush_fuckass_magic1'
+		act 'Fuck her ass': gt 'anushkaev1', 'domnush_fuckass_magic1'
 	end
-	act 'Fuck her ass': gt 'anushkaev1','domnush_fuckass_magic1'
+	act 'Fuck her ass': gt 'anushkaev1', 'domnush_fuckass_magic1'
 end
 
 if $ARGS[0] = 'domnush_fuckass1':
@@ -1023,13 +1023,13 @@ if $ARGS[0] = 'domnush_fuckass1':
 			gs 'arousal', 'anal_strap_give', 3, 'lesbian', 'dom', 'rough'
 			if temporgasm = orgasm: 'You''re so close, but just can''t cum. You''re starting to get tired and decide to stop.'
 			killvar 'temporgasm'
-			gs 'arousal','end'
+			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Pull out': gt 'anushkaev1','domnush_fuckass_afterglow1'
+			act 'Pull out': gt 'anushkaev1', 'domnush_fuckass_afterglow1'
 		end
-		act 'Pull out': gt 'anushkaev1','domnush_fuckass_afterglow1'
+		act 'Pull out': gt 'anushkaev1', 'domnush_fuckass_afterglow1'
 	end
-	act 'Pull out': gt 'anushkaev1','domnush_fuckass_afterglow1'
+	act 'Pull out': gt 'anushkaev1', 'domnush_fuckass_afterglow1'
 end
 
 if $ARGS[0] = 'domnush_fuckass_afterglow1':
@@ -1089,7 +1089,7 @@ if $ARGS[0] = 'domnush_fuckass_magic1':
 				'She gives you a playful shove and giggles. "Okay yeah, I admit it. I love getting fucked in the ass, but I don''t enjoy the sensation of having a gaping asshole."'
 				gs 'arousal', 'magicd_anal', 1, 'lesbian', 'dom', 'rough'
 				killvar 'temporgasm'
-				gs 'arousal','end'
+				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Afterglow':
 					*clr & cla
@@ -1124,22 +1124,22 @@ if $ARGS[0] = 'domnush_fuckass2':
 				*clr & cla
 				gs 'castSpell', 'penisenvy'
 				if spellSuccess > 0:
-					act 'Lube the dildo up': gt 'anushkaev1','domnush_fuckass_lubed_magic'
-					act 'Just lube the tip': gt 'anushkaev1','domnush_fuckass_nolube_magic'
+					act 'Lube the dildo up': gt 'anushkaev1', 'domnush_fuckass_lubed_magic'
+					act 'Just lube the tip': gt 'anushkaev1', 'domnush_fuckass_nolube_magic'
 				else
-					act 'Lube the dildo up': gt 'anushkaev1','domnush_fuckass_lubed'
-					act 'Just lube the tip': gt 'anushkaev1','domnush_fuckass_nolube'
+					act 'Lube the dildo up': gt 'anushkaev1', 'domnush_fuckass_lubed'
+					act 'Just lube the tip': gt 'anushkaev1', 'domnush_fuckass_nolube'
 				end
 			end
 		else
-			act 'Lube the dildo up': gt 'anushkaev1','domnush_fuckass_lubed_magic'
-			act 'Just lube the tip': gt 'anushkaev1','domnush_fuckass_nolube_magic'
+			act 'Lube the dildo up': gt 'anushkaev1', 'domnush_fuckass_lubed_magic'
+			act 'Just lube the tip': gt 'anushkaev1', 'domnush_fuckass_nolube_magic'
 		end
 	else
 		'Having decided to just go straight to fucking her ass, you grab the bottle of lube off her nightstand. You start to squirt a lot of lube onto the fake cock before a mischievous thought crosses your mind. What if you lubed up just the tip, enough to get it in her ass, and then fuck her?'
 		'You look at her ass and then to the lube bottle in your hand. Do you really want to do that to your friend? Would she mind? Maybe she''ll enjoy it? Would you get off on it more?'
-		act 'Lube the dildo up': gt 'anushkaev1','domnush_fuckass_lubed'
-		act 'Just lube the tip': gt 'anushkaev1','domnush_fuckass_nolube'
+		act 'Lube the dildo up': gt 'anushkaev1', 'domnush_fuckass_lubed'
+		act 'Just lube the tip': gt 'anushkaev1', 'domnush_fuckass_nolube'
 	end
 end
 
@@ -1182,14 +1182,14 @@ if $ARGS[0] = 'domnush_fuckass_lubed':
 			gs 'arousal', 'anal_strap_give', 3, 'lesbian', 'dom', 'rough'
 			if temporgasm = orgasm: 'You''re so close, but just can''t cum. You''re starting to get tired, so you decide to stop and give her ass a break.'
 			killvar 'temporgasm'
-			gs 'arousal','end'
+			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Pull out': gt 'anushkaev1','domnush_fuckass_afterglow1'
+			act 'Pull out': gt 'anushkaev1', 'domnush_fuckass_afterglow1'
 		end
 
-		act 'Pull out': gt 'anushkaev1','domnush_fuckass_afterglow1'
+		act 'Pull out': gt 'anushkaev1', 'domnush_fuckass_afterglow1'
 	end
-	act 'Pull out': gt 'anushkaev1','domnush_fuckass_afterglow1'
+	act 'Pull out': gt 'anushkaev1', 'domnush_fuckass_afterglow1'
 end
 
 if $ARGS[0] = 'domnush_fuckass_lubed_magic':
@@ -1235,7 +1235,7 @@ if $ARGS[0] = 'domnush_fuckass_lubed_magic':
 				'She gives you a playful shove and giggles. "Okay yeah, I admit it. I love getting fucked in the ass, but I don''t enjoy the burning sensation, from you fucking it raw."'
 				gs 'arousal', 'magicd_anal', 1, 'lesbian', 'dom', 'rough'
 				killvar 'temporgasm'
-				gs 'arousal','end'
+				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Afterglow':
 					*clr & cla
@@ -1296,13 +1296,13 @@ if $ARGS[0] = 'domnush_fuckass_nolube':
 			gs 'arousal', 'anal_strap_give', 2, 'lesbian', 'dom', 'rough'
 			if temporgasm = orgasm: 'You''re nearly overwhelmed by the wild excitement of fucking Anushka''s asshole. You''re so close, but just can''t cum. You''re starting to get tired and imagine you''ve fucked her asshole raw by now.'
 			killvar 'temporgasm'
-			gs 'arousal','end'
+			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Pull out': gt 'anushkaev1','domnush_fuckass_afterglow2'
+			act 'Pull out': gt 'anushkaev1', 'domnush_fuckass_afterglow2'
 		end
-		act 'Pull out': gt 'anushkaev1','domnush_fuckass_afterglow2'
+		act 'Pull out': gt 'anushkaev1', 'domnush_fuckass_afterglow2'
 	end
-	act 'Pull out': gt 'anushkaev1','domnush_fuckass_afterglow2'
+	act 'Pull out': gt 'anushkaev1', 'domnush_fuckass_afterglow2'
 end
 
 if $ARGS[0] = 'domnush_fuckass_afterglow2':
@@ -1379,7 +1379,7 @@ if $ARGS[0] = 'domnush_fuckass_nolube_magic':
 						'She gives you slightly pained expression. "Fuck you, my ass feels like it is on fire right now."'
 						gs 'arousal', 'magicd_anal', 1, 'lesbian', 'dom', 'rough'
 						killvar 'temporgasm'
-						gs 'arousal','end'
+						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Afterglow':
 							*clr & cla
@@ -1404,7 +1404,7 @@ if $ARGS[0] = 'domnush_fuckass_nolube_magic':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/strapdomnush7.jpg"></center>'
 			'As you keep fucking her ass, you hear her groan and occasionally hiss in pain. You''re not sure if she''s enjoying this at all, but you occasionally hear one of her groans turn into a moan of pleasure. "Oh fuck, oh fuck... Slow down a little... Oh... Please use more lube."'
-			'It seems like she is in more pain than you thought, you grab the bottle of lube and pull your dick out of her ass. She sighs in a relieve as you do, then you squirt some lube into her gapping asshole and squirt some more on the shaft of your dick.'
+			'It seems like she is in more pain than you thought, you grab the bottle of lube and pull your dick out of her ass. She sighs in a relieve as you do, then you squirt some lube into her gaping asshole and squirt some more on the shaft of your dick.'
 			*nl
 			'With her now fully lubed up, you shove your dick back into her asshole, she groans in a pain a bit but also moans in pleasure. Now that her butt is fully lubed you have no problem working your dick balls deep into her ass. You can''t help but smile. Despite all her talk and attitude, there''s a small part of her that just loves being dominated and fucked like a slut.'
 			'"Oh... fuck <<$pcs_nickname>>, that feels so much better... oh... yes..." She starts to relax and really get into it now.'
@@ -1431,7 +1431,7 @@ if $ARGS[0] = 'domnush_fuckass_nolube_magic':
 					'She gives you a slightly dirty look, you can tell she is mostly playing... mostly. "Yeah finally, after you almost caught me ass on fire from the friction." You laugh at her over dramatic description of events.'
 					gs 'arousal', 'magicd_anal', 1, 'lesbian', 'dom', 'rough'
 					killvar 'temporgasm'
-					gs 'arousal','end'
+					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Afterglow':
 						*clr & cla
@@ -1470,8 +1470,8 @@ if $ARGS[0] = 'couch_strapon_give':
 		'You lean back and enjoy her tongue plunging inside your pussy, occasionally using your hand to force her face tighter against you, smearing her face with your wetness for several minutes before changing positions.'
 		gs 'arousal', 'cuni', 3, 'lesbian'
 		gs 'stat'
-		act 'Fuck her': gt 'anushkaev1','couch_fuck_her'
-		act 'Fuck her ass': gt 'anushkaev1','couch_fuck_her_ass'
+		act 'Fuck her': gt 'anushkaev1', 'couch_fuck_her'
+		act 'Fuck her ass': gt 'anushkaev1', 'couch_fuck_her_ass'
 		act 'Eat her':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/livingroom/couchstrap5.jpg"></center>'
@@ -1479,8 +1479,8 @@ if $ARGS[0] = 'couch_strapon_give':
 			'You then stop, step into the harness and pull it up before pulling the straps tight and adjusting the dildo so it is firm against your pelvis.'
 			gs 'arousal', 'cuni_give', 3, 'lesbian'
 			gs 'stat'
-			act 'Fuck her': gt 'anushkaev1','couch_fuck_her'
-			act 'Fuck her ass': gt 'anushkaev1','couch_fuck_her_ass'
+			act 'Fuck her': gt 'anushkaev1', 'couch_fuck_her'
+			act 'Fuck her ass': gt 'anushkaev1', 'couch_fuck_her_ass'
 		end
 		gs 'willpower', 'cuni', 'force'
 		if will_cost <= pcs_willpwr:
@@ -1505,24 +1505,24 @@ if $ARGS[0] = 'couch_strapon_give':
 								*clr & cla
 								gs 'castSpell', 'penisenvy'
 								if spellSuccess > 0:
-									act 'Fuck her': gt 'anushkaev1','couch_fuck_her_magic'
-									act 'Fuck her ass': gt 'anushkaev1','couch_fuck_her_ass_magic'
+									act 'Fuck her': gt 'anushkaev1', 'couch_fuck_her_magic'
+									act 'Fuck her ass': gt 'anushkaev1', 'couch_fuck_her_ass_magic'
 								else
-									act 'Fuck her': gt 'anushkaev1','couch_fuck_her'
-									act 'Fuck her ass': gt 'anushkaev1','couch_fuck_her_ass'
+									act 'Fuck her': gt 'anushkaev1', 'couch_fuck_her'
+									act 'Fuck her ass': gt 'anushkaev1', 'couch_fuck_her_ass'
 								end
 							end
 						else
-							act 'Fuck her': gt 'anushkaev1','couch_fuck_her_magic'
-							act 'Fuck her ass': gt 'anushkaev1','couch_fuck_her_ass_magic'
+							act 'Fuck her': gt 'anushkaev1', 'couch_fuck_her_magic'
+							act 'Fuck her ass': gt 'anushkaev1', 'couch_fuck_her_ass_magic'
 						end
 					else
 						'You use her hair to pull her head back and she gives you a questioning look. You just keep leaning forward and pulling her hair until she has to lie on her back. Once on her back, you pull her legs apart and start gently kiss your way down the insides of her thighs, slowly working your way to her pussy. You find her pussy soaking wet, and she starts moaning as soon as your tongue makes contact with her clit. You alternate between slipping your tongue as deep into her wet pussy as you can and flicking her clit with your tongue for several minutes.'
 						'You then stop and step into the harness and pull it up before pulling the straps tight and adjusting the dildo so it is firm against your pelvis.'
 						gs 'arousal', 'cuni_give', 3, 'lesbian'
 						gs 'stat'
-						act 'Fuck her': gt 'anushkaev1','couch_fuck_her'
-						act 'Fuck her ass': gt 'anushkaev1','couch_fuck_her_ass'
+						act 'Fuck her': gt 'anushkaev1', 'couch_fuck_her'
+						act 'Fuck her ass': gt 'anushkaev1', 'couch_fuck_her_ass'
 					end
 				end
 			end
@@ -1550,9 +1550,9 @@ if $ARGS[0] = 'couch_fuck_her':
 		gs 'arousal', 'vaginal_strap_give', 3, 'lesbian', 'dom'
 		if temporgasm = orgasm: 'You''re nearly overwhelmed by the wild excitement of fucking Anushka''s pussy. You''re so close, but just can''t cum. Once she finishes riding you through her orgasm and comes to a stop, you know you''ve missed your moment.'
 		killvar 'temporgasm'
-		gs 'arousal','end'
+		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Finish': gt 'anushkaev1','couch_strap_finish'
+		act 'Finish': gt 'anushkaev1', 'couch_strap_finish'
 		act 'Fuck her ass': gt 'anushkaev1', 'couch_fuck_her_ass'
 	end
 	act 'Fuck her ass': gt 'anushkaev1', 'couch_fuck_her_ass'
@@ -1575,7 +1575,7 @@ if $ARGS[0] = 'couch_fuck_her_ass':
 		'You keep fucking her ass, finding the right depth and rhythm to really make her moan. "You''re such a dirty little anal slut! Look at you about to cum from getting your asshole fucked!" Your dirty talk seems to have been enough to push her over the edge. She cries out in ecstasy and her whole body shakes as she orgasms hard. You keep fucking her as she rides through her orgasm. Once it passes, you step back and pull the dildo out of her ass.'
 		gs 'arousal', 'anal_strap_give', 3, 'lesbian', 'dom'
 		gs 'stat'
-		act 'Finish': gt 'anushkaev1','couch_strap_finish'
+		act 'Finish': gt 'anushkaev1', 'couch_strap_finish'
 	end
 	gs 'willpower', 'anal', 'self'
 	if will_cost <= pcs_willpwr:
@@ -1601,14 +1601,14 @@ if $ARGS[0] = 'couch_fuck_her_ass':
 				gs 'arousal', 'vaginal_strap_give', 3, 'lesbian', 'dom'
 				if temporgasm = orgasm: 'You''re nearly overwhelmed by the wild excitement of fucking Anushka''s asshole. You''re so close, but just can''t cum. You fuck her through her own orgasm when you realize you''re not going to get one yourself.'
 				killvar 'temporgasm'
-				gs 'arousal','end'
+				gs 'arousal', 'end'
 				*nl
 				'You roll off her and the dildo slides out of her ass as you do.'
 				'She rolls over, placing on hand on her ravaged ass. "Fuck, my ass is going to be sore tomorrow."'
 				'You laugh. "For all the bitching you were doing, I noticed you didn''t try and push me off either. You know you loved having your ass ripped up."'
 				'She blushes a little. "Fuck you <<$pcs_nickname>>!" she says in a mostly joking tone.'
 				gs 'stat'
-				act 'Finish': gt 'anushkaev1','couch_strap_finish'
+				act 'Finish': gt 'anushkaev1', 'couch_strap_finish'
 			end
 			act 'Catch my spit with your tongue':
 				*clr & cla
@@ -1619,7 +1619,7 @@ if $ARGS[0] = 'couch_fuck_her_ass':
 				'Your dirty talk seems to have been enough to push her over the edge. She cries out in ecstasy and her whole body shakes as she orgasms hard. You keep fucking her as she rides through her orgasm. Once it passes, you step back and pull the dildo out of her ass.'
 				gs 'arousal', 'anal_strap_give',3, 'lesbian', 'dom', 'humiliation'
 				gs 'stat'
-				act 'Finish': gt 'anushkaev1','couch_strap_finish'
+				act 'Finish': gt 'anushkaev1', 'couch_strap_finish'
 			end
 		end
 	else
@@ -1766,14 +1766,14 @@ if $ARGS[0] = 'getpleasured':
 			'You slap her on the ass and slide out from under her. She gives you a curious look as you scoot over to her nightstand. You open it, reach inside and pull out her strap-on and lube. Her eyes grow a little wide and she bites her lower lip. "How about we take turns fucking each other with this?" you ask her teasingly.'
 			'She grins. "Sounds good to me, but who gets fucked first?"'
 			'You crawl back across the bed to her. "Well it was my idea, so it''s only fair that I get to fuck you first," you reply.'
-			act 'Use the strap-on on her': gt 'anushkaev1','bedstrapongive'
+			act 'Use the strap-on on her': gt 'anushkaev1', 'bedstrapongive'
 		end
 
 		act 'Get her buttplug out of the nightstand':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/buttplug.jpg"></center>'
 			'You slap her on the ass and slide out from under her. She gives you a curious look as you scoot over to her nightstand. You open it, reach inside and pull out her butt plug and lube. Her eyes grow a little wide and she bites her lower lip. "I''m going to stick this up your ass." you tell her as you crawl back across the bed to her.'
-			act 'Use the butt plug on her': gt 'anushkaev1','buttplug1'
+			act 'Use the butt plug on her': gt 'anushkaev1', 'buttplug1'
 		end
 	end
 end
@@ -1792,7 +1792,7 @@ if $ARGS[0] = 'buttplug':
 		'You grin at her. "I was planning on sticking it up your ass."'
 		'She bites her lower lip, obviously turned on by the idea. "Is that so?"'
 		'You nod at her and put on your best attempt at a demanding voice. "Yeah it is. Now take off your clothes like a good little slut." She only hesitates for a moment before she starts stripping and is soon completely naked. You strip as well and once you''re naked, you crawl across the bed next to her.'
-		act 'Use the butt plug on her': gt 'anushkaev1','buttplug1'
+		act 'Use the butt plug on her': gt 'anushkaev1', 'buttplug1'
 	else
 		'You pull out the butt plug and hold it up. "Yeah, I like this."'
 		'She laughs, walks over and takes it from you before putting it back in the drawer and closing it. "Well maybe you should buy one then, huh?"'
@@ -1861,7 +1861,7 @@ if $ARGS[0] = 'buttplug1':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/sex/strapon/getstrapon.jpg"></center>'
 							'You slap her on the ass and place the butt plug on her nightstand. As she gets back up on her knees and faces you, you reach inside and pull out her strap-on before holding it up. Her eyes grow a little wide and she bites her lower lip. "Now I''m going to fuck you with this," you tell her.'
-							act 'Use the strap-on on her': gt 'anushkaev1','bedstrapongive'
+							act 'Use the strap-on on her': gt 'anushkaev1', 'bedstrapongive'
 						end
 					end
 				end
@@ -1881,7 +1881,7 @@ if $ARGS[0] = 'bedstrapongive':
 	'You laugh and start putting the harness on. She helps you get it into place and you pull on the straps. "So how should I fuck you? Maybe I should fuck your pussy first? Or maybe I should just go straight to that cute little ass?" you ask her rhetorically. She doesn''t respond and seems to be fine with either idea.'
 	gs 'arousal', 'foreplay', 3, 'lesbian'
 	gs 'stat'
-	act 'Straight to the ass': gt 'anushkaev1','bedstrapongiveanal'
+	act 'Straight to the ass': gt 'anushkaev1', 'bedstrapongiveanal'
 	act 'Fuck her pussy':
 		*clr & cla
 		gs 'boyStat', 'D3'
@@ -1895,9 +1895,9 @@ if $ARGS[0] = 'bedstrapongive':
 			'You smack her on the ass as she rides you. "Yeah, that''s right! Ride my dick like the slut you are!" you tell her in a teasing tone. She''s moaning so loudly that you don''t even think she heard your comment. A few more minutes go by before she cries out in orgasm and you can feel her wetness running down onto your thighs. She almost collapses on you, breathing hard, and you have to help her get off you.'
 			gs 'arousal', 'vaginal_strap_give', 5, 'lesbian'
 			gs 'stat'
-			if stat['think_virgin'] = 0: act 'Have her fuck you now': gt 'anushkaev1','bedstraponget'
-			act 'Have her fuck your ass now': gt 'anushkaev1','bedstrapongetanal'
-			act 'Fuck her ass now': gt 'anushkaev1','bedstrapongiveanal'
+			if stat['think_virgin'] = 0: act 'Have her fuck you now': gt 'anushkaev1', 'bedstraponget'
+			act 'Have her fuck your ass now': gt 'anushkaev1', 'bedstrapongetanal'
+			act 'Fuck her ass now': gt 'anushkaev1', 'bedstrapongiveanal'
 			act 'Finish':
 				*clr & cla
 				'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -2065,8 +2065,8 @@ if $ARGS[0] = 'bedstrapongiveanal':
 		'You ride her all the way down, still fucking her ass. Even once the last orgasm passes and she seems completely spent, you keep hammering away at her ass, just to show her who''s boss. Finally tiring yourself out, you stop and pull out of her.'
 		gs 'arousal', 'anal_strap_give', 3, 'lesbian', 'rough', 'dom'
 		gs 'stat'
-		if stat['think_virgin'] = 0: act 'Have her fuck you now': gt 'anushkaev1','bedstraponget'
-		act 'Have her fuck your ass now': gt 'anushkaev1','bedstrapongetanal'
+		if stat['think_virgin'] = 0: act 'Have her fuck you now': gt 'anushkaev1', 'bedstraponget'
+		act 'Have her fuck your ass now': gt 'anushkaev1', 'bedstrapongetanal'
 		act 'Finish':
 			*clr & cla
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -2135,9 +2135,9 @@ if $ARGS[0] = 'bedroom_lesbian':
 						gs 'arousal', 'cuni', 3, 'lesbian'
 						pcs_horny += 5
 						gs 'stat'
-						act 'Finger her': gt 'anushkaev1','bedroom_lesbian_finger'
-						act 'Spank her': gt 'anushkaev1','bedroom_lesbian_spank'
-						act 'Eat her': gt 'anushkaev1','bedroom_lesbian_eatnush'
+						act 'Finger her': gt 'anushkaev1', 'bedroom_lesbian_finger'
+						act 'Spank her': gt 'anushkaev1', 'bedroom_lesbian_spank'
+						act 'Eat her': gt 'anushkaev1', 'bedroom_lesbian_eatnush'
 					end
 				end
 			end
@@ -2153,8 +2153,8 @@ if $ARGS[0] = 'bedroom_lesbian_finger':
 	'You push her onto her back and spread her legs wide before running your hand down her inner thighs until you reach her soaking wet pussy. Your fingers slide into her easily, causing her to moan softly as you slowly start fingerbanging her. After a few minutes, you pull your wet finger out of her and raise it up to her mouth. She opens her mouth and sucks your finger, tasting herself. Pulling your finger out of her mouth, you gently slap her on the hip. You tell her to roll over and get her on her knees while keeping her face against the bed.'
 	gs 'arousal', 'vaginal_finger_give', 2, 'lesbian'
 	gs 'stat'
-	act 'Spank her': gt 'anushkaev1','bedroom_lesbian_spank'
-	act 'Eat her': gt 'anushkaev1','bedroom_lesbian_eatnush'
+	act 'Spank her': gt 'anushkaev1', 'bedroom_lesbian_spank'
+	act 'Eat her': gt 'anushkaev1', 'bedroom_lesbian_eatnush'
 end
 
 if $ARGS[0] = 'bedroom_lesbian_spank':
@@ -2165,7 +2165,7 @@ if $ARGS[0] = 'bedroom_lesbian_spank':
 	'With her ass presented to you like this, you can''t help yourself. You give her ass a smack, causing her to yelp and moan before you proceed to spank her until her ass is red.'
 	gs 'arousal', 'foreplay_give', 1, 'lesbian'
 	gs 'stat'
-	act 'Eat her': gt 'anushkaev1','bedroom_lesbian_eatnush'
+	act 'Eat her': gt 'anushkaev1', 'bedroom_lesbian_eatnush'
 end
 
 if $ARGS[0] = 'bedroom_lesbian_eatnush':
@@ -2183,8 +2183,8 @@ if $ARGS[0] = 'bedroom_lesbian_eatnush':
 		'As you eat her out, she starts grinding back against your face and her breathing becomes quicker, as does her moaning. You can tell she''s close to reaching orgasm. Your face is pushed against her crotch as she cries out and feel her shaking as an orgasm rocks her body. She falls on her side as her orgasm passes before rolling back onto her back and panting with a huge grin on her face.'
 		gs 'arousal', 'cuni_give', 3, 'lesbian'
 		gs 'stat'
-		act 'Sit on her face': gt 'anushkaev1','bedroom_lesbian_facesit'
-		act 'Scissor her': gt 'anushkaev1','bedroom_lesbian_scissor'
+		act 'Sit on her face': gt 'anushkaev1', 'bedroom_lesbian_facesit'
+		act 'Scissor her': gt 'anushkaev1', 'bedroom_lesbian_scissor'
 	end
 end
 
@@ -2198,8 +2198,8 @@ if $ARGS[0] = 'bedroom_lesbian_facesit':
 	gs 'arousal', 'massage', -3, 'lesbian'
 	pcs_horny += 5
 	gs 'stat'
-	act 'Scissor her': gt 'anushkaev1','bedroom_lesbian_scissor'
-	act 'Finish': gt 'anushkaev1','bedroom_lesbian_finish'
+	act 'Scissor her': gt 'anushkaev1', 'bedroom_lesbian_scissor'
+	act 'Finish': gt 'anushkaev1', 'bedroom_lesbian_finish'
 	act 'Grind on her face':
 		*clr & cla
 		'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -2209,8 +2209,8 @@ if $ARGS[0] = 'bedroom_lesbian_facesit':
 		gs 'arousal', 'massage', -3, 'lesbian'
 		pcs_horny += 5
 		gs 'stat'
-		act 'Scissor her': gt 'anushkaev1','bedroom_lesbian_scissor'
-		act 'Finish': gt 'anushkaev1','bedroom_lesbian_finish'
+		act 'Scissor her': gt 'anushkaev1', 'bedroom_lesbian_scissor'
+		act 'Finish': gt 'anushkaev1', 'bedroom_lesbian_finish'
 		act 'Keep grinding on her face':
 			*clr & cla
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -2220,8 +2220,8 @@ if $ARGS[0] = 'bedroom_lesbian_facesit':
 			gs 'arousal', 'massage', -3, 'lesbian'
 			pcs_horny += 5
 			gs 'stat'
-			act 'Scissor her': gt 'anushkaev1','bedroom_lesbian_scissor'
-			act 'Finish': gt 'anushkaev1','bedroom_lesbian_finish'
+			act 'Scissor her': gt 'anushkaev1', 'bedroom_lesbian_scissor'
+			act 'Finish': gt 'anushkaev1', 'bedroom_lesbian_finish'
 		end
 	end
 end
@@ -2234,7 +2234,7 @@ if $ARGS[0] = 'bedroom_lesbian_scissor':
 	'You crawl between her legs, slipping one of your legs over her and the other under one of her legs until your clits are rubbing together. You start rubbing yourself against her, causing you both to moan loudly. After a few minutes of this, she cries out again with a second orgasm. Feeling a little worn down, you disentangle yourself from her.'
 	gs 'arousal', 'trib', 2, 'lesbian'
 	gs 'stat'
-	act 'Finish': gt 'anushkaev1','bedroom_lesbian_finish'
+	act 'Finish': gt 'anushkaev1', 'bedroom_lesbian_finish'
 end
 
 if $ARGS[0] = 'bedroom_lesbian_finish':

+ 67 - 67
locations/anushkaev2.qsrc

@@ -9,21 +9,21 @@ if $ARGS[0] = 'watch_nushrad':
 	'Anushka gets on the bed on all fours in her underwear and wiggles her ass around. "Damn! You have one of the finest asses I''ve ever seen, you know that Nush?" You can tell by the voice that it''s Radomir. He gives her ass a good squeeze with his hand, then grabs her panties and pulls them down, roughly jerking them off and tossing them aside. He then starts playing with her bare ass and rubbing her pussy with his fingers.'
 	gs 'arousal', 'voyeur', 5
 	gs 'stat'
-	act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+	act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 	act 'Keep watching':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad2.jpg"></center>'
 		'"Fuck, I''m so hard! Hurry up and suck my dick!" he says after giving her a slap hard enough to leave a red outline of his hand on her ass. She yelps a little, but turns around and starts sucking his dick. Before too long, he grabs her by the sides of the head and starts fucking her mouth, gagging her as he shoves his dick balls deep down her throat. He then forces his dick balls deep into her mouth and holds her there for several seconds, causing her to choke and gag before he pulls his dick out of her mouth, leaving her choking and gasping for breath.'
 		gs 'arousal', 'voyeur_sex', 5, 'rough'
 		gs 'stat'
-		act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+		act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 		act 'Keep watching':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad3.jpg"></center>'
 			'While she''s catching her breath, he grabs her by the leg, spins her around and drags her towards him until her ass is almost hanging off the edge of the bed. He pushes her legs apart and shoves his dick into her pussy. She winces a little and bites her lower lip, obviously not as wet and ready as she would have liked. He doesn''t seem to notice or doesn''t care as he starts hammering away at her pussy, balls deep. Each thrust makes her grunt, but these slowly turn into moans of pleasure.'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
-			act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+			act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 			act 'Walk in and join them': gt 'anushkaev2', 'rad3some'
 			act 'Keep watching':
 				*clr & cla
@@ -33,7 +33,7 @@ if $ARGS[0] = 'watch_nushrad':
 				'He pushes her down until she''s on her stomach and tosses the bottle aside before he leans forward, pushing his dick between her cheeks as she struggles a little. "You didn''t use enough lube!" she winces as he keeps struggling to penetrate her. "Shut up Nush, this feels better. You''re so fucking tight!" he says and shoves his hips forward hard, which causes her to jump a little and cry out in pain. "Oh fuck that hurt! You need to use more lube!" she protests in a stressed voice, but he pushes her head against the mattress. You can see her wincing in pain and white-knuckling her grip on the bed sheets. "See? I knew you didn''t need much lube." he says as he struggles to force his <<dick>>cm <<$dick_girth>> dick into her ass, moaning in pleasure as he does.'
 				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
-				act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+				act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 				act 'Keep watching':
 					*clr & cla
 					if rand(1,5) = 1:
@@ -47,7 +47,7 @@ if $ARGS[0] = 'watch_nushrad':
 						'He grins even wider and looks even more smug. "Whatever I want."'
 						*nl
 						'You start to shake your head, but before you can tell him to get lost, he interrupts you. "Just small favors, like showing me your tits when I want, buying me a girly mag, stuff like that." You''re about to tell him fuck off, but stop. You''re sure Anushka wouldn''t care, but Radomir... What if he told everyone in school? On the other hand, do you want Maksim to lord this over you for who knows how long?'
-						act 'Agree': gt 'anushkamaksim','maksim_blackmail'
+						act 'Agree': gt 'anushkamaksim', 'maksim_blackmail'
 						gs 'willpower', 'action', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
 							act 'Tell him to fuck off (<<will_cost>> Willpower)':
@@ -60,8 +60,8 @@ if $ARGS[0] = 'watch_nushrad':
 								'Anger washes over him. "Fine, bitch! I''ll just go show her."'
 								'You smirk at him. "Go ahead, go in there while your sister is having sex. I''m sure they won''t mind. If you wait until they''re finished, then I''m sure your sister won''t mind that you were trying to blackmail one of her friends. Who do you think she''ll be more pissed at?"'
 								'He sneers at you and pauses before angrily walking away.'
-								act 'Leave apartment': gt 'pav_complex','start'
-								act 'Wait for Rad to leave': gt 'anushkaev2','wait_nushrad'
+								act 'Leave apartment': gt 'pav_complex', 'start'
+								act 'Wait for Rad to leave': gt 'anushkaev2', 'wait_nushrad'
 							end
 						else
 							act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -72,21 +72,21 @@ if $ARGS[0] = 'watch_nushrad':
 						'"Oh please! You bitches love getting pounded like the sluts you are! So just shut the fuck up and enjoy it!" he says and starts hammering her ass even harder. She grunts loudly in pain with the occasional moan of pleasure, but you don''t think he can tell the difference, or just doesn''t care.'
 						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
-						act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+						act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 						act 'Keep watching':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad6.jpg"></center>'
 							'He grabs hold of her hips and pulls her up until she''s on her knees. He then shoves her face down into the mattress and goes back to hammering away at her ass. She places a hand on his hip in an effort to slow him down a little, but he just roughly shoves her hand away and slaps her hard on the ass. She tries several more times to reach back and slow him down, but he roughly shoves her hands away each time. "Please Rad, slow down or use more lube!" she pleads. "Fucking take it bitch, take it!" he growls and just seems to fuck her ass even harder.'
 							gs 'arousal', 'voyeur_sex', 5
 							gs 'stat'
-							act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+							act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 							act 'Keep watching':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad7.jpg"></center>'
 								'She starts pulling away, but he leans forward as she does, putting more weight on her. Her hips are slowly forced down until she''s lying flat on her stomach again. He clamps his hands on her hips, pinning her in place between him and the mattress to keep her from pulling away more. Her bed sheets are tightly balled up in her clenched fists as she white knuckle grips the sheets. "Please Rad, just slow down a little. Please!" she pleads, but he continues to ignore her pleas and keeps hammering away at her ass. "Fuck yes! God damn, I''m about to bust a nut!"'
 								gs 'arousal', 'voyeur_sex', 5
 								gs 'stat'
-								act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+								act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 								act 'Climax':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad8.jpg"></center>'
@@ -95,8 +95,8 @@ if $ARGS[0] = 'watch_nushrad':
 									gs 'arousal', 'voyeur_sex', 5
 									gs 'stat'
 									gs 'arousal', 'end'
-									act 'Leave apartment': gt 'pav_complex','start'
-									act 'Wait for him to leave': gt 'anushkaev2','wait_nushrad'
+									act 'Leave apartment': gt 'pav_complex', 'start'
+									act 'Wait for him to leave': gt 'anushkaev2', 'wait_nushrad'
 								end
 							end
 						end
@@ -117,7 +117,7 @@ if $ARGS[0] = 'wait_nushrad':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 			'Before you can think of a reply, he walks briskly past you and heads for the apartment door. You open Anushka''s door and walk in, deciding not to say anything about what you just saw.'
-			act 'Enter her room': gt 'anush_bedroom','anushroom'
+			act 'Enter her room': gt 'anush_bedroom', 'anushroom'
 		end
 		act 'You don''t have to be so rough':
 			*clr & cla
@@ -127,7 +127,7 @@ if $ARGS[0] = 'wait_nushrad':
 			'He snorts and shakes his head. "Please! She''s just like all you bitches - she loves every minute of it. I could come back later and she would just roll over, spread those cheeks and let me fuck her ass again. No matter how much she whines and cries about it, she''s always ready for another good ass-fucking."'
 			*nl
 			'You''re not really sure what to say. If she didn''t like it, why would she keep letting him do it? You don''t get to find out since he already left while you were lost in your thoughts. You open Anushka''s door and walk in, deciding not to say anything about what you just saw.'
-			act 'Enter her room': gt 'anush_bedroom','anushroom'
+			act 'Enter her room': gt 'anush_bedroom', 'anushroom'
 		end
 	else
 		'You only take a few steps from the door when it opens and turn like you were just heading to the room. He gives you a slight frown of disgust. "You know if you took better care of yourself, I might give you the fucking of your life too. But I''ve got standards, you know. Now Nush, that''s a fine piece of ass right there," he says while hooking his thumb over his shoulder and pointing back towards her room.'
@@ -135,7 +135,7 @@ if $ARGS[0] = 'wait_nushrad':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 			'Before you can think of a reply, he walks briskly past you and heads for the apartment door to leave. You open Anushka''s door and walk in, deciding not to say anything about what you just saw.'
-			act 'Enter her room': gt 'anush_bedroom','anushroom'
+			act 'Enter her room': gt 'anush_bedroom', 'anushroom'
 		end
 		act 'You don''t have to be so rough':
 			*clr & cla
@@ -145,7 +145,7 @@ if $ARGS[0] = 'wait_nushrad':
 			'He snorts and shakes his head. "Please! She''s like all you bitches - she loves every minute of it. I could come back later and she would just roll over, spread those cheeks and let me fuck her ass again. No matter how much she whines and cries about it, she is always ready for another good ass fucking." He then pauses and laughs. "Well you would understand if you ever found a guy willing to fuck you at least." he says as if the mere thought of it disgusts him.'
 			*nl
 			'You''re not really sure what to say before he suddenly bursts out laughing. "Oh fuck. You were spying on us, weren''t you?" You blush when he realizes what you were doing, which only makes him laugh harder. You can hear him laughing until he walks out of the apartment and closes the door.'
-			act 'Enter her room': gt 'anush_bedroom','anushroom'
+			act 'Enter her room': gt 'anush_bedroom', 'anushroom'
 		end
 	end
 end
@@ -234,7 +234,7 @@ if $ARGS[0] = 'rad3some':
 									'You keep getting dressed while Radomir turns towards Anushka. "Stay out of this, Nush!" he says as he grabs her by the hair and forces her face down against the mattress before he looks at you. "Yeah, that''s right bitch. Get the fuck out of here. No one wants you here!" he barks as he uses his other hand to guide his dick to Anushka''s asshole. He struggles as he pushes against her asshole with his dick. "Use some fucking lube." she says before he shoves forward, popping the head of his dick into her ass and causing her to cry out and grimace in pain while he moans in pleasure.'
 									*nl
 									'"Shut up about the fucking lube already!" he growls as he grabs her hips and shoves himself balls deep into her ass. It makes her cry out more, and she white knuckles the bed sheets, obviously finding it just as painful as you did. However, she isn''t telling him to stop, even though you don''t think she is enjoying it. Not knowing what else to do, you finish getting dressed to the sounds of Anushka grunting in pain and Radomir moaning in pleasure. You leave the two of them alone and walk out of her bedroom, closing the door behind you and heading for the apartment door to leave.'
-									act 'Leave apartment': gt 'pav_complex','start'
+									act 'Leave apartment': gt 'pav_complex', 'start'
 								end
 							end
 						else
@@ -255,7 +255,7 @@ if $ARGS[0] = 'rad3some':
 		'Anushka hesitates for a moment. "<<$pcs_nickname>>, uh..."'
 		'Before Anushka can finish what she was about to say, Radomir interrupts. "For fucks sake <<$pcs_nickname>>, can you get out of here! Your face is killing my boner!" he says in disgust.'
 		'Anushka slaps him on the arm. "You don''t have to be a dick about it, Rad." She then turns towards you. "This really isn''t a good time. Maybe we can hang out sometime later, but can you, you know, take off?" she asks fairly pleasantly, but it is obvious she has no more desire to hook up with you than Radomir does. Feeling rejected, you nod and mumble an apology as you leave her room, shutting the door before leaving the apartment.'
-		act 'Leave apartment': gt 'pav_complex','start'
+		act 'Leave apartment': gt 'pav_complex', 'start'
 	end
 end
 
@@ -308,7 +308,7 @@ if $ARGS[0] = 'radnush_asspound':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/pc/activities/phone/anushka/7.jpg"></center>'
 						'As you break the kiss, Anushka turns and sticks her tongue out. You notice that she is holding up her phone, and takes a selfie of the two of you covered in cum. She then gets up and starts to wipe the cum off her face with a tissue, offering one to you as well. At this point, Radomir is almost dressed. He slaps Anushka on the ass and heads for the door. "Later, bitches!" he quips as he walks out. "What a fucking asshole." she mutters once he''s gone. You both finish getting dressed and she lies down on her bed.'
-						act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+						act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 						act 'Say nothing and join her on the bed': gt 'anush_bedroom', 'bed'
 						act 'Talk about what just happened': gt 'anushkaev2', 'about_rad'
 						act 'Ask about the selfie': gt 'anushkaev2', 'rad_selfie'
@@ -328,7 +328,7 @@ if $ARGS[0] = 'rad_selfie':
 	'She just shrugs. "Keep it as a memento, at least for a while. I often take selfies during or after sex as keepsakes. Why do you ask?"'
 	'"You''re not going to show it to anyone, are you?"'
 	'She looks a little surprised you would ask that. "No, of course not." Then she grins. "Unless you want me to, that is..."'
-	act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+	act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 	act 'Talk about something else': gt 'anush_bedroom', 'bed'
 	act 'Talk about what just happened': gt 'anushkaev2', 'about_rad'
 	act 'Can I see it?':
@@ -340,7 +340,7 @@ if $ARGS[0] = 'rad_selfie':
 		gs 'arousal', 'voyeur_sex', 2
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+		act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 		act 'Talk about something else': gt 'anush_bedroom', 'bed'
 		act 'Talk about what just happened': gt 'anushkaev2', 'about_rad'
 		act 'Ask her to send it to you':
@@ -351,7 +351,7 @@ if $ARGS[0] = 'rad_selfie':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 			'You think about it and decide you would like a copy as well. "Yeah, send it to me."'
 			'She grins, obviously approving of your choice. You then get a notification on your phone and quickly add the selfie to your gallery.'
-			act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+			act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 			act 'Talk about something else': gt 'anush_bedroom', 'bed'
 			act 'Talk about what just happened': gt 'anushkaev2', 'about_rad'
 		end
@@ -409,7 +409,7 @@ if $ARGS[0] = 'about_rad':
 					'You need to know why they broke up, so you push on. "Why did you guys break up?" you ask.'
 					'She gets off the bed. "It''s none of your fucking business <<$pcs_nickname>>! I think you need to leave now." she barks while pointing at the door.'
 					'She''s pretty pissed at you, so you get up and head for the door.'
-					act 'Leave apartment': gt 'pav_complex','start'
+					act 'Leave apartment': gt 'pav_complex', 'start'
 					act 'Apologize':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A144', 'like'
@@ -419,7 +419,7 @@ if $ARGS[0] = 'about_rad':
 						'You stop at the door. "I''m sorry. I didn''t mean to upset you."'
 						'She just shakes her head angrily, not willing to forgive you. "Whatever." she quips and again points to the door.'
 						'You just nod. "Okay, see you later I guess..." You leave before things get worse.'
-						act 'Leave apartment': gt 'pav_complex','start'
+						act 'Leave apartment': gt 'pav_complex', 'start'
 					end
 				end
 			end
@@ -436,14 +436,14 @@ if $ARGS[0] = 'watch_nushval':
 	'She keeps bobbing her head up and down on his dick while she flips him off as a reply to his comment, which just makes him laugh. She slowly strips her clothes as she continues sucking.'
 	gs 'arousal', 'voyeur', 5
 	gs 'stat'
-	act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+	act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 	act 'Keep watching':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyval2.jpg"></center>'
 		'Once she''s naked, she turns around so they are 69ing each other and you push the door open just a little more so you can see all the action. Valentin is eagerly lapping at her pussy as she continues to give him head. You know you really shouldn''t be spying and that you could be caught at any moment.'
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
-		act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+		act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 		act 'Keep watching':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyval3.jpg"></center>'
@@ -451,7 +451,7 @@ if $ARGS[0] = 'watch_nushval':
 			'She turns around again, laughing. "Who said you''re the one who''s going to do the fucking?" she quips as she stands up and straddles him before slowly lowering herself down until his dick slides into her wet pussy. They both moan in pleasure and she slowly starts riding him reverse cowgirl style. She slowly picks up speed and starts fucking him harder and faster, but after a few minutes, she seems to be getting tired and starts slowing down.'
 			gs 'arousal', 'voyeur', 8
 			gs 'stat'
-			act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+			act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 			act 'Walk in and join them': gt 'anushkaev2', 'val3some'
 			act 'Keep watching':
 				*clr & cla
@@ -466,7 +466,7 @@ if $ARGS[0] = 'watch_nushval':
 					'He grins even wider and looks even more smug. "Whatever I want."'
 					*nl
 					'You start to shake your head, but before you can tell him to get lost, he interrupts you. "Just small favors, like showing me your tits when I want, buying me a girly mag, stuff like that." You''re about to tell him fuck off, but stop. You''re sure Anushka wouldn''t care, but Valentin... What if he told everyone in school? On the other hand, do you want Maksim to lord this over you for who knows how long?'
-					act 'Agree': gt 'anushkamaksim','maksim_blackmail'
+					act 'Agree': gt 'anushkamaksim', 'maksim_blackmail'
 					gs 'willpower', 'action', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'Tell him to fuck off (<<will_cost>> Willpower)':
@@ -479,8 +479,8 @@ if $ARGS[0] = 'watch_nushval':
 							'Anger washes over him. "Fine, bitch! I''ll just go show her."'
 							'You smirk at him. "Go ahead, go in there while your sister is having sex. I''m sure they won''t mind. If you wait until they''re finished, then I''m sure your sister won''t mind that you were trying to blackmail one of her friends. Who do you think she''ll be more pissed at?"'
 							'He sneers at you and pauses before angrily walking away.'
-							act 'Leave apartment': gt 'pav_complex','start'
-							act 'Wait for Val to leave': gt 'anushkaev2','wait_nushval'
+							act 'Leave apartment': gt 'pav_complex', 'start'
+							act 'Wait for Val to leave': gt 'anushkaev2', 'wait_nushval'
 						end
 					else
 						act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -491,7 +491,7 @@ if $ARGS[0] = 'watch_nushval':
 					'She rolls over and he scoots up behind her and slips his dick back in her wet pussy. He starts fucking her doggy style, causing her to moan loudly - the louder she moans, the harder and faster he fucks her. She soon has an immense orgasm that rocks her whole body, leaving her bitting the sheets to stop herself from crying out too loudly.'
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
-					act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+					act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 					act 'Keep watching':
 						*clr & cla
 						gs 'boyStat', 'A158'
@@ -501,7 +501,7 @@ if $ARGS[0] = 'watch_nushval':
 						'He is fairly slow and doesn''t go too deep at first, but once she starts moaning loudly and exclaiming "Yes, yes! Fuck yes! Oh god yes!" he starts fucking her a lot harder and faster, finally slamming himself balls deep into her ass. She grips the sheets tightly, just as her body is rocked by another massive orgasm. She buries her face in her shoulder, partially muffling her cries of pleasure. You quickly glance around to make sure no one else heard that.'
 						gs 'arousal', 'voyeur', 5
 						gs 'stat'
-						act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
+						act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex', 'start'
 						act 'Climax':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyval6.jpg"></center>'
@@ -510,12 +510,12 @@ if $ARGS[0] = 'watch_nushval':
 							'Most of it ends up on her forehead and nose, but some of it ends up in her open mouth. He milks the last few drops of cum out of his dick, letting them land on her tongue. "Fuck, that was amazing," he says as she swallows what was in her mouth. They both start getting dressed as she cleans his cum off her face. Once she''s cleaned up, he kisses her on the forehead. "I need to get going babe. I need to see that guy about a part for my bike."'
 							*nl
 							'She sits on her bed and smirks at him. "Whatever, I got what I needed. You can go."'
-							'He laughs and bows slightly. "Why thank you, your majesty, I''m glad I could be of service." They both laugh and he turns towards the door. You quickly close it before you''re spotted.'
+							'He laughs and bows slightly. "Why thank you, Your Majesty, I''m glad I could be of service." They both laugh and he turns towards the door. You quickly close it before you''re spotted.'
 							gs 'arousal', 'voyeur', 5
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave apartment': gt 'pav_complex','start'
-							act 'Wait for him to leave': gt 'anushkaev2','wait_nushval'
+							act 'Leave apartment': gt 'pav_complex', 'start'
+							act 'Wait for him to leave': gt 'anushkaev2', 'wait_nushval'
 						end
 					end
 				end
@@ -530,7 +530,7 @@ if $ARGS[0] = 'wait_nushval':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 	'You only take a few steps from the door when it opens and turn like you were just heading to the room. He looks a little surprised to see you but smiles. "Hey <<$pcs_nickname>>, Anushka is in her room if you''re looking for her. I need to get going, got to get this part for my bike..." he explains as he walks past you. "See you around." With that, he walks towards the front door and leaves. You open Anushka''s door and walk in, deciding not to say anything about what you just saw.'
-	act 'Enter her room': gt 'anush_bedroom','anushroom'
+	act 'Enter her room': gt 'anush_bedroom', 'anushroom'
 end
 
 if $ARGS[0] = 'val3some':
@@ -659,9 +659,9 @@ if $ARGS[0] = 'val3some':
 															'After a few minutes, Valentin gets up. "I need to get going girls." He starts getting dressed, but as you also get up, Anushka pulls you in close. You follow her gaze just in time to see her holding her phone up and taking a selfie of both of you with your tits covered in cum.'
 															*nl
 															'She then grabs some tissues and hands you some before she starts wiping the cum off her tits. As the two of you clean up, he finishes getting dressed. You and Anushka then start to get dressed as well and once he finishes, he leans over and gives Anushka a kiss on the forehead. "See you around babe. This was a blast, we should do it again sometime." he says and points at both of you. He then heads out the door, leaving Anushka to roll her eyes at his comment as the two of you finish getting dressed.'
-															act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+															act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 															act 'Say nothing and join her on the bed': gt 'anush_bedroom', 'bed'
-															act 'Talk about what just happened': gt 'anushkaev2' , 'talkaboutval'
+															act 'Talk about what just happened': gt 'anushkaev2', 'talkaboutval'
 														end
 													end
 												end
@@ -698,9 +698,9 @@ if $ARGS[0] = 'val3some':
 															'After a few minutes, Valentin gets up. "I need to get going girls." He starts getting dressed, but as you also get up, Anushka pulls you in close. You follow her gaze just in time to see her holding her phone up and taking a selfie of both of you with your tits covered in cum.'
 															*nl
 															'Anushka grabs some tissues and hands you some before she starts wiping the cum off her tits. As the two of you clean up, he finishes getting dressed. You and Anushka start to get dressed as well and once he finishes, he leans over and gives Anushka a kiss on the forehead. "See you around babe. This was a blast, we should do it again sometime." he says and points at both of you. He then heads out the door, leaving Anushka to roll her eyes at his comment as the two of you finish getting dressed.'
-															act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+															act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 															act 'Say nothing and join her on the bed': gt 'anush_bedroom', 'bed'
-															act 'Talk about what just happened':gt 'anushkaev2' , 'talkaboutval'
+															act 'Talk about what just happened':gt 'anushkaev2', 'talkaboutval'
 														end
 													end
 												end
@@ -725,7 +725,7 @@ if $ARGS[0] = 'val3some':
 		'Anushka hesitates for a moment. "<<$pcs_nickname>>, uh... No, I don''t think so," she says while shaking her head.'
 		'You feel a little rejected. "Oh... sorry... I didn''t mean to disturb you guys."'
 		'Valentin clears his throat and gives a pointed look to the door. Getting the hint, you walk to the door and walk out. Closing it behind you, you quickly leave the apartment.'
-		act 'Leave apartment': gt 'pav_complex','start'
+		act 'Leave apartment': gt 'pav_complex', 'start'
 	end
 end
 
@@ -745,7 +745,7 @@ if $ARGS[0] = 'talkaboutval':
 	'Before you can finish your sentence, she interrupts. "No, no we''re just friends who occasionally fuck is all. It''t fun and that''s all it is."'
 	'You smile at her. "Just friends that fuck huh?"'
 	'She rolls her eyes slightly. "Yeah, just friends that fuck."'
-	act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+	act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 	act 'Talk about something else': gt 'anush_bedroom', 'bed'
 	if anushkaphoto[8] = 1:
 		act 'Ask about the selfie':
@@ -757,7 +757,7 @@ if $ARGS[0] = 'talkaboutval':
 			'She just shrugs. "Keep it as a memento, at least for a while. I often take selfies during or after sex as keepsakes. Why do you ask?"'
 			'"You''re not going to show it to anyone, are you?"'
 			'She looks a little surprised you would ask that. "No, of course not." Then she grins. "Unless you want me to, that is..."'
-			act 'Hangout in her room': gt 'anush_bedroom','anushroom'
+			act 'Hangout in her room': gt 'anush_bedroom', 'anushroom'
 			act 'Talk about something else': gt 'anush_bedroom', 'bed'
 			act 'Talk about what just happened': gt 'anushkaev2', 'about_rad'
 			act 'Can I see it?':
@@ -769,7 +769,7 @@ if $ARGS[0] = 'talkaboutval':
 				gs 'arousal', 'voyeur_sex', 2
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+				act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 				act 'Talk about something else': gt 'anush_bedroom', 'bed'
 				act 'Ask her to send it to you':
 					*clr & cla
@@ -779,7 +779,7 @@ if $ARGS[0] = 'talkaboutval':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 					'You think about it and decide you would like a copy as well. "Yeah, send it to me."'
 					'She grins, obviously approving of your choice. You then get a notification on your phone and quickly add the selfie to your gallery.'
-					act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+					act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 					act 'Talk about something else': gt 'anush_bedroom', 'bed'
 				end
 			end
@@ -795,7 +795,7 @@ if $ARGS[0] = 'watch_nushmar':
 	'You push the door open just a little to get a better look. You can tell that it''s Marcus from school, his dick already rock-hard. She takes the head of his cock into her mouth and starts sucking on it, slowly working her lips further and further down his shaft. He starts really moaning and grabs her by the hair and starts to fuck her mouth. He''s not too rough, but he takes control of the action.'
 	gs 'arousal', 'voyeur', 5
 	gs 'stat'
-	act 'Leave apartment': gt 'pav_complex','start'
+	act 'Leave apartment': gt 'pav_complex', 'start'
 	act 'Walk in and join them': gt 'anushkaev2', 'mar3some'
 	act 'Keep watching':
 		*clr & cla
@@ -803,7 +803,7 @@ if $ARGS[0] = 'watch_nushmar':
 		'She pulls away until his dick comes out of her mouth and looks up at him. "Please fuck me with your... big... black... dick..." she purrs, drawing out the last words with a breathy moan in accented English. He helps her up before half sitting and half tossing her onto the bed, causing her to giggle. She lies on her back with her legs spread wide and he moves up and slides his dick into her pussy, causing them both to moan. "Fuck. you''re so tight..." he moans out as he starts fucking her. He''s not too fast or hard, but he takes cues from her moans and body language, picking up the pace the more into it she gets.'
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
-		act 'Leave apartment': gt 'pav_complex','start'
+		act 'Leave apartment': gt 'pav_complex', 'start'
 		act 'Keep watching':
 			*clr & cla
 			gs 'boyStat', 'A146'
@@ -813,7 +813,7 @@ if $ARGS[0] = 'watch_nushmar':
 			'He waits while she adjusts to his dick in her ass and then slowly starts fucking her ass with his <<dick>>cm <<$dick_girth>> dick. "Oh god yes, that feels so good. Fuck my little white ass!" she moans to him in English, apparently having paid attention in school. He picks up the pace a little, but is still fairly gentle with her. She seems to be really loving it and seems to really like the race play.'
 			gs 'arousal', 'voyeur', 5
 			gs 'stat'
-			act 'Leave apartment': gt 'pav_complex','start'
+			act 'Leave apartment': gt 'pav_complex', 'start'
 			act 'Keep watching':
 				*clr & cla
 				if rand(1,5) = 1 and maksimQW['blackmail'] ! 1:
@@ -827,7 +827,7 @@ if $ARGS[0] = 'watch_nushmar':
 					'He grins even wider and looks even more smug. "Whatever I want."'
 					*nl
 					'You start to shake your head, but before you can tell him to get lost, he interrupts you. "Just small favors, like showing me your tits when I want, buying me a girly mag, stuff like that." You''re about to tell him fuck off, but stop. You''re sure Anushka wouldn''t care, but Marcus... What if he told everyone in school? On the other hand, do you want Maksim to lord this over you for who knows how long?'
-					act 'Agree': gt 'anushkamaksim','maksim_blackmail'
+					act 'Agree': gt 'anushkamaksim', 'maksim_blackmail'
 					gs 'willpower', 'action', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'Tell him to fuck off (<<will_cost>> Willpower)':
@@ -840,8 +840,8 @@ if $ARGS[0] = 'watch_nushmar':
 							'Anger washes over him. "Fine, bitch! I''ll just go show her."'
 							'You smirk at him. "Go ahead, go in there while your sister is having sex. I''m sure they won''t mind. If you wait until they''re finished, then I''m sure your sister won''t mind that you were trying to blackmail one of her friends. Who do you think she''ll be more pissed at?"'
 							'He sneers at you and pauses before angrily walking away.'
-							act 'Leave apartment': gt 'pav_complex','start'
-							act 'Wait for Marcus to leave': gt 'anushkaev2','wait_nushmar'
+							act 'Leave apartment': gt 'pav_complex', 'start'
+							act 'Wait for Marcus to leave': gt 'anushkaev2', 'wait_nushmar'
 						end
 					else
 						act 'Tell him to fuck off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -851,14 +851,14 @@ if $ARGS[0] = 'watch_nushmar':
 					'"Please I want more of your... big... black... cock... in my ass." You think she''s playing up the accent while speaking English. He grabs hold of her and pulls her up onto her knees, giving him much better access to her ass. He starts fucking her again, but it takes a little prodding from her for him to start going deeper and faster. Once he is sure she is into it, he starts being less gentle about it and as the first hard orgasm hits her, he starts really fucking her.'
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
-					act 'Leave apartment': gt 'pav_complex','start'
+					act 'Leave apartment': gt 'pav_complex', 'start'
 					act 'Keep watching':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spymar5.jpg"></center>'
 						'He''s really starting to hammer away at her ass, so she reaches between her legs and starts rubbing her clit, moaning louder and louder the harder he fucks her ass. A few minutes later, she has another massive orgasm, almost falling over from her body quivering so hard. He has to practically hold her up himself. He then suddenly pulls his dick out of her ass and slides off the bed. "I''m going to cum."'
 						gs 'arousal', 'voyeur', 5
 						gs 'stat'
-						act 'Leave apartment': gt 'pav_complex','start'
+						act 'Leave apartment': gt 'pav_complex', 'start'
 						act 'Climax':
 							*clr & cla
 							nushmarcus_selfie = 1
@@ -869,8 +869,8 @@ if $ARGS[0] = 'watch_nushmar':
 							gs 'arousal', 'voyeur', 5
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave apartment': gt 'pav_complex','start'
-							act 'Wait for him to leave': gt 'anushkaev2','wait_nushmar'
+							act 'Leave apartment': gt 'pav_complex', 'start'
+							act 'Wait for him to leave': gt 'anushkaev2', 'wait_nushmar'
 						end
 					end
 				end
@@ -892,7 +892,7 @@ if $ARGS[0] = 'wait_nushmar':
 	'You smile back at her and her casual response. "Hey, you back. So... you and Marcus, huh?"'
 	'She arches her brow as she finishes getting dressed. "Me and Marcus what?"'
 	'You point to your cheek, indicating the splatter of cum still on her face. It takes her a moment to realize before she looks in the mirror and cleans the rest of it off. "Oh... Shut up." she says, but you can tell by her tone that she''s more amused than bothered by it.'
-	act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+	act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 	act 'Say nothing and join her on the bed': gt 'anush_bedroom', 'bed'
 	act 'Talk about what just happened': gt 'anushkaev2', 'talk_about_marcus'
 end
@@ -962,7 +962,7 @@ if $ARGS[0] = 'mar3some':
 		'Anushka hesitates for a moment. "<<$pcs_nickname>>, uh... No, I don''t think so," she says while shaking her head.'
 		'You feel a bit rejected. "Oh... sorry... I didn''t mean to disturb you guys."'
 		'Marcus stands up while still trying to cover himself. "Uh, maybe I should go?" he says, but Anushka pushes him back down on the bed and replies "No, I don''t think so. I''m not done with you yet. Besides, <<$pcs_nickname>> was just leaving." she says while giving you a pointed look. Getting the hint, you walk to the door and walk out. Closing it behind you, you quickly leave the apartment.'
-		act 'Leave apartment': gt 'pav_complex','start'
+		act 'Leave apartment': gt 'pav_complex', 'start'
 	end
 end
 
@@ -1019,7 +1019,7 @@ if $ARGS[0] = 'eat_nush_fucked':
 							'"Oh... Um, yeah okay. I should get going anyway..." he stammers as he quickly finishes dressing and heads out the door.'
 							'Now that Marcus is gone and it''s just the two of you, you decide to ask her about what just happened. "So, you and Marcus huh?"'
 							'She smiles and shakes her head. "Shut up."'
-							act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+							act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 							act 'Say nothing and join her on the bed': gt 'anush_bedroom', 'bed'
 							act 'Talk about what just happened': gt 'anushkaev2', 'talk_about_marcus'
 						end
@@ -1047,7 +1047,7 @@ if $ARGS[0] = 'talk_about_marcus':
 	*nl
 	'She shakes her head slightly. "It''s not just that, or I should say only that. It''s about everyone saying it''s wrong. It''s the same reason I like fucking other chicks or getting naked. Breaking the rules and rubbing it in their narrow-minded faces is a huge turn-on. I mean fuck what society thinks or wants us to think or how to act. The more people tell me good girls shouldn''t do this or that, the more I want to fucking do it. I say break all the fucking rules and live free."'
 	'You can only nod at that. You know Anushka is a bit of an anarchist at heart, so it''s not a surprise that breaking social norms turns her on.'
-	act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+	act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 	act 'Talk about something else': gt 'anush_bedroom', 'bed'
 	if OluQW['sex'] = 1 and OluQW['tell'] = 0:
 		act 'Tell her about Olu': gt 'anushkachat', 'tell_about_olu'
@@ -1089,7 +1089,7 @@ if $ARGS[0] = 'talk_about_marcus':
 					gs 'arousal', 'voyeur_sex', 2
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+					act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 					act 'Talk about something else': gt 'anush_bedroom', 'bed'
 					if OluQW['sex'] = 1 and OluQW['tell'] = 0:
 						act 'Tell her about Olu': gt 'anushkachat', 'tell_about_olu'
@@ -1112,7 +1112,7 @@ if $ARGS[0] = 'talk_about_marcus':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushbed.jpg"></center>'
 						'You think about it and decide you would like a copy as well. "Yeah, send it to me."'
 						'She grins, obviously approving of your choice. You then get a notification on your phone and quickly add the selfie to your gallery.'
-						act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+						act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 						act 'Talk about something else': gt 'anush_bedroom', 'bed'
 						if OluQW['sex'] = 1 and OluQW['tell'] = 0:
 							act 'Tell her about Olu': gt 'anushkachat', 'tell_about_olu'
@@ -1121,7 +1121,7 @@ if $ARGS[0] = 'talk_about_marcus':
 							act 'Tell her about Djibril': gt 'anushkachat', 'tell_about_djibril'
 						end
 					end
-					act 'Hang out in her room': gt 'anush_bedroom','anushroom'
+					act 'Hang out in her room': gt 'anush_bedroom', 'anushroom'
 					act 'Talk about something else': gt 'anush_bedroom', 'bed'
 					if OluQW['sex'] = 1 and OluQW['tell'] = 0:
 						act 'Tell her about Olu': gt 'anushkachat', 'tell_about_olu'
@@ -1205,7 +1205,7 @@ if $ARGS[0] = 'disco_restroom':
 											*clr & cla
 											minut += 10
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/disco/disco_restroom14.jpg"></center>'
-											'Once she recovers, she grabs you by the face and gives you a long, passionate kiss for a few seconds before breaking it. "I had fun. We should do this again some time." With that, she starts getting dressed after cleaning herself up. You follow suit as she heads out. "I''m heading back to the disco to see what''s going on. See you later." She walks out and you wait for a few minutes before leaving as well.'
+											'Once she recovers, she grabs you by the face and gives you a long, passionate kiss for a few seconds before breaking it. "I had fun. We should do this again sometime." With that, she starts getting dressed after cleaning herself up. You follow suit as she heads out. "I''m heading back to the disco to see what''s going on. See you later." She walks out and you wait for a few minutes before leaving as well.'
 											gs 'arousal', 'kiss', 1, 'lesbian'
 											gs 'arousal', 'end'
 											gs 'stat'
@@ -1230,7 +1230,7 @@ if $ARGS[0] = 'disco_restroom':
 										act 'Anal pounding':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/disco/disco_restroom12.jpg"></center>'
-											'She grabs hold of your hair and starts really hammering your ass hard and fast. She keeps up the jackhammer speed for several minutes before she starts to breathing heavily and slows down until she stops and pulls the dildo out of your ass. Backing away, she unbuckles the harness and lets it fall to the ground before leaning against the wall and spreading her legs. "Finish me off."'
+											'She grabs hold of your hair and starts really hammering your ass hard and fast. She keeps up the jackhammer speed for several minutes before she starts breathing heavily and slows down until she stops and pulls the dildo out of your ass. Backing away, she unbuckles the harness and lets it fall to the ground before leaning against the wall and spreading her legs. "Finish me off."'
 											gs 'arousal', 'anal_strap', 3, 'lesbian'
 											gs 'stat'
 											act 'Eat her out again':
@@ -1243,7 +1243,7 @@ if $ARGS[0] = 'disco_restroom':
 													*clr & cla
 													minut += 10
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/disco/disco_restroom14.jpg"></center>'
-													'Once she recovers, she grabs you by the face and gives you a long, passionate kiss for a few seconds before breaking it. "I had fun. We should do this again some time." With that, she starts getting dressed after cleaning herself up. You follow suit as she heads out. "I''m heading back to the disco to see what''s going on. See you later." She walks out and you wait for a few minutes before leaving as well.'
+													'Once she recovers, she grabs you by the face and gives you a long, passionate kiss for a few seconds before breaking it. "I had fun. We should do this again sometime." With that, she starts getting dressed after cleaning herself up. You follow suit as she heads out. "I''m heading back to the disco to see what''s going on. See you later." She walks out and you wait for a few minutes before leaving as well.'
 													gs 'arousal', 'kiss', 1, 'lesbian'
 													gs 'arousal', 'end'
 													gs 'stat'
@@ -1326,7 +1326,7 @@ if $ARGS[0] = 'disco_emptyroom_suck_strapon':
 	if npc_sex['A144'] = 0:npc_sex['A144'] = 1 & girl += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/sex/disco/nush_getfucked4.jpg"></center>'
-	'"I want you to suck my dick like the dirty little slut you are." You tell her as you push her down until she''s squatting on the floor in front of your. You start rubbing the tip of the dildo against her lips until she opens her mouth. As soon as she opens her mouth you slide your fake dick into her mouth, she starts to sucking your cock while stroking it with one hand.'
+	'"I want you to suck my dick like the dirty little slut you are." You tell her as you push her down until she''s squatting on the floor in front of you. You start rubbing the tip of the dildo against her lips until she opens her mouth. As soon as she opens her mouth you slide your fake dick into her mouth, she starts to sucking your cock while stroking it with one hand.'
 	gs 'arousal', 'foreplay_give', 2, 'lesbian', 'dom'
 	gs 'stat'
 	act 'Watch her suck you off':
@@ -1612,7 +1612,7 @@ if $ARGS[0] = 'disco_emptyroom_suck_strapon_magic':
 										minut += 10
 										'<center><img <<$set_imgh>> src="images/pc/magic/penis_envy/creampie_anal_girl1.jpg"></center>'
 										$orgasm_or = 'yes'
-										$orgasm_txt = 'You shove your cock balls deep into her ass, just as you feel the release from your balls, you pump her butt full of your cum. Once you finish cumming you pull your dick out of her ass, as you step back you see, your cum, come pouring out of her gapping butthole.'
+										$orgasm_txt = 'You shove your cock balls deep into her ass, just as you feel the release from your balls, you pump her butt full of your cum. Once you finish cumming you pull your dick out of her ass, as you step back you see, your cum, come pouring out of her gaping butthole.'
 										'She looks back at you confused, obviously able to feel the cum leaking out of her gaping asshole. "What the fuck is that?" She asks very confused.'
 										'"It is one of those dildo''s with fake cum and a vibrator, I can trigger the cum to spurt out when I cum from the vibrator." You explain to her.'
 										*nl

+ 108 - 33
locations/artem_dorm.qsrc

@@ -1,37 +1,41 @@
 # artem_dorm
-!2024/03/18
 
-!! list of triggers
-!! artemQW['bj'] = number of blowjobs
-!! artemQW['sex'] = 1 when Pc had vaginal sex with Artem
-!! artemQW['anal'] = 1 when Pc had anal sex with Artem
-!! artemQW['hj'] = number of handjobs
-!! artemQW['artembrokenheart'] = 1 artem is heart broken
-!! artemQW['stripsee'] = number of strips for Artem
-!! artemQW['artemlove'] = 1 Artem is in love with Sveta
-!! artemQW['love'] = 1 Sveta is in love with Artem
-!! artemQW['love'] = -1 Sveta is not in love with Artem
-!! artemQW['artemblok'] = 1 artem is blocked
-!! artemQW['bf'] = 1  they are boy friend and girl friend
-!! artemQW['dryhump'] = number of dryhumps
-!! artemQW['artlove'] = 2 Pc rejected Artems love
-!! artemQW['artlie'] =1 Pc lied to artem about the dimka video, blocks love content
-!! artemQW['artfall'] = 10 Artem wants to asks her out on a date
-!! artemQW['date'] =  number of dates after 10 he is in love
-!! artemQW['artem_dom'] += 1 counter used to see how dominate Artem is becoming the higher it goes the more stuff it will unlock.
-!! artemQW['dimka'] =1 Artem removed the blackmail video
-!! artemQW['slutlove'] = 1 .. Pc became know as a slut in Pavlovsk and keeps dating Artem
-!! artemQW['sveslut'] = 1 .. Artem knows that Pc is a slut but they stay friends
-!! artemQW['nush3some_ask'] += 1 Sveta talked about threesome with Nush
-!! artemQW['nush3some'] >= 2 had threesome with Nush
-!! artemQW['nush3some'] = 1 Artem and Nush agreed to threesome
-!! artemQW['nush3some_again'] = 1 can try and convince Artem and Nush to try it again
-!! artemQW['nush3some_again'] = 2 have convinced Artem
-!! artemQW['nush3some_again'] = 3 have convinced Anushka
-!! artemQW['nush3some_again'] = 4 opens up repeating threesomes
-!! artemQW['nush3some'] >= 3 had threesome with Nush more than once
-!! artemQW['nush3some'] = -1 blocks future 3somes
-!! artemQW['strapon'] = 1 means they had strapon sex and he liked it, -1 one means he did not like it and it blocks it going forward
+!{
+2024/03/18
+
+list of triggers
+artemQW['bj'] = number of blowjobs
+artemQW['sex'] = 1 when Pc had vaginal sex with Artem
+artemQW['anal'] = 1 when Pc had anal sex with Artem
+artemQW['hj'] = number of handjobs
+artemQW['artembrokenheart'] = 1 artem is heart broken
+artemQW['stripsee'] = number of strips for Artem
+artemQW['artemlove'] = 1 Artem is in love with Sveta
+artemQW['love'] = 1 Sveta is in love with Artem
+artemQW['love'] = -1 Sveta is not in love with Artem
+artemQW['artemblok'] = 1 artem is blocked
+artemQW['bf'] = 1  they are boy friend and girl friend
+artemQW['dryhump'] = number of dryhumps
+artemQW['artlove'] = 2 Pc rejected Artems love
+artemQW['artlie'] =1 Pc lied to artem about the dimka video, blocks love content
+artemQW['artfall'] = 10 Artem wants to asks her out on a date
+artemQW['date'] =  number of dates after 10 he is in love
+artemQW['artem_dom'] += 1 counter used to see how dominate Artem is becoming the higher it goes the more stuff it will unlock.
+artemQW['dimka'] =1 Artem removed the blackmail video
+artemQW['slutlove'] = 1 .. Pc became know as a slut in Pavlovsk and keeps dating Artem
+artemQW['sveslut'] = 1 .. Artem knows that Pc is a slut but they stay friends
+artemQW['nush3some_ask'] += 1 Sveta talked about threesome with Nush
+artemQW['nush3some'] >= 2 had threesome with Nush
+artemQW['nush3some'] = 1 Artem and Nush agreed to threesome
+artemQW['nush3some_again'] = 1 can try and convince Artem and Nush to try it again
+artemQW['nush3some_again'] = 2 have convinced Artem
+artemQW['nush3some_again'] = 3 have convinced Anushka
+artemQW['nush3some_again'] = 4 opens up repeating threesomes
+artemQW['nush3some'] >= 3 had threesome with Nush more than once
+artemQW['nush3some'] = -1 blocks future 3somes
+artemQW['strapon'] = 1 means they had strapon sex and he liked it, -1 one means he did not like it and it blocks it going forward
+artemQW['strapon_count'] amount of times sveta had strapon sex with Artem
+}
 
 if $ARGS[0] = 'start':
 	$loc = 'artem_dorm'
@@ -718,7 +722,7 @@ if $ARGS[0] = 'chat':
 						'His eyes bulge when he sees how big it is and starts shaking his head. "Hell no! That thing is massive! There''s no way you''re sticking that in me!"'
 						'You sigh. "Come on baby, I''ll go easy on you! I let you fuck me in the ass, so it''s only fair. You''ll enjoy it, I promise."'
 						'He keeps shaking his head and laughs a little. "Fair? That thing is way bigger than I am! Maybe if it was my size or smaller, I might consider it but not that thing!"'
-						'You try to convince him, but he''s stead fast against it and pushes you to have regular sex instead.'
+						'You try to convince him, but he''s steadfast against it and pushes you to have regular sex instead.'
 						act 'Have sex': gt 'artem_sex_uni', 'sex'
 						act 'Stop talking': gt 'artem_dorm', 'start'
 						act 'Keep talking': gt 'artem_dorm', 'chat'
@@ -743,6 +747,77 @@ if $ARGS[0] = 'chat':
 				end
 			end
 		end
+		if artemQW['strapon_count'] = 1 and mc_inventory['strapon'] = 1 and strapnumber > 0 and artemQW['strapon'] >= 1:
+			act 'Bring up strapon sex again':
+				*clr & cla
+				minut += 1
+				gs 'boyStat', 'D<<strapnumber>>'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon2.jpg"></center>'
+				'You wonder if he might let you fuck him in the butt again. "Artem, you remember when you let me fuck you with a strapon?"'
+				'He blushes bright red and panicky looks at the door, like he expects his mom to burst in at any moment. "Not so loud and yes I remember, how could I forget?"'
+				'You smile at him and talk softer. "I really loved doing that and I want to do it again."'
+				'He seems speechless and unsure for a moment, then softly smiles. "Yeah I guess, if it will make you happy, my love." As he talks, he starts taking off his pants.'
+				if strapnumber >= 4:
+					'You pull the strapon harness with its <<dick>>cm <<$dick_girth>> dildo out of your purse and hold it up, showing it to him. "I thought we could use this."'
+					'His eyes bulge when he sees how big it is and starts shaking his head. "Hell no! That thing is massive! There''s no way you''re sticking that in me!"'
+					'You sigh. "Come on baby, I''ll go easy on you! I let you fuck me in the ass, so it''s only fair. You''ll enjoy it, I promise."'
+					'He keeps shaking his head and laughs a little. "Fair? That thing is way bigger than I am! Maybe if it was my size or smaller, I might consider it but not that thing!"'
+					'You try to convince him, but he''s steadfast against it and pushes you to have regular sex instead.'
+					act 'Have sex': gt 'artem_sex_uni', 'sex'
+					act 'Stop talking': gt 'artem_dorm', 'start'
+					act 'Keep talking': gt 'artem_dorm', 'chat'
+				else
+					'You pull the strapon harness with its <<dick>>cm <<$dick_girth>> dildo attached out of your purse and hold it up, showing it to him. "Here it is."'
+					'He looks at the dildo. "Okay fine, but you still can''t tell anyone we did this, okay?"'
+					'You nod. "I swear I won''t tell anyone unless you''re okay with it." He frowns at how you worded it, but it seems good enough.'
+					act 'Put on the harness': gt 'artem_sex_uni', 'strapon_second'
+				end
+			end
+			act 'Change your mind':
+				*clr & cla
+				minut += 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+				'You think about it some more and decide against it. It might freak him out and you don''t know how he would react to such a request. "Never mind. How about we just do what we normally do?"'
+				'He pauses a moment and looks at you. "Are you sure?" You nod at him and start kissing him.'
+				act 'Have sex': gt 'artem_sex', 'sex'
+			end
+		elseif artemQW['strapon_count'] > 1 and mc_inventory['strapon'] = 1 and strapnumber > 0 and artemQW['strapon'] >= 1:
+			act 'Bring up strapon sex yet again':
+				*clr & cla
+				minut += 1
+				gs 'boyStat', 'D<<strapnumber>>'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon2.jpg"></center>'
+				'You wonder if he might let you fuck him in the butt again. "Artem, I was thinking tonight I can fuck you again, what do you think?"'
+				'He blushes bright red. "Ok sure sweety, you can fuck me again." As he talks, he starts taking off his pants.'
+				if strapnumber >= 4:
+					'You pull the strapon harness with its <<dick>>cm <<$dick_girth>> dildo out of your purse and hold it up, showing it to him. "I thought we could use this."'
+					'His eyes bulge when he sees how big it is and starts shaking his head. "Hell no! That thing is massive! There''s no way you''re sticking that in me!"'
+					'You sigh. "Come on baby, I''ll go easy on you! I let you fuck me in the ass, so it''s only fair. You''ll enjoy it, I promise."'
+					'He keeps shaking his head and laughs a little. "Fair? That thing is way bigger than I am! Maybe if it was my size or smaller, I might consider it but not that thing!"'
+					'You try to convince him, but he''s steadfast against it and pushes you to have regular sex instead.'
+					act 'Have sex': gt 'artem_sex_uni', 'sex'
+					act 'Stop talking': gt 'artem_dorm', 'start'
+					act 'Keep talking': gt 'artem_dorm', 'chat'
+				else
+					'You pull the strapon harness with its <<dick>>cm <<$dick_girth>> dildo attached out of your purse and hold it up, showing it to him. "This will soon be up your ass and you''ll be moaning like a slut." You say with a giggle.'
+					'He looks at the dildo and for a moment you think he actually looks eager, then he looks at you and smiles. "Okay fine, but you still can''t tell anyone we are doing this, okay?"'
+					'You nod. "I swear I won''t tell anyone unless you''re okay with it." He frowns at how you worded it, but it seems good enough.'
+					act 'Put on the harness': gt 'artem_sex_uni', 'strapon_again'
+				end
+			end
+			act 'Change your mind':
+				*clr & cla
+				minut += 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+				'You think about it some more and decide against it. It might freak him out and you don''t know how he would react to such a request. "Never mind. How about we just do what we normally do?"'
+				'He pauses a moment and looks at you. "Are you sure?" You nod at him and start kissing him.'
+				act 'Have sex': gt 'artem_sex', 'sex'
+			end
+		end
 	end
 end
 

+ 3 - 3
locations/artem_nush_sex.qsrc

@@ -1005,8 +1005,8 @@ if $ARGS[0] = 'artem_sveta':
 					'You can keep sucking his dick until he blows his load, offer up your pussy or give him your ass.'
 					gs 'arousal', 'bj', 2, 'deepthroat', 'rough'
 					gs 'stat'
-					act 'Spread your legs': gt 'artem_nush_sex_uni', 'artem_sveta_vag'
-					act 'Offer up your ass': gt 'artem_nush_sex_uni', 'artem_sveta_anal'
+					act 'Spread your legs': gt 'artem_nush_sex', 'artem_sveta_vag'
+					act 'Offer up your ass': gt 'artem_nush_sex', 'artem_sveta_anal'
 					act 'Just suck him off':
 						*clr & cla
 						minut += 5
@@ -1053,7 +1053,7 @@ if $ARGS[0] = 'artem_sveta_vag':
 		'As Artem fucks you, you glance over and see that Anushka has her hand down her pants, rubbing one out as she watches you get fucked by Artem. You just grin.'
 		gs 'arousal', 'vaginal', 2
 		gs 'stat'
-		act 'Offer up your ass': gt 'artem_nush_sex_uni', 'artem_sveta_anal'
+		act 'Offer up your ass': gt 'artem_nush_sex', 'artem_sveta_anal'
 		act 'Get fucked some more':
 			*clr & cla
 			gs 'boyStat', 'A2'

+ 527 - 86
locations/artem_sex.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'hj':
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/cleanhands.jpg"></center>'
 			'You grab some tissues off his nightstand and start cleaning his cum off your hands as he blushes. "Sorry."'
-			'You smile at him. "Nothing to be sorry for. It''s just part of sex."' 
+			'You smile at him. "Nothing to be sorry for. It''s just part of sex."'
 			'He just smiles and looks at you as if you''re the most fantastic thing in the world. You finish cleaning off your hands, then give him a quick kiss.'
 			cumspclnt = 9
 			gs 'cum_cleanup'
@@ -43,7 +43,7 @@ if $ARGS[0] = 'hj':
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/lickupcum.jpg"></center>'
 			'You keep hold of his dick and stroke it a few more times until you''ve milked every last drop out of him before you start licking the cum from your hands. His eyes grow wide as he watches you. Once you lick your hands clean, you also lick his dick clean. "You didn''t have to do that. I have tissues you can use."'
-			'You smile at him. "It''s okay. I like the way it tastes."' 
+			'You smile at him. "It''s okay. I like the way it tastes."'
 			'He just smiles and looks at you as if you''re the most fantastic thing in the world. You finish cleaning off your hands, then give him a quick kiss.'
 			cumspclnt = 9
 			gs 'cum_cleanup'
@@ -229,7 +229,7 @@ if $ARGS[0] = 'sex':
 								act 'Finish him with your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
 						end
-					end	
+					end
 				elseif stat['think_virgin'] = 1:
 					'You take his dick out of your mouth for a second and smile apologetically. "Sorry Artem, but I''m still a virgin, and I''m not sure if I''m ready yet. I bet I could still make you feel good with my mouth."'
 					'Artem blushes, but presses on. "I''d like to be your first. So it can be both of our first times together."'
@@ -277,7 +277,7 @@ if $ARGS[0] = 'sex':
 						act 'Just keep sucking': gt 'artem_sex', 'bj'
 					end
 				else
-					act 'Do anal instead': 
+					act 'Do anal instead':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/first5.jpg"></center>'
 						if artemQW['anal'] > 0:
@@ -545,7 +545,7 @@ end
 
 if $ARGS[0] = 'slut_anal':
 	*clr & cla
-	artemQW['anal'] += 1
+	artemQW['anal'] = 1
 	artemQW['artem_dom'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/first3.jpg"></center>'
 	'You start stripping before him, giving him a little show as you remove your clothes, reveling in his undivided attention. Once you''re fully naked, he mutters "Get on your hands and knees, <<$pcs_nickname>>."'
@@ -569,7 +569,7 @@ if $ARGS[0] = 'slut_anal':
 			act 'Facial':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/facial.jpg"></center>'
-				'He suddenly pulls his dick out of you. "I want to cum on your face."' 
+				'He suddenly pulls his dick out of you. "I want to cum on your face."'
 				'You do as he asks and turn round before taking his dick in your hand and stroking it. Almost at once, a hot stream of jizz hits you right in the face, another hits your cheek and the last one lands on your chin.'
 				'"I think we''re done for the day, <<$pcs_nickname>>. I have some things I need to do, so can you please leave now?" he asks as he grabs a tissue to clean up his dick, so you gather your clothes and get dressed.'
 				gs 'arousal', 'hj', 2, 'sub'
@@ -617,7 +617,7 @@ if $ARGS[0] = 'anushka_3some_oral2':
 	*clr & cla
 	artemQW['nushart_oral'] += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some3.jpg"></center>'
-	'You look at her inviting pussy and can''t help yourself. You move in behind Anushka, bury your face in her pussy and start licking. She starts quickly getting wet as she moans loudly.' 
+	'You look at her inviting pussy and can''t help yourself. You move in behind Anushka, bury your face in her pussy and start licking. She starts quickly getting wet as she moans loudly.'
 	'You eat her out for a few minutes with no idea what Artem is doing before you pull away and see him staring at you wide-eyed and flushed.'
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
@@ -639,7 +639,7 @@ if $ARGS[0] = 'anushka_3some_bj':
 	act 'Tell Anushka to suck his dick':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some5.jpg"></center>'
-		'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck this cock like the good little slut you are!"' 
+		'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck this cock like the good little slut you are!"'
 		'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head of his dick into her mouth, tightly wraps her lips around his shaft and starts sucking. After you''re satisfied that she''s doing what you want, you start licking his balls and hear him moaning loudly.'
 		gs 'arousal', 'foreplay', 2
 		gs 'stat'
@@ -692,7 +692,7 @@ if $ARGS[0] = 'anushka_3some_bj':
 								end
 							else
 								act 'Encourage him to get rough (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end	
+							end
 							act 'Ask him to butt fuck you': gt 'artem_sex', 'anushka_3some_anal'
 						end
 					end
@@ -744,7 +744,7 @@ if $ARGS[0] = 'anushka_3some_doggy':
 	'She sits up and gives you a bemused look as Artem takes a step back to watch, eager to get it stuck back in. Anushka gets up and you get on the ottoman bench with your head facing Artem before you encourage her to straddle you and start licking her pussy. You push her forward so her upper body is lying on you, then slide your hands back to her ass and pull her ass cheeks apart, causing her asshole to gape a little. This is all the encouragement Artem needs as he quickly steps closer and slides his dick back up her ass. You can hear her moan loudly as he does.'
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
-	act 'Let him finish': 
+	act 'Let him finish':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some15.jpg"></center>'
 		'You decide not to encourage him further. If he doesn''t have what it takes to fuck a girl roughly, then that''s on him, but you know he''ll be a little disappointed in himself for not taking full advantage of his opportunity as you keep licking Anushka while Artem fucks her ass. It doesn''t take much longer before he starts to grunt, and you can tell he''s about to cum. In fact, he soon pulls out of Anushka''s asshole and starts stroking his cock.'
@@ -767,7 +767,7 @@ if $ARGS[0] = 'anushka_3some_doggy':
 			gs 'arousal', 'cuni_give', 3, 'lesbian', 'dom'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Let him finish': 
+			act 'Let him finish':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some15.jpg"></center>'
 				'You decide not to encourage him further. If he doesn''t have it in him, then that''s his fault, but you know he''ll be a little disappointed for not taking full advantage of his opportunity as you keep licking Anushka while Artem fucks her ass. It doesn''t take much longer before he starts to grunt, and you can tell he''s about to cum. In fact, he soon pulls out of Anushka''s asshole and starts stroking his cock.'
@@ -812,11 +812,11 @@ if $ARGS[0] = 'anushka_3some_doggy':
 				end
 			else
 				act 'Encourage him to really pound her (<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
 	else
 		act 'Encourage him to fuck her harder (<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
 
 if $ARGS[0] = 'anushka_3some_facial':
@@ -1083,7 +1083,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 				'You smile and kiss him again. "Look on the bright side! You got to fuck one of your bullies in the ass. How many people ever get to say that?"'
 				'He looks at you and laughs while shaking his head. "You''re right... I just wish..."'
 				'You look at him. "Wish what?"'
-				'He sighs. "I wish I had taken better advantage of the situation, maybe really paid her back for all the teasing she''s put me through over the years."' 
+				'He sighs. "I wish I had taken better advantage of the situation, maybe really paid her back for all the teasing she''s put me through over the years."'
 				'Before you can reply, he kisses you before walking you to the door. It seems it didn''t bother him too much, so you head on your way.'
 				act 'Leave': gt 'pod_ezd', 'etaj_1'
 			end
@@ -1195,7 +1195,7 @@ if $ARGS[0] = 'nush3some_how_he_feels':
 				'You''re a little surprised by this outburst, but also proud that he''s gaining self-confidence. "Wow! I didn''t know the bullying bothered you this much." He starts to say something, but you keep going. "But I get it, I really do. She and the other gopniks have bullied and sometimes hurt you, and you just wanted to get a little revenge. It''s only natural."'
 				'He relaxes a little, seemingly relieved you''re not upset by what he just said. "Yeah... I just regret missing my only chance to really get some payback." You think about what he said. You know you could likely talk her back into coming back eventually, but do you want to share your boyfriend with her again?'
 			end
-			act 'Agree he missed his chance': 
+			act 'Agree he missed his chance':
 				*clr & cla
 				artemQW['nush3some'] = -1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
@@ -1234,7 +1234,7 @@ if $ARGS[0] = 'nush3some_how_he_feels':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 					'You think for a few seconds before nodding. Anushka likes the rough stuff, and more importantly, you think this will do Artem some good. "Okay, I''ll try and talk her into it, but..." You pause and can tell he''s expecting you to ask him to not be too rough next time. "Only if you promise to not hold back."'
-					'He looks surprised by your comment. "Really!?"' 
+					'He looks surprised by your comment. "Really!?"'
 					act 'Yes':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
@@ -1278,107 +1278,211 @@ end
 if $ARGS[0] = 'strapon_first':
 	*clr & cla
 	minut += 3
+	artemQW['strapon_count'] += 1
 	artemQW['artem_dom'] -= 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon3.jpg"></center>'
-	'You slide the harness on and he helps you buckle it in place before he takes his pants off. You can tell he''s nervous and do your best to give him reassuring smiles, but it doesn''t seem to help.'
-	'Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
-	act 'Continue':
+	if spellKnown['penisenvy'] = 1:
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You can tell he''s nervous and do your best to give him reassuring smiles, but it doesn''t seem to help. You could use this moment to cast the Penis Envy spell. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		if penisEnvyVariable = 0:
+			act 'Cast Penis Envy spell':
+				*clr & cla
+				gs 'castSpell', 'penisenvy'
+				if spellSuccess > 0:
+					act 'Get a blowjob': gt 'artem_sex', 'strapon_first_magic'
+				else
+					act 'Get a blowjob': gt 'artem_sex', 'strapon_first_bj'
+				end
+			end
+		else
+			act 'Get a blowjob': gt 'artem_sex', 'strapon_first_magic'
+		end
+	else
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You can tell he''s nervous and do your best to give him reassuring smiles, but it doesn''t seem to help.'
+		'Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		act 'Get a blowjob': gt 'artem_sex', 'strapon_first_bj'
+	end
+end
+
+if $ARGS[0] = 'strapon_first_bj':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before slowly opening his mouth and taking the dildo in. He starts slowly sucking on it; by his expression, you don''t think he''s really into it, but is doing it to make you happy.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
-		'He gets on his knees in front of you and grabs the back of your legs with his hands before slowly opening his mouth and taking the dildo in. He starts slowly sucking on it; by his expression, you don''t think he''s really into it, but is doing it to make you happy.'
-		'"Okay, take off your shirt and get on the bed," you tell him.'
-		gs 'arousal', 'foreplay_give', 2
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before sitting back on the bed as you smile at him. "You need to roll over."'
+		'He blushes, but rolls over onto his stomach as you open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up the dildo before squirting some lube between his ass cheeks and working it in.'
+		'He glances back over his shoulder at you. "That feels weird."'
+		*nl
+		'You give him a reassuring smile. "It''s okay. Just take a deep breath and relax."'
+		'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He just nods in response and you line the dildo up and slowly push it into his asshole, causing him to hiss in pain.'
+		'"Just breathe," you tell him and he does as you instruct. You wait until you feel him relax before pushing the dildo further into him.'
+		gs 'arousal', 'anal_strap_give', 2
 		gs 'stat'
-		act 'Get the lube':
+		act 'Continue':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
-			'He stops sucking on the dildo and takes off his shirt before sitting back on the bed as you smile at him. "You need to roll over."'
-			'He blushes, but rolls over onto his stomach as you open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up the dildo before squirting some lube between his ass cheeks and working it in.'
-			'He glances back over his shoulder at you. "That feels weird."'
-			'You give him a reassuring smile. "It''s okay. Just take a deep breath and relax."'
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with the strapon, only thrusting about half the length of the dildo into him. "How does that feel?"'
+			'He doesn''t answer at first. "Not as bad as I thought. It stopped hurting."'
+			'You slowly slide the entire length of the <<dick>>cm <<$dick_girth>> dildo into his ass, causing him to moan as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you like that."'
 			*nl
-			'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
-			'He just nods in response and you line the dildo up and slowly push it into his asshole, causing him to hiss in pain.'
-			'"Just breathe," you tell him and he does as you instruct. You wait until you feel him relax before pushing the dildo further into him.'
+			'He glances back over his shoulder at you. "It feels weird, but yeah, I kind of like it."'
+			'You give him a reassuring smile. "Great, because I love this. Now take a deep breath."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to enjoy it.'
 			gs 'arousal', 'anal_strap_give', 2
 			gs 'stat'
-			act 'Continue':
+			act 'Start fucking him hard and fast':
 				*clr & cla
-				gs 'boyStat', 'D<<strapnumber>>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
-				'You start slowly fucking him with the strapon, only thrusting about half the length of the dildo into him. "How does that feel?"'
-				'He doesn''t answer at first. "Not as bad as I thought. It stopped hurting."'
-				'You slowly slide the entire length of the <<dick>>cm <<$dick_girth>> dildo into his ass, causing him to moan as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you like that."'
-				*nl
-				'He glances back over his shoulder at you. "It feels weird, but yeah, I kind of like it."'
-				'You give him a reassuring smile. "Great, because I love this. Now take a deep breath."'
-				'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to enjoy it.'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You start to pick up speed until you''re really hammering his ass. "Fuck yeah, take my cock, bitch!"'
+				'He pushes his hands against your hips to slow you down. "Not so hard! That hurts!"'
 				gs 'arousal', 'anal_strap_give', 2
 				gs 'stat'
-				act 'Start fucking him hard and fast':
+				act 'Keep fucking him hard':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
-					'You start to pick up speed until you''re really hammering his ass. "Fuck yeah, take my cock, bitch!"'
-					'He pushes his hands against your hips to slow you down. "Not so hard! That hurts!"'
+					minut += 5
+					artemQW['strapon'] = -1
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+					'You don''t do as he asks. "Come on baby, just relax."'
+					'His moans quickly turn to pained grunts. "Stop! That hurts!" he cries out and shoves you off before sitting up and glaring at you. "What the hell, <<$pcs_nickname>>?! That hurt!"'
+					'You frown. "Sorry, I just got carried away. Forgive me?"'
+					'He sighs. "Okay, I forgive you, but that''s it. I''m not doing that again." You''re about to speak, but he shakes his head. "No! Never. Again. I''m going to go take a shower. Talk to you later."'
+					*nl
+					'You sigh and slide the harness off before leaving his apartment.'
 					gs 'arousal', 'anal_strap_give', 2
 					gs 'stat'
-					act 'Keep fucking him hard':
+					act 'Leave': gt 'pod_ezd', 'etaj_1'
+				end
+				act 'Ease up':
+					*clr & cla
+					artemQW['strapon'] = 1
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+					'You ease up a little, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+					'You grin. "You like taking my cock in your ass, don''t you?"'
+					'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it."'
+					'He keeps moaning louder, which only turns you on more, but after several minutes, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt again."'
+					gs 'arousal', 'anal_strap_give', 3
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Continue':
 						*clr & cla
-						minut += 5
-						artemQW[strapon] = -1
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
-						'You don''t do as he asks. "Come on baby, just relax."'
-						'His moans quickly turn to pained grunts. "Stop! That hurts!" he cries out and shoves you off before sitting up and glaring at you. "What the hell, <<$pcs_nickname>>?! That hurt!"'
-						'You frown. "Sorry, I just got carried away. Forgive me?"'
-						'He sighs. "Okay, I forgive you, but that''s it. I''m not doing that again." You''re about to speak, but he shakes his head. "No! Never. Again. I''m going to go take a shower. Talk to you later."'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+						'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming.'
+						'"I guess you really liked it..." you say once he finishes.'
 						*nl
-						'You sigh and slide the harness off before leaving his apartment.'
-						gs 'arousal', 'anal_strap_give', 2
-						gs 'stat'
+						'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
+						'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+						'"Let me think about it," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up. "I need to shower and should finish my homework. See you tomorrow?"'
+						'You nod and he kisses you before leaving his room and going to the bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
 						act 'Leave': gt 'pod_ezd', 'etaj_1'
 					end
-					act 'Ease up':
-						*clr & cla
-						artemQW[strapon] = 1
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				end
+			end
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your steady pace, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt again."'
+				gs 'arousal', 'anal_strap_give', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+					'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming.'
+					'"I guess you really liked it..." you say once he finishes.'
+					*nl
+					'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
+					'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+					'"Let me think about it," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up. "I need to shower and should finish my homework. See you tomorrow?"'
+					'You nod and he kisses you before leaving his room and going to the bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+					act 'Leave': gt 'pod_ezd', 'etaj_1'
+				end
+			end
+		end
+	end
+end
 
-						'You ease up a little, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
-						'You grin. "You like taking my cock in your ass, don''t you?"'
-						'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it."'
-						'He keeps moaning louder, which only turns you on more, but ater several minutes, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt again."'
-						gs 'arousal', 'anal_strap_give', 5
-						gs 'arousal', 'end'
-						gs 'stat'
-						act 'Continue':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
-							'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming.'
-							'"I guess you really liked it..." you say once he finishes.'
-							*nl
-							'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
-							'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
-							'"Let me think about it," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up. "I need to shower and should finish my homework. See you tomorrow?"'
-							'You nod and he kisses you before leaving his room and going to the bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
-							act 'Leave': gt 'pod_ezd', 'etaj_1'
-						end
-					end
+if $ARGS[0] = 'strapon_first_magic':
+	*clr & cla
+	$orgasm_or = 'no'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before slowly opening his mouth and taking the dildo in. As he starts sucking on your dick you can feel the warm wetness of his mouth, he starts slowly sucking on it; you don''t think he''s really into it, but is doing it to make you happy.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before sitting back on the bed as you smile at him. "You need to roll over."'
+		'He blushes, but rolls over onto his stomach as you open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up your dick before squirting some lube between his ass cheeks and working it in.'
+		'He glances back over his shoulder at you. "That feels weird."'
+		*nl
+		'You give him a reassuring smile. "It''s okay. Just take a deep breath and relax."'
+		'Once he and your dick are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He just nods in response and you line the dildo up and slowly push it into his asshole, causing him to hiss in pain.'
+		'"Just breathe," you tell him and he does as you instruct. You wait until you feel him relax before pushing your cock further into him.'
+		gs 'arousal', 'magicd_anal', 2
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with your cock, his virgin asshole tightly gripping your cock, which feels amazing for you. You are only thrusting about half the length of the dildo into him. "How does that feel?"'
+			'He doesn''t answer at first. "Not as bad as I thought. It stopped hurting."'
+			'You slowly slide the entire length of your <<dick>>cm <<$dick_girth>> dick into his ass, causing him to groan as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you like that."'
+			*nl
+			'He glances back over his shoulder at you. "It feels weird, but yeah, I kind of like it."'
+			'You give him a reassuring smile. "Great, because I love this. Now take a deep breath."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to enjoy it.'
+			gs 'arousal', 'magicd_anal', 2
+			gs 'stat'
+			act 'Start fucking him hard and fast':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You start to pick up speed until you''re really hammering his ass. "Fuck yeah, take my cock, bitch!"'
+				'He pushes his hands against your hips to slow you down. "Not so hard! That hurts!"'
+				gs 'arousal', 'magicd_anal', 2
+				gs 'stat'
+				act 'Keep fucking him hard':
+					*clr & cla
+					minut += 5
+					artemQW['strapon'] = -1
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+					'You don''t do as he asks. "Come on baby, just relax."'
+					'His moans quickly turn to pained grunts. "Stop! That hurts!" he cries out and shoves you off before sitting up and glaring at you. "What the hell, <<$pcs_nickname>>?! That hurt!"'
+					'You frown. "Sorry, I just got carried away. Forgive me?"'
+					'He sighs. "Okay, I forgive you, but that''s it. I''m not doing that again." You''re about to speak, but he shakes his head. "No! Never. Again. I''m going to go take a shower. Talk to you later."'
+					*nl
+					'You sigh and slide the harness off before leaving his apartment.'
+					gs 'arousal', 'magicd_anal', 2
+					gs 'stat'
+					act 'Leave': gt 'pod_ezd', 'etaj_1'
 				end
-				act 'Fuck him nice and steady':
+				act 'Ease up':
 					*clr & cla
-					artemQW[strapon] = 1
+					artemQW['strapon'] = 1
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
-					'You keep your steady pace, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+					'You ease up a little, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
 					'You grin. "You like taking my cock in your ass, don''t you?"'
 					'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it."'
 					'He keeps moaning louder, which only turns you on more, but after several minutes, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt again."'
-					gs 'arousal', 'anal_strap_give', 5
+					gs 'arousal', 'magicd_anal', 3
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
-						'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming.'
+						'You roll off him and pull your dildo out of his ass, making him moan as you do, sadly before you can get off. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming.'
 						'"I guess you really liked it..." you say once he finishes.'
 						*nl
 						'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
@@ -1389,6 +1493,343 @@ if $ARGS[0] = 'strapon_first':
 					end
 				end
 			end
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your steady pace, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt again."'
+				gs 'arousal', 'magicd_anal', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+					'You roll off him and pull your dick out of his ass, making him moan as you do, sadly before you can get off. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming.'
+					'"I guess you really liked it..." you say once he finishes.'
+					*nl
+					'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
+					'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+					'"Let me think about it," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up. "I need to shower and should finish my homework. See you tomorrow?"'
+					'You nod and he kisses you before leaving his room and going to the bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+					act 'Leave': gt 'pod_ezd', 'etaj_1'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'strapon_second':
+	*clr & cla
+	minut += 3
+	artemQW['strapon_count'] += 1
+	artemQW['artem_dom'] -= 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon3.jpg"></center>'
+	if spellKnown['penisenvy'] = 1:
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You can tell he''s still a little nervous but not as much as the first time and do your best to give him reassuring smiles, which seems to help a little. You could use this moment to cast the Penis Envy spell. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		if penisEnvyVariable = 0:
+			act 'Cast Penis Envy spell':
+				*clr & cla
+				gs 'castSpell', 'penisenvy'
+				if spellSuccess > 0:
+					act 'Get a blowjob': gt 'artem_sex', 'strapon_second_magic'
+				else
+					act 'Get a blowjob': gt 'artem_sex', 'strapon_second_bj'
+				end
+			end
+		else
+			act 'Get a blowjob': gt 'artem_sex', 'strapon_second_magic'
+		end
+	else
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You can tell he''s still a little nervous but not as much as the first time and do your best to give him reassuring smiles, which seems to help a little.'
+		'Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		act 'Get a blowjob': gt 'artem_sex', 'strapon_second_bj'
+	end
+end
+
+if $ARGS[0] = 'strapon_second_bj':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before slowly opening his mouth and taking the dildo in. He starts slowly sucking on it; this time he seems a little more into it, but he obviously still isn''t sure what he is doing and seems kinda hesitant still.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before laying down on the bed, this time he remembers to lay on his stomach.'
+		'You open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up the dildo before squirting some lube between his ass cheeks and working it in.'
+		'He glances back over his shoulder at you. "That still feels kinda weird."'
+		*nl
+		'You give him a reassuring smile. "You''ll get used to it, now take a deep breath and relax." Which he does and visibly relaxes more.'
+		'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He nods in response as he says "Yeah." and you line the dildo up and slowly push it into his asshole, causing him to have a slight hiss in pain, which turns into a loud groan.'
+		'"Just breathe," you tell him and he does as you instruct. You wait until you feel him relax again, before pushing the dildo further into him.'
+		gs 'arousal', 'anal_strap_give', 2
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with the strapon, only thrusting about half the length of the dildo into him. "How does that feel?"'
+			'He doesn''t answer at first. "Better than last time, it didn''t hurt as much and stopped hurting sooner."'
+			'You slowly slide the entire length of the <<dick>>cm <<$dick_girth>> dildo into his ass, causing him to moan as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you are starting to like my cock in your ass." You say to him in a slightly teasing tone.'
+			*nl
+			'He glances back over his shoulder at you. "It still feels weird, but yeah, I kind of like it."'
+			'You give him a reassuring smile. "Great, because I love this. Now just relax and take my cock."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to enjoy it.'
+			gs 'arousal', 'anal_strap_give', 2
+			gs 'stat'
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your pace nice and steady, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, it''s starting to feel really good."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans get louder. "I... think... I... think I''m going to cum." Then he tenses up and moans loudly, you are sure he just came from you fucking his ass, with your strapon, which makes you grin.'
+				gs 'arousal', 'anal_strap_give', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+					'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he rolls off the bed and stands up, you can see a wet spot of cum on his bed, where he shot his load. You grin at him. "Looks like someone really liked it."'
+					*nl
+					'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
+					'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+					'He pauses a moment but then nods. "Ok... but not all the time," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up and pulls the sheet off his bed. "I need to shower and clean this up. See you tomorrow?"'
+					'You nod and he kisses you before leaving his room and going to the bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+					act 'Leave': gt 'pod_ezd', 'etaj_1'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'strapon_second_magic':
+	$orgasm_or = 'no'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before slowly opening his mouth and taking your dick into his mouth. As he starts sucking on your cock you can feel the warm wetness of his mouth, as he starts slowly sucking on it; he is doing a better job than last time, he seems to be more into it as well.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before laying down on the bed, this time he remembers to lay on his stomach.'
+		'You open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up your dick before squirting some lube between his ass cheeks and working it in.'
+		'He glances back over his shoulder at you. "That still feels kinda weird."'
+		*nl
+		'You give him a reassuring smile. "You''ll get used to it, now take a deep breath and relax." Which he does and visibly relaxes more.'
+		'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He nods in response as he says "Yeah." You line the dildo up and slowly push it into his asshole, causing him to have a slight hiss in pain, which turns into a loud groan as his tight little asshole grips your cock tightly, causing you to moan in pleasure.'
+		'"Just breathe," you tell him and he does as you instruct. You wait until you feel him relax again, before pushing your dick further into him, causing you to both moan in pleasure.'
+		gs 'arousal', 'magicd_anal', 2
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with your cock, only thrusting about half the length of your dick into him. "How does that feel?"'
+			'He doesn''t answer at first. "Better than last time, it didn''t hurt as much and stopped hurting sooner."'
+			'You slowly slide the entire length of your <<dick>>cm <<$dick_girth>> dick into his ass, it feels amazing to feel the full length of your shaft inside of him. It causes him to moan as well, as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you are starting to like my cock in your ass." You say to him in a slightly teasing tone.'
+			*nl
+			'He glances back over his shoulder at you. "It still feels weird, but yeah, I kind of like it."'
+			'You give him a reassuring smile. "Great, because I love this. Now just relax and take my cock."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to enjoy it.'
+			gs 'arousal', 'magicd_anal', 2
+			gs 'stat'
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your pace nice and steady, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, it''s starting to feel really good."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans get louder. "I... think... I... think I''m going to cum." Then he tenses up and moans loudly, you are sure he just came from you fucking his ass, with your cock, which turns you on even more.'
+				gs 'arousal', 'magicd_anal', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Fill him with your cum':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/pc/magic/penis_envy/guy_internal_butt_cum1.jpg"></center>'
+					$orgasm_or = 'yes'
+					$orgasm_txt = 'You bury your cock one last time balls deep into his ass, as you feel your cock twitch as you empty your load into his ass. Moaning loudly as you fill his ass with your cum, with the last spurt finished, you pull your cock out of his ass and stand up. He sighs loudly as you do. As you step back you can see your cum leaking out of his gaping hole.'
+					gs 'arousal', 'magicd_anal', 2, 'dom', 'inhibition'
+					killvar 'temporgasm'
+					gs 'stat'
+					act 'Climb off him':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+						'Once you''re off him, he rolls off the bed and stands up, you can see a wet spot of cum on his bed, where he shot his load. You grin at him. "Looks like someone really liked it."'
+						*nl
+						'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
+						'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+						'He pauses a moment but then nods. "Ok... but not all the time," he replies and you nod as you start removing the harness, which breaks the spell and your connection to the dildo. Once the strapon is just a regular strapon again, you start cleaning the dildo while he cleans himself up and pulls the sheet off his bed. "I need to shower and clean this up. See you tomorrow?"'
+						'You nod and he kisses you before leaving his room and going to the bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+						act 'Leave': gt 'pod_ezd', 'etaj_1'
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'strapon_again':
+	*clr & cla
+	minut += 3
+	artemQW['strapon_count'] += 1
+	artemQW['artem_dom'] -= 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon3.jpg"></center>'
+	if spellKnown['penisenvy'] = 1:
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You notice he doesn''t seem nervous at all this time, you think he might even look a little eager. You wonder if he is starting to really like this, instead of just doing it to make you happy. You could use this moment to cast the Penis Envy spell. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		if penisEnvyVariable = 0:
+			act 'Cast Penis Envy spell':
+				*clr & cla
+				gs 'castSpell', 'penisenvy'
+				if spellSuccess > 0:
+					act 'Get a blowjob': gt 'artem_sex', 'strapon_again_magic'
+				else
+					act 'Get a blowjob': gt 'artem_sex', 'strapon_again_bj'
+				end
+			end
+		else
+			act 'Get a blowjob': gt 'artem_sex', 'strapon_again_magic'
+		end
+	else
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You notice he doesn''t seem nervous at all this time, you think he might even look a little eager. You wonder if he is starting to really like this, instead of just doing it to make you happy. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		act 'Get a blowjob': gt 'artem_sex', 'strapon_second_bj'
+	end
+end
+
+if $ARGS[0] = 'strapon_again_bj':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before he quickly opens his mouth, taking the dildo in. He starts sucking on it; this time he seems more into it, he doesn''t seem near as hesitant as he has before and he seems to be doing a much better job. You wonder if he has been practicing or just watching a lot of blow job porn.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before laying down on the bed, this time he remembers to lay on his stomach.'
+		'You open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up the dildo before squirting some lube between his ass cheeks and working it in. He doesn''t comment or move as you apply the lube this time.'
+		*nl
+		'You give him a smile. "I see you are getting used to it, now take a deep breath and relax." Which he does and visibly relaxes more.'
+		'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He nods in response as he says "Yeah." sounding a little eager this time, as you line the dildo up and slowly push it into his asshole, causing him to grunt a little as the tip slides in, which quickly turns into a moan from him. Seeing that he seems to not mind this time or maybe is even enjoying it, you slide the dildo further into his ass as you start to fuck him.'
+		gs 'arousal', 'anal_strap_give', 2
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with the strapon, only thrusting about half the length of the dildo into him. "How does that feel?"'
+			'He doesn''t answer at first. "Better than last time, it kinda feels good... but don''t tell anyone I said that."'
+			'You slowly slide the entire length of the <<dick>>cm <<$dick_girth>> dildo into his ass, causing him to moan loudly as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you are enjoying my cock in your ass." You say to him in a slightly teasing tone.'
+			*nl
+			'He moans loudly then glances back over his shoulder at you, you can''t help but notice the turned-on expression on his face. "OOOhhh yeah... just not too rough."'
+			'You give him a reassuring smile. "Great, because I love this. Now just take my cock like the little slut you are."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to really get off on it.'
+			gs 'arousal', 'anal_strap_give', 2
+			gs 'stat'
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your pace nice and steady, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Ah... YES... Yes, keep fucking... me..."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans get louder. "I''m cumming." Then he tenses up and moans loudly, you are sure he just came from you fucking his ass, with your strapon, which makes you grin.'
+				gs 'arousal', 'anal_strap_give', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+					'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he rolls off the bed and stands up, you can see a wet spot of cum on his bed, where he shot his load. You grin at him. "I guess this means you really like this."'
+					*nl
+					'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, I would have never believed how good that could feel." He then raises his gaze to look at you. "Did you like it?"'
+					'You nod your head. "Yes, I had a lot of fun. Maybe we can do something a little different next time."'
+					'He pauses a moment but then nods. "Sure... but not all the time," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up and pulls the sheet off his bed. "I need to shower and clean this up. See you tomorrow?"'
+					'You nod and he kisses you before leaving his room and going to the bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+					act 'Leave': gt 'pod_ezd', 'etaj_1'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'strapon_again_magic':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before quickly opening his mouth and taking your dick into his mouth. As he starts sucking on your cock you can feel the warm wetness of his mouth, as he starts slowly sucking on it; he is doing a much better job than last time, he seems to be more into it as well.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	$orgasm_or = 'no'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before laying down on the bed, this time he remembers to lay on his stomach.'
+		'You open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up your dick before squirting some lube between his ass cheeks and working it in. He doesn''t comment or move as you apply the lube this time.'
+		*nl
+		'You give him a smile. "I see you are getting used to it, now take a deep breath and relax." Which he does and visibly relaxes more.'
+		'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He nods in response as he says "Yeah." sounding a little eager this time, as you line your cock up and slowly push it into his asshole, causing him to grunt a little as the tip slides in, which quickly turns into a moan from him. Seeing that he seems to not mind this time or maybe is even enjoying it, you slide your dick further into his ass as you start to fuck him.'
+		gs 'arousal', 'magicd_anal', 2
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with your cock, only thrusting about half the length of your shaft into him. "How does that feel?"'
+			'He doesn''t answer at first. "Better than last time, it kinda feels good... but don''t tell anyone I said that."'
+			'You slowly slide the entire length of your <<dick>>cm <<$dick_girth>> dick into his ass, causing him to moan loudly as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you are enjoying my cock in your ass." You say to him in a slightly teasing tone.'
+			*nl
+			'He moans loudly then glances back over his shoulder at you, you can''t help but notice the turned-on expression on his face. "OOOhhh yeah... just not to rough."'
+			'You give him a reassuring smile. "Great, because I love this. Now just take my cock like the little slut you are."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to really get off on it.'
+			gs 'arousal', 'magicd_anal', 2
+			gs 'stat'
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your pace nice and steady, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Ah... YES... Yes, keep fucking... me..."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans get louder. "I''m cumming." Then he tenses up and moans loudly, you are sure he just came from you fucking his ass, with your magic cock, which turns you on even more. Not to mention when he tenses up to cum, his asshole tightens around your shaft which feels amazing.'
+				gs 'arousal', 'magicd_anal', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Fill him with your cum':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/pc/magic/penis_envy/guy_internal_butt_cum1.jpg"></center>'
+					$orgasm_txt = 'You bury your cock one last time balls deep into his ass, as you feel your cock twitch as you empty your load into his ass. Moaning loudly as you fill his ass with your cum, with the last spurt finished, you pull your cock out of his ass and stand up. He sighs loudly as you do. As you step back you can see your cum leaking out of his gaping hole.'
+					$orgasm_or = 'yes'
+					gs 'arousal', 'magicd_anal', 2, 'dom', 'inhibition'
+					killvar 'temporgasm'
+					gs 'stat'
+					act 'Climb off him':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+						'You roll off him and pull your dick out of his ass, making him moan as you do. Once you''re off him, he rolls off the bed and stands up, you can see a wet spot of cum on his bed, where he shot his load. You grin at him. "I guess this means you really like this."'
+						*nl
+						'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, I would have never believed how good that could feel." He then raises his gaze to look at you. "Did you like it?"'
+						'You nod your head. "Yes, I had a lot of fun. Maybe we can do something a little different next time."'
+						'He pauses a moment but then nods. "Sure... but not all the time," he replies and you nod as you start removing the harness, which breaks the spell and your connection to the dildo. Once the strapon is just a regular strapon again, you start cleaning the dildo while he cleans himself up and pulls the sheet off his bed. "I need to shower and clean this up. See you tomorrow?"'
+						'You nod and he kisses you before leaving his room and going to the bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+						act 'Leave': gt 'pod_ezd', 'etaj_1'
+					end
+				end
+			end
 		end
 	end
 end

+ 537 - 81
locations/artem_sex_uni.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'hj':
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/cleanhands.jpg"></center>'
 			'You grab some tissues off his nightstand and start cleaning his cum off your hands as he blushes. "Sorry."'
-			'You smile at him. "Nothing to be sorry for. It''s just part of sex."' 
+			'You smile at him. "Nothing to be sorry for. It''s just part of sex."'
 			'He just smiles and looks at you as if you''re the most fantastic thing in the world. You finish cleaning off your hands, then give him a quick kiss.'
 			cumspclnt = 9
 			gs 'cum_cleanup'
@@ -42,7 +42,7 @@ if $ARGS[0] = 'hj':
 			minut += 5
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/lickupcum.jpg"></center>'
 			'You keep hold of his dick and stroke it a few more times until you''ve milked every last drop out of him before you start licking the cum from your hands. His eyes grow wide as he watches you. Once you lick your hands clean, you also lick his dick clean. "You didn''t have to do that. I have tissues you can use."'
-			'You smile at him. "It''s okay. I like the way it tastes."' 
+			'You smile at him. "It''s okay. I like the way it tastes."'
 			'He just smiles and looks at you as if you''re the most fantastic thing in the world. You finish cleaning off your hands, then give him a quick kiss.'
 			cumspclnt = 9
 			gs 'cum_cleanup'
@@ -228,7 +228,7 @@ if $ARGS[0] = 'sex':
 								act 'Finish him with your mouth (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
 						end
-					end	
+					end
 				elseif stat['think_virgin'] = 1:
 					'You take his dick out of your mouth for a second and smile apologetically. "Sorry Artem, but I''m still a virgin, and I''m not sure if I''m ready yet. I bet I could still make you feel good with my mouth."'
 					'Artem blushes, but presses on. "I''d like to be your first. So it can be both of our first times together."'
@@ -276,7 +276,7 @@ if $ARGS[0] = 'sex':
 						act 'Just keep sucking': gt 'artem_sex_uni', 'bj'
 					end
 				else
-					act 'Do anal instead': 
+					act 'Do anal instead':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/first5.jpg"></center>'
 						if artemQW['anal'] > 0:
@@ -487,7 +487,7 @@ if $ARGS[0] = 'anushka_3some_oral2':
 	*clr & cla
 	artemQW['nushart_oral'] += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some3.jpg"></center>'
-	'You look at her inviting ass and pussy and can''t help yourself. You move in behind Anushka, bury your face in her pussy and start licking. She starts quickly getting wet as she moans loudly.' 
+	'You look at her inviting ass and pussy and can''t help yourself. You move in behind Anushka, bury your face in her pussy and start licking. She starts quickly getting wet as she moans loudly.'
 	'You eat her out for a few minutes with no idea what Artem is doing before you pull away and see him staring at you wide-eyed and flushed.'
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
@@ -509,7 +509,7 @@ if $ARGS[0] = 'anushka_3some_bj':
 	act 'Tell Anushka to suck his dick':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some5.jpg"></center>'
-		'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck this cock like the good little slut you are!"' 
+		'You pop his dick out of your mouth and look back at Anushka. "Get up here and suck this cock like the good little slut you are!"'
 		'She stops eating you out to look up at you with an amused smirk on her face before she moves up and kneels down beside the couch. She obediently takes his cock in one hand and starts stroking it while she takes the head of his dick into her mouth, tightly wraps her lips around his shaft and starts sucking. After you''re satisfied that she''s doing what you want, you start licking his balls and hear him moaning loudly.'
 		gs 'arousal', 'foreplay', 2
 		gs 'stat'
@@ -562,7 +562,7 @@ if $ARGS[0] = 'anushka_3some_bj':
 								end
 							else
 								act 'Encourage him to get rough (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end	
+							end
 							act 'Ask him to butt fuck you': gt 'artem_sex_uni', 'anushka_3some_anal'
 						end
 					end
@@ -614,7 +614,7 @@ if $ARGS[0] = 'anushka_3some_doggy':
 	'She sits up and gives you a bemused look as Artem takes a step back to watch, eager to get it stuck back in. Anushka gets up and you get on the ottoman bench with your head facing Artem before you encourage her to straddle you and start licking her pussy. You push her forward so her upper body is lying on you, then slide your hands back to her ass and pull her ass cheeks apart, causing her asshole to gape a little. This is all the encouragement Artem needs as he quickly steps closer and slides his dick back up her ass. You can hear her moan loudly as he does.'
 	gs 'arousal', 'cuni_give', 2, 'lesbian'
 	gs 'stat'
-	act 'Let him finish': 
+	act 'Let him finish':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some15.jpg"></center>'
 		'You decide not to encourage him further. If he doesn''t have what it takes to fuck a girl roughly, then that''s on him. You know he''ll be a little disappointed in himself for not taking full advantage of his opportunity as you keep licking Anushka while Artem fucks her ass. It doesn''t take much longer before he starts to grunt, and you can tell he''s about to cum. In fact, he soon pulls out of Anushka''s asshole and starts stroking his cock.'
@@ -637,7 +637,7 @@ if $ARGS[0] = 'anushka_3some_doggy':
 			gs 'arousal', 'cuni_give', 3, 'lesbian', 'dom'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Let him finish': 
+			act 'Let him finish':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/sex/nush3some15.jpg"></center>'
 				'You decide not to encourage him further. If he doesn''t have it in him to pound a girl like she''s nothing more than a wet hole for his pleasure, then that''s his fault. You know he''ll be a little disappointed in himself for not taking full advantage of his opportunity as you keep licking Anushka while Artem fucks her ass. It doesn''t take much longer before he starts to grunt, and you can tell he''s about to cum. In fact, he soon pulls out of Anushka''s asshole and starts stroking his cock.'
@@ -682,11 +682,11 @@ if $ARGS[0] = 'anushka_3some_doggy':
 				end
 			else
 				act 'Encourage him to really pound her (<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
 	else
 		act 'Encourage him to fuck her harder (<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
 
 if $ARGS[0] = 'anushka_3some_facial':
@@ -939,7 +939,7 @@ if $ARGS[0] = 'anushka_3some_cleanup':
 				'You smile and kiss him again. "Look on the bright side! You got to fuck one of your bullies in the ass. How many people ever get to say that?"'
 				'He looks at you and laughs while shaking his head. "You''re right... you''re right. I just wish..."'
 				'You look at him. "Wish what?"'
-				'He sighs. "I wish I had taken better advantage of the situation, maybe really paid her back some for all the teasing she''s put me through over the years."' 
+				'He sighs. "I wish I had taken better advantage of the situation, maybe really paid her back some for all the teasing she''s put me through over the years."'
 				'Before you can reply, he kisses you before walking you to the door. It seems it didn''t bother him too much, so you head on your way.'
 				act 'Leave': gt 'uni_dorm', 'second_floor'
 			end
@@ -1051,7 +1051,7 @@ if $ARGS[0] = 'nush3some_how_he_feels':
 				'You''re a little surprised by this outburst, but also proud that he''s gaining self-confidence. "Wow! I didn''t know the bullying bothered you this much." He starts to say something, but you keep going. "But I get it, I really do. She and the other gopniks have bullied and sometimes hurt you, and you just wanted to get a little revenge. It''s only natural."'
 				'He relaxes a little, seemingly relieved you''re not upset by what he just said. "Yeah... I just regret missing my only chance to really get some payback." You think about what he said. You know you could likely talk her back into coming back eventually, but do you want to share your boyfriend with her again?'
 			end
-			act 'Agree he missed his chance': 
+			act 'Agree he missed his chance':
 				*clr & cla
 				artemQW['nush3some'] = -1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
@@ -1084,7 +1084,7 @@ if $ARGS[0] = 'nush3some_how_he_feels':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 					'You think for a few seconds before nodding. Anushka likes the rough stuff, and more importantly, you think this will do Artem some good. "Okay, I''ll try and talk her into it, but..." You pause and can tell he''s expecting you to ask him to not be too rough next time. "Only if you promise to not hold back."'
-					'He looks surprised by your comment. "Really!?"' 
+					'He looks surprised by your comment. "Really!?"'
 					act 'Yes':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
@@ -1131,99 +1131,555 @@ if $ARGS[0] = 'strapon_first':
 	artemQW['artem_dom'] -= 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon3.jpg"></center>'
-	'You slip on the harness and he helps you buckle it in place before he takes his pants off. You can tell he''s nervous and do your best to give him reassuring smiles, but it doesn''t seem to help. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
-	act 'Continue':
+	if spellKnown['penisenvy'] = 1:
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You can tell he''s nervous and do your best to give him reassuring smiles, but it doesn''t seem to help. You could use this moment to cast the Penis Envy spell. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		if penisEnvyVariable = 0:
+			act 'Cast Penis Envy spell':
+				*clr & cla
+				gs 'castSpell', 'penisenvy'
+				if spellSuccess > 0:
+					act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_first_magic'
+				else
+					act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_first_bj'
+				end
+			end
+		else
+			act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_first_magic'
+		end
+	else
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You can tell he''s nervous and do your best to give him reassuring smiles, but it doesn''t seem to help.'
+		'Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_first_bj'
+	end
+end
+
+if $ARGS[0] = 'strapon_first_bj':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before slowly opening his mouth and taking the dildo in. He starts slowly sucking on it; by his expression, you don''t think he''s really into it, but is doing it to make you happy.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
 		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
-		'He gets on his knees in front of you and grabs the back of your legs with his hands before slowly opening his mouth and taking the dildo in. He starts slowly sucking on it; by his expression, you don''t think he''s really into it, but is doing it to make you happy. "Okay, take off your shirt and get on the bed."'
-		gs 'arousal', 'foreplay_give', 2
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before sitting back on the bed as you smile at him. "You need to roll over."'
+		'He blushes, but rolls over onto his stomach as you open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up the dildo before squirting some lube between his ass cheeks and working it in.'
+		'He glances back over his shoulder at you. "That feels weird."'
+		*nl
+		'You give him a reassuring smile. "It''s okay. Just take a deep breath and relax."'
+		'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He just nods in response and you line the dildo up and slowly push it into his asshole, causing him to hiss in pain.'
+		'"Just breathe," you tell him and he does as you instruct. You wait until you feel him relax before pushing the dildo further into him.'
+		gs 'arousal', 'anal_strap_give', 2
 		gs 'stat'
-		act 'Get the lube':
+		act 'Continue':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
-
-			'He stops sucking on the dildo and takes off his shirt before sitting back on the bed as you smile at him. "You need to roll over." He blushes, but rolls over onto his stomach as you open his nightstand and take out the lube he got to use on you before crawling onto the bed on your knees. You lube up the dildo before squirting some between his ass cheeks and working it in.'
-
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with the strapon, only thrusting about half the length of the dildo into him. "How does that feel?"'
+			'He doesn''t answer at first. "Not as bad as I thought. It stopped hurting."'
+			'You slowly slide the entire length of the <<dick>>cm <<$dick_girth>> dildo into his ass, causing him to moan as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you like that."'
 			*nl
-			'He glances back over his shoulder at you. "That feels weird."'
-			'You give him a reassuring smile. "It''s okay. Just take a deep breath and relax." Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?" He just nods in response and you line up the dildo and slowly push it into his ass until the head pops in and he hisses in pain, causing you to stop moving. "Just breathe."'
-			'He does as you instruct, and you wait until you feel him relax before pushing the dildo further into him.'
+			'He glances back over his shoulder at you. "It feels weird, but yeah, I kind of like it."'
+			'You give him a reassuring smile. "Great, because I love this. Now take a deep breath."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to enjoy it.'
 			gs 'arousal', 'anal_strap_give', 2
 			gs 'stat'
-			act 'Continue':
+			act 'Start fucking him hard and fast':
+				artemQW['strapon_count'] += 1
 				*clr & cla
-				gs 'boyStat', 'D<<strapnumber>>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
-				'You start to slowly fuck him with the strapon, only thrusting about half the length of the dildo into him. "How does that feel?"'
-				'He doesn''t answer at first. "Not as bad as I thought. It stopped hurting."'
-				'You slowly slide the entire length of the <<dick>>cm <<$dick_girth>> dildo into his ass, causing him to moan as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you like that."'
-				*nl
-				'He glances back over his shoulder at you. "It feels weird, but yeah, I kind of like it."'
-				'You give him a reassuring smile. "Great, because I love this. Now take a deep breath." You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to enjoy it.'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You start to pick up speed until you''re really hammering his ass. "Fuck yeah, take my cock, bitch!"'
+				'He pushes his hands against your hips to slow you down. "Not so hard! That hurts!"'
 				gs 'arousal', 'anal_strap_give', 2
 				gs 'stat'
-				act 'Start fucking him hard and fast':
+				act 'Keep fucking him hard':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
-					'You start to pick up speed until you''re really hammering his ass. "Fuck yeah, take my cock bitch!"'
-					'His moans turn to grunts, and he puts his hands back against your hips to slow you down. "Slow down, not so hard! That hurts!"'
+					minut += 5
+					artemQW['strapon'] = -1
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+					'You don''t do as he asks. "Come on baby, just relax."'
+					'His moans quickly turn to pained grunts. "Stop! That hurts!" he cries out and shoves you off before sitting up and glaring at you. "What the hell, <<$pcs_nickname>>?! That hurt!"'
+					'You frown. "Sorry, I just got carried away. Forgive me?"'
+					'He sighs. "Okay, I forgive you, but that''s it. I''m not doing that again." You''re about to speak, but he shakes his head. "No! Never. Again. I''m going to go take a shower. Talk to you later."'
+					*nl
+					'You sigh and slide the harness off before leaving his apartment.'
 					gs 'arousal', 'anal_strap_give', 2
 					gs 'stat'
-					act 'Keep fucking him hard':
+					act 'Leave': gt 'uni_dorm', 'second_floor'
+				end
+				act 'Ease up':
+					*clr & cla
+					artemQW['strapon'] = 1
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+					'You ease up a little, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+					'You grin. "You like taking my cock in your ass, don''t you?"'
+					'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it."'
+					'He keeps moaning louder, which only turns you on more, but after several minutes, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt again."'
+					gs 'arousal', 'anal_strap_give', 3
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Continue':
 						*clr & cla
-						minut += 5
-						artemQW['strapon'] = -1
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
-						'You don''t do as he asks. "Come on baby, just relax."'
-						'His grunts turn to pained groans. "Stop! That hurts!" He shoves you off before sitting up and glaring at you. "What the hell, <<$pcs_nickname>>?! That hurt!"'
-						'You frown. "Sorry, I just got carried away. Forgive me?"'
-						'He sighs. "Okay, I forgive you, but that''s it. I''m not doing that again." You start to speak, but he shakes his head. "No! Never. Again. I''m going to go take a shower. Talk to you later."'
-						gs 'arousal', 'anal_strap_give', 2
-						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+						'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming.'
+						'"I guess you really liked it..." you say once he finishes.'
+						*nl
+						'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
+						'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+						'"Let me think about it," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up. "I need to shower and should finish my homework. See you tomorrow?"'
+						'You nod and he kisses you before leaving his room and going to the dorm floor bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
 						act 'Leave': gt 'uni_dorm', 'second_floor'
 					end
-					act 'Ease up a bit':
-						*clr & cla
-						artemQW['strapon'] = 1
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
-						'You ease up a bit, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
-						'You grin as it sounds like he''s really starting to enjoy it. "You like taking my cock in your ass, don''t you?"'
-						'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it." He keeps moaning louder, which only turns you on more. Finally, after several minutes of this, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt a little again."'
-						gs 'arousal', 'anal_strap_give', 5
-						gs 'arousal', 'end'
-						gs 'stat'
-						act 'Continue':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
-							'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming. "I guess you really liked it," you say once he finishes.'
-							'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would..." He raises his gaze to look at you. "Did you like it?"'
-							'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
-							*nl
-							'"Let me think about it," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up. "I think I need to shower, and I really should finish my homework. See you tomorrow?"'
-							'You nod. "Sure, see you tomorrow." He kisses you briefly before leaving his room and going to the bathroom. Placing the strap-on back in your purse, you leave his room with a massive grin on your face.'
-							act 'Leave': gt 'uni_dorm', 'second_floor'
-						end
-					end
 				end
-				act 'Fuck him nice and steady':
+			end
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon_count'] += 1
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your steady pace, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt again."'
+				gs 'arousal', 'anal_strap_give', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+					'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming.'
+					'"I guess you really liked it..." you say once he finishes.'
+					*nl
+					'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
+					'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+					'"Let me think about it," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up. "I need to shower and should finish my homework. See you tomorrow?"'
+					'You nod and he kisses you before leaving his room and going to the dorm floor bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+					act 'Leave': gt 'uni_dorm', 'second_floor'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'strapon_first_magic':
+	*clr & cla
+	$orgasm_or = 'no'
+	artemQW['strapon_count'] += 1
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before slowly opening his mouth and taking the dildo in. As he starts sucking on your dick you can feel the warm wetness of his mouth, he starts slowly sucking on it; you don''t think he''s really into it, but is doing it to make you happy.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before sitting back on the bed as you smile at him. "You need to roll over."'
+		'He blushes but rolls over onto his stomach as you open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up your dick before squirting some lube between his ass cheeks and working it in.'
+		'He glances back over his shoulder at you. "That feels weird."'
+		*nl
+		'You give him a reassuring smile. "It''s okay. Just take a deep breath and relax."'
+		'Once he and your dick are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He just nods in response and you line the dildo up and slowly push it into his asshole, causing him to hiss in pain.'
+		'"Just breathe," you tell him and he does as you instruct. You wait until you feel him relax before pushing your cock further into him.'
+		gs 'arousal', 'magicd_anal', 2
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with your cock, his virgin asshole tightly gripping your cock, which feels amazing for you. You are only thrusting about half the length of the dildo into him. "How does that feel?"'
+			'He doesn''t answer at first. "Not as bad as I thought. It stopped hurting."'
+			'You slowly slide the entire length of your <<dick>>cm <<$dick_girth>> dick into his ass, causing him to groan as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you like that."'
+			*nl
+			'He glances back over his shoulder at you. "It feels weird, but yeah, I kind of like it."'
+			'You give him a reassuring smile. "Great, because I love this. Now take a deep breath."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to enjoy it.'
+			gs 'arousal', 'magicd_anal', 2
+			gs 'stat'
+			act 'Start fucking him hard and fast':
+				*clr & cla
+				artemQW['strapon_count'] += 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You start to pick up speed until you''re really hammering his ass. "Fuck yeah, take my cock, bitch!"'
+				'He pushes his hands against your hips to slow you down. "Not so hard! That hurts!"'
+				gs 'arousal', 'magicd_anal', 2
+				gs 'stat'
+				act 'Keep fucking him hard':
+					*clr & cla
+					minut += 5
+					artemQW['strapon'] = -1
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+					'You don''t do as he asks. "Come on baby, just relax."'
+					'His moans quickly turn to pained grunts. "Stop! That hurts!" he cries out and shoves you off before sitting up and glaring at you. "What the hell, <<$pcs_nickname>>?! That hurt!"'
+					'You frown. "Sorry, I just got carried away. Forgive me?"'
+					'He sighs. "Okay, I forgive you, but that''s it. I''m not doing that again." You''re about to speak, but he shakes his head. "No! Never. Again. I''m going to go take a shower. Talk to you later."'
+					*nl
+					'You sigh and slide the harness off before leaving his apartment.'
+					gs 'arousal', 'magicd_anal', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Leave': gt 'uni_dorm', 'second_floor'
+				end
+				act 'Ease up':
 					*clr & cla
 					artemQW['strapon'] = 1
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
-					'You keep the pace up, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
-					'You grin as it sounds like he''s really starting to enjoy it. "You like taking my cock in your ass, don''t you?"'
-					'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it." He keeps moaning louder, which only turns you on more. Finally, after several minutes of this, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt a little again."'
-					gs 'arousal', 'anal_strap_give', 5
+					'You ease up a little, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+					'You grin. "You like taking my cock in your ass, don''t you?"'
+					'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it."'
+					'He keeps moaning louder, which only turns you on more, but after several minutes, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt again."'
+					gs 'arousal', 'magicd_anal', 3
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
-						'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming. "I guess you really liked it," you say once he finishes.'
-						'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would..." He raises his gaze to look at you. "Did you like it?"'
+						'You roll off him and pull your dildo out of his ass, making him moan as you do, sadly before you can get off. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming.'
+						'"I guess you really liked it..." you say once he finishes.'
+						*nl
+						'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
+						'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+						'"Let me think about it," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up. "I need to shower and should finish my homework. See you tomorrow?"'
+						'You nod and he kisses you before leaving his room and going to the dorm floor bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+						act 'Leave': gt 'uni_dorm', 'second_floor'
+					end
+				end
+			end
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your steady pace, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, I like it."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans start to subside. "Okay, I think we need to stop. It''s starting to hurt again."'
+				gs 'arousal', 'magicd_anal', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+					'You roll off him and pull your dick out of his ass, making him moan as you do, sadly before you can get off. Once you''re off him, he quickly gets up and slides off the bed; as you watch, he starts furiously jerking off and quickly starts cumming.'
+					'"I guess you really liked it..." you say once he finishes.'
+					*nl
+					'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
+					'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+					'"Let me think about it," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up. "I need to shower and should finish my homework. See you tomorrow?"'
+					'You nod and he kisses you before leaving his room and going to the dorm floor bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+					act 'Leave': gt 'uni_dorm', 'second_floor'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'strapon_second':
+	*clr & cla
+	minut += 3
+	artemQW['artem_dom'] -= 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon3.jpg"></center>'
+	if spellKnown['penisenvy'] = 1:
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You can tell he''s still a little nervous but not as much as the first time and do your best to give him reassuring smiles, which seems to help a little. You could use this moment to cast the Penis Envy spell. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		if penisEnvyVariable = 0:
+			act 'Cast Penis Envy spell':
+				*clr & cla
+				gs 'castSpell', 'penisenvy'
+				if spellSuccess > 0:
+					act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_second_magic'
+				else
+					act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_second_bj'
+				end
+			end
+		else
+			act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_second_magic'
+		end
+	else
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You can tell he''s still a little nervous but not as much as the first time and do your best to give him reassuring smiles, which seems to help a little.'
+		'Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_second_bj'
+	end
+end
+
+if $ARGS[0] = 'strapon_second_bj':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before slowly opening his mouth and taking the dildo in. He starts slowly sucking on it; this time he seems a little more into it, but he obviously still isn''t sure what he is doing and seems kinda hesitant still.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay', 2
+	gs 'stat'
+	act 'Get the lube':
+		*clr & cla
+		artemQW['strapon_count'] += 1
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before laying down on the bed, this time he remembers to lay on his stomach.'
+		'You open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up the dildo before squirting some lube between his ass cheeks and working it in.'
+		'He glances back over his shoulder at you. "That still feels kinda weird."'
+		*nl
+		'You give him a reassuring smile. "You''ll get used to it, now take a deep breath and relax." Which he does and visibly relaxes more.'
+		'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He nods in response as he says "Yeah." and you line the dildo up and slowly push it into his asshole, causing him to have a slight hiss in pain, which turns into a loud groan.'
+		'"Just breathe," you tell him and he does as you instruct. You wait until you feel him relax again, before pushing the dildo further into him.'
+		gs 'arousal', 'anal_strap_give', 2
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with the strapon, only thrusting about half the length of the dildo into him. "How does that feel?"'
+			'He doesn''t answer at first. "Better than last time, it didn''t hurt as much and stopped hurting sooner."'
+			'You slowly slide the entire length of the <<dick>>cm <<$dick_girth>> dildo into his ass, causing him to moan as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you are starting to like my cock in your ass." You say to him in a slightly teasing tone.'
+			*nl
+			'He glances back over his shoulder at you. "It still feels weird, but yeah, I kind of like it."'
+			'You give him a reassuring smile. "Great, because I love this. Now just relax and take my cock."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to enjoy it.'
+			gs 'arousal', 'anal_strap_give', 2
+			gs 'stat'
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your pace nice and steady, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, it''s starting to feel really good."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans get louder. "I... think... I... think I''m going to cum." Then he tenses up and moans loudly, you are sure he just came from you fucking his ass, with your strapon, which makes you grin.'
+				gs 'arousal', 'anal_strap_give', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+					'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he rolls off the bed and stands up, you can see a wet spot of cum on his bed, where he shot his load. You grin at him. "Looks like someone really liked it."'
+					*nl
+					'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
+					'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+					'He pauses a moment but then nods. "Ok... but not all the time," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up and pulls the sheet off his bed. "I need to shower and clean this up. See you tomorrow?"'
+					'You nod and he kisses you before leaving his room and going to the dorm floor bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+					act 'Leave': gt 'uni_dorm', 'second_floor'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'strapon_second_magic':
+	$orgasm_or = 'no'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before slowly opening his mouth and taking your dick into his mouth. As he starts sucking on your cock you can feel the warm wetness of his mouth, as he starts slowly sucking on it; he is doing a better job than last time, he seems to be more into it as well.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
+		artemQW['strapon_count'] += 1
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before laying down on the bed, this time he remembers to lay on his stomach.'
+		'You open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up your dick before squirting some lube between his ass cheeks and working it in.'
+		'He glances back over his shoulder at you. "That still feels kinda weird."'
+		*nl
+		'You give him a reassuring smile. "You''ll get used to it, now take a deep breath and relax." Which he does and visibly relaxes more.'
+		'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He nods in response as he says "Yeah." and you line the dildo up and slowly push it into his asshole, causing him to have a slight hiss in pain, which turns into a loud groan as his tight little asshole grips your cock tightly, causing you to moan in pleasure.'
+		'"Just breathe," you tell him and he does as you instruct. You wait until you feel him relax again, before pushing your dick further into him, causing you to both moan in pleasure.'
+		gs 'arousal', 'magicd_anal', 2
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with your cock, only thrusting about half the length of your dick into him. "How does that feel?"'
+			'He doesn''t answer at first. "Better than last time, it didn''t hurt as much and stopped hurting sooner."'
+			'You slowly slide the entire length of your <<dick>>cm <<$dick_girth>> dick into his ass, it feels amazing to feel the full length of your shaft inside of him. It causes him to moan as well, as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you are starting to like my cock in your ass." You say to him in a slightly teasing tone.'
+			*nl
+			'He glances back over his shoulder at you. "It still feels weird, but yeah, I kind of like it."'
+			'You give him a reassuring smile. "Great, because I love this. Now just relax and take my cock."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to enjoy it.'
+			gs 'arousal', 'magicd_anal', 2
+			gs 'stat'
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your pace nice and steady, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Uh... I... Ah... YES... Yes, it''s starting to feel really good."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans get louder. "I... think... I... think I''m going to cum." Then he tenses up and moans loudly, you are sure he just came from you fucking his ass, with your cock, which turns you on even more.'
+				gs 'arousal', 'magicd_anal', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Fill him with your cum':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/pc/magic/penis_envy/guy_internal_butt_cum1.jpg"></center>'
+					$orgasm_or = 'yes'
+					$orgasm_txt = 'You bury your cock one last time balls deep into his ass, as you feel your cock twitch as you empty your load into his ass. Moaning loudly as you fill his ass with your cum, with the last spurt finished, you pull your cock out of his ass and stand up. He sighs loudly as you do. As you step back you can see your cum leaking out of his gaping hole.'
+					gs 'arousal', 'magicd_anal', 2, 'dom', 'inhibition'
+					gs 'stat'
+					act 'Climb off him':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+						'Once you''re off him, he rolls off the bed and stands up, you can see a wet spot of cum on his bed, where he shot his load. You grin at him. "Looks like someone really liked it."'
+						*nl
+						'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, it felt much better than I thought it would." He then raises his gaze to look at you. "Did you like it?"'
 						'You nod your head. "Yes, I had a lot of fun. Maybe we can do it again?"'
+						'He pauses a moment but then nods. "Ok... but not all the time," he replies and you nod as you start removing the harness, which breaks the spell and your connection to the dildo. Once the strapon is just a regular strapon again, you start cleaning the dildo while he cleans himself up and pulls the sheet off his bed. "I need to shower and clean this up. See you tomorrow?"'
+						'You nod and he kisses you before leaving his room and going to the dorm floor bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+						act 'Leave': gt 'uni_dorm', 'second_floor'
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'strapon_again':
+	*clr & cla
+	minut += 3
+	artemQW['artem_dom'] -= 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon3.jpg"></center>'
+	if spellKnown['penisenvy'] = 1:
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You notice he doesn''t seem nervous at all this time, you think he might even look a little eager. You wonder if he is starting to really like this, instead of just doing it to make you happy. You could use this moment to cast the Penis Envy spell. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		if penisEnvyVariable = 0:
+			act 'Cast Penis Envy spell':
+				*clr & cla
+				gs 'castSpell', 'penisenvy'
+				if spellSuccess > 0:
+					act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_again_magic'
+				else
+					act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_again_bj'
+				end
+			end
+		else
+			act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_again_magic'
+		end
+	else
+		'You slide the harness on and he helps you buckle it in place before he takes his pants off. You notice he doesn''t seem nervous at all this time, you think he might even look a little eager. You wonder if he is starting to really like this, instead of just doing it to make you happy. Once the harness is in place, you look at him. "Come and suck my dick, baby," you tell him with a grin.'
+		act 'Get a blowjob': gt 'artem_sex_uni', 'strapon_second_bj'
+	end
+end
+
+if $ARGS[0] = 'strapon_again_bj':
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before he quickly opens his mouth, taking the dildo in. He starts sucking on it; this time he seems a more into it, he doesn''t seem near as hesitant as he has before and he seems to be doing a much better job. You wonder if he has been practicing or just watching a lot of blow job porn.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
+		artemQW['strapon_count'] += 1
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before laying down on the bed, this time he remembers to lay on his stomach.'
+		'You open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up the dildo before squirting some lube between his ass cheeks and working it in. He doesn''t comment or move as you apply the lube this time.'
+		*nl
+		'You give him a smile. "I see your getting use to it, now take a deep breath and relax." Which he does and visibly relaxes more.'
+		'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He nods in response as he says "Yeah." sounding a little eager this time, as you line the dildo up and slowly push it into his asshole, causing him to grunt a little as the tip slides in, that quickly turns into a moan from him. Seeing that he seems to not mind this time or maybe is even enjoying it, you slide the dildo further into his ass as you start to fuck him.'
+		gs 'arousal', 'anal_strap_give', 2
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with the strapon, only thrusting about half the length of the dildo into him. "How does that feel?"'
+			'He doesn''t answer at first. "Better than last time, it kinda feels good... but don''t tell anyone I said that."'
+			'You slowly slide the entire length of the <<dick>>cm <<$dick_girth>> dildo into his ass, causing him to moan loudly as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you are enjoying my cock in your ass." You say to him in a slightly teasing tone.'
+			*nl
+			'He moans loudly then glances back over his shoulder at you, you can''t help but notice the turned on expression on his face. "OOOhhh yeah... just not to rough."'
+			'You give him a reassuring smile. "Great, because I love this. Now just take my cock like the little slut you are."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to really get off on it.'
+			gs 'arousal', 'anal_strap_give', 2
+			gs 'stat'
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your pace nice and steady, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Ah... YES... Yes, keep fucking... me..."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans get louder. "I''m cumming." Then he tenses up and moans loudly, you are sure he just came from you fucking his ass, with your strapon, which makes you grin.'
+				gs 'arousal', 'anal_strap_give', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Continue':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+					'You roll off him and pull your dildo out of his ass, making him moan as you do. Once you''re off him, he rolls off the bed and stands up, you can see a wet spot of cum on his bed, where he shot his load. You grin at him. "I guess this means you really like this."'
+					*nl
+					'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, I would have never believed how good that could feel." He then raises his gaze to look at you. "Did you like it?"'
+					'You nod your head. "Yes, I had a lot of fun. Maybe we can do something a little different next time."'
+					'He pauses a moment but then nods. "Sure... but not all the time," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up and pulls the sheet off his bed. "I need to shower and clean this up. See you tomorrow?"'
+					'You nod and he kisses you before leaving his room and going to the dorm floor bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
+					act 'Leave': gt 'uni_dorm', 'second_floor'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'strapon_again_magic':
+	$orgasm_or = 'no'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon4.jpg"></center>'
+	'He gets on his knees in front of you and grabs the back of your legs with his hands before quickly opening his mouth and taking your dick into his mouth. As he starts sucking on your cock you can feel the warm wetness of his mouth, as he starts slowly sucking on it; he is doing a much better job than last time, he seems to be more into it as well.'
+	'"Okay, take off your shirt and get on the bed," you tell him.'
+	gs 'arousal', 'foreplay_give', 2
+	gs 'stat'
+	act 'Get the lube':
+		artemQW['strapon_count'] += 1
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon5.jpg"></center>'
+		'He stops sucking on the dildo and takes off his shirt before laying down on the bed, this time he remembers to lay on his stomach.'
+		'You open his nightstand and take out the lube before crawling onto the bed on your knees. You lube up your dick before squirting some lube between his ass cheeks and working it in. He doesn''t comment or move as you apply the lube this time.'
+		*nl
+		'You give him a smile. "I see your getting use to it, now take a deep breath and relax." Which he does and visibly relaxes more.'
+		'Once he and the dildo are lubed up, you cap the bottle of lube and toss it aside. "You ready?"'
+		'He nods in response as he says "Yeah." sounding a little eager this time, as you line your cock up and slowly push it into his asshole, causing him to grunt a little as the tip slides in, that quickly turns into a moan from him. Seeing that he seems to not mind this time or maybe is even enjoying it, you slide your dick further into his ass as you start to fuck him.'
+		gs 'arousal', 'magicd_anal', 2
+		gs 'stat'
+		act 'Continue':
+			*clr & cla
+			gs 'boyStat', 'D<<strapnumber>>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon6.jpg"></center>'
+			'You start slowly fucking him with your cock, only thrusting about half the length of your shaft into him. "How does that feel?"'
+			'He doesn''t answer at first. "Better than last time, it kinda feels good... but don''t tell anyone I said that."'
+			'You slowly slide the entire length of your <<dick>>cm <<$dick_girth>> dick into his ass, causing him to moan loudly as you climb on top of him, laying on his back as you slowly start fucking him. "Sounds like you are enjoying my cock in your ass." You say to him in a slightly teasing tone.'
+			*nl
+			'He moans loudly then glances back over his shoulder at you, you can''t help but notice the turned on expression on his face. "OOOhhh yeah... just not to rough."'
+			'You give him a reassuring smile. "Great, because I love this. Now just take my cock like the little slut you are."'
+			'You push it in as far as it will go and start steadily fucking him, picking up the pace as he starts moaning louder. By the sound of it, he''s starting to really get off on it.'
+			gs 'arousal', 'magicd_anal', 2
+			gs 'stat'
+			act 'Fuck him nice and steady':
+				*clr & cla
+				artemQW['strapon'] = 1
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon7.jpg"></center>'
+				'You keep your pace nice and steady, making sure not to go too hard as you lift yourself up so you can more easily thrust into him. He starts moaning a little louder as you do. "Oh... Fuck... Ah..."'
+				'You grin. "You like taking my cock in your ass, don''t you?"'
+				'He raises his head, but doesn''t look back at you. At first, you''re not sure he even heard you. "Ah... YES... Yes, keep fucking... me..."'
+				'He keeps moaning louder, which only turns you on more, but after several minutes, his moans get louder. "I''m cumming." Then he tenses up and moans loudly, you are sure he just came from you fucking his ass, with your magic cock, which turns you on even more. Not to mention when he tenses up to cum, his asshole tightens around your shaft which feels amazing.'
+				gs 'arousal', 'magicd_anal', 3
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Fill him with your cum':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/pc/magic/penis_envy/guy_internal_butt_cum1.jpg"></center>'
+					$orgasm_or = 'yes'
+					$orgasm_txt = 'You bury your cock one last time balls deep into his ass, as you feel your cock twitch as you empty your load into his ass. Moaning loudly as you fill his ass with your cum, with the last spurt finished, you pull your cock out of his ass and stand up. He sighs loudly as you do. As you step back you can see your cum leaking out of his gaping hole.'
+					gs 'arousal', 'magicd_anal', 2, 'dom', 'inhibition'
+					gs 'stat'
+					act 'Climb off him':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+						'You roll off him and pull your dick out of his ass, making him moan as you do. Once you''re off him, he rolls off the bed and stands up, you can see a wet spot of cum on his bed, where he shot his load. You grin at him. "I guess this means you really like this."'
 						*nl
-						'"Let me think about it," he replies and you nod as you start removing the harness and cleaning the dildo while he cleans himself up. "I think I need to shower, and I really should finish my homework. See you tomorrow?"'
-						'You nod. "Sure, see you tomorrow." He kisses you briefly before leaving his room and going to the bathroom. Placing the strap-on back in your purse, you leave his room with a massive grin on your face.'
+						'He glances at you and turns as red as you think is humanly possible. He looks down, refusing to meet your eyes. "Yeah, I would have never believed how good that could feel." He then raises his gaze to look at you. "Did you like it?"'
+						'You nod your head. "Yes, I had a lot of fun. Maybe we can do something a little different next time."'
+						'He pauses a moment but then nods. "Sure... but not all the time," he replies and you nod as you start removing the harness, which breaks the spell and your connection to the dildo. Once the strapon is just a regular strapon again, you start cleaning the dildo while he cleans himself up and pulls the sheet off his bed. "I need to shower and clean this up. See you tomorrow?"'
+						'You nod and he kisses you before leaving his room and going to the dorm floor bathroom. Placing the strap-on back in your purse, you leave his apartment with a massive grin on your face.'
 						act 'Leave': gt 'uni_dorm', 'second_floor'
 					end
 				end

+ 202 - 126
locations/artemhome.qsrc

@@ -1,46 +1,51 @@
 # artemhome
-!!2024/03/19
-!! list of triggers
-!! artemQW['bj'] = number of blowjobs
-!! artemQW['sex'] = 1 Sveta has had vaginal sex with Artem
-!! artemQW['anal'] = 1 Sveta has had anal sex with Artem
-!! artemQW['hj'] = number of handjobs
-!! artemQW['artembrokenheart'] = 1 Artem is heartbroken
-!! artemQW['stripsee'] = number of strips for Artem
-!! artemQW['artemlove'] = 1 Artem is in love with Sveta
-!! artemQW['love'] = 1 Sveta is in love with Artem
-!! artemQW['artemblok'] = 1 Artem is blocked
-!! artemQW['bf'] = 1  they are boyfriend and girlfriend
-!! artemQW['dryhump'] = number of dryhumps
-!! artemQW['artlove'] = 2 Sveta rejected Artem''s love
-!! artemQW['artlie'] = 1 Sveta lied to Artem about the Dimka video (blocks love content)
-!! artemQW['artfall'] = 10 Artem wants to asks Sveta out on a date
-!! artemQW['date'] =  number of dates (after 10, he is in love)
-!!artemQW['artem_dom'] += 1 counter used to see how dominant Artem is becoming (the higher it goes, the more stuff it will unlock)
-!! artemQW['dimka'] =1 Artem removed the blackmail video
-!! artemQW['slutlove'] = 1 .. Sveta became known as a slut in Pavlovsk, but keeps dating Artem
-!! artemQW['sveslut'] = 1 .. Artem knows that Sveta is a slut, but they stay friends
-!! artemQW['nush3some_ask'] += 1 Sveta talked about threesome with Nush
-!! artemQW['nush3some'] >= 2 had threesome with Nush
-!! artemQW['nush3some'] = 1 Artem and Nush agreed to threesome
-!! artemQW['nush3some_again'] = 1 can try and convince Artem and Nush to try it again
-!! artemQW['nush3some_again'] = 2 have convinced Artem
-!! artemQW['nush3some_again'] = 3 have convinced Anushka
-!! artemQW['nush3some_again'] = 4 opens up repeating threesomes
-!! artemQW['nush3some'] >= 3 had threesome with Nush more than once
-!! artemQW['nush3some'] = -1 blocks future threesomes
-!! artemQW['strapon'] = 1 means they had strapon sex and he liked it, -1 one means he did not like it and blocks it going forward
 
-!ArtemLoc tells us where Artem is located
-!----------------------------------------------
-!ArtemLoc = 0 (Artem not home)
-!ArtemLoc = 1 (Artem in the hallway)
-!ArtemLoc = 2 (Artem in his room)
-!ArtemLoc = 3 (Artem in the bathroom)
-!ArtemLoc = 4 (Artem in the kitchen)
-!ArtemLoc = 5 (Artem in the livingroom)
-!ArtemLoc = 6 (Artem in his parents'' room)
-!---------------------------------------------
+!{
+2024/03/19
+ list of triggers
+ artemQW['bj'] = number of blowjobs
+ artemQW['sex'] = 1 Sveta has had vaginal sex with Artem
+ artemQW['anal'] = 1 Sveta has had anal sex with Artem
+ artemQW['hj'] = number of handjobs
+ artemQW['artembrokenheart'] = 1 Artem is heartbroken
+ artemQW['stripsee'] = number of strips for Artem
+ artemQW['artemlove'] = 1 Artem is in love with Sveta
+ artemQW['love'] = 1 Sveta is in love with Artem
+ artemQW['artemblok'] = 1 Artem is blocked
+ artemQW['bf'] = 1  they are boyfriend and girlfriend
+ artemQW['dryhump'] = number of dryhumps
+ artemQW['artlove'] = 2 Sveta rejected Artem''s love
+ artemQW['artlie'] = 1 Sveta lied to Artem about the Dimka video (blocks love content)
+ artemQW['artfall'] = 10 Artem wants to asks Sveta out on a date
+ artemQW['date'] =  number of dates (after 10, he is in love)
+ artemQW['artem_dom'] += 1 counter used to see how dominant Artem is becoming (the higher it goes, the more stuff it will unlock)
+ artemQW['dimka'] =1 Artem removed the blackmail video
+ artemQW['slutlove'] = 1 .. Sveta became known as a slut in Pavlovsk, but keeps dating Artem
+ artemQW['sveslut'] = 1 .. Artem knows that Sveta is a slut, but they stay friends
+ artemQW['nush3some_ask'] += 1 Sveta talked about threesome with Nush
+ artemQW['nush3some'] >= 2 had threesome with Nush
+ artemQW['nush3some'] = 1 Artem and Nush agreed to threesome
+ artemQW['nush3some_again'] = 1 can try and convince Artem and Nush to try it again
+ artemQW['nush3some_again'] = 2 have convinced Artem
+ artemQW['nush3some_again'] = 3 have convinced Anushka
+ artemQW['nush3some_again'] = 4 opens up repeating threesomes
+ artemQW['nush3some'] >= 3 had threesome with Nush more than once
+ artemQW['nush3some'] = -1 blocks future threesomes
+ artemQW['strapon'] = 1 means they had strapon sex and he liked it, -1 one means he did not like it and blocks it going forward
+ artemQW['strapon_count'] amount of times sveta had strapon sex with Artem
+
+ArtemLoc tells us where Artem is located
+----------------------------------------------
+ArtemLoc = 0 (Artem not home)
+ArtemLoc = 1 (Artem in the hallway)
+ArtemLoc = 2 (Artem in his room)
+ArtemLoc = 3 (Artem in the bathroom)
+ArtemLoc = 4 (Artem in the kitchen)
+ArtemLoc = 5 (Artem in the livingroom)
+ArtemLoc = 6 (Artem in his parents'' room)
+---------------------------------------------
+}
+
 
 if $ARGS[0] = 'home':
 	clr
@@ -106,12 +111,12 @@ if $ARGS[0] = 'home':
 			if artemQW['artlie'] =2 or artemQW['artembrokenheart'] = 1 or artemQW['artemblok'] = 1:
 				'You stand outside the Chebotarev household, knocking on the door. It''s soon answered by Artem, who frowns as soon as he sees you. "I told you I never wanted to see you again! Please go away."'
 				'He closes the door in your face without another word.'
-				act 'Leave': gt'pod_ezd','etaj_1'
+				act 'Leave': gt'pod_ezd', 'etaj_1'
 			else
 				'You stand outside the Chebotarev household, hoping that Artem will come to the door.'
 				'Artem opens the door smiling. " Come in, I was just playing some games."'
 				'Once you walk inside, he closes the door and heads for the living room, where some game is playing on the TV. He waits for you to take a seat first.'
-				act 'Take a seat': ArtemLoc = 5 & gt 'artemhome','livingroom'
+				act 'Take a seat': ArtemLoc = 5 & gt 'artemhome', 'livingroom'
 			end
 		elseif DoorOpenedBy = 1:
 			*clr & cla
@@ -136,7 +141,7 @@ if $ARGS[0] = 'home':
 							'You understand it''s time for you to leave'
 						else
 							'Her face tightens ever so slightly. "Yes, he''s in his room." She turns to face down the hall. "Artem dear, <<$pcs_nickname>> from school is here." She then turns back to you. "Go on in. He''s in his room."'
-							act 'Enter': ArtemLoc = 2 & gt 'artemhome','hallway'
+							act 'Enter': ArtemLoc = 2 & gt 'artemhome', 'hallway'
 						end
 					end
 				else
@@ -153,7 +158,7 @@ if $ARGS[0] = 'home':
 							'You understand it''s time for you to leave'
 						else
 							'"Come in, come in." She turns to face down the hall. "Artem dear, one of your little friends is here." She then turns back to you. "Go on in. He''s in his room."'
-							act 'Enter': gt 'artemhome','hallway'
+							act 'Enter': gt 'artemhome', 'hallway'
 						end
 					end
 				end
@@ -169,7 +174,7 @@ if $ARGS[0] = 'home':
 						'You understand it''s time for you to leave'
 					else
 						'She doesn''t seem pleased. "Oh. Well come in then." She turns to face down the hall. "Artem dear, ''that girl'' is here to see you again." You can hear the judgment in her voice before she turns back to you. "Go on back. He''s in his room."'
-						act 'Enter': gt 'artemhome','hallway'
+						act 'Enter': gt 'artemhome', 'hallway'
 					end
 				else
 					'You stand outside the Chebotarev household and knock on the door, which is quickly answered by Artem''s mother, who has a friendly smile on her face. "Hello again, <<$pcs_nickname>>. Are you here to see Artem?"'
@@ -179,7 +184,7 @@ if $ARGS[0] = 'home':
 						'You understand it''s time for you to leave'
 					else
 						'She seems pleased to see you. "Come in, come in." She turns to face down the hall. "Artem dear, one that nice girl <<$pcs_nickname>> is here to see you." She then turns back to you. "Go on back. He''s in his room."'
-						act 'Enter': gt 'artemhome','hallway'
+						act 'Enter': gt 'artemhome', 'hallway'
 					end
 				end
 			end
@@ -209,11 +214,11 @@ if $ARGS[0] = 'hallway':
 	else
 		if ArtemLoc ! 1:
 			act '<b>Leave Artem''s apartment</b>': gt 'pod_ezd', 'etaj_1'
-			act 'Artem''s Room': gt 'artemhome','artemroom'
-			act 'Bathroom': gt 'artemhome','bathroom'
-			act 'Living Room': gt 'artemhome','livingroom'
-			act 'Kitchen': gt 'artemhome','kitchen'
-			act 'Parents Room': gt 'artemhome','artemparents'
+			act 'Artem''s Room': gt 'artemhome', 'artemroom'
+			act 'Bathroom': gt 'artemhome', 'bathroom'
+			act 'Living Room': gt 'artemhome', 'livingroom'
+			act 'Kitchen': gt 'artemhome', 'kitchen'
+			act 'Parents Room': gt 'artemhome', 'artemparents'
 		else
 			'Artem is standing nearby, looking at you expectantly. "What''s up, <<$pcs_nickname>>?"'
 			act '<b>Leave Artem''s apartment</b>': gt 'pod_ezd', 'etaj_1'
@@ -233,10 +238,10 @@ if $ARGS[0] = 'bathroom':
 		gs 'stat'
 		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/bathroom.jpg"></center>'
-		'The first thing you notice are the god awful green tiles with matching sink in the bathroom. You don''t know who picked them, but they clearly don''t have good taste. Other than that, it''s a fairly typical bathroom.'
+		'The first thing you notice is the god awful green tiles with matching sink in the bathroom. You don''t know who picked them, but they clearly don''t have good taste. Other than that, it''s a fairly typical bathroom.'
 		'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 		*nl
-		if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+		gs 'piercing_management', 'set_manage_string'
 		act 'Leave the bathroom': gt 'artemhome', 'hallway'
 		if hour < 6:
 			gt 'artemhome', 'timecheck'
@@ -255,7 +260,7 @@ if $ARGS[0] = 'bathroom':
 				act 'Take a selfie':
 					gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
 				end
-				act 'Get out of the shower': gt 'artemhome','bathroom'
+				act 'Get out of the shower': gt 'artemhome', 'bathroom'
 			end
 			dynamic $bath
 		end
@@ -264,7 +269,7 @@ if $ARGS[0] = 'bathroom':
 		dynamic $basin
 		gs 'din_van', 'prvt_pee'
 	else
-		'As you aproach the bathroom door, you can hear the shower running.'
+		'As you approach the bathroom door, you can hear the shower running.'
 		act 'Knock on the door':
 			*clr & cla
 			'"Hey Artem, are you in there?"'
@@ -289,15 +294,15 @@ if $ARGS[0] = 'artemroom':
 	'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom.jpg"></center>'
 	if hour > 7 and hour < 23:
-		'The room is very clean and neat. Right next to the window is a bed, with a small <a href="exec:gt ''artemhome'',''night_stand''">night stand</a> next to it. Against the opposite wall is a small computer desk and a chair, with a <a href="exec:gt ''artemhome'',''computer''">laptop</a> on it. Next to the desk is a <a href="exec:gt ''artemhome'',''artemdresser''">dresser</a>. On the other side of the desk is a <a href="exec:gt ''artemhome'',''bookshelf''">bookshelf</a> with a fairly large collection of books.'
+		'The room is very clean and neat. Right next to the window is a bed, with a small <a href="exec:gt ''artemhome'', ''night_stand''">night stand</a> next to it. Against the opposite wall is a small computer desk and a chair, with a <a href="exec:gt ''artemhome'', ''computer''">laptop</a> on it. Next to the desk is a <a href="exec:gt ''artemhome'', ''artemdresser''">dresser</a>. On the other side of the desk is a <a href="exec:gt ''artemhome'', ''bookshelf''">bookshelf</a> with a fairly large collection of books.'
 	else
-		'The room is very clean and neat. Right next to the window is a bed, with a small night stand next to it. Against the opposite wall is a small computer desk and a chair, with a laptop on it. Next to the desk is a dresser. On the other side of the desk is a bookshelf with a fairly large collection of books.'
+		'The room is very clean and neat. Right next to the window is a bed, with a small nightstand next to it. Against the opposite wall is a small computer desk and a chair, with a laptop on it. Next to the desk is a dresser. On the other side of the desk is a bookshelf with a fairly large collection of books.'
 	end
 	if $clothingworntype = 'nude':
-		act 'Dress yourself': gs 'shortgs','dress' & gt 'artemhome','artemroom'
+		act 'Dress yourself': gs 'shortgs', 'dress' & gt 'artemhome', 'artemroom'
 	end
 	if $clothingworntype ! 'nude':
-		act 'Leave Artem''s room': gt 'artemhome','hallway'
+		act 'Leave Artem''s room': gt 'artemhome', 'hallway'
 	end
 
 	if hour < 6:
@@ -313,7 +318,7 @@ if $ARGS[0] = 'artemroom':
 				*clr & cla
 				'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
-				'You grin and point out his still wet hair to him. "Are you and your towel having a fight? It looks like she abandoned you," you giggle.'
+				'You grin and point out his still-wet hair to him. "Are you and your towel having a fight? It looks like she abandoned you," you giggle.'
 				'He sheepishly runs a hand through his hair and inspects it. "You uhm... You might have a point. I just didn''t want you to get too bored waiting."'
 				act 'Talk with him': gt 'artemhome', 'chat'
 			end
@@ -324,7 +329,7 @@ if $ARGS[0] = 'artemroom':
 			act 'Let''s go to the living room': ArtemLoc = 5 & gt 'artemhome', 'livingroom'
 			act 'Talk to Artem': ArtemLoc = 2 & gt 'artemhome', 'chat'
 			if lernHome > 0:
-				act 'Do homework with Artem': gt 'artem_events','learn'
+				act 'Do homework with Artem': gt 'artem_events', 'learn'
 			end
 			!! Nutluck needs to say at which point this should be enabled. Set it to artemQW['artfall'] > 5 for now
 			if artemQW['artfall'] > 5 and artkissing ! daystart:
@@ -363,32 +368,32 @@ if $ARGS[0] = 'artemroom':
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
 								if artemQW['dryhump'] = 0:
 									'Artem trips over his words when he tries to suggest something. "<<$pcs_nickname>>, maybe we could... Maybe I... I really want you... Can I touch your ass? Please?"'
-									act 'Let him caress your ass': gt 'artem_events','artemdryhump'
+									act 'Let him caress your ass': gt 'artem_events', 'artemdryhump'
 								elseif artemQW['dryhump'] <= 1:
 									if $pantyworntype ! 'none':
-										'Artem looks at you with embarrassment, but gathers the courage. "<<$pcs_nickname>>, you''re the best thing that''s ever happened to me. I enjoyed last time so much, but could you strip down to your underwear?"'
-										act 'Strip to your panties': gt 'artem_events','artemdryhump1'
+										'Artem looks at you with embarrassment but gathers the courage. "<<$pcs_nickname>>, you''re the best thing that''s ever happened to me. I enjoyed last time so much, but could you strip down to your underwear?"'
+										act 'Strip to your panties': gt 'artem_events', 'artemdryhump1'
 										gs 'willpower', 'exhib', 'resist'
 										if will_cost <= pcs_willpwr:
 											act 'Refuse to strip (<<will_cost>> Willpower)':
 												gs 'willpower', 'pay', 'resist'
-												gt 'artem_events','artemdryhump'
+												gt 'artem_events', 'artemdryhump'
 											end
 										else
 											act 'Refuse to strip (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 										end
 									else
 										'Artem trips over his words when he tries to suggest something. "<<$pcs_nickname>>, maybe we could... I really want you... Can I touch your ass again? Please?"'
-										act 'Let him caress your ass': gt 'artem_events','artemdryhump'
+										act 'Let him caress your ass': gt 'artem_events', 'artemdryhump'
 									end
 								elseif artemQW['dryhump'] <= 2 and artemQW['stripsee'] = 1:
-									'Artem looks at you with embarrassment, but gathers the courage. "<<$pcs_nickname>>, last time you let me rub your ass was great, but now that I''ve seen you naked... Could you strip naked first?"'
-									act 'Strip': gt 'artem_events','artemdryhump2'
+									'Artem looks at you with embarrassment but gathers the courage. "<<$pcs_nickname>>, last time you let me rub your ass was great, but now that I''ve seen you naked... Could you strip naked first?"'
+									act 'Strip': gt 'artem_events', 'artemdryhump2'
 									gs 'willpower', 'exhib', 'resist'
 									if will_cost <= pcs_willpwr:
 										act 'Refuse to strip (<<will_cost>> Willpower)':
 											gs 'willpower', 'pay', 'resist'
-											gt 'artem_events','artemdryhump'
+											gt 'artem_events', 'artemdryhump'
 										end
 									else
 										act 'Refuse to strip (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -415,7 +420,7 @@ if $ARGS[0] = 'artemroom':
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 											'You pull your hand away and climb off him. "No, I can''t... Not yet. I still want to wait."'
-											'He looks visibly disappointed, but nods and smiles. "Sure, I understand. I don''t want to pressure you, so whenever you''re ready is fine."'
+											'He looks visibly disappointed but nods and smiles. "Sure, I understand. I don''t want to pressure you, so whenever you''re ready is fine."'
 											act 'Talk to him': gt 'artemhome', 'chat'
 										end
 									else
@@ -424,7 +429,7 @@ if $ARGS[0] = 'artemroom':
 									act 'Keep making out':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/makeout.jpg"></center>'
-										'You pull your hand away from the bulge in his pants, but keep kissing him. He lets go and stops trying to force your hand down to his crotch and instead focuses on kissing and fondling you.'
+										'You pull your hand away from the bulge in his pants but keep kissing him. He lets go and stops trying to force your hand down to his crotch and instead focuses on kissing and fondling you.'
 										if artemQW['stripsee'] > 0:
 											'He has an embarrassed look on his face as he pulls away from you. "I enjoyed seeing your naked last time and want you to strip for me again, but can you make a bit more of a show of it this time?"'
 											gs 'arousal', 'kiss', 5
@@ -454,7 +459,7 @@ if $ARGS[0] = 'artemroom':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
 				'You bite your lip, unsure if you should ask. It might seem rude, but you could really use a snack right now. "Hey Artem, have you got anything to snack on or drink?"'
 				'He looks a little surprised. "Yeah sorry, I didn''t think about it. Feel free to just grab something if you want in the future, but come on."'
-				act 'Follow him': gt 'artemhome','snack'
+				act 'Follow him': gt 'artemhome', 'snack'
 			end
 		end
 	end
@@ -471,7 +476,7 @@ if $ARGS[0] = 'artemdresser':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/artemdresser.jpg"></center>'
 	'Opening the drawers, all you find are his clothes, neatly folded and stacked. He has shirts in one drawer, pants in another, shorts in another, socks in yet another and underwear in the last.'
 	'It''s very well organized and kind of boring, but you notice him watching you snoop and close the drawers.'
-	act 'Find something else to look at': gt 'artemhome','artemroom'
+	act 'Find something else to look at': gt 'artemhome', 'artemroom'
 end
 
 if $ARGS[0] = 'bookshelf':
@@ -498,7 +503,7 @@ if $ARGS[0] = 'bookshelf':
 			'He looks a little surprised as he walks over. "Oh sure yeah, you can borrow it," he answers a little excitedly.'
 			'You take the book and put it in your purse. "Thanks. I''ll get it back to you as soon as I finish it."'
 			'He waves his hand like it''s no big deal. "Oh, don''t worry about that. I hope you enjoy it."'
-			act 'Find something else to look at': gt 'artemhome','artemroom'
+			act 'Find something else to look at': gt 'artemhome', 'artemroom'
 		end
 	end
 	if artem_borrowed_book = 1:
@@ -515,8 +520,8 @@ if $ARGS[0] = 'bookshelf':
 				cla
 				'"Yeah, it was good," you reply.'
 				'His face lights and he joins you at the bookshelf. "Yeah, I really liked that one too."'
-				act 'Look at more books': gt 'artemhome','bookshelf'
-				act 'Find something else to look at': gt 'artemhome','artemroom'
+				act 'Look at more books': gt 'artemhome', 'bookshelf'
+				act 'Find something else to look at': gt 'artemhome', 'artemroom'
 			end
 			act 'Not really':
 				cla
@@ -526,12 +531,12 @@ if $ARGS[0] = 'bookshelf':
 					'"It was a bit too bland for me. I could guess the outcome right at the start, and it turned out I was right," you reply.'
 				end
 				'Artem looks crushed at your answer.'
-				act 'Look at more books': gt 'artemhome','bookshelf'
-				act 'Find something else to look at': gt 'artemhome','artemroom'
+				act 'Look at more books': gt 'artemhome', 'bookshelf'
+				act 'Find something else to look at': gt 'artemhome', 'artemroom'
 			end
 		end
 	end
-	act 'Find something else to look at': gt 'artemhome','artemroom'
+	act 'Find something else to look at': gt 'artemhome', 'artemroom'
 end
 
 if $ARGS[0] = 'night_stand':
@@ -542,7 +547,7 @@ if $ARGS[0] = 'night_stand':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/nightstand.jpg"></center>'
 	'Having decided to snoop, you open the nightstand drawer to take a peek inside. Rummaging through the drawers, all you find is his phone hooked up to a charger, a few books, some cold medicine, some comics and a flashlight. Noticing him watching you snoop, you close the drawers.'
-	act 'Close the drawer': gt 'artemhome','artemroom'
+	act 'Close the drawer': gt 'artemhome', 'artemroom'
 end
 
 if $ARGS[0] = 'computer':
@@ -558,15 +563,15 @@ if $ARGS[0] = 'computer':
 		'"Mind if I use it? I want to check my emails and stuff," you ask.'
 		'He nods. "Sure, go ahead."'
 		act 'Go online': gt 'Komp', 'start'
-		act 'Find something else to look at': gt 'artemhome','artemroom'
+		act 'Find something else to look at': gt 'artemhome', 'artemroom'
 	elseif ArtemLoc = 2 and ArtemCompUse > 0:
 		'You look at the computer, then at Artem, who meets your gaze and breaks into a smile.'
 		'"Go ahead and use it if you want. I don''t mind."'
 		act 'Go online': gt 'Komp', 'start'
-		act 'Find something else to look at': gt 'artemhome','artemroom'
+		act 'Find something else to look at': gt 'artemhome', 'artemroom'
 	else
 		act 'Go online': gt 'Komp', 'start'
-		act 'Find something else to look at': gt 'artemhome','artemroom'
+		act 'Find something else to look at': gt 'artemhome', 'artemroom'
 	end
 end
 
@@ -607,7 +612,7 @@ if $ARGS[0] = 'livingroom':
 	gs 'stat'
 	'<center><b><font color = maroon>Living room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
-	'The living room is clean and neat. A couch rests against one wall, with a throw rug between it and the TV stand. A flat screen TV sits atop the stand while a neatly stored PlayStation sits on the bottom. Along one side of the TV is a stand with several dozen movies.'
+	'The living room is clean and neat. A couch rests against one wall, with a throw rug between it and the TV stand. A flat-screen TV sits atop the stand while a neatly stored PlayStation sits on the bottom. Along one side of the TV is a stand with several dozen movies.'
 	if hour < 6:
 		gt 'artemhome', 'timecheck'
 	elseif hour > 22:
@@ -640,8 +645,8 @@ if $ARGS[0] = 'livingroom':
 						'You stand in silence for a few seconds before you finally start laughing. "Don''t worry about Artem. I''ll make sure he keeps his head on straight."'
 						'Masharin sighs. "Well, I think Artem and I will have to have a talk later..." he says as he looks sternly at Artem.'
 						'You smile. "You do that..."'
-						'As you and Artem turn around, you show off your ass little as you leave and return to his room.'
-						act 'Leave': ArtemLoc = 2 & gt 'artemhome','artemroom'
+						'As you and Artem turn around, you show off your ass a little as you leave and return to his room.'
+						act 'Leave': ArtemLoc = 2 & gt 'artemhome', 'artemroom'
 					end
 				end
 			else
@@ -659,9 +664,9 @@ if $ARGS[0] = 'livingroom':
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
 						'Masharin looks worryingly at Artem, so you decide to ease the tension by playfully pushing Artem a little. "Ease up, your dad was just looking out for you is all."'
 						'"Still, he shouldn''t have talked about it. I said all of that in confidence..."'
-						'Masharin starts to apologize, but is cut off by Artem. "Let''s go <<$pcs_nickname>>, that''s enough embarrassment for one day."'
+						'Masharin starts to apologize but is cut off by Artem. "Let''s go <<$pcs_nickname>>, that''s enough embarrassment for one day."'
 						'"Don''t worry, Mr. Chebotarev. I''m sure it''s not a big deal and Artem will get over it soon," you say encouragingly before going to Artem''s room.'
-						act 'Leave': ArtemLoc = 2 & gt 'artemhome','artemroom'
+						act 'Leave': ArtemLoc = 2 & gt 'artemhome', 'artemroom'
 					end
 				end
 			end
@@ -693,7 +698,7 @@ if $ARGS[0] = 'livingroom':
 								'"But I can''t be friends with your son, that''s what you''re saying?!"'
 								'Masharin curls up slightly before sighing and going almost limp in apparent defeat. "I... Just don''t hurt him. Please?"'
 								'You roll your eyes and leave.'
-								act 'Leave': gt 'artemhome','hallway'
+								act 'Leave': gt 'artemhome', 'hallway'
 							end
 						end
 					else
@@ -713,7 +718,7 @@ if $ARGS[0] = 'livingroom':
 								'He then suddenly stops. "Oh sorry, I must be boring you... I get ahead of myself and have to remind myself that no one wants to listen to a boring tale about nothing."'
 								'You shake your head. "Not at all. It''s always good hearing a positive opinion about studying, as it''s not always seen in a keen light around here."'
 								'Masharin sighs. "Well, don''t pay too much attention to it, and you''ll see how much better life is as time goes by."'
-								act 'Leave': gt 'artemhome','hallway'
+								act 'Leave': gt 'artemhome', 'hallway'
 							end
 						end
 						act 'We''re having some issues with a few things':
@@ -728,13 +733,13 @@ if $ARGS[0] = 'livingroom':
 								'He tries to excuse himself. "It worked for me, but it doesn''t mean it will work for anyone else. We all have our own quirks that help us when it comes to that stuff. You have your breaks and I have mine."'
 								'"Well, I''d love to hear what you did. I think it would be of great help," you tell him.'
 								'Masharin smiles. "Fine, fine. I used to close my eyes and think that I''m in the middle of a forest, only hearing those unusual sounds that you can hear in such a place. This always cleared my mind and it helped me regain my focus."'
-								'"I might try that some time. Thanks for the advice, but it''s probably best that I head back," you reply.'
-								act 'Leave': gt 'artemhome','hallway'
+								'"I might try that sometime. Thanks for the advice, but it''s probably best that I head back," you reply.'
+								act 'Leave': gt 'artemhome', 'hallway'
 							end
 						end
 					end
 				end
-				act 'Leave': gt 'artemhome','hallway'
+				act 'Leave': gt 'artemhome', 'hallway'
 			else
 				'Artem''s parents are here watching TV. You could disturb them and talk to them, but it might be better if you just snuck back out before they see you.'
 				act 'Sneak out':
@@ -744,7 +749,7 @@ if $ARGS[0] = 'livingroom':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
 					'You turn and carefully tread out of the living room. You quietly make it to the doorway to the hallway and glance back to see them still watching the TV, having failed to notice you coming in at all.'
-					act 'Leave': gt 'artemhome','hallway'
+					act 'Leave': gt 'artemhome', 'hallway'
 				end
 				act 'Talk to them':
 					*clr & cla
@@ -767,22 +772,22 @@ if $ARGS[0] = 'livingroom':
 							'"I can''t believe he picked that slut!" you shout out. "She''s clearly just playing with him to win and doesn''t actually love him," you tell Glinina. "I heard she fucked the producers to get on the show in the first place, and still does. Sometimes all at once!"'
 							'"Shouldn''t you head back to Artem?" Masharin asks.'
 							'Just as you''re about to answer, the commercials come on and you let out a sigh. "I guess it''s time to head back. Thanks for letting me watch." You quickly get up and leave them sitting there stunned, not really understanding what just happened.'
-							act 'Leave': gt 'artemhome','hallway'
+							act 'Leave': gt 'artemhome', 'hallway'
 						end
 						act 'No':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/masharin.jpg"></center>'
-							'"No, I just needed to get away for a while. You know school work is boring as hell and your son is super serious about that stuff, which is no fun," you reply.'
-							'Masharin looks away from the TV. "Well, school work is important. You''re about to head to university and you need to be ready for what''s waiting there."'
+							'"No, I just needed to get away for a while. You know schoolwork is boring as hell and your son is super serious about that stuff, which is no fun," you reply.'
+							'Masharin looks away from the TV. "Well, schoolwork is important. You''re about to head to university and you need to be ready for what''s waiting there."'
 							'"I don''t know if I''ll end up there. I''m already tired of it and I don''t want to spend more time in school when I could be making money," you explain.'
 							'"Oh? And what would you be doing without a degree?" Masharin asks.'
 							'"You know, some odd jobs here and there. I''m sure I''ll get by fine. After all, I''m still young and vigorous, so I''ll manage," you confidently reply. "Well, time to head back. Don''t want to keep Artem waiting..."'
 							'You stretch, showing off your curves a little before turning and leaving the Chebotarevs looking at you in disbelief.'
-							act 'Leave': gt 'artemhome','hallway'
+							act 'Leave': gt 'artemhome', 'hallway'
 						end
 					else
 						'"Excuse me," you whisper, "I don''t want to bother you, but I needed a break and heard you watching TV..."'
-						'Glinina slowly turns around. "You''re not bother at all, <<$pcs_firstname>>. We were just watching the news. You can join us if you want."'
+						'Glinina slowly turns around. "You''re not a bother at all, <<$pcs_firstname>>. We were just watching the news. You can join us if you want."'
 						act 'Yes':
 							*clr & cla
 							minut += 10
@@ -793,7 +798,7 @@ if $ARGS[0] = 'livingroom':
 							'Some time passes by and the three of you are discussing current events that are shown on the TV. The Chebotarevs are very polite and can really carry a discussion.'
 							'"Well, time for me to go back," you say. "Thank you for the little break. It was a lot of fun."'
 							'"Anytime, <<$pcs_firstname>>. We''re glad to have someone else to discuss things with," Glinina replies.'
-							act 'Leave': gt 'artemhome','hallway'
+							act 'Leave': gt 'artemhome', 'hallway'
 						end
 						act 'No':
 							*clr & cla
@@ -801,7 +806,7 @@ if $ARGS[0] = 'livingroom':
 							'"I''ve bothered you enough," you say as you excuse yourself. "I need to head back to Artem..."'
 							'"Okay <<$pcs_firstname>>. The offer still stands if you change your mind," Glinina replies.'
 							'"Thank you. Maybe next time," you say before turning around as they return to watching the TV.'
-							act 'Leave': gt 'artemhome','hallway'
+							act 'Leave': gt 'artemhome', 'hallway'
 						end
 					end
 				end
@@ -842,7 +847,7 @@ if $ARGS[0] = 'livingroom':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/livingroom/playgames.jpg"></center>'
 				'You smile at him. "Yeah, I''d like that."'
 				'He grins and hands you the controller he has in his hand, then rushes over to grab the other one before sitting back on the couch. He starts the game up and the two of you play for some time; he''s pretty good, but he keeps making mistakes. You eventually beat him, but he doesn''t seem to mind at all. "You want to go to my room?"'
-				act 'Follow Artem to his room': ArtemLoc = 2 & gt 'artemhome','artemroom'
+				act 'Follow Artem to his room': ArtemLoc = 2 & gt 'artemhome', 'artemroom'
 				act 'No':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/livingroom/watchplay.jpg"></center>'
@@ -856,12 +861,12 @@ if $ARGS[0] = 'livingroom':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/living.jpg"></center>'
 					'The two of you grab your schoolbags and head to his room.'
-					act 'Follow Artem to his room': ArtemLoc = 2 & gt 'artemhome','artemroom'
+					act 'Follow Artem to his room': ArtemLoc = 2 & gt 'artemhome', 'artemroom'
 				end
 			end
 		else
 			'Nobody''s here right now.'
-			act 'Leave': gt 'artemhome','hallway'
+			act 'Leave': gt 'artemhome', 'hallway'
 		end
 	end
 end
@@ -889,7 +894,7 @@ if $ARGS[0] = 'kitchen':
 	else
 		if kitchenev = 1 and ArtemParentsLoc = 5 and hour < 22:
 			'As you enter the kitchen, you see Artem''s mother busy working away.'
-			act 'Leave':gt 'artemhome','hallway'
+			act 'Leave':gt 'artemhome', 'hallway'
 			act 'Talk to her':
 				if fame['pav_slut'] >= 200 or grupTipe = 4:
 					*clr & cla
@@ -899,7 +904,7 @@ if $ARGS[0] = 'kitchen':
 						'As Artem starts talking, she stops what she was doing. "This is the girl I was telling you about..."'
 						'"Oh." She''s a bit taken aback, but replies politely. "Hello, I''m Glinina, Artem''s mother. Pleasure to meet you."'
 						'You greet her back. "Hi, my name is <<$pcs_firstname>>. Nice to meet you."'
-						'An awkward silcenc follows before Glinina speaks up. "I''m not sure that Artem told me your last name..."'
+						'An awkward silence follows before Glinina speaks up. "I''m not sure that Artem told me your last name..."'
 						act 'Answer':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/glinina.jpg"></center>'
@@ -915,12 +920,12 @@ if $ARGS[0] = 'kitchen':
 								'Glinina crosses her arms. "Is that so, Artem?!" She clears her throat. "You''ve been working very hard this year when it comes to school, so I hope you can keep your focus for the rest of it too."'
 								'Artem looks gloomy at her. "Yes, mom..."'
 								'The two of you exchange pleasantries and as you start walking away, you give Artem a nudge with your hip. "See? I do know how to behave..."'
-								act 'Leave': gt 'artemhome','hallway'
+								act 'Leave': gt 'artemhome', 'hallway'
 							end
 						end
 					else
 						!! The dialogue above was obviously a first meeting one. If you want to add extra dialogue it should go here
-						act 'Leave': gt 'artemhome','hallway'
+						act 'Leave': gt 'artemhome', 'hallway'
 					end
 				else
 					*clr & cla
@@ -934,7 +939,7 @@ if $ARGS[0] = 'kitchen':
 					'"Hopefully only good things..." you joke and smile while looking at Artem.'
 					'She starts laughing. "Yes, no need to worry. He''s kept all the bad stuff from me."'
 					'Artem rolls his eyes, not too amused by his mother''s comment.'
-					'"You have a lovely home," you comment. "I didn''t expect to find so many books laying around..."'
+					'"You have a lovely home," you comment. "I didn''t expect to find so many books lying around..."'
 					'"Both myself and Artem''s father like to read. I''m a librarian after all and my husband is a real bookworm, so I guess that''s how we ended up with that many."'
 					act 'What do you like to read?':
 						*clr & cla
@@ -950,14 +955,14 @@ if $ARGS[0] = 'kitchen':
 							'Just as you pull out the chair, Artem interrupts by clearing his throat. "We need to go and study Mom. I didn''t bring <<$pcs_firstname>> over here so you could have someone to chat with..."'
 							'Glinina sighs. "You and your studying. I know your father says it''s the way to go, but you need to relax sometimes too. I''ve already got one bookworm in this house, I don''t need another."'
 							'Glinina tells you that if you ever find the time, you''re free to come and discuss literature with her over tea.'
-							act 'Leave': gt 'artemhome','hallway'
+							act 'Leave': gt 'artemhome', 'hallway'
 						end
 					end
 				end
 			end
 		else
 			'The room is so spotless that you can actually see your reflection in the tiles. A table is along the wall opposite the counters.'
-			act 'Leave': gt 'artemhome','hallway'
+			act 'Leave': gt 'artemhome', 'hallway'
 			act 'Look in the fridge': gt 'artemhome', 'fridge'
 			dynamic $fill_bottle
 			dynamic $driwater
@@ -1142,16 +1147,16 @@ if $ARGS[0] = 'artemparents':
 	else
 		if hour < 7 or hour > 22:
 			'You look into the bedroom and see Artem''s parents sleeping. Not wanting to disturb them, you close the door and leave.'
-			act 'Leave': gt 'artemhome','hallway'
+			act 'Leave': gt 'artemhome', 'hallway'
 		else
 			'Nobody''s here. You should probably leave, but could also take a look around first...'
-			act 'Leave': gt 'artemhome','hallway'
+			act 'Leave': gt 'artemhome', 'hallway'
 			act 'Look around':
 				*clr & cla
 				minut += 10
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/momsdrawer.jpg"></center>'
 				'You snoop around, opening drawers and looking in the closet, but don''t find anything of interest. The room is perfectly organized with each drawer containing a type of clothing neatly folded up. There seems to be nothing else of interest.'
-				act 'Leave': gt 'artemhome','hallway'
+				act 'Leave': gt 'artemhome', 'hallway'
 			end
 		end
 	end
@@ -1168,7 +1173,7 @@ if $ARGS[0] = 'chat':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 	'You sit and talk with Artem about various topics. Or rather: you''re doing most of the talking, and Artem is mostly listening to you talk while occasionally commenting on something you said.'
-	act 'Stop talking': gt 'artemhome','artemroom'
+	act 'Stop talking': gt 'artemhome', 'artemroom'
 	if dimaFilm > 0 and artemQW['artlie'] = 0 and artemQW['dimkahelp'] ! daystart:
 		act 'Ask Artem to steal the video Dimka filmed of you':
 			*clr & cla
@@ -1277,9 +1282,9 @@ if $ARGS[0] = 'chat':
 			'You just lay silent in each other''s arms for a minute, just thinking about the implications of it all. After that, you realize you need to get on with your day and he probably does too. You give Artem a quick kiss on his cheek and thank him for his support as you get up and gather your things. At least you know you''re not alone in this.'
 			gs 'arousal', 'kiss', 5
 			gs 'stat'
-			act 'Leave Artem''s apartment': minut += 5 & gt 'pod_ezd','etaj_1'
+			act 'Leave Artem''s apartment': minut += 5 & gt 'pod_ezd', 'etaj_1'
 		end
-		act 'Tell him you can''t see him any more':
+		act 'Tell him you can''t see him anymore':
 			*clr & cla
 			artemQW['sveslut'] = 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk3.jpg"></center>'
@@ -1287,7 +1292,7 @@ if $ARGS[0] = 'chat':
 			'Artem looks at you questioningly. "<<$pcs_nickname>>, what are you doing?"'
 			'You shake your head as you softly mutter through your tears. "I''m sorry, Artem... I can''t ask this from you. I can''t ask this from anyone. I''m really sorry, but I don''t think we should see each other any more."'
 			'After you gather your things, you leave his apartment while ignoring his pleas.'
-			act 'Leave Artem''s apartment':minut += 5 & artemQW['artemblok'] = 1 & gt 'pod_ezd','etaj_1'
+			act 'Leave Artem''s apartment':minut += 5 & artemQW['artemblok'] = 1 & gt 'pod_ezd', 'etaj_1'
 		end
 	elseif artemQW['date'] = 0 and artemQW['artfall'] >= 10 and fame['pav_slut'] < 150 and artemQW['dateask'] ! daystart:
 		*clr & cla
@@ -1311,7 +1316,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile. "Sure, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him, heading for the park.'
-			act 'Walk in the park': gt 'artem_date_events','firstdate'
+			act 'Walk in the park': gt 'artem_date_events', 'firstdate'
 		end
 	elseif artemQW['date'] > 0 and artemQW['date'] <= 3 and fame['pav_slut'] < 150 and artemQW['dateask'] ! daystart:
 		*clr & cla
@@ -1334,7 +1339,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile. "Sure, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artem_date_events','artem_date'
+			act 'Go on a date': gt 'artem_date_events', 'artem_date'
 		end
 	elseif artemQW['date'] = 4 and fame['pav_slut'] < 200 and artemQW['dateask'] ! daystart:
 		*clr & cla
@@ -1442,7 +1447,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile. "Sure, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artem_date_events','artem_date'
+			act 'Go on a date': gt 'artem_date_events', 'artem_date'
 		end
 	elseif artemQW['date'] >= 9 and artemQW['dateask'] ! daystart and artemQW['bf'] = 0:
 		*clr & cla
@@ -1528,7 +1533,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'You give him a cute smile. "Sure, that sounds like fun!"'
 			'You quickly pack up your things and leave the apartment with him.'
-			act 'Go on a date': gt 'artem_date_events','artem_date'
+			act 'Go on a date': gt 'artem_date_events', 'artem_date'
 		end
 	else
 		act 'Make small talk':
@@ -1662,7 +1667,7 @@ if $ARGS[0] = 'chat':
 				'You shake your head. "Look, you''re a great guy, but I just feel differently now is all."'
 				'You try to comfort him as he begs and pleads, but after some time you finally get up. "I''m sorry, but this is over. I''m truly sorry."'
 				'You turn and walk out, leaving Artem crying behind you.'
-				act 'Leave Artem''s apartment': minut += 5 & gt 'pod_ezd','etaj_1'
+				act 'Leave Artem''s apartment': minut += 5 & gt 'pod_ezd', 'etaj_1'
 			end
 		end
 		if artemQW['nush3some_ask'] = 1:
@@ -1838,7 +1843,7 @@ if $ARGS[0] = 'chat':
 						'His eyes bulge when he sees how big it is and starts shaking his head. "Hell no! That thing is massive! There''s no way you''re sticking that in me!"'
 						'You sigh. "Come on baby, I''ll go easy on you! I let you fuck me in the ass, so it''s only fair. You''ll enjoy it, I promise."'
 						'He keeps shaking his head and laughs a little. "Fair? That thing is way bigger than I am! Maybe if it was my size or smaller, I might consider it but not that thing!"'
-						'You try to convince him, but he''s stead fast against it and pushes you to have regular sex instead.'
+						'You try to convince him, but he''s steadfast against it and pushes you to have regular sex instead.'
 						act 'Have sex': gt 'artem_sex', 'sex'
 						act 'Stop talking': gt 'artemhome', 'artemroom'
 						act 'Keep talking': gt 'artemhome', 'chat'
@@ -1849,7 +1854,7 @@ if $ARGS[0] = 'chat':
 						'He looks at the dildo, then to you, and back again before finally sighing and nodding slightly. "Okay fine, but you can''t tell anyone we tried this, okay?"'
 						'You nod. "I swear I won''t tell anyone unless you''re okay with it."'
 						'He frowns at how you worded it, but it seems good enough. "Okay, if it''ll make you happy, then I''ll try it, but if it starts to hurt, we''re stopping." You nod in agreement.'
-						act 'Put on harness': gt 'artem_sex', 'strapon_first'
+						act 'Put on the harness': gt 'artem_sex', 'strapon_first'
 					end
 				end
 				act 'Change your mind':
@@ -1863,6 +1868,77 @@ if $ARGS[0] = 'chat':
 				end
 			end
 		end
+		if artemQW['strapon_count'] = 1 and mc_inventory['strapon'] = 1 and strapnumber > 0 and artemQW['strapon'] >= 1:
+			act 'Bring up strapon sex again':
+				*clr & cla
+				minut += 1
+				gs 'boyStat', 'D<<strapnumber>>'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon2.jpg"></center>'
+				'You wonder if he might let you fuck him in the butt again. "Artem, you remember when you let me fuck you with a strapon?"'
+				'He blushes bright red and panicky looks at the door like he expects his mom to burst in at any moment. "Not so loud and yes I remember, how could I forget?"'
+				'You smile at him and talk softer. "I really loved doing that and I want to do it again."'
+				'He seems speechless and unsure for a moment, then softly smiles. "Yeah, I guess, if it will make you happy, my love." As he talks, he starts taking off his pants.'
+				if strapnumber >= 4:
+					'You pull the strapon harness with its <<dick>>cm <<$dick_girth>> dildo out of your purse and hold it up, showing it to him. "I thought we could use this."'
+					'His eyes bulge when he sees how big it is and starts shaking his head. "Hell no! That thing is massive! There''s no way you''re sticking that in me!"'
+					'You sigh. "Come on baby, I''ll go easy on you! I let you fuck me in the ass, so it''s only fair. You''ll enjoy it, I promise."'
+					'He keeps shaking his head and laughs a little. "Fair? That thing is way bigger than I am! Maybe if it was my size or smaller, I might consider it but not that thing!"'
+					'You try to convince him, but he''s steadfast against it and pushes you to have regular sex instead.'
+					act 'Have sex': gt 'artem_sex', 'sex'
+					act 'Stop talking': gt 'artemhome', 'artemroom'
+					act 'Keep talking': gt 'artemhome', 'chat'
+				else
+					'You pull the strapon harness with its <<dick>>cm <<$dick_girth>> dildo attached out of your purse and hold it up, showing it to him. "Here it is."'
+					'He looks at the dildo. "Okay fine, but you still can''t tell anyone we did this, okay?"'
+					'You nod. "I swear I won''t tell anyone unless you''re okay with it." He frowns at how you worded it, but it seems good enough.'
+					act 'Put on the harness': gt 'artem_sex', 'strapon_second'
+				end
+			end
+			act 'Change your mind':
+				*clr & cla
+				minut += 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+				'You think about it some more and decide against it. It might freak him out and you don''t know how he would react to such a request. "Never mind. How about we just do what we normally do?"'
+				'He pauses a moment and looks at you. "Are you sure?" You nod at him and start kissing him.'
+				act 'Have sex': gt 'artem_sex', 'sex'
+			end
+		elseif artemQW['strapon_count'] > 1 and mc_inventory['strapon'] = 1 and strapnumber > 0 and artemQW['strapon'] >= 1:
+			act 'Bring up strapon sex yet again':
+				*clr & cla
+				minut += 1
+				gs 'boyStat', 'D<<strapnumber>>'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon2.jpg"></center>'
+				'You wonder if he might let you fuck him in the butt again. "Artem, I was thinking tonight I can fuck you again, what do you think?"'
+				'He blushes bright red. "Ok sure sweety, you can fuck me again." As he talks, he starts taking off his pants.'
+				if strapnumber >= 4:
+					'You pull the strapon harness with its <<dick>>cm <<$dick_girth>> dildo out of your purse and hold it up, showing it to him. "I thought we could use this."'
+					'His eyes bulge when he sees how big it is and starts shaking his head. "Hell no! That thing is massive! There''s no way you''re sticking that in me!"'
+					'You sigh. "Come on baby, I''ll go easy on you! I let you fuck me in the ass, so it''s only fair. You''ll enjoy it, I promise."'
+					'He keeps shaking his head and laughs a little. "Fair? That thing is way bigger than I am! Maybe if it was my size or smaller, I might consider it but not that thing!"'
+					'You try to convince him, but he''s steadfast against it and pushes you to have regular sex instead.'
+					act 'Have sex': gt 'artem_sex', 'sex'
+					act 'Stop talking': gt 'artemhome', 'artemroom'
+					act 'Keep talking': gt 'artemhome', 'chat'
+				else
+					'You pull the strapon harness with its <<dick>>cm <<$dick_girth>> dildo attached out of your purse and hold it up, showing it to him. "This will soon be up your ass and you''ll be moaning like a slut." You say with a giggle.'
+					'He looks at the dildo and for a moment you think he actually looks eager, then he looks at you and smiles. "Okay fine, but you still can''t tell anyone we are doing this, okay?"'
+					'You nod. "I swear I won''t tell anyone unless you''re okay with it." He frowns at how you worded it, but it seems good enough.'
+					act 'Put on the harness': gt 'artem_sex', 'strapon_again'
+				end
+			end
+			act 'Change your mind':
+				*clr & cla
+				minut += 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/strapon/first_strapon1.jpg"></center>'
+				'You think about it some more and decide against it. It might freak him out and you don''t know how he would react to such a request. "Never mind. How about we just do what we normally do?"'
+				'He pauses a moment and looks at you. "Are you sure?" You nod at him and start kissing him.'
+				act 'Have sex': gt 'artem_sex', 'sex'
+			end
+		end
 	end
 end
 

+ 94 - 94
locations/auditions.qsrc

@@ -12,7 +12,7 @@
 !! audition['roletype'] = 9 - A main character with nude scenes
 
 !! Audition Types
-!! 
+!!
 !! $audition['type'] = 'general' - general audition no special events usually for a minor speaking role
 !! $audition['type'] = 'extra' - an audition basically just to confirm scheduling and check that the PC isn''t grossly ugly
 !! $audition['type'] = 'titty' - an audition based solely on appearance and size of breasts, usually for a role as an extra
@@ -70,7 +70,7 @@ if $ARGS[0] = 'setup':
 end
 
 if $ARGS[0] = 'audition_end':
-	
+
 end
 
 if $ARGS[0] = 'role_denied':
@@ -96,7 +96,7 @@ end
 
 if $ARGS[0] = 'audition_result':
 	audition['result'] = ((audition['scene_prep'] * 5) + pcs_perform + audition['bonus'] - audition['penalty'])
-	if audition['cast_couch'] > 0:	
+	if audition['cast_couch'] > 0:
 		if audition['cast_couch'] > 5 and audition['cast_couch'] < 13:
 			actress['cast_couch_vag'] += 1
 			if audition['cast_couch_virgin'] = 1:
@@ -120,9 +120,9 @@ if $ARGS[0] = 'extra_audition':
 
 
 end
-	
+
 if $ARGS[0] = 'tit_audition':
-	cla & *clr
+	*clr & cla
 	if pcs_inhib > 45:
 		gs 'willpower', 'skill', 'pcs_inhib', 'force', 'easy'
 	else
@@ -142,13 +142,13 @@ if $ARGS[0] = 'tit_audition':
 		else
 			'"You have wonderful skin, very smooth and soft looking, even from here. That will be great for the camera. Now show me your breasts please."'
 		end
-		act'"Excuse me??"':
-			cla & *clr
+		act '"Excuse me??"':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'"Excuse me??" you ask, stunned. "What did you just ask me?"'
 			'The woman sighs in exasperation. "Ugh, this is why I hate dealing with amateurs. Did you even read what you''re auditioning for? You''re here for a bit role where you won''t be on screen for more than 10 seconds. This role <i>only</i> exists to show some tits on screen to excite the audience. And my job is to pick pretty girls with big pretty tits to make that a reality. Now either show me your tits and stop wasting my time or get out."'
-			act'Refuse':
-				cla & *clr
+			act 'Refuse':
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
 				'Blushing, you can''t do it and leave the room red faced while you hear the casting director sneer in disgust again.'
 				'"Next!"'
@@ -158,7 +158,7 @@ if $ARGS[0] = 'tit_audition':
 				if will_cost <= pcs_willpwr:
 					*nl
 					act 'Show her your tits (<<will_cost>> Willpower)':
-						cla & *clr
+						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/showtits.jpg"></center>'
 						'Your face heats with embarassment, both at her beratement and because of how uncomfotable you are with doing this but you pull your clothes aside to reveal your breasts to the woman. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 						'"How big are those? <<$titsize>>s?"'
@@ -171,11 +171,11 @@ if $ARGS[0] = 'tit_audition':
 						end
 						act 'Continue': gt 'auditions', 'tit_audition_result'
 					end
-				
+
 				end
 			else
 				act 'Show her your tits':
-					cla & *clr
+					*clr & cla
 					'<center><video autoplay loop src="images/locations/city/citycenter/aurora/auditions/showtits.mp4"></video></center>'
 					'Your face heats with embarassment from her beratement but you otherwise brazenly pull out your breasts to show them to her. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 					'"How big are those? <<$titsize>>s?"'
@@ -190,12 +190,12 @@ if $ARGS[0] = 'tit_audition':
 				end
 			end
 		end
-		
+
 		if pcs_inhib < 50:
 			if will_cost <= pcs_willpwr:
 				*nl
 				act 'Show her your tits (<<will_cost>> Willpower)':
-					cla & *clr
+					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/showtits.jpg"></center>'
 					'You blush with embarassment at the request but do as she says anyways seeing how you signed up for this in the first place. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 					'"How big are those? <<$titsize>>s?"'
@@ -211,7 +211,7 @@ if $ARGS[0] = 'tit_audition':
 			end
 		else
 			act 'Show her your tits':
-				cla & *clr
+				*clr & cla
 				'<center><video autoplay loop src="images/locations/city/citycenter/aurora/auditions/showtits.mp4"></video></center>'
 				'Not even slightly shy, you brazenly pull out your tits to show them to her in all their glory. She immediately consults her papers and makes notations before looking back up as you continue to stand in the middle of the room with your breasts out.'
 				'"How big are those? <<$titsize>>s?"'
@@ -230,7 +230,7 @@ end
 
 
 if $ARGS[0] = 'tit_audition_result':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	if audition['roletits'] > tits:
 		'"Well, if it were up to me, I''d hire you. You''ve got a great complexion and nice perky boobs, but the director specifically asked for, in his own words, ''big fat titties,'' and unfortunately you''re just too small. Thanks for coming anyways, maybe another time. Next!"'
@@ -261,16 +261,16 @@ if $ARGS[0] = 'tit_audition_result':
 end
 
 if $ARGS[0] = 'general_tit_audition':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
-	
+
 end
 
 !! ----------------------------------- Reluctant Results -----------------------------------------
 
 if $ARGS[0] = 'reluctant_swallow_end':
 	actress['cast_couch'] += 1
-	cla & *clr
+	*clr & cla
 	gs 'auditions','audition_result'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -295,8 +295,8 @@ if $ARGS[0] = 'reluctant_swallow_end':
 		end
 		'<<$boydesc>> reaches over to a stack of papers and looks through it for a bit before pulling one out and sliding it across the table towards you with a pen.'
 		'"Here''s the contract. Just sign here and it''s all official."'
-		act'Sign the contract':
-			if $clothingworntype = 'none':
+		act 'Sign the contract':
+			if $clothingworntype = 'nude':
 				gt 'auditions', 'naked_signature'
 			else
 				gt 'auditions', 'signature'
@@ -308,8 +308,8 @@ if $ARGS[0] = 'reluctant_swallow_end':
 		elseif audition['cast_couch'] = 2:
 			'"Meh," he shrugs noncommittally, sitting down behind the desk. "You should''ve swallowed. Maybe then I''d have considered it. Really impolite to spit out a man''s cum like that. Now get out. I have real applicants to audition."'
 		end
-		act'Leave the room':
-			cla & *clr
+		act 'Leave the room':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, finding yourself taken aback by the moment. That''s it? After everything? <<$boydesc>>''s already stopped paying attention to you and is sifting through papers on his desk.'
 			if $clothingworntype ! 'nude':
@@ -319,9 +319,9 @@ if $ARGS[0] = 'reluctant_swallow_end':
 			end
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if audition['cast_couch'] = 1:
 				'"What the fuck?!" You flush with anger and glare at <<$boydesc>>. "You just pressured me into sucking your dick, tricked me into thinking that it would help me land this role! I even swallowed your fucking cum! And now you''re just going to toss me out like some kind of gutter whore?"'
@@ -342,7 +342,7 @@ end
 
 if $ARGS[0] = 'reluctant_facial_end':
 	actress['cast_couch'] += 1
-	cla & *clr
+	*clr & cla
 	gs 'auditions','audition_result'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -359,16 +359,16 @@ if $ARGS[0] = 'reluctant_facial_end':
 		act 'Sign the contract': gt 'auditions', 'facial_signature_upset'
 	else
 		'"Pfff," he huffs. "As if. I''ve had better before. Either get better at acting or practice giving head cause neither one is a good enough justification to get you the job. Now get out. I have real applicants to audition."'
-		act'Leave the room':
-			cla & *clr
+		act 'Leave the room':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, finding yourself not exactly surprised, but also unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if cumloc[11] > 0:
 				'"What the fuck?!" Something suddenly snaps inside you and you''re filled with a harder emotion than before. "You just pressured me into sucking your dick, tricked me into thinking that it would help me land this role, <i>came on my fucking face</i>," you say, waving your cum covered hand at him, "and now you''re just going to toss me out like some kind of gutter whore?"'
@@ -393,7 +393,7 @@ end
 
 if $ARGS[0] = 'reluctant_results':
 	actress['cast_couch'] += 1
-	cla & *clr
+	*clr & cla
 	gs 'auditions','audition_result'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -436,26 +436,26 @@ if $ARGS[0] = 'reluctant_results':
 		else
 			'"You''re almost as lousy a fuck as you are you an actress. Nowhere good enough to justify giving you the part. Now get out. I have real applicants to audition. Maybe I''ll get lucky and one of them will have good acting ability while also being willing to put out."'
 		end
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'Clench your jaw in anger and leave':
-			cla & *clr
+
+		act 'Clench your jaw in anger and leave':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
-			
+
 			if actress['cast_couch_deny'] > 0:'<i>Great, another stingy fucker,</i> you think to yourself. <i>And another wasted audition spent on the casting couch.</i>'
-			
+
 			'As pissed off as you are, there isn''t anything you can do about this. You grab your things and stomp to the door, slamming it shut on the way out.'
 			act 'Leave': gt 'auditions', 'reflection'
 		end
-		
-!!{		act'What the fuck?!':
-			cla & *clr
+
+!!{		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if audition['cast_couch'] < 6:
 				if cumloc[11] > 0:
@@ -505,7 +505,7 @@ end
 if $ARGS[0] = 'reluctant_virgin_results':
 	actress['cast_couch'] += 1
 	gs 'auditions','audition_result'
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'"Okay. I... I gave... I gave you my virginity... I get the role now right? You promised me right?"'
 	if audition['result'] >= audition['requirement']:
@@ -518,16 +518,16 @@ if $ARGS[0] = 'reluctant_virgin_results':
 		'You feel the blood drain from your face.'
 		'"What?"'
 		'"I''m saying that you''ve got a tight pussy and all but holy fuck are you a bad actress. I can''t justify hiring you just because of this performance, particularly when your last performance was so bad. You should try porn instead, maybe they''d hire you based on just a tight pussy. Now get out. I have real applicants to audition and maybe one of them will have good acting ability while also putting out.'
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if cumloc[11] > 0:
 				'"What the fuck?!" Something suddenly snaps inside you and you''re practically blind with rage. "You just pressured me into fucking you for this! You tricked me into thinking that it would help me land this role! I gave you my virginity! You <i>came on my fucking face</i>," you say, waving your cum covered hand at him, "and now you''re just going to toss me out like some kind of gutter whore?"'
@@ -560,7 +560,7 @@ end
 
 if $ARGS[0] = 'neutral_results':
 	actress['cast_couch'] += 1
-	cla & *clr
+	*clr & cla
 	gs 'auditions','audition_result'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -568,7 +568,7 @@ if $ARGS[0] = 'neutral_results':
 		'"Okay. I sucked you off, I even swallowed. I get the role now right? That was the deal."'
 	elseif audition['cast_couch'] > 0 and audition['cast_couch'] < 6:
 		'"Okay. I sucked you off. I get the role now right? That was the deal."'
-		
+
 	elseif audition['cast_couch'] = 12:
 		'"Okay, I fucked you. Even let you cum inside me. So now I get the part right? That was the deal."'
 	elseif audition['cast_couch'] >= 6 and audition['cast_couch'] < 13:
@@ -608,26 +608,26 @@ if $ARGS[0] = 'neutral_results':
 		else
 			'"You''re almost as lousy a fuck as you are you an actress. Nowhere good enough to justify giving you the part. Now get out. I have real applicants to audition. Maybe I''ll get lucky and one of them will have good acting ability while also being willing to put out."'
 		end
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'Clench your jaw in anger and leave':
-			cla & *clr
+
+		act 'Clench your jaw in anger and leave':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
-			
+
 			if actress['cast_couch_deny'] > 0:'<i>Great, another stingy fucker,</i> you think to yourself. <i>And another wasted audition spent on the casting couch.</i>'
-			
+
 			'As pissed off as you are, there isn''t anything you can do about this. You grab your things and stomp to the door, slamming it shut on the way out.'
 			act 'Leave': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if audition['cast_couch'] < 6:
 				if cumloc[11] > 0:
@@ -677,7 +677,7 @@ end
 if $ARGS[0] = 'neutral_virgin_results':
 	actress['cast_couch'] += 1
 	gs 'auditions','audition_result'
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'"Okay. I fucked you and gave you my virginity. I get the role now right? You promised me."'
 	if audition['result'] >= audition['requirement']:
@@ -696,16 +696,16 @@ if $ARGS[0] = 'neutral_virgin_results':
 		end
 		'"What?"'
 		'"I''m saying that it''s nice to bang virgins and all but holy fuck are you a bad actress. I can''t justify hiring you just because of this performance, particularly when your last performance was so bad. You should try porn instead, maybe they''d hire you based on just a tight pussy. Now get out. I have real applicants to audition and maybe one of them will have good acting ability while also putting out.'
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if cumloc[11] > 0:
 				'"What the fuck?!" Something suddenly snaps inside you and you''re practically blind with rage. "You just pressured me into fucking you for this! You tricked me into thinking that it would help me land this role! I gave you my virginity! You <i>came on my fucking face</i>," you say, pointing at your spunk covered visage, "and now you''re just going to toss me out like some kind of gutter whore?"'
@@ -738,7 +738,7 @@ end
 
 if $ARGS[0] = 'slutty_results':
 	actress['cast_couch'] += 1
-	cla & *clr
+	*clr & cla
 	gs 'auditions','audition_result'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
@@ -779,26 +779,26 @@ if $ARGS[0] = 'slutty_results':
 		else
 			'"You''re almost as lousy a fuck as you are you an actress. Nowhere good enough to justify giving you the part. Now get out. I have real applicants to audition. Maybe I''ll get lucky and one of them will have good acting ability while also being willing to put out."'
 		end
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'Clench your jaw in anger and leave':
-			cla & *clr
+
+		act 'Clench your jaw in anger and leave':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
-			
+
 			if actress['cast_couch_deny'] > 0:'<i>Great, another stingy fucker,</i> you think to yourself. <i>And another wasted audition spent on the casting couch.</i>'
-			
+
 			'As pissed off as you are, there isn''t anything you can do about this. You grab your things and stomp to the door, slamming it shut on the way out.'
 			act 'Leave': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if audition['cast_couch'] < 6:
 				if cumloc[11] > 0:
@@ -847,9 +847,9 @@ end
 
 if $ARGS[0] = 'slutty_virgin_results':
 	actress['cast_couch'] += 1
-	
+
 	gs 'auditions','audition_result'
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'"Soooo..." you say with a sultry smile. "Pretty good, fucking a virgin right? Good enough to make her an actress, am I right?"'
 	if audition['result'] >= audition['requirement']:
@@ -868,16 +868,16 @@ if $ARGS[0] = 'slutty_virgin_results':
 		end
 		'"What?"'
 		'"I''m saying that it''s nice to bang virgins and all but ho-ly, you are as bad a fuck as you are an actress. Even the hooker on the corner knows how to work it better than you. You should try porn instead, maybe they''d hire you based on just a tight pussy. Now get out. I have real applicants to audition and maybe one of them will have good acting ability while also putting out.'
-		act'Speechless':
-			cla & *clr
+		act 'Speechless':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			'You blink, unable to conjure a response.'
 			'Without another word, you pick up your things and leave the room, stepping out into the hallway.'
 			act 'Close the door': gt 'auditions', 'reflection'
 		end
-		
-		act'What the fuck?!':
-			cla & *clr
+
+		act 'What the fuck?!':
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 			if cumloc[11] > 0:
 				'"What the fuck?!" Something suddenly snaps inside you and you''re practically blind with rage. "You just pressured me into fucking you for this! You tricked me into thinking that it would help me land this role! I gave you my virginity! You <i>came on my fucking face</i>," you say, pointing at your spunk covered visage, "and now you''re just going to toss me out like some kind of gutter whore?"'
@@ -912,7 +912,7 @@ end
 
 
 if $ARGS[0] = 'signature':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/shared/misc/signature.jpg"></center>'
 	'You reach over to pick up the pen and sign your name at the bottom of the page.'
 	if cumloc[0] > 0 and $pantyworntype ! 'none':
@@ -920,7 +920,7 @@ if $ARGS[0] = 'signature':
 	elseif cumloc[0] > 0:
 		'As the pen scribbles on paper you feel a random glob of cum drip from your pussy and faintly splat onto the carpet.'
 	elseif cumloc[3] > 0:
-		'As the pen scribbles on paper you feel yet another glob of cum dribble from your anus, lingering uncomfortably between your asscheeks.'		
+		'As the pen scribbles on paper you feel yet another glob of cum dribble from your anus, lingering uncomfortably between your asscheeks.'
 	end
 	*nl
 	'<i>	<<$pcs_firstname>> <<$pcs_lastname>>.</i>'
@@ -931,7 +931,7 @@ if $ARGS[0] = 'signature':
 end
 
 if $ARGS[0] = 'naked_signature':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/shared/misc/signature.jpg"></center>'
 	'You reach over to pick up the pen and sign your name at the bottom of the page.'
 	if cumloc[0] > 0:
@@ -939,7 +939,7 @@ if $ARGS[0] = 'naked_signature':
 	elseif cumloc[3] > 0:
 		'As the pen scribbles on paper you feel yet another glob of cum squeeze out of your asshole and dribble down your left cheek.'
 	elseif cumloc[11] > 0:
-		'As the pen scribbles on paper, a drop of cum falls from your face and spatters on the page next to your name.'		
+		'As the pen scribbles on paper, a drop of cum falls from your face and spatters on the page next to your name.'
 	end
 	'"Love the view by the way," <<$boydesc>> says, shamelessly ogling your naked body while you sign.'
 	*nl
@@ -959,7 +959,7 @@ end
 
 
 if $ARGS[0] = 'facial_signature_upset':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/shared/misc/signature.jpg"></center>'
 	'You pick up the pen he hands you and sign it.'
 	*nl
@@ -981,8 +981,8 @@ if $ARGS[0] = 'audition_escape':
 	gs 'auditions', 'role_denied'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/room.jpg"></center>'
 	'"I have to go!" you yelp and rush out of the room.'
-	act'Rush out the door':
-		cla & *clr
+	act 'Rush out the door':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
 		if actress['audition_pressure'] = 1 and actress['cast_couch'] < 1 and actress['cast_seduce'] < 1:
 			'You slam the door behind you and clutch your hand to your breast, heart pounding.'
@@ -1047,7 +1047,7 @@ end
 
 !! ----------------------------------- Post Casting Couch Reflection -----------------------------------------
 
-	
+
 if $ARGS[0] = 'reflection':
 	gs 'arousal', 'end'
 	if $clothingworntype = 'nude':
@@ -1081,7 +1081,7 @@ if $ARGS[0] = 'reflection_end':
 end
 
 !!if $ARGS[0] = 'reflect_first_time':
-!!	cla & *clr
+!!	*clr & cla
 !!	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
 !!	'The door shuts behind you and you lean against it, thinking about what just happened.'
 !!	''

+ 55 - 55
locations/autosalonF.qsrc

@@ -2,7 +2,7 @@
 if $ARGS[0] = 'start':
 	$loc_arg = $ARGS[0]
 	$loc = 'autosalonF'
-    $location_type = 'event'
+	$location_type = 'event'
 	menu_off = 1
 	cla
 	*clr
@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''111''">Bentley Continental GT</a>.</TD><TD> - </TD><TD> 13,000,000 <b>₽</b> </TD>'
 	$car_table += '<TR><TD><a href="exec:GS ''carF1'',''112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> 14,000,000 <b>₽</b> </TD>'
 	$car_table += '</table></center>'
-	
+
 	$car_table
 
 	act 'Talk to the manager': gt 'autosalonF', 'manager1'
@@ -59,107 +59,107 @@ 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> 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.' 
+	'You have <<karta - bankDebtLimit>> <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'
+	act 'Leave': gt 'city_industrial'
 
 	if prava = 1:
-		if karta + bankDebtLimit >= 535800:
-			act 'Buy a LADA Kalina (535,800 <b>₽</b>)':gt 'autosalonF', 'buy', 535800, 'LADA Kalina', 6, 400
+		if karta >= 535800:
+			act 'Buy a LADA Kalina (535,800 <b>₽</b>)': gt 'autosalonF', 'buy', 535800, 'LADA Kalina', 6, 400
 		end
 
-		if karta + bankDebtLimit >= 645000:
-			act 'Buy a LADA Vesta (645,000 <b>₽</b>)':gt 'autosalonF', 'buy', 645000, 'LADA Vesta', 7, 450
+		if karta  >= 645000:
+			act 'Buy a LADA Vesta (645,000 <b>₽</b>)': gt 'autosalonF', 'buy', 645000, 'LADA Vesta', 7, 450
 		end
 
-		if karta + bankDebtLimit >= 625000:
-			act 'Buy a Chevrolet Niva (625,000 <b>₽</b>)':gt 'autosalonF', 'buy', 625000, 'Chevrolet NIVA', 8, 500
+		if karta >= 625000:
+			act 'Buy a Chevrolet Niva (625,000 <b>₽</b>)': gt 'autosalonF', 'buy', 625000, 'Chevrolet NIVA', 8, 500
 		end
 
-		if karta + bankDebtLimit >= 600000:
-			act 'Buy a UAZ Hunter (600,000 <b>₽</b>)':gt 'autosalonF', 'buy', 600000, 'UAZ HUNTER', 9, 300
+		if karta >= 600000:
+			act 'Buy a UAZ Hunter (600,000 <b>₽</b>)': gt 'autosalonF', 'buy', 600000, 'UAZ HUNTER', 9, 300
 		end
 
-		if karta + bankDebtLimit >= 760000:
-			act 'Buy a UAZ Patriot (760,000 <b>₽</b>)':gt 'autosalonF', 'buy', 760000, 'UAZ Patriot', 10, 400
+		if karta >= 760000:
+			act 'Buy a UAZ Patriot (760,000 <b>₽</b>)': gt 'autosalonF', 'buy', 760000, 'UAZ Patriot', 10, 400
 		end
 
-		if karta + bankDebtLimit >= 884000:
-			act 'Buy a Ford Focus (884,000 <b>₽</b>)':gt 'autosalonF', 'buy', 884000, 'Ford Focus', 13, 800
+		if karta >= 884000:
+			act 'Buy a Ford Focus (884,000 <b>₽</b>)': gt 'autosalonF', 'buy', 884000, 'Ford Focus', 13, 800
 		end
 
-		if karta + bankDebtLimit >= 649990:
-			act 'Buy a Renault LOGAN (649,990 <b>₽</b>)':gt 'autosalonF', 'buy', 649990, 'Renault LOGAN', 102, 1000
+		if karta >= 649990:
+			act 'Buy a Renault LOGAN (649,990 <b>₽</b>)': gt 'autosalonF', 'buy', 649990, 'Renault LOGAN', 102, 1000
 		end
 
-		if karta + bankDebtLimit >= 1329000:
-			act 'Buy a Ford Mondeo (1,329,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1329000, 'Ford Mondeo', 110, 2000
+		if karta >= 1329000:
+			act 'Buy a Ford Mondeo (1,329,000 <b>₽</b>)': gt 'autosalonF', 'buy', 1329000, 'Ford Mondeo', 110, 2000
 		end
 
-		if karta + bankDebtLimit >= 1484000:
-			act 'Buy a Toyota Camry (1,484,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1484000, 'Toyota Camry', 104, 3000
+		if karta >= 1484000:
+			act 'Buy a Toyota Camry (1,484,000 <b>₽</b>)': gt 'autosalonF', 'buy', 1484000, 'Toyota Camry', 104, 3000
 		end
 
-		if karta + bankDebtLimit >= 1749990:
-			act 'Buy a Mitsubishi L200 (1,749,990 <b>₽</b>)':gt 'autosalonF', 'buy', 1749990, 'Mitsubishi L200', 95, 2000
+		if karta >= 1749990:
+			act 'Buy a Mitsubishi L200 (1,749,990 <b>₽</b>)': gt 'autosalonF', 'buy', 1749990, 'Mitsubishi L200', 95, 2000
 		end
 
-		if karta + bankDebtLimit >= 1097000:
-			act 'Buy a Toyota Corolla (1,097,000 <b>₽</b>)':gt 'autosalonF', 'buy', 1097000, 'Toyota Corolla', 103, 3000
+		if karta >= 1097000:
+			act 'Buy a Toyota Corolla (1,097,000 <b>₽</b>)': gt 'autosalonF', 'buy', 1097000, 'Toyota Corolla', 103, 3000
 		end
 
-		if karta + bankDebtLimit >= 1299700:
-			act 'Buy a Mazda 6 (1,299,700 <b>₽</b>)':gt 'autosalonF', 'buy', 1299700, 'Mazda 6', 105, 3000
+		if karta >= 1299700:
+			act 'Buy a Mazda 6 (1,299,700 <b>₽</b>)': gt 'autosalonF', 'buy', 1299700, 'Mazda 6', 105, 3000
 		end
 
-		if karta + bankDebtLimit >= 2950000:
-			act 'Buy a Mercedes-Benz E-Class (2,950,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2950000, 'Mercedes-Benz E-Class', 106, 5000
+		if karta >= 2950000:
+			act 'Buy a Mercedes-Benz E-Class (2,950,000 <b>₽</b>)': gt 'autosalonF', 'buy', 2950000, 'Mercedes-Benz E-Class', 106, 5000
 		end
 
-		if karta + bankDebtLimit >= 2914000:
-			act 'Buy an Audi A6 (2,914,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2914000, 'Audi A6', 109, 5000
+		if karta >= 2914000:
+			act 'Buy an Audi A6 (2,914,000 <b>₽</b>)': gt 'autosalonF', 'buy', 2914000, 'Audi A6', 109, 5000
 		end
 
-		if karta + bankDebtLimit >= 3374000:
-			act 'Buy a Lexus RX 350(3,374,000 <b>₽</b>)':gt 'autosalonF', 'buy', 3374000, 'Lexus RX 350', 97, 4000
+		if karta >= 3374000:
+			act 'Buy a Lexus RX 350(3,374,000 <b>₽</b>)': gt 'autosalonF', 'buy', 3374000, 'Lexus RX 350', 97, 4000
 		end
 
-		if karta + bankDebtLimit >= 2721000:
-			act 'Buy a BMW 3-Seria (2,721,000 <b>₽</b>)':gt 'autosalonF', 'buy', 2721000, 'BMW 3-Seria', 101, 4000
+		if karta >= 2721000:
+			act 'Buy a BMW 3-Seria (2,721,000 <b>₽</b>)': gt 'autosalonF', 'buy', 2721000, 'BMW 3-Seria', 101, 4000
 		end
 
-		if karta + bankDebtLimit >= 7000000:
-			act 'Buy a BMW M5 (7,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 7000000, 'BMW M5', 107, 6000
+		if karta >= 7000000:
+			act 'Buy a BMW M5 (7,000,000 <b>₽</b>)': gt 'autosalonF', 'buy', 7000000, 'BMW M5', 107, 6000
 		end
 
-		if karta + bankDebtLimit >= 5366000:
-			act 'Buy a BMW X6 (5,366,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5366000, 'BMW X6', 99, 4000
+		if karta >= 5366000:
+			act 'Buy a BMW X6 (5,366,000 <b>₽</b>)': gt 'autosalonF', 'buy', 5366000, 'BMW X6', 99, 4000
 		end
 
-		if karta + bankDebtLimit >= 5000000:
-			act 'Buy an Audi Q7 (5,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5000000, 'Audi Q7', 96, 5000
+		if karta >= 5000000:
+			act 'Buy an Audi Q7 (5,000,000 <b>₽</b>)': gt 'autosalonF', 'buy', 5000000, 'Audi Q7', 96, 5000
 		end
 
-		if karta + bankDebtLimit >= 5500000:
-			act 'Buy a Porsche Cayenne (5,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 5500000, 'Porsche Cayenne', 98, 3000
+		if karta >= 5500000:
+			act 'Buy a Porsche Cayenne (5,500,000 <b>₽</b>)': gt 'autosalonF', 'buy', 5500000, 'Porsche Cayenne', 98, 3000
 		end
 
-		if karta + bankDebtLimit >= 6500000:
-			act 'Buy a Jaguar XJ (6,500,000 <b>₽</b>)':gt 'autosalonF', 'buy', 6500000, 'Jaguar XJ', 108, 4000
+		if karta >= 6500000:
+			act 'Buy a Jaguar XJ (6,500,000 <b>₽</b>)': gt 'autosalonF', 'buy', 6500000, 'Jaguar XJ', 108, 4000
 		end
 
-		if karta + bankDebtLimit >= 7600000:
-			act 'Buy a Mercedes-Benz S-Class (7,600,000 <b>₽</b>)':gt 'autosalonF', 'buy', 7600000, 'Mercedes-Benz S-Class', 100, 8000
+		if karta >= 7600000:
+			act 'Buy a Mercedes-Benz S-Class (7,600,000 <b>₽</b>)': gt 'autosalonF', 'buy', 7600000, 'Mercedes-Benz S-Class', 100, 8000
 		end
 
-		if karta + bankDebtLimit >= 13000000:
-			act 'Buy a Bentley Continental GT (13,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 13000000, 'Bentley Continental GT', 111, 8000
+		if karta >= 13000000:
+			act 'Buy a Bentley Continental GT (13,000,000 <b>₽</b>)': gt 'autosalonF', 'buy', 13000000, 'Bentley Continental GT', 111, 8000
 		end
 
-		if karta + bankDebtLimit >= 14000000:
-			act 'Buy a Ferrari 458 Italia (14,000,000 <b>₽</b>)':gt 'autosalonF', 'buy', 14000000, 'Ferrari 458 Italia', 112, 10000
+		if karta >= 14000000:
+			act 'Buy a Ferrari 458 Italia (14,000,000 <b>₽</b>)': gt 'autosalonF', 'buy', 14000000, 'Ferrari 458 Italia', 112, 10000
 		end
 	end
 end
@@ -177,10 +177,10 @@ if $ARGS[0] = 'buy':
 	car['current_condition'] = ARGS[4]
 	wrek = 0
 
-	'The manager draws up a purchasing contract, and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
+	'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'
+	act 'Leave': gt'city_industrial'
 end
 
 --- autosalonF ---------------------------------

+ 78 - 46
locations/bank.qsrc

@@ -29,6 +29,7 @@ if $ARGS[0] = 'start':
 			act 'Open account':
 				cla
 				bankAccount = 1
+				karta = 5000
 				bankDebtLimit = 5000
 				'You are led to on open office and a member of the bank staff goes through your details and ID, then takes 50 <b>₽</b> from you before setting up your account'
 				'"Your account is now open with your 50 <b>₽</b> and an overdraft protection of 5,000 <b>₽</b>"'
@@ -61,23 +62,23 @@ if $ARGS[0] = 'start':
 			end
 		end
 
-		if karta + bankDebtLimit > 0:
+		if karta > 0:
 			act 'Withdraw money':
 				cla
 				menu_off = 1
 				kartaOUT = input ("How much do you want to withdraw from account?")
 
-				if kartaOUT <= 0 or kartaOUT > karta + bankDebtLimit:
+				if kartaOUT <= 0 or kartaOUT > karta:
 					'That is not a valid operation.'
 				else
 					karta -= kartaOUT
 					money += kartaOUT
-					if karta > 0:
-						'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have <<karta>> <b>₽</b> left in your bank account.'
-					elseif karta = 0:
+					if karta > bankDebtLimit:
+						'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have <<karta - bankDebtLimit>> <b>₽</b> left in your bank account.'
+					elseif karta = bankDebtLimit:
 						'<br>You withdraw <<kartaOUT>> <b>₽</b>. You have no money left in your bank account.'
 					else
-						'<br>You withdraw <<kartaOUT>> <b>₽</b>. <font color="red">Your bank account is overdrawn by <b><<karta>> ₽</b>.</font>'
+						'<br>You withdraw <<kartaOUT>> <b>₽</b>. <font color="red">Your bank account is overdrawn by <b><<bankDebtLimit - karta>> ₽</b>.</font>'
 					end
 				end
 				killvar 'kartaOUT'
@@ -86,25 +87,25 @@ if $ARGS[0] = 'start':
 				act 'Walk away':gt 'bank', 'start'
 			end
 
-			if bankDebtLimitRaised = 0 and karta >= 10000:
+			if bankDebtLimitRaised = 0 and karta >= 15000:
 				act 'See about increasing your credit limit':
 					if $region = 'city':
 						gt 'bank', 'loan_officer', 'start'
 					else
-						'You approach the teller and say, “Hello, Id like to talk to someone about increasing my credit limit.”'
+						'You approach the teller and say, “Hello, I''d like to talk to someone about increasing my credit limit.”'
 						*nl
-						'The teller nods and tells you, “Unfortunately our credit limit functions are being handled through our Saint Petersburg branch. I’m sure they’d be happy to help you there.”'
+						'The teller nods and tells you, “Unfortunately our credit limit functions are being handled through our Saint Petersburg branch. I''m sure they''d be happy to help you there.”'
 						delact 'See about increasing your credit limit'
 					end
 				end
 			end
 		end
-		if karta >= 0:
-			'You have <<karta>> <b>₽</b> in your account.'
+		if karta >= bankDebtLimit:
+			'You have <<karta - bankDebtLimit>> <b>₽</b> in your account.'
 			'You can take out a loan of <font color="blue"><<bankDebtLimit>></font>!'
 		else
-			'You hava a debt of <font color="red"><<-1 * karta>></font> <b>₽</b>.'
-			'You can take out a loan of <font color="blue"><<bankDebtLimit + karta>></font>!'
+			'You hava a debt of <font color="red"><<bankDebtLimit - karta>></font> <b>₽</b>.'
+			'You can take out a loan of <font color="blue"><<karta>></font>!'
 		end
 	end
 
@@ -340,9 +341,9 @@ if $ARGS[0] = 'loan_officer':
 			gs 'fame', 'city', 'sex', 3
 			gs 'arousal', 'end'
 
-			bankDebtLimit = 50000
-			money += karta + bankDebtLimit
-			karta = -bankDebtLimit
+			bankDebtLimit += 45000
+			money += 45000
+
 			bankDebtLimitRaised = 1
 			minut += 30
 			gs 'stat'
@@ -352,6 +353,23 @@ if $ARGS[0] = 'loan_officer':
 	end
 end
 
+
+if $ARGS[0] = 'deposit_cash':
+	kartaIN = input ("How much money do you want to deposit into your account?")
+
+	if kartaIN <= 0 or kartaIN > money:
+		'Invalid operation.'
+	else
+		atmDeposit[] += kartaINATM - 100
+		atmDepositDate[] = daystart + 2
+		money -= kartaINATM
+
+		'<br>You deposit <<kartaINATM>> <b>₽</b> into your account.'
+		'It will take 2 days for funds to be available. Your new balance will be <<karta - bankDebtLimit + atmDeposit[]>> <b>₽</b>.'
+	end
+end
+
+
 if $ARGS[0] = 'cikl':
 	!!------------------------------------------------------------------------------------------------------------
 	!!	Banking
@@ -361,7 +379,7 @@ if $ARGS[0] = 'cikl':
 	!!Not very realistic but won''t make anyone too rich.
 
 	if bankAccount = 1:
-		kartatotal = karta
+		kartatotal = karta - bankDebtLimit
 		:kartaloop
 		if kartatotal > 20000000:
 			kartacount += 1
@@ -371,10 +389,10 @@ if $ARGS[0] = 'cikl':
 		else
 			largekarta[0] = kartatotal
 		end
-		if karta >= 2000000:
+		if karta - bankDebtLimit >= 2000000:
 			!! yearly interest of 2.3% recalculated into daily interest = 0.006% daily
 			intrate = 60
-		elseif karta >= 0:
+		elseif karta - bankDebtLimit >= 0:
 			!! yearly interest of 1.15% recalculated into daily interest = 0.003% daily
 			intrate = 30
 		else
@@ -382,16 +400,16 @@ if $ARGS[0] = 'cikl':
 			intrate = 550
 		end
 		:intloop
-		if kartacount > 0:
+		if kartacount = 0:
+			smallmoneypos += (largekarta[0] * intrate)
+			largekarta[0] = 0
+			if kartacount ! 0: kartacount = 0
+		else
 			smallmoneypos += (largekarta[kartacount] * intrate)
 			if smallmoneypos >= 1000000 or smallmoneypos <= -1000000: karta += smallmoneypos / 1000000 & smallmoneypos = smallmoneypos mod 1000000
 			largekarta[kartacount] = 0
 			kartacount -= 1
 			jump 'intloop'
-		else
-			smallmoneypos += (largekarta[0] * intrate)
-			largekarta[0] = 0
-			if kartacount ! 0: kartacount = 0
 		end
 
 		if smallmoneypos >= 1000000 or smallmoneypos <= -1000000:
@@ -399,21 +417,34 @@ if $ARGS[0] = 'cikl':
 			smallmoneypos = smallmoneypos mod 1000000
 		end
 
-		if atmDeposit > 0 and atmDepositDate <= daystart:
-			karta += atmDeposit
-			atmDeposit = 0
+
+		bank_i = 0
+		:atmdeposit_loop
+		if arrsize('atmDeposit') > 0:
+			if atmDepositDate[bank_i] <= daystart:
+				if atmDeposit[bank_i] > 0:
+					karta += atmDeposit[bank_i]
+				end
+				killvar 'atmDeposit', bank_i
+				killvar 'atmDepositDate', bank_i
+			else
+				bank_i += 1
+			end
+			jump 'atmdeposit_loop'
 		end
+		killvar 'bank_i'
+
 
 
 		! Daily Internet and mobile checks
 		$internet_action_messages = func('internet_mobile', 'check_subscription_actions')
-		count = ARRSIZE('$internet_action_messages')
-		i = 0
+		count = arrsize('$internet_action_messages')
+		bank_i = 0
 		:loop_messages
-			if $internet_action_messages[i] ! '': *pl $internet_action_messages[i]
-			i += 1
-		if i < count: jump 'loop_messages'
-		killvar 'i'
+			if $internet_action_messages[bank_i] ! '': *pl $internet_action_messages[bank_i]
+			bank_i += 1
+		if bank_i < count: jump 'loop_messages'
+		killvar 'bank_i'
 		killvar 'count'
 	end
 
@@ -440,13 +471,14 @@ if $ARGS[0] = 'cikl':
 
 	else
 		!! meynold payment
-		if	mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] < 10 and mey_tamara['qw_end'] = 0:
-			karta += 10000
-			'<b><font color=green>For your efforts aunt Tamara gave you 10,000 rubles</font></b>'
-			mey_tamara['help_count'] = 0
-		elseif mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] >= 10 and mey_tamara['qw_end'] = 0:
-			karta += 15000
-			'<b><font color=green>For your efforts aunt Tamara gave you 15,000 rubles</font></b>'
+		if mey_vika['mey_vika_qw'] >= 35 and mey_tamara['qw_end'] = 0:
+			if mey_tamara['help_count'] < 10:
+				karta += 10000
+				'<b><font color=green>For your efforts aunt Tamara gave you 10,000 rubles</font></b>'
+			else
+				karta += 15000
+				'<b><font color=green>For your efforts aunt Tamara gave you 15,000 rubles</font></b>'
+			end
 			mey_tamara['help_count'] = 0
 		end
 
@@ -524,14 +556,14 @@ if $ARGS[0] = 'cikl':
 		! Utilities for all apartments.
 		if func('homes_properties', 'get_owned_homes_count') > 0 and electroday = 0:
 			gs 'housing', 'util'
-			if bankAccount = 1 and karta >= elektro:
+			if bankAccount = 1 and karta - bankDebtLimit >= elektro:
 				'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account.</font></b>'
 				electroday = 1
 				if elektro >= 2000:
 					elektro = 2000 + rand(0, 100)
 					karta -= elektro * hcount_util
 				end
-			elseif bankAccount = 1 and karta + bankDebtLimit >= elektro:
+			elseif bankAccount = 1 and karta >= elektro:
 				'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account and overdraw facility. Please contact your bank.</font></b>'
 				electroday = 1
 				if elektro >= 2000:
@@ -553,11 +585,11 @@ if $ARGS[0] = 'cikl':
 		! Cable for all apartments
 		if kabel > 0 and kabelday = 0:
 			gs 'housing', 'cable'
-			if bankAccount = 1 and karta >= (300 * hcount_cable):
+			if bankAccount = 1 and karta - bankDebtLimit >= (300 * hcount_cable):
 				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account, for you cable TV subscription.</font></b>'
 				kabelday = 1
 				karta -= 300 * hcount_cable
-			elseif bankAccount = 1 and karta + bankDebtLimit >= (300 * hcount_cable):
+			elseif bankAccount = 1 and karta >= (300 * hcount_cable):
 				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account and overdraw facility, for you cable TV subscription.</font></b>'
 				kabelday = 1
 				karta -= 300 * hcount_cable
@@ -585,8 +617,8 @@ if $ARGS[0] = 'cikl':
 		:loop_rent_payments
 			if property_days[bank_i] <= 2:
 				!From bank
-				if bankAccount = 1 and karta + bankDebtLimit >= property_rent[bank_i]:
-					'<b><font color="green">Your rent payment of <<property_rent[bank_i]>> <b>₽</b> for your <<$property_name[bank_i]>>, has automatically been deducted from your bank account' + iif(kart >= 0, '', ' and overdraw facility. Please contact your bank regarding your overdraw repayment') + '.</font></b>'
+				if bankAccount = 1 and karta >= property_rent[bank_i]:
+					'<b><font color="green">Your rent payment of <<property_rent[bank_i]>> <b>₽</b> for your <<$property_name[bank_i]>>, has automatically been deducted from your bank account' + iif(karta >= bankDebtLimit, '', ' and overdraw facility. Please contact your bank regarding your overdraw repayment') + '.</font></b>'
 					gs 'homes_properties', 'pay_rent', $property_code[bank_i], 'card'
 					!karta -= property_rent[bank_i]
 					!gs 'homes_properties', 'add_rent_days', $property_code[bank_i]

+ 1 - 1
locations/bdsm_dressing.qsrc

@@ -21,7 +21,7 @@ gs 'stat'
 'It is here where you must set your role for your visit, you can also change it here but must be wearing the correct clothing for your role or you will only be able to leave.'
 'Submissives must wear either maid or submissive sex shop clothing or be naked.'
 'Dominants must wear clothing of minimum "expensive" quality.'
-if ($clothingworntype = 'gm_maid' or PCloStyle2 = 1) or CloStyle3 = 2 or $clothingworntype = 'nude':
+if ($clothingworntype = 'gm_maid' or PCloStyle2 = 1) or PCloStyle3 = 2 or $clothingworntype = 'nude':
 	act 'Enter the club''s foyer (submissive role)':
 		$bdsmclub['role'] = 'sub'
 		gt 'bdsm_hallway', 'foyer'

+ 4 - 4
locations/bdsm_mansion.qsrc

@@ -67,7 +67,7 @@ if $ARGS[0] = 'start':
 				act 'Enter the club':gt 'bdsm_hallway', 'foyer'
 			end
 		end
-		gs 'taxi'		
+		gs 'taxi'
 	else
 		act 'Go to the elite settlement':gt 'city_suburbs', 'start'
 	end
@@ -155,7 +155,7 @@ if $ARGS[0] = 'office':
 		*nl
 		'You cannot afford the 10,000 rubes required to extend your club membership.'
 	else
-		if money > 10000:
+		if money >= 10000:
 			act 'Pay 10,000 <b>₽</b> to extend your membership and return to the dressing room':
 				bdsmclub['payday'] = daystart
 				bdsmclub['training_daystart'] = daystart
@@ -163,11 +163,11 @@ if $ARGS[0] = 'office':
 				gt 'bdsm_dressing'
 			end
 		end
-		if karta > 10000:
+		if karta >= 10000:
 			act 'Pay 10,000 <b>₽</b> to extend your membership and return to the dressing room':
 				bdsmclub['payday'] = daystart
 				bdsmclub['training_daystart'] = daystart
-				money -= 10000
+				karta -= 10000
 				gt 'bdsm_dressing'
 			end
 		end

+ 0 - 0
locations/BDSM_training.qsrc → locations/bdsm_training.qsrc


+ 1 - 1
locations/bed2.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'main':
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/son.jpg"></center>'
 	end
 	*nl
-	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt ''bed2'', ''main''">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt ''bed2'', ''main''">ON</a>.')
+	func('alarmclock', 'base_alarmclock_text')
 	*nl
 	gs 'bed2', 'wear_panties_decider'
 	*nl

+ 2 - 6
locations/bedr.qsrc

@@ -18,7 +18,7 @@ if rembedr = 0:
 	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a>.'
 	*nl
 
-	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+	func('alarmclock', 'base_alarmclock_text')
 
 	*nl
 	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor. The windows are closed with faded, heavy curtains.'
@@ -27,11 +27,7 @@ else
 	*nl
 	'A bright and beautiful room, with a large, kingsized <a href="exec:gt ''bed'', ''start''">double bed</a>.'
 	*nl
-	if alarmOn = 0:
-		'There is an <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> on the bedside table, and it is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> and is currently turned <a href="exec: alarmVars[''alarmOn''] = 1 & gt ''<<$loc>>''">off</a>.'
-	else
-		'There is an <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> on the bedside table, and it is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> and is currently turned <a href="exec: alarmVars[''alarmOn''] = 0 & gt ''<<$loc>>''">on</a>.'
-	end
+	'There is an <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> on the bedside table, and it is set to <<func(''alarmclock'', ''get_week_display'')>> during the week and <<func(''alarmclock'', ''get_weekend_display'')>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
 	*nl
 	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor. Against the wall stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
 end

+ 1 - 1
locations/bedr2x.qsrc

@@ -23,7 +23,7 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt 'tobiQW', 'start'
 'A bright and beautiful bedroom, with modern and stylish furniture.'
 *nl
 'The room is dominated by <a href="exec:gt ''bed'',''start''">full sized bed</a>'
-'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+func('alarmclock', 'base_alarmclock_text')
 *nl
 'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 *nl

+ 2 - 1
locations/bedrPar.qsrc

@@ -139,7 +139,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		end
 
 		if func('homes_properties', 'can_live_here'):
-			'<table><tr><td valign="top">Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+			'<table><tr><td valign="top">'
+			func('alarmclock', 'base_alarmclock_text')
 
 			if mc_inventory['contraceptive_pill'] > 0 and mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0:
 				'Your <a href="exec:gt ''stol'', ''bc''">birth control</a> is hidden in one of your desk drawers, as are your <a href="exec:gt ''stol'', ''bc''">condoms</a>.'

+ 8 - 16
locations/bedrPar2.qsrc

@@ -2,14 +2,9 @@
 !2021/04/26
 if $ARGS[0] = '':
 	CLOSE ALL
-	*clr & cla
-	$loc = 'bedrPar2'
-	$loc_arg = ''
-	$locclass = 'bedr'
-	$location_type = 'private'
-	$menu_loc = 'bedrPar2'
-	$menu_arg = ''
 	menu_off = 0
+	gs 'shortgs', 'setloc', 'bedrPar2', ''
+	$location_type = 'private'
 	minut += 1
 	gs 'stat'
 	gs 'themes', 'indoors'
@@ -80,7 +75,6 @@ end
 
 ! parent''s wardrobe
 if $ARGS[0] = 'parents_wardrobe':
-	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/wardrobe.jpg"></center>'
 	'An old looking wardrobe, probably from the Soviet times.'
 	act 'Leave ': gt $loc, $loc_arg
@@ -88,7 +82,6 @@ if $ARGS[0] = 'parents_wardrobe':
 end
 
 if $ARGS[0] = 'wardrobe_search':
-	*clr & cla
 	if locat['Fam_inGad'] = 0 and (locat['Mother'] = 1 or locat['Mother'] = 3 or locat['Stepdad'] = 1 or locat['Stepdad'] = 2):
 		'What are you thinking? You can''t go through the wardrobe while your parents are in the room!'
 		act 'Leave ': gt $loc, $loc_arg
@@ -113,7 +106,6 @@ if $ARGS[0] = 'wardrobe_search':
 end
 
 if $ARGS[0] = 'momtoy_play':
-	*clr & cla
 	menu_off = 1
 	mc_inventory['dildo_small'] = 1
 	dildohand = 10
@@ -127,7 +119,7 @@ if $ARGS[0] = 'momtoy_play':
 end
 
 if $ARGS[0] = 'peek':
-	cla & *clr
+	menu_off = 1
 	parentsexday = daystart
 	minut += 2
 	gs 'stat'
@@ -137,7 +129,7 @@ if $ARGS[0] = 'peek':
 	act 'Leave': gt 'korrPar'
 
 	act 'Keep peeking':
-		cla & *clr
+		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad2.jpg"></center>'
 		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she''s mostly naked, he pushes her down on the bed so she''s sitting on it in front of him, her head about crotch height to him. Knowing what he wants, she opens the fly on his pants and pulls out his cock, stroking it a few times in her hand until he gets hard. She then takes his dick into her mouth and starts sucking it. He moans softly as she does. "Fuck, you''re the best cocksucker ever, Natasha."'
@@ -147,7 +139,7 @@ if $ARGS[0] = 'peek':
 		act 'Leave': gt 'korrPar'
 
 		act 'Keep peeking':
-			cla & *clr
+			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad3.jpg"></center>'
 			'After spending several minutes sucking Vlad''s cock, she helps him strip while continuing to suck his dick. Once he''s naked, he lies down on the bed and she straddles him and quickly starts riding his dick reverse cowgirl style.'
@@ -158,7 +150,7 @@ if $ARGS[0] = 'peek':
 			act 'Leave': gt 'korrPar'
 
 			act 'Keep peeking':
-				cla & *clr
+				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad4.jpg"></center>'
 				'Vlad suddenly grabs her and throws her on her side on the bed. He turns on his side, lifting up her leg with one hand while using the other to guide his cock. He feels around until he places the head of his dick against her anus, then pushes it in, using only her pussy juices for lubrication. It slides in surprisingly easy and you can only guess that this is far from the first time your mother has had a dick in her ass. They both moan in pleasure and she rubs her clit as Vlad fucks her ass.'
@@ -167,7 +159,7 @@ if $ARGS[0] = 'peek':
 				act 'Leave':gt 'korrPar'
 
 				act 'Keep peeking':
-					cla & *clr
+					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad5.jpg"></center>'
 					'They keep going for several more minutes until Vlad starts to pant and buries his dick balls deep in your mother''s ass and lets out a loud moan as he twitches. After a few seconds, he pulls out of her and rolls off the bed as she gets on her back and spreads her ass, giving both you and Vlad a good view of her asshole as his cum starts leaking out of it.'
@@ -182,5 +174,5 @@ if $ARGS[0] = 'peek':
 	end
 end
 
---- bedrPar2 ---------------------------------
 
+--- bedrPar2 ---------------------------------

+ 9 - 8
locations/begin.qsrc

@@ -1,4 +1,5 @@
 # begin
+!! SKIP_QSRC2TW
 !!2021/04/01
 if $ARGS[0] = 'start':
 	$loc_arg = 'start'
@@ -24,8 +25,8 @@ if $ARGS[0] = 'start':
 	*nl
 	'<center>There are three main start types:'
 	'Last year of school (before or after summer holidays);'
-	'In the city post graduation from school;'
-	'First year of university.'
+	'First year of university;'
+	'In the city post graduation from school.'
 	*nl
 	'For each start type there are 3 options:'
 	'Standard;'
@@ -44,18 +45,18 @@ if $ARGS[0] = 'start':
 	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'sg', 'magic')
 	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'sg', 'tg')
 
-	$start_text += '<TR><TD><p align="center">City</p></TD>'
-
-	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'nomagic')
-	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'magic')
-	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'tg')
-
 	$start_text += '<TR><TD><p align="center">University</p></TD>'
 
 	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'uni', 'nomagic')
 	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'uni', 'magic')
 	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'uni', 'tg')
 
+	$start_text += '<TR><TD><p align="center">City</p></TD>'
+
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'nomagic')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'magic')
+	$start_text += $dyneval($checkimg, $start_type['loc'], $start_type['magic'], 'city', 'tg')
+
 	$start_text
 
 	'</table></center>'

+ 186 - 0
locations/beta_journal_quests.qsrc

@@ -0,0 +1,186 @@
+# beta_journal_quests
+!! 12/09/22 - Hooded Silence
+
+!! Game Character Quest section. This is the container file for all quest roles in game. Used to provide player feedback on how to proceed in quests.
+!! All quest information should be in a guidance or hint style fashion to encourage exploration.
+
+!! Beta 1 - New module design template for integration
+
+!! Section icons
+!! 🧭 Quest
+!! 💕 Relationship
+!! 📌 Location
+!! ✨ Magic
+!! Quest progress icons:
+!! <font color = "green">✓</font> - green tick
+!! <font color = "red">🗴</font> Red cross
+
+if $ARGS[0] = 'init':
+	*clr & cla
+	$loc_id = beta_journal_quests
+	act 'Put your journal down': gt $menu_loc, $menu_arg
+	act 'Return to top journal page': gt 'journal', 'records'
+	$jumploc = 'questtab'
+	!! gs 'journal', 'journalmenu'
+	'<center><h2>Quests and Relationships</h2></center>'
+	if $debug['journal'] ! '':
+		'<h2><font color = "red">Error with:</font> <<$debug[''journal'']>></h2>'
+		$debug['journal'] = ''
+	end
+	if journal['alert'] = 1:
+		'<div>'
+		'<center><h3><font color = "orange">⚠ Todays Quests and Tasks</font></h3></center>'
+		'<ul style="margin:0; padding:0;">🧭 You have to attend starlets</ul>'
+		'<ul style="margin:0; padding:0;">💕 You have a date with {npc} today at {time}, {location}</ul>'
+		'</div>'
+	else
+		!! Pull randomly from a journal[''gametips''] array
+		'<div>'
+		'<center><h3>Todays Random Tips</h3></center>'
+
+		'<ul style="margin:0; padding:0;">🧭 Visit the school sports field to meet your brother, and maybe other jocks.</ul>'
+		'</div>'
+	end
+end
+
+if $ARGS[0] = 'rel_pavlovsk':
+end
+if $ARGS[0] = 'rel_city':
+end
+if $ARGS[0] = 'rel_gad':
+end
+if $ARGS[0] = 'rel_pushkin':
+	!! Ballet Maya
+end
+
+if $ARGS[0] = 'geo_pavlovsk':
+end
+if $ARGS[0] = 'geo_city':
+end
+if $ARGS[0] = 'geo_pushkin':
+	!! Ballet school content
+	!! Ballet Secrets content
+end
+if $ARGS[0] = 'geo_gad':
+end
+if $ARGS[0] = 'geo_village':
+end
+if $ARGS[0] = 'vcard':
+	*clr & cla
+	!! Section used to generate the user quests and other pertinent information
+	if $firstname['A<<ARGS[1]>>'] = '':
+		gs $loc_id, 'failure',  'id'
+	end
+	!! Initiate NPC data.
+	gs 'quest_data_a<<ARGS[1]>>', 'init'
+	$display_dob = func('shortgs', 'convert_dob', ARGS[1])
+
+	!! Start vcard construction
+	$vard = ''
+	$vcard += '<center><h3>Ballet Quests - Characters</h3></center>'
+	$vcard += '<br>'
+	$vcard += '<div width="80%">'
+	$vcard += '<div style="width: 120px; padding: 0; float:left"><img style="height:100px;"  src="<<$npc_img_path[''A<<ARGS[1]>>'']>>/<<ARGS[1]>>_profile.jpg"></div>'
+	$vcard += '<div style="padding: 0;">'
+	$vcard += '<p><ul style="margin:0; padding:0;">Name: <<$npc_firstname[''A<<ARGS[1]>>'']>> "<<$npc_nickname[''A<<ARGS[1]>>'']>>" <<$npc_lastname[''A<<ARGS[1]>>'']>></ul>'
+	$vcard += '<ul style="margin:0; padding:0;">Date of Birth: <<$display_dob>> </ul>'
+	$vcard += '<ul style="margin:0; padding:0;">Home: <<$npc_home[''A<<ARGS[1]>>'']>></ul>'
+	$vcard += '<ul style="margin:0; padding:0;">Location: Unknown</ul>'
+
+	!! if debug is enabled show pop up msg:
+	if debug['code']  = 1:
+		gs 'quest_data_a<<ARGS[1]>>', 'debug'
+		$vcard += '<ul style="margin:0; padding:0;">Debug Vars:<a href="exec:msg <<$npc_quest[''debug_data'']>>">Quest Vars (pop up)</a></ul>'
+	end
+	$vcard += '</p></div>'
+	$vcard += '</div>'
+	$vcard += '<br>'
+
+	!! Output
+	$vcard
+
+	!! Ensure quest data fields are populated
+	if $npc_quest['q_body'] ='':
+		gs $loc_id, 'Failure', 'quest_body'
+	end
+	if $npc_quest['q_next'] = '':
+		gs $loc_id, 'Failure', 'nav_forward'
+	end
+	if $npc_quest['q_back'] = '':
+		gs $loc_id, 'Failure', 'nav_back'
+	end
+
+	!! Start quest body construction
+	$qsteps +=	'<div width = "80%">'
+	$qsteps +=	'<div style="padding: 10px;">'
+	$qsteps +=	'<h4>💕 Relationship Quest hints:</h4>'
+	$qsteps +=	$npc_quest['q_body']
+	$qsteps +=	'<br>'
+	$qsteps +=	'<h4>Quest requisites:</h4>'
+	$qsteps +=	'<p><<$npc_[''quest_body'']>></p>'
+	$qsteps +=	'<br>'
+	$qsteps +=	'</div>'
+	$qsteps +=	'<div style="padding:5px; align: center;">'
+	$qsteps += 	'<center><h5>Quest History</h5></center>'
+
+	if $npc_quest['q_next'] ! 'null':
+		$next_nav = 'Current Stage'
+	else
+		$next_nav = '<a href="gs ''quest_data_a<<ARGS[1]>>'', ''<<$npc_quest[''q_next'']>>''" >Next Stage</a> '
+	end
+	if $npc_quest['q_back'] ! 'null':
+		$back_nav = 'Quest Start'
+	else
+		$back_nav = '<a href="gs ''quest_data_a<<ARGS[1]>>'', ''<<$npc_quest[''q_next'']>>''" >Previous Stage</a> '
+	end
+	$qsteps +=	'<center><b>←</b> <<$back_nav>> |  <<$next_nav>> <b>→</b></center>'
+	$qsteps +=	'</div>'
+	$qsteps +=	'</div>'
+	$qsteps +=	'<br>'
+	$qsteps +=	'<br>'
+
+	!! Output
+	$qsteps
+
+	!! Clean up
+	killvar '$vcard'
+	killvar '$qsteps'
+	killvar 'birthday'
+	killvar '$birthday'
+	killvar 'birthmonth'
+	killvar '$birthmonth'
+	killvar 'birthyear'
+	killvar '$evt_suffix'
+end
+
+if $ARGS[0] = 'failure':
+	!! Debug sections
+	if $ARGS[1] = 'id':
+		$debug['journal'] = 'NPC ID not set, vcard not generated.'
+		gt $loc_id, 'start'
+	elseif $ARGS[1] = 'quest_body':
+		$debug['journal'] = 'Quest body not set, quests details was not display.'
+	elseif $ARGS[1] = 'nav_forward':
+		$debug['journal'] = 'No forward navigation set - please ensure you have set the var in quest_data'
+	elseif $ARGS[1] = 'nav_back':
+		$debug['journal'] = 'No back navigation set - please ensure you have set the var in quest_data'
+	end
+end
+
+if $ARGS[0] = 'gametips':
+
+	if ARGS[1] = 1:
+		'If you have 50 skill in modern dance and Albina likes you might get a chance to join Starlets.'
+	elseif ARGS[1] = 2:
+		'Mon Cheri is the most prestigious clothing store in St. Petersburg, with a price tag to match.'
+	elseif ARGS[1] = 3:
+		'There is some parts of the game restricted to over-18s such as doing driving lessons, gambling at the casino and other areas. There is rumours that there is studios who are less fussy about sticking to the law.'
+	elseif ARGS[1] = 4:
+	elseif ARGS[1] = 5:
+	elseif ARGS[1] = 6:
+	elseif ARGS[1] = 7:
+	elseif ARGS[1] = 8:
+	elseif ARGS[1] = 9:
+	end
+end
+--- beta_journal_quests ---------------------------------

+ 16 - 22
locations/body.qsrc

@@ -21,12 +21,8 @@
 !!bodyVars['weight_warning'] = used to flag if to display the gaining/losing weight message when bathing
 !!bodyresetflag = used to prevent a code chunk from firing on a soft or hard reset
 !!Image set variables
-!!	bodset = body image and descriptor control variable, used to indicate which image and descriptor set is in use
-!!	$bodimgsets[x] = body shape descriptors, tens place is the set (using bodset), 0 - 7 the descriptors, 8 filler, 9 is the folder name
-!!	bdsetlock = flag to indicate set control override, 0 is use the formula to pick a set, 1 is use a fixed set
-!!	fixbodset = the identification number of the fixed image set
-!!	bodsetcnt = the number of sets present
-!!	imgset6ovr[x] and imgset7ovr[x] = a flag to indicate that an image set (x) has its own image 6 and/or 7
+!!	cheatVars['fix_bodyimg'] = flag to indicate set control override, 0 is use the formula to pick a set, 1 is use a fixed set
+!!	cheatVars['fix_bi_set'] = the identification number of the fixed image set
 !!	extended lash functionality; pcs_lashes = n are: {2, largest natural size}, {3, with temporary false lashes on or basic 2D lash extensions}, {4, with ornate false lashes on or lavish 4D extensions}, {5, with extremely ornate, 6D-style extensions} - xerya
 
 
@@ -62,11 +58,13 @@ if $ARGS[0] = 'UpdateBodyMeasurement':
 	pcs_hips  = (pcs_hgt   * bodyVars['hratio']) / 100 + bodyVars['vhips']
 	pcs_waist = (pcs_hips  * bodyVars['wratio']) / 100 + bodyVars['vofat']
 	pcs_band  = (pcs_waist * bodyVars['bratio']) / 100 + bodyVars['vofat']
-	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10)) + pcs_mass['preg'] / 5 + bodyVars['bust_lact']
-	pcs_butt  = min(pcs_mass['butt'], 50) + bodyVars['butt_bonus'] + bodyVars['butt_silicone'] + bodyVars['butt_cheat'] + pcs_butt_tr + max(-10, min(bodyVars['butt_other'], 10))
+	pcs_bust  = (pcs_waist * bodyVars['bratio']) / 100 + pcs_mass['bust']			+ bodyVars['bust_bonus'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10)) + bodyVars['bust_magic'] + pcs_mass['preg'] / 5 + bodyVars['bust_lact']
+	pcs_butt  = (pcs_hgt   * bodyVars['hratio']) / 100 + min(pcs_mass['butt'], 50)	+ bodyVars['butt_bonus'] + bodyVars['butt_silicone'] + max(-10, min(bodyVars['butt_other'], 10)) + pcs_butt_tr
 
-	!! pcs_cupsize = pcs_mass['bust'] + bodyVars['bust_magic'] + bodyVars['bust_silicone'] - bodyVars['vofat']
+	!! pcs_cupsize = pcs_mass['bust']			+ bodyVars['bust_bonus'] + bodyVars['bust_silicone'] + max(-10, min(bodyVars['bust_other'], 10)) + bodyVars['bust_magic'] + pcs_mass['preg'] / 5 + bodyVars['bust_lact'] - bodyVars['vofat']
 	pcs_cupsize = pcs_bust - pcs_band
+	!! pcs_buttsize = min(pcs_mass['butt'], 50) + bodyVars['butt_bonus'] + bodyVars['butt_silicone'] + max(-10, min(bodyVars['butt_other'], 10)) + pcs_butt_tr - bodyVars['vofat']
+	pcs_buttsize = pcs_butt - pcs_hips
 end
 
 if $ARGS[0] = 'CalcWeight':
@@ -152,15 +150,15 @@ if $ARGS[0] = 'DailyUpdate':
 
 
 	if pcs_skin <= 300:
-		pcs_skin += min(skinDailyGain * 2, 20) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain * 2, 20)	- skinDailyPenalty - 1
 	elseif pcs_skin <= 600:
-		pcs_skin += min(skinDailyGain, 10) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain, 10)		- skinDailyPenalty - 1
 	elseif pcs_skin <= 800:
-		pcs_skin += min(skinDailyGain / 2, 5) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain / 2, 5)	- skinDailyPenalty - 1
 	elseif pcs_skin <= 900:
-		pcs_skin += min(skinDailyGain / 3, 3) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain / 3, 3)	- skinDailyPenalty - 1
 	elseif pcs_skin <= 1000:
-		pcs_skin += min(skinDailyGain / 5, 2) - skinDailyPenalty - 1
+		pcs_skin += min(skinDailyGain / 5, 2)	- skinDailyPenalty - 1
 	end
 
 	gs 'body', 'Update_Teeth'
@@ -816,18 +814,14 @@ if $ARGS[0] = 'Update_vhips':
 	end
 	killvar 'vhtmp'
 
-	!! Varies between 0 and 25 to 30 ish range
-	!bodyVars['butt_bonus'] = max(0, pcs_mass['butt'] - max(0, bodyVars['vhips']))
-	bodyVars['butt_bonus'] = (pcs_mass['butt'] - 20) / 3
 
-	!! temp_vhips2 = vhips + (pcs_hgt * bodyVars['hratio'])/100 - (pcs_hgt * 72)/100
-	!! temp_vhips2 = pcs_hips - (pcs_hgt * 72) / 1000
-	temp_vhips2 = vhips - (pcs_hgt * (72 - bodyVars['hratio'])) / 100
+	!! temp_vhips2 = bodyVars['vhips'] + (pcs_hgt * bodyVars['hratio'])/100 - (pcs_hgt * 72)/100
+	!! temp_vhips2 = pcs_hips - (pcs_hgt * 72) / 100
+	temp_vhips2 = bodyVars['vhips'] - (pcs_hgt * (72 - bodyVars['hratio'])) / 100
 	bodyVars['vofat'] = max(0, temp_vhips2 / 2)
 	bodyVars['vhips'] -= 2 * bodyVars['vofat']
 
-	!! vhips = vhips - max(0, temp_vhips2)
-	!! vhips = vhips || vhips = (pcs_hgt * (72 - bodyVars['hratio'])) / 100
+	!! vhips = max(bodyVars['vhips'], (pcs_hgt * (72 - bodyVars['hratio'])) / 100)
 
 	killvar 'temp_vhips2'
 end

+ 476 - 169
locations/body_desc.qsrc

@@ -13,7 +13,11 @@ if $ARGS[0] = '':
 	gs 'body_desc', 'throat'
 	gs 'body_desc', 'pussy'
 	gs 'body_desc', 'anus'
-	if dounspell = 0: gs 'body_desc', 'butt' & gs 'body_desc', 'breasts' & gs 'body_desc', 'BMI'
+	if dounspell = 0:
+		gs 'body_desc', 'butt'
+		gs 'body_desc', 'breasts'
+		gs 'body_desc', 'BMI'
+	end
 	gs 'body_desc', 'lips'
 	gs 'body_desc', 'hair'
 	gs 'body_desc', 'tan'
@@ -41,85 +45,100 @@ end
 
 if $ARGS[0] = 'throat':
 	if pcs_throat = 0:
-		$pcs_throat = 'You have a chaste <a href="exec:view''images/pc/body/throat/th0.jpg''">mouth</a>.'
+		$pc_descFull['throat'] = 'You have a chaste <a href="exec:view''images/pc/body/throat/th0.jpg''">mouth</a>.'
 		$pc_desc['throat'] = 'virgin'
 		$pc_descWordy['throat'] = 'virginal, unused'
 		$throattipe = 'virgin'
 	elseif pcs_throat <= 5:
-		$pcs_throat = 'You have an extremely inexperienced <a href="exec:view''images/pc/body/throat/th1.jpg''">mouth</a>.'
+		$pc_descFull['throat'] = 'You have an extremely inexperienced <a href="exec:view''images/pc/body/throat/th1.jpg''">mouth</a>.'
 		$pc_desc['throat'] = 'narrow'
 		$pc_descWordy['throat'] = 'reluctant, gag-prone'
 		$throattipe = 'narrow'
 	elseif pcs_throat <= 10:
-		$pcs_throat = 'Your slightly-experienced mouth leads to a sensitive <a href="exec:view''images/pc/body/throat/th2.jpg''">throat</a> with an easily-triggered gag reflex.'
+		$pc_descFull['throat'] = 'Your slightly-experienced mouth leads to a sensitive <a href="exec:view''images/pc/body/throat/th2.jpg''">throat</a> with an easily-triggered gag reflex.'
 		$pc_desc['throat'] = 'delicate'
 		$pc_descWordy['throat'] = 'delicate, barely-experienced'
 		$throattipe = 'delicate'
 	elseif pcs_throat <= 15:
-		$pcs_throat = 'You have an experienced mouth and fairly practiced <a href="exec:view''images/pc/body/throat/th3.jpg''">throat</a>.'
+		$pc_descFull['throat'] = 'You have an experienced mouth and fairly practiced <a href="exec:view''images/pc/body/throat/th3.jpg''">throat</a>.'
 		$pc_desc['throat'] = 'fairly practiced'
 		$pc_descWordy['throat'] = 'fairly practiced'
 		$throattipe = 'fairly practiced'
 	elseif pcs_throat <= 25:
-		$pcs_throat = 'You have a willing mouth and trained <a href="exec:view''images/pc/body/throat/th4.jpg''">throat</a>.'
+		$pc_descFull['throat'] = 'You have a willing mouth and trained <a href="exec:view''images/pc/body/throat/th4.jpg''">throat</a>.'
 		$pc_desc['throat'] = 'well-trained'
 		$pc_descWordy['throat'] = 'experienced, well-trained and eager'
 		$throattipe = 'well-trained'
 	elseif pcs_throat <= 35:
-		$pcs_throat = 'Your deep tunnel of a <a href="exec:view''images/pc/body/throat/th5.jpg''">throat</a> may adopt any member.'
+		$pc_descFull['throat'] = 'Your deep tunnel of a <a href="exec:view''images/pc/body/throat/th5.jpg''">throat</a> may adopt any member.'
 		$pc_desc['throat'] = 'capacious'
 		$pc_descWordy['throat'] = 'seasoned, effortlessly-plumbed'
 		$throattipe = 'capacious'
 	else
-		$pcs_throat = 'Your gag reflex is completely absent and your <a href="exec:view''images/pc/body/throat/th6.jpg''">throat</a> has seen nearly as much cock as it has food.'
+		$pc_descFull['throat'] = 'Your gag reflex is completely absent and your <a href="exec:view''images/pc/body/throat/th6.jpg''">throat</a> has seen nearly as much cock as it has food.'
 		$pc_desc['throat'] = 'bottomless'
 		$pc_descWordy['throat'] = 'elastic, oft-fucked'
 		$throattipe = 'bottomless'
 	end
 
-	if pcs_breath = 1:$pcs_throat += ' Last you checked, your breath smelled fresh and minty.'
+	if pcs_breath = 1: $pc_descFull['throat'] += ' Last you checked, your breath smelled fresh and minty.'
 end
 
 if $ARGS[0] = 'pussy':
+	if pcs_piercings['pussy'] > 0 and pcs_tattoos['pussy'] > 0:
+		$pc_desc['pussy'] = 'pierced and tattooed '
+		$pc_descWordy['pussy'] = 'pierced and tattooed '
+	elseif pcs_piercings['pussy'] > 0:
+		$pc_desc['pussy'] = 'pierced '
+		$pc_descWordy['pussy'] = 'pierced '
+	elseif pcs_tattoos['pussy'] > 0:
+		$pc_desc['pussy'] = 'tattooed '
+		$pc_descWordy['pussy'] = 'tattooed '
+	else
+		$pc_desc['pussy'] = ''
+		$pc_descWordy['pussy'] = ''
+	end
+
+
 	if vgape >= 4:
+		$pcs_vag_image = 'images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg'
 		if rand(0,1) = 0:
-			$pcs_vag = 'Your regularly-fucked <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">playground</a> can take most things you force up there, ' + iif(stat['think_virgin'] = 0,'maybe you should skip the next gangbang?.','this can''t be right. What could be doing this to me?')
+			$pcs_vag = 'Your regularly-fucked <<$pc_desc[''pussy'']>><a href="exec: view ''<<$pcs_vag_image>>''">playground</a> can take most things you force up there, ' + iif(stat['think_virgin'] = 0,'maybe you should skip the next gangbang?.','this can''t be right. What could be doing this to me?')
 		else
-			$pcs_vag = 'Your poor little <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">pussy</a> is broken from too much stuffing, it''ll need time to recover, ' + iif(stat['think_virgin'] = 0,'maybe you should skip the next gangbang?.','this can''t be right. What could be doing this to me?')
+			$pcs_vag = 'Your poor little <a href="exec: view ''<<$pcs_vag_image>>''">pussy</a> is broken from too much stuffing, it''ll need time to recover, ' + iif(stat['think_virgin'] = 0,'maybe you should skip the next gangbang?.','this can''t be right. What could be doing this to me?')
 		end
-		$pcs_vag_image = 'images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg'
-		$pc_desc['pussy'] = func('body_desc', 'ChooseDescWord', 'ruined', 'broken', 'proplapsed', 'destroyed', 'annihilated', 'obliterated','decimated')
-		$pc_descWordy['pussy'] = 'prolapsed, ruined, chasm of a'
+		$pc_desc['pussy'] += func('body_desc', 'ChooseDescWord', 'ruined', 'broken', 'proplapsed', 'destroyed', 'annihilated', 'obliterated','decimated')
+		$pc_descWordy['pussy'] += 'prolapsed, ruined, chasm of a'
 		$vaginatipe = 'ruined'
 	elseif vgape = 3:
-		$pcs_vag = 'You have a gaping hole of a <a href="exec:view''images/pc/body/pussy/stage4/' + rand(1,5) + '.jpg''">vagina</a>, ' + iif(stat['think_virgin'] = 0,'it has seen a lot of action.','how though? Maybe something is wrong with you, virgins don''t look like this.')
 		$pcs_vag_image = 'images/pc/body/pussy/stage4/' + rand(1,5) + '.jpg'
-		$pc_desc['pussy'] = func('body_desc', 'ChooseDescWord', 'gaping', 'open', 'extended', 'wide')
-		$pc_descWordy['pussy'] = 'gaping and well used'
+		$pcs_vag = 'You have a <<$pc_desc[''pussy'']>>gaping hole of a <a href="exec: view ''<<$pcs_vag_image>>''">vagina</a>, ' + iif(stat['think_virgin'] = 0,'it has seen a lot of action.','how though? Maybe something is wrong with you, virgins don''t look like this.')
+		$pc_desc['pussy'] += func('body_desc', 'ChooseDescWord', 'gaping', 'open', 'extended', 'wide')
+		$pc_descWordy['pussy'] += 'gaping and well used'
 		$vaginatipe = 'gaping'
 	elseif vgape = 2:
-		$pcs_vag = 'Your <a href="exec:view''images/pc/body/pussy/stage3/' + rand(1,5) + '.jpg''">vagina</a> looks like it has seen some action, ' + iif(stat['think_virgin'] = 0,'which it totally has.','which doesn''t make sense. You''re still a virgin.')
 		$pcs_vag_image = 'images/pc/body/pussy/stage3/' + rand(1,5) + '.jpg'
-		$pc_desc['pussy'] = func('body_desc', 'ChooseDescWord', 'recovering', 'recently used', 'welcoming')
-		$pc_descWordy['pussy'] = 'experienced, welcoming'
+		$pcs_vag = 'Your <<$pc_desc[''pussy'']>><a href="exec: view ''<<$pcs_vag_image>>''">vagina</a> looks like it has seen some action, ' + iif(stat['think_virgin'] = 0,'which it totally has.','which doesn''t make sense. You''re still a virgin.')
+		$pc_desc['pussy'] += func('body_desc', 'ChooseDescWord', 'recovering', 'recently used', 'welcoming')
+		$pc_descWordy['pussy'] += 'experienced, welcoming'
 		$vaginatipe = 'welcoming'
 	elseif vgape = 1 or pcs_vag > 10:
-		$pcs_vag = 'Your <a href="exec:view''images/pc/body/pussy/stage2/' + rand(1,5) + '.jpg''">pussy</a> looks like it has been used recently or is just well worn in, ' + iif(stat['think_virgin'] = 0,'maybe you''ve been over doing it?','which seems unfair for a virgin like yourself.')
 		$pcs_vag_image = 'images/pc/body/pussy/stage2/' + rand(1,5) + '.jpg'
-		$pc_desc['pussy'] = func('body_desc', 'ChooseDescWord', 'pliable', 'used')
-		$pc_descWordy['pussy'] = 'worn in'
+		$pcs_vag = 'Your <<$pc_desc[''pussy'']>><a href="exec: view ''<<$pcs_vag_image>>''">pussy</a> looks like it has been used recently or is just well worn in, ' + iif(stat['think_virgin'] = 0,'maybe you''ve been over doing it?','which seems unfair for a virgin like yourself.')
+		$pc_desc['pussy'] += func('body_desc', 'ChooseDescWord', 'pliable', 'used')
+		$pc_descWordy['pussy'] += 'worn in'
 		$vaginatipe = 'used'
 	elseif pcs_vag > 0:
-		$pcs_vag = 'Your <a href="exec:view''images/pc/body/pussy/stage1/' + rand(1,5) + '.jpg''">pussy</a> looks perfectly normal, ' + iif(stat['think_virgin'] = 0,'for someone sexually active.','just not as virginal as you would expect.')
 		$pcs_vag_image = 'images/pc/body/pussy/stage1/' + rand(1,5) + '.jpg'
-		$pc_desc['pussy'] = func('body_desc', 'ChooseDescWord', 'snug', 'tight', 'cosy')
-		$pc_descWordy['pussy'] = 'tight and unused'
+		$pcs_vag = 'Your <<$pc_desc[''pussy'']>><a href="exec: view ''<<$pcs_vag_image>>''">pussy</a> looks perfectly normal, ' + iif(stat['think_virgin'] = 0,'for someone sexually active.','just not as virginal as you would expect.')
+		$pc_desc['pussy'] += func('body_desc', 'ChooseDescWord', 'snug', 'tight', 'cosy')
+		$pc_descWordy['pussy'] += 'tight and unused'
 		$vaginatipe = 'unused'
 	else
-		$pcs_vag = 'Your virgin <a href="exec:view''images/pc/body/pussy/stage0/' + rand(1,5) + '.jpg''">pussy</a> still has its hymen intact, ' + iif(stat['think_virgin'] = 0,'even though you are not a virgin.','which makes sense for a virgin.')
 		$pcs_vag_image = 'images/pc/body/pussy/stage0/' + rand(1,5) + '.jpg'
-		$pc_desc['pussy'] = 'virgin'
-		$pc_descWordy['pussy'] = 'virgin'
+		$pcs_vag = 'Your <<$pc_desc[''pussy'']>>virgin <a href="exec: view ''<<$pcs_vag_image>>''">pussy</a> still has its hymen intact, ' + iif(stat['think_virgin'] = 0,'even though you are not a virgin.','which makes sense for a virgin.')
+		$pc_desc['pussy'] += 'virgin'
+		$pc_descWordy['pussy'] += 'virgin'
 		$vaginatipe = 'virgin'
 	end
 end
@@ -176,7 +195,7 @@ if $ARGS[0] = 'anus':
 		if $pantyworntype ! 'none':
 			$pcs_ass = 'Your <a href="exec:view''images/pc/body/analplug.jpg''">anus</a> is currently filled with your butt plug.'
 		else
-			if pirsG > 0 and pirsG < 10000:
+			if pcs_piercings['pussy'] > 0:
 				$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/pirs' + rand(1,3) + '.jpg''">anus</a> is currently filled with your butt plug.'
 			else
 				$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/analplugnotanga.jpg''">anus</a> is currently filled with your butt plug.'
@@ -376,31 +395,41 @@ end
 
 if $ARGS[0] = 'butt':
 	!have butt implant
+	$temp_img = func('$body_image', 'butt')
 	if bodyVars['butt_silicone'] > 0:
-		$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec:view''images/pc/body/ass/9s.jpg''">butt</a>.'
+		$pc_desc['butt'] = 'jiggly bubble'
+		$pcs_butt = 'Through the use of implants, you have given yourself a jiggly bubble <a href="exec: view ''<<$temp_img>>''">butt</a>.'
 
 	!natural butt
+	elseif pcs_buttsize <= 7:
+		$pc_desc['butt'] = 'square and flat'
+		$pc_descFull['butt'] = 'Your <a href="exec: view ''<<$temp_img>>'' ">ass</a> is square and as flat as a plank.'
+	elseif pcs_buttsize <= 14:
+		$pc_desc['butt'] = 'square'
+		$pc_descFull['butt'] = 'Your <a href="exec: view ''<<$temp_img>>'' ">ass</a> is square but not completely flat.'
+	elseif pcs_buttsize <= 21:
+		$pc_desc['butt'] = 'average'
+		$pc_descFull['butt'] = 'You have an average, feminine looking <a href="exec: view ''<<$temp_img>>'' ">ass</a>.'
+	elseif pcs_buttsize <= 29:
+		$pc_desc['butt'] = 'above average'
+		$pc_descFull['butt'] = 'You have an above-average, feminine looking <a href="exec: view ''<<$temp_img>>'' ">ass</a>.'
+	elseif pcs_buttsize <= 36:
+		$pc_desc['butt'] = 'big'
+		$pc_descFull['butt'] = 'Your <a href="exec:view''<<$temp_img>>'' ">ass</a> is bigger, rounder and firmer than average.'
+	elseif pcs_buttsize <= 44:
+		$pc_desc['butt'] = 'ample'
+		$pc_descFull['butt'] = 'Your ample <a href="exec: view ''<<$temp_img>>'' ">ass</a> is bigger, rounder and firmer than most.'
+	elseif pcs_buttsize <= 51:
+		$pc_desc['butt'] = 'heart-shaped'
+		$pc_descFull['butt'] = 'You have a heart-shaped <a href="exec: view ''<<$temp_img>>'' ">butt</a> that jiggles as you walk.'
+	elseif pcs_buttsize <= 59:
+		$pc_desc['butt'] = 'large heart-shaped'
+		$pc_descFull['butt'] = 'You have a large heart-shaped <a href="exec: view ''<<$temp_img>>'' ">butt</a> that jiggles and sways as you walk.'
 	else
-		if pcs_butt <= 7:
-			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/1.jpg''">ass</a> is square and as flat as a plank.'
-		elseif pcs_butt <= 14:
-			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/2.jpg''">ass</a> is square but not completely flat.'
-		elseif pcs_butt <= 21:
-			$pcs_butt = 'You have an average, feminine looking <a href="exec:view''images/pc/body/ass/3.jpg''">ass</a>.'
-		elseif pcs_butt <= 29:
-			$pcs_butt = 'You have an above-average, feminine looking <a href="exec:view''images/pc/body/ass/4.jpg''">ass</a>.'
-		elseif pcs_butt <= 36:
-			$pcs_butt = 'Your <a href="exec:view''images/pc/body/ass/5.jpg''">ass</a> is bigger, rounder and firmer than average.'
-		elseif pcs_butt <= 44:
-			$pcs_butt = 'Your ample <a href="exec:view''images/pc/body/ass/6.jpg''">ass</a> is bigger, rounder and firmer than most.'
-		elseif pcs_butt <= 51:
-			$pcs_butt = 'You have a heart-shaped <a href="exec:view''images/pc/body/ass/7.jpg''">butt</a> that jiggles as you walk.'
-		elseif pcs_butt <= 59:
-			$pcs_butt = 'You have a large heart-shaped <a href="exec:view''images/pc/body/ass/8.jpg''">butt</a> that jiggles and sways as you walk.'
-		else
-			$pcs_butt = 'You have a large bubble <a href="exec:view''images/pc/body/ass/9.jpg''">butt</a> that jiggles and sways as you walk.'
-		end
+		$pc_desc['butt'] = 'large bubble'
+		$pc_descFull['butt'] = 'You have a large bubble <a href="exec: view ''<<$temp_img>>'' ">butt</a> that jiggles and sways as you walk.'
 	end
+	killvar '$temp_img'
 end
 
 if $ARGS[0] = 'lips':
@@ -457,7 +486,7 @@ if $ARGS[0] = 'lips':
 		$pc_desc['lip glossed'] = 'softened'
 	end
 
-	$lip = 'You have <<$pcs_lipSize>>, <<$pc_desc[''lip gloss'']>> ' + iif(pcs_lip = 4, 'suggestively full ', '') +  'lips. <<$pirsB>> <<$pirsA>>'
+	$pc_descFull['lip'] = 'You have <<$pcs_lipSize>>, <<$pc_desc[''lip gloss'']>> ' + iif(pcs_lip = 4, 'suggestively full ', '') +  'lips. <<$pcs_piercings[''lip_desc'']>> <<$pcs_piercings[''tongue_desc'']>>'
 
 	!! A pair of ready-made lip strings for writers to use if they are unsure how to construct them themselves. Again, these are not great and should preferably not be relied on, but they are here.
 	$pc_desc['lips'] = '<<$pc_desc[''lip size'']>> <<$pc_desc[''lip gloss'']>>'
@@ -498,23 +527,23 @@ if $ARGS[0] = 'skin':
 	if pcs_skin < 200:
 		$pc_desc['skin'] = func('body_desc', 'ChooseDescWord', 'terrible', 'awful', 'greasy', 'pimple-strewn')
 		$pc_descWordy['skin'] = 'awful, greasy and pimply'
-		$skin = 'Your <<$pcs_tan>> skin is rough and covered with pimples and moles. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
+		$pc_descFull['skin'] = 'Your <<$pcs_tan>> skin is rough and covered with pimples and moles. <<$pcs_piercings[''ears_desc'']>> <<$pcs_piercings[''nose_desc'']>> <<$pcs_piercings[''brow_desc'']>> <<$pcs_piercings[''navel_desc'']>>'
 	elseif pcs_skin < 400:
 		$pc_desc['skin'] = func('body_desc', 'ChooseDescWord', 'bad', 'greasy', 'rough', 'unappealing')
 		$pc_descWordy['skin'] = 'poorly-kept, unappealing'
-		$skin = 'Your <<$pcs_tan>> skin is rough and has a few pimples. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
+		$pc_descFull['skin'] = 'Your <<$pcs_tan>> skin is rough and has a few pimples. <<$pcs_piercings[''ears_desc'']>> <<$pcs_piercings[''nose_desc'']>> <<$pcs_piercings[''brow_desc'']>> <<$pcs_piercings[''navel_desc'']>>'
 	elseif pcs_skin < 600:
 		$pc_desc['skin'] = func('body_desc', 'ChooseDescWord', 'average', 'normal', 'clear')
 		$pc_descWordy['skin'] = 'normal, slightly rough'
-		$skin = 'Your <<$pcs_tan>> skin is clear of acne but still slightly rough. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
+		$pc_descFull['skin'] = 'Your <<$pcs_tan>> skin is clear of acne but still slightly rough. <<$pcs_piercings[''ears_desc'']>> <<$pcs_piercings[''nose_desc'']>> <<$pcs_piercings[''brow_desc'']>> <<$pcs_piercings[''navel_desc'']>>'
 	elseif pcs_skin < 800:
 		$pc_desc['skin'] = func('body_desc', 'ChooseDescWord', 'good', 'nice', 'smooth', 'great', 'well-kept')
 		$pc_descWordy['skin'] = 'smooth, well-kept'
-		$skin = 'You have <<$pcs_tan>>, smooth and well-groomed skin. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
+		$pc_descFull['skin'] = 'You have <<$pcs_tan>>, smooth and well-groomed skin. <<$pcs_piercings[''ears_desc'']>> <<$pcs_piercings[''nose_desc'']>> <<$pcs_piercings[''brow_desc'']>> <<$pcs_piercings[''navel_desc'']>>'
 	else
 		$pc_desc['skin'] = func('body_desc', 'ChooseDescWord', 'excellent', 'silken', 'soft', 'silky', 'immaculate')
 		$pc_descWordy['skin'] = 'immaculate, silky-soft'
-		$skin = 'You have <<$pcs_tan>> and very smooth skin which almost feels like silk to the touch. <<$pirsC>> <<$pirsD>> <<$pirsE>> <<$pirsN>>'
+		$pc_descFull['skin'] = 'You have <<$pcs_tan>> and very smooth skin which almost feels like silk to the touch. <<$pcs_piercings[''ears_desc'']>> <<$pcs_piercings[''nose_desc'']>> <<$pcs_piercings[''brow_desc'']>> <<$pcs_piercings[''navel_desc'']>>'
 	end
 end
 
@@ -617,169 +646,447 @@ if $ARGS[0] = 'eye_size':
 	if pcs_eyesize = 0:
 		$pc_desc['eye size'] = ''
 		$pc_descWordy['eye size'] = 'little'
-		$glaza = 'You have little <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
+		$pc_descFull['eyes'] = 'You have little <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	elseif pcs_eyesize = 1:
 		$pc_desc['eye size'] = ''
 		$pc_descWordy['eye size'] = 'medium-sized'
-		$glaza = 'You have medium-sized <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
+		$pc_descFull['eyes'] = 'You have medium-sized <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	elseif pcs_eyesize = 2:
 		$pc_desc['eye size'] = 'large'
 		$pc_descWordy['eye size'] = 'large, expressive'
-		$glaza = 'You have large <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
+		$pc_descFull['eyes'] = 'You have large <<$pcs_eyecol>> eyes <<$pcs_lashes>>.<<$glass>>'
 	else
 		pcs_eyesize = 3
 		$pc_desc['eye size'] = 'huge'
 		$pc_descWordy['eye size'] = 'huge'
-		$glaza = 'You have huge <<$pcs_eyecol>> eyes that almost look like they''re out of an anime, <<$pcs_lashes>>.<<$glass>>'
+		$pc_descFull['eyes'] = 'You have huge <<$pcs_eyecol>> eyes that almost look like they''re out of an anime, <<$pcs_lashes>>.<<$glass>>'
 	end
 end
 
-if $ARGS[0] = 'pierrcing':
-	!! If, like me, you are confused by the logic of what initially appear to be arbitrary numbers, it turns out the piercing location value is set to a number to indicate which photo it uses, which is tied to what jewelry you have for the piercing. 10000 means pierced, but no jewelry.
-	if pirsA > 0 and pirsA < 10000:
-		$pirsA = 'When you talk to people, they can sometimes get a glimpse of your tongue piercing.'
-		rand_tongue = rand(0,1)
-		if rand_tongue = 0:
-			$pcdesc_tonguerandom = 'pierced tongue'
-		elseif rand_tongue = 1:
-			$pcdesc_tonguerandom = 'pierced licker'
+if $ARGS[0] = 'piercing':
+	!! If, like me, you are confused by the logic of what initially appear to be arbitrary numbers, it turns out the piercing location value is set to a number to indicate which photo it uses, which is tied to what jewelry you have for the piercing. Netative means pierced, but no jewelry.
+	if pcs_piercings['ears'] > 0:
+		$pcs_piercings['ears_desc'] = 'You are wearing earrings.'
+		if 1:
+			$pc_descRandom['ears'] = 'pierced'
 		end
-		$pcdesc_tonguewordy = 'barbell-pierced tongue'
-		$pcdesc_tongue = 'pierced tongue'
+		$pc_descWordy['ears'] = 'pierced'
+		$pc_desc['ears'] = 'pierced'
 	else
-		$pirsA = ''
-		rand_tongue = rand(0,1)
-		if rand_tongue = 0:
-			$pcdesc_tonguerandom = 'tongue'
-		elseif rand_tongue = 1:
-			$pcdesc_tonguerandom = 'licker'
+		$pcs_piercings['ears_desc'] = ''
+		if 1:
+			$pc_descRandom['ears'] = ''
 		end
-		$pcdesc_tonguewordy = 'tongue'
-		$pcdesc_tongue = 'tongue'
+		$pc_descWordy['ears'] = ''
+		$pc_desc['ears'] = ''
 	end
 
-	if pirsB > 0 and pirsB < 10000:
-		$pirsB = 'Your lip is pierced.'
-		$pcdesc_lowerliprandom = 'pierced lower lip'
-		$pcdesc_lowerlipwordy = 'jewelry-studded lower lip'
-		$pcdesc_lowerlip = 'pierced lower lip'
+	!! Unfortunately there is no real way to tell if it is a pierced septum or a pierced nostril without overhauling the jewelry and other piercing references for now.
+	if pcs_piercings['nose'] > 0:
+		$pcs_piercings['nose_desc'] = 'You have a piercing inserted in your nose.'
+		$pc_descRandom['nose'] = 'pierced'
+		$pc_descWordy['nose'] = 'jewelry-studded'
+		$pc_desc['nose'] = 'pierced'
 	else
-		$pirsB = ''
-		$pcdesc_lowerliprandom = 'lower lip'
-		$pcdesc_lowerlipwordy = 'lower lip'
-		$pcdesc_lowerlip = 'lower lip'
+		$pcs_piercings['nose_desc'] = ''
+		$pc_descRandom['nose'] = ''
+		$pc_descWordy['nose'] = ''
+		$pc_desc['nose'] = ''
 	end
 
-	if pirsC > 0 and pirsC < 10000:
-		$pirsC = 'You are wearing earrings.'
-		$pcdesc_earsrandom = 'pierced ears' & $pcdesc_earrandom = 'pierced ear'
-		$pcdesc_earswordy = 'pierced ears'
-		$pcdesc_ears = 'pierced ears'
-		$pcdesc_earwordy = 'pierced ear'
-		$pcdesc_ear = 'pierced ear'
+	if pcs_piercings['brow'] > 0:
+		$pcs_piercings['brow_desc'] = 'Your eyebrow is pierced.'
+		$pc_descRandom['brow'] = 'pierced'
+		$pc_descWordy['brow'] = 'pierced'
+		$pc_desc['brow'] = 'pierced'
 	else
-		$pirsC = ''
-		$pcdesc_earsrandom = 'ears' & $pcdesc_earrandom = 'ear'
-		$pcdesc_earswordy = 'ears'
-		$pcdesc_ears = 'ears'
-		$pcdesc_earwordy = 'ear'
-		$pcdesc_ear = 'ear'
+		$pcs_piercings['brow_desc'] = ''
+		$pc_descRandom['brow'] = ''
+		$pc_descWordy['brow'] = ''
+		$pc_desc['brow'] = ''
 	end
 
-	!! Unfortunately there is no real way to tell if it is a pierced septum or a pierced nostril without overhauling the jewelry and other piercing references for now.
-	if pirsD > 0 and pirsD < 10000:
-		$pirsD = 'You have a piercing inserted in your nose.'
-		$pcdesc_noserandom = 'pierced nose'
-		$pcdesc_nosewordy = 'jewelry-studded nose'
-		$pcdesc_nose = 'pierced nose'
+	if pcs_piercings['lip'] > 0:
+		$pcs_piercings['lip_desc'] = 'Your lip is pierced.'
+		$pc_descRandom['lower_lip'] = 'pierced'
+		$pc_descWordy['lower_lip'] = 'jewelry-studded'
+		$pc_desc['lower_lip'] = 'pierced'
 	else
-		$pirsD = ''
-		$pcdesc_noserandom = 'nose'
-		$pcdesc_nosewordy = 'nose'
-		$pcdesc_nose = 'nose'
+		$pcs_piercings['lip_desc'] = ''
+		$pc_descRandom['lower_lip'] = ''
+		$pc_descWordy['lower_lip'] = ''
+		$pc_desc['lower_lip'] = ''
 	end
 
-	if pirsE > 0 and pirsE < 10000:
-		$pirsE = 'Your eyebrow is pierced.'
-		$pcdesc_eyebrowrandom = 'pierced eyebrow'
-		$pcdesc_eyebrowwordy = 'pierced eyebrow'
-		$pcdesc_eyebrow = 'pierced eyebrow'
+	if pcs_piercings['tongue'] > 0:
+		$pcs_piercings['tongue_desc'] = 'When you talk to people, they can sometimes get a glimpse of your tongue piercing.'
+		$pc_descRandom['tongue'] = 'pierced'
+		$pc_descWordy['tongue'] = 'barbell-pierced'
+		$pc_desc['tongue'] = 'pierced'
 	else
-		$pirsE = ''
-		$pcdesc_eyebrowrandom = 'eyebrow'
-		$pcdesc_eyebrowwordy = 'eyebrow'
-		$pcdesc_eyebrow = 'eyebrow'
+		$pcs_piercings['tongue_desc'] = ''
+		$pc_descRandom['tongue'] = ''
+		$pc_descWordy['tongue'] = ''
+		$pc_desc['tongue'] = ''
 	end
 
-	if pirsN > 0 and pirsN < 10000:
-		$pirsN = 'You are wearing a navel piercing.'
-		$pcdesc_navelrandom = 'pierced navel'
-		$pcdesc_navelwordy = 'pierced navel'
-		$pcdesc_navel = 'pierced navel'
+	if pcs_piercings['navel'] > 0:
+		$pcs_piercings['navel_desc'] = 'You are wearing a navel piercing.'
+		$pc_descRandom['navel'] = 'pierced'
+		$pc_descWordy['navel'] = 'pierced'
+		$pc_desc['navel'] = 'pierced'
 	else
-		$pirsN = ''
-		$pcdesc_navelrandom = 'navel'
-		$pcdesc_navelwordy = 'navel'
-		$pcdesc_navel = 'navel'
+		$pcs_piercings['navel_desc'] = ''
+		$pc_descRandom['navel'] = ''
+		$pc_descWordy['navel'] = ''
+		$pc_desc['navel'] = ''
 	end
 
 	!! Some of these are labial rings, some of them are hood piercings. No good way to tell without an overhaul.
-	if pirsG  > 0 and pirsG < 10000:
-		$pirspiz = 'You are wearing a pubic piercing.'
-		$pcdesc_genitalsrandom = 'pierced pussy'
-		$pcdesc_genitalswordy = 'jewelry-adorned pussy'
-		$pcdesc_genitals = 'pierced pussy'
+	!{
+	if pcs_piercings['pussy'] > 0:
+		$pcs_piercings['pussy_desc'] = 'You are wearing a pubic piercing.'
+		$pc_descRandom['pussy'] = 'pierced'
+		$pc_descWordy['pussy'] = 'jewelry-adorned'
+		$pc_desc['pussy'] = 'pierced'
 	else
-		$pirspiz = ''
-		$pcdesc_genitalsrandom = 'pussy'
-		$pcdesc_genitalswordy = 'pussy'
-		$pcdesc_genitals = 'pussy'
+		$pcs_piercings['pussy_desc'] = ''
+		$pc_descRandom['pussy'] = ''
+		$pc_descWordy['pussy'] = ''
+		$pc_desc['pussy'] = ''
 	end
+	}
 end
 
+if $ARGS[0] = 'tattoo':
+	!! If, like me, you are confused by the logic of what initially appear to be arbitrary numbers, it turns out the tattoo location value is set to a number to indicate which photo it uses, which is tied to what tattoo you have. Netative means that the tatto is removed.
+	if pcs_tattoos['ankle'] > 0:
+		$pcs_tattoos['aankle_desc'] = ''
+		if 1:
+			$pc_descRandom['ankle'] = 'tattooed'
+		end
+		$pc_descWordy['ankle'] = 'tattooed'
+		$pc_desc['ankle'] = 'tattooed'
+	else
+		$pcs_tattoos['ankle_desc'] = ''
+		if 1:
+			$pc_descRandom['ankle'] = ''
+		end
+		$pc_descWordy['ankle'] = ''
+		$pc_desc['ankle'] = ''
+	end
+
+	if pcs_tattoos['arm'] > 0:
+		$pcs_tattoos['arm_desc'] = ''
+		if 1:
+			$pc_descRandom['arm'] = 'tattooed'
+		end
+		$pc_descWordy['arm'] = 'tattooed'
+		$pc_desc['arm'] = 'tattooed'
+	else
+		$pcs_tattoos['arm_desc'] = ''
+		if 1:
+			$pc_descRandom['arm'] = ''
+		end
+		$pc_descWordy['arm'] = ''
+		$pc_desc['arm'] = ''
+	end
+
+	if pcs_tattoos['ass'] > 0:
+		$pcs_tattoos['ass_desc'] = ''
+		if 1:
+			$pc_descRandom['ass'] = 'tattooed'
+		end
+		$pc_descWordy['ass'] = 'tattooed'
+		$pc_desc['ass'] = 'tattooed'
+	else
+		$pcs_tattoos['ass_desc'] = ''
+		if 1:
+			$pc_descRandom['ass'] = ''
+		end
+		$pc_descWordy['ass'] = ''
+		$pc_desc['ass'] = ''
+	end
+
+	if pcs_tattoos['back'] > 0:
+		$pcs_tattoos['back_desc'] = ''
+		if 1:
+			$pc_descRandom['back'] = 'tattooed'
+		end
+		$pc_descWordy['back'] = 'tattooed'
+		$pc_desc['back'] = 'tattooed'
+	else
+		$pcs_tattoos['back_desc'] = ''
+		if 1:
+			$pc_descRandom['back'] = ''
+		end
+		$pc_descWordy['back'] = ''
+		$pc_desc['back'] = ''
+	end
+
+	if pcs_tattoos['belly'] > 0:
+		$pcs_tattoos['belly_desc'] = ''
+		if 1:
+			$pc_descRandom['belly'] = 'tattooed'
+		end
+		$pc_descWordy['belly'] = 'tattooed'
+		$pc_desc['belly'] = 'tattooed'
+	else
+		$pcs_tattoos['belly_desc'] = ''
+		if 1:
+			$pc_descRandom['belly'] = ''
+		end
+		$pc_descWordy['belly'] = ''
+		$pc_desc['belly'] = ''
+	end
+
+	!{
+	if pcs_tattoos['breast'] > 0:
+		$pcs_tattoos['breast_desc'] = ''
+		if 1:
+			$pc_descRandom['breast'] = 'tattooed'
+		end
+		$pc_descWordy['breast'] = 'tattooed'
+		$pc_desc['breast'] = 'tattooed'
+	else
+		$pcs_tattoos['breast_desc'] = ''
+		if 1:
+			$pc_descRandom['breast'] = ''
+		end
+		$pc_descWordy['breast'] = ''
+		$pc_desc['breast'] = ''
+	end
+	}
+	if pcs_tattoos['chest'] > 0:
+		$pcs_tattoos['chest_desc'] = ''
+		if 1:
+			$pc_descRandom['chest'] = 'tattooed'
+		end
+		$pc_descWordy['chest'] = 'tattooed'
+		$pc_desc['chest'] = 'tattooed'
+	else
+		$pcs_tattoos['chest_desc'] = ''
+		if 1:
+			$pc_descRandom['chest'] = ''
+		end
+		$pc_descWordy['chest'] = ''
+		$pc_desc['chest'] = ''
+	end
+
+	if pcs_tattoos['face'] > 0:
+		$pcs_tattoos['face_desc'] = ''
+		if 1:
+			$pc_descRandom['face'] = 'tattooed'
+		end
+		$pc_descWordy['face'] = 'tattooed'
+		$pc_desc['face'] = 'tattooed'
+	else
+		$pcs_tattoos['face_desc'] = ''
+		if 1:
+			$pc_descRandom['face'] = ''
+		end
+		$pc_descWordy['face'] = ''
+		$pc_desc['face'] = ''
+	end
+
+	if pcs_tattoos['hand'] > 0:
+		$pcs_tattoos['hand_desc'] = ''
+		if 1:
+			$pc_descRandom['hand'] = 'tattooed'
+		end
+		$pc_descWordy['hand'] = 'tattooed'
+		$pc_desc['hand'] = 'tattooed'
+	else
+		$pcs_tattoos['hand_desc'] = ''
+		if 1:
+			$pc_descRandom['hand'] = ''
+		end
+		$pc_descWordy['hand'] = ''
+		$pc_desc['hand'] = ''
+	end
+
+	if pcs_tattoos['leg'] > 0:
+		$pcs_tattoos['leg_desc'] = ''
+		if 1:
+			$pc_descRandom['leg'] = 'tattooed'
+		end
+		$pc_descWordy['leg'] = 'tattooed'
+		$pc_desc['leg'] = 'tattooed'
+	else
+		$pcs_tattoos['leg_desc'] = ''
+		if 1:
+			$pc_descRandom['leg'] = ''
+		end
+		$pc_descWordy['leg'] = ''
+		$pc_desc['leg'] = ''
+	end
+
+	!{
+	if pcs_tattoos['lip'] > 0:
+		$pcs_tattoos['lip_desc'] = ''
+		if 1:
+			$pc_descRandom['lip'] = 'tattooed'
+		end
+		$pc_descWordy['lip'] = 'tattooed'
+		$pc_desc['lip'] = 'tattooed'
+	else
+		$pcs_tattoos['lip_desc'] = ''
+		if 1:
+			$pc_descRandom['lip'] = ''
+		end
+		$pc_descWordy['lip'] = ''
+		$pc_desc['lip'] = ''
+	end
+	}
+
+	if pcs_tattoos['neck'] > 0:
+		$pcs_tattoos['neck_desc'] = ''
+		if 1:
+			$pc_descRandom['neck'] = 'tattooed'
+		end
+		$pc_descWordy['neck'] = 'tattooed'
+		$pc_desc['neck'] = 'tattooed'
+	else
+		$pcs_tattoos['neck_desc'] = ''
+		if 1:
+			$pc_descRandom['neck'] = ''
+		end
+		$pc_descWordy['neck'] = ''
+		$pc_desc['neck'] = ''
+	end
+
+	if pcs_tattoos['shoulder'] > 0:
+		$pcs_tattoos['shoulder_desc'] = ''
+		if 1:
+			$pc_descRandom['shoulder'] = 'tattooed'
+		end
+		$pc_descWordy['shoulder'] = 'tattooed'
+		$pc_desc['shoulder'] = 'tattooed'
+	else
+		$pcs_tattoos['shoulder_desc'] = ''
+		if 1:
+			$pc_descRandom['shoulder'] = ''
+		end
+		$pc_descWordy['shoulder'] = ''
+		$pc_desc['shoulder'] = ''
+	end
+
+	if pcs_tattoos['side'] > 0:
+		$pcs_tattoos['side_desc'] = ''
+		if 1:
+			$pc_descRandom['side'] = 'tattooed'
+		end
+		$pc_descWordy['side'] = 'tattooed'
+		$pc_desc['side'] = 'tattooed'
+	else
+		$pcs_tattoos['side_desc'] = ''
+		if 1:
+			$pc_descRandom['side'] = ''
+		end
+		$pc_descWordy['side'] = ''
+		$pc_desc['side'] = ''
+	end
+
+	if pcs_tattoos['tramp'] > 0:
+		$pcs_tattoos['tramp_desc'] = ''
+		if 1:
+			$pc_descRandom['tramp'] = 'tattooed'
+		end
+		$pc_descWordy['tramp'] = 'tattooed'
+		$pc_desc['tramp'] = 'tattooed'
+	else
+		$pcs_tattoos['tramp_desc'] = ''
+		if 1:
+			$pc_descRandom['tramp'] = ''
+		end
+		$pc_descWordy['tramp'] = ''
+		$pc_desc['tramp'] = ''
+	end
+
+	if pcs_tattoos['under'] > 0:
+		$pcs_tattoos['under_desc'] = ''
+		if 1:
+			$pc_descRandom['under'] = 'tattooed'
+		end
+		$pc_descWordy['under'] = 'tattooed'
+		$pc_desc['under'] = 'tattooed'
+	else
+		$pcs_tattoos['under_desc'] = ''
+		if 1:
+			$pc_descRandom['under'] = ''
+		end
+		$pc_descWordy['under'] = ''
+		$pc_desc['under'] = ''
+	end
+
+	if pcs_tattoos['wrist'] > 0:
+		$pcs_tattoos['wrist_desc'] = ''
+		if 1:
+			$pc_descRandom['wrist'] = 'tattooed'
+		end
+		$pc_descWordy['wrist'] = 'tattooed'
+		$pc_desc['wrist'] = 'tattooed'
+	else
+		$pcs_tattoos['wrist_desc'] = ''
+		if 1:
+			$pc_descRandom['wrist'] = ''
+		end
+		$pc_descWordy['wrist'] = ''
+		$pc_desc['wrist'] = ''
+	end
+end
+
+
+
 if $ARGS[0] = 'makeup':
 	if pcs_makeup = 0:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'makeup-ruined', 'makeup-smeared', 'makeup-trashed')
 		$pc_descWordy['makeup'] = 'clownishly makeup-smeared'
-		$pcs_makeup = '<b><font color="red">Your makeup is smeared all over your face</font></b>'
+		$pc_descFull['makeup'] = '<b><font color="red">Your makeup is smeared all over your face</font></b>'
 		$pcs_makeup_msg = 'Your makeup is smeared all over your face.'
 		$pcs_makeup_tooltip = 'Your makeup is ruined.'
 	elseif pcs_makeup = 1:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'natural', 'bare')
 		$pc_descWordy['makeup'] = 'bare, natural'
-		$pcs_makeup = 'You''re not wearing any kind of makeup'
+		$pc_descFull['makeup'] = 'You''re not wearing any kind of makeup'
 		$pcs_makeup_msg = 'You''re not wearing any kind of makeup.'
 		$pcs_makeup_tooltip = 'You''re not wearing makeup.'
 	elseif pcs_makeup = 2:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'lightly-accented', 'subtly-highlighted')
 		$pc_descWordy['makeup'] = 'almost natural, subtly-accented'
-		$pcs_makeup = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty'
+		$pc_descFull['makeup'] = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty'
 		$pcs_makeup_msg = 'Your makeup is light and subtle, with neutral tones to bring out your natural beauty.'
 		$pcs_makeup_tooltip = 'Your makeup is light and subtle.'
 	elseif pcs_makeup = 3:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'colourfully done-up', 'vibrantly done-up')
 		$pc_descWordy['makeup'] = 'colourful, tastefully done-up'
-		$pcs_makeup = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features'
+		$pc_descFull['makeup'] = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features'
 		$pcs_makeup_msg = 'Your makeup has some mildly vibrant tones, covering your minor imperfections and enhancing your best features.'
 		$pcs_makeup_tooltip = 'Your makeup has some mildly vibrant tones.'
 	elseif pcs_makeup = 4:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'painted-on', 'makeup-caked', 'dolled-up', 'sultry, dramatically done-up')
 		$pc_descWordy['makeup'] = 'heavily dolled-up and painted'
-		$pcs_makeup = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips'
+		$pc_descFull['makeup'] = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips'
 		$pcs_makeup_msg = 'Your makeup is thick enough to cover most imperfections, with rich shades drawing attention to your eyes and lips.'
 		$pcs_makeup_tooltip = 'Your makeup is thick enough to cover most imperfections.'
 	elseif pcs_makeup = 5:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'painted-on', 'makeup-caked', 'dolled-up', 'sultry, dramatically done-up')
 		$pc_descWordy['makeup'] = 'heavily dolled-up and painted'
-		$pcs_makeup = 'Your makeup is professional grade, covering up any and all imperfections and flawlessly complimenting the natural hues of your eyes, face, and hair'
+		$pc_descFull['makeup'] = 'Your makeup is professional grade, covering up any and all imperfections and flawlessly complimenting the natural hues of your eyes, face, and hair'
 		$pcs_makeup_msg = 'Your makeup is professional grade, covering up any and all imperfections and flawlessly complimenting the natural hues of your eyes, face, and hair.'
 		$pcs_makeup_tooltip = 'Your makeup is professional grade.'
 	elseif pcs_makeup = 6:
 		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'bimbo', 'hawt', 'O M G', 'just, the best')
 		$pc_descWordy['makeup'] = 'really fucking bimbo-y'
-		$pcs_makeup = 'You look, like super hawt and everyone is so jelly because their makeup is boring and ugly.'
+		$pc_descFull['makeup'] = 'You look, like super hawt and everyone is so jelly because their makeup is boring and ugly.'
 		$pcs_makeup_msg = 'You look, like super hawt and everyone is so jelly because their makeup is boring and ugly.'
 		$pcs_makeup_tooltip = 'OMG! your makeup is sooo bimbo fine.'
+	elseif pcs_makeup = 7:
+		$pc_desc['makeup'] = func('body_desc', 'ChooseDescWord', 'goth', 'dark', 'heavy')
+		$pc_descWordy['makeup'] = 'completely obscured and goth'
+		$pc_descFull['makeup'] = 'Your makeup is goth style, covering up any and all imperfections and fully obscures your natural features.'
+		$pcs_makeup_msg = 'Your makeup is goth style, covering up any and all imperfections and fully obscures your natural features.'
+		$pcs_makeup_tooltip = 'Your makeup is goth style.'
 	end
 end
 
@@ -834,23 +1141,28 @@ if $ARGS[0] = 'clit':
 end
 
 if $ARGS[0] = 'pubes':
-	if lashair = 0:
+	if lashair = 1:
+		$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'hairless', 'smooth', 'bald', 'silky-smooth')
+		$pc_descWordy['pubes'] = 'eternally silky-smooth'
+		$pcs_pubes = 'You have a smooth, <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">bald pussy</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
+		$pube_style['word'] = 'shaved'
+	else
 		$pube_style['shape'] = ''
 		if pcs_pubes <= 3:
 			lobkoef = 3
-			$pcs_pubes = 'You have a smoothly <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">shaved pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have a smoothly <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shaved pussy</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'silky', 'hairless', 'smooth-shaven', 'freshly-shaven')
 			$pc_descWordy['pubes'] = 'silky, freshly-shaven'
 			$pube_style['word'] = 'shaved'
 		elseif pcs_pubes <= 10:
 			lobkoef = 0
-			$pcs_pubes = 'You have stubble growing around your <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have stubble growing around your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'stubbly', 'scratchy', 'roughly-stubbled')
 			$pc_descWordy['pubes'] = 'scratchy, roughly-stubbled'
 			$pube_style['word'] = 'stubble'
 		elseif pcs_pubes <= 15:
 			lobkoef = 0
-			$pcs_pubes = 'You have a tidy patch of hair growing above your <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have a tidy patch of hair growing above your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'almost bare', 'barely-haired', 'well-kept')
 			$pc_descWordy['pubes'] = 'scratchy, roughly-stubbled'
 			$pube_style['word'] = 'patch'
@@ -859,60 +1171,55 @@ if $ARGS[0] = 'pubes':
 			$pube_style['word'] = 'trimmed'
 			if pubestyle = 9:
 				$pube_style['shape'] = 'bush'
-				$pcs_pubes = 'You have neatly trimmed section of hair around your <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+				$pcs_pubes = 'You have neatly trimmed section of hair around your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 			elseif pubestyle = 12:
 				$pube_style['word'] = 'patch'
-				$pcs_pubes = 'You have cute little patch of bush at the top of your <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+				$pcs_pubes = 'You have cute little patch of bush at the top of your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 			elseif pubestyle = 13:
 				$pube_style['shape'] = 'strip'
-				$pcs_pubes = 'You have tidy strip of bush covering your <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+				$pcs_pubes = 'You have tidy strip of bush covering your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 			elseif pubestyle = 14:
 				$pube_style['shape'] = 'rectangle'
-				$pcs_pubes = 'You have neatly trimmed rectangle of hair just above your <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+				$pcs_pubes = 'You have neatly trimmed rectangle of hair just above your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 			else
 				if pubestyle = 2:
 					$pube_style['shape'] = 'V'
-					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">shape of a V</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shape of a V</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 				elseif pubestyle = 3:
 					$pube_style['shape'] = 'triangle'
-					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">shape of a triangle</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shape of a triangle</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 				elseif pubestyle = 4:
 					$pube_style['shape'] = 'landing strip'
-					$pcs_pubes = 'You have a cleanly trimmed <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">landing strip</a> between your legs. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">landing strip</a> between your legs. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 				elseif pubestyle = 5:
 					$pube_style['shape'] = 'heart'
-					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">shape of a heart</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shape of a heart</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 				elseif pubestyle = 6:
 					$pube_style['shape'] = 'flame'
-					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">shape of a flame</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shape of a flame</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 				elseif pubestyle = 7:
 					$pube_style['shape'] = 'cross'
-					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">shape of a cross</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a cleanly trimmed mat of pubic hair in the <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shape of a cross</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 				elseif pubestyle = 8:
 					$pube_style['shape'] = 'bush'
-					$pcs_pubes = 'You have a close-cropped lawn of pubic hair covering your <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+					$pcs_pubes = 'You have a close-cropped lawn of pubic hair covering your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 				end
 			end
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'wispy-haired', 'lightly-furred', 'trimmed', 'well-maintained')
 			$pc_descWordy['pubes'] = 'trimmed, well-kept'
 		elseif pcs_pubes <= 30:
 			lobkoef = 0
-			$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have a bushy but well-maintained mat of <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pubic hair</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'furred', 'bushy', 'partially-maintained')
 			$pc_descWordy['pubes'] = 'bushy, thick'
 			$pube_style['word'] = 'bush'
-		elseif pcs_pubes >= 40:
+		else
 			lobkoef = 0
-			$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">pubic hair</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pubic hair</a>. <<$pcs_piercings[''pussy_desc'']>><br><<$clitsize>>'
 			$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'thickly-furred', 'very hairy', 'ill-maintained')
 			$pc_descWordy['pubes'] = 'hairy, wild-maned'
 			$pube_style['word'] = 'untrimmed'
 		end
-	elseif lashair = 1:
-		$pc_desc['pubes'] = func('body_desc', 'ChooseDescWord', 'hairless', 'smooth', 'bald', 'silky-smooth')
-		$pc_descWordy['pubes'] = 'eternally silky-smooth'
-		$pcs_pubes = 'You have a smooth, <a href="exec:view''<<FUNC(''$body_image'', ''pubes'')>>''">bald pussy</a>. <<$pirspiz>><br><<$clitsize>>'
-		$pube_style['word'] = 'shaved'
 	end
 	gs 'body_desc', 'pube_desc_update'
 end
@@ -955,7 +1262,7 @@ if $ARGS[0] = 'pube_desc_update':
 		end
 	elseif pcs_pubes <= 30:
 		$pube_desc = 'full bush'
-	elseif pcs_pubes <= 40:
+	else
 		$pube_desc = 'wild bush'
 	end
 end

+ 322 - 360
locations/body_structure.qsrc

@@ -66,185 +66,69 @@ if $ARGS[0] = 'get_class':
 end
 
 
-!	Get the bmi description:
-!	$bodyVars['bmi_desc'] = func('body_structure', pcs_bmi)
-if $ARGS[0] = 'bmi_desc':
-	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
-
-	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], 30)
-
-	if bs_temp_bs_class < 100:
-		$result = 'You are severely underweight.'
-	elseif bs_temp_bs_class < 200:
-		$result = 'You are underweight'
-	elseif bs_temp_bs_class < 300:
-		$result = 'You have a normal, healthy weight.'
-	elseif bs_temp_bs_class < 400:
-		$result = 'You have a normal, healthy weight.'
-	elseif bs_temp_bs_class < 500:
-		$result = 'You are overweight.'
-	elseif bs_temp_bs_class < 600:
-		$result = 'You are moderately obese.'
-	elseif bs_temp_bs_class < 700:
-		$result = 'You are severely obese.'
-	elseif bs_temp_bs_class < 800:
-		$result = 'You are very severely obese.'
-	else
-		$result = 'You are morbidly obese.'
-	end
-
-	killvar 'bs_temp_bs_class'
-end
-
-
-!	Get the appearance bonus
-!	Appearance_bonus = func('body_structure', 'appearance_bonus', pcs_bmi, strenbuf)
-if $ARGS[0] = 'appearance_bonus':
-	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
-	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
-
-	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
-
-	if bs_temp_bs_class < 100:
-		!	starving: bmi < 16
-		result = -10
-	elseif bs_temp_bs_class < 200:
-		!	underweight: 16 <= bmi < 16
-		result = 25
-	elseif bs_temp_bs_class < 300:
-		!	slender: 19 <= bmi < 21
-		result = 50
-	elseif bs_temp_bs_class < 400:
-		!	healthy: 21 <= bmi < 25
-		result = 50
-	elseif bs_temp_bs_class < 500:
-		!	overweight: 26 <= bmi < 30
-		result = 25
-	elseif bs_temp_bs_class < 600:
-		!	moderately obese: 30 <= bmi < 35
-		result = 10
-	elseif bs_temp_bs_class < 700:
-		!	severely obese: 35 <= bmi < 40
-		result = -15
-	elseif bs_temp_bs_class < 800:
-		!	very severely obese: 40 <= bmi < 45
-		result = -40
-	else
-		!	morbidly obese: 45 <= bmi
-		result = -80
-	end
-
-	bs_temp_bs_class = bs_temp_bs_class mod 100
-
-	if bs_temp_bs_class = 0:
-		!	0 <= strenbuf <= 5
-		result -= 30
-	elseif bs_temp_bs_class = 1:
-		!	5 < strenbuf <= 10
-		result -= 20
-	elseif bs_temp_bs_class = 2:
-		!	10 < strenbuf <= 15
-		result -= 15
-	elseif bs_temp_bs_class = 3:
-		!	15 < strenbuf <= 25
-		result -= 10
-	elseif bs_temp_bs_class = 4:
-		!	25 < strenbuf <= 35
-		result -= 5
-	elseif bs_temp_bs_class = 5:
-		!	35 < strenbuf <= 50
-		result += 0
-	elseif bs_temp_bs_class = 6:
-		!	50 < strenbuf <= 70
-		result += 5
-	elseif bs_temp_bs_class = 7:
-		!	70 < strenbuf <= 100
-		result += 10
-	elseif bs_temp_bs_class = 8:
-		!	100 < strenbuf <= 110
-		result += 5
-	elseif bs_temp_bs_class = 9:
-		!	110 < strenbuf <= 120
-		result += 0
-	elseif bs_temp_bs_class = 10:
-		!	120 < strenbuf <= 130
-		result -= 5
-	elseif bs_temp_bs_class = 11:
-		!	130 < strenbuf <= 140
-		result -= 15
-	elseif bs_temp_bs_class = 12:
-		!	140 < strenbuf <= 150
-		result -= 30
-	elseif bs_temp_bs_class = 13:
-		!	150 < strenbuf <= 160
-		result -= 45
-	elseif bs_temp_bs_class = 14:
-		!	160 < strenbuf <= 170
-		result -= 60
-	elseif bs_temp_bs_class = 15:
-		!	170 < strenbuf <= 180
-		result -= 75
-	elseif bs_temp_bs_class = 16:
-		!	180 < strenbuf <= 190
-		result -= 100
-	else
-		!	190 < strenbuf <= 200
-		result -= 130
-	end
-
-	killvar 'bs_temp_bs_class'
-end
 
+if $ARGS[0] = 'body_img_totals':
+	if ARGS[0] = 000:
+		result = 2
+	elseif ARGS[0] = 006:
+		result = 2
 
-if $ARGS[0] = 'Body_img_totals':
-	if ARGS[1] = 0:
-		result = 1
-	elseif ARGS[1] = 100:
+	elseif ARGS[0] = 100:
 		result = 4
-	elseif ARGS[1] = 106:
+	elseif ARGS[0] = 106:
 		result = 3
-	elseif ARGS[1] = 200:
-		result = 3
-	elseif ARGS[1] = 206:
-		result = 4
-	elseif ARGS[1] = 207:
+
+	elseif ARGS[0] = 200:
 		result = 2
-	elseif ARGS[1] = 208:
+	elseif ARGS[0] = 206:
+		result = 4
+	elseif ARGS[0] = 207:
+		result = 3
+	elseif ARGS[0] = 208:
 		result = 1
-	elseif ARGS[1] = 210:
+	elseif ARGS[0] = 210:
 		result = 1
-	elseif ARGS[1] = 213:
+	elseif ARGS[0] = 213:
 		result = 1
-	elseif ARGS[1] = 215:
+	elseif ARGS[0] = 215:
 		result = 1
-	elseif ARGS[1] = 300:
-		result = 4
-	elseif ARGS[1] = 306:
+
+	elseif ARGS[0] = 300:
 		result = 3
-	elseif ARGS[1] = 307:
+	elseif ARGS[0] = 306:
+		result = 3
+	elseif ARGS[0] = 307:
 		result = 1
-	elseif ARGS[1] = 400:
+	elseif ARGS[0] = 308:
+		result = 1
+
+	elseif ARGS[0] = 400:
 		result = 2
-	elseif ARGS[1] = 406:
-		result = 3
-	elseif ARGS[1] = 500:
+	elseif ARGS[0] = 406:
+		result = 2
+
+	elseif ARGS[0] = 500:
 		result = 3
-	elseif ARGS[1] = 506:
+	elseif ARGS[0] = 506:
 		result = 2
-	elseif ARGS[1] = 600:
-		result = 1
-	elseif ARGS[1] = 700:
+
+	elseif ARGS[0] = 600:
 		result = 1
-	elseif ARGS[1] = 800:
+
+	elseif ARGS[0] = 700:
+		result = 2
+
+	elseif ARGS[0] = 800:
 		result = 1
-	else
-		result = 0
+
 	end
 end
 
 if $ARGS[0] = 'Body_img_transform':
-	if ARGS[1] < 100:
-		result = 0
+	if ARGS[1] < 006:
+		result = 000
+	elseif ARGS[1] < 100:
+		result = 006
 	elseif ARGS[1] < 106:
 		result = 100
 	elseif ARGS[1] < 200:
@@ -270,7 +154,7 @@ if $ARGS[0] = 'Body_img_transform':
 	elseif ARGS[1] = 307:
 		result = 307
 	elseif ARGS[1] < 310:
-		result = 208
+		result = 308
 	elseif ARGS[1] < 313:
 		result = 210
 	elseif ARGS[1] < 315:
@@ -294,6 +178,24 @@ if $ARGS[0] = 'Body_img_transform':
 	end
 end
 
+!	ARGS[1] = bs_class
+if $ARGS[0] = 'default_set_class_transform':
+	result = ARGS[1]
+	if cheatVars['fix_bi_set'] mod 10 = 0:
+		result = 100 * (result / 100) + 2
+	elseif cheatVars['fix_bi_set'] mod 10 = 1:
+		result = 100 * (result / 100) + 6
+	elseif cheatVars['fix_bi_set'] mod 10 = 2:
+		result = 100 * (result / 100) + 8
+	end
+
+	if cheatVars['fix_bi_set'] / 10 mod 10 ! 9:
+		result = (cheatVars['fix_bi_set'] / 10 mod 10) * 100 + result mod 100
+	end
+end
+
+
+
 !	Get the body shape image
 !	$bodyVars['img'] = func('body_structure', 'body_img', pcs_bmi, strenbuf, PregChem)
 if $ARGS[0] = 'body_img':
@@ -302,206 +204,107 @@ if $ARGS[0] = 'body_img':
 	if arrsize('ARGS') = 3: ARGS[3] = PregChem
 
 
-	if 1:
-		! =======      Pregnant       ======= !
-		if bdsetlock = 0 and (knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or ARGS[3] > 3600))):
-			if ARGS[3] <= 2687:
-				$result = 'images/pc/body/shape/default_preg/0.jpg'
-			elseif ARGS[3] <= 6215:
-				$result = 'images/pc/body/shape/default_preg/<<((ARGS[3] - 2184)/504)>>.jpg'
-			else
-				$result = 'images/pc/body/shape/default_preg/8.jpg'
-			end
-			exit
-		end
 
-		bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
-
-		if bdsetlock = 1:
-			if fixbodset = 0:
-				bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 2
-			elseif fixbodset = 1:
-				bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 6
-			elseif fixbodset = 2:
-				bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 8
-			else
-				$result = func('body_structure', 'custom_body_img', bs_temp_bs_class)
-				killvar 'bs_temp_bs_class'
-				exit
-			end
-		end
-
-		$result = 'images/pc/body/shape/'
-		! =======      starving       ======= !
-		! -----           bmi < 16      ----- !
-		if bs_temp_bs_class <= 17:
-			!	0 <= strenbuf <= 200
-			$result += '0.jpg'
-
-		! =======     underweight     ======= !
-		! -----     16 <= bmi < 19      ----- !
-		elseif bs_temp_bs_class <= 105:
-			!	0 <= strenbuf <= 50
-			$result += 'default_low/1.jpg'
-		elseif bs_temp_bs_class <= 107:
-			!	51 <= strenbuf <= 100
-			$result += 'default_mid/1.jpg'
-		elseif bs_temp_bs_class <= 117:
-			!	101 <= strenbuf <= 200
-			$result += 'default_high/1.jpg'
-
-		! =======       slender       ======= !
-		! -----     19 <= bmi < 21      ----- !
-		elseif bs_temp_bs_class <= 205:
-			!	0 <= strenbuf <= 50
-			$result += 'default_low/2.jpg'
-		elseif bs_temp_bs_class <= 207:
-			!	51 <= strenbuf <= 100
-			$result += 'default_mid/2.jpg'
-		elseif bs_temp_bs_class <= 217:
-			!	101 <= strenbuf <= 200
-			$result += 'default_high/2.jpg'
-
-		! =======       healthy       ======= !
-		! -----     21 <= bmi < 25      ----- !
-		elseif bs_temp_bs_class <= 305:
-			!	0 <= strenbuf <= 50
-			$result += 'default_low/3.jpg'
-		elseif bs_temp_bs_class <= 307:
-			!	51 <= strenbuf <= 100
-			$result += 'default_mid/3.jpg'
-		elseif bs_temp_bs_class <= 317:
-			!	101 <= strenbuf <= 200
-			$result += 'default_high/3.jpg'
-
-		! =======     overweight      ======= !
-		! -----     26 <= bmi < 30      ----- !
-		elseif bs_temp_bs_class <= 405:
-			!	0 <= strenbuf <= 50
-			$result += 'default_low/4.jpg'
-		elseif bs_temp_bs_class <= 407:
-			!	51 <= strenbuf <= 100
-			$result += 'default_mid/4.jpg'
-		elseif bs_temp_bs_class <= 417:
-			!	101 <= strenbuf <= 200
-			$result += 'default_high/4.jpg'
-
-		! =======  moderately obese   ======= !
-		! -----     30 <= bmi < 35      ----- !
-		elseif bs_temp_bs_class <= 505:
-			!	0 <= strenbuf <= 50
-			$result += 'default_low/5.jpg'
-		elseif bs_temp_bs_class <= 507:
-			!	51 <= strenbuf <= 100
-			$result += 'default_mid/5.jpg'
-		elseif bs_temp_bs_class <= 517:
-			!	101 <= strenbuf <= 200
-			$result += 'default_high/5.jpg'
-
-		! =======   severely obese    ======= !
-		! -----     35 <= bmi < 40      ----- !
-		elseif bs_temp_bs_class <= 617:
-			!	0 <= strenbuf <= 200
-			$result += '6.jpg'
-
-		! ======= very severely obese ======= !
-		! -----     40 <= bmi < 45      ----- !
-		elseif bs_temp_bs_class <= 717:
-			!	0 <= strenbuf <= 200
-			$result += '7.jpg'
-
-		! =======   morbidly obese    ======= !
-		! -----     45 <= bmi           ----- !
+	! =======      Pregnant       ======= !
+	if cheatVars['fix_bodyimg'] = 0 and (knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or ARGS[3] > 3600))):
+		if ARGS[3] <= 2687:
+			$result = 'images/pc/body/shape/preg/0/0.jpg'
+		elseif ARGS[3] <= 6215:
+			$result = 'images/pc/body/shape/preg/0/<<((ARGS[3] - 2184)/504)>>.jpg'
 		else
-			!	0 <= strenbuf <= 200
-			!$result = 'images/pc/body/shape/8.jpg'
-			$result += '7.jpg'
+			$result = 'images/pc/body/shape/preg/0/8.jpg'
 		end
+		exit
+	end
 
-	else
-		! =======      Pregnant       ======= !
-		if bdsetlock = 0 and (knowpreg = 1 or (preg = 1 and (thinkpreg = 1 or ARGS[3] > 3600))):
-			if ARGS[3] <= 2687:
-				$result = 'images/pc/body/shape/preg/0/0.jpg'
-			elseif ARGS[3] <= 6215:
-				$result = 'images/pc/body/shape/preg/0/<<((ARGS[3] - 2184)/504)>>.jpg'
-			else
-				$result = 'images/pc/body/shape/preg/0/8.jpg'
-			end
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
+
+	if cheatVars['fix_bodyimg'] = 1:
+		if cheatVars['fix_bi_set'] < 10:
+			$result = func('body_structure', 'custom_body_img', bs_temp_bs_class)
+			killvar 'bs_temp_bs_class'
 			exit
+		else
+			bs_temp_bs_class = func('body_structure', 'default_set_class_transform', bs_temp_bs_class)
 		end
+	end
 
-		bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
-
-		if bdsetlock = 1:
-			if fixbodset = 0:
-				bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 2
-			elseif fixbodset = 1:
-				bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 6
-			elseif fixbodset = 2:
-				bs_temp_bs_class = 100 * (bs_temp_bs_class / 100) + 8
-			else
-				$result = func('body_structure', 'custom_body_img', bs_temp_bs_class)
-				killvar 'bs_temp_bs_class'
-				exit
-			end
-		end
+	$result = func('body_structure', 'body_img_from_class', bs_temp_bs_class)
+	killvar 'bs_temp_bs_class'
+end
 
-		$result = 'images/pc/body/shape/'
-
-		bs_temp_bs_class = func('body_structure', 'Body_img_transform', bs_temp_bs_class)
-		gs 'body_structure', 'Body_img_totals'
-		if bs_temp_bs_class < 100:
-			$result += '0_starving/'
-		elseif bs_temp_bs_class < 200:
-			$result += '1_underweight/'
-		elseif bs_temp_bs_class < 300:
-			$result += '2_slender/'
-		elseif bs_temp_bs_class < 400:
-			$result += '3_healthy/'
-		elseif bs_temp_bs_class < 500:
-			$result += '4_overweight/'
-		elseif bs_temp_bs_class < 600:
-			$result += '5_modobese/'
-		elseif bs_temp_bs_class < 700:
-			$result += '6_sevobese/'
-		elseif bs_temp_bs_class < 800:
-			$result += '7_vsevobese/'
-		else
-			$result += '8_morobese/'
-		end
 
-		if bs_temp_bs_class mod 100 = 0:
-			$result += '0_low_'
-		elseif bs_temp_bs_class mod 100 = 6:
-			$result += '6_mid_'
-		elseif bs_temp_bs_class mod 100 = 7:
-			$result += '7_high_'
-		elseif bs_temp_bs_class mod 100 = 8:
-			$result += '8_strong_'
-		elseif bs_temp_bs_class mod 100 = 10:
-			$result += '10_vstrong_'
-		elseif bs_temp_bs_class mod 100 = 13:
-			$result += '13_bb_'
-		elseif bs_temp_bs_class mod 100 = 15:
-			$result += '15_hulk_'
-		end
+if $ARGS[0] = 'body_img_from_class':
+	$result = 'images/pc/body/shape/'
 
-		$result += '<<rand(0, func(''body_structure'', ''Body_img_totals'', bs_temp_bs_class)-1)>>.jpg'
+	ARGS[1] = func('body_structure', 'Body_img_transform', ARGS[1])
+	if ARGS[1] < 100:
+		$result += '0_starving/'
+	elseif ARGS[1] < 200:
+		$result += '1_underweight/'
+	elseif ARGS[1] < 300:
+		$result += '2_slender/'
+	elseif ARGS[1] < 400:
+		$result += '3_healthy/'
+	elseif ARGS[1] < 500:
+		$result += '4_overweight/'
+	elseif ARGS[1] < 600:
+		$result += '5_modobese/'
+	elseif ARGS[1] < 700:
+		$result += '6_sevobese/'
+	elseif ARGS[1] < 800:
+		$result += '7_vsevobese/'
+	else
+		$result += '8_morobese/'
 	end
 
+	if ARGS[1] mod 100 = 0:
+		$result += '0_low_'
+	elseif ARGS[1] mod 100 = 6:
+		$result += '6_mid_'
+	elseif ARGS[1] mod 100 = 7:
+		$result += '7_high_'
+	elseif ARGS[1] mod 100 = 8:
+		$result += '8_strong_'
+	elseif ARGS[1] mod 100 = 10:
+		$result += '10_vstrong_'
+	elseif ARGS[1] mod 100 = 13:
+		$result += '13_bbuilder_'
+	elseif ARGS[1] mod 100 = 15:
+		$result += '15_hulk_'
+	end
+
+	temp_img_totals = func('body_structure', 'body_img_totals', ARGS[1])
+	if arrsize('ARGS') <= 2:
+		temp_img_chosen = rand(0, temp_img_totals-1)
+	elseif ARGS[2] < 0:
+		temp_img_chosen = 0
+	elseif ARGS[2] < temp_img_totals:
+		temp_img_chosen = ARGS[2]
+	else
+		temp_img_chosen = temp_img_totals - 1
+	end
+
+	$result += '<<temp_img_chosen>>.jpg'
+
+	killvar 'temp_img_totals'
 	killvar 'bs_temp_bs_class'
 end
 
 if $ARGS[0] = 'custom_body_img':
 	ARGS[1] = ARGS[1] / 100
-	if ARGS[1] = 0 or ARGS[1] >= 6:
-		if dyneval('result = imset<<ARGS[1]>>ovr[<<fixbodset>>]') = 0:
-			$result = 'images/pc/body/shape/<<ARGS[1]>>.jpg'
-			exit
-		end
+
+	$temp_img_name = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_img_<<ARGS[1]>>']
+	if $temp_img_name = '':
+		$result = func('body_structure', 'body_img_from_class', ARGS[1] * 100)
+		killvar '$temp_img_name'
+		exit
 	end
-	$result = 'images/pc/body/shape/<<$bodimgsets[((fixbodset * 10) + 9)]>>/<<ARGS[1]>>.jpg'
+
+	$temp_base_folder = 'images/pc/body/shape/' + $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_folder']
+	$result = '<<$temp_base_folder>>/<<$temp_img_name>>.jpg'
+	killvar '$temp_base_folder'
+	killvar '$temp_img_name'
 end
 
 
@@ -535,80 +338,92 @@ if $ARGS[0] = 'body_desc':
 		exit
 	end
 
-
-
 	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
 
+	if cheatVars['fix_bodyimg'] = 1:
+		if cheatVars['fix_bi_set'] < 10:
+			$result = func('body_structure', 'custom_body_desc', bs_temp_bs_class)
+			killvar 'bs_temp_bs_class'
+			exit
+		else
+			bs_temp_bs_class = func('body_structure', 'default_set_class_transform', bs_temp_bs_class)
+		end
+	end
 
+	$result = func('body_structure', 'body_desc_from_class', bs_temp_bs_class)
+	killvar 'bs_temp_bs_class'
+end
+
+if $ARGS[0] = 'body_desc_from_class':
 	! =======      starving       ======= !
 	! -----           bmi < 16      ----- !
-	if bs_temp_bs_class <= 17:
+	if ARGS[1] <= 17:
 		!	0 <= strenbuf <= 200
 		$result = 'starving'
 
 	! =======     underweight     ======= !
 	! -----     16 <= bmi < 19      ----- !
-	elseif bs_temp_bs_class <= 105:
+	elseif ARGS[1] <= 105:
 		!	0 <= strenbuf <= 50
 		$result = 'underweight'
-	elseif bs_temp_bs_class <= 107:
+	elseif ARGS[1] <= 107:
 		!	51 <= strenbuf <= 100
 		$result = 'slight'
-	elseif bs_temp_bs_class <= 117:
+	elseif ARGS[1] <= 117:
 		!	101 <= strenbuf <= 200
 		$result = 'wiry'
 
 	! =======       slender       ======= !
 	! -----     19 <= bmi < 22      ----- !
-	elseif bs_temp_bs_class <= 205:
+	elseif ARGS[1] <= 205:
 		!	0 <= strenbuf <= 50
 		$result = 'slender'
-	elseif bs_temp_bs_class <= 207:
+	elseif ARGS[1] <= 207:
 		!	51 <= strenbuf <= 100
 		$result = 'skinny'
-	elseif bs_temp_bs_class <= 217:
+	elseif ARGS[1] <= 217:
 		!	101 <= strenbuf <= 200
 		$result = 'lean'
 
 	! =======       healthy       ======= !
 	! -----     22 <= bmi < 25      ----- !
-	elseif bs_temp_bs_class <= 305:
+	elseif ARGS[1] <= 305:
 		!	0 <= strenbuf <= 50
 		$result = 'healthy'
-	elseif bs_temp_bs_class <= 307:
+	elseif ARGS[1] <= 307:
 	!		51 <= strenbuf <= 100
 		$result = 'toned'
-	elseif bs_temp_bs_class <= 317:
+	elseif ARGS[1] <= 317:
 		!	101 <= strenbuf <= 200
 		$result = 'ripped'
 
 	! =======     overweight      ======= !
 	! -----     26 <= bmi < 30      ----- !
-	elseif bs_temp_bs_class <= 405:
+	elseif ARGS[1] <= 405:
 		!	0 <= strenbuf <= 50
 		$result = 'overweight'
-	elseif bs_temp_bs_class <= 407:
+	elseif ARGS[1] <= 407:
 	!		51 <= strenbuf <= 100
 		$result = 'curvy'
-	elseif bs_temp_bs_class <= 417:
+	elseif ARGS[1] <= 417:
 		!	101 <= strenbuf <= 200
 		$result = 'heavy set'
 
 	! =======  moderately obese   ======= !
 	! -----     30 <= bmi < 35      ----- !
-	elseif bs_temp_bs_class <= 517:
+	elseif ARGS[1] <= 517:
 		!	0 <= strenbuf <= 200
 		$result = 'moderately obese'
 
 	! =======   severely obese    ======= !
 	! -----     35 <= bmi < 40      ----- !
-	elseif bs_temp_bs_class <= 617:
+	elseif ARGS[1] <= 617:
 		!	0 <= strenbuf <= 200
 		$result = 'severely obese'
 
 	! ======= very severely obese ======= !
 	! -----     40 <= bmi < 45      ----- !
-	elseif bs_temp_bs_class <= 717:
+	elseif ARGS[1] <= 717:
 		!	0 <= strenbuf <= 200
 		$result = 'very severely obese'
 
@@ -618,9 +433,156 @@ if $ARGS[0] = 'body_desc':
 		!	0 <= strenbuf <= 200
 		$result = 'morbidly obese'
 	end
+end
+
+
+if $ARGS[0] = 'custom_body_desc':
+	ARGS[1] = ARGS[1] / 100
+
+	$temp_bs_body_desc = $cheatVars['fix_biset_<<cheatVars[''fix_bi_set'']>>_desc_<<ARGS[1]>>']
+	if $temp_bs_body_desc = '':
+		$temp_bs_body_desc = func('body_structure', 'body_desc_from_class', ARGS[1] * 100)
+	end
+
+	$result = $temp_bs_body_desc
+	killvar '$temp_bs_body_desc'
+end
+
+
+
+!	Get the bmi description:
+!	$bodyVars['bmi_desc'] = func('body_structure', pcs_bmi)
+if $ARGS[0] = 'bmi_desc':
+	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
+
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], 30)
+	$result = func('body_structure', 'bmi_desc_from_class', bs_temp_bs_class)
+	killvar 'bs_temp_bs_class'
+end
+
+
+if $ARGS[0] = 'bmi_desc_from_class':
+	if ARGS[1] < 100:
+		$result = 'You are severely underweight.'
+	elseif ARGS[1] < 200:
+		$result = 'You are underweight'
+	elseif ARGS[1] < 300:
+		$result = 'You have a normal, healthy weight.'
+	elseif ARGS[1] < 400:
+		$result = 'You have a normal, healthy weight.'
+	elseif ARGS[1] < 500:
+		$result = 'You are overweight.'
+	elseif ARGS[1] < 600:
+		$result = 'You are moderately obese.'
+	elseif ARGS[1] < 700:
+		$result = 'You are severely obese.'
+	elseif ARGS[1] < 800:
+		$result = 'You are very severely obese.'
+	else
+		$result = 'You are morbidly obese.'
+	end
+end
+
+
+!	Get the appearance bonus
+!	Appearance_bonus = func('body_structure', 'appearance_bonus', pcs_bmi, strenbuf)
+if $ARGS[0] = 'appearance_bonus':
+	if arrsize('ARGS') = 1: ARGS[1] = pcs_bmi
+	if arrsize('ARGS') = 2: ARGS[2] = strenbuf
 
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
+	result = func('body_structure', 'appearance_bonus_from_class', bs_temp_bs_class)
 	killvar 'bs_temp_bs_class'
 end
 
+if $ARGS[0] = 'appearance_bonus_from_class':
+	if ARGS[1] < 100:
+		!	starving: bmi < 16
+		result = -10
+	elseif ARGS[1] < 200:
+		!	underweight: 16 <= bmi < 16
+		result = 25
+	elseif ARGS[1] < 300:
+		!	slender: 19 <= bmi < 21
+		result = 50
+	elseif ARGS[1] < 400:
+		!	healthy: 21 <= bmi < 25
+		result = 50
+	elseif ARGS[1] < 500:
+		!	overweight: 26 <= bmi < 30
+		result = 25
+	elseif ARGS[1] < 600:
+		!	moderately obese: 30 <= bmi < 35
+		result = 10
+	elseif ARGS[1] < 700:
+		!	severely obese: 35 <= bmi < 40
+		result = -15
+	elseif ARGS[1] < 800:
+		!	very severely obese: 40 <= bmi < 45
+		result = -40
+	else
+		!	morbidly obese: 45 <= bmi
+		result = -80
+	end
+
+	ARGS[1] = ARGS[1] mod 100
+
+	if ARGS[1] = 0:
+		!	0 <= strenbuf <= 5
+		result -= 30
+	elseif ARGS[1] = 1:
+		!	5 < strenbuf <= 10
+		result -= 20
+	elseif ARGS[1] = 2:
+		!	10 < strenbuf <= 15
+		result -= 15
+	elseif ARGS[1] = 3:
+		!	15 < strenbuf <= 25
+		result -= 10
+	elseif ARGS[1] = 4:
+		!	25 < strenbuf <= 35
+		result -= 5
+	elseif ARGS[1] = 5:
+		!	35 < strenbuf <= 50
+		result += 0
+	elseif ARGS[1] = 6:
+		!	50 < strenbuf <= 70
+		result += 5
+	elseif ARGS[1] = 7:
+		!	70 < strenbuf <= 100
+		result += 10
+	elseif ARGS[1] = 8:
+		!	100 < strenbuf <= 110
+		result += 5
+	elseif ARGS[1] = 9:
+		!	110 < strenbuf <= 120
+		result += 0
+	elseif ARGS[1] = 10:
+		!	120 < strenbuf <= 130
+		result -= 5
+	elseif ARGS[1] = 11:
+		!	130 < strenbuf <= 140
+		result -= 15
+	elseif ARGS[1] = 12:
+		!	140 < strenbuf <= 150
+		result -= 30
+	elseif ARGS[1] = 13:
+		!	150 < strenbuf <= 160
+		result -= 45
+	elseif ARGS[1] = 14:
+		!	160 < strenbuf <= 170
+		result -= 60
+	elseif ARGS[1] = 15:
+		!	170 < strenbuf <= 180
+		result -= 75
+	elseif ARGS[1] = 16:
+		!	180 < strenbuf <= 190
+		result -= 100
+	else
+		!	190 < strenbuf <= 200
+		result -= 130
+	end
+end
+
 
 --- body_structure ---------------------------------

+ 44 - 51
locations/bordelv.qsrc

@@ -1,47 +1,45 @@
 # bordelv
-cla
-*clr
-menu_off = 1
-minut += 30
-pcs_horny += 20
-gs 'stat'
-'<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 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 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':
-	cla
-	*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 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', 'clit_finger', 5, 'masturbate'
-	minut -= 5
+
+if $ARGS[0] = '':
+	menu_off = 1
+	minut += 30
+	pcs_horny += 20
 	gs 'stat'
-	
-	act 'Leave':gt 'bordelv', 'out'
-	
-	gs 'willpower', 'voyeur', 'self', 'hard'
-	if will_cost <= pcs_willpwr:
-		act 'Keep watching (<<will_cost>> Willpower)':
-			gs 'willpower', 'voyeur', 'self', 'hard'
-			gs 'willpower', 'pay', 'self'
-			gs 'stat'
-			gt 'bordelv', 'sex'
+	'<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 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 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':
+		*clr & cla
+		'<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 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', 'clit_finger', 5, 'masturbate'
+		minut -= 5
+		gs 'stat'
+
+		act 'Leave':gt 'bordelv', 'out'
+
+		gs 'willpower', 'voyeur', 'self', 'hard'
+		if will_cost <= pcs_willpwr:
+			act 'Keep watching (<<will_cost>> Willpower)':
+				gs 'willpower', 'voyeur', 'self', 'hard'
+				gs 'willpower', 'pay', 'self'
+				gs 'stat'
+				gt 'bordelv', 'sex'
+			end
+		else
+			act 'Keep watching (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-	else
-		act 'Keep watching (<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 $ARGS[0] = 'sex':
-	cla
-	*clr
 	dviksex += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika<<rand(3,7)>>.jpg"></center>'
@@ -52,7 +50,7 @@ if $ARGS[0] = 'sex':
 	gs 'arousal', 'clit_finger', 10, 'masturbate'
 	minut -= 10
 	gs 'stat'
-	
+
 	gs 'willpower', 'voyeur', 'self'
 	if will_cost <= pcs_willpwr:
 		act 'Keep watching more (<<will_cost>> Willpower)':
@@ -69,8 +67,6 @@ if $ARGS[0] = 'sex':
 end
 
 if $ARGS[0] = 'end':
-	cla
-	*clr
 	minut += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/sex/bvika8.jpg"></center>'
@@ -80,10 +76,9 @@ if $ARGS[0] = 'end':
 	$orgasm_or = 'custom'
 	gs 'arousal', 'clit_finger', 5, 'masturbate'
 	gs 'stat'
-	
+
 	act 'Wait in the room':
-		cla
-		*clr
+		*clr & cla
 		'<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.'
 
@@ -97,7 +92,7 @@ if $ARGS[0] = 'end':
 					vikaend = 1
 					gt 'city_redlight', 'start'
 				end
-				
+
 				gs 'willpower', 'misc', 'self'
 				if will_cost <= pcs_willpwr:
 					act 'Comfort her (<<will_cost>> Willpower)':
@@ -138,7 +133,7 @@ if $ARGS[0] = 'end':
 
 				act 'Leave':gt 'city_redlight', 'start'
 			end
-			
+
 			gs 'willpower', 'misc', 'self', 'hard'
 			if will_cost <= pcs_willpwr:
 				act 'Ask about a job at the brothel (<<will_cost>> Willpower)':
@@ -161,8 +156,6 @@ if $ARGS[0] = 'end':
 end
 
 if $ARGS[0] = 'out':
-	cla
-	*clr
 	minut += 20
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/sauna/bordel.jpg"></center>'
@@ -171,17 +164,17 @@ if $ARGS[0] = 'out':
 	'"<<$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 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
 		vikaend = 1
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
-	
+
 		gt 'city_redlight', 'start'
 	end
-	
+
 	gs 'willpower', 'misc', 'self', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Comfort her (<<will_cost>> Willpower)':

+ 2 - 2
locations/bras.qsrc

@@ -238,7 +238,7 @@ if $ARGS[0] = 'view_bra_item':
 			else
 				'You do not have enough cash to buy this bra.'
 			end
-			if karta + bankDebtLimit >= price:
+			if karta >= price:
 				act 'Buy (card)':
 					karta -= price
 					dynamic $ARGS[2] + '_bras[<<ARGS[3]>>] = 1'
@@ -267,7 +267,7 @@ if $ARGS[0] = 'view_bra_item':
 					else
 						'You do not have enough cash to buy this set.'
 					end
-					if karta + bankDebtLimit >= price_set:
+					if karta >= price_set:
 						act 'Buy set (card)':
 							karta -= price_set
 							dynamic $ARGS[2] + '_bras[<<ARGS[3]>>] = 1'

+ 55 - 57
locations/brother.qsrc

@@ -12,7 +12,7 @@ if (npc_dob['A34'] mod 10000)/100 = month and (npc_dob['A34'] mod 100) > day: br
 if npc_QW['A34'] > 20 and npc_QW['A34'] < 25: npc_QW['A34'] = 20
 
 !! Variables used
-!! brothersawpirsF: Flag 0/1 Have your brother seen your nipple piercings
+!! brotherQW['piercing_nipples']: Flag 0/1 Have your brother seen your nipple piercings
 !! npc_rel['A34']: relationship
 !! npc_dick['A34']: size of brothers dick (14cm)
 !! brotherSex = 1 - You have purposely shown him your tits
@@ -177,7 +177,7 @@ if $ARGS[0] = 'start':
 				act 'Go watch porn':minut += 5 & gt 'seeporn'
 			elseif evgenQW < 4 or kolkaseepornday = daystart:
 				'Your brother grins, "Hi, <<$pcs_nickname>>. Fancy a game of football?"'
-				if $clothingworntype ! 'danilovich_outfits':
+				if PCloSport = 0:
 					'Kolka points at your outfit, "Oh, you can''t play dressed like that! Go put on some sportswear, or just watch us play if you want."'
 				else
 					'He adds, "Or you could just watch us."'
@@ -214,72 +214,70 @@ if $ARGS[0] = 'start':
 					act 'Talk about your relationship': gt 'brother2', 'DTR'
 				end
 			end
-			
+
 		end
 	end
 
 	if $loc = 'sitrPar':
 		gs 'brother', 'brotherSexCount'
 
-		if locat['Fam_inGad'] = 0 and $clothingworntype ! 'nude' and brothersawpirsF=0 and locat['Stepdad'] ! 10 and npc_rel['A34'] > 85 and hour >= 18 and hour < 23 and pirsF > 0:
-			act 'Show off your nipple piercings':
-				*clr & cla
-				gs 'stat'
-				minut+=1
-				pcs_horny += 3
-				brothersawpirsF=1
-				npc_rel['A34'] += 3
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/9vh2v.jpg" ></center>'
-				'"Look what I have," you walk up to Kolka, your chest bare, showing off your nipple piercings. "Don''t be shy, you can touch them."'
-				'Your brother, dumbfounded by your suggestion, hesitantly touches the piercing on one of your nipples, causing you to moan softly.'
-				if brotherSex = 0:
-					'He abruptly withdraws his hand and apologizes for his rudeness. You have no choice but to apologize back; that wasn''t fair. You cover your chest.'
-					gs 'arousal', 'foreplay', 1, 'incest'
+		if locat['Fam_inGad'] = 0 and brotherQW['piercing_nipples'] = 0 and pcs_piercings['nipples'] > 0:
+			if $clothingworntype ! 'nude' and locat['Stepdad'] ! 10 and npc_rel['A34'] > 85 and hour >= 18 and hour < 23:
+				act 'Show off your nipple piercings':
+					*clr & cla
 					gs 'stat'
-				else
-					'Seeing the pleasure playing with your nipples brings you, he begins to play harder with your piercings, sometimes squeezing your exposed breasts.'
-					'After a minute, he releases your <<$titsize>> boobs, saying, "I really like your new additions."'
-					gs 'arousal', 'foreplay', 1, 'incest'
+					minut+=1
+					pcs_horny += 3
+					brotherQW['piercing_nipples'] = 1
+					npc_rel['A34'] += 3
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/kolka/9vh2v.jpg" ></center>'
+					'"Look what I have," you walk up to Kolka, your chest bare, showing off your nipple piercings. "Don''t be shy, you can touch them."'
+					'Your brother, dumbfounded by your suggestion, hesitantly touches the piercing on one of your nipples, causing you to moan softly.'
+					if brotherSex = 0:
+						'He abruptly withdraws his hand and apologizes for his rudeness. You have no choice but to apologize back; that wasn''t fair. You cover your chest.'
+						gs 'arousal', 'foreplay', 1, 'incest'
+						gs 'stat'
+					else
+						'Seeing the pleasure playing with your nipples brings you, he begins to play harder with your piercings, sometimes squeezing your exposed breasts.'
+						'After a minute, he releases your <<$titsize>> boobs, saying, "I really like your new additions."'
+						gs 'arousal', 'foreplay', 1, 'incest'
+						gs 'stat'
+					end
+					gs 'arousal', 'end'
 					gs 'stat'
-				end
-				gs 'arousal', 'end'
-				gs 'stat'
-				act 'Leave':gt 'sitrPar'
-				exit
-			end
-		end
-
-		if locat['Fam_inGad'] = 0 and $clothingworntype = 'nude' and pirsF > 0 and brothersawpirsF = 0:
-			if brotherSex < 4:
-				if npc_rel['A34'] >= 70:
-					'"Looks good on you," your brother winks, and points toward your pierced nipples.'
-					if npc_rel['A34'] <50:npc_rel['A34'] += 1
-					brothersawpirsF=1
-					act 'Leave':gt 'sitrPar'
-					exit
-				else
-					'"I don''t get it, why would you do that to yourself?" Kolka asks, noticing your pierced nipples.'
-					brothersawpirsF=1
 					act 'Leave':gt 'sitrPar'
 					exit
 				end
-			else
-				if locat['Stepdad'] ! 10 and hour >= 18 and hour < 23:
-					'"How lovely," Kolka says as he plays with your pierced nipples.'
-					npc_rel['A34'] += 3
-					brothersawpirsF = 1
-					pcs_horny += 10
-					act 'Leave':gt 'sitrPar'
-					exit
-				elseif locat['Stepdad'] = 10 and hour >= 18 and hour < 23:
-					gs 'arousal','foreplay', 1
-					'"Beautiful," Kolka whispers while gently cupping your breasts and stroking your pierced nipples.'
-					npc_rel['A34'] += 3
-					brothersawpirsF=1
-					pcs_horny += 10
-					gs 'stat'
-					act 'Leave':gt 'sitrPar'
+
+			elseif $clothingworntype = 'nude':
+				if brotherSex < 4:
+					brotherQW['piercing_nipples'] = 1
+					if npc_rel['A34'] >= 70:
+						'"Looks good on you," your brother winks, and points toward your pierced nipples.'
+					else
+						'"I don''t get it, why would you do that to yourself?" Kolka asks, noticing your pierced nipples.'
+						if npc_rel['A34'] < 50: npc_rel['A34'] += 1
+					end
+
+					act 'Leave': gt 'sitrPar'
 					exit
+				else
+					if hour >= 18 and hour < 23:
+						npc_rel['A34'] += 3
+						brotherQW['piercing_nipples'] = 1
+						pcs_horny += 10
+						if locat['Stepdad'] ! 10:
+							'"How lovely," Kolka says as he plays with your pierced nipples.'
+						else
+							'"Beautiful," Kolka whispers while gently cupping your breasts and stroking your pierced nipples.'
+
+							gs 'arousal','foreplay', 1
+							gs 'stat'
+						end
+
+						act 'Leave': gt 'sitrPar'
+						exit
+					end
 				end
 			end
 		end
@@ -799,7 +797,7 @@ if $ARGS[0] = 'brotherSexStart':
 				npc_rel['A34'] += 5
 				gs 'boyStat', 'A34'
 				gs 'cum_call', 'face', 'A34', 1
-				
+
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial21.jpg"></center>'

+ 1 - 1
locations/brother_voyeur.qsrc

@@ -13,7 +13,7 @@ razors_to_use['pussy'] = min(2, max(1, (max(0, pcs_pubes-shave_length))/20))
 razors_to_use['legs']  = min(3, max(1, (pcs_leghair*4)/20))
 
 !! Variables used
-!! brothersawpirsF: Flag 0/1 Have your brother seen your nipple piercings
+!! brotherQW['piercing_nipples']: Flag 0/1 Have your brother seen your nipple piercings
 !! npc_rel['A34']: relationship
 !! npc_dick['A34']: size of brothers dick (14cm)
 !! brotherSex: Number of sexual interactions with brother (cap at 10)

+ 12 - 13
locations/buklinik.qsrc

@@ -1,13 +1,13 @@
 # buklinik
 
 if $ARGS[0] = 'start':
-	$menu_loc = 'buklinik'
-	$menu_arg = 'start'
-	menu_off = 0
 	*clr & cla
-	minut += 5	
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'buklinik', 'start'
+	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
+
 	'<center><b>Mercy clinic</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli.jpg"></center>'
 	'A well-known homeless shelter in a run-down building. Looking above the entrance you can see a sign saying, Mercy Clinic.'
@@ -26,15 +26,14 @@ if $ARGS[0] = 'start':
 	if temp = 10:'Surprisingly, there is no one around the shelter...'
 
 	act 'Leave':gt 'city_industrial'
-	
+
 	if hour >= 9 and hour <= 17: act 'Enter the shelter':gt 'buklinik', 'holl'
 end
 
 if $ARGS[0] = 'holl':
-	$menu_loc = 'buklinik'
-	$menu_arg = 'holl'
-	menu_off = 0
 	*clr & cla
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'buklinik', 'holl'
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
@@ -138,15 +137,15 @@ if $ARGS[0] = 'olga':
 	gs 'themes', 'indoors'
 	'<center><b>Olga</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_olga.jpg"></center>'
-	
+
 	if bumtolik = 5:
 		'You manage to find Olga and walk up to her, "Hi Olga! I don''t know if you remember me, it''s <<$pcs_nickname>>. You told me about this place and that you were looking volunteers and I decided to see if I could help out. The women at the reception told me that I would find you here."'
 		'Olga looks at you, "<<$pcs_nickname>>..., good afternoon! Glad to have you on board! Well as you can see we are swamped so any help is very welcome!" Smiling, she continues, "Since you got sent here that means I''ll be your mentor, feel free to ask me whenever you have a question."'
 		'You nod, "I will do that!"'
 		'Olga, still smiling, "Good, lets start off with a tour. If we start off here, the storage room. Every donation we receive ends up here and gets sorted depending on where they need to end up. Next up the managers'' office!"'
-		
+
 		act 'Visit the managers office':gt 'buklinik', 'sec'
-	
+
 	else
 		'You look around, "Is there someone named Olga here?!"'
 		'A woman looks up, "Right here, honey! And who might you be?"'
@@ -154,7 +153,7 @@ if $ARGS[0] = 'olga':
 		'Olga crosses her arms, "Is that so?! They are keen on sending everyone to me. Well, nothing to worry about, and since you were looking specifically for me, you''re a new volunteer?"'
 		'You nod.'
 		'Olga smiles, "Good, well, lets start off with a tour. If we start off here, the storage room. Every donation we receive ends up here and gets sorted depending on where they need to end up. Next up the managers'' office!"'
-		
+
 		act 'Visit the managers office':gt 'buklinik', 'sec'
 	end
 end
@@ -188,7 +187,7 @@ if $ARGS[0] = 'dir':
 	gs 'themes', 'indoors'
 	'<center><b>Coordinators'' office</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_dir.jpg"></center>'
-	
+
 	if bumtolik = 5:
 		'Olga barges in without even knocking, "And this is our head coordinator Vera..."'
 		'Vera sighs, "Again Olga?! Haven''t I told you to knock when you''re about to enter the and I told you, just call me Vera."'

+ 22 - 21
locations/burger.qsrc

@@ -261,7 +261,7 @@ if $ARGS[0] = 'dishes':
 										gs 'arousal', 'bj', 4, 'sub', 'humiliation'
 										gs 'boyStat', 'A74'
 										gs 'cum_call', 'mouth_swallow', 'A74', 1, 0, 10000, 13
-										
+
 										gs 'cum_call', 'face', 'A74', 1, 0, 10000, 27
 										gs 'stat'
 
@@ -320,7 +320,7 @@ if $ARGS[0] = 'dishes':
 						end
 					else
 						act 'Thank you very much. (Deny) (<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
 			end
 		end
@@ -457,7 +457,7 @@ if $ARGS[0] = 'dishes':
 						end
 					else
 						act 'That''s bullshit! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-					end	
+					end
 					act 'Use your mouth':
 						*clr & cla
 						BurgerQW['Level'] = 55
@@ -487,7 +487,7 @@ if $ARGS[0] = 'dishes':
 				end
 			else
 				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 
 			exit
 		end
@@ -502,7 +502,7 @@ if $ARGS[0] = 'dishes':
 			act 'Crawl under the table':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/diner/sex/bjud.jpg"></center>'
-				'You crawl under the table and Ilyushkin pulls out his penis in front of your face. You wrap your lips around it and begin to suck trying to get it into your mouth as deeply as possible. It is cramped and uncomfortable under the table, but you cope with it and after a few minutes of skilfully sucking him off you get Ilyushkin to release his semen into your mouth. You quickly start to swallow, trying to avoid getting your clothes dirty.'
+				'You crawl under the table and Ilyushkin pulls out his penis in front of your face. You wrap your lips around it and begin to suck trying to get it into your mouth as deeply as possible. It is cramped and uncomfortable under the table, but you cope with it and after a few minutes of skillfully sucking him off you get Ilyushkin to release his semen into your mouth. You quickly start to swallow, trying to avoid getting your clothes dirty.'
 				'Afterwards, Ilyushkin takes out 500 <b>₽</b> and hands them to you.'
 
 				money += 500
@@ -532,7 +532,7 @@ if $ARGS[0] = 'dishes':
 				gs 'boyStat', 'A75'
 				gs 'arousal', 'bj', 3, 'sub'
 				gs 'cum_call', 'mouth_swallow', 'A75', 1
-				
+
 				gs 'cum_call', 'face', 'A75', 1
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -551,12 +551,12 @@ if $ARGS[0] = 'dishes':
 				if will_cost <= pcs_willpwr:
 					act 'Refuse (<<will_cost>> Willpower)':
 						gs 'willpower', 'pay', 'resist'
-						BurgerQW['Level'] = 61 
+						BurgerQW['Level'] = 61
 						gt 'burger', 'start'
 					end
 				else
 					act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
 
 				act 'Yes':
 					*clr & cla
@@ -678,22 +678,23 @@ if $ARGS[0] = 'boss':
 		if BurgerQW['Secretary'] = 2:
 			if week < 6 and hour < 10:'Anatoly Borisovich looks at you sternly, "<<$pcs_nickname>>, you''re fired. Go away, we''re done, I love my wife more than you."'
 		elseif BurgerQW['Secretary'] = 1:
-			if week < 6 and hour < 10 and CloStyle3 = 4:
-				act 'Work':gt 'burgerWork', 'start'
+			if week < 6 and hour < 10:
+				if PCloStyle2 ! 5:
+					'Anatoly Borisovich looks at you sternly, "<<$pcs_nickname>>, why aren''t you dressed properly? Go home and come back tomorrow dressed appropriately, you''re not working today!"'
+				else
+					act 'Work':gt 'burgerWork', 'start'
 
-				act 'Resign':
-					BurgerQW['Secretary'] = 0
-					work = 0
-					minut += 20
+					act 'Resign':
+						BurgerQW['Secretary'] = 0
+						work = 0
+						minut += 20
 
-					gt 'burger', 'start'
+						gt 'burger', 'start'
+					end
 				end
-
-			elseif week < 6 and hour < 10 and CloStyle3 ! 4:
-				'Anatoly Borisovich looks at you sternly, "<<$pcs_nickname>>, why aren''t you dressed properly? Go home and come back tomorrow dressed appropriately, you''re not working today!"'
 			end
 
-		elseif BurgerQW['Secretary'] = 0 and week < 6:
+		elseif week <= 5:
 			if secrDiplom = 1:
 				act 'Show your secretary diploma':
 					*clr & cla
@@ -793,7 +794,7 @@ if $ARGS[0] = 'boss':
 					end
 				else
 					act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-				end	
+				end
 				act 'Get on your knees':
 					*clr & cla
 					money += 300
@@ -830,7 +831,7 @@ if $ARGS[0] = 'boss':
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 
 		act 'Get on your knees':
 			*clr & cla

+ 1 - 1
locations/cardgame_durak.qsrc

@@ -815,7 +815,7 @@ if $ARGS[0] = 'card_game_won_cum_on_girl':
 		npc_sex[$boy] += 1
 
 		'After a few minutes, you find someone. "Alright, <<$loss_npc_name>>, come here", you whisper to him as you drag him out of view.'
-		'You quickly drop to your knees and take his cock in your mouth, giving him a skilful blowjob. The other guys are actually a bit jealous when they see you on your knees before your friend, and pull out their phones to record you:'
+		'You quickly drop to your knees and take his cock in your mouth, giving him a skillful blowjob. The other guys are actually a bit jealous when they see you on your knees before your friend, and pull out their phones to record you:'
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/card/street_event/bj' + rand(1,2) + '.mp4"></video></center>'
 		'When you lick <<$loss_npc_name>> close to his orgasm, he runs to his victim.'
 

+ 1 - 15
locations/cikl.qsrc

@@ -13,18 +13,7 @@ if (masseuse['<<week>>_shift_1'] ! 0 or masseuse['<<week>>_shift_2'] ! 0 or mass
 	masseuse['missed_shift2'] = 1
 end
 
-
-
 !!----------------------------------------------------------------------------
-!! Time calculations
-!! day = day in this month
-!! week = day in the week. 1 == Monday
-!! hour = Full hour in this day
-
-daystart += 1
-hour -= 24
-gs 'daystart'
-
 !! new years party calculation
 if day = 1 and month = 12:
 	temp = func('shortgs','dow',year,12,31)
@@ -47,10 +36,7 @@ if week = 1:
 end
 
 gs 'yearstart'
-transient_evt_day = day
-gs 'emp_functions', 'evt_day_suffix'
-$stat_day_suffix = $evt_suffix
-killvar '$evt_suffix'
+
 !!----------------------------------------------------------------------------
 
 !!Fame call to update all the fame variables

+ 39 - 519
locations/city_clinic.qsrc

@@ -2,21 +2,20 @@
 $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
+	*clr & cla
 	CLOSE ALL
-	$sexloc = 'city_clinic'
-	$loc = 'city_clinic'
-	$loc_arg = 'start'
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'city_clinic', 'start'
 	$location_type = 'indoors'
-	$menu_loc = 'city_clinic'
-	$menu_arg = 'start'
+	$sexloc = 'city_clinic'
+
 	killvar 'temp_small_mbottle_ids'
 	killvar 'temp_medium_mbottle_ids'
-	menu_off = 0
-	*clr & cla
 	hosprand = rand(0, 10)
 	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
+
 	'<center><b><font color="maroon">Clinic</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/clinic/poli.jpg"></center>'
 	'A sign inside the clinic lists some of the services the clinic has to offer:'
@@ -44,7 +43,7 @@ if $ARGS[0] = 'start':
 	if workhosp = 1 and hour >= 8 and hour <= 9 and week < 6:act 'Begin your work day': gt 'city_clinic', 'beginwork'
 
 	act 'Leave the clinic': minut += 5 & gt 'city_residential'
-	act 'See a cosmetic surgeon': gt 'city_clinic','cosmetic1'
+	act 'See a cosmetic surgeon': gt 'city_clinic', 'cosmetic1'
 	if lact_ev['pcs_knows_milkbank'] >= 1:
 		act 'Go to the breast milk donation office': minut += 5 & gt 'city_clinic','milk_donation_room'
 	end
@@ -89,22 +88,7 @@ if $ARGS[0] = 'start':
 
 	act 'Go to the STD clinic': gt 'city_clinic', 'stdclinic'
 
-	if money >= 15000 and preg = 1 and pregchem < 1863 and knowpreg = 1:
-		act 'Get an abortion (15,000 <b>₽</b>)':
-			cla
-			money -= 15000
-
-			'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/abort.jpg"></center>'
-			'You spread out on a gynecological chair at an angle where you can''t see what''s going on. You feel nauseous and violated as a nurse hands you a single aspirin and a glass of muddy-looking water to down it with.'
-
-			gs 'medical_din','abortion'
-
-			minut += 60
-			gs 'stat'
-
-			act 'Return to the entrance': gt 'city_clinic', 'start'
-		end
-	end
+	gs 'clinic_functions', 'set_abortion_act'
 
 	if experimentQW['discovered'] = 1:
 		*nl
@@ -172,192 +156,12 @@ if $ARGS[0] = 'start':
 
 	if katjob > 0: act 'Visit the chief doctor': gt 'city_clinic', 'glavdoc'
 
-	if (pcs_teeth > -1 and (dentistday < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
-		act 'Go to the dentist':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/dentist.jpg"></center>'
-			menu_off = 1
-			minut += 15
-			gs 'stat'
-
-			if pcs_brace = 1:
-				pcs_brace = 0
-				pcs_teeth -= 1
-				'The dentist spends 15 minutes taking off your brace and cleaning up. You look in the mirror afterwards and your teeth are '+iif(pcs_teeth = 0, 'now straight', 'straighter, but can still use some more work.')
-				gs 'AppearanceSystem', 'UpdateBaseAppearance'
-				gs 'stat'
-			else
-				if pcs_missing_teeth = 1:
-					zubpay = 30000
-					'The dentist examines you and says it will cost 3000 <b>₽</b> to replace your tooth.'
-				elseif pcs_missing_teeth > 1:
-					zubpay = pcs_missing_teeth * 30000
-					'The dentist examines you and says it will cost <<pcs_missing_teeth * 30000>> <b>₽</b> to fill the gaps.'
-				elseif pcs_teeth = 0:
-					zubpay = 3000
-					'The dentist examines you and says, it will cost 3000 <b>₽</b> to brighten and polish your teeth.'
-				elseif pcs_teeth > 0:
-					zubpay = 4500
-					'The dentist examinees you and says it will cost 4500 <b>₽</b> to straighten your teeth and that you''ll have to wear a brace for three months. However, he states that he can''t promise they will be completely straight after one treatment.'
-				end
-
-				if money < zubpay and karta + bankDebtLimit < zubpay:
-					*nl
-					'You do not have enough money to fix your teeth.'
-				else
-					if money >= zubpay:
-						act 'Sort out your teeth (cash)':
-							*clr & cla
-							money -= zubpay
-							minut += 60
-							if pcs_missing_teeth > 0:
-								pcs_missing_teeth = 0
-								'You pay the dentist to fix your teeth and he has restored your winning smile within an hour.'
-							elseif pcs_teeth > 0:
-								dentistday = daystart + 180
-								pcs_brace = 1
-								'You pay the dentist to straighten your teeth. After an hour of work, he has attached a brace to your teeth and tells you to come back in six months to have it taken off.'
-							else
-								dentistday = daystart + 90
-								pcs_teeth = -1
-								'You pay the dentist to brighten and polish your teeth and an hour later, your smile is much brighter and more attractive.'
-							end
-							gs 'AppearanceSystem', 'UpdateBaseAppearance'
-							gs 'stat'
-
-							act 'Leave the clinic': minut += 5 & gt 'city_residential'
-						end
-					end
-					if karta + bankDebtLimit >= zubpay:
-						act 'Sort out your teeth (card)':
-							*clr & cla
-							karta -= zubpay
-							minut += 60
-							if pcs_missing_teeth > 0:
-								pcs_missing_teeth = 0
-								'You pay the dentist to fix your teeth and he has restored your winning smile within an hour.'
-							elseif pcs_teeth > 0:
-								dentistday = daystart + 180
-								pcs_brace = 1
-								'You pay the dentist to straighten your teeth. After an hour of work, he has attached a brace to your teeth and tells you to come back in six months to have it taken off.'
-							else
-								dentistday = daystart + 90
-								pcs_teeth = -1
-								'You pay the dentist to brighten and polish your teeth and an hour later, your smile is much brighter and more attractive.'
-							end
-							gs 'AppearanceSystem', 'UpdateBaseAppearance'
-							gs 'stat'
-
-							act 'Leave the clinic': minut += 5 & gt 'city_residential'
-						end
-					end
-				end
-			end
-			act 'Leave the clinic': minut += 5 & gt 'city_residential'
-		end
-	end
-
-	if glassqw = 1:
-		act'Visit the optometrist (0:35)':
-			*clr & cla
-			menu_off = 1
-			minut += 35
-			gs'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/optometrist.jpg"></center>'
-			'The optometrist takes you through a series of tests to measure the condition of your eyes.'
-			'He looks at you as if he has bad news for you. "Well, you probably already expected this, but your vision has deteriorated significantly. You''re going to need glasses to be able to read. The prescription I''m writing for you is for a simple set of rimmed glasses which you can pick up at the front desk before you leave."'
-			'He hands you a piece of paper. "Of course you can get a different pair elsewhere if you want better looking ones, the details for which ones you need are on your prescription. You can also get laser vision correction if you really don''t want to use glasses, but I''m going to be honest with you: that''s a very expensive procedure."'
-			pcs_nerd += 1
-			glassqw = 2
-			glass = 1
-			blizoruk += 1
-			act 'Return to the entrance': gt 'city_clinic', 'start'
-		end
-	end
-
-	if glass > 0:
-		act 'Go to the optometrist':
-			*clr & cla
-			menu_off = 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/optometrist.jpg"></center>'
-			'The optometrist examines your eyes and says that he can perform laser eye surgery for 75,000 <b>₽</b>. Of course, reading books can cause your eyesight to deteriorate again.'
-
-			if glass = 1: 'The optometrist also tells you about the option to buy glasses for 4,500 <b>₽</b>.'
-
-			act 'Return to the entrance': gt 'city_clinic', 'start'
-
-			if glass = 1:
-				if money < 4500 and karta + bankDebtLimit < 4500:
-					*nl
-					'You can''t afford the more stylish glasses.'
-				else
-					if money >= 4500:
-						act 'Buy glasses (4,500 <b>₽</b>) (cash)':
-							cla
-							money -= 4500
-							minut += 60
-							glass = 2
-							gs 'AppearanceSystem', 'UpdateBaseAppearance'
-							gs 'stat'
-							'You buy a new, more stylish pair of glasses.'
-
-							act 'Return to the entrance': gt 'city_clinic', 'start'
-						end
-					end
-					if karta + bankDebtLimit >= 4500:
-						act 'Buy glasses (4,500 <b>₽</b>) (card)':
-							cla
-							karta -= 4500
-							minut += 60
-							glass = 2
-							gs 'AppearanceSystem', 'UpdateBaseAppearance'
-							gs 'stat'
-							'You buy a new, more stylish pair of glasses.'
+	gs 'clinic_functions', 'set_dentist_act'
 
-							act 'Return to the entrance': gt 'city_clinic', 'start'
-						end
-					end
-				end
-			end
-
-			if glass ! 0:
-				if money < 75000 and karta + bankDebtLimit < 75000:
-					*nl
-					'You can''t afford the laser eye correction surgery.'
-				else
-					if money >= 75000:
-						act 'Pay for laser correction (75,000 <b>₽</b>) (cash)':
-							cla
-							money -= 75000
-							minut += 60
-							blizoruk = 0
-							glass = 0
-							gs 'body_desc'
-							gs 'stat'
-							'You undergo laser eye surgery. Your eyesight is much better now.'
-							act 'Return to the entrance': gt 'city_clinic', 'start'
-						end
-					end
-					if karta + bankDebtLimit >= 75000:
-						act 'Pay for laser correction (75,000 <b>₽</b>) (card)':
-							cla
-							karta -= 75000
-							minut += 60
-							blizoruk = 0
-							glass = 0
-							gs 'AppearanceSystem', 'UpdateBaseAppearance'
-							gs 'stat'
-							'You undergo laser eye surgery. Your eyesight is much better now.'
-							act 'Return to the entrance': gt 'city_clinic', 'start'
-						end
-					end
-				end
-			end
-		end
-	end
+	gs 'clinic_functions', 'set_optometrist_acts'
 end
 
+
 if $ARGS[0] = 'stdclinic':
 	$menu_arg = $ARGS[0]
 	menu_off = 0
@@ -381,102 +185,19 @@ if $ARGS[0] = 'stdclinic':
 			gs 'city_clinic', 'stdcheck'
 		end
 	end
-
-	if karta + bankDebtLimit >= 1000:
+	if karta >= 1000:
 		act 'Get tested for STDs (1,000 <b>₽</b>) (card)':
 			karta -= 1000
 			gs 'city_clinic', 'stdcheck'
 		end
 	end
 
-	if GerpesNapr > 0 and GerpesUkolDay ! daystart:
-		if money < 450 and karta + bankDebtLimit < 450: *nl & 'You can''t afford your herpes shot.'
-
-		if money >= 450:
-			act 'Get herpes shot (450 <b>₽</b>) (cash) You need <<GerpesNapr>> more injections to complete the treatment':
-				money -= 450
-				gs 'city_clinic', 'herpes_shot'
-			end
-		end
-
-		if karta + bankDebtLimit >= 450:
-			act 'Get herpes shot (450 <b>₽</b>) (card) You need <<GerpesNapr>> more injections to complete the treatment':
-				karta -= 450
-				gs 'city_clinic', 'herpes_shot'
-			end
-		end
-	end
-
-	if TriperNapr > 0 and TriperUkolDay ! daystart:
-		if money < 750 and karta + bankDebtLimit < 750: *nl & 'You can''t afford your gonorrhea shot.'
-
-		if money >= 750:
-			act 'Get gonorrhea shot (750 <b>₽</b>) (cash) You need <<TriperNapr>> more injections to complete the treatment':
-				money -= 750
-				gs 'city_clinic', 'gonorrhea_shot'
-			end
-		end
-
-		if karta + bankDebtLimit >= 750:
-			act 'Get gonorrhea shot (750 <b>₽</b>) (card) You need <<TriperNapr>> more injections to complete the treatment':
-				karta -= 750
-				gs 'city_clinic', 'gonorrhea_shot'
-			end
-		end
-	end
-
-	if SifNapr = 1:
-		if money < 1000 and karta + bankDebtLimit < 1000: *nl & 'You can''t afford your syphilis shot.'
-
-		if money >= 1000:
-			act 'Get syphilis shot (1,000 <b>₽</b>) (cash)':
-				money -= 1000
-				gs 'city_clinic', 'syphilis_shot'
-			end
-		end
-
-		if karta + bankDebtLimit >= 1000:
-			act 'Get syphilis shot (1,000 <b>₽</b>) (card)':
-				karta -= 1000
-				gs 'city_clinic', 'syphilis_shot'
-			end
-		end
-	end
-
-	if GerpesOnce = 1 and week = 1 and day <= 10:
-		if money < 45000 and karta + bankDebtLimit < 45000: *nl & 'You to go to private clinic and completely cure your herpes.'
-
-		if money >= 45000:
-			act 'Go to private clinic and completely cure your herpes (45,000 <b>₽</b>) (cash)':
-				money -= 45000
-				gs 'city_clinic', 'herpes_cure'
-			end
-		end
-
-		if karta + bankDebtLimit >= 45000:
-			act 'Go to private clinic and completely cure your herpes (45,000 <b>₽</b>) (card)':
-				karta -= 45000
-				gs 'city_clinic', 'herpes_cure'
-			end
-		end
-	end
-
-	if KandidozOnce = 1 and week = 1 and day <= 10:
-		if money < 15000 and karta + bankDebtLimit < 15000: *nl & 'You can''t afford to go to the private clinic and completely cure your yeast infection.'
-
-		if money >= 15000:
-			act 'Go to private clinic and completely cure your yeast infection. (15,000 <b>₽</b>) (cash)':
-				money -= 15000
-				gs 'city_clinic', 'yeast_cure'
-			end
-		end
-
-		if karta + bankDebtLimit >= 15000:
-			act 'Go to private clinic and completely cure your yeast infection. (15,000 <b>₽</b>) (card)':
-				karta -= 15000
-				gs 'city_clinic', 'yeast_cure'
-			end
-		end
+	gs 'clinic_functions', 'set_std_herpes_shot_act'
+	gs 'clinic_functions', 'set_std_gonorrhea_shot_act'
+	gs 'clinic_functions', 'set_std_syphilis_shot_act'
+	if week = 1 and day <= 10:
+		gs 'clinic_functions', 'set_std_herpes_cure_act'
+		gs 'clinic_functions', 'set_std_yeast_cure_act'
 	end
 end
 
@@ -574,45 +295,6 @@ if $ARGS[0] = 'stdcheck':
 	end
 end
 
-if $ARGS[0] = 'herpes_shot':
-	*clr & cla
-	minut += 15
-	GerpesUkolDay = daystart
-	GerpesNapr -= 1
-	gs 'stat'
-	'You see the nurse and she gives you a painful injection in your ass.'
-
-	if GerpesNapr = 0:Gerpes = -10 & 'You have completed the treatment.'
-	act 'Leave': gt 'city_clinic', 'start'
-end
-
-if $ARGS[0] = 'gonorrhea_shot':
-	*clr & cla
-	minut += 15
-	TriperUkolDay = daystart
-	TriperNapr -= 1
-	gs 'stat'
-	'You see the nurse and she gives you a painful injection in your ass.'
-
-	if TriperNapr = 0:TriperOral = 0 & TriperOralSigns = 0 & Triper = 0 & Venera -= 1 & TriperOnce = 0 & 'You have completed the treatment.'
-
-	act 'Leave': gt 'city_clinic', 'start'
-end
-
-if $ARGS[0] = 'syphilis_shot':
-	*clr & cla
-	minut += 60
-	SifNapr = 0
-	SifacOnce = 0
-	Sifilis = 0
-	Venera -= 1
-	gs 'stat'
-	'You see the nurse and she gives you a painful injection in your ass.'
-
-	'"That''s it. You might still feel a little off, but the infection is now cured."'
-
-	act 'Leave': gt 'city_clinic', 'start'
-end
 
 if $ARGS[0] = 'yeast_cure':
 	*clr & cla
@@ -1286,7 +968,9 @@ if $ARGS[0] = '2':
 end
 
 if $ARGS[0] = 'cosmetic1':
-	menu_off = 1
+	gs 'shortgs', 'setloc', 'city_clinic', 'cosmetic1'
+	gs 'stat'
+
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmetic1.jpg"></center>'
 	'You''re greeted by a nurse who explains what procedures are available.'
 	*nl
@@ -1294,197 +978,33 @@ if $ARGS[0] = 'cosmetic1':
 	'"Fillable breast implants allow you to fill them after the surgery. We stock silicone you use to fill them."'
 	'"String implants slowly absorb your body fluids and grow larger over time. We can also drain it for you if it becomes too large."'
 	*nl
-	if money >= 80000 and lashair = 0:
-		'<a href="exec:gt ''city_clinic'', ''electrolysis''">Electrolysis</a> laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
-		else
-		'Electrolysis - laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
-	end
-	if money >= 25000 and pcs_lip < 4:
-		'<a href="exec:gt ''city_clinic'', ''lipPlus''">Lip enlargement surgery</a> - 25,000 <b>₽</b>'
-		else
-		'Lip enlargement surgery - 25,000 <b>₽</b>'
-	end
-	if money >= 30000 and pcs_lip ! 0:
-		'<a href="exec:gt ''city_clinic'', ''lipMin''">Lip reduction surgery</a> - 30,000 <b>₽</b>'
-		else
-		'Lip reduction surgery - 30,000 <b>₽</b>'
-	end
-	if money >= 90000 and pcs_eyesize < 3:
-		'<a href="exec:gt ''city_clinic'', ''eyePlus''">Eye enlargement surgery</a> - 90,000 <b>₽</b>'
-		else
-		'Eye enlargement surgery - 90,000 <b>₽</b>'
-	end
-	if money >= 90000 and pcs_eyesize ! 0:
-		'<a href="exec:gt ''city_clinic'', ''eyeMin''">Eye reduction surgery</a> - 90,000 <b>₽</b>'
-		else
-		'Eye reduction surgery - 90,000 <b>₽</b>'
-	end
-	if money >= 75000 and pcs_mass['body'] > 40:
-		'<a href="exec:gt ''city_clinic'', ''lyposuction''">Liposuction</a> - 75,000 <b>₽</b>'
-		else
-		'Liposuction - 75,000 <b>₽</b>'
-	end
-	''
-	if money >= 90000 and bodyVars['bust_silicone'] ! 0:
-		'<a href="exec:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & gt ''city_clinic'', ''bImplantA''">Remove breast implants</a> - 90,000 <b>₽</b>'
-		else
-		'Remove breast implants - 90,000 <b>₽</b>'
-	end
-	if money >= 170000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 10 & gt ''city_clinic'', ''bImplantA''">Get small breast implants</a> - 170,000 <b>₽</b>'
-		else
-		'Get small breast implants - 170,000 <b>₽</b>'
-	end
-	if money >= 180000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & gt ''city_clinic'', ''bImplantA''">Get medium breast implants</a> - 180,000 <b>₽</b>'
-		else
-		'Get medium breast implants - 180,000 <b>₽</b>'
-	end
-	if money >= 190000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 30 & gt ''city_clinic'', ''bImplantA''">Get large breast implants</a> - 190,000 <b>₽</b>'
-		else
-		'Get large breast implants - 190,000 <b>₽</b>'
-	end
-	if money >= 200000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 40 & gt ''city_clinic'', ''bImplantA''">Get XXL breast implants</a> - 200,000 <b>₽</b>'
-		else
-		'Get XXL breast implants - 200,000 <b>₽</b>'
-	end
-	if money >= 200000 and bodyVars['bust_silicone'] = 0 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & fillimplant = 1 & gt ''city_clinic'', ''bImplantA''">Get fillable implants</a> - 200,000 <b>₽</b>'
-		else
-		'Get fillable implants - 200,000 <b>₽</b>'
-	end
-	if money >= 250000 and bodyVars['bust_silicone'] = 0 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & stringimplant = 1 & gt ''city_clinic'', ''bImplantA''">Get string implants</a> - 250,000 <b>₽</b>'
-		else
-		'Get string implants - 250,000 <b>₽</b>'
-	end
-	if stringimplant = 1 and bodyVars['bust_silicone'] >= 30 and money >= 2000:'<a href="exec: bodyVars[''bust_silicone''] -= 10 & money -= 2000 & MSG ''You drain some of your string implant''">Drain string implant</a> - 2,000 <b>₽</b>'
-	''
-	if money >= 500:
-		'<a href="exec:siliconeBag += 1 & money -= 500 & MSG ''You buy a silicone bag.''">Buy silicone bag</a> - 500 <b>₽</b>'
-		else
-		'Buy silicone bag - 500 <b>₽</b>'
-	end
-
-	act 'Go back': gt 'city_clinic','start'
-end
-
-if $ARGS[0] = 'electrolysis':
-	*clr & cla
-	minut += 120
-	pcs_leghair = 0
-	pcs_pubes = 0
-	lashair = 1
-	money -= 80000
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/electrolysis.jpg"></center>'
-	'The surgeon has you strip completely and lie down on the table. Over the next few hours, you''re treated by a laser over and over again. When the treatment is finished and you get up from the table, your skin feels silky smooth.'
-
-	act 'Continue': gt 'city_clinic', 'cosmetic1'
-end
-
-if $ARGS[0] = 'lipPlus':
-	*clr & cla
-	minut += 60
-	pcs_lip += 1
-	money -= 25000
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
-	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply. We''ll be done before you know it."'
-	'When you wake up, the procedure is complete and your lips are fuller.'
-
-	act 'Continue': gt 'city_clinic', 'cosmetic1'
-end
+	gs 'clinic_functions', 'set_electrolysis_act'
+	gs 'clinic_functions', 'set_lip_enlargement_act'
+	gs 'clinic_functions', 'set_lip_reduction_act'
+	gs 'clinic_functions', 'set_eye_enlargement_act'
+	gs 'clinic_functions', 'set_eye_reduction_act'
+	gs 'clinic_functions', 'set_liposuction_act'
 
-if $ARGS[0] = 'lipMin':
-	*clr & cla
-	minut += 60
-	pcs_lip -= 1
-	money -= 30000
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
-	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply. We''ll be done before you know it."'
-	'When you wake up, the procedure is complete and your lips are thinner.'
+	*nl
 
-	act 'Continue': gt 'city_clinic', 'cosmetic1'
-end
+	gs 'clinic_functions', 'set_remove_breast_implant_act'
+	gs 'clinic_functions', 'set_get_small_breast_implant_act'
+	gs 'clinic_functions', 'set_get_medium_breast_implant_act'
+	gs 'clinic_functions', 'set_get_large_breast_implant_act'
+	gs 'clinic_functions', 'set_get_XXL_breast_implant_act'
+	gs 'clinic_functions', 'set_get_fillable_breast_implant_act'
+	gs 'clinic_functions', 'set_get_string_breast_implant_act'
 
-if $ARGS[0] = 'eyePlus':
-	*clr & cla
-	minut += 60
-	pcs_eyesize += 1
-	money -= 90000
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
-	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply. We''ll be done before you know it."'
-	'When you wake up again, the procedure is complete and your eyes are larger.'
-
-	act 'Continue': gt 'city_clinic', 'cosmetic1'
-end
+	*nl
 
-if $ARGS[0] = 'eyeMin':
-	*clr & cla
-	minut += 60
-	pcs_eyesize -= 1
-	money -= 90000
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
-	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply. We''ll be done before you know it."'
-	'When you wake up, the procedure is complete and your eyes are smaller.'
+	gs 'clinic_functions', 'set_drain_string_breast_implant_act'
+	gs 'clinic_functions', 'set_buy_silicone_bag_act'
 
-	act 'Continue': gt 'city_clinic', 'cosmetic1'
+	act 'Go back': gt 'city_clinic','start'
 end
 
-if $ARGS[0] = 'lyposuction':
-	*clr & cla
-	minut += 60
-	pcs_mass['body'] -= 40
-	if pcs_mass['body'] < 11: pcs_mass['body'] = 11
-	money -= 75000
-	gs 'body', 'softreset'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
-	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply. We''ll be done before you know it."'
-	'When you wake up, the procedure is complete and you''re looking thinner.'
 
-	act 'Continue': gt 'city_clinic', 'cosmetic1'
-end
 
-if $ARGS[0] = 'bImplantA':
-	*clr & cla
-	minut += 60
-	bodyVars['bust_silicone'] = brSurTemp
-	! Get String Implants
-	if stringimplant = 1:
-		money -= 250000
-	! Get Fillable Implants
-	elseif fillimplant = 1:
-		money -= 200000
-	! Get XXL Implants
-	elseif bodyVars['bust_silicone'] = 40:
-		money -= 200000
-	! Get Large Implants
-	elseif bodyVars['bust_silicone'] = 30:
-		money -= 190000
-	! Get Medium Implants
-	elseif bodyVars['bust_silicone'] = 20:
-		money -= 180000
-	! Get Small Implants
-	elseif bodyVars['bust_silicone'] = 10:
-		money -= 170000
-	! Remove any implants
-	elseif bodyVars['bust_silicone'] = 0:
-		money -= 90000
-	end
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
-	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply... we''ll be done before you know it."'
-	'When you wake up again, the procedure is complete and you look down at your new breasts.'
-
-	act 'Continue': gt 'city_clinic', 'cosmetic1'
-end
 
 if $ARGS[0] = 'milk_advertisement':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/milkbank/milk_advertisement.jpg"></center>'

+ 27 - 27
locations/city_hotel.qsrc

@@ -129,38 +129,38 @@ end
 
 if $ARGS[0] = 'pay_the_room':
 	hotel_room_id = ARGS[1]
-	if totalCost<=money:
-		act 'Pay with cash':
-			cla
-			money-=totalCost
-			hotelRoom['city'] = hotel_room_id
-			hotelRoomDays['city'] = daystart + hotelRoomDays['city']
-			'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!"'
-			act 'Step away from the reception desk': gt 'city_hotel'
-			killvar 'totalCost'
-			killvar 'hotel_room_id'
-		end
-	end
-	if totalCost<=karta+bankDebtLimit:
-		act 'Pay with card':
-			cla
-			karta-=totalCost
-			'hotel_room_id: <<hotel_room_id>>'
-			hotelRoom['city'] = hotel_room_id
-			hotelRoomDays['city'] = daystart + hotelRoomDays['city']
-			'You swipe your card and wait a moment for ''APPROVED'' to appear on the tiny screen. As soon as the receipt is printed, she hands it to you with the key to your room. "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!" she says with a smile.'
-			act 'Step away from the reception desk': gt 'city_hotel'
-			killvar 'totalCost'
-			killvar 'hotel_room_id'
-		end
-	end
-
-	if totalCost > karta+bankDebtLimit and totalCost > money:
+	if money < totalCost and karta < totalCost:
 		if ARGS[1] = 1: act 'You can''t afford to stay in the hotel for that long.': gt 'city_hotel'
 		if ARGS[1] = 2: act 'You can''t afford to stay in a luxury room at this hotel for that long.': gt 'city_hotel'
 		if ARGS[1] = 3: act 'You can''t afford to stay in the Royal Suite at this hotel for that long.': gt 'city_hotel'
 		killvar 'totalCost'
 		killvar 'hotel_room_id'
+	else
+		if money >= totalCost:
+			act 'Pay with cash':
+				cla
+				money -= totalCost
+				hotelRoom['city'] = hotel_room_id
+				hotelRoomDays['city'] = daystart + hotelRoomDays['city']
+				'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!"'
+				act 'Step away from the reception desk': gt 'city_hotel'
+				killvar 'totalCost'
+				killvar 'hotel_room_id'
+			end
+		end
+		if karta >= totalCost:
+			act 'Pay with card':
+				cla
+				karta -= totalCost
+				'hotel_room_id: <<hotel_room_id>>'
+				hotelRoom['city'] = hotel_room_id
+				hotelRoomDays['city'] = daystart + hotelRoomDays['city']
+				'You swipe your card and wait a moment for ''APPROVED'' to appear on the tiny screen. As soon as the receipt is printed, she hands it to you with the key to your room. "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!" she says with a smile.'
+				act 'Step away from the reception desk': gt 'city_hotel'
+				killvar 'totalCost'
+				killvar 'hotel_room_id'
+			end
+		end
 	end
 
 	act 'You change your mind':

+ 15 - 18
locations/city_house_res_misc.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'fronty':
 	$menu_arg = 'fronty'
 	$location_type = 'public_outdoors'
 	killvar '$locclass'
-	
+
 	menu_off = 0
 	minut += 1
 	gs 'stat'
@@ -62,7 +62,7 @@ if $ARGS[0] = 'hallw':
 	*clr & cla
 	'<center><b><font color="maroon">Hallway</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_hallway.jpg"></center>'
-	
+
 	gs 'courtletter'
 
 	act 'Go out front':
@@ -77,15 +77,15 @@ if $ARGS[0] = 'hallw':
 
 	'The main hallway of your house. You can visit the different rooms from here.'
 	'There''s a <a href="exec:gt ''mirror'', ''start''">mirror</a> hanging on the wall.'
-	
+
 	if mc_inventory['umbrella'] > 0:'There''s an umbrella hanging on a hook by the door.'
-	
+
 	act 'Go to your bedroom': gt 'city_house_res_bedr', 'bedro'
 	act 'Go to your bathroom': gt 'city_house_res_bathr', 'bathr'
 	act 'Go to your kitchen': gt 'city_house_res_kitch', 'kitch'
 	act 'Go to your living room': gt 'city_house_res_misc', 'livroom'
 	act 'Go to your backyard': gt 'city_house_res_misc', 'backy'
-	
+
 end
 
 !!Small backyard for outdoor working out or maybe gardening?
@@ -95,11 +95,11 @@ if $ARGS[0] = 'backy':
 	$menu_loc = 'city_house_res_misc'
 	$menu_arg = 'backy'
 	$location_type = 'secluded'
-	
+
 	menu_off = 0
 	minut += 1
 	gs 'stat'
-	
+
 	*clr & cla
 	'<center><b><font color="maroon">Living Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_backy.jpg"></center>'
@@ -109,16 +109,13 @@ if $ARGS[0] = 'backy':
 
 	if sunWeather = 1:
 		if pcs_stam >=15 or (pcs_stam >= 10 and mc_inventory['book_yoga'] + mc_inventory['hula_hoop'] > 0):
-			if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
-				*nl
+			*nl
+			if PCloSport = 0:
+				'You could do some exercises here if you were wearing exercise clothes.'
+			else
 				'You can do some exercises here.'
-
 				gs 'wardrobe', 'default_clothing_options'
-
 				act 'Exercise': gt 'exercise', 'workout'
-			else
-				*nl
-				'You could do some exercises here if you were wearing exercise clothes.'
 			end
 		end
 	end
@@ -132,12 +129,12 @@ if $ARGS[0] = 'livroom':
 	$menu_arg = 'livroom'
 	$location_type = 'private'
 	$locclass = 'livingr'
-	
+
 	menu_off = 0
 	minut += 1
 	gs 'stat'
 	gs 'music_actions', 'clear_restrictions'
-	
+
 	*clr & cla
 	'<center><b><font color="maroon">Living Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/house/crh_living.jpg"></center>'
@@ -149,7 +146,7 @@ if $ARGS[0] = 'livroom':
 	!! Computer and internet use.
 	if mc_inventory['tech_computer'] = 1:
 		gs 'internet_mobile', 'get_access'
-		!!TODO: Need to build a check for husband being at home or something.			
+		!!TODO: Need to build a check for husband being at home or something.
 		'There''s a <a href="exec:gt ''Komp'', ''start''">computer</a> sitting on your <a href="exec:gt ''stol'', ''start''">desk</a>.'
 	else
 		'A small <a href="exec:gt ''stol'', ''start''">desk</a> is against the wall.'
@@ -167,7 +164,7 @@ if $ARGS[0] = 'livroom':
 		'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored next to your favorite chair.'
 		*nl
 		if pcs_sewng >= 80:
-			if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0: 
+			if newgobelen = 0 and mc_inventory['sewing_fabric'] > 0:
 				act 'Start a new tapestry': gt 'sewing', 'tapestry'
 			elseif newgobelen >= 1:
 				'Your tapestry is <<newgobelen/10>> percent finished.'

+ 1 - 1
locations/city_mall.qsrc

@@ -85,7 +85,7 @@ end
 if hour > 12 and hour < 18 and sunWeather = 1 and exhibitionQW >= 5 and KsenyaQW = 0 and Kignore ! daystart:
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pushkin/ksenya/mall1.jpg"></center>'
-	'As you approach the mall, you see a beautiful, hot pink Lamborghini before you. It''s top is down and it''s doors are wide open. Inside you see a familiar face. "Hello Ksenya" You say walking up to her.'
+	'As you approach the mall, you see a beautiful, hot pink Ferrari before you. It''s top is down and it''s doors are wide open. Inside you see a familiar face. "Hello Ksenya" You say walking up to her.'
 	'She looks up at you with a smile and steps out of the car. You can see she isn''t wearing her normal exhibition clothes today but with slight movement, you can get a look at her panties as her dress is rather tight and short.'
 
 	act 'Talk to Ksenya':

+ 30 - 30
locations/city_mansion_entrance.qsrc

@@ -7,10 +7,10 @@ if $ARGS[0] = '':
 	$menu_arg = ''
 	menu_off = 0
 	gs 'stat'
-	
+
 	*clr & cla
 	property_construction_status = func('homes_properties', 'get_property_construction_status')
-	property_owned = func('homes_properties', 'is_property_of_status', 'owned', 'matryona_mansion') 
+	property_owned = func('homes_properties', 'is_property_of_status', 'owned', 'matryona_mansion')
 	if property_construction_status = 0:
 		'<center><h4>Your Land</h4></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/o_empty_field.jpg"></center>'
@@ -24,7 +24,7 @@ if $ARGS[0] = '':
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/matryona_mansion.jpg"></center>'
 		'<center>Your fully built mansion stands here. </center>'
 	end
-	
+
 	*nl
 	if car > 0 and cardrive = 18:
 		cardrive = 18
@@ -47,14 +47,14 @@ if $ARGS[0] = '':
 	end
 
 	act 'Go to the suburbs':
-		minut += 10 
+		minut += 10
 		gt 'city_suburbs', 'start'
 	end
 
-	if property_owned: 
+	if property_owned:
 		if property_construction_status = 2  : act 'Walk inside the mansion': minut += 4 & gt 'city_mansion_residence_1', 'yfoyer'
 
-		if karta + bankDebtLimit >= 500000 and property_construction_status = 0:
+		if karta >= 500000 and property_construction_status = 0:
 			act 'Pay for running utilities and the building foundation (500,000 <b>₽</b>)':
 				cls
 				karta -= 500000
@@ -68,7 +68,7 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if karta + bankDebtLimit >= 1500000 and property_construction_status = 1:
+		if karta >= 1500000 and property_construction_status = 1:
 			act 'Pay for the finishing touches on the mansion (1,500,000 <b>₽</b>)':
 				cls
 				karta -= 1500000
@@ -82,7 +82,7 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if karta + bankDebtLimit >= 500000 and property_construction_status = 2 and ymanrem[3] = 0:
+		if karta >= 500000 and property_construction_status = 2 and ymanrem[3] = 0:
 			act 'Pay for the construction of the rooms (500,000 <b>₽</b>)':
 				cls
 				karta -= 500000
@@ -97,7 +97,7 @@ if $ARGS[0] = '':
 		end
 
 		if property_construction_status > 0:
-			if karta + bankDebtLimit >= 800000 and banaMansion = 0:
+			if karta >= 800000 and banaMansion = 0:
 				act 'Pay for the construction of the sauna (800,000 <b>₽</b>)':
 					cls
 					karta -= 800000
@@ -111,7 +111,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if karta + bankDebtLimit >= 500000 and bassMansion = 0:
+			if karta >= 500000 and bassMansion = 0:
 				act 'Pay for the construction of the pool area (500,000 <b>₽</b>)':
 					cls
 					karta -= 500000
@@ -126,7 +126,7 @@ if $ARGS[0] = '':
 			end
 		end
 		if property_construction_status = 2:
-			if karta + bankDebtLimit >= 250000 and ymanrem[3] = 1:
+			if karta >= 250000 and ymanrem[3] = 1:
 				act 'Pay for the renovations of the main hall (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -139,7 +139,7 @@ if $ARGS[0] = '':
 					act 'Leave':gt $curloc
 				end
 
-			elseif karta + bankDebtLimit >= 150000 and ymanrem[3] = 2:
+			elseif karta >= 150000 and ymanrem[3] = 2:
 				act 'Decorate the main hall (150,000 <b>₽</b>)':
 					cls
 					karta -= 150000
@@ -153,7 +153,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if karta + bankDebtLimit >= 250000 and ymanrem[4] = 0:
+			if karta >= 250000 and ymanrem[4] = 0:
 				act 'Pay for the renovations of the bedroom (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -165,7 +165,7 @@ if $ARGS[0] = '':
 
 					act 'Leave':gt $curloc
 				end
-			elseif karta + bankDebtLimit >= 300000 and ymanrem[4] = 1:
+			elseif karta >= 300000 and ymanrem[4] = 1:
 				act 'Decorate the bedroom (300,000 <b>₽</b>)':
 					cls
 					karta -= 300000
@@ -179,7 +179,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if karta + bankDebtLimit >= 250000 and ymanrem[5] = 0:
+			if karta >= 250000 and ymanrem[5] = 0:
 				act 'Pay for the renovations of the bathroom (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -191,7 +191,7 @@ if $ARGS[0] = '':
 
 					act 'Leave':gt $curloc
 				end
-			elseif karta + bankDebtLimit >= 250000 and ymanrem[5] = 1:
+			elseif karta >= 250000 and ymanrem[5] = 1:
 				act 'Decorate the bathroom (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -205,7 +205,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if karta + bankDebtLimit >= 250000 and ymanrem[6] = 0:
+			if karta >= 250000 and ymanrem[6] = 0:
 				act 'Pay for the renovations of the kitchen (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -217,7 +217,7 @@ if $ARGS[0] = '':
 
 					act 'Leave':gt $curloc
 				end
-			elseif karta + bankDebtLimit >= 350000 and ymanrem[6] = 1:
+			elseif karta >= 350000 and ymanrem[6] = 1:
 				act 'Decorate the kitchen (350,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -231,7 +231,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if karta + bankDebtLimit >= 250000 and ymanrem[7] = 0:
+			if karta >= 250000 and ymanrem[7] = 0:
 				act 'Pay for the renovations of the living room (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -243,7 +243,7 @@ if $ARGS[0] = '':
 
 					act 'Leave':gt $curloc
 				end
-			elseif karta + bankDebtLimit >= 250000 and ymanrem[7] = 1:
+			elseif karta >= 250000 and ymanrem[7] = 1:
 				act 'Decorate the living room (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -258,7 +258,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if karta + bankDebtLimit >= 250000 and ymanrem[8] = 0:
+			if karta >= 250000 and ymanrem[8] = 0:
 				act 'Pay for the renovations of the fireplace room (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -270,7 +270,7 @@ if $ARGS[0] = '':
 
 					act 'Leave':gt $curloc
 				end
-			elseif karta + bankDebtLimit >= 250000 and ymanrem[8] = 1:
+			elseif karta >= 250000 and ymanrem[8] = 1:
 				act 'Decorate the fireplace room (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -284,7 +284,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if karta + bankDebtLimit >= 250000 and ymanrem[9] = 0:
+			if karta >= 250000 and ymanrem[9] = 0:
 				act 'Pay for the renovations of the nursery room (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -296,7 +296,7 @@ if $ARGS[0] = '':
 
 					act 'Leave':gt $curloc
 				end
-			elseif karta + bankDebtLimit >= 250000 and ymanrem[9] = 1:
+			elseif karta >= 250000 and ymanrem[9] = 1:
 				act 'Decorate the nursery (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -310,7 +310,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if karta + bankDebtLimit >= 250000 and ymanrem[10] = 0:
+			if karta >= 250000 and ymanrem[10] = 0:
 				act 'Pay for the renovations of the library (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -322,7 +322,7 @@ if $ARGS[0] = '':
 
 					act 'Leave':gt $curloc
 				end
-			elseif karta + bankDebtLimit >= 250000 and ymanrem[10] = 1:
+			elseif karta >= 250000 and ymanrem[10] = 1:
 				act 'Decorate the library (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -336,7 +336,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if karta + bankDebtLimit >= 250000 and ymanrem[11] = 0:
+			if karta >= 250000 and ymanrem[11] = 0:
 				act 'Pay for the renovations of the gym (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -348,7 +348,7 @@ if $ARGS[0] = '':
 
 					act 'Leave':gt $curloc
 				end
-			elseif karta + bankDebtLimit >= 250000 and ymanrem[11] = 1:
+			elseif karta >= 250000 and ymanrem[11] = 1:
 				act 'Decorate the gym (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -362,7 +362,7 @@ if $ARGS[0] = '':
 				end
 			end
 
-			if karta + bankDebtLimit >= 250000 and ymanrem[12] = 0:
+			if karta >= 250000 and ymanrem[12] = 0:
 				act 'Pay for the renovations of the office (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000
@@ -374,7 +374,7 @@ if $ARGS[0] = '':
 
 					act 'Leave':gt $curloc
 				end
-			elseif karta + bankDebtLimit >= 250000 and ymanrem[12] = 1:
+			elseif karta >= 250000 and ymanrem[12] = 1:
 				act 'Decorate the office (250,000 <b>₽</b>)':
 					cls
 					karta -= 250000

+ 1 - 1
locations/city_market.qsrc

@@ -197,7 +197,7 @@ if $ARGS[0] = 'tailor':
 			if money >= 500:
 				act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
 					*clr & cla
-					if CloStyle = 5 or $clothingworntype = 'danilovich_outfits':
+					if PCloStyle = 5 or PCloStyle2 = 6:
 						'The tailor is looking irritatingly at you, "Why are you wasting my time with exercise clothing? That type of clothing does not need to be resized..."'
 					elseif dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') = pcs_hips:
 						'The tailor is looking irritatingly at you, "Is this joke? Your clothes could not fit you better if they had been made for you. I have no time for such foolishness."'

+ 412 - 412
locations/city_musicstore_stock.qsrc

@@ -1,427 +1,427 @@
 # city_musicstore_stock
 
 if $ARGS[0]='electric':
-    *clr & cla
-    $store = 'musicstore'
-    '<center><table border=1>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''electric'', ''store'', ''<<$store>>''">Electric guitars</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''acoustic'', ''store'', ''<<$store>>''">Acoustic guitars</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio Equipment</a></center>
-        </TH>
-    </table></center>'
-    '<center><font size="+4" color="red"><b>Warning: Right now, these guitars have no effect on gameplay!</b></font></center>'
-    '<center><table border=1>
-        <tr>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/burny-rlg55-vld.jpg" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/epiphone-les-paul-express.jpg" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/fender-american-professional-stratocaster.jpg" align="left"></td>
-        </tr>
-        <tr>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/fender-player-tele.jpg" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/gibson-2019-les-paul.jpg" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/yamaha-pacifica-012-rm.jpg" align="left"></td>
-        </tr>
-    </table>
-    </center>' 
-    act 'Leave': gt 'city_musicstore', 'musicshop'
-
-    if karta >= 43990 and  ml_guitars['burny-rlg55-vld'] = 0:
-        act 'Buy the Burny RLG55 VLD with card (43,990 P)': 
-            ml_guitars['burny-rlg55-vld'] = 1
-            karta -= 43990
-            ml_boughtguitar += 1  
-            ml_gigbag = 1
-            gs 'stat'
-            gt 'city_musicstore_stock', 'electric'
-        end        
-    end
-
-    if money >= 43990 and  ml_guitars['burny-rlg55-vld'] = 0:
-        act 'Buy the Burny RLG55 VLD with cash (43,990 P)': 
-            ml_guitars['burny-rlg55-vld'] = 1
-            money -= 43990
-            ml_boughtguitar += 1  
-            ml_gigbag = 1 
-            gs 'stat'         
-            gt 'city_musicstore_stock', 'electric'
-        end        
-    end
-
-    if karta >= 14280  and ml_guitars['epiphone-les-paul-express'] = 0:
-        act 'Buy the Epiphone Les Paul Express with card (14,280 P)': 
-            ml_guitars['epiphone-les-paul-express'] = 1
-            karta -= 14280
-            ml_boughtguitar += 1   
-            ml_gigbag = 1   
-            gs 'stat'      
-            gt 'city_musicstore_stock', 'electric'
-        end        
-    end
-
-    if money >= 14280  and ml_guitars['epiphone-les-paul-express'] = 0:
-        act 'Buy the Epiphone Les Paul Express with cash (14,280 P)': 
-            ml_guitars['epiphone-les-paul-express'] = 1
-            money -= 14280
-            ml_boughtguitar += 1   
-            ml_gigbag = 1
-            gs 'stat'         
-            gt 'city_musicstore_stock', 'electric'
-        end        
-    end
-
-    if karta >= 179000 and ml_guitars['fender-american-professional-stratocaster'] = 0:
-        act 'Buy the Fender American Professional Stratocaster with card (179,000 P)':
-            ml_guitars['fender-american-professional-stratocaster'] = 1
-            karta -= 179000            
-            ml_boughtguitar += 1 
-            ml_hardcase = 1 
-            gs 'stat'          
-            gt 'city_musicstore_stock', 'electric'
-        end
-    end
-
-    if money >= 179000 and ml_guitars['fender-american-professional-stratocaster'] = 0:
-        act 'Buy the Fender American Professional Stratocaster with cash (179,000 P)':
-            ml_guitars['fender-american-professional-stratocaster'] = 1
-            money -= 179000            
-            ml_boughtguitar += 1 
-            ml_hardcase = 1 
-            gs 'stat'          
-            gt 'city_musicstore_stock', 'electric'
-        end
-    end
-
-    if karta >= 83000 and ml_guitars['fender-player-tele'] = 0:
-        act 'Buy the Fender Player Tele with card (83,000 P)':
-            ml_guitars['fender-player-tele'] = 1
-            karta -= 83000
-            ml_boughtguitar += 1            
-            ml_hardcase = 1  
-            gs 'stat'
-            gt 'city_musicstore_stock', 'electric'
-        end
-    end
-
-        if money >= 83000 and ml_guitars['fender-player-tele'] = 0:
-        act 'Buy the Fender Player Tele with cash (83,000 P)':
-            ml_guitars['fender-player-tele'] = 1
-            money -= 83000
-            ml_boughtguitar += 1            
-            ml_hardcase = 1  
-            gs 'stat'
-            gt 'city_musicstore_stock', 'electric'
-        end
-    end
-
-    if karta >= 241000 and ml_guitars['gibson-2019-les-paul'] = 0:
-        act 'Buy the Gibson 2019 Les Paul with card (241,000 P)':
-            ml_guitars['gibson-2019-les-paul'] = 1
-            karta -= 241000
-            ml_boughtguitar += 1  
-            ml_hardcase = 1
-            gs 'stat'            
-            gt 'city_musicstore_stock', 'electric'
-        end        
-    end 
-
-    if money >= 241000 and ml_guitars['gibson-2019-les-paul'] = 0:
-        act 'Buy the Gibson 2019 Les Paul with cash (241,000 P)':
-            ml_guitars['gibson-2019-les-paul'] = 1
-            money -= 241000
-            ml_boughtguitar += 1  
-            ml_hardcase = 1  
-            gs 'stat'          
-            gt 'city_musicstore_stock', 'electric'
-        end        
-    end 
-
-    if karta >= 17990 and ml_guitars['yamaha-pacifica-012-rm'] = 0:
-        act 'Buy the Yamaha Pacifica 012 RM with card (17,900 P)':
-            ml_guitars['yamaha-pacifica-012-rm'] = 1
-            karta -= 17990
-            ml_boughtguitar += 1    
-            ml_gigbag =  1 
-            gs 'stat'       
-            gt 'city_musicstore_stock', 'electric'
-        end
-    end
-
-    if money >= 17990 and ml_guitars['yamaha-pacifica-012-rm'] = 0:
-        act 'Buy the Yamaha Pacifica 012 RM with cash (17,900 P)':
-            ml_guitars['yamaha-pacifica-012-rm'] = 1
-            money -= 17990
-            ml_boughtguitar += 1    
-            ml_gigbag =  1 
-            gs 'stat'       
-            gt 'city_musicstore_stock', 'electric'
-        end
-    end
+	*clr & cla
+	$store = 'musicstore'
+	'<center><table border=1>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''electric'', ''store'', ''<<$store>>''">Electric guitars</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''acoustic'', ''store'', ''<<$store>>''">Acoustic guitars</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio Equipment</a></center>
+		</TH>
+	</table></center>'
+	'<center><font size="+4" color="red"><b>Warning: Right now, these guitars have no effect on gameplay!</b></font></center>'
+	'<center><table border=1>
+		<tr>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/burny-rlg55-vld.jpg" align="left"></td>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/epiphone-les-paul-express.jpg" align="left"></td>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/fender-american-professional-stratocaster.jpg" align="left"></td>
+		</tr>
+		<tr>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/fender-player-tele.jpg" align="left"></td>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/gibson-2019-les-paul.jpg" align="left"></td>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/yamaha-pacifica-012-rm.jpg" align="left"></td>
+		</tr>
+	</table>
+	</center>'
+	act 'Leave': gt 'city_musicstore', 'musicshop'
+
+	if karta >= 43990 and  ml_guitars['burny-rlg55-vld'] = 0:
+		act 'Buy the Burny RLG55 VLD with card (43,990 P)':
+			ml_guitars['burny-rlg55-vld'] = 1
+			karta -= 43990
+			ml_boughtguitar += 1
+			ml_gigbag = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+	if money >= 43990 and  ml_guitars['burny-rlg55-vld'] = 0:
+		act 'Buy the Burny RLG55 VLD with cash (43,990 P)':
+			ml_guitars['burny-rlg55-vld'] = 1
+			money -= 43990
+			ml_boughtguitar += 1
+			ml_gigbag = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+	if karta >= 14280  and ml_guitars['epiphone-les-paul-express'] = 0:
+		act 'Buy the Epiphone Les Paul Express with card (14,280 P)':
+			ml_guitars['epiphone-les-paul-express'] = 1
+			karta -= 14280
+			ml_boughtguitar += 1
+			ml_gigbag = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+	if money >= 14280  and ml_guitars['epiphone-les-paul-express'] = 0:
+		act 'Buy the Epiphone Les Paul Express with cash (14,280 P)':
+			ml_guitars['epiphone-les-paul-express'] = 1
+			money -= 14280
+			ml_boughtguitar += 1
+			ml_gigbag = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+	if karta >= 179000 and ml_guitars['fender-american-professional-stratocaster'] = 0:
+		act 'Buy the Fender American Professional Stratocaster with card (179,000 P)':
+			ml_guitars['fender-american-professional-stratocaster'] = 1
+			karta -= 179000
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+	if money >= 179000 and ml_guitars['fender-american-professional-stratocaster'] = 0:
+		act 'Buy the Fender American Professional Stratocaster with cash (179,000 P)':
+			ml_guitars['fender-american-professional-stratocaster'] = 1
+			money -= 179000
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+	if karta >= 83000 and ml_guitars['fender-player-tele'] = 0:
+		act 'Buy the Fender Player Tele with card (83,000 P)':
+			ml_guitars['fender-player-tele'] = 1
+			karta -= 83000
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+		if money >= 83000 and ml_guitars['fender-player-tele'] = 0:
+		act 'Buy the Fender Player Tele with cash (83,000 P)':
+			ml_guitars['fender-player-tele'] = 1
+			money -= 83000
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+	if karta >= 241000 and ml_guitars['gibson-2019-les-paul'] = 0:
+		act 'Buy the Gibson 2019 Les Paul with card (241,000 P)':
+			ml_guitars['gibson-2019-les-paul'] = 1
+			karta -= 241000
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+	if money >= 241000 and ml_guitars['gibson-2019-les-paul'] = 0:
+		act 'Buy the Gibson 2019 Les Paul with cash (241,000 P)':
+			ml_guitars['gibson-2019-les-paul'] = 1
+			money -= 241000
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+	if karta >= 17990 and ml_guitars['yamaha-pacifica-012-rm'] = 0:
+		act 'Buy the Yamaha Pacifica 012 RM with card (17,900 P)':
+			ml_guitars['yamaha-pacifica-012-rm'] = 1
+			karta -= 17990
+			ml_boughtguitar += 1
+			ml_gigbag =  1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
+
+	if money >= 17990 and ml_guitars['yamaha-pacifica-012-rm'] = 0:
+		act 'Buy the Yamaha Pacifica 012 RM with cash (17,900 P)':
+			ml_guitars['yamaha-pacifica-012-rm'] = 1
+			money -= 17990
+			ml_boughtguitar += 1
+			ml_gigbag =  1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'electric'
+		end
+	end
 end
 
 
 if $ARGS[0]='acoustic':
-    *clr & cla
-    $store = 'musicstore'
-    '<center><table border=1>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''electric'', ''store'', ''<<$store>>''">Electric guitars</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''acoustic'', ''store'', ''<<$store>>''">Acoustic guitars</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio Equipment</a></center>
-        </TH>
-    </table></center>'
-    '<center><font size="+4" color="red"><b>Warning: Right now, these guitars have no effect on gameplay!</b></font></center>'
-    '<center><table border=1>
-        <tr>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-hdc-28e.jpg" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-d10e-01.jpg" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-ed-sheeran.jpg" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-lx-1.jpg" align="left"></td>
-        </tr>
-    </table>
-    </center>'
-    act 'Leave': gt 'city_musicstore', 'musicshop'
-
-    if karta >= 320000 and ml_guitars['martin-hdc-28e'] = 0:
-        act 'Buy the Martin HDC-28E with card (320,000 P)': 
-            ml_guitars['martin-hdc-28e'] = 1
-            karta -= 320000
-            ml_boughtguitar += 1  
-            ml_hardcase = 1 
-            if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1      
-            gs 'stat' 
-            gt 'city_musicstore_stock', 'acoustic'
-        end
-    end
-
-    if money >= 320000 and ml_guitars['martin-hdc-28e'] = 0:
-        act 'Buy the Martin HDC-28E with cash (320,000 P)': 
-            ml_guitars['martin-hdc-28e'] = 1
-            money -= 320000
-            ml_boughtguitar += 1  
-            ml_hardcase = 1 
-            if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1  
-            gs 'stat'     
-            gt 'city_musicstore_stock', 'acoustic'
-        end
-    end    
-
-    if karta >= 81990 and ml_guitars['martin-d10e-01'] = 0:    
-        act 'Buy the Martin D-10E-01 with card (81,990 P)':
-            ml_guitars['martin-d10e-01'] = 1
-            karta -= 81990
-            ml_boughtguitar += 1 
-            ml_hardcase = 1
-            if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1
-            gs 'stat'    
-            gt 'city_musicstore_stock', 'acoustic'
-        end
-    end
-
-    if money >= 81990 and ml_guitars['martin-d10e-01'] = 0:    
-        act 'Buy the Martin D-10E-01 with cash (81,990 P)':
-            ml_guitars['martin-d10e-01'] = 1
-            money -= 81990
-            ml_boughtguitar += 1 
-            ml_hardcase = 1
-            if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1
-            gs 'stat'    
-            gt 'city_musicstore_stock', 'acoustic'
-        end
-    end
-
-    if karta >= 63900 and ml_guitars['martin-ed-sheeran'] = 0:
-        act 'Buy the Martin Ed Sheeran Signature Edition with card (63,900 P)':
-            ml_guitars['martin-ed-sheeran'] = 1
-            karta -= 63900
-            ml_boughtguitar += 1     
-            ml_hardcase = 1
-            if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1  
-            gs 'stat'        
-            gt 'city_musicstore_stock', 'acoustic'
-        end
-    end
-
-    if money >= 63900 and ml_guitars['martin-ed-sheeran'] = 0:
-        act 'Buy the Martin Ed Sheeran Signature Edition with cash (63,900 P)':
-            ml_guitars['martin-ed-sheeran'] = 1
-            money -= 63900
-            ml_boughtguitar += 1     
-            ml_hardcase = 1
-            if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1  
-            gs 'stat'        
-            gt 'city_musicstore_stock', 'acoustic'
-        end
-    end
-
-    if karta >= 41990 and ml_guitars['martin-lx-1'] = 0:
-        act 'Buy the Martin LX-1 with card (41,900 P)': 
-            ml_guitars['martin-lx-1'] = 1
-            karta -= 41900
-            ml_boughtguitar += 1
-            ml_gigbag = 1
-            if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1 
-            gs 'stat'  
-            gt 'city_musicstore_stock', 'acoustic'
-        end
-    end
-
-        if money >= 41990 and ml_guitars['martin-lx-1'] = 0:
-        act 'Buy the Martin LX-1 with cash (41,900 P)': 
-            ml_guitars['martin-lx-1'] = 1
-            money -= 41900
-            ml_boughtguitar += 1
-            ml_gigbag = 1
-            if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1  
-            gs 'stat' 
-            gt 'city_musicstore_stock', 'acoustic'
-        end
-    end
+	*clr & cla
+	$store = 'musicstore'
+	'<center><table border=1>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''electric'', ''store'', ''<<$store>>''">Electric guitars</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''acoustic'', ''store'', ''<<$store>>''">Acoustic guitars</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio Equipment</a></center>
+		</TH>
+	</table></center>'
+	'<center><font size="+4" color="red"><b>Warning: Right now, these guitars have no effect on gameplay!</b></font></center>'
+	'<center><table border=1>
+		<tr>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-hdc-28e.jpg" align="left"></td>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-d10e-01.jpg" align="left"></td>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-ed-sheeran.jpg" align="left"></td>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/martin-lx-1.jpg" align="left"></td>
+		</tr>
+	</table>
+	</center>'
+	act 'Leave': gt 'city_musicstore', 'musicshop'
+
+	if karta >= 320000 and ml_guitars['martin-hdc-28e'] = 0:
+		act 'Buy the Martin HDC-28E with card (320,000 P)':
+			ml_guitars['martin-hdc-28e'] = 1
+			karta -= 320000
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'acoustic'
+		end
+	end
+
+	if money >= 320000 and ml_guitars['martin-hdc-28e'] = 0:
+		act 'Buy the Martin HDC-28E with cash (320,000 P)':
+			ml_guitars['martin-hdc-28e'] = 1
+			money -= 320000
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'acoustic'
+		end
+	end
+
+	if karta >= 81990 and ml_guitars['martin-d10e-01'] = 0:
+		act 'Buy the Martin D-10E-01 with card (81,990 P)':
+			ml_guitars['martin-d10e-01'] = 1
+			karta -= 81990
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'acoustic'
+		end
+	end
+
+	if money >= 81990 and ml_guitars['martin-d10e-01'] = 0:
+		act 'Buy the Martin D-10E-01 with cash (81,990 P)':
+			ml_guitars['martin-d10e-01'] = 1
+			money -= 81990
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'acoustic'
+		end
+	end
+
+	if karta >= 63900 and ml_guitars['martin-ed-sheeran'] = 0:
+		act 'Buy the Martin Ed Sheeran Signature Edition with card (63,900 P)':
+			ml_guitars['martin-ed-sheeran'] = 1
+			karta -= 63900
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'acoustic'
+		end
+	end
+
+	if money >= 63900 and ml_guitars['martin-ed-sheeran'] = 0:
+		act 'Buy the Martin Ed Sheeran Signature Edition with cash (63,900 P)':
+			ml_guitars['martin-ed-sheeran'] = 1
+			money -= 63900
+			ml_boughtguitar += 1
+			ml_hardcase = 1
+			if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'acoustic'
+		end
+	end
+
+	if karta >= 41990 and ml_guitars['martin-lx-1'] = 0:
+		act 'Buy the Martin LX-1 with card (41,900 P)':
+			ml_guitars['martin-lx-1'] = 1
+			karta -= 41900
+			ml_boughtguitar += 1
+			ml_gigbag = 1
+			if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'acoustic'
+		end
+	end
+
+		if money >= 41990 and ml_guitars['martin-lx-1'] = 0:
+		act 'Buy the Martin LX-1 with cash (41,900 P)':
+			ml_guitars['martin-lx-1'] = 1
+			money -= 41900
+			ml_boughtguitar += 1
+			ml_gigbag = 1
+			if ml_guitar['carried'] = 0: ml_guitar['carried'] = 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'acoustic'
+		end
+	end
 end
 
 if $ARGS[0]='amplifier':
-    *clr & cla
-    $store = 'musicstore'
-    '<center><table border=1>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''electric'', ''store'', ''<<$store>>''">Electric guitars</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''acoustic'', ''store'', ''<<$store>>''">Acoustic guitars</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio Equipment</a></center>
-        </TH>
-    </table></center>'
-    '<center><font size="+4" color="red"><b>Warning: Right now, these amplifiers have no effect on gameplay!</b></font></center>'
-    '<center><table border=1>
-        <tr>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/kustom-kg112fx.jpg" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/orange-rocker-32.jpg" align="left"></td>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/blackstar-artisan-15.jpg" align="left"></td>
-        </tr>
-    </table>
-    </center>'
-    act 'Leave': gt 'city_musicstore', 'musicshop'
-    if karta >= 10790 and ml_amplifiers['kustom-kg112fx'] = 0:
-        act 'Buy Kustom KG112FX with card (10,790 P)':
-            ml_amplifiers['kustom-kg112fx'] = 1
-            karta -= 10790
-            ml_boughtamp += 1
-            gs 'stat'
-            gt 'city_musicstore_stock', 'amplifier'
-        end
-    end
-
-    if money >= 10790 and ml_amplifiers['kustom-kg112fx'] = 0:
-        act 'Buy Kustom KG112FX with cash (10,790 P)':
-            ml_amplifiers['kustom-kg112fx'] = 1
-            money -= 10790
-            ml_boughtamp += 1
-            gs 'stat'
-            gt 'city_musicstore_stock', 'amplifier'
-        end
-    end   
-
-    if karta >= 99990 and ml_amplifiers['orange-rocker-32'] = 0:
-        act 'Buy Orange Rocker 32 with card (99,990 P)':
-            ml_amplifiers['orange-rocker-32'] = 1
-            karta -= 99990
-            ml_boughtamp += 1
-            gs 'stat'
-            gt 'city_musicstore_stock', 'amplifier'
-        end
-    end
-
-    if money >= 99990 and ml_amplifiers['orange-rocker-32'] = 0:
-        act 'Buy Orange Rocker 32 with cash (99,990 P)':
-            ml_amplifiers['orange-rocker-32'] = 1
-            money -= 99990
-            ml_boughtamp += 1
-            gs 'stat'
-            gt 'city_musicstore_stock', 'amplifier'
-        end
-    end    
-
-    if karta >= 145900 and ml_amplifiers['blackstar-artisan-15'] = 0:
-        act 'Buy Blackstar Artisan 15 with card (145.900 P)':
-            ml_amplifiers['blackstar-artisan-15'] = 1
-            karta -= 145900
-            ml_boughtamp += 1
-            gs 'stat'
-            gt 'city_musicstore_stock', 'amplifier'
-        end
-    end
-
-        if money >= 145900 and ml_amplifiers['blackstar-artisan-15'] = 0:
-        act 'Buy Blackstar Artisan 15 with cash (145.900 P)':
-            ml_amplifiers['blackstar-artisan-15'] = 1
-            money -= 145900
-            ml_boughtamp += 1
-            gs 'stat'
-            gt 'city_musicstore_stock', 'amplifier'
-        end
-    end
+	*clr & cla
+	$store = 'musicstore'
+	'<center><table border=1>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''electric'', ''store'', ''<<$store>>''">Electric guitars</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''acoustic'', ''store'', ''<<$store>>''">Acoustic guitars</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio Equipment</a></center>
+		</TH>
+	</table></center>'
+	'<center><font size="+4" color="red"><b>Warning: Right now, these amplifiers have no effect on gameplay!</b></font></center>'
+	'<center><table border=1>
+		<tr>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/kustom-kg112fx.jpg" align="left"></td>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/orange-rocker-32.jpg" align="left"></td>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/blackstar-artisan-15.jpg" align="left"></td>
+		</tr>
+	</table>
+	</center>'
+	act 'Leave': gt 'city_musicstore', 'musicshop'
+	if karta >= 10790 and ml_amplifiers['kustom-kg112fx'] = 0:
+		act 'Buy Kustom KG112FX with card (10,790 P)':
+			ml_amplifiers['kustom-kg112fx'] = 1
+			karta -= 10790
+			ml_boughtamp += 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'amplifier'
+		end
+	end
+
+	if money >= 10790 and ml_amplifiers['kustom-kg112fx'] = 0:
+		act 'Buy Kustom KG112FX with cash (10,790 P)':
+			ml_amplifiers['kustom-kg112fx'] = 1
+			money -= 10790
+			ml_boughtamp += 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'amplifier'
+		end
+	end
+
+	if karta >= 99990 and ml_amplifiers['orange-rocker-32'] = 0:
+		act 'Buy Orange Rocker 32 with card (99,990 P)':
+			ml_amplifiers['orange-rocker-32'] = 1
+			karta -= 99990
+			ml_boughtamp += 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'amplifier'
+		end
+	end
+
+	if money >= 99990 and ml_amplifiers['orange-rocker-32'] = 0:
+		act 'Buy Orange Rocker 32 with cash (99,990 P)':
+			ml_amplifiers['orange-rocker-32'] = 1
+			money -= 99990
+			ml_boughtamp += 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'amplifier'
+		end
+	end
+
+	if karta >= 145900 and ml_amplifiers['blackstar-artisan-15'] = 0:
+		act 'Buy Blackstar Artisan 15 with card (145.900 P)':
+			ml_amplifiers['blackstar-artisan-15'] = 1
+			karta -= 145900
+			ml_boughtamp += 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'amplifier'
+		end
+	end
+
+		if money >= 145900 and ml_amplifiers['blackstar-artisan-15'] = 0:
+		act 'Buy Blackstar Artisan 15 with cash (145.900 P)':
+			ml_amplifiers['blackstar-artisan-15'] = 1
+			money -= 145900
+			ml_boughtamp += 1
+			gs 'stat'
+			gt 'city_musicstore_stock', 'amplifier'
+		end
+	end
 end
 
 if $ARGS[0]='studio':
-    *clr & cla
-    $store = 'musicstore'
-    '<center><table border=1>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''electric'', ''store'', ''<<$store>>''">Electric guitars</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''acoustic'', ''store'', ''<<$store>>''">Acoustic guitars</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
-        </TH>
-        <TH>
-            <center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio Equipment</a></center>
-        </TH>
-    </table></center>'
-
-    '<center><table border=1>
-        <tr>
-            <td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/home-studio.jpg" align="left"></td>
-        </tr>
-    </table>
-    </center>'
-    act 'Leave': gt 'city_musicstore', 'musicshop'
-    if karta >= 19980 and ml_studio['scarlet-3rd-gen'] = 0:
-        act 'Buy Focusrite Scarlett Solo Studio 3rd Gen with card (19,980 P)':
-            ml_studio['scarlet-3rd-gen'] = 1
-            karta -= 19980
-            gs 'stat'
-            gt 'city_musicstore_stock', 'studio'
-        end
-    end
-
-    if money >= 19980 and ml_studio['scarlet-3rd-gen'] = 0:
-        act 'Buy Focusrite Scarlett Solo Studio 3rd Gen  with cash (19,980 P)':
-            ml_studio['scarlet-3rd-gen'] = 1
-            money -= 19980
-            gs 'stat'
-            gt 'city_musicstore_stock', 'studio'
-        end
-    end
+	*clr & cla
+	$store = 'musicstore'
+	'<center><table border=1>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''electric'', ''store'', ''<<$store>>''">Electric guitars</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''acoustic'', ''store'', ''<<$store>>''">Acoustic guitars</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''amplifier'', ''store'', ''<<$store>>''">Amplifiers</a></center>
+		</TH>
+		<TH>
+			<center><a href="exec:gs ''city_musicstore_stock'', ''studio'', ''store'', ''<<$store>>''">Studio Equipment</a></center>
+		</TH>
+	</table></center>'
+
+	'<center><table border=1>
+		<tr>
+			<td><img src="images/locations/city/citycenter/mall/musicstore/musictorestock/home-studio.jpg" align="left"></td>
+		</tr>
+	</table>
+	</center>'
+	act 'Leave': gt 'city_musicstore', 'musicshop'
+	if karta >= 19980 and ml_studio['scarlet-3rd-gen'] = 0:
+		act 'Buy Focusrite Scarlett Solo Studio 3rd Gen with card (19,980 P)':
+			ml_studio['scarlet-3rd-gen'] = 1
+			karta -= 19980
+			gs 'stat'
+			gt 'city_musicstore_stock', 'studio'
+		end
+	end
+
+	if money >= 19980 and ml_studio['scarlet-3rd-gen'] = 0:
+		act 'Buy Focusrite Scarlett Solo Studio 3rd Gen  with cash (19,980 P)':
+			ml_studio['scarlet-3rd-gen'] = 1
+			money -= 19980
+			gs 'stat'
+			gt 'city_musicstore_stock', 'studio'
+		end
+	end
 end
 --- city_musicstore_stock ---------------------------------

+ 1 - 1
locations/city_nightclub.qsrc

@@ -802,7 +802,7 @@ if $ARGS[0] = 'lezbsort1':
 	menu_off = 1
 	'<center><b><font color="maroon">WC</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nightclub/sex/sortukuni.jpg"></center>'
-	'You remove her pants and she sits on the toilet before spreading her legs. You passionately lick her pussy as she moans heavily and plays with her erect nipples. Some time later, you make her cum.'
+	'You remove her pants and she sits on the toilet before spreading her legs. You passionately lick her pussy as she moans heavily and plays with her erect nipples. Sometime later, you make her cum.'
 	gs 'dinSex', 'std_trigger'
 	gs 'arousal', 'cuni_give', 10, 'sub', 'lesbian'
 	gs 'stat'

+ 2 - 2
locations/city_park.qsrc

@@ -120,7 +120,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if hour >= 6 and hour <= 22 and parkrunday ! daystart:
-		if $clothingworntype ! 'danilovich_outfits' or $shoeworntype ! 'danilovich':
+		if PCloSport = 0:
 			'You could go for a run in the park if you were wearing sports clothes and shoes.'
 		elseif pcs_energy < 5:
 			act 'Go for a run in the park (1:00)': '<br><font color="red">You are so hungry you cannot face going for a run.</font>'
@@ -595,7 +595,7 @@ if $ARGS[0] = 'rape1':
 
 	act 'Try to resist':
 		cla
-		'You try everything that''s possible in your situation to resist him, but he just tightens his grip and doesn''t stop fucking you. Some time later, he begins to groan and you feel his hot cum flowing inside your pussy. You just hope to yourself that he didn''t impregnate you. He then zips up his pants, takes your money, and leaves.'
+		'You try everything that''s possible in your situation to resist him, but he just tightens his grip and doesn''t stop fucking you. Sometime later, he begins to groan and you feel his hot cum flowing inside your pussy. You just hope to yourself that he didn''t impregnate you. He then zips up his pants, takes your money, and leaves.'
 		gs 'arousal', 15, 'vaginal', 'rape', 'rough'
 		gs 'cum_call'
 		gs 'arousal', 'end'

+ 1 - 1
locations/city_sauna.qsrc

@@ -112,7 +112,7 @@ if $ARGS[0] = 'saunaroom':
 	end
 	*nl
 
-	'Your <a href="exec:gt ''alarmclock'', ''start''">alarm clock</a> is set to <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerH''], alarmVars[''timerM''])>> during the week and <<func(''alarmclock'', ''alarm_display'', alarmVars[''timerEndH''], alarmVars[''timerEndM''])>> during the weekend. It is currently turned ' + iif(alarmVars['alarmOn'] = 0, '<a href="exec: alarmVars[''alarmOn''] = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: alarmVars[''alarmOn''] = 0 & gt $loc, $loc_arg">ON</a>.')
+	func('alarmclock', 'base_alarmclock_text')
 
 	*nl
 

+ 1 - 1
locations/city_saunawhore.qsrc

@@ -91,7 +91,7 @@ if $ARGS[0] = 'saunawork':
 			gs 'stat'
 			'You explain how you feel nauseous and have pain in your pubic area. The nurse checks you over and eventually comes to a conclusion.'
 			'"I think it might be toxic shock. We''ll have to get you sorted out. Wait here I''ll call the doctor."'
-			act 'Some time later':
+			act 'Sometime later':
 				cla
 				minut += 15
 				gs 'cum_cleanup', 'cleanloc', 17

+ 764 - 0
locations/clinic_functions.qsrc

@@ -0,0 +1,764 @@
+# clinic_functions
+
+if $ARGS[0] = 'set_abortion_act':
+	if preg = 1 and pregchem < 1863 and knowpreg = 1:
+		if max(money, karta) < 15000:
+			act 'Get an abortion (<font color="red">15,000 <b>₽</b></font>)': '<br><font color="red">You don''t have enough money to have an abortion.</font>'
+		else
+			act 'Get an abortion (15,000 <b>₽</b>)':
+				cla
+				if money >= 15000:
+					act 'Pay in cash':
+						xgt 'clinic_functions', 'get_abortion', 'money'
+					end
+				end
+				if karta >= 15000:
+					act 'Pay with card':
+						xgt 'clinic_functions', 'get_abortion', 'karta'
+					end
+				end
+				act 'Return to the entrance': gt $loc, $loc_arg
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'get_abortion':
+	if $ARGS[1] = 'money':
+		money -= 15000
+	else
+		karta -= 15000
+	end
+
+	minut += 60
+	if $region = 'city':
+		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/abort.jpg"></center>'
+	end
+	'You spread out on a gynecological chair at an angle where you can''t see what''s going on. You feel nauseous and violated as a nurse hands you a single aspirin and a glass of muddy-looking water to down it with.'
+
+	gs 'medical_din', 'abortion'
+
+	gs 'stat'
+	act 'Return to the entrance': gt $loc, $loc_arg
+end
+
+
+
+if $ARGS[0] = 'set_dentist_act':
+	if (pcs_teeth > -1 and (dentistday < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
+		act 'Go to the dentist':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/dentist.jpg"></center>'
+			menu_off = 1
+			minut += 15
+			gs 'stat'
+
+			if pcs_brace = 1:
+				pcs_brace = 0
+				pcs_teeth -= 1
+				'The dentist spends 15 minutes taking off your brace and cleaning up. You look in the mirror afterwards and your teeth are '+iif(pcs_teeth = 0, 'now straight', 'straighter, but can still use some more work.')
+				gs 'AppearanceSystem', 'UpdateBaseAppearance'
+				gs 'stat'
+			else
+				if pcs_missing_teeth = 1:
+					zubpay = 30000
+					'The dentist examines you and says it will cost 3000 <b>₽</b> to replace your tooth.'
+				elseif pcs_missing_teeth > 1:
+					zubpay = pcs_missing_teeth * 30000
+					'The dentist examines you and says it will cost <<pcs_missing_teeth * 30000>> <b>₽</b> to fill the gaps.'
+				elseif pcs_teeth = 0:
+					zubpay = 3000
+					'The dentist examines you and says, it will cost 3000 <b>₽</b> to brighten and polish your teeth.'
+				elseif pcs_teeth > 0:
+					zubpay = 4500
+					'The dentist examinees you and says it will cost 4500 <b>₽</b> to straighten your teeth and that you''ll have to wear a brace for three months. However, he states that he can''t promise they will be completely straight after one treatment.'
+				end
+
+				if max(money, karta) < zubpay:
+					*nl
+					'You do not have enough money to fix your teeth.'
+				else
+					dynamic "
+						if money >= <<zubpay>>:
+							act 'Sort out your teeth (<<zubpay>> <b>₽</b>) (cash)':
+								xgt 'clinic_functions', 'fix_teeth', <<zubpay>>, 'money'
+							end
+						end
+						if karta >= <<zubpay>>:
+							act 'Sort out your teeth (<<zubpay>> <b>₽</b>) (card)':
+								xgt 'clinic_functions', 'fix_teeth', <<zubpay>>, 'karta'
+							end
+						end
+					"
+				end
+				killvar 'zubpay'
+			end
+
+			act 'Return to the entrance': gt $loc, $loc_arg
+		end
+	end
+end
+
+if $ARGS[0] = 'fix_teeth':
+	act 'Return to the entrance': gt $loc, $loc_arg
+
+	if $ARGS[2] = 'money':
+		money -= ARGS[1]
+	else
+		karta -= ARGS[1]
+	end
+
+	minut += 60
+	if pcs_missing_teeth > 0:
+		pcs_missing_teeth = 0
+		'You pay the dentist to fix your teeth and he has restored your winning smile within an hour.'
+	elseif pcs_teeth > 0:
+		dentistday = daystart + 180
+		pcs_brace = 1
+		'You pay the dentist to straighten your teeth. After an hour of work, he has attached a brace to your teeth and tells you to come back in six months to have it taken off.'
+	else
+		dentistday = daystart + 90
+		pcs_teeth = -1
+		'You pay the dentist to brighten and polish your teeth and an hour later, your smile is much brighter and more attractive.'
+	end
+	gs 'AppearanceSystem', 'UpdateBaseAppearance'
+	gs 'stat'
+end
+
+
+
+if $ARGS[0] = 'set_optometrist_acts':
+	if glassqw = 1:
+		act 'Visit the optometrist (0:35)':
+			*clr & cla
+			menu_off = 1
+			minut += 35
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/optometrist.jpg"></center>'
+			'The optometrist takes you through a series of tests to measure the condition of your eyes.'
+			'He looks at you as if he has bad news for you. "Well, you probably already expected this, but your vision has deteriorated significantly. You''re going to need glasses to be able to read. The prescription I''m writing for you is for a simple set of rimmed glasses which you can pick up at the front desk before you leave."'
+			'He hands you a piece of paper. "Of course you can get a different pair elsewhere if you want better looking ones, the details for which ones you need are on your prescription. You can also get laser vision correction if you really don''t want to use glasses, but I''m going to be honest with you: that''s a very expensive procedure."'
+			pcs_nerd += 1
+			glassqw = 2
+			glass = 1
+			blizoruk += 1
+			act 'Return to the entrance': gt $loc, $loc_arg
+		end
+	end
+
+	if glass > 0:
+		act 'Go to the optometrist':
+			*clr & cla
+			menu_off = 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/optometrist.jpg"></center>'
+			'The optometrist examines your eyes and says that he can perform laser eye surgery for 75,000 <b>₽</b>. Of course, reading books can cause your eyesight to deteriorate again.'
+
+			if glass = 1: 'The optometrist also tells you about the option to buy glasses for 4,500 <b>₽</b>.'
+
+			act 'Return to the entrance': gt $loc, $loc_arg
+
+			if glass = 1:
+				if max(money, karta) < 4500:
+					*nl
+					'You can''t afford the more stylish glasses.'
+				else
+					if money >= 4500:
+						act 'Buy glasses (4,500 <b>₽</b>) (cash)':
+							xgt 'clinic_functions', 'buy_stylish_glasses', 'money'
+						end
+					end
+					if karta >= 4500:
+						act 'Buy glasses (4,500 <b>₽</b>) (card)':
+							xgt 'clinic_functions', 'buy_stylish_glasses', 'karta'
+						end
+					end
+				end
+			end
+
+			if glass ! 0:
+				if max(money, karta) < 75000:
+					*nl
+					'You can''t afford the laser eye correction surgery.'
+				else
+					if money >= 75000:
+						act 'Pay for laser correction (75,000 <b>₽</b>) (cash)':
+							xgt 'clinic_functions', 'buy_laser_correction', 'money'
+						end
+					end
+					if karta >= 75000:
+						act 'Pay for laser correction (75,000 <b>₽</b>) (card)':
+							xgt 'clinic_functions', 'buy_laser_correction', 'karta'
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'buy_stylish_glasses':
+	if $ARGS[1] = 'money':
+		money -= 4500
+	else
+		karta -= 4500
+	end
+	minut += 60
+	glass = 2
+	gs 'AppearanceSystem', 'UpdateBaseAppearance'
+	gs 'stat'
+	'You buy a new, more stylish pair of glasses.'
+
+	act 'Return to the entrance': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'buy_laser_correction':
+	if $ARGS[1] = 'money':
+		money -= 75000
+	else
+		karta -= 75000
+	end
+	minut += 60
+	blizoruk = 0
+	glass = 0
+	gs 'body_desc'
+	gs 'stat'
+	'You undergo laser eye surgery. Your eyesight is much better now.'
+	act 'Return to the entrance': gt $loc, $loc_arg
+end
+
+
+
+
+if $ARGS[0] = 'set_std_herpes_shot_act':
+	if GerpesNapr > 0 and GerpesUkolDay ! daystart:
+		if max(money, karta) < 450:
+			*nl
+			'You can''t afford your herpes shot.'
+		else
+			if money >= 450:
+				act 'Get herpes shot (450 <b>₽</b>) (cash) You need <<GerpesNapr>> more injections to complete the treatment':
+					money -= 450
+					xgt 'clinic_functions', 'herpes_shot'
+				end
+			end
+			if karta >= 450:
+				act 'Get herpes shot (450 <b>₽</b>) (card) You need <<GerpesNapr>> more injections to complete the treatment':
+					karta -= 450
+					xgt 'clinic_functions', 'herpes_shot'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'set_std_gonorrhea_shot_act':
+	if TriperNapr > 0 and TriperUkolDay ! daystart:
+		if max(money, karta) < 750:
+			*nl
+			'You can''t afford your gonorrhea shot.'
+		else
+			if money >= 750:
+				act 'Get gonorrhea shot (750 <b>₽</b>) (cash) You need <<TriperNapr>> more injections to complete the treatment':
+					money -= 750
+					xgt 'clinic_functions', 'gonorrhea_shot'
+				end
+			end
+			if karta >= 750:
+				act 'Get gonorrhea shot (750 <b>₽</b>) (card) You need <<TriperNapr>> more injections to complete the treatment':
+					karta -= 750
+					xgt 'clinic_functions', 'gonorrhea_shot'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'set_std_syphilis_shot_act':
+	if SifNapr = 1:
+		if max(money, karta) < 1000:
+			*nl
+			'You can''t afford your syphilis shot.'
+		else
+			if money >= 1000:
+				act 'Get syphilis shot (1,000 <b>₽</b>) (cash)':
+					money -= 1000
+					xgt 'clinic_functions', 'syphilis_shot'
+				end
+			end
+			if karta >= 1000:
+				act 'Get syphilis shot (1,000 <b>₽</b>) (card)':
+					karta -= 1000
+					xgt 'clinic_functions', 'syphilis_shot'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'set_std_herpes_cure_act':
+	if GerpesOnce = 1 and week = 1 and day <= 10:
+		if max(money, karta) < 45000:
+			*nl
+			'You to go to private clinic and completely cure your herpes.'
+		else
+			if money >= 45000:
+				act 'Go to private clinic and completely cure your herpes (45,000 <b>₽</b>) (cash)':
+					money -= 45000
+					xgt 'clinic_functions', 'herpes_cure'
+				end
+			end
+			if karta >= 45000:
+				act 'Go to private clinic and completely cure your herpes (45,000 <b>₽</b>) (card)':
+					karta -= 45000
+					xgt 'clinic_functions', 'herpes_cure'
+				end
+			end
+		end
+	end
+end
+if $ARGS[0] = 'set_std_yeast_cure_act':
+	if KandidozOnce = 1:
+		if max(money, karta) < 15000:
+			*nl
+			'You can''t afford to go to the private clinic and completely cure your yeast infection.'
+		else
+			if money >= 15000:
+				act 'Go to private clinic and completely cure your yeast infection. (15,000 <b>₽</b>) (cash)':
+					money -= 15000
+					xgt 'clinic_functions', 'yeast_cure'
+				end
+			end
+			if karta >= 15000:
+				act 'Go to private clinic and completely cure your yeast infection. (15,000 <b>₽</b>) (card)':
+					karta -= 15000
+					xgt 'clinic_functions', 'yeast_cure'
+				end
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'herpes_shot':
+	*clr & cla
+	minut += 15
+	GerpesUkolDay = daystart
+	GerpesNapr -= 1
+	gs 'stat'
+	'You see the nurse and she gives you a painful injection in your ass.'
+
+	if GerpesNapr = 0:Gerpes = -10 & 'You have completed the treatment.'
+	act 'Leave': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'gonorrhea_shot':
+	*clr & cla
+	minut += 15
+	TriperUkolDay = daystart
+	TriperNapr -= 1
+	gs 'stat'
+	'You see the nurse and she gives you a painful injection in your ass.'
+
+	if TriperNapr = 0:TriperOral = 0 & TriperOralSigns = 0 & Triper = 0 & Venera -= 1 & TriperOnce = 0 & 'You have completed the treatment.'
+
+	act 'Leave': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'syphilis_shot':
+	*clr & cla
+	minut += 60
+	SifNapr = 0
+	SifacOnce = 0
+	Sifilis = 0
+	Venera -= 1
+	gs 'stat'
+	'You see the nurse and she gives you a painful injection in your ass.'
+	'"That''s it. You might still feel a little off, but the infection is now cured."'
+
+	act 'Leave': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'yeast_cure':
+	*clr & cla
+	menu_off = 1
+	day += 3
+	week += 3
+	KandidozOnce = 0
+	Kandidoz = 0
+	gs 'stat'
+	'There''s an ambulance waiting outside. It drives you to a cutting edge medical facility, where you spend 3 days being treated and pampered.'
+	'After a long recovery, you have been completely cured of your yeast infection.'
+
+	act 'Leave': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'herpes_cure':
+	*clr & cla
+	menu_off = 1
+	day += 3
+	week += 3
+	GerpesOnce = 0
+	Gerpes = 0
+	OrHerpes = 0
+	GenHerpes = 0
+	Venera -= 1
+	gs 'stat'
+	'There''s an ambulance waiting outside. It drives you to a cutting edge medical facility, where you spend 3 days being treated and pampered.'
+	'After a long recovery, you have been completely cured of your herpes.'
+
+	act 'Leave': gt $loc, $loc_arg
+end
+
+
+
+if $ARGS[0] = 'set_electrolysis_act':
+	if lashair = 0:
+		if max(money, karta) >= 80000:
+			'<a href="exec: gt ''clinic_functions'', ''electrolysis''">Electrolysis</a> laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
+		else
+			'Electrolysis - laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
+		end
+	else
+		'Electrolysis - laser hair removal of legs and pubic area - 80,000 <b>₽</b> - You have no hair to remove.'
+	end
+end
+if $ARGS[0] = 'set_lip_enlargement_act':
+	if pcs_lip < 4:
+		if max(money, karta) >= 25000:
+			'<a href="exec: gt ''clinic_functions'', ''lipPlus''">Lip enlargement surgery</a> - 25,000 <b>₽</b>'
+		else
+			'Lip enlargement surgery - 25,000 <b>₽</b>'
+		end
+	else
+		'Lip enlargement surgery - 25,000 <b>₽</b> - Your lips are already big.'
+	end
+end
+if $ARGS[0] = 'set_lip_reduction_act':
+	if pcs_lip > 0:
+		if max(money, karta) >= 30000:
+			'<a href="exec: gt ''clinic_functions'', ''lipMin''">Lip reduction surgery</a> - 30,000 <b>₽</b>'
+		else
+			'Lip reduction surgery - 30,000 <b>₽</b>'
+		end
+	else
+		'Lip reduction surgery - 30,000 <b>₽</b> - Your lips are already thin'
+	end
+end
+if $ARGS[0] = 'set_eye_enlargement_act':
+	if pcs_eyesize < 3:
+		if max(money, karta) >= 90000:
+			'<a href="exec: gt ''clinic_functions'', ''eyePlus''">Eye enlargement surgery</a> - 90,000 <b>₽</b>'
+		else
+			'Eye enlargement surgery - 90,000 <b>₽</b>'
+		end
+	else
+		'Eye enlargement surgery - 90,000 <b>₽</b> - Your eyes are already big.'
+	end
+end
+if $ARGS[0] = 'set_eye_reduction_act':
+	if pcs_eyesize > 0:
+		if max(money, karta) >= 90000:
+			'<a href="exec: gt ''clinic_functions'', ''eyeMin''">Eye reduction surgery</a> - 90,000 <b>₽</b>'
+		else
+			'Eye reduction surgery - 90,000 <b>₽</b>'
+		end
+	else
+		'Eye reduction surgery - 90,000 <b>₽</b> - Your eyes are already small.'
+	end
+end
+if $ARGS[0] = 'set_liposuction_act':
+	if pcs_mass['body'] > 40:
+		if max(money, karta) >= 75000:
+			'<a href="exec: gt ''clinic_functions'', ''lyposuction''">Liposuction</a> - 75,000 <b>₽</b>'
+		else
+			'Liposuction - 75,000 <b>₽</b>'
+		end
+	else
+		'Liposuction - 75,000 <b>₽</b> - You''re already thin.'
+	end
+end
+
+if $ARGS[0] = 'set_remove_breast_implant_act':
+	if bodyVars['bust_silicone'] ! 0:
+		if max(money, karta) >= 90000:
+			'<a href="exec: stringimplant = 0 & fillimplant = 0 & gt ''clinic_functions'', ''bImplantA'', 0">Remove breast implants</a> - 90,000 <b>₽</b>'
+		else
+			'Remove breast implants - 90,000 <b>₽</b>'
+		end
+	else
+		'Remove breast implants - 90,000 <b>₽</b> - You have no breast implants.'
+	end
+end
+if $ARGS[0] = 'set_get_small_breast_implant_act':
+	if fillimplant = 0 and stringimplant = 0:
+		if max(money, karta) >=  170000:
+			'<a href="exec: gt ''clinic_functions'', ''bImplantA'', 10">Get small breast implants</a> - 170,000 <b>₽</b>'
+		else
+			'Get small breast implants - 170,000 <b>₽</b>'
+		end
+	else
+		'Get small breast implants - 170,000 <b>₽</b> - You already have ' + iif(fillimplant = 1, 'fillable', 'string') + ' implants.'
+	end
+end
+if $ARGS[0] = 'set_get_medium_breast_implant_act':
+	if fillimplant = 0 and stringimplant = 0:
+		if max(money, karta) >=  180000:
+			'<a href="exec: gt ''clinic_functions'', ''bImplantA'', 20">Get medium breast implants</a> - 180,000 <b>₽</b>'
+		else
+			'Get medium breast implants - 180,000 <b>₽</b>'
+		end
+	else
+		'Get medium breast implants - 180,000 <b>₽</b> - You already have ' + iif(fillimplant = 1, 'fillable', 'string') + ' implants.'
+	end
+end
+if $ARGS[0] = 'set_get_large_breast_implant_act':
+	if fillimplant = 0 and stringimplant = 0:
+		if max(money, karta) >=  190000:
+			'<a href="exec: gt ''clinic_functions'', ''bImplantA'', 30">Get large breast implants</a> - 190,000 <b>₽</b>'
+		else
+			'Get large breast implants - 190,000 <b>₽</b>'
+		end
+	else
+		'Get large breast implants - 190,000 <b>₽</b> - You already have ' + iif(fillimplant = 1, 'fillable', 'string') + ' implants.'
+	end
+end
+if $ARGS[0] = 'set_get_XXL_breast_implant_act':
+	if fillimplant = 0 and stringimplant = 0:
+		if max(money, karta) >=  200000:
+			'<a href="exec: gt ''clinic_functions'', ''bImplantA'', 40">Get XXL breast implants</a> - 200,000 <b>₽</b>'
+		else
+			'Get XXL breast implants - 200,000 <b>₽</b>'
+		end
+	else
+		'Get XXL breast implants - 200,000 <b>₽</b> - You already have ' + iif(fillimplant = 1, 'fillable', 'string') + ' implants.'
+	end
+end
+if $ARGS[0] = 'set_get_fillable_breast_implant_act':
+	if fillimplant = 0 and stringimplant = 0:
+		if max(money, karta) >=  200000:
+			'<a href="exec: fillimplant = 1 & gt ''clinic_functions'', ''bImplantA'', 20">Get fillable implants</a> - 200,000 <b>₽</b>'
+		else
+			'Get fillable implants - 200,000 <b>₽</b>'
+		end
+	else
+		'Get fillable implants - 200,000 <b>₽</b> - You already have ' + iif(fillimplant = 1, 'fillable', 'string') + ' implants.'
+	end
+end
+if $ARGS[0] = 'set_get_string_breast_implant_act':
+	if fillimplant = 0 and stringimplant = 0:
+		if max(money, karta) >=  200000:
+			'<a href="exec: stringimplant = 1 & gt ''clinic_functions'', ''bImplantA'', 20">Get string implants</a> - 250,000 <b>₽</b>'
+		else
+			'Get string implants - 250,000 <b>₽</b>'
+		end
+	else
+		'Get string implants - 250,000 <b>₽</b> - You already have ' + iif(fillimplant = 1, 'fillable', 'string') + ' implants.'
+	end
+end
+
+if $ARGS[0] = 'set_drain_string_breast_implant_act':
+	if stringimplant = 1 and bodyVars['bust_silicone'] >= 30:
+		if max(money, karta) >= 2000:
+			'<a href="exec: xgt ''clinic_functions'', ''bImplantA'', ''drain''">Drain string implant</a> - 2,000 <b>₽</b>'
+		else
+			'Drain string implant - 2,000 <b>₽</b>'
+		end
+	end
+end
+if $ARGS[0] = 'set_buy_silicone_bag_act':
+	if fillimplant = 1:
+		if max(money, karta) >= 500:
+			'<a href="exec: xgt ''clinic_functions'', ''bImplantA'', ''bag''">Buy silicone bag</a> - 500 <b>₽</b>'
+		else
+			'Buy silicone bag - 500 <b>₽</b>'
+		end
+	else
+		'Buy silicone bag - 500 <b>₽</b> - You don''t have fillable implants.'
+	end
+end
+
+
+
+if $ARGS[0] = 'electrolysis':
+	menu_off = 1
+	if money >= 80000:
+		money -= 80000
+	else
+		karta -= 80000
+	end
+	minut += 120
+	pcs_leghair = 0
+	pcs_pubes = 0
+	lashair = 1
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/electrolysis.jpg"></center>'
+	'The surgeon has you strip completely and lie down on the table. Over the next few hours, you''re treated by a laser over and over again. When the treatment is finished and you get up from the table, your skin feels silky smooth.'
+
+	act 'Continue': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'lipPlus':
+	menu_off = 1
+	if money >= 25000:
+		money -= 25000
+	else
+		karta -= 25000
+	end
+	minut += 60
+	pcs_lip += 1
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
+	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply. We''ll be done before you know it."'
+	'When you wake up, the procedure is complete and your lips are fuller.'
+
+	act 'Continue': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'lipMin':
+	menu_off = 1
+	if money >= 30000:
+		money -= 30000
+	else
+		karta -= 30000
+	end
+	minut += 60
+	pcs_lip -= 1
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
+	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply. We''ll be done before you know it."'
+	'When you wake up, the procedure is complete and your lips are thinner.'
+
+	act 'Continue': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'eyePlus':
+	menu_off = 1
+	if money >= 90000:
+		money -= 90000
+	else
+		karta -= 90000
+	end
+	minut += 60
+	pcs_eyesize += 1
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
+	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply. We''ll be done before you know it."'
+	'When you wake up again, the procedure is complete and your eyes are larger.'
+
+	act 'Continue': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'eyeMin':
+	menu_off = 1
+	if money >= 90000:
+		money -= 90000
+	else
+		karta -= 90000
+	end
+	minut += 60
+	pcs_eyesize -= 1
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
+	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply. We''ll be done before you know it."'
+	'When you wake up, the procedure is complete and your eyes are smaller.'
+
+	act 'Continue': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'lyposuction':
+	menu_off = 1
+	if money >= 75000:
+		money -= 75000
+	else
+		karta -= 75000
+	end
+	minut += 60
+	pcs_mass['body'] -= 40
+	if pcs_mass['body'] < 11: pcs_mass['body'] = 11
+	gs 'body', 'softreset'
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
+	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply. We''ll be done before you know it."'
+	'When you wake up, the procedure is complete and you''re looking thinner.'
+
+	act 'Continue': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'bImplantA':
+	menu_off = 1
+	if stringimplant = 1:
+		! Get String Implants
+		temp_pay_amount = 250000
+	elseif fillimplant = 1:
+		! Get Fillable Implants
+		temp_pay_amount = 200000
+	elseif ARGS[1] = 40:
+		! Get XXL Implants
+		temp_pay_amount = 200000
+	elseif ARGS[1] = 30:
+		! Get Large Implants
+		temp_pay_amount = 190000
+	elseif ARGS[1] = 20:
+		! Get Medium Implants
+		temp_pay_amount = 180000
+	elseif ARGS[1] = 10:
+		! Get Small Implants
+		temp_pay_amount = 170000
+	elseif ARGS[1] = 0:
+		! Remove any implants
+		temp_pay_amount = 90000
+	end
+
+	if money >= temp_pay_amount:
+		money -= temp_pay_amount
+	else
+		karta -= temp_pay_amount
+	end
+	killvar 'temp_pay_amount'
+
+
+	minut += 60
+	bodyVars['bust_silicone'] = ARGS[1]
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/cosmeticsur.jpg"></center>'
+	'The surgeon has you strip, put on a gown and lie down on the table, where he gives you a mask. "Just breathe in deeply... we''ll be done before you know it."'
+	'When you wake up again, the procedure is complete and you look down at your new breasts.'
+
+	act 'Continue': gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'bImplantB':
+	menu_off = 1
+	if $ARGS[1] = 'drain':
+		if money >= 2000:
+			money -= 2000
+		else
+			karta -= 2000
+		end
+		bodyVars['bust_silicone'] -= 10
+		msg 'You drain some of your string implant'
+	elseif $ARGS[1] = 'bag':
+		if money >= 500:
+			money -= 500
+		else
+			karta -= 500
+		end
+		siliconeBag += 1
+		msg 'You buy a silicone bag.'
+	end
+	gs 'stat'
+
+	act 'Continue': gt $loc, $loc_arg
+end
+
+
+
+--- clinic_functions ---------------------------------------

+ 28 - 24
locations/clothing.qsrc

@@ -1502,11 +1502,20 @@ if $ARGS[0] = 'view_clothing_item':
 		if CloInhibit + 10 > pcs_inhib and CloInhibit <= pcs_inhib: 'You find this outfit more revealing than you are completely comfortable with but that makes it quite exciting too.'
 	end
 
-!!CloStyle2: 1 Maid, 2 Server, 3 Stripper, 4 School
-	if CloStyle2 = 1: 'This is a maid outfit.'
-	if CloStyle2 = 2: 'This outfit is a server uniform.'
-	if CloStyle2 = 3: 'This outfit is a stripper uniform, suitable for jobs that require one.'
-	if CloStyle2 = 4: gs 'clothing', 'school_check'
+!!CloStyle2: 1 Maid, 2 Server, 3 Stripper, 4 School, 5 Office, 6 Exercise
+	if CloStyle2 = 1:
+		'This is a maid outfit.'
+	elseif CloStyle2 = 2:
+		'This outfit is a server uniform.'
+	elseif CloStyle2 = 3:
+		'This outfit is a stripper uniform, suitable for jobs that require one.'
+	elseif CloStyle2 = 4:
+		gs 'clothing', 'school_check'
+	elseif CloStyle2 = 5:
+		'This outfit is an office uniform, suitable for jobs that require one.'
+	elseif CloStyle2 = 6:
+		'This is sport clothing.'
+	end
 
 	if $ARGS[4] ! 'shop' and ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6):
 		$RESULT = '(strength '
@@ -1534,7 +1543,7 @@ if $ARGS[0] = 'view_clothing_item':
 			act 'Leave': gt $loc, $loc_arg
 			if CloInhibit > pcs_inhib:
 				'You don''t feel daring enough to wear an outfit this revealing and can''t bring yourself to buy it.'
-			elseif karta + bankDebtLimit < Price and money < Price:
+			elseif karta < Price and money < Price:
 				'You cannot afford this outfit.'
 			else
 				if money >= Price:
@@ -1547,7 +1556,7 @@ if $ARGS[0] = 'view_clothing_item':
 						gs 'clothing', 'view_clothing_item_buy', $ARGS[4], $ARGS[1], ARGS[2], ARGS[3]
 					end
 				end
-				if karta + bankDebtLimit >= Price:
+				if karta >= Price:
 					act 'Buy (card)':
 						h = 0
 						if CloStyle = 2:h = 10
@@ -1777,7 +1786,7 @@ end
 
 if $ARGS[0] = 'dispose':
 	dynamic $clothingworntype + '[<<clothingwornnumber>>] = 0'
-	$lastwornclothingtype = 'none'
+	$lastwornclothingtype = 'nude'
 	lastwornclothingnumber = 0
 
 	gs 'clothing', 'strip_code'
@@ -1820,6 +1829,7 @@ if $ARGS[0] = 'strip_code':
 	CloPanties = 0
 	CloStyle = 0
 	CloStyle2 = 0
+	CloStyle3 = 0
 	CloBimbo = 0
 	CloGoth = 0
 	CloPunk = 0
@@ -1841,24 +1851,26 @@ if $ARGS[0] = 'strip_code':
 	PCloPunk = 0
 	PCloInhibit = 0
 	PCloOnePiece = 0
-	PCloswimwear = 0
+	PCloSwimwear = 0
 	PXCloThinness = 0
 	PXCloTopCut = 0
 	PXCloBottomShortness = 0
 	PCloCoverTop = 4
 	PCloCoverBack = 4
 	PCloCoverFront = 4
+
 	PShoQuality = 0
 	PShoCut = 0
 	PShoHeels = 0
 	PShoStyle = 0
+	PShoStyle2 = 0
 	PShoBimbo = 0
 	PShoGoth = 0
 	PShoPunk = 0
 
+	gs 'outfit', 'set_tags'
 
-	gs 'clothing', 'exposure_calc'
-
+	gs 'outfit', 'exposure_calc'
 end
 
 
@@ -1934,7 +1946,11 @@ if $ARGS[0] = 'wear':
 	PCloCoverBack = CloCoverBack
 	PCloCoverFront = CloCoverFront
 
-	gs 'clothing', 'exposure_calc'
+	gs 'outfit', 'set_tags'
+
+	if strpos($clothingworntype, 'swimsuit') > 0 or strpos($clothingworntype, 'bikinis') > 0: PCloSwimwear = 1
+
+	gs 'outfit', 'exposure_calc'
 
 !Calculations for clothing beauty, multiplied by natural beauty
 	if PCloThinness > 0:
@@ -2015,20 +2031,8 @@ if $ARGS[0] = 'wear':
 	end
 
 	if PCloPanties = 1: PXCloBottomShortness = 400
-
-	if $clothingworntype = 'danilovich_swimsuit' or $clothingworntype = 'scandalicious_swimsuit' or $clothingworntype = 'scandalicious_bikinis' or $clothingworntype = 'allure_swimsuit' or $clothingworntype = 'allure_bikinis' or $clothingworntype = 'nerdvana_swimsuit' or $clothingworntype = 'nerdvana_bikinis': PCloswimwear = 1
 end
 
-if $ARGS[0] = 'exposure_calc':
-	CoverTop = (PCloCoverTop + PBraCover) - 4
-	if CoverTop < 0: CoverTop = 0
-
-	CoverBack = (PCloCoverBack + PPanCoverBack) - 4
-	if CoverBack < 0: CoverBack = 0
-
-	CoverFront = (PCloCoverFront + PPanCoverFront) - 4
-	if CoverFront < 0: CoverFront = 0
-end
 
 if $ARGS[0] = 'wear_last_worn':
 	!!contingency

+ 164 - 128
locations/clothing_attributes.qsrc

@@ -1,88 +1,101 @@
 # clothing_attributes
 
-!! **Clothing Organization
-!! CloCategory: based on attribute file name and usually the shop name often with _outfits or _dress as postfix
-!! CloStyle: 1 Girlie, 2 Rebel, 3 Wealthy, 4 Prostitute, 5 is Loose fit
-!!		Notes: 1 is clothing themed to give the impression of innocence of youth. 2 is for stereotypical punks; ripped clothing, leather jackets, etc. 3 gives the impression that theyre debutanttes or rich at first glance. 4 is stuff worn by prostitutes. 5 is formless clothing that doesn''t requiring refitting.
-!! CloStyle2: 1 Maid, 2 Server, 3 Stripper, 4 School
-!!		Notes: Used to distinguish between the main types of uniform.
-!! CloStyle3: 1 Dom, 2 sub, 3 Can be used for both Dom and sub, 4 Office wear
-!! CloInhibit: 0-100 Inhibition value required to wear the outfit
+!!	**Clothing Organization
+!!	CloCategory: based on attribute file name and usually the shop name often with _outfits or _dress as postfix
+!!	CloStyle:	1 Girlie, 2 Rebel, 3 Wealthy, 4 Prostitute, 5 is Loose fit
+!!		Notes:	1 is clothing themed to give the impression of innocence of youth. 2 is for stereotypical punks; ripped clothing, leather jackets, etc. 3 gives the impression that theyre debutanttes or rich at first glance. 4 is stuff worn by prostitutes. 5 is formless clothing that doesn''t requiring refitting.
+!!	CloStyle2:	1 Maid, 2 Server, 3 Stripper, 4 School, 5 Office, 6 Exercise
+!!		Notes:	Used to distinguish between the main types of uniform.
+!!	CloStyle3:	1 Dom, 2 sub, 3 Can be used for both Dom and sub
 !!
-!! **Clothing Variables
-!! Scales use a 1-5 range. with 6 being a special case thats essentially nudity.
+!! CloInhibit:	0-100 Inhibition value required to wear the outfit
 !!
-!! CloQuality = 1-7 scale, based on the general expensiveness of the clothing. Higher is more expensive.
-!!		Notes: 7 is reserved for ballroom gowns, and other clothing that might only be found on celebrities or millionaires at red carpet events.
-!! 		Ex:		6-5 are the higher and lower levels of the expensive category
-!!				4-3 are the same for average category
-!!				2-1 are the same for cheap category.
-!! CloThinness = 1-6 scale, with higher values being made of thinner material and/or being more tightly fitting.
-!!		Notes:   Clothing with large cut-away sections or transparent sections should have a decreased CloThinness score
-!!		Ex: 	6 intentionally reveals breast or pubic areas, with translucent or transparent areas and should trigger some sort of indecent exposure/arrest event if worn in public without underwear.
-!!				5 is thin enough to be seen through only in bright light, or is otherwise tight enough to show the body in detail if opaque (skin tight).
-!!				4 is thin or tight enough to be flirty and fine in most places except the most conservative (church, court, etc).
-!!				3-2 is the range of clothing that is modest enough to be worn in all public places.
-!!				1 does not follow the curves of the body in great detail, and makes it hard to see the body shape.
-!!Top!!
-!! CloTopCut = 1-4 scale* (with an additional +0-3 based on player breast sizes, for an effective 1-7 scale). System is based on based on how much skin on the torso is shown (including navel, not just above the breasts), with larger breasts implicitly making the outfit smaller and more revealing.
-!!		Notes:   Need to add modifiers based on breast size, where larger breasts end up forcing the player to show more cleavage than those with smaller breasts.
-!!		Ex: 	4 reveals over half the skin on the torso area,
+!!	**Clothing Variables
+!!	Scales use a 1-5 range. with 6 being a special case thats essentially nudity.
+!!
+!!	CloQuality =	1-7 scale, based on the general expensiveness of the clothing. Higher is more expensive.
+!!		Notes:		7 is reserved for ballroom gowns, and other clothing that might only be found on celebrities or millionaires at red carpet events.
+!!		Ex:			6-5 are the higher and lower levels of the expensive category
+!!					4-3 are the same for average category
+!!					2-1 are the same for cheap category.
+!!
+!!	CloThinness =	1-6 scale, with higher values being made of thinner material and/or being more tightly fitting.
+!!		Notes:		Clothing with large cut-away sections or transparent sections should have a decreased CloThinness score
+!!		Ex:			6 intentionally reveals breast or pubic areas, with translucent or transparent areas and should trigger some sort of indecent exposure/arrest event if worn in public without underwear.
+!!					5 is thin enough to be seen through only in bright light, or is otherwise tight enough to show the body in detail if opaque (skin tight).
+!!					4 is thin or tight enough to be flirty and fine in most places except the most conservative (church, court, etc).
+!!					3-2 is the range of clothing that is modest enough to be worn in all public places.
+!!					1 does not follow the curves of the body in great detail, and makes it hard to see the body shape.
+!!
+!!	Top!!
+!!	CloTopCut =	1-4 scale* (with an additional +0-3 based on player breast sizes, for an effective 1-7 scale). System is based on based on how much skin on the torso is shown (including navel, not just above the breasts), with larger breasts implicitly making the outfit smaller and more revealing.
+!!		Notes:	Need to add modifiers based on breast size, where larger breasts end up forcing the player to show more cleavage than those with smaller breasts.
+!!		Ex:		4 reveals over half the skin on the torso area,
 !!				3 has a deep neckline that reaches the cleavage between the breasts,
 !!				2 is a cut high enough to be considered appropriate in most places (above the cleavage, or just below where it starts),
 !!				1 is a neckline that ends very near the neck or higher.
-!! CloBra = 1 for on 2 for bare chest
+!!
+!!	CloBra =	1 for on 2 for bare chest
 !!		Ex:		2 Your chest is not covered at all by the outfit, if you wear a bra that will be your top
 !!				1 the top is no more than a bra and wearing a bra underneath s pointless
-!!Bottoms!!
-!! CloSkirtShortness = 1-6 scale. Higher values are shorter.
-!!		Notes: 	 Loose skirts sometimes rank higher than tight skirts of the same length, since they are more likely to flash others.
-!!		Ex: 	6 is short enough to reveal pubic areas at all times
-!!				5 is ~20% thigh length or less (micro-skirt), and can reveal underwear frequently
-!!				4 is ~40% thigh length (miniskirt) and may show underwear if bending over
-!!				3 is up to ~60% thigh length (skirt) and normally never reveals underwear
-!!				2 is ending immediately above, at or below the knees (knee-length)
-!!				1 is ankle-length.
-!! CloPantsShortness = 1-6 scale. Higher values are shorter.
-!!		Notes: 	 Intentionally separate variable from skirt length to prevent wording confusion during events (e.g., lifting a dress or skirt versus pulling down pants or shorts)
-!!		Ex: 	6 are high-cut shorts (legs end significantly above the crotch, usually reveals a large amount of the ass cheek)
-!!				5 is mini shorts (legs do not reach below the crotch)
-!!				4 are shorts (close to mid thigh)
-!!				3 is knee-length shorts
-!!				2 is calf length
-!!				1 is ankle length
-!! CloDress  =  1 for yes
+!!
+!!	Bottoms!!
+!!	CloSkirtShortness =	1-6 scale. Higher values are shorter.
+!!			Notes:		Loose skirts sometimes rank higher than tight skirts of the same length, since they are more likely to flash others.
+!!			Ex:			6 is short enough to reveal pubic areas at all times
+!!						5 is ~20% thigh length or less (micro-skirt), and can reveal underwear frequently
+!!						4 is ~40% thigh length (miniskirt) and may show underwear if bending over
+!!						3 is up to ~60% thigh length (skirt) and normally never reveals underwear
+!!						2 is ending immediately above, at or below the knees (knee-length)
+!!						1 is ankle-length.
+!!
+!!	CloPantsShortness =	1-6 scale. Higher values are shorter.
+!!			Notes:		Intentionally separate variable from skirt length to prevent wording confusion during events (e.g., lifting a dress or skirt versus pulling down pants or shorts)
+!!			Ex: 		6 are high-cut shorts (legs end significantly above the crotch, usually reveals a large amount of the ass cheek)
+!!						5 is mini shorts (legs do not reach below the crotch)
+!!						4 are shorts (close to mid thigh)
+!!						3 is knee-length shorts
+!!						2 is calf length
+!!						1 is ankle length
+!!
+!!	CloDress =	1 for yes
 !!		EX		1 This average quality dress. Unlike a skirt the whole thing must be removed
-!! CloPanties = 1 for yes, 2 for no coverage eg. a harness
-!!		Ex:		1 The bottom of this outfit offers no more coverage than panties and it will replace your panties (if worn)
-!! CloOnePiece = 1
-!!		Notes:	 Flag for event writing; excludes skirted/dress outfits. Denotes that in order to have sex, the clothing must be pulled to the side, unlike shorts which can be pulled down, or skirts which may be lifted.
-!! CloBimbo = 1
-!!		Notes:	 Flag for bimboification gain. All exceptionally slutty clothing (the kind almost never seen outside of porn, strip clubs, or on street hookers) should have this flag.
-!! CloGoth = 1
-!!		Notes:	 Flag for Goth clothes
-!! CloPunk = 1
-!!		Notes:	 Flag for Punk / aggressive clothes.
 !!
-!! The following are only applied if required, if the outfit covers these areas fully there is no need to add them
+!!	CloPanties =	1 for yes, 2 for no coverage eg. a harness
+!!			Ex:		1 The bottom of this outfit offers no more coverage than panties and it will replace your panties (if worn)
+!!
+!!	CloOnePiece =	1
+!!		Notes:		Flag for event writing; excludes skirted/dress outfits. Denotes that in order to have sex, the clothing must be pulled to the side, unlike shorts which can be pulled down, or skirts which may be lifted.
+!!
+!!	CloBimbo =	1
+!!		Notes:	Flag for bimboification gain. All exceptionally slutty clothing (the kind almost never seen outside of porn, strip clubs, or on street hookers) should have this flag.
 !!
-!! CloCoverFront:1-4 scale not required to be set must expose the vagina at least partially
-!!		Ex: 	4 Pussy not covered at all
-!!				3 Pussy is covered but the material is completely transparent, or wide fishnet
-!!				2 Pussy covered but still visible, inc. wide mesh
-!!				1 Pussy can barely be seen through material if you look hard enough, inc. fine mesh
+!!	CloGoth =	1
+!!		Notes:	Flag for Goth clothes
 !!
-!! CloCoverBack:1-4 scale not required to be set exposure of the butt, the presence of a g-string or thong does not mean the butt is covered
-!!		Ex: 	4 Butt not covered at all
-!!				3 Butt is covered but the material is completely transparent, or wide fishnet
-!!				2 Butt covered but still visible, inc. wide mesh
-!!				1 Butt can barely be seen through material if you look hard enough, inc. fine mesh
+!!	CloPunk =	1
+!!		Notes:	Flag for Punk / aggressive clothes.
 !!
-!! CloCoverTop:	1-4 scale not required to be set. Breast exposure, must be some nipple or the whole of the rest of the breast for it to count. Deep cleavage without nipple does not count.
-!!		Ex: 	4 Breasts not covered at all
-!!				3 Breasts is covered but the material is completely transparent, or wide fishnet
-!!				2 Breasts covered but still visible, inc. wide mesh
-!!				1 Breasts can barely be seen through material if you look hard enough, inc. fine mesh
+!!
+!!	The following are only applied if required, if the outfit covers these areas fully there is no need to add them
+!!
+!!	CloCoverFront:	1-4 scale not required to be set must expose the vagina at least partially
+!!			Ex: 	4 Pussy not covered at all
+!!					3 Pussy is covered but the material is completely transparent, or wide fishnet
+!!					2 Pussy covered but still visible, inc. wide mesh
+!!					1 Pussy can barely be seen through material if you look hard enough, inc. fine mesh
+!!
+!!	CloCoverBack:	1-4 scale not required to be set exposure of the butt, the presence of a g-string or thong does not mean the butt is covered
+!!			Ex: 	4 Butt not covered at all
+!!					3 Butt is covered but the material is completely transparent, or wide fishnet
+!!					2 Butt covered but still visible, inc. wide mesh
+!!					1 Butt can barely be seen through material if you look hard enough, inc. fine mesh
+!!
+!!	CloCoverTop:	1-4 scale not required to be set. Breast exposure, must be some nipple or the whole of the rest of the breast for it to count. Deep cleavage without nipple does not count.
+!!			Ex:		4 Breasts not covered at all
+!!					3 Breasts is covered but the material is completely transparent, or wide fishnet
+!!					2 Breasts covered but still visible, inc. wide mesh
+!!					1 Breasts can barely be seen through material if you look hard enough, inc. fine mesh
 !!
 !!	Figures for CloInhibit values, these are the maximums for each range. Currently all set to lowest figure in range but to add random element when time permits
 !!0:	dress:1					pants:1		top:2			thickness:2
@@ -121,91 +134,113 @@ CloCoverFront = 0
 CloCoverBack = 0
 CloCoverTop = 0
 
-if $ARGS[0] = 'gm_outfits':
-	gs '$attributes_gm_outfits', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'gm_dress':
-	gs '$attributes_gm_dress', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'misc_outfits':
-	gs '$attributes_misc_outfits', $ARGS[0], ARGS[1]
+
+if $ARGS[0] = 'allure_swimsuit':
+	gs '$attributes_allure_swim_one', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'allure_bikinis':
+	gs '$attributes_allure_swim_two', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'bomba_dress':
+	gs '$attributes_bomba_dress', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'bomba_outfits':
+	gs '$attributes_bomba_outfits', $ARGS[0], ARGS[1]
+
 elseif $ARGS[0] = 'cats_dress':
 	gs '$attributes_cats_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'cats_outfits':
 	gs '$attributes_cats_outfits', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'flamingos_outfits':
-	gs '$attributes_flamingos_outfits', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'flamingos_dress':
-	gs '$attributes_flamingos_dress', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'coco_outfits':
-	gs '$attributes_coco_outfits', $ARGS[0], ARGS[1]
+
 elseif $ARGS[0] = 'coco_dress':
 	gs '$attributes_coco_dress', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'fashionista_dress':
-	gs '$attributes_fashionista_dress', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'fashionista_outfits':
-	gs '$attributes_fashionista_outfits', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'moncheri_dress':
-	gs '$attributes_moncheri_dress', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'moncheri_gown':
-	gs '$attributes_moncheri_gown', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'gm_office':
-	gs '$attributes_office', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'gm_school':
-	gs '$attributes_school', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'coco_outfits':
+	gs '$attributes_coco_outfits', $ARGS[0], ARGS[1]
+
 elseif $ARGS[0] = 'danilovich_outfits':
 	gs '$attributes_danilovich_outfits', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'danilovich_swimsuit':
+	gs '$attributes_danilovich_swim_one', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'dolls_dress':
+	gs '$attributes_dolls_dress', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'dolls_outfits':
+	gs '$attributes_dolls_outfits', $ARGS[0], ARGS[1]
+
 elseif $ARGS[0] = 'eroto_dress':
 	gs '$attributes_eroto_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'eroto_outfits':
 	gs '$attributes_eroto_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'eroto_strip':
 	gs '$attributes_eroto_strip', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'salacious_dress':
-	gs '$attributes_salacious_dress', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'salacious_outfits':
-	gs '$attributes_salacious_outfits', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'fancy_burlesque':
+	gs '$attributes_fancy_burlesque', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'fashionista_dress':
+	gs '$attributes_fashionista_dress', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'fashionista_outfits':
+	gs '$attributes_fashionista_outfits', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'flamingos_outfits':
+	gs '$attributes_flamingos_outfits', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'flamingos_dress':
+	gs '$attributes_flamingos_dress', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'gm_dress':
+	gs '$attributes_gm_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'gm_maid':
 	gs '$attributes_gm_maid', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'gm_office':
+	gs '$attributes_office', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'gm_outfits':
+	gs '$attributes_gm_outfits', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'gm_school':
+	gs '$attributes_school', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'gm_server':
 	gs '$attributes_gm_server', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'danilovich_swimsuit':
-	gs '$attributes_danilovich_swim_one', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'scandalicious_outfits':
-	gs '$attributes_scandalicious_outfits', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'scandalicious_dress':
-	gs '$attributes_scandalicious_dress', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'scandalicious_swimsuit':
-	gs '$attributes_scandalicious_swim_one', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'scandalicious_bikinis':
-	gs '$attributes_scandalicious_swim_two', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'fancy_burlesque':
-	gs '$attributes_fancy_burlesque', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'dolls_dress':
-	gs '$attributes_dolls_dress', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'dolls_outfits':
-	gs '$attributes_dolls_outfits', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'bomba_dress':
-	gs '$attributes_bomba_dress', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'bomba_outfits':
-	gs '$attributes_bomba_outfits', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'allure_swimsuit':
-	gs '$attributes_allure_swim_one', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'allure_bikinis':
-	gs '$attributes_allure_swim_two', $ARGS[0], ARGS[1]
+
 elseif $ARGS[0] = 'market_outfits':
 	gs '$attributes_market_clothes', $ARGS[0], ARGS[1]
+
 elseif $ARGS[0] = 'materinstvo_dress':
 	gs '$attributes_materinstvo_dress', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'misc_outfits':
+	gs '$attributes_misc_outfits', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'moncheri_dress':
+	gs '$attributes_moncheri_dress', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'moncheri_gown':
+	gs '$attributes_moncheri_gown', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'nerdvana_bikinis':
+	gs '$attributes_nerdvana_swim_two', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'nerdvana_cosplay':
 	gs '$attributes_nerdvana_cosplay', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'nerdvana_outfits':
 	gs '$attributes_nerdvana_outfits', $ARGS[0], ARGS[1]
-elseif $ARGS[0] = 'nerdvana_bikinis':
-	gs '$attributes_nerdvana_swim_two', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'nerdvana_swimsuit':
 	gs '$attributes_nerdvana_swim_one', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'salacious_dress':
+	gs '$attributes_salacious_dress', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'salacious_outfits':
+	gs '$attributes_salacious_outfits', $ARGS[0], ARGS[1]
+
+elseif $ARGS[0] = 'scandalicious_dress':
+	gs '$attributes_scandalicious_dress', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'scandalicious_outfits':
+	gs '$attributes_scandalicious_outfits', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'scandalicious_bikinis':
+	gs '$attributes_scandalicious_swim_two', $ARGS[0], ARGS[1]
+elseif $ARGS[0] = 'scandalicious_swimsuit':
+	gs '$attributes_scandalicious_swim_one', $ARGS[0], ARGS[1]
+
 end
 
-if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! 'scandalicious_swimsuit' and $ARGS[0] ! 'scandalicious_bikinis' and $ARGS[0] ! 'danilovich_swimsuit' and $ARGS[0] ! 'nerdvana_swimsuit' and $ARGS[0] ! 'nerdvana_bikinis':
+
+
+
+if strpos($ARGS[0], 'swimsuit') <= 0 and strpos($ARGS[0], 'bikinis') <= 0:
 	if CloCoverFront = 4:
 		CloInhibit = 50
 	elseif CloCoverFront = 3 or CloCoverTop = 4:
@@ -284,8 +319,8 @@ if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! '
 end
 
 !! Adjusting the cleavage to the player characters breast size.
-if CloTopCut = 3 and tits >=4: CloTopCut = 4
-if CloTopCut = 2 and tits >=6: CloTopCut = 3
+if CloTopCut = 3 and tits >= 4: CloTopCut = 4
+if CloTopCut = 2 and tits >= 6: CloTopCut = 3
 
 !! This is the old version giving to drastic changes when the scal of CloTopCut is only 1-4
 !!if CloTopCut > 1:
@@ -295,4 +330,5 @@ if CloTopCut = 2 and tits >=6: CloTopCut = 3
 !!end
 !!if CloTopCut > 4: CloTopCut = 4
 
+
 --- clothing_attributes ---------------------------------

+ 1 - 1
locations/coats.qsrc

@@ -170,7 +170,7 @@ if $ARGS[0] = 'view_coat_item':
 			else
 				'You do not have enough cash to buy these coat.'
 			end
-			if karta + bankDebtLimit >= price:
+			if karta >= price:
 				act 'Buy (card)':
 					karta -= price
 					dynamic $ARGS[2] + '_coats[<<ARGS[3]>>] = 1'

+ 2 - 2
locations/core_library.qsrc

@@ -14,8 +14,8 @@ if $ARGS[0] = 'init':
 	if $start_type['cat'] = 'dancer':
 		!! Parents Home Triggers
 		if $loc = 'kuhrPar':
-			if ((daystart >= 159 and daystart <= 198) and mod_ballet['letter'] = 0) or (daystart >= 198 and balletqw['school'] > 1):
-
+			if ((daystart >= 158 and daystart <= 198) and mod_ballet['letter'] = 0) or (daystart >= 198 and balletqw['school'] > 1):
+				gs 'pushkin_ballet_init', 'start'
 			end
 		end
 

+ 64 - 50
locations/costuming_outfits1.qsrc

@@ -4,118 +4,130 @@ if $ARGS[0] = 'start':
 	if acting['costume_unique'] = 1:
 
 		!! ----- extra roles -------------------
-		if $acting['role'] = 'Spring Break Flasher':gs 'costuming_outfits', 'SpringBreakFlasher'
-	!!	if $acting['role'] = 'Vera':gs 'costuming_outfits', 'HotBartender'
-	!!	if $acting['role'] = 'Vera':gs 'costuming_outfits', 'HotBartender'
-	!!	if $acting['role'] = 'Vera':gs 'costuming_outfits', 'HotBartender'
+		if $acting['role'] = 'Spring Break Flasher': gs 'costuming_outfits', 'SpringBreakFlasher'
+	!!	if $acting['role'] = 'Vera': gs 'costuming_outfits', 'HotBartender'
+	!!	if $acting['role'] = 'Vera': gs 'costuming_outfits', 'HotBartender'
+	!!	if $acting['role'] = 'Vera': gs 'costuming_outfits', 'HotBartender'
 		!! ----- minor roles ------------------
-		if $acting['role'] = 'Diner Waitress':gs 'costuming_outfits', 'DinerWaitress'
-		if $acting['role'] = 'Slutty Club Girl':gs 'costuming_outfits', 'SluttyClubGirl'
-		if $acting['role'] = 'Vera':gs 'costuming_outfits', 'HotBartender'
-		
-		
+		if $acting['role'] = 'Diner Waitress': gs 'costuming_outfits', 'DinerWaitress'
+		if $acting['role'] = 'Slutty Club Girl': gs 'costuming_outfits', 'SluttyClubGirl'
+		if $acting['role'] = 'Vera': gs 'costuming_outfits', 'HotBartender'
+
 	else
 		!! if there is no specific outfit assigned, player will be given a random one from a corresponding shop
-		
+
+		!! Why not use:
+		!!	gs 'clothing', 'totals', $acting['outfit_type']
+		!!	gs 'clothing', 'wear', $acting['outfit_type'], rand(1, total)
+
 		if $acting['outfit_type'] = 'gm_outfits':
-			gs 'clothing', 'wear', 'gm_outfits', rand(1,150)
+			gs 'clothing', 'wear', 'gm_outfits', rand(1, 150)
 			'Put you in some cheap casual clothes'
-			
+
 		elseif $acting['outfit_type'] = 'gm_dress':
 			gs 'clothing', 'wear', 'gm_dress', rand(1,50)
 			'Put you in a cheap casual outfit with a skirt'
+
 		elseif $acting['outfit_type'] = 'cats_outfits':
 			gs 'clothing', 'wear', 'cats_outfits', rand(1,100)
 			'They give you some girly clothes to wear with tight pants that really emphasize your ass.'
+
 		elseif $acting['outfit_type'] = 'cats_dress':
 			gs 'clothing', 'wear', 'cats_dress', rand(1,110)
 			'They give you a girly outfit with a skirt to wear.'
+
 		elseif $acting['outfit_type'] = 'coco_outfits':
 			gs 'clothing', 'wear', 'coco_outfits', rand(1,90)
 			'They give you a trendy outfit to wear.'
+
 		elseif $acting['outfit_type'] = 'coco_dress':
 			gs 'clothing', 'wear', 'coco_dress', rand(1,100)
 			'They give you a trendy outfit with a skirt to wear.'
+
 		elseif $acting['outfit_type'] = 'bomba_outfits':
 			gs 'clothing', 'wear', 'bomba_outfits', rand(1,50)
 			'They give you a goth girl outfit to wear.'
+
 		elseif $acting['outfit_type'] = 'bomba_dress':
 			gs 'clothing', 'wear', 'bomba_dress', rand(1,70)
 			'They give you a goth girl outfit with a skirt to wear.'
+
 		elseif $acting['outfit_type'] = 'dolls_outfits':
 			gs 'clothing', 'wear', 'dolls_outfits', rand(1,50)
-			
+
 		elseif $acting['outfit_type'] = 'dolls_dress':
 			gs 'clothing', 'wear', 'dolls_dress', rand(1,110)
-			
+
 		elseif $acting['outfit_type'] = 'eroto_outfits':
 			gs 'clothing', 'wear', 'eroto_outfits', rand(1,100)
-			
+
 		elseif $acting['outfit_type'] = 'eroto_dress':
 			gs 'clothing', 'wear', 'eroto_dress', rand(1,120)
-			
+
 		elseif $acting['outfit_type'] = 'flamingos_outfits':
 			gs 'clothing', 'wear', 'flamingos_outfits', rand(1,50)
-			
+
 		elseif $acting['outfit_type'] = 'flamingos_dress':
 			gs 'clothing', 'wear', 'flamingos_dress', rand(1,90)
-			
+
 		elseif $acting['outfit_type'] = 'moncheri_dress':
 			gs 'clothing', 'wear', 'moncheri_dress', rand(1,80)
-		
+
 		elseif $acting['outfit_type'] = 'moncheri_gown':
 			gs 'clothing', 'wear', 'moncheri_gown', rand(1,160)
-			
+
 		elseif $acting['outfit_type'] = 'nerdvana_outfits':
 			gs 'clothing', 'wear', 'nerdvana_outfits', rand(1,60)
-			
+
 		elseif $acting['outfit_type'] = 'fashionista_dress':
 			gs 'clothing', 'wear', 'bomba_outfits', rand(1,200)
-			
+
 		elseif $acting['outfit_type'] = 'danilovich_outfits':
 			gs 'clothing', 'wear', 'bomba_outfits', rand(1,170)
-			
+
 		elseif $acting['outfit_type'] = 'salacious_outfits':
 			gs 'clothing', 'wear', 'flamingos_outfits', rand(1,20)
-			
+
 		elseif $acting['outfit_type'] = 'salacious_dress':
 			gs 'clothing', 'wear', 'flamingos_dress', rand(1,150)
-		
+
 		elseif $acting['outfit_type'] = 'scandalicious_outfits':
 			gs 'clothing', 'wear', 'flamingos_outfits', rand(1,20)
-			
+
 		elseif $acting['outfit_type'] = 'scandalicious_dress':
 			gs 'clothing', 'wear', 'flamingos_dress', rand(1,50)
-		
-		
+
+
 		!!REMINDER: add swimwear
-		
-		
+
+
 		end
-		
-!!{		
-		if $acting['costume_underwear'] = 'none':
-			
-		elseif $acting['costume_underwear'] = 'braless':
-			if $braworntype ! 'none':
-				gs 'bras','remove'
-				
-			else
-				if $costuming['panties'] = 'fashionista':
-			
-			end
-		elseif $acting['costume_underwear'] = 'pantyless':
-		
+	end
+!!{
+	if $acting['costume_underwear'] = 'none':
+
+	elseif $acting['costume_underwear'] = 'braless':
+		if $braworntype ! 'none':
+			gs 'bras','remove'
+
 		else
-		
+			if $costuming['panties'] = 'fashionista':
+
+			end
+
 		end
-		
+	elseif $acting['costume_underwear'] = 'pantyless':
+
+	else
+
 	end
 }
-	
+
 	costuming['check'] = acting['scene_outfit']
 end
+
 !! ------------------------------------------- Extra Roles -------------------------------------------
+
 if $ARGS[0] = 'SpringBreakFlasher':
 	gs 'clothing', 'wear', 'gm_outfits', 149
 	gs 'bras','remove'
@@ -139,7 +151,9 @@ if $ARGS[0] = 'UndressingLockerGirl':
 	end
 end
 
+
 !! ------------------------------------------- Minor Roles -------------------------------------------
+
 if $ARGS[0] = 'DinerWaitress':
 	gs 'clothing', 'wear', 'nerdvana_outfits', 17
 	acting['scene_makeup'] = 3
@@ -153,12 +167,12 @@ if $ARGS[0] = 'HotBartender':
 		acting['scene_makeup'] = 4
 		costuming['check'] = acting['scene_outfit']
 	elseif acting['scene_outfit'] = 3:
-		
+
 	else
 		gs 'clothing', 'wear', 'gm_dress', 38
 		acting['scene_makeup'] = 4
 		costuming['check'] = acting['scene_outfit']
-		
+
 	end
 end
 
@@ -178,4 +192,4 @@ end
 
 
 
---- costuming_outfits1 ---------------------------------
+--- costuming_outfits1 ---------------------------------

+ 4 - 4
locations/dachamy.qsrc

@@ -23,13 +23,13 @@ act 'Go into the house':gt 'dachain', 'start'
 
 if sunWeather = 1:
 	if pcs_stam >=15 or (pcs_stam >= 10 and mc_inventory['book_yoga'] + mc_inventory['hula_hoop'] > 0):
-		if $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich':
+		if PCloSport = 0:
 			*nl
-			'You can do some exercises here.'
-			act 'Exercise': gt 'exercise', 'workout'
+			'You could do some exercises here if you were wearing exercise clothes.'
 		else
 			*nl
-			'You could do some exercises here if you were wearing exercise clothes.'
+			'You can do some exercises here.'
+			act 'Exercise': gt 'exercise', 'workout'
 		end
 	end
 end

+ 12 - 19
locations/dimaEv.qsrc

@@ -490,19 +490,16 @@ if $ARGS[0] = 'dimkaabuse6':
 	minut += 20
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/nip.jpg"></center>'
 	'Dimka make you lie down, and binds you until you are fully immobilized. He looks at you with a pensive expression. "Ok... Hm... I think that you don''t understand your position... Hmm, let''s see if you can learn something" then he clamps your nipples in small vices and tightens the jaws. It hurts, but then you see what he has prepared, and cry in terror. Suddenly he stabs a needle through your nipple. You howl in pain, but Dimka spits on you as you cry and sticks in another needle forcing you to howl again. You yell and swear at this fucking sadist, but Dimka coldly continues an to your ever growing horror, connect them to a battery. Little shocks run through your body, enhancing the sensation of helplessness. After an eternity of sobbing, pain and pleading. He releases you.'
-	if pirsF > 0:
+	if pcs_piercings['nipple'] > 0:
 		'When he gets bored of watching you in pain, Dimka pulls the needles out of your nipples and sets you free.'
 		gs 'pain', 7, 'nipples', 'pierce'
-	end
-	if pirsF = 0:
-		pirsF = 1
-		pirsF1_owned = 1
-		pierWearCount += 1
+	else
 		gs 'pain', 9, 'nipples', 'pierce'
+		gs 'piercing_management', 'add', 'nipple', 1
 		'When he finally gets bored, Dimka pierces your nipples with metal bars, then sets you free.'
 	end
 	gs 'stat'
-	act 'Leave':gt 'pav_residential'
+	act 'Leave': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse7':
@@ -513,13 +510,11 @@ if $ARGS[0] = 'dimkaabuse7':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/ton.jpg"></center>'
 	'Dimka binds you until you are fully immobilized. "As a slut, you have a dirty tongue. That can''t be, you must be clean for me. So... I am going to teach you a lesson in personal hygiene." You try to recoil in horror at the needles in his hands, but you are trapped. He grabs hold of your tongue and suddenly pushes a needle through it. You squeal and twitch from the sharp pain. Dimka amuses himself by sticking needles through your tongue, lips and cheeks. The more you howl in pain, the more excited he gets.'
-	if pirsA > 0:'When he gets bored of watching you in pain, Dimka pulls the needles out of your tongue and sets you free.'
-	if pirsA = 0:
-		pirsA = 1
-		pirsA1_owned = 1
-		pierWearCount += 1
+	if pcs_piercings['tongue'] > 0:
+		'When he gets bored of watching you in pain, Dimka pulls the needles out of your tongue and sets you free.'
+	else
+		gs 'piercing_management', 'add', 'tongue', 1
 		'When he gets bored of watching you in pain, Dimka pulls the needles, pierces your tongue with a metal bar, then sets you free'
-		pierCount += 1
 	end
 	act 'Leave':gt 'pav_residential'
 end
@@ -532,13 +527,11 @@ if $ARGS[0] = 'dimkaabuse8':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/vag.jpg"></center>'
 	'Dimka binds you until you are fully immobilized. "You know, a lot of people think that a piercing in the cunt enhances the pleasure during sex... Something about more blood flow... So... I was thinking, that you as my personal fucktoy need a little encouragement to come here... So let''s begin." Then he picks up a safety pin and pricks your labia. You howled at the sharp unbearable pain, struggling against your bonds, but Dimka does not calm down until he has sealed your entire vagina with safety pins.'
-	if pirsG > 0:'When he gets bored of watching you in pain, Dimka takes the pins out of your pussy and sets you free.'
-	if pirsG = 0:
-		pirsG = 1
-		pirsG1_owned = 1
-		pierWearCount += 1
+	if pcs_piercings['pussy'] > 0:
+		'When he gets bored of watching you in pain, Dimka takes the pins out of your pussy and sets you free.'
+	else
+		gs 'piercing_management', 'add', 'tongue', 1
 		'When he gets bored of watching you in pain, Dimka takes the pins out of your pussy, pierces your clitoris, then sets you free'
-		pierCount += 1
 	end
 	act 'Leave':gt 'pav_residential'
 end

+ 2 - 2
locations/dimaHome.qsrc

@@ -176,7 +176,7 @@ if $ARGS[0] = 'bathroom2':
 	'This restroom has a large sink area and tile floors. The toilet sits along the far wall. You also notice a walk-in shower and large bathtub. You imagine how luxurious it must feel to bathe in here.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	gs 'piercing_management', 'set_manage_string'
 
 	if mc_inventory['shampoo'] > 0:
 		act 'Take a shower (0:15)':
@@ -315,7 +315,7 @@ if $ARGS[0] = 'dimka_master_bathroom':
 	'The master bathroom is a huge space with a large sink area and tile floors. The toilet sits along the far wall. You can''t help but feel impressed by the size of the walk-in shower and deep bathtub. It all looks very expensive.'
 	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
 	*nl
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	gs 'piercing_management', 'set_manage_string'
 	if mc_inventory['shampoo'] > 0:
 		act 'Take a shower':
 			*clr & cla

+ 1 - 1
locations/dimaRevenge.qsrc

@@ -934,7 +934,7 @@ if dimaRevChoice = 4:
 					act 'Just watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/oldschool/gophangout/party/party.jpg"></center>'
-						'You watch the two of them make out and then they drift into another room to be alone. You rejoin the party, talking with others and drinking. You spend the whole day there, even passing out for awhile, only to wake up to several others also passed out. Seems like the party finally ran out of steam. You get up and look around a bit, stretching before heading out. You check your phone on the way and see that school is just getting out. On your way out, you spot Dimka hitting on a girl. She pushes him away and runs off, not even giving him the time of day. He looks at you with eyes full of anger, but he looks down when you glare back. It looks like you broke his spirit a bit. You smile as you leave the school grounds.'
+						'You watch the two of them make out and then they drift into another room to be alone. You rejoin the party, talking with others and drinking. You spend the whole day there, even passing out for a while, only to wake up to several others also passed out. Seems like the party finally ran out of steam. You get up and look around a bit, stretching before heading out. You check your phone on the way and see that school is just getting out. On your way out, you spot Dimka hitting on a girl. She pushes him away and runs off, not even giving him the time of day. He looks at you with eyes full of anger, but he looks down when you glare back. It looks like you broke his spirit a bit. You smile as you leave the school grounds.'
 						act 'Continue': gt 'pav_residential'
 					end
 				end

+ 74 - 74
locations/dimalina.qsrc

@@ -8,7 +8,7 @@
 
 3 - Event-6 is divided in two parts Sveta and Lina, and must be played in order.
 
-3 - Event-7 trigger after leaving Dimka''s home whith Lina(Events 5 6-Lina 8) 
+3 - Event-7 trigger after leaving Dimka''s home whith Lina(Events 5 6-Lina 8)
 
 4 - Event 8 is repeatible
 
@@ -45,12 +45,12 @@ if $ARGS[0] = 'dimkalina1':
 	if dimlinaQW = 0: dimlinaQW = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D1.jpg"></center>'
-	'With reluctance, you remove your clothes and watch Dimka carefully as he shows you a package. Inside there is a rubber ball with leather straps.' 
-	'"You know what it is, slut?"' 
-	'Swallowing hard, you nod your head in agreement. "A ball gag?"' 
+	'With reluctance, you remove your clothes and watch Dimka carefully as he shows you a package. Inside there is a rubber ball with leather straps.'
+	'"You know what it is, slut?"'
+	'Swallowing hard, you nod your head in agreement. "A ball gag?"'
 	'"That''s right! I was wondering what perverted shit a slut like you would want as a gift, and here it is, all for you. But before that, take this." In his hand, there is a pair of pink pills. Just as you open your mouth to question him, he shoves the pills in. You try to push them out, but Dimka immediately stuffs the ball gag into your mouth and straps it in. It''s so big, you begin to think that he chose the wrong size as your jaw starts to hurt.'
 	'"Now look at this, whore," He says as he opens the closet door.'
-	
+
 	gs 'pain', 2, 'jaw', 'bind'
 	gs 'stat'
 	act 'Look inside the closet':
@@ -58,44 +58,44 @@ if $ARGS[0] = 'dimkalina1':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D2.jpg"></center>'
 		'You hesitantly walk over and peer inside. You are... not sure what he was doing until you see the chains. What the hell? The sick fuck has improvised a bondage set in his closet.'
 		'"Ahh... Why that face?. And to think I spent all this time making this lovely gift for you!" He sighs. "Don''t worry I''m sure you will learn to appreciate it. So... come on, get in."'
-		'You''re looking apprehensively at the chains and start to consider making a run for the door when Dimka''s mobile sounds. Quickly, he answers the call.' 
-		'"Dimka here... Hm... Oh...? You''re on your way...? Hm... What...? No...! Of course, no...! Yeah, I''ll be waiting."' 
+		'You''re looking apprehensively at the chains and start to consider making a run for the door when Dimka''s mobile sounds. Quickly, he answers the call.'
+		'"Dimka here... Hm... Oh...? You''re on your way...? Hm... What...? No...! Of course, no...! Yeah, I''ll be waiting."'
 		'With an enthusiastic smile, Dimka shoves you into the closet and chains you up, even taking a moment to admire his work. The chains hurt you and the position doesn''t let you relax.'
 		'"Alright, this is what is about to happen: I''m going to close the door, and if I hear a <i>single</i> sound from you during this visit, you will be punished. Understood?"'
 		gs 'willpower', 'humiliation', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Shake your head in disagreement (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
-				*clr & cla				
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D3.jpg"></center>'
-				'He smiles down at you. "You will learn to obey me, slut, you will learn." He tightens the chains around your throat until you can''t breathe. Shaking, you fight to breathe as your vision starts to darken. Finally, he releases the chains and shuts the door as you sit there coughing and teary eyed. You focus on catching your breath and after awhile you take notice to Dimka going about his business as usual on the other side of the door. You are just a toy for him, to fuck, hurt and forget.' 
-				'"Come in and make yourself comfortable."' 
-				'Spying through a slit in the closet door, you see the new guest and you recognize her as Avelina Starov. Judging by her expression, she seems unimpressed and leery of being in Dimka''s room.' 
-				'His eyes do a superficial sweep of the room and during a moment his eyes meet yours. Maybe it''s the drug but you are sure that he winks at you.' 
-				'For awhile, the two of them talk about trivialities. When the conversation comes to a pause, he leans closer and presses his lips against hers, the kiss quickly deepening as they start making out. While they kiss, he tries to slip his hands beneath her top, hoping to grope at her breasts but she stops him. That sudden move kills the mood and the two of them seems unsure of what to do until Dimka finally breaks the awkward silence.'
-				
+				'He smiles down at you. "You will learn to obey me, slut, you will learn." He tightens the chains around your throat until you can''t breathe. Shaking, you fight to breathe as your vision starts to darken. Finally, he releases the chains and shuts the door as you sit there coughing and teary eyed. You focus on catching your breath and After a while you take notice to Dimka going about his business as usual on the other side of the door. You are just a toy for him, to fuck, hurt and forget.'
+				'"Come in and make yourself comfortable."'
+				'Spying through a slit in the closet door, you see the new guest and you recognize her as Avelina Starov. Judging by her expression, she seems unimpressed and leery of being in Dimka''s room.'
+				'His eyes do a superficial sweep of the room and during a moment his eyes meet yours. Maybe it''s the drug but you are sure that he winks at you.'
+				'for a while, the two of them talk about trivialities. When the conversation comes to a pause, he leans closer and presses his lips against hers, the kiss quickly deepening as they start making out. While they kiss, he tries to slip his hands beneath her top, hoping to grope at her breasts but she stops him. That sudden move kills the mood and the two of them seems unsure of what to do until Dimka finally breaks the awkward silence.'
+
 				if pcs_health > 20: pcs_health -= 20
 				if pcs_mood > 5: pcs_mood -= 5
 				npc_rel['A1'] -= 5
 				gs 'pain', 3, 'throat', 'choke'
 				gs 'stat'
-				act 'Listen carefully': gt 'dimalina', 'Listen' 
+				act 'Listen carefully': gt 'dimalina', 'Listen'
 			end
 		else
 			act 'Shake your head in disagreement (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 		act 'Nod in understanding':
-			*clr & cla	
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D3.jpg"></center>'
-			'You obediently agree to follow his command before the door is finally shut. You sit there. Silent. Thinking. Hearing Dimka go about his business as if you weren''t there. You are just a toy for him, to fuck, hurt and forget.' 
-			'"Come in and make yourself comfortable."' 
-			'Spying through a slit in the closet door, you see the new guest and you recognize her as Avelina Starov. Judging by her expression, she seems unimpressed and leery of being in Dimka''s room.' 
-			'His eyes do a superficial sweep of the room and during a moment his eyes meet yours. Maybe it''s the drug but you are sure that he winks at you.' 
-			'For awhile, the two of them talk about trivialities. When the conversation comes to a pause, he leans closer and presses his lips against hers, the kiss quickly deepening as they start making out. While they kiss, he tries to slip his hands beneath her top, hoping to grope at her breasts but she stops him. That sudden move kills the mood and the two of them seems unsure of what to do until Dimka finally breaks the awkward silence.'
-			
+			'You obediently agree to follow his command before the door is finally shut. You sit there. Silent. Thinking. Hearing Dimka go about his business as if you weren''t there. You are just a toy for him, to fuck, hurt and forget.'
+			'"Come in and make yourself comfortable."'
+			'Spying through a slit in the closet door, you see the new guest and you recognize her as Avelina Starov. Judging by her expression, she seems unimpressed and leery of being in Dimka''s room.'
+			'His eyes do a superficial sweep of the room and during a moment his eyes meet yours. Maybe it''s the drug but you are sure that he winks at you.'
+			'for a while, the two of them talk about trivialities. When the conversation comes to a pause, he leans closer and presses his lips against hers, the kiss quickly deepening as they start making out. While they kiss, he tries to slip his hands beneath her top, hoping to grope at her breasts but she stops him. That sudden move kills the mood and the two of them seems unsure of what to do until Dimka finally breaks the awkward silence.'
+
 			if pcs_mood > 10: pcs_mood -= 10
 			npc_rel['A1'] += 1
-			gs 'stat'	
+			gs 'stat'
 			act 'Listen carefully': gt 'dimalina', 'Listen'
 		end
 	end
@@ -131,7 +131,7 @@ if $ARGS[0] = 'Listen':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/F1.jpg"></center>'
-			'You break the chains and overpower Dimka, then take Lina in your arms and get out of there as fast as possible. Far away from that psychopath, you embrace Lina and admire her as she stands there in your arms, wearing nothing but a sexy set of lingerie. "Please make me your bitch and do whatever you want!" Lina begs you. Your hands drift to her bottom and caress the taut flesh, making Lina moan. You kiss her and smile. As you push one hand under her panties, she freezes and opens her legs slightly to make it easy for you to caress between her thighs. She moans, cries, and whimper as you expertly drive her to orgasm after orgasm. But this isn''t the end. You pause for a moment, she looks at you with tired and puzzled eyes. After a moment she gasps in shock and pain as you begin to finger-fuck her asshole...'	 
+			'You break the chains and overpower Dimka, then take Lina in your arms and get out of there as fast as possible. Far away from that psychopath, you embrace Lina and admire her as she stands there in your arms, wearing nothing but a sexy set of lingerie. "Please make me your bitch and do whatever you want!" Lina begs you. Your hands drift to her bottom and caress the taut flesh, making Lina moan. You kiss her and smile. As you push one hand under her panties, she freezes and opens her legs slightly to make it easy for you to caress between her thighs. She moans, cries, and whimper as you expertly drive her to orgasm after orgasm. But this isn''t the end. You pause for a moment, she looks at you with tired and puzzled eyes. After a moment she gasps in shock and pain as you begin to finger-fuck her asshole...'
 			'You blink as your mind awakens from the sudden daydream. During your sex-crazed haze, Dimka seems to has moved Lina to a new position. She kneels on the bed before him.'
 			gs 'arousal', 'voyeur', 5, 'bound'
 			gs 'stat'
@@ -150,7 +150,7 @@ if $ARGS[0] = 'Listen':
 		act 'Fantasize about... Dimka?!':
 			*clr & cla
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/FD1.jpg"></center>' 
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/FD1.jpg"></center>'
 			'Dimka kneels before you, he is your bitch, but you aren''t happy. He doesn''t know how to lick boots properly like a bitch should. This is unforgivable and only serve to piss you off. "Seriously? Why must I waste my time helping a little sick fuck like yourself? Come on!" You firmly kick him aside and he lays there, staring up at you with a pathetic look. "Poor little pet..." You sigh. "A good mistress must educate her wards. I''m far too good for you, you realize that, right?" You sit in a chair and let him clean them slowly and a bit sloppily. Why... won''t... he... learn?! You whip his back and he lets out a strained whimper. After trying to get him to clean your boots again you realize... he''s doing it on purpose! Of course, he''s a bratty little bitch. He''s getting off on this, but he knows better to ask for release. If he wants it so bad, then it seems like some pegging will be in order, but he won''t get his release so easily. With a smile, you relax and recline in your chair and watch a nervous Dimka who doesn''t realize what''s going to happen next...'
 			'You blink as your mind awakens from the sudden daydream. Dimka seems to has moved Lina to a new position. She kneels on the bed before him.'
 			gs 'arousal', 'voyeur', 5, 'bound'
@@ -169,7 +169,7 @@ if $ARGS[0] = 'Listen':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'Help':
 	*clr & cla
 	dimbadgirl = 1
@@ -180,7 +180,7 @@ if $ARGS[0] = 'Help':
 	'"Oh... Look Dimka, I don''t feel like..."'
 	'"Hey don''t worry, just relax. Here, I''ll put on some music, trust me you''ll love it!" Dimka puts on some music, drowning out your muffled cries. After a short moment, they''re continuing where they left off until Lina is left kneeling on his bed. He stops and walks toward her, his erection very clearly pressing against his pants.'
 	'"Lina... Can you...? I mean..."'
-	
+
 	npc_rel['A1'] -= 5
 	npc_rel['A19'] += 5
 	if pcs_health > 20: pcs_health -= 20
@@ -190,7 +190,7 @@ if $ARGS[0] = 'Help':
 	gs 'stat'
 	act 'Watch helplessly': gt 'dimalina', 'watch'
 end
-	
+
 if $ARGS[0] = 'watch':
 	*clr & cla
 	menu_off = 1
@@ -220,7 +220,7 @@ if $ARGS[0] = 'watch':
 			'"What? Oh... Listen I... I''m sorry for screwing this up, I hope you don''t hate me..."'
 			'She gives him a little smile but doesn''t say anything...'
 			'"Well... call me, okay?"'
-			'She nods slightly but that''s all before she finally leaves.' 
+			'She nods slightly but that''s all before she finally leaves.'
 			gs 'arousal', 'voyeur_sex', 5, 'bound'
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -237,7 +237,7 @@ if $ARGS[0] = 'watch':
 					'You struggle to maintain your footing as you fight to breathe. It feels like the moment stretches on forever, but it suddenly comes to an end when he loses his grip and lets you fall. As you lie there in a heap on the floor, he takes away the ball gag and chains.'
 					'"Come on, get dressed and leave, I''m only human and can''t fuck you now."'
 					'You groan and stand up on unstable legs. Your body hurts and you''re still in a lustful haze. You get dressed as quick as you can and leave.'
-					
+
 					pcs_health -= 20
 					if pcs_mood > 5: pcs_mood -= 5
 					gs 'dimalina', 'bindpain'
@@ -287,7 +287,7 @@ if $ARGS[0] = 'dimkalina2':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D10.jpg"></center>'
 				'You know that Lina has never been one to say "no" to people, so after a moment she sighs and begins to undress. Slowly and hesitantly, she slips out of her skirt, then kneels and bends over, putting her head on the floor with her butt in the air. He moves around Lina, taking snaps, but then stops.'
-				'"This isn''t working... Hm... Let''s see." Dimka starts to pull at her panties and Lina tries to stop him, but he just yanks them down without hesitation.' 
+				'"This isn''t working... Hm... Let''s see." Dimka starts to pull at her panties and Lina tries to stop him, but he just yanks them down without hesitation.'
 				'"Come on, you''ll look great, I promise!"'
 				'She finally resigns herself to being Dimka''s model and lets him pull them down her thighs.'
 				gs 'willpower', 'misc', 'self', 'medium'
@@ -306,10 +306,10 @@ if $ARGS[0] = 'dimkalina2':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/F2.jpg"></center>'
 					'Lina and You are kneeling on the floor. Your underwear is nowhere to be found. She smiles as your last bout of sex has confirmed that being your lover is the best decision in her life. With skilled fingers you tease her inner thighs, making her moan in frustrated anticipation. She begs, pleads and supplicates for more... and finally you caress her lower lips. She cums and the smell of her arousal fills the room. You begin a fast masturbation, giving her what she needs. She cums again and again under your expertise. Finally, you stop and look at her... waiting. Wasted, she asks you to make love to her.'
 					'Sadly, the sound of Lina''s voice puts a stop to your fantasy.'
-					
+
 					pcs_horny += 20
 					gs 'stat'
-					
+
 					gs 'willpower', 'misc', 'self', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'Cause a distraction (<<will_cost>> Willpower)':
@@ -327,10 +327,10 @@ if $ARGS[0] = 'dimkalina2':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/FD2.jpg"></center>'
 					'What the fuck is wrong with him? Why doesn''t he understand that this is all he is good for: licking your boots. You''re tired of him trying to be coy. You could be doing so much more, be instead you have to sit here and train him to be a proper sub bitch. Dimka must sense your growing frustration with him because you hear him whimper and tremble. Not in the mood for his games, you take your other foot and step on his fingers as he kneels beneath you on all fours. You ignore his cries of pain, instead you look out a nearby window and notice a couple walking by. The two are smiling, the woman is giggling and hanging on to him while they whisper to each other. You know as soon as they''re alone, they''ll be fucking each other, and the thought of that makes you both jealous and a bit horny. You wanted to have some fun today, but no, instead you have to deal with this.'
 					'Sadly, the sound of Lina''s voice puts a stop to your fantasy.'
-					
+
 					pcs_horny += 20
 					gs 'stat'
-					
+
 					gs 'willpower', 'misc', 'self', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'Cause a distraction (<<will_cost>> Willpower)':
@@ -347,7 +347,7 @@ if $ARGS[0] = 'dimkalina2':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'distraction':
 	dimbadgirl = 1
 	*clr & cla
@@ -360,7 +360,7 @@ if $ARGS[0] = 'distraction':
 	'"Don''t worry! Something just fell off the shelf in there," he tells her, but she seems unconvinced. Quickly he follows up it up, "I didn''t want to tell you, but... it''s a present I''ve been getting ready for you. I had to make sure it didn''t get messed up."'
 	'Lina looks at him then the closet and finally the door. She''s not buying it and wants to leave! Good! But Dimka isn''t going to lose her so easily. He moves closer to Lina and caress her hair.'
 	'"Look Lina... can we just start over? I don''t want things to end likes this... come here, babe." Dimka pulls her closer into a deep kiss and all her doubt seems to melt away as they make out. By the end of it, Lina doesn''t say anything, she just grabs his zipper and takes out his dick before she starts to stroke him.'
-	
+
 	pcs_health -= 20
 	npc_rel['A1'] -= 5
 	gs 'pain', 3, 'throat', 'choke'
@@ -369,24 +369,24 @@ if $ARGS[0] = 'distraction':
 	act 'Watch her jerk him off': gt 'dimalina', 'cums1'
 end
 
-if $ARGS[0] = 'watch2': 
+if $ARGS[0] = 'watch2':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D11.jpg"></center>'
 	'"Like this, Dimka?"'
-	'He groans, "Oh yeah... just like that, keep going." You didn''t notice until now that they''ve moved to the bed, where Lina has been giving him a handjob. As he calls her his girlfriend, you think she seems excited as she spits onto his cock and pumps him a bit faster, but judging by the look of discomfort, it''s obvious she did that to distract him so he doesn''t call her that again.' 
+	'He groans, "Oh yeah... just like that, keep going." You didn''t notice until now that they''ve moved to the bed, where Lina has been giving him a handjob. As he calls her his girlfriend, you think she seems excited as she spits onto his cock and pumps him a bit faster, but judging by the look of discomfort, it''s obvious she did that to distract him so he doesn''t call her that again.'
 	'"Fuck... that''s much better!" Dimka then caresses the back of Lina''s head as his face twists with pleasure.'
 	gs 'arousal', 'voyeur_sex', 5, 'bound'
 	gs 'stat'
 	act 'Watch her jerk him off': gt 'dimalina', 'cums1'
-end	
+end
 
-if $ARGS[0] = 'cums1': 
+if $ARGS[0] = 'cums1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D12.jpg"></center>'
 	'"Please Lina... fuck... can you use your mouth?"'
 	'Lina looks at him only for a moment, and with a quickness that shows she just wants this over and done with, she takes his dick into her mouth and starts to suck him. He grunts in obvious pleasure, as Lina begins a slow-paced blowjob.'
 	'"Yes... You... Hmf..."'
-	'She moves faster, making Dimka breath quicken. Your altered mental state can only raise your arousal, as the scene, more proper on a porn video play before you. He is reaching his climax and quickly pushes her head away so she can stroke him until he''s finally shooting his load all over her face. You groan in frustration as your own release is negated by the chains on your hands and legs.' 
+	'She moves faster, making Dimka breath quicken. Your altered mental state can only raise your arousal, as the scene, more proper on a porn video play before you. He is reaching his climax and quickly pushes her head away so she can stroke him until he''s finally shooting his load all over her face. You groan in frustration as your own release is negated by the chains on your hands and legs.'
 	act 'Watch her leave':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D13.jpg"></center>'
@@ -420,25 +420,25 @@ if $ARGS[0] = 'dimkalina3':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D2.jpg"></center>'
-			'Gritting your teeth, you look to Dimka. He''s distracted adjusting some settings, so you throw the pills into your clothes and hide them. Relieved that he hasn''t noticed, you put on the gag ball. Fortunately, this time it''s you who put this thing on and manage to do so without hurting your jaw. Dimka ends what he was doing and looks at you with an expression of satisfaction on his face.' 
+			'Gritting your teeth, you look to Dimka. He''s distracted adjusting some settings, so you throw the pills into your clothes and hide them. Relieved that he hasn''t noticed, you put on the gag ball. Fortunately, this time it''s you who put this thing on and manage to do so without hurting your jaw. Dimka ends what he was doing and looks at you with an expression of satisfaction on his face.'
 			'"Look Slut, if you behave, the next time I will give you a gift. OK?"'
 			'You wordlessly agree by nodding, and he seems satisfied. As usual he chains you up in the closet but weirdly, today he seems genuinely in a good mood. You wait there as Dimka prepare the cameras in the room.'
 			act 'Watch': gt 'dimalina', 'watch3'
 		end
 	else
 		act 'Hide the pills (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
+	end
 	act 'Take the pills':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D2.jpg"></center>'
-		'You are trapped and without options. Gritting your teeth, you take them. After eating the pills, you put in the gag. Fortunately, this time it''s you who put this thing on and manage to put it on without hurting your jaw. Dimka ends what he was doing and looks at you with an expression of satisfaction on his face.' 
+		'You are trapped and without options. Gritting your teeth, you take them. After eating the pills, you put in the gag. Fortunately, this time it''s you who put this thing on and manage to put it on without hurting your jaw. Dimka ends what he was doing and looks at you with an expression of satisfaction on his face.'
 		'"Look Slut, if you behave, the next time I will give you a gift. OK?"'
 		'You wordlessly agree with a nod, and he seems satisfied. As usual he chains you up in the closet but weirdly, today he seems genuinely in a good mood. You wait there as Dimka prepare the cameras in the room.'
 		act 'Watch': gt 'dimalina', 'watch3'
 	end
 end
-		
+
 if $ARGS[0] = 'watch3':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D3.jpg"></center>'
@@ -446,17 +446,17 @@ if $ARGS[0] = 'watch3':
 	'"Look I''m sorry, can we... can we talk about this?"'
 	'"I''m sorry Dimka, it''s just that... I like someone else and this can''t work."'
 	'"Right... well we can still be friends, can''t we? Stay for a bit, have a drink and hang out."'
-	'After that, he leads Lina into his room and leaves her for awhile before returning with two sodas. The two of them seem on edge as they sit in silence sipping on their drinks. You notice Lina begins to rub her legs together as her breathing gets a bit heavier. You quickly recognize her actions as ones you''ve done before... there is no mistake: Lina was slipped those same pink pills, no doubt put in her drink. Groaning she begins to stand.'
+	'After that, he leads Lina into his room and leaves her for a while before returning with two sodas. The two of them seem on edge as they sit in silence sipping on their drinks. You notice Lina begins to rub her legs together as her breathing gets a bit heavier. You quickly recognize her actions as ones you''ve done before... there is no mistake: Lina was slipped those same pink pills, no doubt put in her drink. Groaning she begins to stand.'
 	act 'She is drugged...':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D14.jpg"></center>'
-		'"Hmm... I think... That... Hm?" She stands and then stumbles a bit before falling back onto the bed. Dimka sees his chance and gently guides her to lay down. She tries to fight back, but it only results in her being positioned onto her stomach by him. Smiling, he puts his hands under her skirt and slides her panties down to her thighs. Lina lets out a breathy moan as she looks back at him in confusion and arousal.' 
+		'"Hmm... I think... That... Hm?" She stands and then stumbles a bit before falling back onto the bed. Dimka sees his chance and gently guides her to lay down. She tries to fight back, but it only results in her being positioned onto her stomach by him. Smiling, he puts his hands under her skirt and slides her panties down to her thighs. Lina lets out a breathy moan as she looks back at him in confusion and arousal.'
 		'"I know how to make you behave..." Dimka whispers to her before he begins to unzip the front of his jeans. You close your eyes for a moment...'
 		act 'Dream of Lina':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/F3.jpg"></center>'
-			'You can hear Lina''s cries of pleasure and a sudden image of her comes to mind. She is on all fours moaning as you massage lube into her tight little ass. She looks at you with concern, but you know what to do, you are going to fill that cute hole with the beads. Your fingers were only the beginning. You lick the beads and spread her cheeks. When you begin to push, she gasps, cries and clenches her teeth as she adjusts to the toy and slowly starts to enjoy the feeling. You smile knowing that by the end of this, she''ll be the perfect anal slut for you.' 
+			'You can hear Lina''s cries of pleasure and a sudden image of her comes to mind. She is on all fours moaning as you massage lube into her tight little ass. She looks at you with concern, but you know what to do, you are going to fill that cute hole with the beads. Your fingers were only the beginning. You lick the beads and spread her cheeks. When you begin to push, she gasps, cries and clenches her teeth as she adjusts to the toy and slowly starts to enjoy the feeling. You smile knowing that by the end of this, she''ll be the perfect anal slut for you.'
 			'Just as you begin to thrust the beads in and out of her ass a bit, you''re pulled back to reality by the sound of grunting from Dimka'
 			pcs_horny += 10
 			gs 'stat'
@@ -502,12 +502,12 @@ if $ARGS[0] = 'linadefiled':
 		'"Open your fucking mouth!"'
 		'Lina obeys and even manages to give him a lick before he cums onto her exposed tongue.'
 		'"Uff... That was great!"'
-		'For awhile, Lina doesn''t move. She lies there breathing heavily, staring blankly ahead as she processes what just happened. Finally, she gets up and shakily redress. It isn''t until she''s mostly done getting dressed that she starts to cry, running out of the room whimpering. Dimka then opens the closet.'
+		'for a while, Lina doesn''t move. She lies there breathing heavily, staring blankly ahead as she processes what just happened. Finally, she gets up and shakily redress. It isn''t until she''s mostly done getting dressed that she starts to cry, running out of the room whimpering. Dimka then opens the closet.'
 		'"That was a close call, but dad says that he will not pay another abortion. Too bad, you know, I think she would make the perfect breeding material."'
 		'He doesn''t seem at all bothered with what has just happened. He actually seems quite happy with himself as he quickly removes your chains and gag.'
 		'"Ok Slut, a deal is a deal. You''ve been a good girl so I''ll have a treat for you, but for now I''m done playing with you, so get out."'
 		'Silently you redress and leave.'
-		
+
 		gs 'dimalina', 'bindpain'
 		gs 'arousal', 'voyeur_sex', 10, 'bound'
 		if pcs_mood > 10: pcs_mood -= 10
@@ -535,7 +535,7 @@ if $ARGS[0] = 'dimkalina4':
 		'He passes the camera to her. You can see tears on her face and at that point, you know exactly what is happening in her head. Discouragement, rage, fear, shock...'
 		'"If you don''t do..."'
 		'Slap!'
-		'The sound of her hand hitting Dimka''s face is deafening. He falls back and crashes down on the bed. At the same time, Lina takes the camera and smashes it on the floor. She turns and begins to run towards the door, but before reaching it, hesitates. She returns to grab what is left of the camera and leaves the room.' 
+		'The sound of her hand hitting Dimka''s face is deafening. He falls back and crashes down on the bed. At the same time, Lina takes the camera and smashes it on the floor. She turns and begins to run towards the door, but before reaching it, hesitates. She returns to grab what is left of the camera and leaves the room.'
 		act 'Oh shit!':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
@@ -545,9 +545,9 @@ if $ARGS[0] = 'dimkalina4':
 			'"Time for your punishment, Slut!"'
 			'He pushes you into a doggy position and shows you the hook.'
 			'"You know what this is, stupid cow? It''s an anal hook! Let''s see if I can teach you some manners."'
-			
+
 			act 'Endure': gt 'dimalina', 'endure'
-			
+
 !{leave this commented out for now
 			if (spellKnown['stun'] = 1 and pcs_mana >= spellMana['stun']) or pcs_stren >= 40:
 				act 'Try to escape(Note: Will have BAD consequences)': gt 'dimalina', 'escape'
@@ -623,9 +623,9 @@ if $ARGS[0] = 'dimkalina6':
 					'"Oh? What do we have here? Take a look my Little Slut, it seems your friend has come to take your place. Well, I suppose you can go then..." Dimka proceeds to undo the chains and she falls to the floor gasping for breath. Red chain marks all over her body attest to the pain that must have suffered. Without looking at her, he takes out the anal hook that had been inside her and then takes off the gag and binding tape.'
 					'"Get out of here before I change my mind"'
 					'Lina looks at you with a mix of fear, gratitude and regret as Dimka orders you to get in the closet. You look at her and hope she leaves quickly as you take your place inside the closet. No longer hesitating, Lina grabs her clothes from a pile beside his bed and quickly puts on her top and bottoms and bundles the rest up in her arms before rushing out the room. Meanwhile, Dimka is too distracted be his rising fury with you to really care what she does. Instead he shoves you against the back wall of the closet as he starts to bind your feet and wrists with the sticky tape.'
-					
+
 					act 'Endure': gt 'dimalina', 'endure'
-					
+
 !{leave this commented out for now
 					if (spellKnown['stun'] = 1 and pcs_mana >= spellMana['stun']) or pcs_stren >= 40:
 						act 'Try to escape(Note: Will have BAD consequences)': gt 'dimalina', 'escape'
@@ -638,7 +638,7 @@ if $ARGS[0] = 'dimkalina6':
 				end
 			else
 				act 'Leave her alone! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 			act '"That... Sounds nice."':
 				*clr & cla
 				gs 'stat'
@@ -739,7 +739,7 @@ if $ARGS[0] = 'dimkalina7':
 							act 'Help her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end
 						act 'You can''t bring yourself to move...': gt 'dimalina', 'linaundress'
-							
+
 						if succubusflag = 1:
 							act 'Succubus comeback': gt 'dimalina', 'succubuslina'
 						end
@@ -761,7 +761,7 @@ if $ARGS[0] = 'dimkalina8':
 	'He gives you a condescending smile and sits smugly in his chair.'
 	'"Yeah... So... You show up just when she is about to arrive? No way that this is a coincidence!"'
 	'Just at that moment, Lina arrive at the room.'
-	'"Ehm... Dimka I''m here! Hm?! Ehm... Hello <<$pcs_firstname>>"' 
+	'"Ehm... Dimka I''m here! Hm?! Ehm... Hello <<$pcs_firstname>>"'
 	act 'He wants to play':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
@@ -787,7 +787,7 @@ if $ARGS[0] = 'dimkalina8':
 			'"Ok. Your turn to undress Little Slut."'
 			act 'She undresses': gt 'dimalina', 'linaundress'
 		end
-		
+
 		gs 'willpower', 'sex', 'force', 'medium'
 		if will_cost <= pcs_willpwr:
 			act '"Neither" (<<will_cost>> Willpower)':
@@ -796,7 +796,7 @@ if $ARGS[0] = 'dimkalina8':
 			end
 		else
 			act 'Neither (<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 succubusflag = 1:
 			act 'Succubus comeback': gt 'dimalina', 'succubuslina'
 		end
@@ -837,7 +837,7 @@ if $ARGS[0] = 'hooksex':
 	if pcs_vag < 10:
 		'You howl in pain, without foreplay you are dry and Dimka is too mad to really care. Enduring his trusts you bite your lips and wait for him to cum.'
 		'"Oh yeah... For a Slut, you know how to maintain a tight cunt. I must..." He grunts with pleasure. "rethink your punishment"'
-		'He continues forcing himself painfully on you. In the meantime, you try to think of other things, anything, to forget about the rape. Your body reacts and some wetness makes the situation less painful. Fortunately, he finally reaches climax and cums.' 
+		'He continues forcing himself painfully on you. In the meantime, you try to think of other things, anything, to forget about the rape. Your body reacts and some wetness makes the situation less painful. Fortunately, he finally reaches climax and cums.'
 		'You two lie there, trying to catch your breath. He then stands up and leaves. "I''m going to shower to get rid of your stink, get out of my home."'
 		'You sob and redress getting out of this madhouse, quickly.'
 	elseif pcs_vag < 20:
@@ -857,7 +857,7 @@ if $ARGS[0] = 'hooksex':
 		minut -= 10
 		gs 'stat'
 	end
-	
+
 	gs 'pain', 2, 'hair', 'pull'
 	gs 'pain', 2, 'cheeks', 'slap'
 	gs 'pain', 2, 'mouth', 'bind'
@@ -874,7 +874,7 @@ end
 if $ARGS[0] = 'helplina':
 	gs 'willpower', 'pay', 'self'
 	*clr & cla
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D25.jpg"></center>'					
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/linased/D25.jpg"></center>'
 	'You are half dressed when a sudden idea pops into your head. Maybe there is a way to help her...'
 	'"What are you doing?" Lina squeaks in surprise as you throw her on the bed. Dimka looks at you with a questioning expression, but before he can say anything, you interrupt him.'
 	'"I''m just getting her ready..." You tell him. Dimka just stands there looking confused as you fight to undress a more than reluctant Lina.'
@@ -918,7 +918,7 @@ if $ARGS[0] = 'helplina':
 				'Dimka slumps back, out of breath and exhausted as he tries to collect himself. "Alright... you''ve done your job, now get out!"'
 				'Dimka then leaves for the restroom. As you and Lina redress, she embraces you.'
 				'"Thanks <<$pcs_firstname>>"'
-				
+
 				gs 'pain', 3, 'throat', 'choke'
 				gs 'dimalina', 'sexpain', 'vaginal'
 				if pcs_mood > 5: pcs_mood -= 5
@@ -981,7 +981,7 @@ if $ARGS[0] = 'walklina':
 			'She sighs and begins to walk alongside you. She seems lost in her thoughts. You try to chat with her but...'
 			'"Can we just... walk?"'
 			'Lina looks at you with pleading eyes and you have to concede. She grabs your hand and puts her head on your shoulder. You decide to take a detour through the park and sense that is the correct choice, since Lina seems to relax. Finally you two end up in the courtyard.'
-			!!act 'Seduce her': 
+			!!act 'Seduce her':
 			act 'Leave':
 				*clr & cla
 				gs 'stat'
@@ -993,7 +993,7 @@ if $ARGS[0] = 'walklina':
 			end
 		end
 	end
-end	
+end
 
 if $ARGS[0] = 'bindpain':
 	gs 'pain', 2, 'neck', 'bind'
@@ -1035,9 +1035,9 @@ if $ARGS[0] = 'escape':
 		'Fear triggers your adrenaline and instinctively, your mana responds and power words escape your mouth. Dimka then freezes and falls back paralyzed. With him momentarily out of action, you grab your clothes and run half-dressed away from his home.'
 		pcs_mana -= spellMana['stun']
 	elseif pcs_stren >= 40:
-		'Fear triggers your adrenaline and with newfound strength you suddenly struggle and thrash against the tape until it rips. Dimka is taken by surprise and doesn''t react fast enough to stop you from slamming back against him. You fall back on top of him and you hear him groan and gasp as the air is knocked out of him. You scramble to your feet and grab your belongings, running away from his house half dressed.'	
+		'Fear triggers your adrenaline and with newfound strength you suddenly struggle and thrash against the tape until it rips. Dimka is taken by surprise and doesn''t react fast enough to stop you from slamming back against him. You fall back on top of him and you hear him groan and gasp as the air is knocked out of him. You scramble to your feet and grab your belongings, running away from his house half dressed.'
 	end
-	
+
 	gs 'dimalina', 'bindpain'
 	gs 'pain', 2, 'mouth', 'bind'
 	if pcs_mood > 10: pcs_mood -= 10
@@ -1070,7 +1070,7 @@ if $ARGS[0] = 'succubusdimka':
 			'"Master, let me help you," You purr. With inhuman grace, you begin to ride him, the rage and madness soon forgotten. His hand caresses your hips and you smile, accelerating your ride and putting him on edge. There is nothing like the touch of a succubus...'
 			'"Oh...<<$pcs_nickname>>" He cums and fills you with energy. Smiling you rise and look at him, he is wasted and exhausted.'
 			'"I think... you can go?" he mumbles tiredly. With a smile, you leave him trying to catch his breath. After taking a quick shower in the restroom, you redress and leave.'
-									
+
 			gs 'pain', 2, 'hair', 'pull'
 			gs 'pain', 2, 'cheeks', 'slap'
 			gs 'pain', 2, 'mouth', 'bind'
@@ -1087,7 +1087,7 @@ end
 if $ARGS[0] = 'succubuslina':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/pc/body/succubusself.jpg"></center>'
-	'You look at the items in his hand for a minute and an idea pops in your head. You can''t stop comparing people with food. As an example, Dimka is a chocolate treat, mouth-watering on the outside, but full of maggots on the inside. On the other hand, Lina is a mix of fruits, sweet and healthy, yet somehow bland. Of course, you can''t mix them. You must do something...' 
+	'You look at the items in his hand for a minute and an idea pops in your head. You can''t stop comparing people with food. As an example, Dimka is a chocolate treat, mouth-watering on the outside, but full of maggots on the inside. On the other hand, Lina is a mix of fruits, sweet and healthy, yet somehow bland. Of course, you can''t mix them. You must do something...'
 	'You call your true self up from its resting place.'
 	'It fills you completely, suffusing your being with power...'
 	'and hunger.'
@@ -1127,7 +1127,7 @@ if $ARGS[0] = 'succubuslina':
 					'You smile and caress her sweaty and cum covered body. A pretty blush appears on her skin.'
 					'"Don''t let him hurt you."'
 					'Picking some semen with your fingers, you push it in her mouth. She fervently opens up her mouth and licks. Oh... Yes. She is yours. Finally, after resting for a moment, you help her redress and leave Dimka''s home.'
-					
+
 					npc_rel['A1'] -= 5
 					npc_rel['A19'] += 5
 					scfeed = succublvl + rand(1,4)
@@ -1173,7 +1173,7 @@ if $ARGS[0] = 'linaundress':
 				'Breathless, Lina opens her mouth, just in time to receive a full face of Dimka''s slimy jizz before falling to the floor sobbing. After some minutes of Lina crying while he sits back with a smile to catch his breath, Dimka gets up and unchains you.'
 				'"Clean her up and get her out of here."'
 				'He leaves for the bathroom and you help Lina redress and walk her out of this house.'
-				
+
 				gs 'dimalina', 'bindpain'
 				gs 'pain', 2, 'mouth', 'bind'
 				if pcs_mood > 5: pcs_mood -= 5

+ 1 - 1
locations/din_bad.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = 'd_bag':
 	end
 	if FUNC('Cum_Manage', 'check_private') = 1:
 		dynamic $toymanage
-		if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0: act 'Manage your piercings': gt 'piercing_management', 'main'
+		gs 'piercing_management', 'set_manage_act'
 	end
 	*nl
 	if mc_inventory['amphetamine'] > 0:	'You have <b><<mc_inventory[''amphetamine'']>></b> tablets of amphetamine left in your purse. <a href="exec: gs ''drugs'', ''amphetamine'' & gs ''din_bad'', ''d_bag''">Take One</a>'

+ 3 - 1
locations/din_van.qsrc

@@ -1160,6 +1160,8 @@ if $ARGS[0] = 'private':
 		'You can use Tanya''s shampoo.'
 		gs 'din_van', 'shower'
 		gs 'din_van', 'bath'
+	elseif $loc = 'gad_gpbath':
+
 	elseif mc_inventory['shampoo'] > 0:
 		'You have enough shampoo for <b><<mc_inventory[''shampoo'']>></b> uses.'
 		gs 'din_van', 'shower'
@@ -1198,7 +1200,7 @@ if $ARGS[0] = 'private':
 		'<a href="exec:gs ''drugs'', ''breastcream'' & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
 	end
 
-	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:*clr & cla & gs ''din_van'', ''pirManage''">Manage your piercings</a>'
+	gs 'piercing_management', 'set_manage_string'
 
 	if fillimplant = 1:
 		if siliconeBag >= 1:

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