1
0

264 Коммитууд 9d64fe43a5 ... 74ae52fafb

Эзэн SHA1 Мессеж Огноо
  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]]` 4 сар өмнө
  anjuna krokus 279c23d534 [changed] Pav appartment now uses shortgs setloc and small layout changes 4 сар өмнө
  anjuna krokus b8a5764311 [changed] Gad bath now mostly relies on `din_van`. 4 сар өмнө
  Stephan Fuchs 417b985a7e Merge remote-tracking branch 'kevinsmarts/master' into QSRC2TW 4 сар өмнө
  Stephan Fuchs d09fdd97dd [qsrc2tw] fixed the `CHOOSE GAME START`-table 4 сар өмнө
  Kevin_Smarts 5fd5223b59 Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 4 сар өмнө
  Kevin_Smarts 29f716e700 Merge remote-tracking branch 'Awesome/master' 4 сар өмнө
  Kevin_Smarts fb457c8933 Merge remote-tracking branch 'Hooded_Silence/master' 4 сар өмнө
  Kevin_Smarts 8815af79e5 Merge remote-tracking branch 'Anya/master' 4 сар өмнө
  Stephan Fuchs 1af15c8317 [qsrc2tw] fixed backwards compatibility for proficiencies: QSP still doesn't understand floats 4 сар өмнө
  Awesome 1fd9e1d2ee [Changed] Dynamic -> ARGS 4 сар өмнө
  Awesome 8b09bfd4ef [Fixed] Variable getting reset before getting displayed 4 сар өмнө
  Awesome 43cdd847bb [Fixed] Artem strapon block not working 4 сар өмнө
  Myles Croft (Hooded Silence) 3506406d28 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  anjuna krokus 021ebf1c56 [changed] Gschool break girls bathroom bully event now discards the worn clothes. And various small changes and 4 сар өмнө
  anjuna krokus 38313a787f [changed] some small code optimizations 4 сар өмнө
  anjuna krokus bb0297795b [changed] added a safeguard just in case 4 сар өмнө
  anjuna krokus f3f8090a76 [changed] `stat_sklattrib` should non only do calculations for attributes and skills that have changed that day 4 сар өмнө
  anjuna krokus 0b490b0f01 [fixed] blank screen after in a certain combination of pav_pharamacy events. Reported by Damian 4 сар өмнө
  Anya f18d4cba27 [fixed] Bad location call spotted by Skylah 4 сар өмнө
  anjuna krokus ca88f26575 [fixed] text formatting. Reported by Damian 4 сар өмнө
  Myles Croft (Hooded Silence) f01996fb76 [Bug fix and Beta] Fixed ballet letter not appearing due to the recent daystart change. 4 сар өмнө
  anjuna krokus b421f31ff1 [fixed] Enforced lvl floor 4 сар өмнө
  anjuna krokus 3b4fe2c916 [changed] Used relative skill change for bimbo inhib 4 сар өмнө
  anjuna krokus 23acb9cf47 Ensured that the start of `bordelv` wasn't set repeatedly only to be immediately wiped 4 сар өмнө
  anjuna krokus 6f903e8f67 [changed] more setloc routing 4 сар өмнө
  anjuna krokus 2916145aeb [changed] added setloc functions instead of raw $loc setting 4 сар өмнө
  anjuna krokus e5a37d052f [changed] more intro changes 4 сар өмнө
  anjuna krokus 67efea5efe [fixed] typo in `gad_gpyard`. Reported by Skylah 4 сар өмнө
  Kevin_Smarts 467c538cbe Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 4 сар өмнө
  anjuna krokus 80463671dc Merge remote-tracking branch 'master/master' 4 сар өмнө
  Kevin_Smarts 353f9ed617 [changed] GM panties and bra no.1 is now ubiquitous. They can't be destroyed or moved from main wardrobe area 4 сар өмнө
  anjuna krokus c38dbc08a1 [fixed] uni_tg intro flow and a uni dorm event not clearing actions nor screen 4 сар өмнө
  anjuna krokus 940575aa49 [fixed] reactivated previously broken link. 4 сар өмнө
  anjuna krokus f3634eadad [added] Grandparents random schedule will now properly update each day 4 сар өмнө
  anjuna krokus 68d237a7d8 [fixed] `'booty_call', 'hotel_links'` was broken due to a typo. Reported by Dakkhon 4 сар өмнө
  Stephan Fuchs 4f9117b102 [qsrc2tw] Don't initialize variables if they are initialized already 4 сар өмнө
  Stephan Fuchs d0cb1cf700 [qsrc2tw] Skill-system redone in TS 4 сар өмнө
  anjuna krokus 97f480251f [fixed] bug in grandmother's schedule 4 сар өмнө
  anjuna krokus 936244466e [changed/added] Made further changes to the setup and exit function. Setup now cleans up after itself, so exit is only used for events. This removed the need for npcs to call that exit (because that was garbage). Added two sample leave events to gad_gphouse 4 сар өмнө
  anjuna krokus eea3c04ee3 [changed/added] Added `$prevloc` and `$prevarg` to shortgs setloc. Changed `$prevloc` to $loc` in gopskver. Used updated shortgs setloc function to automatically take `$prevloc` into account for the hotelroom. 4 сар өмнө
  anjuna krokus cedb68449e [fixed] more small gad fixes 4 сар өмнө
  anjuna krokus 53e4ae5148 [fixed/changed] grandparents and Mira now properly clean up variables when you leave the house. Slight rewrite of the exit function to accomodate other locations using it 4 сар өмнө
  Stephan Fuchs 568b882fe7 [qsrc2tw] add convert-modes to `qsrc2tw` to auto-generate TS-and JS-code 4 сар өмнө
  anjuna krokus 80506aace1 [fixed] qproj update with the introduction and removal of some files for the grandparents 4 сар өмнө
  anjuna krokus 2356f44990 [changed] Encountering misha while returning home naked should only trigger when coming from school 4 сар өмнө
  anjuna krokus 030e1f82d2 [changed] Big changes to how the grandparents schedule works, some small changes to Mira's schedule and the re-integrating a lot of removed content back into the grandparents house 4 сар өмнө
  Kevin_Smarts 12d6b92931 Merge remote-tracking branch 'Hooded_Silence/master' 4 сар өмнө
  Myles Croft (Hooded Silence) 4ef490f6f1 [Code refactor and UI improvements] Added date suffix to cheatmenu_din date and time section and index, added braces removal date in journal as per user request, refactored function evt_day_suffix to be simpler and added $debug['date_suffix'] as a failsafe to determine call failures. Found an QSP issue of not always passing variables attached to gs calls, implemented temporary carrier var to ensure tasked var returns where needed. 4 сар өмнө
  anjuna krokus ed434eb801 [fixed] getting kickout out should now result in actually getting kicked out 4 сар өмнө
  anjuna krokus 83c560f086 [changed] ensured that the "you're gaining/losing weight" messages are more reliably about actually losing/gaining weight and not redistribution of fat to/from bust and/or butt. Reported by CypherWisp and Skylah 4 сар өмнө
  anjuna krokus b89cd35d2a [changed] spaces to tab, slight code simplification, routed a journal text through the proper homes_properties function 4 сар өмнө
  anjuna krokus 17df22590b [changed] prevented bugs due to reusing `i` and `j`. Gave paying rent priority over getting kicked out 4 сар өмнө
  anjuna krokus 79a37e914d [added] additional saveguards to prevent absurd body ratios through the cheatmenu. Reported by Honey 4 сар өмнө
  anjuna krokus 94fde0fb95 [changed] moved the intro stuff from `gad_gphouse` and `bedrPar` to `intro_sg` 4 сар өмнө
  anjuna krokus cb3cd67cb5 [changed] reduced the number of func calls in `stat_sklattrib` 4 сар өмнө
  anjuna krokus 5141f7e6e8 [fixed] Steuch also broke the stat window 4 сар өмнө
  anjuna krokus fc45f600d7 [fixed] Myles broke stat_display and the entire game with it 4 сар өмнө
  anjuna krokus 62d44ecccd [fixed] re-added the removed `gs 'Cheatmenu_din'` to saveupdater since the screen won't get cleared automatically 4 сар өмнө
  Kevin_Smarts 1ab8ebacbf Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  anjuna krokus b18d8df28e [fixed] More dynamic stuff that Steuchs broke 4 сар өмнө
  Kevin_Smarts 39727a8e92 Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  Kevin_Smarts 6e8fed6e19 Merge remote-tracking branch 'Hornguy6/master' 4 сар өмнө
  anjuna krokus d3314c948f [fixed] de-dynamicallizing Cheatmenu brought some majro bugs with it. Those should now be fixed 4 сар өмнө
  hornguy6 3769f56f96 [fixed] gt link goes to new Albina location 4 сар өмнө
  Myles Croft (Hooded Silence) 41dc0d6175 [QoL code updates] Added function to track current day jobs to allow the journal to jump to the right page of jobs and for stat_display finish displaying you have active jobs. 4 сар өмнө
  Myles Croft (Hooded Silence) 23557ac039 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  Kevin_Smarts 43382fb754 Merge remote-tracking branch 'Hooded_Silence/master' 4 сар өмнө
  Kevin_Smarts 13e4d15815 Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 4 сар өмнө
  Myles Croft (Hooded Silence) c8380e6947 [Code improvements] Improve stat_display journal hotlinks to jump to correct journal page for work and magic/non-magic journals. 4 сар өмнө
  Myles Croft (Hooded Silence) d56c372e30 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  rachels d2cd7cf4cc [fixed] killvar string indexed array 4 сар өмнө
  Stephan Fuchs bf19e723a1 Merge commit '4c4bbbecc9bdb997be96e63d8f105631c0261121' into QSRC2TW 4 сар өмнө
  Stephan Fuchs d5a1141a3b [fix] White screen after loading savegame 4 сар өмнө
  Myles Croft (Hooded Silence) 6f8b5ea8bd Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  Kevin_Smarts 4c4bbbecc9 [fixed] Dancer start had too high inhib to wear leotard which she'll need for ballet so adjusted it down by 5, also added message to clothing list if outfit is too risque 4 сар өмнө
  Kevin_Smarts fca0e5692a Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 4 сар өмнө
  Kevin_Smarts 0f670889cd Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  Stephan Fuchs b055792641 [change] Converted dynamic code in `Cheatmenu_din` into static code. 4 сар өмнө
  Stephan Fuchs 001f43c344 [fix] `input` can start with `$`: `$input` 4 сар өмнө
  Stephan Fuchs 3564ebfb23 [fixed] changed `pcs_mood` to `pcs_mood_effects` in `hourly_events` 4 сар өмнө
  Stephan Fuchs 6d2d36750c [change] Converted various dynamic code into static code. 4 сар өмнө
  Stephan Fuchs 556cc1a861 [qsrc2tw] Less verbose error messages for the qsrc2tw-compiler (unless you toggle them on). 4 сар өмнө
  Stephan Fuchs 83d592add3 [qsrc2tw] Fix display bug in `DebugTools` 4 сар өмнө
  anjuna krokus 307b1935f1 [changed/fixed] code style changes and deactivated the accidental inclusion of new icons 4 сар өмнө
  anjuna krokus 562116ca13 [fixed] Lovers are now properly added to the contact list. Fixed the improper use of `$npclastsaved` (since not all lovers are new). Fuckbudies and sugar_daddies don't get a "default" empty call schedule 4 сар өмнө
  anjuna krokus ddb9049471 [fixed] removed blank screen in `gopskver` 4 сар өмнө
  anjuna krokus d8d6c7cd2c [changed] clicking the big back button while in the telephone's main menu will now exit the telefone. 4 сар өмнө
  anjuna krokus 3e52df9765 [changed] enforced the standard apostrophe style 4 сар өмнө
  anjuna krokus 52ee43e88c [changed/fixed] booty calls now use the same SMS staging setup as the rest of the game. This removed a bunch of uneeded checks and simplified the code. 4 сар өмнө
  anjuna krokus 155cae9f7b [fixed/changed] fixed a lose `</font>` that added an empty line. Layout changes 4 сар өмнө
  anjuna krokus 93c7c913fe [fixed] layout in saveupdater 4 сар өмнө
  Myles Croft (Hooded Silence) 92d82355ae Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  Kevin_Smarts 6f47520301 Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  Kevin_Smarts 7190b598d0 Merge remote-tracking branch 'Hooded_Silence/master' 4 сар өмнө
  Kevin_Smarts 06287da905 Merge remote-tracking branch 'Awesome/master' 4 сар өмнө
  anjuna krokus 7657029a02 [changed] layout changes, killvarred temp variables, used + + instead of << >> 4 сар өмнө
  anjuna krokus a504824c29 [removed] unneeded spaces 4 сар өмнө
  anjuna krokus cab50930cc [fixed] accidentally used a string variable (`$`) instead of an integer 4 сар өмнө
  Myles Croft (Hooded Silence) ce789cb8cf [Code reversion] resolving merge conflict. 4 сар өмнө
  Myles Croft (Hooded Silence) c02a53f366 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  anjuna krokus 4421a1525e [fixed] masseuse rehire text always saying 400 rubles instead of the actual pay 4 сар өмнө
  anjuna krokus a01cb0d0e8 [fixed] Possible to unlock the salon massage work without certifaction. Reported by YanDnepr 4 сар өмнө
  Awesome 08b7c84709 [Added] Sonia post-fall expansion from Nutluck and Sonia variable migration 4 сар өмнө
  Stephan Fuchs 0e3a797967 [qsrc2tw] added `setup.variableStorageUsage` 4 сар өмнө
  anjuna krokus 046aef251e [fixed] wait action and telefon were available even when `menu_off = 1` 4 сар өмнө
  anjuna krokus 51ef89efa7 [changed] minor layout changes 4 сар өмнө
  anjuna krokus 1240364aa0 [fixed] changingroom count swim item would set `menu_off = 1` which was not intended 4 сар өмнө
  anjuna krokus d4da8317ac [fixed] blank screens in the pavlovsk shoplifting stuff 4 сар өмнө
  anjuna krokus ee71fd48ec [fixed] revealing outfits did not get the correct symbol 4 сар өмнө
  anjuna krokus 2a172ee6cf [fixed] 600 minutes of metered internet now costs the correct amount of 155 Rubles instead of 115. 4 сар өмнө
  Myles Croft (Hooded Silence) 26ec72a660 [Item update] Seeded new stats to leotards and one piece running outfits. 4 сар өмнө
  Stephan Fuchs 988c4078ca [qsrc2tw] Nicer Savegame-names 4 сар өмнө
  Stephan Fuchs 4430007311 Merge remote-tracking branch 'kevinsmarts/master' into QSRC2TW 4 сар өмнө
  Stephan Fuchs 8ee4189101 [qsrc2tw] Layout changes: using gridstack is now optional, custom CSS and dedicated mobile interface 4 сар өмнө
  anjuna krokus 3b4005db28 [changed] reduced unneeded checks in `npcpreservec` due to bad looping 4 сар өмнө
  anjuna krokus 8134f264ed [removed] Unused functions that had been moved to `npcgeneratec` 4 сар өмнө
  anjuna krokus b8bbf4103f [fixed] Talking with the gopniks inside should now no longer magically teleport you outide during the conversation (relevant w.r.t. rain) 4 сар өмнө
  anjuna krokus c81044b524 [changed/removed] Significant simplification of bootycall code 4 сар өмнө
  anjuna krokus 338f824cf9 [fixed] Sport outfit 151 is now correctly identified as a onepiece outfit 4 сар өмнө
  anjuna krokus f26a369bf2 [fixed] Bug in adding Tatiana to your contacts. Reported by Honey 4 сар өмнө
  anjuna krokus 8e30c53fc4 [fixed] wrong cum_calls were breaking the game. Reported by Dakkhon 4 сар өмнө
  Kevin_Smarts b9d874eb28 Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 4 сар өмнө
  Kevin_Smarts fcf26a0937 Merge remote-tracking branch 'Hooded_Silence/master' 4 сар өмнө
  Kevin_Smarts 9330295142 Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  Kevin_Smarts d98b6965a5 [added] Arousal for sex dreams 4 сар өмнө
  Stephan Fuchs 89ed84c719 [qsrc2tw] navigation qith keys 1-0, as requested by `Myles Croft (Hooded Silence)` 4 сар өмнө
  Myles Croft (Hooded Silence) efd14a6c26 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  Myles Croft (Hooded Silence) 53dcdb36b7 [Code Cleanup] Removal of old magic quest code that is no longer used and leads to a dead end. 4 сар өмнө
  anjuna krokus de2484f606 [fixed] "Adding" tatiana to your contacts removes the option 4 сар өмнө
  anjuna krokus e0b8592843 [added/changed] Added texts from Tatiana to remind you to visit her if she has something for you (spells, information, missions). Also did some layout changes, added `menu_off = 1` and `gs 'stats'` at various points. Changed spaces into tabs and removed trailing spaces. 4 сар өмнө
  anjuna krokus b4c4768007 [added] more tags to punk/goth clothes 4 сар өмнө
  anjuna krokus dafef8e110 [added/fixed] MtF gschool start now uses the standard character select options. Ensured that gruptype would always be set (defaults to outcast) 4 сар өмнө
  anjuna krokus d7426c8f76 [fixed/changed] fixed sugar daddies not calling you if you had no fuckbuddies. Moved the booty call SMS stager to SMS_schedules, simplified booty_call code 4 сар өмнө
  Kevin_Smarts 02dd91a41f Merge remote-tracking branch 'Steuchs_bug_hunt/Layout' 4 сар өмнө
  Kevin_Smarts 171f9af91f Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  Stephan Fuchs e700d10f0c [qsec2tw] Save Layout Configuration in Localstorage 4 сар өмнө
  anjuna krokus 4b7434ae6c [fixes] to cum_all and masseuse_work 4 сар өмнө
  Stephan Fuchs 36f7edbd4a Demo: Using `gridstack` to move interface-elements around 4 сар өмнө
  anjuna krokus baee8470ae [added] more control over the enumerate_list function 4 сар өмнө
  anjuna krokus ed81d733c3 [added/changed] added additional layouer, minor code changes 4 сар өмнө
  anjuna krokus b67e400b57 [changed] Troublemaker now starts with punk clothes 4 сар өмнө
  anjuna krokus 809598f722 [added/fixed] make the goth makeup work 4 сар өмнө
  anjuna krokus f7470eda42 [added] more seeding of punk/goth shoes 4 сар өмнө
  anjuna krokus 285ca57636 [fixed] more bugs in stat display 4 сар өмнө
  anjuna krokus f75deb2b6d [fixed] goth start, starting outfits now have the goth tag 4 сар өмнө
  anjuna krokus e372b39ac2 [fixed] bugs in stat_display 4 сар өмнө
  anjuna krokus 9104602a7d [changed] Massively overhauled the stat_display clothes descriptions to minimize repititions and added the goth and punk descriptions. Removed trailing spaces 4 сар өмнө
  anjuna krokus 1741207931 [added] seeded gothlevel and punklevel in preparation to possible, bimbo-like, traits 4 сар өмнө
  anjuna krokus a6848a4fd0 [fixed] updated variable descriptions in cheatmenu 4 сар өмнө
  anjuna krokus b56852fb62 [changed] Moved extra_supnatvnesh to the makeupbonus section and added a bonus/penalty at high/low makupskl for goth makeup 4 сар өмнө
  anjuna krokus 6857928b57 [added] goth make-up 4 сар өмнө
  anjuna krokus 5528a014d7 [fixed] goth and punk styles now use the correct logic in `pcs_has_attr`. Enabling reactions from npc's 4 сар өмнө
  anjuna krokus 0139937137 [added] `ShoGoth` (servant of the elder gods) and `ShoPunk` added to the shoes attributes 4 сар өмнө
  anjuna krokus 0f6a304096 [fixed] easy_orgasms trait had a typo. Reported by CRER 4 сар өмнө
  Kevin_Smarts 0ea86fbd75 Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  Kevin_Smarts e89cb0b79d Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 4 сар өмнө
  anjuna krokus 65297cd68e [fixed/changed/removed] fixed all shoes showing up as bimbo shoes. Changed layouts and removed trailing spaces 4 сар өмнө
  Stephan Fuchs 7dca722256 [qsrc2tw] fix display of sidebar-status-bars. should have no effect on qsp-version 4 сар өмнө
  Stephan Fuchs 48fba093f7 [qsrc2tw] extend `setup.Overwrite` with `func` and `gs` and add both to the interfaces-file 4 сар өмнө
  anjuna krokus ac36f7a3bc [changed] flash now stores its generated text in flashVars, and using option 2 will allow you to set the flash text before the arousal call (the action itself) with `$flash_text[0]` and after the arousal call (the getting clothed) with `$flash_text[1]`. This is relevant w.r.t. the blackmailer content. Delegated the church and carwash flashing to rely more on the flash system 4 сар өмнө
  Myles Croft (Hooded Silence) 01fa276f4f Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  Kevin_Smarts e8d45d3fd8 Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  Kevin_Smarts fcfa0672a7 Merge remote-tracking branch 'Steuchs_bug_hunt/QSRC2TW' 4 сар өмнө
  anjuna krokus 8d8f73de91 [changed] layout changes and removed trailing spaces 4 сар өмнө
  anjuna krokus 6fef5f9d40 [fixed] cum_call wasn't properly setting up npc's due to wrong logic 4 сар өмнө
  anjuna krokus 96015eed9b [fixed] issue with saveupdater caused new games to do a timejump 4 сар өмнө
  Kevin_Smarts 39c4f90bff [added] grab google fonts from the intarwebs as well as html-to-image thingy from Earnest 4 сар өмнө
  Stephan Fuchs 4d3e85e18d Merge commit '0fb860ec7a63b7677aec7558374f48126ef4956a' into QSRC2TW 4 сар өмнө
  Kevin_Smarts 0fb860ec7a [text edit] Removed extra 'all' which made sentence clunky 4 сар өмнө
  anjuna krokus f28096d76d [added] `shortgs, enumerate_list` function which takes a list and returns a string with the entries listed (think 'name 1, name 2, and name 3'). Used this in library_functions and clothing_QV 4 сар өмнө
  anjuna krokus 35940655dd Merge remote-tracking branch 'master/master' 4 сар өмнө
  Vengeance_11 25829c75c1 Text edits 4 сар өмнө
  anjuna krokus 980d02df51 [changed] Bimbo start will now properly wear her pretty shoes and not those ugly standard shoes. Ew 4 сар өмнө
  anjuna krokus b6a9fc2bda [fixed] `npcgeneratec` was failing due to a copy-paste error. Reported by Dakkhon 4 сар өмнө
  anjuna krokus c3330c5908 [added/changed] Added the option to do a full flash in the parks. Extracted more repeated code in `pav_park` 4 сар өмнө
  anjuna krokus 096d5aa37d Merge remote-tracking branch 'master/master' 4 сар өмнө
  Kevin_Smarts d9682b6848 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  Kevin_Smarts 320b380d2b Merge branch 'QSRC2TW' of StephanFuchs/glife into master 4 сар өмнө
  anjuna krokus ce7c6f263b [fixed] Violet pill description said it lowered inhibition while it raised it (rest of description was still correct 4 сар өмнө
  Stephan Fuchs 5bea81fa2e [qsrc2tw] add `TypeScript` 4 сар өмнө
  Stephan Fuchs 4887340f35 [qsrc2tw] `start` 4 сар өмнө
  anjuna krokus f0e2930466 [added] Goth and Punk tags 4 сар өмнө
  anjuna krokus f319b7356c [removed] unneeded lines 4 сар өмнө
  anjuna krokus 7691c65e3c [added] (P)ShoBimbo as a seperate tracker for bimbo shoes. Moved "alternative" style from (P)ShoStyle = 3 to (P)ShoStyle = 2. 4 сар өмнө
  Stephan Fuchs 94c623b648 init `QSRC2TW` 4 сар өмнө
  anjuna krokus 6a56b1c6ef [changed] updated the shoe code to now use the same structure as the clothes code, massively reducing duplicate code 4 сар өмнө
  anjuna krokus 7584096e97 [changed] layout changes 4 сар өмнө
  anjuna krokus c9ad875f6b [fixed] indoor flashing not working correctly. Reported by Skylah 4 сар өмнө
  anjuna krokus e7642fc0c8 [changed] Moved "sort by" to the top and massively reduced the amount of duplicated code 4 сар өмнө
  Myles Croft (Hooded Silence) e7dfdff539 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  Kevin_Smarts a703c6426d Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  Kevin_Smarts 51601e5853 New claothing attribute CloPanties = 2, for outfits that provide even less coverage than microskirt or panties 4 сар өмнө
  anjuna krokus 42c366c115 [changed] layout-changes to `stat_sklattrib` 4 сар өмнө
  anjuna krokus 5141ea4b9e Merge remote-tracking branch 'master/master' 4 сар өмнө
  anjuna krokus 8c51d2d1e0 [changed/fixed] Layout changes to `stat_sklattrib`, ensured that levels were properly deteriorated with negative trials, and ensured that the trials trigger only once each day 4 сар өмнө
  anjuna krokus 95e2a8ca77 [fixed] Hopefully prevented some blank screens in relation to repeated/no events 4 сар өмнө
  anjuna krokus 9788ccc6a6 [fixed] Taking selfies wasn't working correctly due to an old `gs 'telefon', ...` call. Reported by Dark Ether 4 сар өмнө
  bgkjdgbizgblzdgbr 0c54c6cbe7 [fixed] Missing cla & *clr 4 сар өмнө
  anjuna krokus a761e533c8 [fixed] clothing_attributes should call the `$attributes_....` files through `gs`, not `func` 4 сар өмнө
  anjuna krokus 37f2d8e55e Merge remote-tracking branch 'master/master' 4 сар өмнө
  anjuna krokus 3671c52c08 [changed] split `lact_switch` into `lact_on` and `lact_off`. `lact_switch`'s functionality remains unchanged 4 сар өмнө
  Kevin_Smarts 82c4d730fb Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  Kevin_Smarts f768f4b1d8 Merge remote-tracking branch 'Steuchs_bug_hunt/SteuchsGoesBughunting' 4 сар өмнө
  anjuna krokus dd2085ad60 [added] more connection between the breast cream trial and the therapist 4 сар өмнө
  anjuna krokus 7fc4b228bf [added] The experimental trials now has an advert in the newspaper. Special entrance through the therapist 4 сар өмнө
  anjuna krokus bedccc7603 [fixed] Rex invite should now work again. odd_week should change with the week as well. It sadly does not actually track whether the week is "odd" (since there are technically 53 weeks in a year) 4 сар өмнө
  anjuna krokus 401fcf0a0e [fixed] black screens in grandparents house. `locat` should not be killvarred, Mira depends on its persistence 4 сар өмнө
  Stephan Fuchs 1392204428 [fixed] copy-paste-errors in `pcs_has_attr` 4 сар өмнө
  Kevin_Smarts b39e47de60 Merge remote-tracking branch 'Steuchs_bug_hunt/SteuchsGoesBughunting' 4 сар өмнө
  Stephan Fuchs 0311e45944 [fixed] `if`-block wasn't closed in `gad_gpchores` 4 сар өмнө
  Stephan Fuchs b381e6f378 [fixed] removed superfluous `&` in `city_mansion_residence_1` 4 сар өмнө
  Stephan Fuchs a273a85af2 [fixed] future-proofed `kid` by renaming `$play` (`play` is a reserved keyword) to `$playWithKid` (also makes this name less ambiguous) 4 сар өмнө
  Stephan Fuchs 6709fff58f [fixed] removed superfluous `&` in `igorhome` 4 сар өмнө
  Stephan Fuchs d39dbeef32 [fixed] removed superfluous `&` in `lover_pref` 4 сар өмнө
  Stephan Fuchs b4d2d7f39b [fixed] removed superfluous `&` in `restoran` 4 сар өмнө
  Stephan Fuchs ce0926782f [fixed] removed superfluous `&` in `katja_lake` 4 сар өмнө
  anjuna krokus 988d83cd6f [fixed] accidentally pushed part of the highly unfinished camgirl update 4 сар өмнө
  anjuna krokus 2863ab1169 [added] Images to the farmers market. Thank you Skylah and Alanstalker for searching 4 сар өмнө
  anjuna krokus 0597239b6c [fixed] pube images showing up as the same in the "shave menu". Reported by Skylah 4 сар өмнө
  Kevin_Smarts 32c729eaf0 Merge remote-tracking branch 'Hooded_Silence/master' 4 сар өмнө
  Kevin_Smarts dfbcaeffce Merge remote-tracking branch 'Anjuna/master' 4 сар өмнө
  Kevin_Smarts 7d8787f583 Merge branch 'SteuchsGoesBughunting' of StephanFuchs/glife into master 4 сар өмнө
  Stephan Fuchs a9e6b356fd Merge commit '0efda27ed10c7d02a801cd96b12f1983d1513a2a' into SteuchsGoesBughunting 4 сар өмнө
  Stephan Fuchs 0e80e8186e [fixed] superfluous quote char in `anushapt` 4 сар өмнө
  Myles Croft (Hooded Silence) 824dfddf34 [DayStart migration] Amended ballet start to init function - all dancers now get pushkin fame of +15, changed ballet DayStart to new system, gp_chores typo. 4 сар өмнө
  anjuna krokus 3e238bd783 [fixed] bugfix in saveupdater and made the time-cheats work with the new system 4 сар өмнө
  anjuna krokus 3464a7faea [fixed] whoops, broke it 4 сар өмнө
  anjuna krokus d0058aa64c [changed] layout stuff 4 сар өмнө
  anjuna krokus 8cddc9267e [changed] We now depend on `daystart` as the primary date-tracking variable 4 сар өмнө
  anjuna krokus b71fcb1d50 Merge remote-tracking branch 'master/master' 4 сар өмнө
  anjuna krokus a86a4c867e [changed] split off repeated code from the intro_initializations into its own sublocation 4 сар өмнө
  Kevin_Smarts 0efda27ed1 Merge remote-tracking branch 'Hooded_Silence/master' 4 сар өмнө
  Myles Croft (Hooded Silence) f5909bd8e4 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  anjuna krokus 529689abb7 [fixed] body_desc not updated to use body_image instead of pube_image 4 сар өмнө
  anjuna krokus c2c09b2f33 [fixed] Small fix to the gadukino market stall. Ensuring it's reset if Sveta escapes somehow 4 сар өмнө
  anjuna krokus 289dfc6f3c [fixed/changed/removed] layout of the new clothes tab. Integrated `$pube_image` into `$body_image, pubes` 4 сар өмнө
  Myles Croft (Hooded Silence) a855a92366 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife 4 сар өмнө
  Stephan Fuchs 0031c92b2d [fixed] a-tags closed in `wardrobe.default_template` 4 сар өмнө
100 өөрчлөгдсөн 7828 нэмэгдсэн , 5147 устгасан
  1. 2 0
      .gitignore
  2. 21 0
      buildHTML.bat
  3. 13 7
      glife.qproj
  4. 16 13
      locations/AppearanceSystem.qsrc
  5. 307 274
      locations/Cheatmenu_din.qsrc
  6. 5 5
      locations/Cum_Manage.qsrc
  7. 1 4
      locations/HotelRoom.qsrc
  8. 9 8
      locations/Nudelake.qsrc
  9. 10 0
      locations/SMS_schedules.qsrc
  10. 12 12
      locations/TV.qsrc
  11. 101 92
      locations/_attributes_bomba_dress.qsrc
  12. 99 98
      locations/_attributes_bomba_outfits.qsrc
  13. 48 38
      locations/_attributes_bomba_shoes.qsrc
  14. 44 41
      locations/_attributes_cats_shoes.qsrc
  15. 165 143
      locations/_attributes_danilovich_outfits.qsrc
  16. 46 43
      locations/_attributes_danilovich_shoes.qsrc
  17. 123 71
      locations/_attributes_dolls_dress.qsrc
  18. 76 49
      locations/_attributes_dolls_outfits.qsrc
  19. 285 163
      locations/_attributes_dolls_shoes.qsrc
  20. 27 23
      locations/_attributes_eroto_shoes.qsrc
  21. 34 31
      locations/_attributes_gm_shoes.qsrc
  22. 199 165
      locations/_attributes_moncheri_shoes.qsrc
  23. 46 38
      locations/_attributes_scandalicious_shoes.qsrc
  24. 58 55
      locations/_attributes_school.qsrc
  25. 145 44
      locations/_body_image.qsrc
  26. 1 1
      locations/_menu_setting.qsrc
  27. 0 76
      locations/_pube_image.qsrc
  28. 35 24
      locations/_shoe_description2.qsrc
  29. 17 17
      locations/abduction.qsrc
  30. 28 28
      locations/abductionCustomer.qsrc
  31. 32 32
      locations/agentned.qsrc
  32. 99 87
      locations/albina_chat.qsrc
  33. 18 14
      locations/albina_sex_scenes.qsrc
  34. 1 0
      locations/anushaptbr.qsrc
  35. 18 6
      locations/anushka.qsrc
  36. 18 6
      locations/anushkachat.qsrc
  37. 9 3
      locations/anushkachat_city.qsrc
  38. 18 18
      locations/artem_sex.qsrc
  39. 1 1
      locations/artemhome.qsrc
  40. 38 46
      locations/bank.qsrc
  41. 18 18
      locations/bed_events.qsrc
  42. 4 4
      locations/bed_get_out_events.qsrc
  43. 1 66
      locations/bedrPar.qsrc
  44. 8 16
      locations/bedrPar2.qsrc
  45. 7 6
      locations/begin.qsrc
  46. 196 0
      locations/beta_journal_quests.qsrc
  47. 3 2
      locations/blackmailer.qsrc
  48. 19 17
      locations/body.qsrc
  49. 42 38
      locations/body_desc.qsrc
  50. 60 177
      locations/body_structure.qsrc
  51. 200 216
      locations/booty_call.qsrc
  52. 7 7
      locations/booty_call_sms.qsrc
  53. 44 51
      locations/bordelv.qsrc
  54. 12 2
      locations/bras.qsrc
  55. 12 12
      locations/brother_lessons.qsrc
  56. 12 13
      locations/buklinik.qsrc
  57. 2 2
      locations/camera.qsrc
  58. 12 16
      locations/casino.qsrc
  59. 5 1
      locations/changingroom.qsrc
  60. 31 58
      locations/cikl.qsrc
  61. 5 3
      locations/city_church.qsrc
  62. 31 27
      locations/city_clinic.qsrc
  63. 2 1
      locations/city_experimental_trials.qsrc
  64. 28 9
      locations/city_experimental_trials_events.qsrc
  65. 17 0
      locations/city_experimental_trials_list.qsrc
  66. 7 33
      locations/city_hotel.qsrc
  67. 1 1
      locations/city_lake.qsrc
  68. 1 1
      locations/city_mansion_residence_1.qsrc
  69. 12 0
      locations/city_park.qsrc
  70. 26 7
      locations/clothing.qsrc
  71. 266 371
      locations/clothing_QV.qsrc
  72. 68 62
      locations/clothing_attributes.qsrc
  73. 2 9
      locations/core_library.qsrc
  74. 4 4
      locations/cum_call.qsrc
  75. 184 32
      locations/daystart.qsrc
  76. 118 97
      locations/din_bad.qsrc
  77. 410 393
      locations/din_pav.qsrc
  78. 130 90
      locations/din_van.qsrc
  79. 34 20
      locations/dina.qsrc
  80. 28 16
      locations/dinmother.qsrc
  81. 27 21
      locations/dinnpc.qsrc
  82. 24 26
      locations/dream_events.qsrc
  83. 51 31
      locations/emp_functions.qsrc
  84. 190 117
      locations/flash.qsrc
  85. 169 184
      locations/fuelstation_carwash.qsrc
  86. 6 4
      locations/gad_church.qsrc
  87. 6 1
      locations/gad_gpbath.qsrc
  88. 31 30
      locations/gad_gpchores.qsrc
  89. 656 133
      locations/gad_gphouse.qsrc
  90. 18 15
      locations/gad_market.qsrc
  91. 5 1
      locations/gad_miroslava_home.qsrc
  92. 1 1
      locations/gdktoilet_mens.qsrc
  93. 32 49
      locations/gopskver.qsrc
  94. 1054 0
      locations/gp_elene.qsrc
  95. 157 40
      locations/gp_elene_schedule.qsrc
  96. 888 0
      locations/gp_zlatek.qsrc
  97. 209 47
      locations/gp_zlatek_schedule.qsrc
  98. 0 411
      locations/grandmahelp.qsrc
  99. 0 352
      locations/grandpahelp.qsrc
  100. 10 10
      locations/grigory.qsrc

+ 2 - 0
.gitignore

@@ -50,3 +50,5 @@ missing_media.txt
 plugins.dat
 *.log
 *.stackdump
+
+*glife.html

+ 21 - 0
buildHTML.bat

@@ -0,0 +1,21 @@
+@ECHO off
+
+SET LOCATIONS=%CD%/locations
+
+PUSHD %1
+cd ./qsrc2tw/tools/QSRC2TW
+node index.js -in "%LOCATIONS%" -out "../../twine-code"
+cd ../..
+call npx tsc
+call npx esbuild "temp/typescript.js" --minify --outfile="twine-code/-generated/typescript-min.js"
+POPD
+
+if %PROCESSOR_ARCHITECTURE% == AMD64 (
+	CALL "%~dp0qsrc2tw\tools\tweeGo\tweego_win64.exe" --head "%~dp0qsrc2tw\twine-code\misc\head.txt" -o "%~dp0glife.html" "%~dp0qsrc2tw\twine-code"
+) else (
+	CALL "%~dp0qsrc2tw\tools\tweeGo\tweego_win86.exe" --head "%~dp0qsrc2tw\twine-code\misc\head.txt" -o "%~dp0glife.html" "%~dp0qsrc2tw\twine-code"
+)
+
+
+
+@ECHO ON

+ 13 - 7
glife.qproj

@@ -107,7 +107,6 @@
 		<Location name="piercing_management"/>
 		<Location name="$face_image"/>
 		<Location name="$body_image"/>
-		<Location name="$pube_image"/>
 	</Folder>
 	<Folder name="Stimulus">
 		<Location name="boyStat"/>
@@ -286,6 +285,7 @@
 		<Location name="intro_uni_m"/>
 		<Location name="intro_uni_tg"/>
 		<Location name="intro_initialization"/>
+		<Location name="intro_initialization_sg"/>
 		<Location name="intro_initialization_city"/>
 		<Location name="intro_customization"/>
 		<Location name="intro_sg_select"/>
@@ -619,6 +619,7 @@
 	<Folder name="Sonia">
 		<Location name="soniadisco"/>
 		<Location name="soniahome"/>
+		<Location name="soniaev1"/>
 	</Folder>
 	<Folder name="Generator">
 		<Location name="placer"/>
@@ -1038,7 +1039,6 @@
 		<Location name="MartinSex2"/>
 		<Location name="MartinSex3"/>
 		<Location name="casino"/>
-		<Location name="mqroom"/>
 		<Location name="city_hotel"/>
 		<Location name="deckShuffle"/>
 	</Folder>
@@ -1149,8 +1149,11 @@
 	</Folder>
 	<Folder name="Gadyukino">
 		<Location name="gad_gphouse"/>
-		<Location name="grandmahelp"/>
-		<Location name="grandpahelp"/>
+		<Location name="gp_elene"/>
+		<Location name="gp_elene_schedule"/>
+		<Location name="gp_zlatek"/>
+		<Location name="gp_zlatek_schedule"/>
+		<Location name="gad_gpchores"/>
 		<Location name="gad_gpyard"/>
 		<Location name="gad_gpbarn"/>
 		<Location name="gad_gpbath"/>
@@ -1175,9 +1178,6 @@
 		<Location name="gad_swampspring"/>
 		<Location name="gad_swamp_woods"/>
 		<Location name="gad_backwater"/>
-		<Location name="gp_elene_schedule"/>
-		<Location name="gp_zlatek_schedule"/>
-		<Location name="gad_gpchores"/>
 	</Folder>
 	<Folder name="Gadyukino Characters">
 		<Location name="hunters"/>
@@ -1408,6 +1408,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>

+ 16 - 13
locations/AppearanceSystem.qsrc

@@ -6,13 +6,12 @@ if $ARGS[0] = '':
 		Note: A huge part of PC's appearance is from base appearance, which is updated once a day. Because it's
 		a global variable, it does not show in this function in particular, but it's used in 'CalcAppearance'
 	}
-	if pcs_makeup = 6 and bimbolevel >= 2: extra_supnatvnesh = 2*bimbolevel - 2
 
 	clothingBonus = func('AppearanceSystem', 'CalcClothingBonus')
 	accessoriesBonus = func('AppearanceSystem', 'CalcAccessoriesBonus', bonusZ, PShoQuality)
 	groomingBonus = func('AppearanceSystem', 'CalcGroomingBonus')
 	groomingPenalty = func('AppearanceSystem', 'CalcGroomingPenalty')
-	pcs_apprnc = func('AppearanceSystem', 'CalcAppearance', (supnatvnesh + extra_supnatvnesh))
+	pcs_apprnc = func('AppearanceSystem', 'CalcAppearance', supnatvnesh)
 	pcs_hotcat = func('AppearanceSystem', 'ConvertToHotcat', pcs_apprnc)
 
 	killvar 'clothingBonus'
@@ -73,14 +72,14 @@ if $ARGS[0] = 'CalcFaceBonus':
 end
 
 if $ARGS[0] = 'CalcAttributeBonus':
-	tempAttributeBonus = (pcs_agil / 5) + (pcs_vital / 5)
+	tempAttributeBonus = (pcs_agil + pcs_vital) / 5
 
 	result = func('AppearanceSystem', 'AdjustFromBMI', tempAttributeBonus)
 	killvar 'tempAttributeBonus'
 end
 
 if $ARGS[0] = 'CalcVisibleAgePenalty':
-	if vidage < 20: tempAttributePenalty = func('shortgs','round_divide', (5*(20 - vidage)), 2)
+	if vidage < 20: tempAttributePenalty = (5*(20 - vidage) + 1) / 2
 
 	result = func('AppearanceSystem', 'AdjustFromBMI', tempAttributePenalty)
 	killvar 'tempAttributePenalty'
@@ -192,18 +191,22 @@ end
 if $ARGS[0] = 'CalcGroomingBonus':
 
 	makeupBonus = pcs_makupskl/5 - 5
-	if pcs_makeup = 0: makeupBonus = -5
-	if pcs_makeup = 1: makeupBonus = 0
-	if pcs_makeup = 5: makeupBonus = 30
-
-	breathBonus = pcs_breath * 5
+	if pcs_makeup = 0:
+		makeupBonus = -5
+	elseif pcs_makeup = 1:
+		makeupBonus = 0
+	elseif pcs_makeup = 5:
+		makeupBonus = 30
+	elseif pcs_makeup = 6 and bimbolevel >= 2:
+		makeupBonus += 2 * (bimbolevel - 1)
+	elseif pcs_makeup = 7:
+		makeupBonus += pcs_makeupskl / 10 - 50
+	end
 
-	tempGroomingBonus = makeupBonus + breathBonus
+	breathBonus = 5 * pcs_breath
 
-	!result = tempGroomingBonus
-	result = func('AppearanceSystem', 'AdjustFromBMI', tempGroomingBonus)
+	result = func('AppearanceSystem', 'AdjustFromBMI', makeupBonus + breathBonus)
 
-	killvar 'tempGroomingBonus'
 	killvar 'breathBonus'
 	killvar 'makeupBonus'
 end

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 307 - 274
locations/Cheatmenu_din.qsrc


+ 5 - 5
locations/Cum_Manage.qsrc

@@ -675,7 +675,7 @@ if $ARGS[0] = 'cum_stat_display':
 			$txtloc_adj = 'all over '
 			$icon_txtloc = 'your labia'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumpussy/cumpus'+rand(1,4)+'.jpg''">labia</a>'
-		elseif i = 2 and PCloPanties > 0:
+		elseif i = 2 and PCloPanties = 1:
 			$txtloc_adj = 'across '
 			$txtloc = 'the front of your panties'
 			$icon_txtloc = $txtloc
@@ -687,7 +687,7 @@ if $ARGS[0] = 'cum_stat_display':
 			$txtloc_adj = 'all over '
 			$icon_txtloc = 'your butt'
 			$txtloc = 'your <a href="exec:view''images/pc/body/cum/cumass/cumass'+rand(1,6)+'.jpg''">butt</a>'
-		elseif i = 5 and PCloPanties > 0:
+		elseif i = 5 and PCloPanties = 1:
 			$txtloc_adj = 'painting '
 			$txtloc = 'the back of your panties'
 			$icon_txtloc = $txtloc
@@ -1118,7 +1118,7 @@ if $ARGS[0] = 'cum_decay':
 								end
 								if cumforced = 0:
 									!! 2 = 'On your panties over your vagina'
-									if $pantyworntype <> 'none' or PCloPanties > 0:
+									if $pantyworntype <> 'none' or PCloPanties = 1:
 										!! isprokp - sanitary pad absorption
 										if isprokp <> 1:
 											spafinloc = 2
@@ -1192,7 +1192,7 @@ if $ARGS[0] = 'cum_decay':
 									end
 								else
 									!! 5 = 'On your panties over your butt'
-									if $pantyworntype <> 'none' or PCloPanties > 0:
+									if $pantyworntype <> 'none' or PCloPanties = 1:
 										!! isprokp - sanitary pad absorption
 										if isprokp <> 1:
 											spafinloc = 5
@@ -1231,7 +1231,7 @@ if $ARGS[0] = 'cum_decay':
 					!! 1 = 'On your labia'  4 = 'On your butt'
 					elseif (i = 1 and sparrvol[idx]*((totminut-cumdectime)/15) > rand(2,5)) _ 
 						or (i = 4 and sparrvol[idx]*((totminut-cumdectime)/15) > rand(4,8)):
-						if $pantyworntype <> 'none' or PCloPanties > 0:
+						if $pantyworntype <> 'none' or PCloPanties = 1:
 							!! 2 = 'On your panties over your vagina'  5 = 'On your panties over your butt'
 							sexvolume = rand(sparrvol[idx]/2, sparrvol[idx]) - iif(i=1,isprokp*rand(15,30),0)
 							if sexvolume > 0:

+ 1 - 4
locations/HotelRoom.qsrc

@@ -6,7 +6,6 @@ CLOSE ALL
 if $ARGS[0] = 'normal':
 	*clr & cla
 	gs 'shortgs', 'setloc', 'HotelRoom', 'normal'
-	$prevloc = $loc
 	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1
@@ -52,7 +51,6 @@ end
 if $ARGS[0] = 'better':
 	*clr & cla
 	gs 'shortgs', 'setloc', 'HotelRoom', 'better'
-	$prevloc = $loc
 	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1
@@ -98,7 +96,6 @@ end
 if $ARGS[0] = 'best':
 	*clr & cla
 	gs 'shortgs', 'setloc', 'HotelRoom', 'best'
-	$prevloc = $loc
 	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1
@@ -146,7 +143,7 @@ if $ARGS[0] = 'therapist':
 	*clr & cla
 	gs 'schedule', 'A186'
 	gs 'shortgs', 'setloc', 'HotelRoom', 'therapist'
-	if $prevloc ! $loc: $prevloc = $loc & gt 'therapist_home', 'hotel_enter'
+	if $prevloc ! $loc: gt 'therapist_home', 'hotel_enter'
 	$location_type = 'private'
 	menu_off = 0
 	hotelWiFi = 1

+ 9 - 8
locations/Nudelake.qsrc

@@ -57,14 +57,7 @@ if temper >= 15 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 				cla
 				*clr
 				minut += 5
-				$lastwornclothingtype['swim'] = $clothingworntype
-				lastwornclothingnumber['swim'] = clothingwornnumber
-				$lastwornpantytype['swim'] = $pantyworntype
-				lastwornpantynumber['swim'] = pantywornnumber
-				$lastwornbratype['swim'] = $braworntype
-				lastwornbranumber['swim'] = brawornnumber
-				gs 'clothing', 'strip_all'
-				if pcs_horny >= 80 and exhibitionist_lvl > 1 and PCloPanties > 0:
+				if pcs_horny >= 80 and exhibitionist_lvl > 1 and (PCloPanties = 1 or $pantyworntype ! 'none'):
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/self/wetpussypants3.jpg"></center>'
 					'You strip off. A few passing men do a double-take and pause to look at your sopping wet panties, probably thinking about what is making you so excited. You don''t care about what they might say or think of you.'
 				elseif pcs_inhib >= 60:
@@ -74,6 +67,14 @@ if temper >= 15 and month >= 5 and month <= 9 and hour >= 6 and hour <= 20:
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/dress/undressnudebeach.jpg"></center>'
 					'You quickly check to see if anyone is watching, and when you''re satisfied no one is paying you undue attention, you take off your clothes. You''re naked now.'
 				end
+				$lastwornclothingtype['swim'] = $clothingworntype
+				lastwornclothingnumber['swim'] = clothingwornnumber
+				$lastwornpantytype['swim'] = $pantyworntype
+				lastwornpantynumber['swim'] = pantywornnumber
+				$lastwornbratype['swim'] = $braworntype
+				lastwornbranumber['swim'] = brawornnumber
+				gs 'clothing', 'strip_all'
+				gs 'stat'
 			else
 				cla
 				*clr

+ 10 - 0
locations/SMS_schedules.qsrc

@@ -1,6 +1,11 @@
 # SMS_schedules
 
 if $ARGS[0] = 'cikl':
+	!! set the time when the SMS will be send
+	gs 'booty_call', 'scheduler'
+	booty_call_time['daystart'] = daystart
+
+
 	if nerd_game['invite_day'] < daystart and week = 1:
 		if nerd_game['first_SMS_received'] = 0: if arrpos('$contact', 'A152') = -1: gs 'telefon', 'AddContact', 'A152', 'icon_na', 1
 		gs 'telefon', 'SetSMSSchedule', 'A152', "", "0", "gs 'nerd_game_night', 'game_invite_sms_switch'", "totminut > <<totminut + (11 - hour) * 60 + rand(20, 280) - minut>>"
@@ -21,6 +26,11 @@ if $ARGS[0] = 'cikl':
 			gs 'telefon', 'SetSMSSchedule', 'A144', "", "0", "gs 'band_tour_anushka_SMS', 'start'", "totminut > <<totminut + (19 - hour) * 60 + rand(20, 100) - minut>>"
 		end
 	end
+
+	if mainQW >= 1:
+		gs 'tatiana_lab', 'stage_SMS'
+	end
+
 end
 
 

+ 12 - 12
locations/TV.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
 	end
 
-	if daystart < 10 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart - daystart_start < 9 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 	act 'Turn off the TV and get off the couch':
 		cla
 		gt $loc, $loc_arg
@@ -34,7 +34,7 @@ if $ARGS[0] = 'nokable':
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 	'You watch the network channel, lying on the couch. It''s all repeats and cheesy infomercials.'
 
-	if daystart < 10 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart - daystart_start < 9 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'nokable'
 	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
@@ -48,14 +48,14 @@ if $ARGS[0] = 'kable':
 	'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 	'You watch cable television. It''s really good these days.'
 
-	if daystart < 10 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
+	if daystart - daystart_start < 9 and $start_type[1] = 'tg':'Sometimes while watching TV, you catch a glimpse of your legs or chest, and every time, it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
 	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'pav':
-	if tvtime = 0: 
+	if tvtime = 0:
 		*clr & cla
 		minut += 5
 		tvtime = 1
@@ -70,9 +70,9 @@ if $ARGS[0] = 'pav':
 		'<center><img <<$set_imgh>> src="images/shared/home/telek.jpg"></center>'
 		'You are watching one of the half dozen or so television channels that you can get without cable. None of their programs are really worth watching, but the distraction is welcome anyway.'
 		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'pav'
-		act 'Turn off the TV': 
+		act 'Turn off the TV':
 			*clr & cla
-			tvtime = 0 
+			tvtime = 0
 			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
 			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squawk in protest.'
 			act 'Continue': gt $loc, $loc_arg
@@ -81,7 +81,7 @@ if $ARGS[0] = 'pav':
 end
 
 if $ARGS[0] = 'gad':
-	if tvtime = 0: 
+	if tvtime = 0:
 		*clr & cla
 		minut += 5
 		tvtime = 1
@@ -96,9 +96,9 @@ if $ARGS[0] = 'gad':
 		'<center><video autoplay loop src="images/locations/gadukino/grandparents/tv/tv'+rand(1,5)+'.mp4"></video></center>'
 		'You are watching one of the three television channels that you can get here in the country. None of their programs are really worth watching, but the distraction is welcome anyway.'
 		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'gad'
-		act 'Turn off the TV': 
+		act 'Turn off the TV':
 			*clr & cla
-			tvtime = 0 
+			tvtime = 0
 			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
 			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squawk in protest.'
 			act 'Continue': gt $loc, $loc_arg
@@ -107,7 +107,7 @@ if $ARGS[0] = 'gad':
 end
 
 if $ARGS[0] = 'meyhome':
-	if tvtime = 0: 
+	if tvtime = 0:
 		*clr & cla
 		minut += 5
 		tvtime = 1
@@ -124,9 +124,9 @@ if $ARGS[0] = 'meyhome':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tvon.jpg"></center>'
 		'You watch cable television. It''s really good these days.'
 		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'meyhome'
-		act 'Turn off the TV and get off the couch': 
+		act 'Turn off the TV and get off the couch':
 			*clr & cla
-			tvtime = 0 
+			tvtime = 0
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tvoff.jpg"></center>'
 			'You turn off the TV and the image blinks out of existence, while you stand up and stretch your legs.'
 			act 'Continue': gt $loc, $loc_arg

+ 101 - 92
locations/_attributes_bomba_dress.qsrc

@@ -9,7 +9,7 @@ if ARGS[1] = 1:
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 2:
 	CloQuality = 3
 	CloThinness = 1
@@ -17,7 +17,7 @@ elseif ARGS[1] = 2:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 1
@@ -25,7 +25,7 @@ elseif ARGS[1] = 3:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 1
@@ -33,14 +33,14 @@ elseif ARGS[1] = 4:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 5:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 6:
 	CloQuality = 4
 	CloThinness = 1
@@ -48,7 +48,7 @@ elseif ARGS[1] = 6:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 1
@@ -56,7 +56,7 @@ elseif ARGS[1] = 7:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 8:
 	CloQuality = 4
 	CloThinness = 3
@@ -64,7 +64,7 @@ elseif ARGS[1] = 8:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 9:
 	CloQuality = 3
 	CloThinness = 2
@@ -72,7 +72,7 @@ elseif ARGS[1] = 9:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 3
@@ -80,7 +80,7 @@ elseif ARGS[1] = 10:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 11:
 	CloQuality = 4
 	CloThinness = 3
@@ -89,21 +89,21 @@ elseif ARGS[1] = 11:
 	CloDress = 1
 	CloStyle = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 1
@@ -111,14 +111,14 @@ elseif ARGS[1] = 14:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 15:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloDress = 1
-	
+
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 4
@@ -126,7 +126,7 @@ elseif ARGS[1] = 16:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 17:
 	CloQuality = 3
 	CloThinness = 4
@@ -134,28 +134,28 @@ elseif ARGS[1] = 17:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloDress = 1
-	
+
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 21:
 	CloQuality = 3
 	CloThinness = 4
@@ -168,77 +168,77 @@ elseif ARGS[1] = 22:
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 25:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 29:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 30:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 1
@@ -246,7 +246,7 @@ elseif ARGS[1] = 33:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 5
-	
+
 elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 3
@@ -254,49 +254,51 @@ elseif ARGS[1] = 34:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 39:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 41:
 	CloQuality = 3
 	CloThinness = 4
@@ -304,28 +306,28 @@ elseif ARGS[1] = 41:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloDress = 1
-	
+
 elseif ARGS[1] = 45:
 	CloQuality = 3
 	CloThinness = 4
@@ -341,7 +343,7 @@ elseif ARGS[1] = 46:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 47:
 	CloQuality = 3
 	CloThinness = 5
@@ -349,14 +351,14 @@ elseif ARGS[1] = 47:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 4
@@ -364,7 +366,8 @@ elseif ARGS[1] = 49:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 4
@@ -372,14 +375,14 @@ elseif ARGS[1] = 50:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 51:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 4
@@ -387,26 +390,26 @@ elseif ARGS[1] = 52:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 53:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	
+
 elseif ARGS[1] = 54:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 4
-	
+
 elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 6
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 4
@@ -419,14 +422,14 @@ elseif ARGS[1] = 57:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 59:
 	CloQuality = 3
 	CloThinness = 4
@@ -434,7 +437,7 @@ elseif ARGS[1] = 59:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 60:
 	CloQuality = 3
 	CloThinness = 4
@@ -442,7 +445,7 @@ elseif ARGS[1] = 60:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 5
@@ -450,7 +453,7 @@ elseif ARGS[1] = 61:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 62:
 	CloQuality = 4
 	CloThinness = 5
@@ -458,7 +461,7 @@ elseif ARGS[1] = 62:
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 63:
 	CloQuality = 4
 	CloThinness = 4
@@ -466,7 +469,7 @@ elseif ARGS[1] = 63:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 64:
 	CloQuality = 4
 	CloThinness = 5
@@ -475,7 +478,7 @@ elseif ARGS[1] = 64:
 	CloDress = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 65:
 	CloQuality = 4
 	CloThinness = 5
@@ -484,33 +487,35 @@ elseif ARGS[1] = 65:
 	CloDress = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 66:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloGoth = 1
+	CloPunk = 1
+
 elseif ARGS[1] = 67:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	
+
 elseif ARGS[1] = 68:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 69:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
-	
+
 elseif ARGS[1] = 70:
 	CloQuality = 3
 	CloThinness = 4
@@ -518,21 +523,21 @@ elseif ARGS[1] = 70:
 	CloSkirtShortness = 4
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 71:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 72:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 73:
 	CloQuality = 3
 	CloThinness = 5
@@ -540,7 +545,7 @@ elseif ARGS[1] = 73:
 	CloSkirtShortness = 4
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 74:
 	CloQuality = 3
 	CloThinness = 1
@@ -582,14 +587,14 @@ elseif ARGS[1] = 79:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 80:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
-	
+
 elseif ARGS[1] = 81:
 	CloQuality = 3
 	CloThinness = 5
@@ -597,13 +602,13 @@ elseif ARGS[1] = 81:
 	CloSkirtShortness = 5
 	CloStyle = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 82:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
-	
+
 elseif ARGS[1] = 83:
 	CloQuality = 3
 	CloThinness = 5
@@ -611,7 +616,7 @@ elseif ARGS[1] = 83:
 	CloSkirtShortness = 5
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 84:
 	CloQuality = 3
 	CloThinness = 4
@@ -619,7 +624,7 @@ elseif ARGS[1] = 84:
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 85:
 	CloQuality = 4
 	CloThinness = 4
@@ -627,14 +632,14 @@ elseif ARGS[1] = 85:
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 86:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 87:
 	CloQuality = 3
 	CloThinness = 4
@@ -642,27 +647,28 @@ elseif ARGS[1] = 87:
 	CloSkirtShortness = 5
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 88:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 5
-	
+
 elseif ARGS[1] = 89:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 90:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 91:
 	CloQuality = 4
 	CloThinness = 6
@@ -670,7 +676,8 @@ elseif ARGS[1] = 91:
 	CloSkirtShortness = 5
 	CloStyle = 4
 	CloBimbo = 1
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 92:
 	CloQuality = 4
 	CloThinness = 6
@@ -678,49 +685,51 @@ elseif ARGS[1] = 92:
 	CloSkirtShortness = 5
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 93:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloStyle = 4
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 94:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 6
 	CloDress = 1
-	
+
 elseif ARGS[1] = 95:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 6
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 96:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 6
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 97:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloSkirtShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 98:
 	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
 	CloSkirtShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 99:
 	CloQuality = 4
 	CloThinness = 4
@@ -728,14 +737,14 @@ elseif ARGS[1] = 99:
 	CloSkirtShortness = 6
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 100:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloStyle = 4
-					
+
 end
 
 --- $attributes_bomba_dress ---------------------------------

+ 99 - 98
locations/_attributes_bomba_outfits.qsrc

@@ -8,117 +8,117 @@ if ARGS[1] = 1:
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 2:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 4:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 5:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 8:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 10:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 11:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 12:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 15:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 17:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 2
@@ -130,74 +130,74 @@ elseif ARGS[1] = 19:
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 25:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 28:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 29:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 30:
 	CloQuality = 4
 	CloThinness = 6
@@ -205,49 +205,50 @@ elseif ARGS[1] = 30:
 	CloPantsShortness = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 32:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 33:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 35:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 4
@@ -255,14 +256,14 @@ elseif ARGS[1] = 37:
 	CloPantsShortness = 1
 	CloStyle = 2
 	CloOnePiece = 1
-	
+
 elseif ARGS[1] = 38:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 39:
 	CloQuality = 5
 	CloThinness = 2
@@ -270,94 +271,94 @@ elseif ARGS[1] = 39:
 	CloPantsShortness = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 40:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 41:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 45:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 47:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 48:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 51:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 1
-	
+
 elseif ARGS[1] = 53:
 	CloQuality = 4
 	CloThinness = 4
@@ -365,117 +366,117 @@ elseif ARGS[1] = 53:
 	CloPantsShortness = 6
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 54:
 	CloQuality = 3
 	CloThinness = 6
 	CloBra = 1
 	CloPantsShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 57:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 59:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 60:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 62:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 63:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 64:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 3
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 65:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 5
-	
+
 elseif ARGS[1] = 66:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 5
 	CloOnePiece = 1
-	
+
 elseif ARGS[1] = 67:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 68:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 69:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 70:
 	CloQuality = 3
 	CloThinness = 4
@@ -483,28 +484,28 @@ elseif ARGS[1] = 70:
 	CloPantsShortness = 5
 	CloStyle = 2
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 71:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 72:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 73:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 74:
 	CloQuality = 4
 	CloThinness = 4
@@ -512,7 +513,7 @@ elseif ARGS[1] = 74:
 	CloPantsShortness = 5
 	CloStyle = 2
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 75:
 	CloQuality = 4
 	CloThinness = 4
@@ -520,14 +521,14 @@ elseif ARGS[1] = 75:
 	CloPantsShortness = 5
 	CloStyle = 2
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 76:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 77:
 	CloQuality = 4
 	CloThinness = 3
@@ -542,14 +543,14 @@ elseif ARGS[1] = 78:
 	CloPantsShortness = 6
 	CloStyle = 2
 	CloOnePiece = 1
-	
+
 elseif ARGS[1] = 79:
 	CloQuality = 4
 	CloThinness = 6
 	CloTopCut = 4
 	CloPantsShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 80:
 	CloQuality = 5
 	CloThinness = 4
@@ -557,7 +558,7 @@ elseif ARGS[1] = 80:
 	CloPantsShortness = 6
 	CloStyle = 2
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 81:
 	CloQuality = 4
 	CloThinness = 5
@@ -565,20 +566,20 @@ elseif ARGS[1] = 81:
 	CloPanties = 1
 	CloStyle = 2
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 82:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 6
-	
+
 elseif ARGS[1] = 83:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 6
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 84:
 	CloQuality = 4
 	CloThinness = 6
@@ -586,66 +587,66 @@ elseif ARGS[1] = 84:
 	CloPantsShortness = 6
 	CloStyle = 2
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 85:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 2
 	CloPantsShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 86:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 6
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 87:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 88:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 3
 	CloPantsShortness = 6
-	
+
 elseif ARGS[1] = 89:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 6
-	
+
 elseif ARGS[1] = 90:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 6
-	
+
 elseif ARGS[1] = 91:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 6
-	
+
 elseif ARGS[1] = 92:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 93:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloStyle = 4
-		
+
 elseif ARGS[1] = 94:
 	CloQuality = 4
 	CloThinness = 4
@@ -653,42 +654,42 @@ elseif ARGS[1] = 94:
 	CloPanties = 1
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 95:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 4
 	CloPantsShortness = 5
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 96:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 97:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 98:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 2
 	CloPantsShortness = 6
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 99:
 	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 100:
 	CloQuality = 4
 	CloThinness = 4
@@ -696,7 +697,7 @@ elseif ARGS[1] = 100:
 	CloPantsShortness = 6
 	CloStyle = 4
 	CloBimbo = 1
-	
+
 end
 
 --- $attributes_bomba_outfits ---------------------------------

+ 48 - 38
locations/_attributes_bomba_shoes.qsrc

@@ -7,175 +7,182 @@ if ARGS[1] = 1:
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 2:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 4:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 5:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 6:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 7:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 13:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 17:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+	ShoGoth = 1
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 22:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 23:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 24:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 25:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 26:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 27:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 28:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 29:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 4
@@ -183,10 +190,11 @@ elseif ARGS[1] = 30:
 	ShoHeels = 4
 
 elseif ARGS[1] = 31:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
+	ShoBimbo = 1
 
 elseif ARGS[1] = 32:
 	ShoStyle = 0
@@ -231,17 +239,19 @@ elseif ARGS[1] = 38:
 	ShoHeels = 3
 
 elseif ARGS[1] = 39:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 3
 	ShoHeels = 3
+	ShoBimbo = 1
 
 elseif ARGS[1] = 40:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 3
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 end
 
 --- $attributes_bomba_shoes ---------------------------------

+ 44 - 41
locations/_attributes_cats_shoes.qsrc

@@ -7,175 +7,177 @@ if ARGS[1] = 1:
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 2:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 4:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 5:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 6:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 14:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 16:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 22:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 23:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 24:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 25:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 26:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 27:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 28:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 29:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 5
@@ -187,55 +189,56 @@ elseif ARGS[1] = 31:
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 32:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 33:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 34:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 35:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 36:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 37:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 38:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 39:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 40:
 	ShoStyle = 0
 	ShoQuality = 5

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 165 - 143
locations/_attributes_danilovich_outfits.qsrc


+ 46 - 43
locations/_attributes_danilovich_shoes.qsrc

@@ -7,241 +7,244 @@ if ARGS[1] = 1:
 	ShoQuality = 7
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 2:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 4:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 5:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 6:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 12:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 22:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 23:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 24:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 25:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 26:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 27:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 28:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 29:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 31:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 32:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 33:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 34:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 35:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 36:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 37:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 38:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 39:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 40:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 end
 
 --- $attributes_danilovich_shoes ---------------------------------

+ 123 - 71
locations/_attributes_dolls_dress.qsrc

@@ -9,7 +9,8 @@ if ARGS[1] = 1:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 2:
 	CloQuality = 5
 	CloThinness = 2
@@ -17,7 +18,8 @@ elseif ARGS[1] = 2:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 3:
 	CloQuality = 5
 	CloThinness = 2
@@ -25,7 +27,8 @@ elseif ARGS[1] = 3:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 2
@@ -33,7 +36,8 @@ elseif ARGS[1] = 4:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 5:
 	CloQuality = 5
 	CloThinness = 2
@@ -41,7 +45,8 @@ elseif ARGS[1] = 5:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 6:
 	CloQuality = 5
 	CloThinness = 2
@@ -49,7 +54,8 @@ elseif ARGS[1] = 6:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 7:
 	CloQuality = 5
 	CloThinness = 2
@@ -57,7 +63,8 @@ elseif ARGS[1] = 7:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 8:
 	CloQuality = 5
 	CloThinness = 2
@@ -65,7 +72,8 @@ elseif ARGS[1] = 8:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 2
@@ -73,7 +81,8 @@ elseif ARGS[1] = 9:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 10:
 	CloQuality = 5
 	CloThinness = 2
@@ -81,7 +90,8 @@ elseif ARGS[1] = 10:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 2
@@ -89,7 +99,8 @@ elseif ARGS[1] = 11:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 12:
 	CloQuality = 5
 	CloThinness = 2
@@ -97,7 +108,8 @@ elseif ARGS[1] = 12:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 13:
 	CloQuality = 5
 	CloThinness = 2
@@ -105,7 +117,8 @@ elseif ARGS[1] = 13:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 14:
 	CloQuality = 5
 	CloThinness = 2
@@ -113,7 +126,8 @@ elseif ARGS[1] = 14:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 2
@@ -121,7 +135,8 @@ elseif ARGS[1] = 15:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 16:
 	CloQuality = 4
 	CloThinness = 2
@@ -129,7 +144,8 @@ elseif ARGS[1] = 16:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 2
@@ -137,7 +153,8 @@ elseif ARGS[1] = 17:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 2
@@ -145,7 +162,7 @@ elseif ARGS[1] = 18:
 	CloSkirtShortness = 1
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 19:
 	CloQuality = 5
 	CloThinness = 5
@@ -153,7 +170,8 @@ elseif ARGS[1] = 19:
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 20:
 	CloQuality = 4
 	CloThinness = 4
@@ -161,7 +179,7 @@ elseif ARGS[1] = 20:
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 2
@@ -169,14 +187,14 @@ elseif ARGS[1] = 21:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 2
@@ -184,7 +202,7 @@ elseif ARGS[1] = 23:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 4
@@ -192,7 +210,8 @@ elseif ARGS[1] = 24:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 25:
 	CloQuality = 4
 	CloThinness = 3
@@ -200,7 +219,8 @@ elseif ARGS[1] = 25:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 26:
 	CloQuality = 4
 	CloThinness = 3
@@ -208,35 +228,36 @@ elseif ARGS[1] = 26:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 27:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 4
 	CloThinness = 2
@@ -244,7 +265,8 @@ elseif ARGS[1] = 31:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 2
@@ -252,21 +274,21 @@ elseif ARGS[1] = 32:
 	CloSkirtShortness = 3
 	CloStyle = 2
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 33:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 34:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 35:
 	CloQuality = 4
 	CloThinness = 2
@@ -274,7 +296,7 @@ elseif ARGS[1] = 35:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 2
@@ -282,7 +304,7 @@ elseif ARGS[1] = 36:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 37:
 	CloQuality = 3
 	CloThinness = 2
@@ -290,7 +312,7 @@ elseif ARGS[1] = 37:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 38:
 	CloQuality = 3
 	CloThinness = 2
@@ -298,7 +320,7 @@ elseif ARGS[1] = 38:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 39:
 	CloQuality = 5
 	CloThinness = 2
@@ -306,7 +328,8 @@ elseif ARGS[1] = 39:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 4
@@ -314,7 +337,7 @@ elseif ARGS[1] = 40:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 4
@@ -322,7 +345,7 @@ elseif ARGS[1] = 41:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 4
@@ -330,7 +353,7 @@ elseif ARGS[1] = 42:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 4
@@ -338,7 +361,8 @@ elseif ARGS[1] = 43:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 44:
 	CloQuality = 4
 	CloThinness = 4
@@ -346,7 +370,8 @@ elseif ARGS[1] = 44:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 45:
 	CloQuality = 4
 	CloThinness = 4
@@ -354,7 +379,7 @@ elseif ARGS[1] = 45:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 4
@@ -362,7 +387,7 @@ elseif ARGS[1] = 46:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 47:
 	CloQuality = 4
 	CloThinness = 4
@@ -370,7 +395,7 @@ elseif ARGS[1] = 47:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 48:
 	CloQuality = 4
 	CloThinness = 4
@@ -378,14 +403,14 @@ elseif ARGS[1] = 48:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 49:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 50:
 	CloQuality = 4
 	CloThinness = 4
@@ -393,7 +418,7 @@ elseif ARGS[1] = 50:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 51:
 	CloQuality = 4
 	CloThinness = 4
@@ -401,7 +426,7 @@ elseif ARGS[1] = 51:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 52:
 	CloQuality = 4
 	CloThinness = 4
@@ -409,14 +434,15 @@ elseif ARGS[1] = 52:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 53:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 54:
 	CloQuality = 3
 	CloThinness = 4
@@ -424,7 +450,7 @@ elseif ARGS[1] = 54:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 55:
 	CloQuality = 4
 	CloThinness = 4
@@ -432,21 +458,26 @@ elseif ARGS[1] = 55:
 	CloSkirtShortness = 3
 	CloDress = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 56:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 3
 	CloSkirtShortness = 3
 	CloStyle = 2
-	
+	CloStyle2 = 4
+	CloGoth = 1
+
 elseif ARGS[1] = 57:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloStyle2 = 4
+	CloPunk = 1
+
 elseif ARGS[1] = 58:
 	CloQuality = 4
 	CloThinness = 3
@@ -454,7 +485,7 @@ elseif ARGS[1] = 58:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 59:
 	CloQuality = 4
 	CloThinness = 4
@@ -462,35 +493,39 @@ elseif ARGS[1] = 59:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 61:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 62:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 63:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+	CloStyle2 = 4
+	CloGoth = 1
+
+
 elseif ARGS[1] = 64:
 	CloQuality = 4
 	CloThinness = 3
@@ -498,28 +533,28 @@ elseif ARGS[1] = 64:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 65:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 66:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 67:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 68:
 	CloQuality = 5
 	CloThinness = 4
@@ -527,14 +562,14 @@ elseif ARGS[1] = 68:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 69:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 70:
 	CloQuality = 4
 	CloThinness = 4
@@ -565,6 +600,7 @@ elseif ARGS[1] = 73:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 74:
 	CloQuality = 3
@@ -572,6 +608,7 @@ elseif ARGS[1] = 74:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 75:
 	CloQuality = 3
@@ -594,6 +631,7 @@ elseif ARGS[1] = 77:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 78:
 	CloQuality = 3
@@ -632,6 +670,7 @@ elseif ARGS[1] = 82:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 83:
 	CloQuality = 5
@@ -671,6 +710,7 @@ elseif ARGS[1] = 87:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 88:
 	CloQuality = 4
@@ -685,7 +725,7 @@ elseif ARGS[1] = 89:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 90:
 	CloQuality = 3
 	CloThinness = 4
@@ -700,6 +740,7 @@ elseif ARGS[1] = 91:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 92:
 	CloQuality = 5
@@ -724,6 +765,7 @@ elseif ARGS[1] = 94:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 95:
 	CloQuality = 4
@@ -799,6 +841,7 @@ elseif ARGS[1] = 104:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 105:
 	CloQuality = 4
@@ -806,6 +849,7 @@ elseif ARGS[1] = 105:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 106:
 	CloQuality = 4
@@ -834,6 +878,7 @@ elseif ARGS[1] = 109:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 110:
 	CloQuality = 5
@@ -856,6 +901,7 @@ elseif ARGS[1] = 112:
 	CloTopCut = 3
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 113:
 	CloQuality = 3
@@ -893,6 +939,8 @@ elseif ARGS[1] = 117:
 	CloSkirtShortness = 4
 	CloDress = 1
 	CloStyle = 2
+	CloGoth = 1
+	CloPunk = 1
 
 elseif ARGS[1] = 118:
 	CloQuality = 5
@@ -908,6 +956,7 @@ elseif ARGS[1] = 119:
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 120:
 	CloQuality = 4
@@ -929,6 +978,7 @@ elseif ARGS[1] = 122:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 123:
 	CloQuality = 5
@@ -949,6 +999,7 @@ elseif ARGS[1] = 125:
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 126:
 	CloQuality = 4
@@ -986,6 +1037,7 @@ elseif ARGS[1] = 130:
 	CloDress = 1
 	CloStyle = 2
 	CloCoverTop = 3
+	CloGoth = 1
 
 elseif ARGS[1] = 131:
 	CloQuality = 4
@@ -1058,7 +1110,7 @@ elseif ARGS[1] = 140:
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloStyle = 4
-	
+
 end
 
 --- $attributes_dolls_dress ---------------------------------

+ 76 - 49
locations/_attributes_dolls_outfits.qsrc

@@ -8,224 +8,242 @@ if ARGS[1] = 1:
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 2:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 3:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 5:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 6:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 7:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 8:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 9:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 10:
 	CloQuality = 6
 	CloThinness = 2
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 11:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 12:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 13:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 14:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 15:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 19:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 20:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 21:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 22:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 25:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 26:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 27:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 28:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 29:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 30:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 32:
 	CloQuality = 4
 	CloThinness = 5
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 33:
 	CloQuality = 4
 	CloThinness = 5
@@ -233,7 +251,7 @@ elseif ARGS[1] = 33:
 	CloPantsShortness = 1
 	CloStyle = 2
 	CloCoverTop = 2
-	
+
 elseif ARGS[1] = 34:
 	CloQuality = 5
 	CloThinness = 6
@@ -241,91 +259,95 @@ elseif ARGS[1] = 34:
 	CloPantsShortness = 1
 	CloStyle = 2
 	CloCoverTop = 3
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 35:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 38:
 	CloQuality = 6
 	CloThinness = 3
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 39:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 40:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 41:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 42:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 43:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 44:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 45:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 46:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 47:
 	CloQuality = 4
 	CloThinness = 5
@@ -333,21 +355,22 @@ elseif ARGS[1] = 47:
 	CloPantsShortness = 1
 	CloStyle = 2
 	CloCoverTop = 2
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 48:
 	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 49:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
-	
+
 elseif ARGS[1] = 50:
 	CloQuality = 5
 	CloThinness = 4
@@ -396,6 +419,7 @@ elseif ARGS[1] = 56:
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 57:
 	CloQuality = 5
@@ -403,6 +427,7 @@ elseif ARGS[1] = 57:
 	CloTopCut = 3
 	CloPantsShortness = 1
 	CloStyle = 2
+	CloGoth = 1
 
 elseif ARGS[1] = 58:
 	CloQuality = 4
@@ -480,6 +505,7 @@ elseif ARGS[1] = 68:
 	CloTopCut = 4
 	CloPantsShortness = 1
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 69:
 	CloQuality = 4
@@ -543,6 +569,7 @@ elseif ARGS[1] = 77:
 	CloTopCut = 2
 	CloPantsShortness = 5
 	CloStyle = 2
+	CloPunk = 1
 
 elseif ARGS[1] = 78:
 	CloQuality = 5

+ 285 - 163
locations/_attributes_dolls_shoes.qsrc

@@ -7,241 +7,266 @@ if ARGS[1] = 1:
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 2:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 4:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 2
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 5:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 6:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 2
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 9:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 11:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 17:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 5
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 19:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 5
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 20:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 3
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 22:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 23:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 24:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 25:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+	ShoGoth = 1
+
 elseif ARGS[1] = 26:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 3
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 27:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 3
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 28:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 29:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 31:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 32:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 33:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 34:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 35:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 36:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 37:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 38:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 39:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 40:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 41:
 	ShoStyle = 0
 	ShoQuality = 4
@@ -252,110 +277,134 @@ elseif ARGS[1] = 42:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 1	
-	
+	ShoHeels = 1
+
 elseif ARGS[1] = 43:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 1	
-	
+	ShoHeels = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 44:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
 
 elseif ARGS[1] = 45:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 46:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 47:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 48:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 2
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 49:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 50:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 51:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 52:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 53:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
-	
+	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 54:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
+	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 55:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
-	
+	ShoHeels = 4
+	ShoBimbo = 1
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 56:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
-	ShoHeels = 5	
+	ShoHeels = 5
+	ShoGoth = 1
 
 elseif ARGS[1] = 57:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 2
-	
+	ShoPunk = 1
+	ShoBimbo = 1
+
 elseif ARGS[1] = 58:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 59:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 60:
 	ShoStyle = 0
 	ShoQuality = 5
@@ -363,35 +412,39 @@ elseif ARGS[1] = 60:
 	ShoHeels = 1
 
 elseif ARGS[1] = 61:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 62:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 63:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 64:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 65:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 66:
 	ShoStyle = 0
 	ShoQuality = 4
@@ -403,19 +456,21 @@ elseif ARGS[1] = 67:
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 68:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
+	ShoPunk = 1
 
 elseif ARGS[1] = 69:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 70:
 	ShoStyle = 0
 	ShoQuality = 4
@@ -427,31 +482,36 @@ elseif ARGS[1] = 71:
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 72:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 2
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 73:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
-	ShoHeels = 4	
-	
+	ShoHeels = 4
+	ShoPunk = 1
+
 elseif ARGS[1] = 74:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
+	ShoGoth = 1
 
 elseif ARGS[1] = 75:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 76:
 	ShoStyle = 0
 	ShoQuality = 4
@@ -463,265 +523,327 @@ elseif ARGS[1] = 77:
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 78:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
+	ShoHeels = 4
 
 elseif ARGS[1] = 79:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
-	ShoHeels = 4	
-	
+	ShoHeels = 4
+
 elseif ARGS[1] = 80:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 5	
+	ShoHeels = 5
+	ShoPunk = 1
 
 elseif ARGS[1] = 81:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
-	ShoHeels = 4	
-	
+	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 82:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 3
+	ShoPunk = 1
 
 elseif ARGS[1] = 83:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 84:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 1
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 85:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 86:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 3
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 87:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 3
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 88:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 4
+	ShoGoth = 1
 
 elseif ARGS[1] = 89:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 4
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 90:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 91:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 1
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 92:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 1
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 93:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 1
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 94:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 2
 	ShoHeels = 2
+	ShoGoth = 1
 
 elseif ARGS[1] = 95:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 96:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
+	ShoGoth = 1
 
 elseif ARGS[1] = 97:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
-	
+	ShoPunk = 1
+	ShoGoth = 1
+
 elseif ARGS[1] = 98:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
+	ShoGoth = 1
 
 elseif ARGS[1] = 99:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 100:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
+	ShoGoth = 1
 
 elseif ARGS[1] = 101:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 102:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 1
+	ShoGoth = 1
 
 elseif ARGS[1] = 103:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 2
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 104:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 2
+	ShoGoth = 1
 
 elseif ARGS[1] = 105:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 2
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 106:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 2
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 107:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 2
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 108:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 2
+	ShoGoth = 1
 
 elseif ARGS[1] = 109:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 5
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 110:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 111:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 112:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 2
+	ShoGoth = 1
 
 elseif ARGS[1] = 113:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 2
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 114:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 2
+	ShoGoth = 1
 
 elseif ARGS[1] = 115:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 116:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
+	ShoPunk = 1
 
 elseif ARGS[1] = 117:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoPunk = 1
+
 elseif ARGS[1] = 118:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
+	ShoGoth = 1
+	ShoPunk = 1
 
 elseif ARGS[1] = 119:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 5
 	ShoCut = 3
 	ShoHeels = 4
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 elseif ARGS[1] = 120:
-	ShoStyle = 3
+	ShoStyle = 2
 	ShoQuality = 4
 	ShoCut = 4
 	ShoHeels = 4
-	
+	ShoGoth = 1
+	ShoPunk = 1
+
 end
 
 --- $attributes_dolls_shoes ---------------------------------

+ 27 - 23
locations/_attributes_eroto_shoes.qsrc

@@ -7,115 +7,117 @@ if ARGS[1] = 1:
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 2:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 4:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 5:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 6:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 4
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 6
@@ -177,10 +179,11 @@ elseif ARGS[1] = 29:
 	ShoHeels = 6
 
 elseif ARGS[1] = 30:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 5
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 31:
 	ShoStyle = 0
@@ -231,10 +234,11 @@ elseif ARGS[1] = 38:
 	ShoHeels = 6
 
 elseif ARGS[1] = 39:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 5
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 40:
 	ShoStyle = 0

+ 34 - 31
locations/_attributes_gm_shoes.qsrc

@@ -6,149 +6,152 @@ if ARGS[1] = 1:
 	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 2:
 	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 3:
 	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 4:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 5:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 6:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 7:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 8:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 9:
+	ShoStyle = 0
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	ShoStyle = 2
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 10:
+	ShoStyle = 0
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	ShoStyle = 2
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 11:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 12:
 	ShoQuality = 1
 	ShoHeels = 1
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 13:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 14:
 	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 15:
 	ShoQuality = 2
 	ShoHeels = 1
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 16:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 17:
 	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 3
-	
+
 elseif ARGS[1] = 18:
 	ShoQuality = 3
 	ShoHeels = 1
 	ShoCut = 3
-	
+
 elseif ARGS[1] = 19:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 20:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 21:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 22:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 23:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 24:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 3
-	
+
 elseif ARGS[1] = 25:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 4
-	
+	ShoGoth = 1
+
 elseif ARGS[1] = 26:
 	ShoQuality = 2
 	ShoHeels = 2
 	ShoCut = 4
-	
+
 elseif ARGS[1] = 27:
 	ShoQuality = 2
 	ShoHeels = 4
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 28:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 1
-	
+
 elseif ARGS[1] = 29:
 	ShoQuality = 2
 	ShoHeels = 3
 	ShoCut = 2
-	
+
 elseif ARGS[1] = 30:
 	ShoQuality = 2
 	ShoHeels = 4

+ 199 - 165
locations/_attributes_moncheri_shoes.qsrc

@@ -3,791 +3,823 @@
 !!price range from 6 to 7 but please avoid adding too many 7s
 
 if ARGS[1] = 1:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 2:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 3:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 4:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 5:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 6:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 8:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 9:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 10:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 15:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 21:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 22:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 23:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 24:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 3
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 25:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 26:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 27:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 28:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 29:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 30:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 31:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 32:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 33:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 34:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 35:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 36:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 37:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 38:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 39:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 40:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 41:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 42:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 43:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 44:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 45:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 46:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 47:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 48:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 49:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 50:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 51:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 52:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 53:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 54:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 55:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 56:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 57:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 58:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 59:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 60:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 61:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 62:
 	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 63:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 64:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 65:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 66:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 67:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 68:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 69:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 70:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 71:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 72:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 73:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 2
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 74:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 4
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 75:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 4
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 76:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 77:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 78:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 79:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 80:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 81:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 82:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 3
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 83:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 2
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 84:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 85:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 86:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 87:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 88:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 89:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 90:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 91:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 92:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 93:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 94:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 95:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 96:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 97:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 98:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 99:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 100:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 1
-	
+
 elseif ARGS[1] = 101:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 102:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 103:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 104:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 105:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 106:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 107:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 108:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 109:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 110:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 111:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 112:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 113:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 114:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 115:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 116:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 117:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 118:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 119:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 120:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 121:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 122:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 123:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 124:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 125:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 126:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 127:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 128:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 129:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 130:
 	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 131:
 	ShoStyle = 0
 	ShoQuality = 7
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 132:
 	ShoStyle = 0
 	ShoQuality = 7
@@ -807,16 +839,18 @@ elseif ARGS[1] = 134:
 	ShoHeels = 4
 
 elseif ARGS[1] = 135:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
+	ShoBimbo = 1
 
 elseif ARGS[1] = 136:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 6
 	ShoCut = 1
 	ShoHeels = 4
+	ShoBimbo = 1
 
 elseif ARGS[1] = 137:
 	ShoStyle = 0

+ 46 - 38
locations/_attributes_scandalicious_shoes.qsrc

@@ -7,175 +7,177 @@ if ARGS[1] = 1:
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 2
-	
+
 elseif ARGS[1] = 2:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 3:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+	ShoBimbo = 1
+
 elseif ARGS[1] = 4:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 5:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 3
-	
+
 elseif ARGS[1] = 6:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 7:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 8:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 9:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 10:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 11:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 12:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 13:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 14:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 15:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 16:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 17:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 18:
 	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 19:
 	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 4
-	
+
 elseif ARGS[1] = 20:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 21:
 	ShoStyle = 1
 	ShoQuality = 3
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 22:
 	ShoStyle = 1
 	ShoQuality = 3
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 23:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 24:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 25:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 5
-	
+
 elseif ARGS[1] = 26:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 27:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 28:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 29:
 	ShoStyle = 1
 	ShoQuality = 4
 	ShoCut = 2
 	ShoHeels = 6
-	
+
 elseif ARGS[1] = 30:
 	ShoStyle = 1
 	ShoQuality = 4
@@ -267,16 +269,18 @@ elseif ARGS[1] = 44:
 	ShoHeels = 6
 
 elseif ARGS[1] = 45:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 46:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 47:
 	ShoStyle = 0
@@ -333,10 +337,11 @@ elseif ARGS[1] = 55:
 	ShoHeels = 6
 
 elseif ARGS[1] = 56:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 3
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 57:
 	ShoStyle = 1
@@ -375,10 +380,11 @@ elseif ARGS[1] = 62:
 	ShoHeels = 6
 
 elseif ARGS[1] = 63:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 64:
 	ShoStyle = 1
@@ -399,10 +405,11 @@ elseif ARGS[1] = 66:
 	ShoHeels = 6
 
 elseif ARGS[1] = 67:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 68:
 	ShoStyle = 1
@@ -465,10 +472,11 @@ elseif ARGS[1] = 77:
 	ShoHeels = 6
 
 elseif ARGS[1] = 78:
-	ShoStyle = 2
+	ShoStyle = 0
 	ShoQuality = 4
 	ShoCut = 1
 	ShoHeels = 6
+	ShoBimbo = 1
 
 elseif ARGS[1] = 79:
 	ShoStyle = 0
@@ -481,7 +489,7 @@ elseif ARGS[1] = 80:
 	ShoQuality = 5
 	ShoCut = 1
 	ShoHeels = 6
-	
+
 end
 
 --- $attributes_scandalicious_shoes ---------------------------------

+ 58 - 55
locations/_attributes_school.qsrc

@@ -8,98 +8,98 @@ if ARGS[1] = 1:
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 2:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 3:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 4:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 5:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 6:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 7:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 8:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 9:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 10:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 11:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 12:
 	CloQuality = 2
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 13:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 14:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 15:
 	CloQuality = 3
 	CloThinness = 3
@@ -107,140 +107,140 @@ elseif ARGS[1] = 15:
 	CloSkirtShortness = 4
 	CloBimbo = 1
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 16:
 	CloQuality = 5
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 17:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 18:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 19:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 20:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 21:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 22:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 23:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 24:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 1
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 25:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 1
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 26:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 27:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 28:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 29:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 30:
 	CloQuality = 3
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 32:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 33:
 	CloQuality = 4
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 34:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 35:
 	CloQuality = 3
 	CloThinness = 4
@@ -248,14 +248,14 @@ elseif ARGS[1] = 35:
 	CloSkirtShortness = 5
 	CloStyle2 = 4
 	CloBimbo = 1
-	
+
 elseif ARGS[1] = 36:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 37:
 	CloQuality = 4
 	CloThinness = 3
@@ -269,7 +269,7 @@ elseif ARGS[1] = 38:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 39:
 	CloQuality = 3
 	CloThinness = 4
@@ -277,7 +277,7 @@ elseif ARGS[1] = 39:
 	CloSkirtShortness = 5
 	CloStyle2 = 4
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 40:
 	CloQuality = 3
 	CloThinness = 3
@@ -306,7 +306,7 @@ elseif ARGS[1] = 43:
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 44:
 	CloQuality = 5
 	CloThinness = 2
@@ -320,7 +320,7 @@ elseif ARGS[1] = 45:
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 46:
 	CloQuality = 3
 	CloThinness = 4
@@ -334,35 +334,36 @@ elseif ARGS[1] = 47:
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 49:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 50:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 51:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 52:
 	CloQuality = 3
 	CloThinness = 2
@@ -370,28 +371,30 @@ elseif ARGS[1] = 52:
 	CloSkirtShortness = 4
 	CloStyle2 = 4
 	CloStyle = 2
-	
+	CloPunk = 1
+
 elseif ARGS[1] = 53:
 	CloQuality = 3
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 54:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+	CloGoth = 1
+
 elseif ARGS[1] = 56:
 	CloQuality = 3
 	CloThinness = 4
@@ -400,42 +403,42 @@ elseif ARGS[1] = 56:
 	CloStyle2 = 4
 	CloBimbo = 1
 	CloStyle = 4
-	
+
 elseif ARGS[1] = 57:
 	CloQuality = 4
 	CloThinness = 3
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 58:
 	CloQuality = 3
 	CloThinness = 3
 	CloTopCut = 2
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 59:
 	CloQuality = 5
 	CloThinness = 2
 	CloTopCut = 1
 	CloSkirtShortness = 2
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 60:
 	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 61:
 	CloQuality = 5
 	CloThinness = 1
 	CloTopCut = 1
 	CloSkirtShortness = 3
 	CloStyle2 = 4
-	
+
 elseif ARGS[1] = 62:
 	CloQuality = 4
 	CloThinness = 6

+ 145 - 44
locations/_body_image.qsrc

@@ -1,23 +1,134 @@
 # $body_image
 !This function will return url of image, and set additional texts to $body_image_msg
-!for example, you can   VIEW FUNC('$body_image', 'body')   to view body image in popup window, and
+!for example, you can   VIEW func('$body_image', 'body')   to view body image in popup window, and
 !pl $body_image_msg     to display extra texts
 
 
 $body_image_msg = ''
+
 if $ARGS[0] = 'body':
+	$body_image_msg += 'You are <<pcs_hgt>>cm tall and <<$bodyVars[''desc'']>>.'
 	$result = $bodyVars['img']
-	$body_image_msg += 'You are <<pcs_hgt>>cm tall and <<$bodyVars[''desc'']>>'
 end
 
+if $ARGS[0] = 'tits':
+	$body_image_msg += 'Your breasts would be considered an EU <<$titsize>>.'
+	$result = 'images/pc/body/tits/t<<tits>>.jpg'
+end
+
+if $ARGS[0] = 'pubes' or $ARGS[0] = 'pussy':
+	$result = 'images/pc/body/pussy/'
+
+	if ARGS[1] ! 0: temp_pubes = ARGS[1]		else temp_pubes = pcs_pubes
+	if ARGS[2] ! 0: temp_pubecol = ARGS[2]		else temp_pubecol = pcs_pubecol[2]
+	if ARGS[3] ! 0: temp_pubestyle = ARGS[3]	else temp_pubestyle = pubestyle
+
+	if temp_pubecol = 0:
+		$temp_pubecol = 'black'
+	elseif temp_pubecol = 1:
+		$temp_pubecol = 'brunette'
+	elseif temp_pubecol = 2:
+		$temp_pubecol = 'ginger'
+	elseif temp_pubecol = 3:
+		$temp_pubecol = 'blonde'
+	elseif temp_pubecol = 4:
+		$temp_pubecol = 'red'
+	elseif temp_pubecol = 5:
+		$temp_pubecol = 'blue'
+	elseif temp_pubecol = 6:
+		$temp_pubecol = 'green'
+	elseif temp_pubecol = 7:
+		$temp_pubecol = 'pink'
+	elseif temp_pubecol = 8:
+		$temp_pubecol = 'purple'
+	end
+
+	if temp_pubes ! 0:
+		if temp_pubes <= 3:
+			$result += 'hair/pussy'
+		elseif temp_pubes <= 10:
+			$result += 'hair/stubble'
+		elseif temp_pubes <= 15:
+			$result += 'hair/very_short'
+		elseif temp_pubes <= 25:
+			if temp_pubestyle = 2:
+				$result += 'shave/<<$temp_pubecol>>_v'
+			elseif temp_pubestyle = 3:
+				$result += 'shave/<<$temp_pubecol>>_triangle'
+			elseif temp_pubestyle = 4:
+				$result += 'shave/<<$temp_pubecol>>_landing'
+			elseif temp_pubestyle = 5:
+				$result += 'shave/<<$temp_pubecol>>_heart'
+			elseif temp_pubestyle = 6:
+				$result += 'shave/<<$temp_pubecol>>_flame'
+			elseif temp_pubestyle = 7:
+				$result += 'shave/<<$temp_pubecol>>_cross'
+			elseif temp_pubestyle = 8:
+				$result += 'shave/<<$temp_pubecol>>_trimmed'
+			elseif temp_pubestyle = 12:
+				$result += 'shave/<<$temp_pubecol>>_mini'
+			else
+				$result += 'hair/<<$temp_pubecol>>_small'
+			end
+		elseif temp_pubes <= 35:
+			$result += 'hair/<<$temp_pubecol>>_mid'
+		else
+			$result += 'hair/<<$temp_pubecol>>_full'
+		end
+	else
+		$result += 'hair/pussy'
+	end
+
+	killvar 'temp_pubes' & killvar 'temp_pubecol' & killvar 'temp_pubestyle'
+
+	$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_butt <= 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_butt <= 14:
+		$result += '2.jpg'
+		!$body_image_msg = 'Your <a href="exec:view''<<$result>>''">ass</a> is square but not completely flat.'
+	elseif pcs_butt <= 21:
+		$result += '3.jpg'
+		!$body_image_msg = 'You have an average, feminine looking <a href="exec:view''<<$result>>''">ass</a>.'
+	elseif pcs_butt <= 29:
+		$result += '4.jpg'
+		!$body_image_msg = 'You have an above-average, feminine looking <a href="exec:view''<<$result>>''">ass</a>.'
+	elseif pcs_butt <= 36:
+		$result += '5.jpg'
+		!$body_image_msg = 'Your <a href="exec:view''<<$result>>''">ass</a> is bigger, rounder and firmer than average.'
+	elseif pcs_butt <= 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_butt <= 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_butt <= 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':
-		$RESULT = ''
 		$body_image_msg += 'You will not wear a coat outside.'
-
 		$body_image_msg += '<br>Your health will suffer if you don''t wear a coat in the winter.'
+		$result = ''
 	else
-		$RESULT = 'images/pc/items/<<$coatworntype>>/coats/<<coatwornnumber>>.jpg'
 		$body_image_msg += 'Your current coat is <<$coatworntype>> no.<<coatwornnumber>>.<br>'
 		!make sure to sync these with [outdoors]~364
 		if PCoatWarm = 1:
@@ -27,28 +138,29 @@ if $ARGS[0] = 'coat':
 		elseif PCoatWarm = 3:
 			$body_image_msg += 'You will be nice and warm even in the depths of winter.'
 		end
+		$result = 'images/pc/items/<<$coatworntype>>/coats/<<coatwornnumber>>.jpg'
 	end
 end
 
 if $ARGS[0] = 'clothes':
 	if $clothingworntype = 'nude' and towel = 1 and $pantyworntype = 'none':
-		$RESULT = 'images/pc/body/towel.jpg'
+		$result = 'images/pc/body/towel.jpg'
 		$body_image_msg += 'You are only wearing a towel'
 	elseif $clothingworntype = 'nude' and robe = 1:
-		$RESULT = 'images/pc/body/robe.jpg'
+		$result = 'images/pc/body/robe.jpg'
 		$body_image_msg += 'You are only wearing a robe'
 	elseif $clothingworntype = 'nude' and $pantyworntype ! 'none':
-		$RESULT = 'images/pc/body/nude.jpg'
+		$result = 'images/pc/body/nude.jpg'
 		$body_image_msg += 'You are only wearing panties'
 	elseif $clothingworntype = 'nude' and $pantyworntype = 'none':
-		$RESULT = 'images/pc/body/nude1.jpg'
+		$result = 'images/pc/body/nude1.jpg'
 		$body_image_msg += 'You are completely naked.'
 	elseif $clothingworntype = 'misc_outfits' and clothingwornnumber = 1:
-		$RESULT = FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
+		$result = func('$clothing_image', $clothingworntype, clothingwornnumber)
 		$body_image_msg += 'You are wearing a hessian sack the hunters gave you.'
 	else
-		$RESULT = FUNC('$clothing_image', $clothingworntype, clothingwornnumber)
-		$body_image_msg += 'You are wearing ' + FUNC('$short_description', $clothingworntype) + '<<clothingwornnumber>>.'
+		$result = func('$clothing_image', $clothingworntype, clothingwornnumber)
+		$body_image_msg += 'You are wearing ' + func('$short_description', $clothingworntype) + '<<clothingwornnumber>>.'
 		if PClobimbo = 1:$body_image_msg += '<br>You are dressed like a bimbo.'
 		if $clothingworntype ! 'coat' and PCloswimwear = 0:
 			gs 'clothing_attributes', $clothingworntype, clothingwornnumber
@@ -56,27 +168,21 @@ if $ARGS[0] = 'clothes':
 			$body_image_msg += '<br><<$description>>'
 		else
 			if $clothingworntype = 'danilovich_swimsuit':
-				FUNC('$attributes_danilovich_swim_one', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_danilovich_swim_one', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'scandalicious_swimsuit':
-				FUNC('$attributes_scandalicious_swim_one', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_scandalicious_swim_one', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'scandalicious_bikinis':
-				FUNC('$attributes_scandalicious_swim_two', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_scandalicious_swim_two', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'allure_swimsuit':
-				FUNC('$attributes_allure_swim_one', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_allure_swim_one', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'allure_bikinis':
-				FUNC('$attributes_allure_swim_two', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_allure_swim_two', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'nerdvana_swimsuit':
-				FUNC('$attributes_nerdvana_swim_one', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_nerdvana_swim_one', $clothingworntype, clothingwornnumber
 			elseif $clothingworntype = 'nerdvana_bikinis':
-				FUNC('$attributes_nerdvana_swim_two', $clothingworntype, clothingwornnumber)
-				$body_image_msg += $swimwear_description
+				gs '$attributes_nerdvana_swim_two', $clothingworntype, clothingwornnumber
 			end
+			$body_image_msg += $swimwear_description
 		end
 
 		if $clothingworntype = 'gm_maid' or PCloStyle2 = 1:
@@ -91,45 +197,40 @@ end
 
 if $ARGS[0] = 'panties':
 	if $pantyworntype = 'none':
-		$RESULT = FUNC('$pube_image')
 		$body_image_msg += 'You are not wearing any panties.'
+		$result = func('$body_image', 'pussy')
 	else
-		$RESULT = FUNC('$panty_image', $pantyworntype, pantywornnumber)
-		!Kevin, please edit this line. I can not find panties description
-		!$body_image_msg += 'You are wearing ' + FUNC('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
-		$body_image_msg += 'You are wearing <<$pantyworntype>> panty <<pantywornnumber>>'
+		$result = func('$panty_image', $pantyworntype, pantywornnumber)
+		$body_image_msg += 'You are wearing <<$pantyworntype>> panty no. <<pantywornnumber>>'
 	end
 end
 
 if $ARGS[0] = 'bra':
 	if $braworntype = 'none':
-		$RESULT = 'images/pc/body/tits/t<<tits>>.jpg'
-		$body_image_msg += 'You are not wearing a bra. Your breasts would be considered an EU <<$titsize>>'
+		$body_image_msg += 'You are not wearing a bra. '
+		$result = func('$body_image', 'tits')
 	else
-		$RESULT = FUNC('$bra_image', $braworntype, brawornnumber)
-		!Kevin, please edit this line. I can not find bra description
-		!$body_image_msg += 'You are wearing ' + FUNC('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
-		$body_image_msg += 'You are wearing <<$braworntype>> bra <<brawornnumber>>. Your breasts would be considered an EU <<$titsize>>'
+		$body_image_msg += 'You are wearing <<$braworntype>> bra no. <<brawornnumber>>. Your breasts would be considered an EU <<$titsize>>'
+		$result = func('$bra_image', $braworntype, brawornnumber)
 	end
 end
 
 if $ARGS[0] = 'bodysuit':
 	if $braworntype = 'none':
-		$RESULT = 'images/pc/body/tits/t<<tits>>.jpg'
-		$body_image_msg += 'You are not wearing a bodysuit. Your breasts would be considered an EU <<$titsize>>'
+		$body_image_msg += 'You are not wearing a bodysuit. '
+		$result = func('$body_image', 'tits')
 	else
-		$RESULT = FUNC('$pcs_outfit_image', $bodysuitworntype+'_bodysuits', bodysuitwornnumber)
 		$body_image_msg += 'You are wearing <<$bodysuitworntype>> bodysuit <<bodysuitwornnumber>>. Your breasts would be considered an EU <<$titsize>>'
+		$result = func('$pcs_outfit_image', $bodysuitworntype+'_bodysuits', bodysuitwornnumber)
 	end
 end
 
 if $ARGS[0] = 'shoes':
 	if $clothingworntype = 'nude' or $shoeworntype = 'none':
-		$RESULT = 'images/pc/body/feet.jpg'
+		$result = 'images/pc/body/feet.jpg'
 	else
-		$RESULT = FUNC('$shoe_image', $shoeworntype, shoewornnumber)
-
-		$body_image_msg += 'You are wearing ' + FUNC('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
+		$body_image_msg += 'You are wearing ' + func('$shoe_description', $shoeworntype) + '<<shoewornnumber>>.'
+		$result = func('$shoe_image', $shoeworntype, shoewornnumber)
 	end
 end
 

+ 1 - 1
locations/_menu_setting.qsrc

@@ -1,7 +1,7 @@
 # $menu_setting
 
 gs 'Cheatmenu_din'
-dynamic $cheatmenu['setting']
+gs 'Cheatmenu_din', 'setting'
 
 --- $menu_setting ---------------------------------
 

+ 0 - 76
locations/_pube_image.qsrc

@@ -1,76 +0,0 @@
-# $pube_image
-
-!!use with - <img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>">
-!! Expanded use that can call specific lengths, colours and styles (for shave menu):
-!! func('$pube_image', [pube length], [pube colour num], [pube style])
-
-
-$RESULT = 'images/pc/body/pussy/'
-
-if ARGS[0] ! 0: temp_pubes = ARGS[0] else temp_pubes = pcs_pubes
-if ARGS[1] ! 0: temp_pubecol = ARGS[1] else temp_pubecol = pcs_pubecol[2]
-if ARGS[2] ! 0: temp_pubestyle = ARGS[2] else temp_pubestyle = pubestyle
-
-if temp_pubecol = 0:
-	$temp_pubecol = 'black'
-elseif temp_pubecol = 1:
-	$temp_pubecol = 'brunette'
-elseif temp_pubecol = 2:
-	$temp_pubecol = 'ginger'
-elseif temp_pubecol = 3:
-	$temp_pubecol = 'blonde'
-elseif temp_pubecol = 4:
-	$temp_pubecol = 'red'
-elseif temp_pubecol = 5:
-	$temp_pubecol = 'blue'
-elseif temp_pubecol = 6:
-	$temp_pubecol = 'green'
-elseif temp_pubecol = 7:
-	$temp_pubecol = 'pink'
-elseif temp_pubecol = 8:
-	$temp_pubecol = 'purple'
-end
-
-if temp_pubes ! 0:
-	if temp_pubes <= 3:
-		$RESULT += 'hair/pussy'
-	elseif temp_pubes <= 10:
-		$RESULT += 'hair/stubble'
-	elseif temp_pubes <= 15:
-		$RESULT += 'hair/very_short'
-	elseif temp_pubes <= 25:
-		if temp_pubestyle = 2:
-			$RESULT += 'shave/<<$temp_pubecol>>_v'
-		elseif temp_pubestyle = 3:
-			$RESULT += 'shave/<<$temp_pubecol>>_triangle'
-		elseif temp_pubestyle = 4:
-			$RESULT += 'shave/<<$temp_pubecol>>_landing'
-		elseif temp_pubestyle = 5:
-			$RESULT += 'shave/<<$temp_pubecol>>_heart'
-		elseif temp_pubestyle = 6:
-			$RESULT += 'shave/<<$temp_pubecol>>_flame'
-		elseif temp_pubestyle = 7:
-			$RESULT += 'shave/<<$temp_pubecol>>_cross'
-		elseif temp_pubestyle = 8:
-			$RESULT += 'shave/<<$temp_pubecol>>_trimmed'
-		elseif temp_pubestyle = 12:
-			$RESULT += 'shave/<<$temp_pubecol>>_mini'
-		else
-			$RESULT += 'hair/<<$temp_pubecol>>_small'
-		end
-	elseif temp_pubes <= 35:
-		$RESULT += 'hair/<<$temp_pubecol>>_mid'
-	else
-		$RESULT += 'hair/<<$temp_pubecol>>_full'
-	end
-else
-	$RESULT += 'hair/pussy'
-end
-
-killvar 'temp_pubes' & killvar 'temp_pubecol' & killvar 'temp_pubestyle'
-
-$RESULT += '.jpg'
-
-
---- $pube_image ---------------------------------
-

+ 35 - 24
locations/_shoe_description2.qsrc

@@ -2,60 +2,71 @@
 
 
 if ShoQuality = 1:
-   $RESULT = 'This is a crappy cheap '
+	$result = 'This is a crappy cheap '
 elseif ShoQuality = 2:
-   $RESULT = 'This is a low quality '
+	$result = 'This is a low quality '
 elseif ShoQuality = 3:
-   $RESULT = 'This is an average quality '
+	$result = 'This is an average quality '
 elseif ShoQuality = 4:
-   $RESULT = 'This is a reasonable quality '
+	$result = 'This is a reasonable quality '
 elseif ShoQuality = 5:
-   $RESULT = 'This is a high quality '
+	$result = 'This is a high quality '
 elseif ShoQuality = 6:
-   $RESULT = 'This is a very well made '
+	$result = 'This is a very well made '
 elseif ShoQuality = 7:
-   $RESULT = 'This is a beautifully made '
+	$result = 'This is a beautifully made '
 end
 
 if $ARGS[0] = 'danilovich':
-	$RESULT += 'training shoe.'
+	$result += 'training shoe.'
 else
 	if ShoHeels = 1:
-	   $RESULT += 'flat '
+		$result += 'flat '
 	elseif ShoHeels = 2:
-	   $RESULT += 'low heel '
+		$result += 'low heel '
 	elseif ShoHeels = 3:
-	   $RESULT += 'mid heel '
+		$result += 'mid heel '
 	elseif ShoHeels = 4:
-	   $RESULT += 'high heel '
+		$result += 'high heel '
 	elseif ShoHeels = 5:
-	   $RESULT += 'ultra high heel '
+		$result += 'ultra high heel '
 	elseif ShoHeels = 6:
-	   $RESULT += 'fetish heel '
+		$result += 'fetish heel '
 	end
 
 	if ShoCut = 1:
-	   $RESULT += 'shoe.'
+		$result += 'shoe.'
 	elseif ShoCut = 2:
-	   $RESULT += 'ankle boot.'
+		$result += 'ankle boot.'
 	elseif ShoCut = 3:
-	   $RESULT += 'calf high boot.'
+		$result += 'calf high boot.'
 	elseif ShoCut = 4:
-	   $RESULT += 'knee high boot.'
+		$result += 'knee high boot.'
 	elseif ShoCut = 5:
-	   $RESULT += 'thigh high boot.'
+		$result += 'thigh high boot.'
 	elseif ShoCut = 6:
-	   $RESULT += 'groin high boot.'
+		$result += 'groin high boot.'
 	end
 end
 
 if ShoStyle = 1:
-	$RESULT += ' These shoes are considered stripper shoes.'
+	$result += ' These shoes are considered stripper shoes.'
 elseif ShoStyle = 2:
-	$RESULT += ' These shoes are considered bimbo shoes.'
-elseif ShoStyle = 3:
-	$RESULT += ' These shoes are considered alternative shoes.'
+	$result += ' These shoes are considered alternative shoes.'
 end
 
+killvar '$temp_shoe_desc'
+if ShoBimbo = 1:	$temp_shoe_desc[] = 'bimbo'
+if ShoGoth = 1:		$temp_shoe_desc[] = 'goth'
+if ShoPunk = 1:		$temp_shoe_desc[] = 'punk'
+
+if arrsize('$temp_shoe_desc') > 0:
+	$result += ' These shoes are considered '
+	$result += func('shortgs', 'enumerate_list', '$temp_shoe_desc')
+	$result += ' shoes.'
+end
+killvar '$temp_shoe_desc'
+
+
 --- $shoe_description2 ---------------------------------
 

+ 17 - 17
locations/abduction.qsrc

@@ -128,10 +128,10 @@ if $ARGS[0] = 'abdSomeoneComing':
 		if broken = 0:
 			'You fearfully back away from the man and curl up against the wall, your body trembling in fear of what''s going to happen next.'
 			act 'Cower in fear':gt 'abduction', 'abdRape'
-			
+
 			if rapeCount >= 5: act 'Plead that you can''t take any more':gt 'abduction', 'abdBreak1'
 		else
-		
+
 		end
 
 		buyoutChance = (broken + tortureCount + rapeCount + abdCustomerCount) - 20
@@ -176,7 +176,7 @@ if $ARGS[0] = 'abdExamStart':
 	'Your blindfold is removed and you find yourself in a small room that''s painted white. The light is very bright and blinds you to the point that you can barely see.'
 	'As your eyes adjust, you see that it''s some kind of examination room. It distinctly reminds you of a gynecologist''s office.'
 	'"Sit." the man sternly orders.'
-	
+
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Resist (<<will_cost>> Willpower)':
@@ -338,7 +338,7 @@ if $ARGS[0] = 'abdBrokenGivePainkiller':
 		end
 	else
 		act 'Refuse and keep your mouth shut (<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] = 'abdBrokenGivePainkillerYes':
@@ -378,13 +378,13 @@ end
 if $ARGS[0] = 'abdBrokenAsk':
 	menu_off = 1
 	gs 'stat'
-	
+
 	'Your master responds. "Very good. What do you want me to do to you, slave?"'
-	
+
 	act 'Please fuck my mouth Master':gt 'abduction', 'abdBreak2FuckB1'
-	
+
 	if pcs_vag > 0: act 'Please fuck my pussy Master':gt 'abduction', 'abdBreak2FuckA1'
-	
+
 	if broken >= 5: act 'Please rape me Master':gt 'abduction', 'abdRape'
 
 	if broken >= 10: act 'Please punish me Master':gt 'abduction', 'abdTorture'
@@ -395,7 +395,7 @@ if $ARGS[0] = 'abdBreak2FuckA1':
 	menu_off = 1
 	broken += 1
 	cumnostd = 1
-	gs 'cum_call', '', 'Master', 0,'', spot, svol
+	gs 'cum_call', '', 'Master', 0, 0, spot, svol
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/brokena1.jpg"></center>'
 	'Your tormentor unchains you and throws you onto your dirty bed.'
 	'Spreading your legs wide apart, you spit on your hand and smear it on your pussy. "Come and take me, Master."'
@@ -411,7 +411,7 @@ if $ARGS[0] = 'abdBreak2FuckA2':
 	*clr & cla
 	menu_off = 1
 	cumnostd = 1
-	gs 'cum_call', 'mouth', 'Master', 0,'', spot, svol
+	gs 'cum_call', 'mouth', 'Master', 0, 0, spot, svol
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/brokena2.jpg"></center>'
 	'Fucking you wildly for some time, your master stops right before he orgasms.'
 	'He unties your hands and legs, then ties your hands behind your back.'
@@ -671,7 +671,7 @@ if $ARGS[0] = 'abdFood':
 		menu_off = 1
 		minut += 15
 		pcs_horny += 1
-		noshampoo = 1 
+		noshampoo = 1
 		dynamic $showerdin
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/shower1.jpg"></center>'
@@ -686,7 +686,7 @@ if $ARGS[0] = 'abdexercise':
 	*clr & cla
 	menu_off = 1
 	gs 'exercise', 'tier2', 30, 'stren'
-	
+
 	'<center><video autoplay loop src="images/pc/activities/exercises/push_nude.mp4"></video></center>'
 	*nl
 	'You do push-ups for <<$timestring>> minutes, improving your strength.'
@@ -702,18 +702,18 @@ if $ARGS[0] = 'abdexercise':
 
 	if pushrecord < pushnum:pushrecord = pushnum & 'This is a new record!'
 	gs 'stat'
-	
+
 	act 'Continue':
 		*clr & cla
 		menu_off = 1
 		gs 'exercise', 'tier2', 30, 'vital'
-		
+
 		'<center><video autoplay loop src="images/pc/activities/exercises/abdominal_nude.mp4"></video></center>'
 		*nl
 		'You do a series of abdominal exercises for <<$timestring>> minutes, improving your endurance.'
-		
+
 		gs 'stat'
-	
+
 		act 'Finish': gt 'abduction', 'abdFood'
 	end
 end
@@ -745,7 +745,7 @@ if $ARGS[0] = 'abdRape':
 	elseif rapeType = 2 and pcs_vag > 0:
 		pain['vaginal'] += 10
 		cumnostd = 1
-		gs 'cum_call', '', 'Master', 0
+		gs 'cum_call', '', 'Master'
 		i = rand(1,5)
 		'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/fucktiedpussy<<i>>.jpg"></center>'
 		'Your hands are tied, and you''re bent over the bed.'

+ 28 - 28
locations/abductionCustomer.qsrc

@@ -219,12 +219,12 @@ if $ARGS[0] = 'abdCustomer-buyout1':
 	'"You do realize that the police have already given up searching for you. As if they made any effort though..."'
 	'"I-I don''t even know how long I''ve been here. The only thing I remember is being a plaything for these perverts..."'
 	'There is a short period of silence, but despite the unexpected situation, you keep kneeling with your back straight and breasts jutting forward, as you have been trained to do.'
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/shared/abduction/sex/slavewhorekneel2.jpg"></center>'
 	'The look on <<$bName>>''s face then changes from surprised to something else.'
 	'He approaches you and gently caresses your face. "Plaything, you say? And do you like it?"'
 	'Surprised by such a question, you consider how to reply:'
-	
+
 	gs 'willpower', 'misc', 'self', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Admit you like to be dominated, but this is too much (<<will_cost>> Willpower)':
@@ -267,7 +267,7 @@ if $ARGS[0] = 'abdCustomer-buyout3':
 			gs 'willpower', 'bj', 'resist'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			
+
 			gt 'abductionCustomer', 'abdCustomer-fuckAnalRough'
 		end
 	else
@@ -438,7 +438,7 @@ if $ARGS[0] = 'abdCustomer-unzip':
 	end
 
 	if pcs_throat < dick:
-		'It''s obvious that his <<$dick_girth>> dick is above your skill level and you know you can''t safely swallow it whole.'	
+		'It''s obvious that his <<$dick_girth>> dick is above your skill level and you know you can''t safely swallow it whole.'
 		act 'Suck the tip':gt 'abductionCustomer', 'abdCustomer-suckTip'
 		gs 'willpower', 'bj', 'self'
 		if will_cost <= pcs_willpwr:
@@ -446,7 +446,7 @@ if $ARGS[0] = 'abdCustomer-unzip':
 				gs 'willpower', 'bj', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-suckForceself'
 			end
 		else
@@ -461,7 +461,7 @@ if $ARGS[0] = 'abdCustomer-unzip':
 				gs 'willpower', 'bj', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-suckDeep'
 			end
 		else
@@ -482,11 +482,11 @@ end
 if $ARGS[0] = 'abdCustomer-suckTip':
 	gs 'arousal', 'bj', 15, 'sub'
 	gs 'stat'
-	i = rand(1,5)	
+	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoreblowjobtip<<i>>.mp4"></video></center>'
 	'You try your best to suck the head of his <<dick>> cm sized <<$dick_girth>> dick.'
 	if pcs_throat < dick:
-		'It''s obvious that his <<$dick_girth>> dick is above your skill level and you know you can''t safely swallow it whole.'	
+		'It''s obvious that his <<$dick_girth>> dick is above your skill level and you know you can''t safely swallow it whole.'
 	else
 		'Even though his dick is <<$dick_girth>>, you know you could take it all the way to the base.'
 	end
@@ -517,7 +517,7 @@ if $ARGS[0] = 'abdCustomer-suckTip':
 					gs 'willpower', 'bj', 'self'
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					
+
 					gt 'abductionCustomer', 'abdCustomer-suckForceself'
 				end
 			else
@@ -530,7 +530,7 @@ if $ARGS[0] = 'abdCustomer-suckTip':
 					gs 'willpower', 'bj', 'self'
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					
+
 					gt 'abductionCustomer', 'abdCustomer-suckDeep'
 				end
 			else
@@ -627,7 +627,7 @@ if $ARGS[0] = 'abdCustomer-fuck':
 				gs 'willpower', 'sex', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-beg'
 			end
 		else
@@ -656,7 +656,7 @@ if $ARGS[0] = 'abdCustomer-decide':
 		else
 			'"I want to see how tight your ass is."'
 			act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnal'
-		end		
+		end
 	end
 end
 
@@ -683,17 +683,17 @@ if $ARGS[0] = 'abdCustomer-beg':
 		hardChance = rand(1, 100)
 		'"I''ll fuck you however I want, so shut up bitch!"'
 		if hardChance <= 50:
-			if vagOrAss = 0:	
+			if vagOrAss = 0:
 				act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckRough'
 			else
 				act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnalRough'
 			end
 		else
-			if vagOrAss = 0:	
+			if vagOrAss = 0:
 				act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckNormal'
 			else
 				act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnal'
-			end	
+			end
 		end
 	end
 end
@@ -758,7 +758,7 @@ if $ARGS[0] = 'abdCustomer-fuckAnalRough':
 		pain['tummy'] += assDMG
 		gs 'stat'
 		act 'Continue':gt 'abductionCustomer', 'abdCustomer-fuckAnalDeep'
-	end	
+	end
 end
 
 if $ARGS[0] = 'abdCustomer-fuckAnalDeep':
@@ -827,7 +827,7 @@ if $ARGS[0] = 'abdCustomer-fuckRough':
 	i = rand(1,5)
 	'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhorefuckrough<<i>>.mp4"></video></center>'
 	'The man takes you by your leash and positions your body as if it''s just meat to be used.'
-	'What comes next is an excruciatingly rough fuck that clearly shows he has no regard for all the pain you have to endure.'	
+	'What comes next is an excruciatingly rough fuck that clearly shows he has no regard for all the pain you have to endure.'
 	if vagDMG <= 0:
 		'Fortunately, his <<$dick_girth>> dick is not enough to cause you much pain. No more than usual, anyway.'
 		gs 'arousal', 'vaginal', 30, 'sub', 'bound'
@@ -870,7 +870,7 @@ if $ARGS[0] = 'abdCustomer-fuckDeep':
 	end
 	'With every thrust of his dick deep inside your vagina, you feel as if it''s your very cervix being penetrated.'
 	'After about half an hour of deep vaginal banging, the man is about to cum.'
-	
+
 	if endPunishment = 1 or $charType = 'sadistic':
 		'"I''m going to feed you my cum now, you unruly fuck slave!"'
 		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cum'
@@ -885,45 +885,45 @@ if $ARGS[0] = 'abdCustomer-cumGate':
 		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cum'
 	elseif buyout = 1:
 		'"You''re going to be filled with my seed for the first time, so be sure to cherish the memory of this moment!"'
-		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cumAss'		
+		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cumAss'
 	else
 		'"So where do you want it, bitch?"'
 		act 'Be silent':gt 'abductionCustomer', 'abdCustomer-cum'
 		act 'On your face':gt 'abductionCustomer', 'abdCustomer-cumFace'
-		
+
 		gs 'willpower', 'cum_inside', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Inside your pussy (<<will_cost>> Willpower)':
 				gs 'willpower', 'cum_inside', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-cumPussy'
 			end
 		else
 			act 'Inside your pussy (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		
+
 		gs 'willpower', 'cum_inside_anal', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'Inside your ass (<<will_cost>> Willpower)':
 				gs 'willpower', 'cum_inside_anal', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-cumAss'
 			end
 		else
 			act 'Inside your ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		
+
 		gs 'willpower', 'swallow', 'self'
 		if will_cost <= pcs_willpwr:
 			act 'In your mouth (<<will_cost>> Willpower)':
 				gs 'willpower', 'swallow', 'self'
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
-				
+
 				gt 'abductionCustomer', 'abdCustomer-cumMouth'
 			end
 		else
@@ -978,7 +978,7 @@ if $ARGS[0] = 'abdCustomer-cumPussy':
 	pcs_vag += 1
 	stat['vaginal'] += 1
 	cumnostd = 1
-	gs 'cum_call', 'pussy', 'customer', svol,'', spot
+	gs 'cum_call', 'pussy', 'customer', 0, 0, spot, svol
 	gs 'stat'
 
 	act 'Continue':gt 'abductionCustomer', 'abdCustomer-end'
@@ -1038,7 +1038,7 @@ if $ARGS[0] = 'abdCustomer-cumAss':
 	end
 	pcs_ass += 1
 	cumnostd = 1
-	gs 'cum_call', 'anus', $boy
+	gs 'cum_call', 'anus', $boy, 0
 	stat['anal'] += 1
 	gs 'stat'
 	if buyout = 1:
@@ -1057,7 +1057,7 @@ if $ARGS[0] = 'abdCustomer-cumMouth':
 		pain['throat'] += throatDMG
 		gs 'stat'
 	end
-	
+
 	if cumVol = 3:
 		'His cum fills your throat.'
 	elseif cumVol = 4:

+ 32 - 32
locations/agentned.qsrc

@@ -3,7 +3,7 @@
 
 if $ARGS[0] = 'start':
 	CLOSE ALL
-	
+
 	*clr & cla
 	$loc = 'agentned'
 	$loc_arg = $ARGS[0]
@@ -11,11 +11,11 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'agentned'
 	$menu_arg = 'start'
 	menu_off = 0
-	
+
 	gs'stat'
 	gs'dina'
 !!	gs 'housing', 'rent'
-	
+
 	'<center><b><font color = maroon>Kirsanova Real Estate Agency</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo.jpg"></center>'
 	*nl
@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 		if i < count: jump 'listing_rented_properties_loop'
 	end
 	killvar 'count' & killvar 'i'
-	
+
 	!! Get a list of the properties and their attributes that the player rented:
 	!! $property_code[], $property_name[], $property_display[], $property_status_display[], $property_type[]
 	!! property_construction_status, property_is_renovated[], property_sales_price[], property_renovation_value[]
@@ -97,11 +97,11 @@ if $ARGS[0] = 'buy':
 	*nl
 	minut += 5
 	gs 'stat'
-	
+
 	act 'Return':gt'agentned', 'start'
-	
-	!! "Returns": 
-	!! $property_code[], $property_name[], $property_display[], $property_agency_name[], 
+
+	!! "Returns":
+	!! $property_code[], $property_name[], $property_display[], $property_agency_name[],
 	!! property_construction_status,property_is_renovated[], property_sales_price[],
 	!! property_type[]
 	gs 'homes_properties', 'get_properties_for_sale'
@@ -109,13 +109,13 @@ if $ARGS[0] = 'buy':
 	if count > 0:
 		i = 0
 		'<h4>We have the following properties for sales</h4>'
-		:listing_properties_for_sale_loop	
+		:listing_properties_for_sale_loop
 			if property_is_rented[i] ! 0:
 				'You could buy the <<$property_display[i]>> you''re currently renting, for <<func(''agentned'', ''format_price_string'', property_sales_price[i])>> <b>₽</b>.'
-			else	
+			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 + bankDebtLimit >= 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'
@@ -133,11 +133,11 @@ end
 if $ARGS[0] = 'buy_property':
 	*clr & cla
 	menu_off = 1
-	
+
 	gs 'homes_properties', 'get_property_sales_info', $ARGS[1]
 	minut += 30
 	karta -= property_sales_price
-	
+
 	gs 'homes_properties', 'buy_property', $ARGS[1], property_sales_price
 	$set_homeyn = input("Would you like to set this as your new home? (yes/no)")
 	if $set_homeyn = 'yes': gs 'homes_properties', 'set_home', $ARGS[1]
@@ -156,7 +156,7 @@ if $ARGS[0] = 'buy_property':
 	act 'Return':gt'agentned', 'start'
 end
 
-!! NOTE: When a property is sold, it can be bought back. To avoid a guaranteed income from the 
+!! NOTE: When a property is sold, it can be bought back. To avoid a guaranteed income from the
 !!       "I buy property for X, renovate it, sell it for X+Y, then buy it for X, then repeat" loop,
 !!       the sales price of the property is updated with the price that it was sold for.
 if $ARGS[0] = 'sell':
@@ -168,20 +168,20 @@ if $ARGS[0] = 'sell':
 	$menu_arg = 'sell'
 	menu_off = 0
 	gs 'homes_properties', 'clean_up_property_data'
-	
+
 	'<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
 	'<h4>Any purchase or sale of a property requires a bank account. The Agency is not conducting business in cash in compliance with the Anti-Money Laundering Regulations</h4>'
 	*nl
 	act 'Return': gs 'homes_properties', 'clean_up_property_data' & gt'agentned', 'start'
-	
+
 	if bankAccount = 1:
 		!! Get a list of the properties and their attributes that the player rented:
 		!! $property_code[], $property_name[], $property_display[], $property_status_display[], $property_type[]
 		!! property_construction_status, property_is_renovated[], property_sales_price[], property_renovation_value[]
 		gs 'homes_properties', 'get_owned_properties', 'home'
-		
+
 		count = ARRSIZE('$property_name')
 		if count > 0:
 			'<h4>Available offers for your properties</h4>'
@@ -191,7 +191,7 @@ if $ARGS[0] = 'sell':
 					!! NOTE: Offer: (last sales price + rand(-10%, +10%)) + (renovation value + rand(0%,+10%)
 					!! 		 No need to check what has been renovated, the only thing that matters is the total value of the renovation
 					!! 		 If Sveta sells, this will be stored as the new sales price of the property
-					
+
 					offer = property_sales_price + property_renovation_value + (property_sales_price*rand(-10,10))/100 + (property_renovation_value*rand(0,10))/100
 					'We have found a buyer for your <<$property_display[i]>>. They will offer <<func(''agentned'', ''format_price_string'', offer)>><b>₽</b>, minus 5% for fees and taxes to the value of <<func(''agentned'', ''format_price_string'', ( (offer*5)/100) )>>, bringing the total to <<func(''agentned'', ''format_price_string'', ( (offer*95)/100 ) )>>'
 					if $property_code[i] = 'city_apartment': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'finalise_sale', 'city_apartment', i
@@ -201,23 +201,23 @@ if $ARGS[0] = 'sell':
 				end
 				i += 1
 			if i < count: jump 'listing_offers_on_owned_properties_loop'
-			
+
 		end
 		gs 'homes_properties', 'clean_up_property_data'
 		killvar 'count' & killvar 'i' & killvar 'j'
 		act 'Leave': minut += 5 & gt 'city_center'
 
 !! NOTE: Keeping this here for future renovation related reference.
-!!{ 
+!!{
 	if bankAccount = 1:
 			if rembedr = 1 and remsitr = 1 and remkorr = 1 and remvanr = 1 and remkuhr = 1:
 				!Renovated city residential apartment
-				offer1 = ((800000 + 250000) + rand(-100000, 100000)) 
+				offer1 = ((800000 + 250000) + rand(-100000, 100000))
 			else
 				offer1 = (800000 + rand(-100000, 100000))
 			end
-		
-			if func('homes_properties', 'property_renovated', 'village_cottage') = 1: 
+
+			if func('homes_properties', 'property_renovated', 'village_cottage') = 1:
 				!Renovated communal cottage
 				offer2 = ((prop_price['village_cottage'] + 200000) + rand(-10000, 10000))
 			else
@@ -259,9 +259,9 @@ if $ARGS[0] = 'rent':
 	*nl
 	minut += 5
 	gs 'stat'
-	
+
 	act 'Return': killvar 'rent_code' & killvar 'monthly_rent' & gt'agentned', 'start'
-	
+
 	gs 'homes_properties', 'get_properties_for_rent', 'home'
 	count = ARRSIZE('property_name')
 
@@ -291,9 +291,9 @@ if $ARGS[0] = 'view_property_details':
 	*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."'
 	'<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]:
-		act 'Agree and pay': 
+		act 'Agree and pay':
 			*clr & cla
 			cls
 			minut += 30
@@ -312,7 +312,7 @@ if $ARGS[0] = 'view_property_details':
 				if $set_homeyn = 'yes': gs 'homes_properties', 'set_home', $ARGS[1]
 				killvar '$set_homeyn'
 			end
-			
+
 			gs'stat'
 			'<center><b><font color = maroon>Real Estate Agency</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/realestate/agenstvo_paperwork.jpg"></center>'
@@ -322,7 +322,7 @@ if $ARGS[0] = 'view_property_details':
 		end
 	else
 		'You do not have enough money with you or in your bank account to pay the rent.'
-	end	
+	end
 
 	act 'Decline':
 		*clr & cla
@@ -340,15 +340,15 @@ end
 
 !! $ARGS[1] - the code of the property.
 if $ARGS[0] = 'get_rent_detail_dialogue':
-	if $ARGS[1] = 'old_town_apartment': 
+	if $ARGS[1] = 'old_town_apartment':
 		$result = '"We have a small apartment available right now that is in Pushkin’s city center. It’s a little bit pricey, but it’s been recently renovated to be more modern. It looks quite nice, so you won’t find a place like that outside of Pushkin."'
-	elseif $ARGS[1] = 'city_apartment': 
+	elseif $ARGS[1] = 'city_apartment':
 		$result = '"We have a flat available right now in the St. Petersburg residential area."'
 	else
 		gs 'agentned', 'get_rent_detail_dialogue_hook', $ARGS[1]
 		$result = $agency_rental_dialogue
 		killvar '$agency_rental_dialogue'
-	end 
+	end
 end
 
 !! $ARGS[1] - the code of the property.

+ 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

+ 18 - 14
locations/albina_sex_scenes.qsrc

@@ -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'
@@ -1281,12 +1281,12 @@ if $ARGS[0] = 'lazar_wait':
 end
 
 if $ARGS[0] = 'lazar_peek1':
-	act'Peep on her':
-		cla & *clr
+	act 'Peep on her':
+		*clr & cla
 		'<center><video autoplay loop src="images/shared/sex/vag/miss/rough1.mp4"></video></center>'
 		'Unable to help yourself, you move in close to Albina''s door and silently ease it open just a <i>tiny</i> crack to see what''s inside.'
 		*nl
-		'Albina is on her back, her hair wrapped in Lazar''s fist and being savagely pulled onto his cock even as he hammers it between her legs. The sound of flesh against flesh is easily as loud as you clapping as hard as you can.'
+		'Albina is on her back, her hair wrapped in Lazar''s fist and being savagely pulled onto his cock even as he hammers it between her legs. The sound of flesh slapping against flesh fills the room.'
 		gs 'albina_sex_scenes', 'lazar_wait'
 		gs 'albina_sex_scenes', 'lazar_peek2'
 	end
@@ -1297,9 +1297,10 @@ 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 from between her legs and forcibly flips her onto her knees. From this angle you can see Albina is soaking wet, but it doesn''t stop him from spreading her lips and spitting directly into her pussy. Her whole body twitches in one violent flinch on impact and you hear a muffled moan.'
-		'"You like it dirty, don''t you you little whore?"'
+		'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>'
@@ -1349,6 +1350,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,7 +1362,9 @@ if $ARGS[0] = 'lazar_peek_end':
 	end
 	
 !!	act 'Panic!':
-	
+		!!*clr & cla
+		!!'<center><img <<$set_imgh>> src="images/.jpg"></center>'
+		
 !!	end
 	
 	act 'Run back down the stairs!':
@@ -1386,13 +1390,13 @@ if $ARGS[0] = 'lazar_after':
 	'"<i>Nnngh. Who is it...?</i>"'
 	'"It''s me, <<$pcs_nickname>>."'
 	'"<i>Oh... Come in...</i>"'
-	act'Open the door':
-		cla & *clr
+	act 'Open the door':
+		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/home/nudealbina.jpg"></center>'
 		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."'
@@ -1664,7 +1668,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':
@@ -1680,7 +1684,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
@@ -1695,7 +1699,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
 
@@ -1710,7 +1714,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
 
 

+ 1 - 0
locations/anushaptbr.qsrc

@@ -325,6 +325,7 @@ if $ARGS[0] = 'race_maksim_result':
 			*clr & cla
 			gs 'flash', 'tits', 'indoors', 1, 1
 			gs 'stat'
+
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/maksimshow.jpg"></center>'
 			'"A bet''s a bet," you shrug.'
 			'You stand and pull your top up, his eyes growing wide as he stares at your breasts. Before either of you can say anything, you hear the front door slam. "Maksim... Maksim... Come see... Come see!" Timofey yells as he runs down the hall.'

+ 18 - 6
locations/anushka.qsrc

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

+ 18 - 18
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:
@@ -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>'
@@ -1326,7 +1326,7 @@ if $ARGS[0] = 'strapon_first':
 					act 'Keep fucking him hard':
 						*clr & cla
 						minut += 5
-						artemQW[strapon] = -1
+						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!"'
@@ -1340,7 +1340,7 @@ if $ARGS[0] = 'strapon_first':
 					end
 					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 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..."'
@@ -1366,7 +1366,7 @@ if $ARGS[0] = 'strapon_first':
 				end
 				act 'Fuck him nice and steady':
 					*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 grin. "You like taking my cock in your ass, don''t you?"'

+ 1 - 1
locations/artemhome.qsrc

@@ -1257,7 +1257,7 @@ if $ARGS[0] = 'chat':
 		'"I still love you..." he whispers.'
 		'You smile at him. "Are you sure you want to be seen with a whore? Everyone will look down on you too!"'
 		'"I don''t care what others call you, or what they think... I just want to be with you," he tells you.'
-		if soniaPS > 0:
+		if soniaQW['slut'] > 0:
 			'You continue. "You saw what happened to Sonia! She used to get along with everyone, but ever since that night at the disco, they all treat her like dirt! That will happen to me too, I just know it! And you, if people see you near me!"'
 		else
 			'You shake your head sadly. "I know you think that now, but it won''t be the same. People will treat me like dirt, Artem! And they''ll do the same to you for dating a whore!"'

+ 38 - 46
locations/bank.qsrc

@@ -359,7 +359,7 @@ if $ARGS[0] = 'cikl':
 
 	!!MJ: Add some (daily) interest to the bank account.
 	!!Not very realistic but won''t make anyone too rich.
-	
+
 	if bankAccount = 1:
 		kartatotal = karta
 		:kartaloop
@@ -421,7 +421,24 @@ if $ARGS[0] = 'cikl':
 	!!	Payments
 	!!------------------------------------------------------------------------------------------------------------
 
-	if day = 25:
+	if day ! 25:
+		if paydayHusb = 1:paydayHusb = 0
+		if workKafe['job'] = 1 and paydayKafe = 1:paydayKafe = 0
+		if workSec = 1 and paydaySec = 1:paydaySec = 0
+		!! No idea what haday is, it does not show up anywhere else beyond this one line
+		!! All the checks for the whether Sveta owns certain properties make no sense, if it is the 25th, haday, electroday and
+		!! kabelday are set to 0. The fact that Sveta doesn''t own or rent properties only means that their value is meaningless
+		!! anyway.
+		if haday = 1: haday = 0
+		if electroday = 1: electroday = 0
+		if kabelday = 1: kabelday = 0
+		if scholarshipday = 1: scholarshipday = 0
+		if nopaytanwork = 1: nopaytanwork = 0
+		if nopaypoly = 1: nopaypoly = 0
+		if nopaysalon = 1: nopaysalon = 0
+		if paydaybistrosec = 1: paydaybistrosec = 0
+
+	else
 		!! meynold payment
 		if	mey_vika['mey_vika_qw'] >= 35 and mey_tamara['help_count'] < 10 and mey_tamara['qw_end'] = 0:
 			karta += 10000
@@ -552,69 +569,44 @@ if $ARGS[0] = 'cikl':
 				'<b><font color="red">Your card was declined during automatic debit of 300 <b>₽</b> for cable TV subscription.</font></b>'
 			end
 		end
-
-	end
-
-
-	if day ! 25:
-		if paydayHusb = 1:paydayHusb = 0
-		if workKafe['job'] = 1 and paydayKafe = 1:paydayKafe = 0
-		if workSec = 1 and paydaySec = 1:paydaySec = 0
-		!! No idea what haday is, it does not show up anywhere else beyond this one line
-		!! All the checks for the whether Sveta owns certain properties make no sense, if it is the 25th, haday, electroday and 
-		!! kabelday are set to 0. The fact that Sveta doesn''t own or rent properties only means that their value is meaningless
-		!! anyway.
-		if haday = 1: haday = 0
-		if electroday = 1: electroday = 0
-		if kabelday = 1: kabelday = 0
-		if scholarshipday = 1: scholarshipday = 0
-		if nopaytanwork = 1: nopaytanwork = 0
-		if nopaypoly = 1: nopaypoly = 0
-		if nopaysalon = 1: nopaysalon = 0
-		if paydaybistrosec = 1: paydaybistrosec = 0
 	end
 
 	!! Checking for tenants moving out
 	gs 'homes_properties', 'tenant_move_out_check'
-	
 
 	!!----------------------------------------
 	!! Rent
 	!!----------------------------------------
 	!! property_rent, property_days, $property_name, $property_display $property_code
 	gs 'homes_properties', 'get_rented_properties'
-	count = ARRSIZE('property_name')
-	if count > 0:
-		i = 0
+	bank_count = ARRSIZE('property_name')
+	if bank_count > 0:
+		bank_i = 0
 		:loop_rent_payments
-			if property_days[i] <= 2:
+			if property_days[bank_i] <= 2:
 				!From bank
-				if property_days[i] <= 0:
-					gs 'homes_properties', 'cancel_rent', $property_code[i]
-				elseif bankAccount = 1 and karta >= property_rent[i]:
-					'<b><font color="green">Your rent payment of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>, has automatically been deducted from your bank account.</font></b>'
-					gs 'homes_properties', 'pay_rent', $property_code[i], 'card'
-					!karta -= property_rent[i]
-					!gs 'homes_properties', 'add_rent_days', $property_code[i]
-				elseif bankAccount = 1 and karta + bankDebtLimit >= property_rent[i]:
-					'<b><font color="green">Your rent payment of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>, has automatically been deducted from your bank account and overdraw facility. Please contact your bank regarding your overdraw repayment.</font></b>'
-					gs 'homes_properties', 'pay_rent', $property_code[i], 'card'
-					!karta -= property_rent[i]
-					!gs 'homes_properties', 'add_rent_days', $property_code[i]
+				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>'
+					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]
+				elseif property_days[bank_i] <= 0:
+					gs 'homes_properties', 'cancel_rent', $property_code[bank_i]
 				elseif bankAccount = 0:
-					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>. To avoid eviction, please make a manual payment as soon as possible.</font></b>'
+					'<b><font color="red">You currently do not have a bank account setup for automatic rent deduction of <<property_rent[bank_i]>> <b>₽</b> for your <<$property_name[bank_i]>>. To avoid eviction, please make a manual payment as soon as possible.</font></b>'
 				else
 					nl
-					'<b><b><font color="red">Your card was declined during automatic rent deduction of <<property_rent[i]>> <b>₽</b> for your <<$property_name[i]>>. To avoid eviction, please rectify as soon as possible.</font></b>'
+					'<b><b><font color="red">Your card was declined during automatic rent deduction of <<property_rent[bank_i]>> <b>₽</b> for your <<$property_name[bank_i]>>. To avoid eviction, please rectify as soon as possible.</font></b>'
 				end
 			end
-			i += 1
-		if i < count: jump 'loop_rent_payments'
+			bank_i += 1
+		if bank_i < bank_count: jump 'loop_rent_payments'
 		gs 'homes_properties', 'clean_up_property_data'
-		killvar 'i'
+		killvar 'bank_i'
 	end
+	killvar 'bank_count'
 	!!------------------------------------------------------------------------------------------------------------
-
 end
---- bank ---------------------------------
 
+
+--- bank ---------------------------------

+ 18 - 18
locations/bed_events.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			$sleep_events[] = 'gs ''bed_events'', ''vor'' '
 		end
 
-		gt 'bed_events', 'mod_sleepevents'
+		xgt 'bed_events', 'mod_sleepevents'
 	end
 
 	gt 'bed_events', 'continue'
@@ -52,7 +52,7 @@ if $ARGS[0] = 'mod_sleepevents':
 	!! IT WILL ALMOST CERTIANLY END BADLY WHEN MORE THAN 1 MOD IS INVOLVED.
 
 	gs 'LOCA', 'bed_events', 'mod_sleepevents'
-	gt 'bed_events', 'event_handler'
+	xgt 'bed_events', 'event_handler'
 end
 
 
@@ -65,12 +65,12 @@ if $ARGS[0] = 'event_handler':
 		end
 	end
 
-	gt 'bed_events', 'continue'
+	xgt 'bed_events', 'continue'
 end
 
 if $ARGS[0] = 'event_handler2':
 	sleepVars['events_done'] += 1
-	
+
 	if $ARGS[1] = 'priority':
 		temp_slev_id = rand(0, arrsize('$sleep_events_priority')-1)
 		$temp_sleep_event_chosen = $sleep_events_priority[temp_slev_id]
@@ -84,7 +84,7 @@ if $ARGS[0] = 'event_handler2':
 	killvar 'temp_slev_id'
 	dynamic $temp_sleep_event_chosen
 
-	gs 'bed_events', 'event_end'
+	xgt 'bed_events', 'event_end'
 end
 
 
@@ -94,7 +94,7 @@ if $ARGS[0] = 'event_end':
 !!		gt 'bed_events', 'event_handler2', 'priority'
 !!	end
 
-	gt 'bed_events', 'event_handler'
+	xgt 'bed_events', 'event_handler'
 end
 
 
@@ -114,7 +114,7 @@ if $ARGS[0] = 'continue':
 	killvar 'temp_slev_id'
 	killvar '$temp_sleep_event_chosen'
 
-	gt 'bed2', 'start'
+	xgt 'bed2', 'start'
 end
 
 
@@ -158,7 +158,7 @@ if $ARGS[0] = 'rab2':
 
 		gs 'arousal', 'bj', 5, 'sub', 'lesbian'
 		gs 'stat'
-		
+
 		act 'Lie down':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r2.jpg"></center>'
@@ -167,7 +167,7 @@ if $ARGS[0] = 'rab2':
 
 			gs 'arousal', 'bj', 5, 'sub', 'lesbian', 'rough'
 			gs 'stat'
-		
+
 			act 'Get up':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/nicholas/sex/r3.jpg"></center>'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'vor2':
 		act 'Scream': gt 'bed_events', 'vor3'
 
 	else
-		if dog_bravery = 0: 
+		if dog_bravery = 0:
 			dog_bravery = rand(1,100)
 		end
 
@@ -252,7 +252,7 @@ if $ARGS[0] = 'vor2':
 			act 'Check the lock':
 				cla
 				'You check the lock on the door and it appears to be intact. You''re not sure if you forgot to lock the door when you came in or if the lock was picked. Maybe you should have a second one installed...'
-				act 'Lock the door': 
+				act 'Lock the door':
 					gs 'bed_events', 'exit'
 					gt 'korr'
 				end
@@ -293,7 +293,7 @@ if $ARGS[0] = 'vor3':
 
 			gs 'arousal', 'bj', 15, 'rough', 'sub', 'group', 'bound'
 			gs 'stat'
-			
+
 			act 'Get up':
 				*clr & cla
 				orgasm += 1
@@ -314,8 +314,8 @@ if $ARGS[0] = 'vor3':
 				gs 'arousal', 'vaginal', 15, 'rough', 'sub', 'group', 'bound'
 				minut -= 15
 				gs 'stat'
-			
-				act 'Continue': 
+
+				act 'Continue':
 					picrand = 38
 					gs 'bed_events', 'exit'
 					xgt 'sexdvoe', 'var'
@@ -381,7 +381,7 @@ if $ARGS[0] = 'mast':
 				$orgasm_or = 'custom'
 				gs 'arousal', 'vaginal_dildo', 10, 'masturbate'
 				gs 'arousal', 'end'
-				
+
 				act 'Breathe': gs 'bed_events', 'event_end'
 
 			else
@@ -431,7 +431,7 @@ if $ARGS[0] = 'mast':
 								$orgasm_or = 'custom'
 								gs 'arousal', 'end'
 								gs 'stat'
-						
+
 								act 'Finish': gs 'bed_events', 'event_end'
 							end
 						end
@@ -499,7 +499,7 @@ if $ARGS[0] = 'mast':
 							gs 'arousal', 'vaginal_dildo', 10
 							gs 'arousal', 'bj', -10
 							gs 'stat'
-						
+
 							act 'Spread your legs ':
 								picrand = 89
 								gs 'bed_events', 'exit'
@@ -523,7 +523,7 @@ if $ARGS[0] = 'mast':
 								gs 'arousal', 'anal_dildo', 5
 								gs 'arousal', 'bj', -10
 								gs 'stat'
-								
+
 								act 'Offer your ass':
 									picrand = 89
 									gs 'bed_events', 'exit'

+ 4 - 4
locations/bed_get_out_events.qsrc

@@ -20,14 +20,14 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	if sleepVars['events_active'] = 1:
 		sleepVars['events_done'] = 0
-		
+
 		if vomit['morning_sick'] = 1 or vomit['hangover'] = 1 or vomit['unlucky'] = 1:
 			$sleep_events[] = 'gs ''bed_get_out_events'', ''vomit'' '
 		end
 
 		xgt 'bed_get_out_events', 'mod_sleepevents'
 	end
-	
+
 	xgt 'bed_get_out_events', 'continue'
 end
 
@@ -61,7 +61,7 @@ if $ARGS[0] = 'event_handler':
 		end
 	end
 
-	gs 'bed_get_out_events', 'continue'
+	xgt 'bed_get_out_events', 'continue'
 end
 
 if $ARGS[0] = 'event_handler2':
@@ -80,7 +80,7 @@ if $ARGS[0] = 'event_handler2':
 	killvar 'temp_slev_id'
 	dynamic $temp_sleep_event_chosen
 
-	gs 'bed_get_out_events', 'event_end'
+	xgt 'bed_get_out_events', 'event_end'
 end
 
 

+ 1 - 66
locations/bedrPar.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 					if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Here kitty, kitty!</b>"'
 					if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>I just met you, and this is crazy!</b>"'
 					if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Bow before me!</b>"'
-					if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Hes just a friend, honest!</b>"'
+					if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>He''s just a friend, honest!</b>"'
 					if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you do to my socks?</b>"'
 					if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>That''s what she said!</b>"'
 					if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Help! They''ve turned me into a parrot!</b>"'
@@ -279,69 +279,4 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 	end
 end
 
-if $ARGS[0] = 'intro':
-	CLOSE ALL
-	grandmaQW['last_month_paid'] = month
-	menu_off = 1
-	hour = 6
-	gs 'stat'
-	music_loop = 0
-	'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-	'You suddenly hear a familiar voice yelling out. "<<$pcs_nickname>>, time to get up! You can''t spend the whole day laying around!"'
-	wait 1000
-	$temp_nickname = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
-	if $temp_nickname ! '':$npc_nickname['A29'] = '<<$temp_nickname>>'
-	killvar '$temp_nickname'
-	act 'Continue':
-		cla & *clr
-		minut += 2
-		gs 'stat'
-		'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-		'You tiredly open your eyes and see your mother standing over you. "Fifteen more minutes..." you mumble.'
-		'Your mother lets out a loud sigh. "No, up now!" she says as she yanks the covers off.'
-		'"<<$npc_nickname[''A29'']>>!" you exclaim as you feel a slightly cold breeze hit your body.'
-		'"No excuses, <<$pcs_nickname>>! The summer holidays will be over before you know it and you mustn''t get used to sleeping in, otherwise you won''t be able to get up early when school starts again. From now on, set your alarm to wake up at a reasonable time." your <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
-		act 'Get up':
-			cla & *clr
-			minut += 2
-			gs 'stat'
-			'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-			'As soon as you get off your now coverless bed, your mother is quick to resume her nagging, repeating what you already heard from her a few moments ago. "Summer is no excuse to laze around all day. You can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
-			'"What are you going to do when school starts, or when you get a job? You better get into the habit of setting your alarm so you can wake up bright and early."'
-			act 'Continue':
-				cla & *clr
-				minut += 2
-				gs 'stat'
-				'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-				'You let out an exasperated sigh. "Yeah yeah I know, you told me that already. So how early are we talking?"'
-				'Your mother shoots you a sharp look and you know to fix your attitude or else. "Well, that depends on what you plan to do in the morning. There''s breakfast, showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right... Anya used to wake up at 06:00 for school."'
-				act 'Continue':
-					cla & *clr
-					minut += 2
-					gs 'stat'
-					'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-					'"You want me to wake up that early?!" you huff. "Can''t I wake up at like... 07:00?"'
-					'Your mother shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns before making her way towards the kitchen.'
-					if stat['think_virgin'] = 1: '"Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month!" she adds quickly.'
-					act 'But why do I--':
-						cla & *clr
-						minut += 2
-						gs 'stat'
-						'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" she says before she storms out of the room without giving you a chance to respond.'
-						act 'I understand...': $menu_loc = 'bedrPar' & $menu_arg = 'start' & gt 'alarmclock', 'start'
-					end
-				end
-			end
-		end
-	end
-end
-
 --- bedrPar ---------------------------------
-

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

+ 7 - 6
locations/begin.qsrc

@@ -1,4 +1,5 @@
 # begin
+!! SKIP_QSRC2TW
 !!2021/04/01
 if $ARGS[0] = 'start':
 	$loc_arg = 'start'
@@ -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>'

+ 196 - 0
locations/beta_journal_quests.qsrc

@@ -0,0 +1,196 @@
+# 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] = 'start':
+	*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'
+
+	!! Calculate NPC birthday and convert to human readable format
+	birthday = (npc_dob['A<<ARGS[1]>>'] mod 100)
+	gs 'emp_functions', 'evt_day_suffix', birthday
+	birthmonth = (npc_dob['A<<ARGS[1]>>'] / 100) mod 100
+	birthyear = npc_dob['A<<ARGS[1]>>'] / 10000
+	$birthday = '<<birthday>><<$evt_suffix>>'
+	$birthmonth = $monthName[birthmonth]
+
+	!! 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: <<$birthday>> <<$birthmonth>>, <<birthyear>> </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'
+	gs 'shortgs', 'remove_array_element', 'npc_home', 'A<<ARGS[1]>>'
+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] = 1:
+		'Mon Cheri is the most prestigious clothing store in St. Petersburg, with a price tag to match.'
+	elseif ARGS[1] = 2:
+		'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] = 3:
+	elseif ARGS[1] = 4:
+	elseif ARGS[1] = 5:
+	elseif ARGS[1] = 6:
+	elseif ARGS[1] = 7:
+	elseif ARGS[1] = 8:
+	end
+end
+
+
+--- beta_journal_quests ---------------------------------

+ 3 - 2
locations/blackmailer.qsrc

@@ -5,6 +5,7 @@ if $ARGS[0] = 'init_check':
 	if ($ARGS[2] = 'inside' or $ARGS[2] = 'indoors'):
 		if strpos($loc, 'church') <= 0: exit
 	end
+	if $flash_image = '': exit
 
 
 	temp_prob_chance = 300
@@ -47,7 +48,7 @@ if $ARGS[0] = 'init_blackmail':
 		$blackmailQW['init_flashaction'] = $ARGS[1]
 	end
 
-	$blackmailQW['init_flashimage'] = $flash_image + '.jpg'
+	$blackmailQW['init_flashimage'] = $flash_image
 	$blackmailQW['init_flashloc'] = $loc
 	$blackmailQW['init_flashloc_arg'] = $loc_arg
 	$blackmailQW['init_flashregion'] = $region
@@ -1033,4 +1034,4 @@ end
 
 if $ARGS[0] ! 'set_SMSTree' and $ARGS[0] ! 'add_blackmail_selfie': killvar 'SMSTree'
 
---- blackmailer ---------------------------------
+--- blackmailer ---------------------------------

+ 19 - 17
locations/body.qsrc

@@ -403,13 +403,15 @@ if $ARGS[0] = 'Update_Body':
 	gs 'body', 'Update_vhips'
 
 	!!This will trigger the warning notices in the bathing code (the +/- 12 should always be +/- 11 + the max change to pcs_mass['body'] w/ fat)
-	if pcs_mass['body'] <= pcs_mass['body_message'] - 6:
+	temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
+	if temp_total_mass <= pcs_mass['body_message'] - 6:
 		bodyVars['weight_warning'] = 1
-		pcs_mass['body_message'] = pcs_mass['body']
-	elseif pcs_mass['body'] => pcs_mass['body_message'] + 6:
+		pcs_mass['body_message'] = temp_total_mass
+	elseif temp_total_mass => pcs_mass['body_message'] + 6:
 		bodyVars['weight_warning'] = 2
-		pcs_mass['body_message'] = pcs_mass['body']
+		pcs_mass['body_message'] = temp_total_mass
 	end
+	killvar 'temp_total_mass'
 
 	!!Setting the pcs_apprnc bonus based on fat and strength
 	temp_bmi = func('body', 'CalcBMI2')
@@ -726,27 +728,27 @@ end
 
 
 if $ARGS[0] = 'Reset_mass_distribution':
-	total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
-	total_gen_mass = 60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
+	temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
+	temp_total_gen_mass = 60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
 
-	if total_mass >= total_gen_mass - 10 and total_mass <= total_gen_mass:
+	if temp_total_mass >= temp_total_gen_mass - 10 and temp_total_mass <= temp_total_gen_mass:
 		pcs_mass['bust'] = pcs_mass['bust_gen']
 		pcs_mass['butt'] = pcs_mass['butt_gen']
 	else
-		pcs_mass['bust'] = (pcs_mass['bust_gen'] * total_mass) / total_gen_mass
-		pcs_mass['butt'] = (pcs_mass['butt_gen'] * total_mass) / total_gen_mass
+		pcs_mass['bust'] = (pcs_mass['bust_gen'] * temp_total_mass) / temp_total_gen_mass
+		pcs_mass['butt'] = (pcs_mass['butt_gen'] * temp_total_mass) / temp_total_gen_mass
 	end
 
-	pcs_mass['body'] = total_mass - pcs_mass['bust'] - pcs_mass['butt']
+	pcs_mass['body'] = temp_total_mass - pcs_mass['bust'] - pcs_mass['butt']
 
+	pcs_mass['body_message'] = temp_total_mass
 	pcs_mass['bust_message'] = pcs_mass['bust']
 	pcs_mass['butt_message'] = pcs_mass['butt']
-	pcs_mass['body_message'] = pcs_mass['body']
 
 	bodyVars['vhips'] = (pcs_mass['body'] + pcs_mass['butt'] - 80) / 2
 
-	killvar 'total_mass'
-	killvar 'total_gen_mass'
+	killvar 'temp_total_mass'
+	killvar 'temp_total_gen_mass'
 end
 
 if $ARGS[0] = 'Reset_preg_mass':
@@ -767,12 +769,12 @@ if $ARGS[0] = 'Set_mass_distribution_using_body':
 		pcs_mass['bust'] = pcs_mass['bust_gen']
 		pcs_mass['butt'] = pcs_mass['butt_gen']
 	else
-		pcs_mass['bust'] = (pcs_mass['bust_gen'] * ARGS[1]) / 60
-		pcs_mass['butt'] = (pcs_mass['butt_gen'] * ARGS[1]) / 60
+		pcs_mass['bust'] = (pcs_mass['bust_gen'] * pcs_mass['body']) / 60
+		pcs_mass['butt'] = (pcs_mass['butt_gen'] * pcs_mass['body']) / 60
 	end
 	bodyVars['vhips'] = (pcs_mass['body'] + pcs_mass['butt'] - 80) / 2
 
-	pcs_mass['body_message'] = pcs_mass['body']
+	pcs_mass['body_message'] = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
 	pcs_mass['bust_message'] = pcs_mass['bust']
 	pcs_mass['butt_message'] = pcs_mass['butt']
 
@@ -934,7 +936,7 @@ if $ARGS[0] = 'hardreset':
 			end
 		end
 
-		pcs_mass['body_message'] = pcs_mass['body']
+		pcs_mass['body_message'] = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
 		pcs_mass['bust_message'] = pcs_mass['bust']
 		pcs_mass['butt_message'] = pcs_mass['butt']
 

+ 42 - 38
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'
@@ -376,31 +380,31 @@ 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>.'
+		$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_butt <= 7:
+		$pcs_butt = 'Your <a href="exec: view ''<<$temp_img>>'' ">ass</a> is square and as flat as a plank.'
+	elseif pcs_butt <= 14:
+		$pcs_butt = 'Your <a href="exec: view ''<<$temp_img>>'' ">ass</a> is square but not completely flat.'
+	elseif pcs_butt <= 21:
+		$pcs_butt = 'You have an average, feminine looking <a href="exec: view ''<<$temp_img>>'' ">ass</a>.'
+	elseif pcs_butt <= 29:
+		$pcs_butt = 'You have an above-average, feminine looking <a href="exec: view ''<<$temp_img>>'' ">ass</a>.'
+	elseif pcs_butt <= 36:
+		$pcs_butt = 'Your <a href="exec:view''<<$temp_img>>'' ">ass</a> is bigger, rounder and firmer than average.'
+	elseif pcs_butt <= 44:
+		$pcs_butt = 'Your ample <a href="exec: view ''<<$temp_img>>'' ">ass</a> is bigger, rounder and firmer than most.'
+	elseif pcs_butt <= 51:
+		$pcs_butt = 'You have a heart-shaped <a href="exec: view ''<<$temp_img>>'' ">butt</a> that jiggles as you walk.'
+	elseif pcs_butt <= 59:
+		$pcs_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
+		$pcs_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':
@@ -838,19 +842,19 @@ if $ARGS[0] = 'pubes':
 		$pube_style['shape'] = ''
 		if pcs_pubes <= 3:
 			lobkoef = 3
-			$pcs_pubes = 'You have a smoothly <a href="exec:view''<<FUNC(''$pube_image'')>>''">shaved pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have a smoothly <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">shaved pussy</a>. <<$pirspiz>><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(''$pube_image'')>>''">pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+			$pcs_pubes = 'You have stubble growing around your <a href="exec:view''<<func(''$body_image'', ''pubes'')>>''">pussy</a>. <<$pirspiz>><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(''$pube_image'')>>''">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>. <<$pirspiz>><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,51 +863,51 @@ 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(''$pube_image'')>>''">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>. <<$pirspiz>><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(''$pube_image'')>>''">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>. <<$pirspiz>><br><<$clitsize>>'
 			elseif pubestyle = 13:
 				$pube_style['shape'] = 'strip'
-				$pcs_pubes = 'You have tidy strip of bush covering your <a href="exec:view''<<FUNC(''$pube_image'')>>''">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>. <<$pirspiz>><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(''$pube_image'')>>''">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>. <<$pirspiz>><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(''$pube_image'')>>''">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>. <<$pirspiz>><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(''$pube_image'')>>''">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>. <<$pirspiz>><br><<$clitsize>>'
 				elseif pubestyle = 4:
 					$pube_style['shape'] = 'landing strip'
-					$pcs_pubes = 'You have a cleanly trimmed <a href="exec:view''<<FUNC(''$pube_image'')>>''">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. <<$pirspiz>><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(''$pube_image'')>>''">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>. <<$pirspiz>><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(''$pube_image'')>>''">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>. <<$pirspiz>><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(''$pube_image'')>>''">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>. <<$pirspiz>><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(''$pube_image'')>>''">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>. <<$pirspiz>><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(''$pube_image'')>>''">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>. <<$pirspiz>><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:
 			lobkoef = 0
-			$pcs_pubes = 'You have a wild and unkempt jungle of <a href="exec:view''<<FUNC(''$pube_image'')>>''">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>. <<$pirspiz>><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'
@@ -911,7 +915,7 @@ if $ARGS[0] = 'pubes':
 	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(''$pube_image'')>>''">bald pussy</a>. <<$pirspiz>><br><<$clitsize>>'
+		$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'

+ 60 - 177
locations/body_structure.qsrc

@@ -302,194 +302,77 @@ 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 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
-			!	0 <= strenbuf <= 200
-			!$result = 'images/pc/body/shape/8.jpg'
-			$result += '7.jpg'
-		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
-			exit
+			$result = 'images/pc/body/shape/preg/0/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
+	bs_temp_bs_class = func('body_structure', 'get_class', ARGS[1], ARGS[2])
 
-		$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/'
+	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 += '8_morobese/'
+			$result = func('body_structure', 'custom_body_img', bs_temp_bs_class)
+			killvar 'bs_temp_bs_class'
+			exit
 		end
+	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
+	$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
 
-		$result += '<<rand(0, func(''body_structure'', ''Body_img_totals'', bs_temp_bs_class)-1)>>.jpg'
+	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
 
+	$result += '<<rand(0, func(''body_structure'', ''Body_img_totals'', bs_temp_bs_class)-1)>>.jpg'
+
 	killvar 'bs_temp_bs_class'
 end
 

+ 200 - 216
locations/booty_call.qsrc

@@ -1,95 +1,141 @@
 # booty_call
+
 if $ARGS[0] = 'scheduler':
 	!! clear SMS
 	!! clear schedule
 	killvar 'booty_call_time'
+	killvar 'sugar_daddy_call'
 	killvar 'npc_booty_call'
 	killvar 'npc_booty_call_time'
-	i = 0
-	gs 'booty_call', 'fuckbuddy_scheduler2'
+	gs 'booty_call', 'booty_call_scheduler'
 end
 
-if $ARGS[0] = 'fuckbuddy_scheduler2':
-	if i < arrsize('$fuckbuddy'):
-		$temp = 'FuckBuddy'
-		gs 'booty_call', 'fb_npc_stat_update'
-!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_rel[$FuckBuddy[i]] > 0 and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
+if $ARGS[0] = 'booty_call_scheduler':
+	temp_bc_i = 0
+	:bc_fb_sched_loop
+	if temp_bc_i < arrsize('$fuckbuddy'):
+		$temp_bc_id = $FuckBuddy[temp_bc_i]
+		gs 'telefon', 'ClearSMSSchedule', $temp_bc_id
+		gs 'booty_call', 'bc_npc_stat_update', $temp_bc_id
+!!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_rel[$temp_bc_id] > 0 and npc_no_booty_call[$temp_bc_id] ! daystart and npc_big_fight[$temp_bc_id] < daystart - 7:
 
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
 
-!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and (npc_big_fight[$FuckBuddy[i]] < daystart - 7 and daystart > 7):
+!!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_no_booty_call[$temp_bc_id] ! daystart and (npc_big_fight[$temp_bc_id] < daystart - 7 and daystart > 7):
 
-		if (npc_booty_call_date[$FuckBuddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or rand(1,100) <= npc_rel[$FuckBuddy[i]]) and npc_no_booty_call[$FuckBuddy[i]] ! daystart:
-			gs 'booty_call', 'fuckbuddy_scheduler3'
-		else
-			npc_no_booty_call[$FuckBuddy[i]] = daystart
+		if daystart > npc_no_booty_call[$temp_bc_id] and (npc_booty_call_date[$temp_bc_id] = daystart or rand(1, 10) <= npc_sexdrive[$temp_bc_id] or rand(1, 100) <= npc_rel[$temp_bc_id]):
+			gs 'booty_call', 'schedule_sms', $temp_bc_id
 		end
-		i += 1
-		gs 'booty_call', 'fuckbuddy_scheduler2'
-	else
-		i = 0
-		gs 'booty_call', 'sugar_daddy_scheduler2'
+		temp_bc_i += 1
+		jump 'bc_fb_sched_loop'
 	end
-end
 
 
-if $ARGS[0] = 'sugar_daddy_scheduler2':
-	if i < arrsize('$sugar_daddy'):
-		gs 'booty_call', 'sd_npc_stat_update'
-!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_rel[$FuckBuddy[i]] > 0 and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
+	temp_bc_i = 0
+	:bc_sd_sched_loop
+	if temp_bc_i < arrsize('$sugar_daddy'):
+		$temp_bc_id = $sugar_daddy[temp_bc_i]
+		gs 'telefon', 'ClearSMSSchedule', $temp_bc_id
+		gs 'booty_call', 'bc_npc_stat_update', $temp_bc_id
+!!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_rel[$temp_bc_id] > 0 and npc_no_booty_call[$temp_bc_id] ! daystart and npc_big_fight[$temp_bc_id] < daystart - 7:
 
 !!		temporary removal of npc_rel requirement until boy initiated breakups can occur
 
-!!		if (rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$sugar_daddy[i]] = daystart) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and (npc_big_fight[$sugar_daddy[i]] < daystart - 7 and daystart > 7):
-		if npc_sugar_daddy_timer[$sugar_daddy[i]] - (npc_rel[$sugar_daddy[i]] / 10) > daystart:
-			npc_no_booty_call[$sugar_daddy[i]] = daystart
+!!		if (rand(1, 10) <= npc_sexdrive[$temp_bc_id] or npc_booty_call[$temp_bc_id] = daystart) and npc_no_booty_call[$temp_bc_id] ! daystart and (npc_big_fight[$temp_bc_id] < daystart - 7 and daystart > 7):
 
-		elseif (npc_booty_call_date[$sugar_daddy[i]] = daystart or rand(1,10) <= npc_sexdrive[$sugar_daddy[i]] or rand(1,100) <= npc_rel[$sugar_daddy[i]]) and npc_no_booty_call[$sugar_daddy[i]] ! daystart:
-			sugar_daddy_call[$sugar_daddy[i]] = 1
-			gs 'booty_call', 'sugar_daddy_scheduler3'
-		else
-			npc_no_booty_call[$sugar_daddy[i]] = daystart
+		if daystart > npc_no_booty_call[$temp_bc_id] and (daystart + npc_rel[$temp_bc_id] / 10 >= npc_sugar_daddy_timer[$temp_bc_id]) and (npc_booty_call_date[$temp_bc_id] = daystart or rand(1, 10) <= npc_sexdrive[$temp_bc_id] or rand(1, 100) <= npc_rel[$temp_bc_id]):
+			sugar_daddy_call[$sugar_daddy[temp_bc_i]] = 1
+			gs 'booty_call', 'schedule_sms', $temp_bc_id
 		end
-		i += 1
-		gs 'booty_call', 'sugar_daddy_scheduler2'
+		temp_bc_i += 1
+		jump 'bc_sd_sched_loop'
 	end
-end
 
-if $ARGS[0] = 'fuckbuddy_scheduler3':
-	if npc_booty_call[$FuckBuddy[i]] = daystart:
-		booty_call_time[$FuckBuddy[i]] = ((npc_booty_call_time[$FuckBuddy[i]] * 60) + rand(0,180))
-	elseif week = npc_day_off[$FuckBuddy[i]]:
-		booty_call_time[$FuckBuddy[i]] = (600 + rand(0,720))
-	elseif week ! npc_day_off[$FuckBuddy[i]]:
-		booty_call_time[$FuckBuddy[i]] = (rand(npc_start_free_time[$FuckBuddy[i]],(npc_end_free_time[$FuckBuddy[i]] - 1)) * 60) + rand(0,180)
-	else
-		booty_call_time[$FuckBuddy[i]] = 2000
-	end
+	killvar 'temp_bc_i'
+	killvar '$temp_bc_id'
 end
 
-if $ARGS[0] = 'sugar_daddy_scheduler3':
-	if npc_booty_call[$sugar_daddy[i]] = daystart:
-		booty_call_time[$sugar_daddy[i]] = ((npc_booty_call_time[$sugar_daddy[i]] * 60) + rand(0,180))
-	elseif week = npc_day_off[$sugar_daddy[i]]:
-		booty_call_time[$sugar_daddy[i]] = (600 + rand(0,720))
-	elseif week ! npc_day_off[$sugar_daddy[i]]:
-		booty_call_time[$sugar_daddy[i]] = (rand(npc_start_free_time[$sugar_daddy[i]],(npc_end_free_time[$sugar_daddy[i]] - 1)) * 60) + rand(0,180)
+!! $ARGS[1] = $npc_id
+if $ARGS[0] = 'schedule_sms':
+	if npc_booty_call[$ARGS[1]] = daystart:
+		gs 'telefon', 'SetSMSSchedule', $ARGS[1], "", "0", "gs 'booty_call_sms', 'start', '<<$ARGS[1]>>'", "totminut > <<totminut + 60 * (npc_booty_call_time[$ARGS[1]] - hour) + rand(0, 180) - minut>>"
+		!booty_call_time[$ARGS[1]] = 60 * npc_booty_call_time[$ARGS[1]] + rand(0, 180)
+	elseif week = npc_day_off[$ARGS[1]]:
+		gs 'telefon', 'SetSMSSchedule', $ARGS[1], "", "0", "gs 'booty_call_sms', 'start', '<<$ARGS[1]>>'", "totminut > <<totminut + 60 * (10 - hour) + rand(0, 240) + rand(0, 240) + rand(0, 240) - minut>>"
+		!booty_call_time[$ARGS[1]] = 600 + rand(0, 720)
+	elseif week ! npc_day_off[$ARGS[1]]:
+		gs 'telefon', 'SetSMSSchedule', $ARGS[1], "", "0", "gs 'booty_call_sms', 'start', '<<$ARGS[1]>>'", "totminut > <<totminut + 60 * (rand(npc_start_free_time[$ARGS[1]], npc_end_free_time[$ARGS[1]] - 1) - hour) + rand(0, 180) - minut>>"
+		!booty_call_time[$ARGS[1]] = 60 * rand(npc_start_free_time[$ARGS[1]], (npc_end_free_time[$ARGS[1]] - 1)) + rand(0, 180)
 	else
-		booty_call_time[$sugar_daddy[i]] = 2000
+		!booty_call_time[$ARGS[1]] = 2000
 	end
 end
 
+
 !!	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0 or npc_end_free_time[$FuckBuddy[i]] = 0:
 !!		$boy = $FuckBuddy[i]
 
 !!	end
 
-!!		if ((rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and (rand(1,npc_rel[$FuckBuddy[i]]) > 0)) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
+!!		if ((rand(1, 10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and (rand(1, npc_rel[$FuckBuddy[i]]) > 0)) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
 
 !!			elseif week < 6:
-!!				booty_call_time[$FuckBuddy[i]] = 900 + rand(0,210)
+!!				booty_call_time[$FuckBuddy[i]] = 900 + rand(0, 210)
 !!			else
-!!				booty_call_time[$FuckBuddy[i]] = 600 + rand(0,720)
+!!				booty_call_time[$FuckBuddy[i]] = 600 + rand(0, 720)
+
+
+!! ------------ NPC Stat Updater ------------------------
+
+!! $ARGS[1] = $npc_id
+if $ARGS[0] = 'bc_npc_stat_update':
+	if npc_start_free_time[$ARGS[1]] = 0 or npc_day_off[$ARGS[1]] = 0:
+		if npc_finance[$ARGS[1]] = 0:
+			temp_bc_rand = rand(1, 3)
+			if temp_bc_rand = 1:
+				npc_start_free_time[$ARGS[1]] = 9
+				npc_end_free_time[$ARGS[1]] = 12
+			elseif temp_bc_rand = 2:
+				npc_start_free_time[$ARGS[1]] = 16
+				npc_end_free_time[$ARGS[1]] = 20
+			else
+				npc_start_free_time[$ARGS[1]] = 20
+				npc_end_free_time[$ARGS[1]] = 23
+			end
+			killvar 'temp_bc_rand'
+		elseif npc_finance[$ARGS[1]] = 1:
+			if rand(1,2) = 1:
+				npc_start_free_time[$ARGS[1]] = 9
+				npc_end_free_time[$ARGS[1]] = 12
+			else
+				npc_start_free_time[$ARGS[1]] = 20
+				npc_end_free_time[$ARGS[1]] = 23
+			end
+		elseif npc_finance[$ARGS[1]] = 2:
+			if rand(1, 2) = 1:
+				npc_start_free_time[$ARGS[1]] = 8
+				npc_end_free_time[$ARGS[1]] = 12
+
+				npc_work_start[$ARGS[1]] = 13
+				npc_work_end[$ARGS[1]] = 21
+			else
+				npc_start_free_time[$ARGS[1]] = 18
+				npc_end_free_time[$ARGS[1]] = 22
+
+				npc_work_start[$ARGS[1]] = 9
+				npc_work_end[$ARGS[1]] = 17
+			end
+			npc_apt_type[$ARGS[1]] = 5
+			!!npc_apt_type[$npclastgenerated] = rand(5, 6)
+			!! apt_type 6 is disabled until pictures are added
+			npc_occupation[$ARGS[1]] = rand(14, 18)
+			npc_car[$ARGS[1]] = rand(0, 1)
+		end
+		npc_day_off[$ARGS[1]] = rand(1, 7)
+	end
+end
+!! ------------------------------------------------------
+
 
 if $ARGS[0] = 'set_booty_call_date':
 	sex_ev['set_date'] = 1
@@ -114,88 +160,76 @@ if $ARGS[0] = 'block_booty_calls':
 	end
 end
 
-if $ARGS[0] = 'SMS raiser':
-	i = 0
-	:fuckbuddy_sms_raiser_loop
-	if i < arrsize('$FuckBuddy'):
-		if booty_call_time[$FuckBuddy[i]] < ((hour * 60) + minut) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_last_booty_call[$FuckBuddy[i]] ! daystart:
-			gs 'booty_call_sms', 'start', $FuckBuddy[i]
-			booty_call_time[$FuckBuddy[i]] = 2399
-			!! this is a bit superfluous, but it makes the code run faster.
-			booty_call_invite[$FuckBuddy[i]] = daystart
-		end
-		i += 1
-		jump 'fuckbuddy_sms_raiser_loop'
-	end
-
-	i = 0
-	:sugar_daddy_sms_raiser_loop
-	if i < arrsize('$sugar_daddy'):
-		if booty_call_time[$sugar_daddy[i]] < ((hour * 60) + minut) and npc_no_booty_call[$sugar_daddy[i]] ! daystart and npc_last_booty_call[$sugar_daddy[i]] ! daystart:
-			gs 'booty_call_sms', 'start', $sugar_daddy[i]
-			booty_call_time[$sugar_daddy[i]] = 2399
-			!! this is a bit superfluous, but it makes the code run faster.
-			booty_call_invite[$sugar_daddy[i]] = daystart
-		end
-		i += 1
-		jump 'sugar_daddy_sms_raiser_loop'
-	end
-end
-
 if $ARGS[0] = 'home_links':
-	i = 0
+	temp_bc_i = 0
 	:loopFB_homes
-	if i < arrsize('$Fuckbuddy'):
-		*nl
-		if (npc_residence[$Fuckbuddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$Fuckbuddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$Fuckbuddy[i]] = 4 and $loc = 'city_center'):
-			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
-			!! ''''
-		end
-		!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>>''''s</a> apartment is nearby.'' ')
-		i += 1
+	if temp_bc_i < arrsize('$Fuckbuddy'):
+		gs 'booty_call', 'generate_home_link', $Fuckbuddy[temp_bc_i]
+		temp_bc_i += 1
 		jump 'loopFB_homes'
 	end
 
-	i = 0
+	temp_bc_i = 0
 	:loopSD_homes
-	if i < arrsize('$sugar_daddy'):
-		*nl
-		if (npc_residence[$sugar_daddy[i]] = 1 and $loc = 'pav_residential') or (npc_residence[$sugar_daddy[i]] = 3 and $loc = 'city_residential')or (npc_residence[$sugar_daddy[i]] = 4 and $loc = 'city_center'):
-			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
-			!! ''''
-		end
-		!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>>''''s</a> apartment is nearby.'' ')
-		i += 1
+	if temp_bc_i < arrsize('$sugar_daddy'):
+		gs 'booty_call', 'generate_home_link', $sugar_daddy[temp_bc_i]
+		temp_bc_i += 1
 		jump 'loopSD_homes'
 	end
+
+	killvar 'temp_bc_i'
+end
+
+! $ARGS[1] = $npc_id
+if $ARGS[0] = 'generate_home_link':
+	if (npc_residence[$ARGS[1]] = 1 and $loc = 'pav_residential') or (npc_residence[$ARGS[1]] = 3 and $loc = 'city_residential') or (npc_residence[$ARGS[1]] = 4 and $loc = 'city_center'):
+		*nl
+		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$ARGS[1]>>'''' "><<$npc_firstname[$ARGS[1]]>>''''s</a> apartment is nearby.'' ')
+		!! ''''
+	end
+	!!		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''fb_npc_home_start'''',''''<<$ARGS[1]>>'''' "><<$npc_firstname[$ARGS[1]]>>''''s</a> apartment is nearby.'' ')
+
 end
 
+
 if $ARGS[0] = 'hotel_links':
-	i = 0
+	temp_bc_i = 0
 	:loopFB_hotel
-	if i < arrsize('$Fuckbuddy'):
-		*nl
-		if $booty_call_hotel[$Fuckbuddy[i]] = $region and booty_call_invite[$FuckBuddy[i]] = daystart:
-			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$Fuckbuddy[i]>>'''' "><<$npc_firstname[$Fuckbuddy[i]]>></a> booked a hotel room to meet you in.'' ')
-			!! ''''
-		end
-		i += 1
+	if temp_bc_i < arrsize('$Fuckbuddy'):
+		gs 'booty_call', 'generate_hotel_link', $Fuckbuddy[temp_bc_i]
+		temp_bc_i += 1
 		jump 'loopFB_hotel'
 	end
 
-	i = 0
+	temp_bc_i = 0
 	:loopSD_hotel
-	if i < arrsize('$sugar_daddy'):
-		*nl
-		if $booty_call_hotel[$sugar_daddy[i]] = $region and booty_call_invite[$sugar_daddy[i]] = daystart:
-			dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$sugar_daddy[i]>>'''' "><<$npc_firstname[$sugar_daddy[i]]>></a> booked a hotel room to meet you in.'' ')
-			!! ''''
-		end
-		i += 1
+	if temp_bc_i < arrsize('$sugar_daddy'):
+		gs 'booty_call', 'generate_hotel_link', $sugar_daddy[temp_bc_i]
+		temp_bc_i += 1
 		jump 'loopSD_hotel'
 	end
+
+	killvar 'temp_bc_i'
+end
+
+if $ARGS[0] = 'generate_hotel_link':
+	if $booty_call_hotel[$ARGS[1]] = $region and booty_call_invite[$ARGS[1]] = daystart:
+		*nl
+		dynamic(' ''<a href="exec: minut += 2 & gt ''''sex_ev_start'''',''''initiate_pre'''',''''<<$ARGS[1]>>'''' "><<$npc_firstname[$ARGS[1]]>></a> booked a hotel room to meet you in.'' ')
+		!! ''''
+	end
 end
 
+
+
+
+	!!========================================================!!
+	!!                                                        !!
+	!!                         LEGACY                         !!
+	!!                                                        !!
+	!!========================================================!!
+
+
 !! booty_call_invite['B0']
 
 if $ARGS[0] = 'text':
@@ -214,7 +248,7 @@ if $ARGS[0] = 'text':
 		!! IMAGE HERE
 		'	<b><font color="blue">i was thinking about you today</font></b>'
 		'<b><font color="pink">what were you thinking about?</font></b>'
-		booty_call['text'] = rand(1,3)
+		booty_call['text'] = rand(1, 3)
 		if booty_call['text'] = 1:
 			'	<b><font color="blue">wanted to know if you wanted to come over to my place</font></b>'
 			'	<b><font color="blue">have some fun?</font></b>'
@@ -249,7 +283,7 @@ if $ARGS[0] = 'invite_yourself':
 end
 
 if $ARGS[0] = 'get_invited':
-	if rand(0,1) = 1:
+	if rand(0, 1) = 1:
 		'"Why don''t you come over to my place right now and we can have some fun?"'
 
 	else
@@ -277,7 +311,7 @@ if $ARGS[0] = 'text1':
 		!! IMAGE HERE
 		'	<b><font color="blue">i was thinking about you today</font></b>'
 		'<b><font color="pink">what were you thinking about?</font></b>'
-		booty_call['text'] = rand(1,3)
+		booty_call['text'] = rand(1, 3)
 		if booty_call['text'] = 1:
 			'	<b><font color="blue">wanted to know if you wanted to come over to my place</font></b>'
 			'	<b><font color="blue">have some fun?</font></b>'
@@ -297,7 +331,7 @@ if $ARGS[0] = 'text1':
 		'	<b><font color="blue">i was thinking about you today</font></b>'
 		'<b><font color="pink">me too</font></b>'
 		'	<b><font color="blue">come over</font></b>'
-!!		booty_call['text'] = rand(1,3)
+!!		booty_call['text'] = rand(1, 3)
 !!		if booty_call['text'] = 1:
 		'	<b><font color="blue">lets fuck like bunnies</font></b>'
 	end
@@ -365,10 +399,11 @@ if $ARGS[0] = 'invite_yourself1':
 	*nl
 	!! missing code
 	!! better way of randomizing this? personality based?
-	if rand(1,3) = 3:
+	temp_bc_rand = rand(1, 3)
+	if temp_bc_rand = 1:
 		'You don''t receive a response. He must be busy.'
 		act 'Put away your phone': gt $loc, $loc_arg
-	elseif rand(1,2) = 2 and hour < 18:
+	elseif temp_bc_rand = 2 and hour < 18:
 		'	<b><font color="blue">im at work</font></b>'
 		act'Sorry, never mind':
 			cla & *nl
@@ -441,6 +476,7 @@ if $ARGS[0] = 'invite_yourself1':
 			end
 		end
 	end
+	killvar 'temp_bc_rand'
 end
 
 if $ARGS[0] = 'invite_yourself2':
@@ -465,111 +501,59 @@ if $ARGS[0] = 'invite_yourself2':
 	end
 end
 
-!! ------------ NPC Stat Updater ------------------------
-
-if $ARGS[0] = 'fb_npc_stat_update':
-	if npc_start_free_time[$FuckBuddy[i]] = 0 or npc_day_off[$FuckBuddy[i]] = 0:
-		if npc_finance[$FuckBuddy[i]] = 0:
-			if rand(1,3) = 1:
-				npc_start_free_time[$FuckBuddy[i]] = 9
-				npc_end_free_time[$FuckBuddy[i]] = 12
-			elseif rand(1,2) = 1:
-				npc_start_free_time[$FuckBuddy[i]] = 16
-				npc_end_free_time[$FuckBuddy[i]] = 20
-			else
-				npc_start_free_time[$FuckBuddy[i]] = 20
-				npc_end_free_time[$FuckBuddy[i]] = 23
-			end
-		elseif npc_finance[$FuckBuddy[i]] = 1:
-			if rand(1,2) = 1:
-				npc_start_free_time[$FuckBuddy[i]] = 9
-				npc_end_free_time[$FuckBuddy[i]] = 12
-			else
-				npc_start_free_time[$FuckBuddy[i]] = 20
-				npc_end_free_time[$FuckBuddy[i]] = 23
-			end
-		elseif npc_finance[$FuckBuddy[i]] = 2:
-			if rand(1,2) = 1:
-				npc_start_free_time[$npclastgenerated] = 8
-				npc_end_free_time[$npclastgenerated] = 12
 
-				npc_work_start[$npclastgenerated] = 13
-				npc_work_end[$npclastgenerated] = 21
-			else
-				npc_start_free_time[$npclastgenerated] = 18
-				npc_end_free_time[$npclastgenerated] = 22
+!! ------------ Legacy Backup ------------------------
 
-				npc_work_start[$npclastgenerated] = 9
-				npc_work_end[$npclastgenerated] = 17
-			end
-			npc_apt_type[$FuckBuddy[i]] = 5
-			!!npc_apt_type[$npclastgenerated] = rand(5,6)
-			!! apt_type 6 is disabled until pictures are added
-			npc_occupation[$FuckBuddy[i]] = rand(14,18)
-			npc_car[$FuckBuddy[i]] = rand(0,1)
-		end
-		npc_day_off[$FuckBuddy[i]] = rand(1,7)
+if $ARGS[0] = 'draw':
+	! this routine should invoke a the booty call sms from random friend in $lover list
+	! but I cannnot randomize the time because the probability is 100 % now
+	! I suppose that the routine will be modified later to take in account the lovers preferences
+	if booty_call['A0'] ! daystart :
+		temp_bc_i = rand(0, arrsize('$fuckbuddy')-1)
+		$lover_drawn = $fuckbuddy[temp_bc_i]
+		!$booty_call_daily_id[temp_bc_i] = $lover_drawn
+		gs 'booty_call_sms', 'start', $lover_drawn
+		booty_call['A0'] = daystart
 	end
+	killvar 'temp_bc_i'
 end
 
-if $ARGS[0] = 'sd_npc_stat_update':
-	if npc_start_free_time[$sugar_daddy[i]] = 0 or npc_day_off[$sugar_daddy[i]] = 0:
-		if npc_finance[$sugar_daddy[i]] = 0:
-			if rand(1,3) = 1:
-				npc_start_free_time[$sugar_daddy[i]] = 9
-				npc_end_free_time[$sugar_daddy[i]] = 12
-			elseif rand(1,2) = 1:
-				npc_start_free_time[$sugar_daddy[i]] = 16
-				npc_end_free_time[$sugar_daddy[i]] = 20
-			else
-				npc_start_free_time[$sugar_daddy[i]] = 20
-				npc_end_free_time[$sugar_daddy[i]] = 23
-			end
-		elseif npc_finance[$sugar_daddy[i]] = 1:
-			if rand(1,2) = 1:
-				npc_start_free_time[$sugar_daddy[i]] = 9
-				npc_end_free_time[$sugar_daddy[i]] = 12
-			else
-				npc_start_free_time[$sugar_daddy[i]] = 20
-				npc_end_free_time[$sugar_daddy[i]] = 23
-			end
-		elseif npc_finance[$sugar_daddy[i]] = 2:
-			if rand(1,2) = 1:
-				npc_start_free_time[$npclastgenerated] = 8
-				npc_end_free_time[$npclastgenerated] = 12
-
-				npc_work_start[$npclastgenerated] = 13
-				npc_work_end[$npclastgenerated] = 21
-			else
-				npc_start_free_time[$npclastgenerated] = 18
-				npc_end_free_time[$npclastgenerated] = 22
 
-				npc_work_start[$npclastgenerated] = 9
-				npc_work_end[$npclastgenerated] = 17
-			end
-			npc_apt_type[$sugar_daddy[i]] = 5
-			!!npc_apt_type[$npclastgenerated] = rand(5,6)
-			!! apt_type 6 is disabled until pictures are added
-			npc_occupation[$sugar_daddy[i]] = rand(14,18)
-			npc_car[$sugar_daddy[i]] = rand(0,1)
+if $ARGS[0] = 'SMS raiser':
+	temp_bc_i = 0
+	:fuckbuddy_sms_raiser_loop
+	if temp_bc_i < arrsize('$FuckBuddy'):
+		$temp_bc_id = $FuckBuddy[temp_bc_i]
+		if booty_call_time[$temp_bc_id] < ((hour * 60) + minut) and npc_no_booty_call[$temp_bc_id] ! daystart and npc_last_booty_call[$temp_bc_id] ! daystart:
+			!$booty_call_daily_id[temp_bc_i] = $temp_bc_id
+			gs 'booty_call_sms', 'start', $temp_bc_id
+			booty_call_time[$temp_bc_id] = 2399
+			!! this is a bit superfluous, but it makes the code run faster.
+			booty_call_invite[$temp_bc_id] = daystart
 		end
-		npc_day_off[$sugar_daddy[i]] = rand(1,7)
+		temp_bc_i += 1
+		jump 'fuckbuddy_sms_raiser_loop'
 	end
-end
 
-!! ------------ Legacy Backup ------------------------
 
-if $ARGS[0] = 'draw':
-	! this routine should invoke a the booty call sms from random friend in $lover list
-	! but I cannnot randomize the time because the probability is 100 % now
-	! I suppose that the routine will be modified later to take in account the lovers preferences
-	if booty_call['A0'] ! daystart :
-		$lover_drawn = $fuckbuddy[rand(0,arrsize('$fuckbuddy')-1)]
-		gs 'booty_call_sms', 'start',$lover_drawn
-!		gs 'booty_call_sms', 'Add SMS', $lover_drawn
-		booty_call['A0'] = daystart
+	temp_bc_i = 0
+	:sugar_daddy_sms_raiser_loop
+	if temp_bc_i < arrsize('$sugar_daddy'):
+		$temp_bc_id = $sugar_daddy[temp_bc_i]
+		if booty_call_time[$temp_bc_id] < ((hour * 60) + minut) and npc_no_booty_call[$temp_bc_id] ! daystart and npc_last_booty_call[$temp_bc_id] ! daystart:
+			!$booty_call_daily_id[i] = $temp_bc_id
+			gs 'booty_call_sms', 'start', $temp_bc_id
+			booty_call_time[$temp_bc_id] = 2399
+			!! this is a bit superfluous, but it makes the code run faster.
+			booty_call_invite[$temp_bc_id] = daystart
+		end
+		temp_bc_i += 1
+		jump 'sugar_daddy_sms_raiser_loop'
 	end
+
+	killvar 'temp_bc_i'
+	killvar '$temp_bc_id'
 end
 
 
---- booty_call ---------------------------------
+--- booty_call ---------------------------------

+ 7 - 7
locations/booty_call_sms.qsrc

@@ -28,8 +28,7 @@
 
 
 if $ARGS[0] = 'start':
-	$booty_call_daily_id[i] = $ARGS[1]
-
+	gs 'telefon', 'ClearSMSSchedule', $ARGS[1]
 	if npc_booty_call[$ARGS[1]] = daystart:
 		gs 'booty_call_sms', 'Add SMS2', 'pre_planned_booty_call', $ARGS[1]
 	elseif sugar_daddy_call[$ARGS[1]] = 1:
@@ -142,7 +141,7 @@ if $ARGS[0] = 'default_booty_call':
 					!! player response 1 option 2
 				$SMSTree['b3'] = 'me too'
 						!! boy response 2
-					if npc_finance[$ARGS[1]] = 2 and func('homes_properties_attr', 'get_property_attribute', '$town', $home['current']) ! 'city' and npc_residence[$ARGS[1]] >= 3: 
+					if npc_finance[$ARGS[1]] = 2 and func('homes_properties_attr', 'get_property_attribute', '$town', $home['current']) ! 'city' and npc_residence[$ARGS[1]] >= 3:
 						$SMSTree['b4'] = 'I booked a hotel room in Pav. why dont you come by?'
 					else
 						if $npc_fav_pos[$ARGS[1]] = 'blowjob' and rand(0, 2) = 0:
@@ -338,7 +337,7 @@ if $ARGS[0] = 'sugar_daddy_booty_call':
 			$SMSTree['2'] = 'ive been thinking about you'
 					!! player 1st reply, choice A
 				$SMSTree['a3'] = 'what were you thinking about?'
-	
+
 						!! boy response to 1st reply, choice A
 					if ($home['current'] ! 'city_apartment' and $home['current'] ! 'niko_apartment' and $home['current'] ! 'university_dorm' and $home['current'] ! 'city_house' and $home['current'] ! 'maid_bedroom') and npc_residence[$ARGS[1]] >= 3:
 						$SMSTree['a4'] = 'I booked a hotel room in Pav. why dont you come by?'
@@ -405,6 +404,7 @@ if $ARGS[0] = 'new_booty_call':
 			$SMSTree['e2'] = 'its late. text me earlier next time.'
 
 			!! hour - message_received_hour >= 3
+			!! Add daystart as well??
 			$SMSTree['f2'] = 'sorry'
 				$SMSTree['fa3'] = 'didn''t see your message until now'
 					$SMSTree['fa4'] = 'whatsup?'
@@ -465,7 +465,7 @@ if $ARGS[0] = 'new_booty_call':
 				!! player response 1 option 2
 			$SMSTree['b11'] = 'me too'
 					!! boy response 2
-				if npc_finance[$ARGS[1]] = 2 and func('homes_properties_attr', 'get_property_attribute', '$town', $home['current']) ! 'city' and npc_residence[$ARGS[1]] >= 3: 
+				if npc_finance[$ARGS[1]] = 2 and func('homes_properties_attr', 'get_property_attribute', '$town', $home['current']) ! 'city' and npc_residence[$ARGS[1]] >= 3:
 					$SMSTree['b12'] = 'I booked a hotel room in Pav. why dont you come by?'
 				else
 					if $npc_fav_pos[$ARGS[1]] = 'blowjob' and rand(0, 2) = 0:
@@ -561,7 +561,7 @@ if $ARGS[0] = 'new_booty_call':
 			else
 				$SMSTRee['b21'] = 'cant wait'
 			end
-	
+
 	$SMSTree['c20'] = 'its kind of late'
 		$SMSTree['c21'] = 'sorry'
 			$SMSTree['c22'] = 'maybe another time?'
@@ -838,7 +838,7 @@ end
 ! $ARGS[3] = npc_code
 ! $ARGS[4] = code reply send
 !  ARGS[5] = smsID
-if $ARGS[0] = 'late apology':
+if $ARGS[0] = 'late_apology':
 	gs 'booty_call_sms', $ARGS[2], $ARGS[3]
 	gs 'SMStext_builder', 'start'
 		gs 'SMStext_builder', 'send', $SMSTree[$ARGS[4]]

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

+ 12 - 2
locations/bras.qsrc

@@ -68,7 +68,17 @@ if $ARGS[0] = 'view_bra_list':
 	clo_i = 0
 	:loopbraquality_filter
 
-	i = 1
+	!! default bra
+	gs 'underwear_attributes', 'gm_bras', 1
+	gs 'bras', 'bra_filter'
+	!!sort by filter
+	if (clothingfilter['quality'] = 0 and BraQuality = clo_i) or clothingfilter['number'] = 0:
+		if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
+			*p '<a href="exec:gt ''bras'', ''view_bra_item'', ''<<$ARGS[1]>>'', ''gm'', 1"><img src="images/pc/items/gm/bras/1.jpg" 	height="150" /></a>'
+		end
+	end
+
+	i = 2
 	:loopgmbras
 		if gm_brasS[i] = metka_bras and gm_bras[i] = 1:
 			gs 'underwear_attributes', 'gm_bras', i
@@ -427,7 +437,7 @@ if $ARGS[0] = 'view_bra_item':
 					end
 				end
 			end
-			gs 'bras', 'storage_options'
+			if $ARGS[2] ! 'gm' or ARGS[3] ! 1: gs 'bras', 'storage_options'
 		end
 	end
 end

+ 12 - 12
locations/brother_lessons.qsrc

@@ -603,7 +603,7 @@ if $ARGS[0] = 'anatomylesson2':
 								'<i>Well, at least I didn''t get wet for nothing.</i>'
 								act 'Continue the lesson': gt'brother_lessons', 'anatomylesson3'
 							end
-							
+
 						else
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/homework/anatomylesson/8.jpg"></center>'
 							'"Kolk-! Ahh~! Wai- Uh~! Sto-... Ohh~!" you try to voice protests but they get lost in your stifled moans.'
@@ -647,29 +647,29 @@ if $ARGS[0] = 'anatomylesson3':
 		'"Ohhh! Okay!" he says, writing everything down. <i>This might just be helping him in school after all...</i> you think to yourself.'
 		act'Continue':
 			cla & *clr
-			
-			if pcs_vag = 0: 
+
+			if pcs_vag = 0:
 				vagtype = 0
-			elseif pcs_vag <= 25: 
+			elseif pcs_vag <= 25:
 				vagtype = 1
-			elseif pcs_vag <= 35: 
+			elseif pcs_vag <= 35:
 				vagtype = 2
-			elseif pcs_vag > 35: 
+			elseif pcs_vag > 35:
 				vagtype = 3
 			end
-			
+
 			gs 'stat'
 			*clr
-			'<center><img <<$set_imgh>> src="<<FUNC(''$pube_image'')>>"></center>'
-			
+			'<center><img <<$set_imgh>> src="<<func(''$body_image'', ''pubes'')>>"></center>'
+
 			if vagtype = 0:
 				'"Next is a very special part of the vagina," you start. You spread your pussy lips apart and let him look inside. "This is the hymen. Every girl is born with one and will have it until it gets torn."'
 			else
 				'"The next part I can''t actually show you, but I might as well show you where it should be," you say. You spread your pussy lips apart and let him look inside. "Normally, there''s something called a ''hymen'' here. You can see a diagram of it in your textbook. Every girl is born with one and will have it until it gets torn."'
 			end
-			
+
 			'"How does it get torn?" Kolka quickly asks while continuing to stare at your pussy as if trying to imprint it into his mind.'
-			'"Well, it can get torn in a number of ways, but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina."' 
+			'"Well, it can get torn in a number of ways, but the most common is when a girl loses her virginity. We''ll talk about this more next time, but when a boy and a girl have sex, the boy sticks his penis inside the girl''s vagina."'
 			*nl
 			if brotherSex = 7:
 				'Kolka interrupts you. "Duh! I know the penis goes in, I was there!"'
@@ -698,7 +698,7 @@ if $ARGS[0] = 'anatomylesson3':
 				elseif vagtype = 3:
 					'<br>	"Woah! It''s like a cave in there! Are they all this wide?" he exclaims. You blush harder than you think you''ve ever blushed in your life.'
 				end
-			
+
 				if (vagtype = 2 or vagtype = 3) and guy > 0:
 					act'"I''ve had a lot of sex"':
 						cla

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

+ 2 - 2
locations/camera.qsrc

@@ -171,7 +171,7 @@ if $ARGS[0] = 'check_location':
 				gt 'camera', $camera_event
 			end
 		! If they photographed the lake but did not trigger the sonia conditions, offer her
-		elseif $camera_event = 'pav_lake' and camera_found['sonia'] ! 1 and sunWeather = 1 and soniaPS > 0:
+		elseif $camera_event = 'pav_lake' and camera_found['sonia'] ! 1 and sunWeather = 1 and soniaQW['slut'] > 0:
 			gs 'camera', 'pav_lake_sonia', 'describe'
 		end
 	end
@@ -396,7 +396,7 @@ if $ARGS[0] = 'pav_lake':
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
 	'As you look out over the lake, you realize what a wonderful photo this place would make. You walk around the shore several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
-	if soniaPS > 0 and sunWeather = 1 and temp > 15 and hour > 6 or hour < 22:
+	if soniaQW['slut'] > 0 and sunWeather = 1 and temp > 15 and hour > 6 or hour < 22:
 		'Just as you''re about to put your camera away, you notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia, and she appears alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
 		gs 'camera', 'pav_lake_sonia'
 	else

+ 12 - 16
locations/casino.qsrc

@@ -9,17 +9,14 @@ if $ARGS[0] = 'outside':
 	menu_off = 0
 
 	$location_type = 'public_outdoors'
-	
+
 	*clr & cla
 	gs 'stat'
 	'<right><img <<$set_imgh>> src="images/locations/city/industrial/casino/zdcasino.jpg"></right>'
 	'You stand in front of the door of the huge building casinos.'
 
 	act 'Return to the city industrial area': minut += 10 & gt 'city_industrial'
-
 	act 'Enter the casino': gt 'casino', 'foyer'
-
-	!!if tobiQW < 1000:tobiQW = 1000
 end
 
 if $ARGS[0] = 'foyer':
@@ -28,7 +25,7 @@ if $ARGS[0] = 'foyer':
 	$menu_arg = $ARGS[0]
 	menu_off = 0
 	$location_type = 'public_indoors'
-	
+
 	*clr & cla
 	minut += 1
 	gs 'stat'
@@ -119,7 +116,7 @@ if $ARGS[0] = 'roulette_bet1':
 		elseif st_1 > 1000:
 			msg '<br>The maximum amount you can bet is 1000 <b>₽</b>'
 			gt 'casino', 'roulette_bet1'
-		else 
+		else
 			money -= st_1
 			gt 'casino', 'roulette_bet2'
 		end
@@ -139,11 +136,11 @@ if $ARGS[0] = 'roulette_bet2':
 	'<right><img <<$set_imgh>> src="images/locations/city/industrial/casino/stavkaru.jpg"></right>'
 	'Where do you put your chips?'
 
-	act 'Don''t bet': 
+	act 'Don''t bet':
 		money += st_1
 		gt 'casino', 'roulette_bet1'
 	end
-	
+
 	act 'Red / Black':
 		cla
 		act 'Reconsider': gt 'casino', 'roulette_bet2'
@@ -376,7 +373,7 @@ if $ARGS[0] = 'slots':
 	$loc_arg = $ARGS[0]
 	$menu_arg = $ARGS[0]
 	menu_off = 0
-	
+
 	*clr & cla
 	minut += 1
 	gs 'stat'
@@ -385,7 +382,7 @@ if $ARGS[0] = 'slots':
 	'Every once in a while you hear the satisfying sound of coins streaming into the tray of the next lucky winner.'
 	'According to the huge animated digital display on the back wall, there is a hefty jackpot up for grabs.'
 
-	act 'Go to the foyer': gt 'casino', 'foyer'	
+	act 'Go to the foyer': gt 'casino', 'foyer'
 	act 'Use one of the slot machines':
 		*clr & cla
 		menu_off = 1
@@ -429,7 +426,7 @@ if $ARGS[0] = 'slots':
 
 				minut += 1
 				gs 'stat'
-				
+
 				gt 'casino', 'slots'
 			else
 				msg 'You don''t have enough money to play. Turns out there''s no such thing as a free lunch, and you need money for a chance to win more money. Life is so unfair.'
@@ -513,7 +510,7 @@ if $ARGS[0] = 'cards_cw':
 	$loc_arg = $ARGS[0]
 	$menu_arg = $ARGS[0]
 	menu_off = 0
-	
+
 	*clr & cla
 	minut += 1
 	gs 'stat'
@@ -552,7 +549,7 @@ if $ARGS[0] = 'cards_cw':
 			That''s it. Enjoy the game.'
 			gt 'casino', 'cards_cw'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'cards_cwplay':
@@ -567,7 +564,7 @@ if $ARGS[0] = 'cards_cwplay':
 		'Place your bets, ladies and gentlemen.'
 
 		act 'Leave the table': gt 'casino', 'cards_cw'
-		
+
 		act 'Place your bet':
 			if money < 1:
 				'You don''t have any money!'
@@ -588,7 +585,7 @@ if $ARGS[0] = 'cards_cwplay':
 			end
 
 			gt 'casino', 'cards_cwplay'
-		end	
+		end
 	end
 
 	if turn1 = 1:
@@ -1084,4 +1081,3 @@ if $ARGS[0] = 'blackjack_view':
 end
 
 --- casino ---------------------------------
-

+ 5 - 1
locations/changingroom.qsrc

@@ -2,9 +2,10 @@
 
 
 $locclass = 'changingroom'
-menu_off = 1
 
 if $ARGS[0] = 'view_swim_list':
+	menu_off = 1
+	gs 'stat'
 	!! ARGS[1] - Ignore Inhibition
 	!!           0: no
 	!!           1: Partially, overcome through willpower
@@ -131,6 +132,9 @@ end
 
 
 if $ARGS[0] = 'view_swim_item':
+	menu_off = 1
+	gs 'stat'
+
 	!!  ARGS 0 - view_clothing_item
 	!! $ARGS 1 - clothing type
 	!!  ARGS 2 - clothing index

+ 31 - 58
locations/cikl.qsrc

@@ -21,31 +21,12 @@ end
 !! week = day in the week. 1 == Monday
 !! hour = Full hour in this day
 
-day += 1
-week += 1
+daystart += 1
 hour -= 24
+gs 'daystart'
 
-if day > monthsEnd[month]:
-	day -= monthsEnd[month]
-	month += 1
-
-	!! Changing the year at new year and making sure February have the correct number of days.
-	if month > 12:
-		month = 1
-		year += 1
-		if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0):
-			monthsend[2] = 29
-		else
-			monthsend[2] = 28
-		end
-	end
-
-	!!MJ: Don''t think that one is needed. But it was in the original loop.
-	if month < 1: month = 1
-
-	$month = $monthName[month]
-
-	!! new years party calculation
+!! new years party calculation
+if day = 1 and month = 12:
 	temp = func('shortgs','dow',year,12,31)
 	if temp < 6:
 		nyp_day = 31
@@ -54,32 +35,22 @@ if day > monthsEnd[month]:
 	else
 		nyp_day = 29
 	end
-
 end
 
 !!MJ: Don''t think that one is needed. But it was here already.
-if day <= 0:day = 1
 
 ciklNewWeek = 0
-if week > 7:
-	odd_week = iif(odd_week,0,1)
+if week = 1:
 	ciklNewWeek = 1
-	:loopweek
-	week -= 7
 	husbandrink = 0
-
-	if military = 1:military = 0
-
-	if week > 7:jump 'loopweek'
+	if military = 1: military = 0
 end
 
-gs 'daystart'
-
 gs 'yearstart'
-
+transient_evt_day = day
 gs 'emp_functions', 'evt_day_suffix'
-$stat_day_suffix = $date_suffix
-killvar '$date_suffix'
+$stat_day_suffix = $evt_suffix
+killvar '$evt_suffix'
 !!----------------------------------------------------------------------------
 
 !!Fame call to update all the fame variables
@@ -94,9 +65,6 @@ if (film > 0 or pornstack = 1) and pfilmNO = 0 and pfilmSTOP = 0:
 	gs 'pornschedule', 'schedule'
 end
 
-!! set the time when the SMS will be send
-gs 'booty_call', 'scheduler'
-booty_call_time['daystart'] = daystart
 
 
 !!------------------------------------------------------------------------------------------------------------
@@ -194,6 +162,16 @@ if dyneval ('RESULT = <<$coatworntype>>_coats_h[<<coatwornnumber>>]') <= 0: $coa
 if abortionbirthdate ! 0 and daystart - abortionbirthdate > 24: abortionbirthdate = 0
 if pregbirthdate ! 0 and daystart - pregbirthdate > 73: pregbirthdate = 0
 
+
+
+
+	!!==================================================================!!
+	!!                                                                  !!
+	!!                              TRAITS                              !!
+	!!                                                                  !!
+	!!==================================================================!!
+
+
 !!------------------------------------------------------------------------------------------------------------
 !!	Nympho
 !!------------------------------------------------------------------------------------------------------------
@@ -230,15 +208,9 @@ if bimbo >= 40: bimbo = 40
 
 !!Bimbo levels. They use custom variables so they won''t permanently change character stats
 if bimbolevel = 0: supnatvnesh = 0 & bimbostupidity = 0
-if cheatVars['smart_bimbo'] = 0:
-	if bimbolevel = 1: supnatvnesh = 2 & bimbostupidity = (pcs_intel / 6)
-	if bimbolevel = 2: supnatvnesh = 2 & bimbostupidity = (pcs_intel / 4)
-	if bimbolevel = 3: supnatvnesh = 4 & bimbostupidity = (pcs_intel / 3)
-elseif cheatVars['smart_bimbo'] = 1:
-	if bimbolevel = 1: supnatvnesh = 2 & bimbostupidity = 0
-	if bimbolevel = 2: supnatvnesh = 2 & bimbostupidity = 0
-	if bimbolevel = 3: supnatvnesh = 4 & bimbostupidity = 0
-end
+if bimbolevel = 1: supnatvnesh = 2 & bimbostupidity = iif(cheatVars['smart_bimbo'] = 1, 0, (pcs_intel / 6))
+if bimbolevel = 2: supnatvnesh = 2 & bimbostupidity = iif(cheatVars['smart_bimbo'] = 1, 0, (pcs_intel / 4))
+if bimbolevel = 3: supnatvnesh = 4 & bimbostupidity = iif(cheatVars['smart_bimbo'] = 1, 0, (pcs_intel / 3))
 
 !!A Succubus cannot be a Bimbo
 if succubusflag = 1 and cheatVars['suc_bimbo'] = 0:
@@ -342,7 +314,12 @@ if pcs_traits['new_again'] > 0: pcs_traits['new_again'] -= 1
 !!	Succubus Level & hunger calcs
 !!------------------------------------------------------------------------------------------------------------
 if succubusflag = 1: gs 'succubus','cikl'
-!!------------------------------------------------------------------------------------------------------------
+
+
+	!!==================================================================
+
+
+
 
 if defcurly = 0 and curly > 0:curly -= 1
 if defcurly = 1:
@@ -1070,13 +1047,6 @@ if month = 11 and day = 19 and (AlbinaQW['StarletsJoined'] <= 0 or (AlbinaQW['St
 
 !!-------------Music career related variables and calculations------------------------------------------------
 
-!! Setting Del Parco initial variables
-if daystart < 2:
-	ml_delparcoQW['Stage'] = 0
-	ml_delparcoQW['Zariyah Trust'] = 50
-end
-
-
 !! How many hours a day can Sveta perform. It maxes out at 3.
 !! Using the actual skill level, not the one modified by Attributes because that is more realistic for this.
 ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
@@ -1280,7 +1250,10 @@ if camwhore = 1:
 	end
 end
 
+!gs 'komp_cam_functions', 'cikl'
 
+!!-----------------Gad market variables ------------------------------------------
+gad_stand = 0
 
 !!---------------Keeping track of missing court appearances-----------------------------
 if arrsize('policeQW_courthearing_dates') > 0 and daystart > policeQW_courthearing_dates[0]:

+ 5 - 3
locations/city_church.qsrc

@@ -220,10 +220,12 @@ if $ARGS[0] = 'pray':
 			*clr & cla
 			menu_off = 1
 			gs 'fame', 'city', 'sex', 2
-			gs 'flash', 'butt', 'indoors', 2, 1
+
+			$flash_image = 'images/locations/pavlovsk/church/ch_prayingflash.jpg'
+			$flash_text[0] = 'While you''re praying, you get a devious idea. With a sly smile, you expose your ass, giving anyone that looks your way a naughty sight as you lower your head and pray in silence. You occasionally hear whispers behind you, causing you to smile.'
+			gs 'flash', 'butt', 'indoors', 2, 2
+
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_prayingflash.jpg"></center>'
-			'While you''re praying, you get a devious idea. With a sly smile, you expose your ass, giving anyone that looks your way a naughty sight as you lower your head and pray in silence. You occasionally hear whispers behind you, causing you to smile.'
 			act 'Return to Narthex': gt 'city_church', 'Narthex'
 		end
 	end

+ 31 - 27
locations/city_clinic.qsrc

@@ -96,9 +96,9 @@ if $ARGS[0] = 'start':
 
 			'<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'
 
@@ -106,11 +106,15 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if experimentQW['discovered'] = 0:
+	if experimentQW['discovered'] = 1:
 		*nl
-		'In the far corner you spot the entrance to a signup area for <a href="exec: experimentQW[''discovered''] = 1 & gt ''city_experimental_trials'', ''front_desk''">experimental trials</a>.'
+		'In the far corner you spot the entrance to a signup area for <a href="exec: experimentQW[''discovered''] = 2 & gt ''city_experimental_trials'', ''front_desk''">experimental trials</a>.'
 		*nl
-	else
+	elseif experimentQW['discovered'] = 10:
+		*nl
+		'In the far corner you spot the entrance to a signup area for <a href="exec: experimentQW[''discovered''] = 2 & gt ''city_experimental_trials'', ''front_desk''">experimental trials</a>. That must be the place your <i>husband</i> told you about.'
+		*nl
+	elseif experimentQW['discovered'] = 2:
 		act 'Go to the medical trials reception desk': gt 'city_experimental_trials', 'front_desk'
 	end
 
@@ -139,7 +143,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	
+
 	if sick <= 0 and pcs_horny >= 90 and ninelsex >= 1 and ninelday ! daystart:
 		act 'Look for Dr. Ninel':
 			*clr & cla
@@ -175,7 +179,7 @@ if $ARGS[0] = 'start':
 			menu_off = 1
 			minut += 15
 			gs 'stat'
-			
+
 			if pcs_brace = 1:
 				pcs_brace = 0
 				pcs_teeth -= 1
@@ -261,7 +265,7 @@ if $ARGS[0] = 'start':
 			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 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
@@ -368,7 +372,7 @@ if $ARGS[0] = 'stdclinic':
 	'		Complete cure of syphilis - 1,000 <b>₽</b>.'
 	'		Complete cure for yeast infection - 15,000 <b>₽</b>.'
 	'	Treatment requires hospitalization on first Monday of each month.'
-	
+
 	act 'Leave': gt 'city_clinic', 'start'
 
 	if money >= 1000:
@@ -506,7 +510,7 @@ if $ARGS[0] = 'stdcheck':
 						act 'Ask him why he''s filming your examination':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/bg28qy97.jpg"></center>'
-							'The doctor, unfazed, speaks in a calm voice. "Oh, you noticed that, huh? The camera is there for your safety as well as mine, miss. I''ve been accused of molestation before. Then it hit me: people on the internet pay good money to see my examinations! Two birds with one stone, right?"' 
+							'The doctor, unfazed, speaks in a calm voice. "Oh, you noticed that, huh? The camera is there for your safety as well as mine, miss. I''ve been accused of molestation before. Then it hit me: people on the internet pay good money to see my examinations! Two birds with one stone, right?"'
 							'After a moment of silence, he grins. "Okay... Since you spotted the camera, I''ll offer you a choice. If you give me 10,000 <b>₽</b>, I''ll delete the footage as if you were never here. I''d be losing a lot of income, so that''s only fair."'
 							'Before you can reply, he continues. "Or if you don''t mind being watched by a few thousand people who you''ll probably never meet anyway, I can give you... 3000 <b>₽</b> to keep quiet. It''s your call."'
 							act 'Pay him to delete the footage': gt 'city_clinic', 'ven1'
@@ -524,7 +528,7 @@ if $ARGS[0] = 'stdcheck':
 					else
 						if venera > 0 or Kandidoz > 10:
 							'The doctor frowns and tells you that the test did not go well.'
-						
+
 							if GerpesOnce = 1:
 								'"You have genital herpes. The cure for this disease is very expensive, but it''s only active some of the time."'
 								if Gerpes >= 3:
@@ -545,7 +549,7 @@ if $ARGS[0] = 'stdcheck':
 
 							if TriperOnce = 1:
 								'"We found gonorrhea. In principle, this disease is curable."'
-								if TriperNapr = 0: 
+								if TriperNapr = 0:
 									TriperNapr = 5 & '"I''m going to put you on a course of gonorrhea injections. You''ll need a total of 5 injections over the course of a few days. Each injection will cost 750 <b>₽</b>."'
 								elseif TriperNapr > 0:
 									'"You need to see the nurse for your gonorrhea injections."'
@@ -828,7 +832,7 @@ if $ARGS[0] = 'ninel':
 								gs 'arousal', 'anal_dildo', 10, 'sub'
 								minut -= 10
 								gs 'stat'
-								
+
 								act 'This doesn''t seem normal':
 									*clr & cla
 									gs 'stat'
@@ -849,7 +853,7 @@ if $ARGS[0] = 'ninel':
 									'"Good. Kneel on the couch."'
 									gs 'arousal', 'vaginal_finger', 10, 'sub', 'lesbian'
 									gs 'stat'
-									
+
 									act 'Kneel on couch':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/exam17.jpg"></center>'
@@ -866,7 +870,7 @@ if $ARGS[0] = 'ninel':
 											'Ninel starts fucking you confidently, moaning with every jolt. The unusual situation and Ninel''s skill quickly brings you to your peak.'
 											gs 'arousal', 'vaginal_strap', 10, 'sub', 'lesbian'
 											gs 'stat'
-											
+
 											act 'Ride the wave!':
 												*clr & cla
 												'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/exam19.jpg"></center>'
@@ -878,7 +882,7 @@ if $ARGS[0] = 'ninel':
 												$orgasm_or = 'yes'
 												gs 'arousal', 'vaginal_strap', 10, 'sub', 'lesbian'
 												gs 'stat'
-											
+
 												act 'Return the favor':
 													*clr & cla
 													ninelsex += 1
@@ -892,7 +896,7 @@ if $ARGS[0] = 'ninel':
 													'Ninel removes the strap-on and you press your face to her soaking wet pussy. It doesn''t take long for your efforts to bring Ninel to orgasm. She screams and digs her nails into her knees as your face is covered by her squirting orgasm.'
 													gs 'arousal', 'cuni_give', 10, 'sub', 'lesbian'
 													gs 'stat'
-											
+
 													act 'Dress':
 														*clr & cla
 														'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/exam11.jpg"></center>'
@@ -903,7 +907,7 @@ if $ARGS[0] = 'ninel':
 														'You clean up and leave, Ninel smiling at you as you leave.'
 														gs 'arousal', 'end'
 														gs 'stat'
-														
+
 														act 'Leave the clinic': minut += 5 & gt 'city_residential'
 													end
 												end
@@ -1025,7 +1029,7 @@ if $ARGS[0] = 'ninel2':
 										'She cums with a long, yelling, shaking fervor and abundantly fills your face with her juices.'
 										gs 'arousal', 'cuni_give', 10, 'sub', 'lesbian'
 										gs 'stat'
-									
+
 										act 'Wow':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/exam09a.jpg"></center>'
@@ -1034,7 +1038,7 @@ if $ARGS[0] = 'ninel2':
 											'You''re healthy and satisfied, thanks to Ninel.'
 											gs 'arousal', 'end'
 											gs 'stat'
-											
+
 											act 'Thank her and leave': minut += 5 & gt 'city_residential'
 										end
 									end
@@ -1073,7 +1077,7 @@ if $ARGS[0] = 'ninel3':
 			act 'Fuck me!':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/polsex02.jpg"></center>'
-				'Remembering that Ninel loves to hear you beg her to fuck you, you don''t even need to pretend the desire is literally burnt into you. You beg and plead and Ninel finally heeds your request.' 
+				'Remembering that Ninel loves to hear you beg her to fuck you, you don''t even need to pretend the desire is literally burnt into you. You beg and plead and Ninel finally heeds your request.'
 				'She shoves you onto your knees and starts driving the strap-on firmly into your eager pussy. You let out screams of pleasure as you feel your legs weakening.'
 				gs 'arousal', 'vaginal_strap', 10, 'sub', 'lesbian'
 				gs 'stat'
@@ -1178,7 +1182,7 @@ if $ARGS[0] = '0':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex1.jpg"></center>'
 	'During the examination, the doctor starts to flirt with you and touch you longer than is necessary, clearly trying to start something intimate.'
-	
+
 	gs 'willpower', 'sex', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Stop him (<<will_cost>> Willpower)':
@@ -1206,7 +1210,7 @@ if $ARGS[0] = '1':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex2.jpg"></center>'
 	'You''re examined by two doctors who touch you everywhere, clearly going beyond what is permitted.'
-	
+
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Storm out (<<will_cost>> Willpower)':
@@ -1243,7 +1247,7 @@ if $ARGS[0] = '2':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex4.jpg"></center>'
 		'As you walk in, the doctor runs out and the startled nurse glares at you. After a moment, her eyes light up and she removes her robe before walking over to you and grabbing your ass and breast.'
-		
+
 		gs 'willpower', 'cuni', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
@@ -1267,14 +1271,14 @@ if $ARGS[0] = '2':
 			'She pulls down your clothes and bends you over the couch before she starts pleasuring your pussy with her tongue.'
 			gs 'arousal', 'cuni', 10, 'lesbian', 'group'
 			gs 'stat'
-	
+
 			act 'Lick her':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex6.jpg"></center>'
 				'You lay her on the couch and sink your lips into her pussy, the smell of it driving you crazy. You''re found in this state by the returning doctor.'
 				gs 'arousal', 'cuni_give', 10, 'lesbian', 'group'
 				gs 'stat'
-	
+
 				act 'Threesome':picrand = 11 & gt 'podrsex', 'suck'
 			end
 		end
@@ -1313,7 +1317,7 @@ if $ARGS[0] = 'cosmetic1':
 	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>' 
+		'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>'

+ 2 - 1
locations/city_experimental_trials.qsrc

@@ -45,6 +45,8 @@ if $ARGS[0] = 'front_desk' or $ARGS[0] = '':
 	if experimentQW['signed'] ! 0:
 		'She looks up as you walk in and warmly welcomes you inside. "Hello Miss <<$pcs_lastname>>, how can I help you today?"'
 
+		act 'Leave': gt 'city_clinic', 'start'
+
 		if $experimentQW['trial_active'] = '':
 			act 'Ask which clinical trials are available': gt 'city_experimental_trials_list', 'see_trials'
 		else
@@ -81,7 +83,6 @@ if $ARGS[0] = 'front_desk' or $ARGS[0] = '':
 			act 'Go to the experimental pharmacy': gt 'city_experimental_trials_pharmacy', 'counter'
 		end
 
-		act 'Leave': gt 'city_clinic', 'start'
 
 	else
 		'She looks up as you walk in and warmely welcomes you inside. "Hello miss, how can I help you?"'

+ 28 - 9
locations/city_experimental_trials_events.qsrc

@@ -59,6 +59,7 @@ elseif $experimentQW['trial_active'] = 'pill_red':
 	if experimentQW['random_option'] = 1:
 		if stren_lvl > 11:
 			stren_exp -= 2 * (stren_xpnxt - stren_xpprv)
+			stren_mem -= 2 * (stren_xpnxt - stren_xpprv)
 		end
 
 		'You seem to have lost a lot of mussle mass and feel weaker. This must have been that experimental pill you took.'
@@ -73,6 +74,7 @@ elseif $experimentQW['trial_active'] = 'pill_red':
 	elseif experimentQW['random_option'] = 3:
 		if agil_lvl > 11:
 			agil_exp -= 2 * (agil_xpnxt - agil_xpprv)
+			agil_mem -= 2 * (agil_xpnxt - agil_xpprv)
 		end
 
 		'Your agility has deminished and you feel slower. This must have been that experimental pill you took.'
@@ -87,6 +89,7 @@ elseif $experimentQW['trial_active'] = 'pill_red':
 	elseif experimentQW['random_option'] = 5:
 		if vital_lvl > 11:
 			vital_exp -= 2 * (vital_xpnxt - vital_xpprv)
+			vital_mem -= 2 * (vital_xpnxt - vital_xpprv)
 		end
 
 		'Your endurance has decreased! This must have been that experimental pill you took.'
@@ -134,6 +137,7 @@ elseif $experimentQW['trial_active'] = 'pill_blue':
 	if experimentQW['random_option'] = 1:
 		if intel_lvl > 11:
 			intel_exp -= 2 * (intel_xpnxt - intel_xpprv)
+			intel_mem -= 2 * (intel_xpnxt - intel_xpprv)
 		end
 
 		'Your intelligence has decreased and you feel dumber. This must have been that experimental pill you took.'
@@ -148,6 +152,7 @@ elseif $experimentQW['trial_active'] = 'pill_blue':
 	elseif experimentQW['random_option'] = 3:
 		if react_lvl > 11:
 			react_exp -= 2 * (react_xpnxt - react_xpprv)
+			react_mem -= 2 * (react_xpnxt - react_xpprv)
 		end
 
 		'Your reaction time has deminished and you feel slower. This must have been that experimental pill you took.'
@@ -162,6 +167,7 @@ elseif $experimentQW['trial_active'] = 'pill_blue':
 	elseif experimentQW['random_option'] = 5:
 		if chrsm_lvl > 11:
 			chrsm_exp -= 2 * (chrsm_xpnxt - chrsm_xpprv)
+			chrsm_mem -= 2 * (chrsm_xpnxt - chrsm_xpprv)
 		end
 
 		'You feel less charismatic. This must have been that experimental pill you took.'
@@ -176,6 +182,7 @@ elseif $experimentQW['trial_active'] = 'pill_blue':
 	elseif experimentQW['random_option'] = 7:
 		if prcptn_lvl > 11:
 			prcptn_exp -= 2 * (prcptn_xpnxt - prcptn_xpprv)
+			prcptn_mem -= 2 * (prcptn_xpnxt - prcptn_xpprv)
 		end
 
 		'You feel less perceptive. This must have been that experimental pill you took.'
@@ -283,14 +290,15 @@ elseif $experimentQW['trial_active'] = 'pill_orange':
 	end
 
 	if experimentQW['random_option'] = 1:
-		butt_tr_exp -= 10 * (butt_tr_xpnxt - butt_tr_xpprv)
+		butt_tr_exp -= 2 * (butt_tr_xpnxt - butt_tr_xpprv)
+		butt_tr_mem -= 2 * (butt_tr_xpnxt - butt_tr_xpprv)
 		if butt_tr_exp < 0: butt_tr_exp = 0
 
 		*nl
 		'You notice that your ass has shrunk! This must have been that experimental pill you took.'
 
 	else
-		butt_tr_exp += 10 * (butt_tr_xpnxt - butt_tr_xpprv)
+		butt_tr_exp += 2 * (butt_tr_xpnxt - butt_tr_xpprv)
 
 		*nl
 		'You notice that your ass has grown! This must have been that experimental pill you took.'
@@ -304,7 +312,7 @@ elseif $experimentQW['trial_active'] = 'pill_violet':
 		if rand(0,9) < 4:
 			experimentQW['random_option'] = 1
 
-		!! 60% chance of increasing your tits
+		!! 60% chance of increasing your inhib_exp
 		else
 			experimentQW['random_option'] = 2
 		end
@@ -312,15 +320,19 @@ elseif $experimentQW['trial_active'] = 'pill_violet':
 
 	if experimentQW['random_option'] = 1:
 		!! correct amount??
-		inhib_exp -= 50
+		inhib_exp -= 2 * (inhib_xpnxt - inhib_xpprv)
+		inhib_mem -= 2 * (inhib_xpnxt - inhib_xpprv)
+		inhib_lvl -= 2
+		inhib_flr -= 2
+		inhib_lvlst -= 2
 		*nl
-		'Your inhibition has lowered and you feel less outgoing and more ashamed. This must have been that experimental pill you took.'
+		'Your inhibition has increased and you feel less outgoing and more ashamed. This must have been that experimental pill you took.'
 
 	else
 		!! correct amount??
-		inhib_exp += 50
+		inhib_exp += 2 * (inhib_xpnxt - inhib_xpprv)
 		*nl
-		'Your inhibition has increased and you feel more outgoing and less ashamed. This must have been that experimental pill you took.'
+		'Your inhibition has lowered and you feel more outgoing and less ashamed. This must have been that experimental pill you took.'
 	end
 
 
@@ -440,6 +452,11 @@ elseif $experimentQW['trial_active'] = 'pill_pink':
 	end
 end
 
+if mid($experimentQW['trial_active'],1, 4) = 'pill':
+	gs 'stat_sklattrib'
+	gs 'stat_sklattrib'
+end
+
 
 	!!=========================!!
 	!!                         !!
@@ -458,7 +475,7 @@ if $experimentQW['trial_active'] = 'breast_cream':
 	else
 		if lactation['active'] <= 0:
 			!! Permanent lactation
-			func('lact_lib', 'lact_switch')
+			gs 'lact_lib', 'lact_on'
 			lactation['milkprod_type'] = 0
 			*nl
 			'Your breasts have grown and have a fullness to them. This must have been that experimental breast cream.'
@@ -466,6 +483,7 @@ if $experimentQW['trial_active'] = 'breast_cream':
 			*nl
 			'Your breasts have grown and have become fuller. This must have been that experimental breast cream.'
 		end
+		if therapistQW['breast_cream'] = 2: therapistQW['breast_cream'] = 3
 	end
 end
 
@@ -513,7 +531,7 @@ if $experimentQW['trial_active'] = 'aphrodisiac_pill':
 		pcs_horny = 100
 		orgasm += 1
 		pcs_mood = 100
-		if pcs_traits['easy_orgams'] < 2: pcs_traits['easy_orgams'] = 2
+		if pcs_traits['easy_orgasms'] < 2: pcs_traits['easy_orgasms'] = 2
 
 		*nl
 		'You feel a heat spreading from your stomach and moving towards your pussy. The heat pulses and you find yourself in the grips of an intense orgasm! You feel like it''ll be easier to orgasm from now on. This must have been that experimental aphrodisiac.'
@@ -594,6 +612,7 @@ end
 
 
 experimentQW['trial_duration'] -= 1
+experimentQW['event_day'] = daystart
 
 if experimentQW['trial_duration'] <= 0:
 	experimentQW['trial_duration'] = 0

+ 17 - 0
locations/city_experimental_trials_list.qsrc

@@ -55,6 +55,21 @@ $trial_sections[6]  = 'growth_hormones'
 Drugs
 }
 
+if therapistQW['breast_cream'] = 1 and experimentQW['times_participated_1'] = 0 and $ARGS[0] = 'see_trials':
+	$trial_names[1] = '<b>Breast Cream</b>'
+	cetl_i = 0
+	:therapist_overwrite_loop
+		$trial_names[cetl_i]     = $trial_names[1]
+		 trial_pays[cetl_i]      =  trial_pays[1]
+		$trial_sections[cetl_i]  = $trial_sections[1]
+		 trial_maxs[cetl_i]      =  trial_maxs[1]
+		cetl_i += 1
+	if cetl_i < arrsize('$trial_names'): jump 'therapist_overwrite_loop'
+end
+
+
+
+
 if $ARGS[0] = 'see_trials':
 	$menu_loc = 'city_experimental_trials_list'
 	$menu_arg = 'see_trials'
@@ -248,6 +263,8 @@ elseif $ARGS[0] = $trial_sections[1]:
 		$experimentQW['trial_active'] = $trial_sections[1]
 		 experimentQW['trial_duration'] = trial_durations[1]
 
+		if therapistQW['breast_cream'] = 1: therapistQW['breast_cream'] = 2
+
 		menu_off = 1
 		minut += 2
 		gs 'stat'

+ 7 - 33
locations/city_hotel.qsrc

@@ -15,42 +15,17 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/lobby.jpg"></center>'
 
-	if tobiQW < 2000:'The hotel lobby is deserted and you only notice an alone bored girl standing at the reception desk.'
-	if tobiQW >= 2000 and tobiQW < 2100:'The hotel lobby is very crowded. You notice there''s a swarm of comely old men dressed in scanty jackets with elbow patches.'
-
-	if tobiQW = 2001:
-		'One of the visitors of the hotel, grabs your attention as he''s sitting in a chair, reading a book. It''s written in squiggles, which reminds you to the scroll you read earlier.'
-		act 'Excuse me':
-			*clr & cla
-			minut += 5
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/industrial/casino/oldman.jpg"></center>'
-			'"I didn''t mean to disturb you, but what language is the book written in?" you ask the man.'
-			'The man stops, looks up to you and cheerfully answers, "This book right here is written in old Japanese language. Why do you ask?" the man asks curiously.'
-			'"Well, I was handed this book, in which the characters are very similarly written." you answer.'
-			'The man gasps, "By the gods! Can I take a look?"'
-			'"I don''t really know if it''s okay..." you hesitantly answer.'
-			'The man is taken aback a little by your answer, "Oh yes, it''s no wonder you''re being careful, where are my manners, I should introduce myself. My name is Plato Aristarkhovich, and you are?"'
-			'"My name is <<$pcs_firstname>> <<$pcs_lastname>>." you answer.'
-			'"I hope this doesn''t sound too creepy but would you please follow me to my room?" Plato asks you.'
-
-			act 'Go with Plato': minut += 1 & gt 'mqroom'
-		end
-	end
+	'The hotel lobby is deserted and you only notice an alone bored girl standing at the reception desk.'
 
 	act 'Leave': minut += 5 & gt 'city_center'
-
 	if hotelRoom['city'] ! 0:
 		act 'Go to your room':
 			if hotelRoom['city'] = 1: gt 'HotelRoom', 'normal'
 			if hotelRoom['city'] = 2: gt 'HotelRoom', 'better'
 			if hotelRoom['city'] = 3: gt 'HotelRoom', 'best'
 		end
-
 	end
-
 	act 'Go to the reception desk': gt 'city_hotel', 'reception'
-
 end
 
 if $ARGS[0] = 'reception':
@@ -112,7 +87,7 @@ if $ARGS[0] = 'reception':
 				act'Standard room':
 					cla
 					hotelRoomDays['city'] = input ("For how long would you like to stay?")
-					if hotelRoomDays['city'] > 0 : 
+					if hotelRoomDays['city'] > 0 :
 						totalCost = hotelRoomDays['city'] * 500
 						'"A standard room for <<hotelRoomDays[''city'']>> days, that will be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
 						gs 'city_hotel', 'pay_the_room', 1
@@ -136,11 +111,11 @@ if $ARGS[0] = 'reception':
 				act'Royal Suite':
 					cla
 					hotelRoomDays['city'] = input ("For how long would you like to stay?")
-					if hotelRoomDays['city'] > 0: 
+					if hotelRoomDays['city'] > 0:
 						totalCost = hotelRoomDays['city'] * 10000
 						'"The royal suite for <<hotelRoomDays[''city'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
 						gs 'city_hotel', 'pay_the_room', 3
-					else	
+					else
 						gt'city_hotel'
 					end
 				end
@@ -154,7 +129,7 @@ end
 
 if $ARGS[0] = 'pay_the_room':
 	hotel_room_id = ARGS[1]
-	if totalCost<=money:		
+	if totalCost<=money:
 		act 'Pay with cash':
 			cla
 			money-=totalCost
@@ -188,12 +163,11 @@ if $ARGS[0] = 'pay_the_room':
 		killvar 'hotel_room_id'
 	end
 
-	act 'You change your mind': 
-		killvar 'totalCost' 
+	act 'You change your mind':
+		killvar 'totalCost'
 		killvar 'hotel_room_id'
 		gt 'city_hotel'
 	end
 end
 
 --- city_hotel ---------------------------------
-

+ 1 - 1
locations/city_lake.qsrc

@@ -154,7 +154,7 @@ if $ARGS[0] = 'start':
                     elseif evrand <= 60 and evrand > 40 and temp >= 20 and daystage = 2 and hour >= 10 and hour <= 19 and pcs_hotcat >= 7:
 						act 'Continue': gt 'city_lake', 'volleyball_intro_day'
 					elseif evrand <= 40 and andrei > 30:
-						act 'Continue': gt 'city_lake', 'Andrei intro'
+						act 'Continue': gt 'city_lake', 'Andrei_intro'
                     elseif evrand <= 30 and evrand > 20:
 						act 'Continue': gt 'city_lake', 'vlake1'
                     elseif evrand <= 20 and evrand > 10:

+ 1 - 1
locations/city_mansion_residence_1.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'yfoyer':
 		act 'Go to your living room': gt 'city_mansion_residence_2', 'yliving'
 		act 'Go to your lounge': gt 'city_mansion_residence_2', 'ylounge'
 		act 'Go to your library': gt 'city_mansion_residence_2', 'ylibrary'
-		act 'Go to your office': & gt 'city_mansion_residence_2', 'yoffice'
+		act 'Go to your office': gt 'city_mansion_residence_2', 'yoffice'
 		act 'Go to your nursery': gt 'city_mansion_residence_2', 'ynursery'
 		act 'Go to your gym': minut += 1 & gt 'city_mansion_residence_3', 'ygym'
 	end

+ 12 - 0
locations/city_park.qsrc

@@ -193,6 +193,18 @@ if $ARGS[0] = 'start':
 		end
 	end
 
+	if exhibitionist_lvl > 2:
+		act 'Flash your pussy and tits (0:05)':
+			menu_off = 1
+			if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1'
+			*clr & cla
+			gs 'flash', 'full', 'outdoors', 5
+			gs 'stat'
+
+			act 'Continue': gt 'city_park', 'start'
+		end
+	end
+
 	gs 'blackmailer', 'set_park_act'
 end
 

+ 26 - 7
locations/clothing.qsrc

@@ -120,16 +120,22 @@ $clothing_list_line = {
 	end
 
 	if $ARGS[1] = 'misc_outfits' and ARGS[2] = 1:
-		$RESULT += '<TD>A hessian sack the hunters gave you.</TD>'
+		$RESULT += '<TD>A hessian sack the hunters gave you.'
 	elseif $swimwear_description = '':
 		gs 'clothing_descriptions'
-		$RESULT += '<TD><<FUNC(''$short_description'', $ARGS[1])>> <<ARGS[2]>><BR/><<$description>></TD>'
+		$RESULT += '<TD><<FUNC(''$short_description'', $ARGS[1])>> <<ARGS[2]>><BR/><<$description>>'
 	else
-		$RESULT += '<TD>' + $swimwear_description + '</TD>'
+		$RESULT += '<TD>' + $swimwear_description
 	end
 
+	if CloInhibit > pcs_inhib: $RESULT += '<BR>You don''t feel confident enough to wear an outfit this revealing.'
+
+	$RESULT += '</TD>'
+
 	$RESULT += '<TD>'
 	if CloBimbo = 1: $RESULT += '<img src="images/system/icons/clothing/bimbo.png"><BR>'
+	if CloGoth = 1: $RESULT += '' & !'<img src="images/system/icons/clothing/goth.png"><BR>'
+	if CloPunk = 1: $RESULT += '' & !'<img src="images/system/icons/clothing/punk.png"><BR>'
 	if CloStyle = 4: $RESULT += '<img src="images/system/icons/clothing/prostitute.png"><BR>'
 	if CloStyle2 = 3: $RESULT += '<img src="images/system/icons/clothing/stripper.png">'
 
@@ -1487,6 +1493,8 @@ if $ARGS[0] = 'view_clothing_item':
 	end
 
 	if CloBimbo = 1 and cheatVars['bimbo'] = 0: 'This item is considered bimbo clothing.'
+	if CloGoth = 1: 'This item is considered goth clothing.'
+	if CloPunk = 1: 'This item is considered punk clothing.'
 
 	if CloStyle = 4:'This outfit can be used for prostitution.'
 
@@ -1813,11 +1821,10 @@ if $ARGS[0] = 'strip_code':
 	CloStyle = 0
 	CloStyle2 = 0
 	CloBimbo = 0
+	CloGoth = 0
+	CloPunk = 0
 	CloOnePiece = 0
-	PShoQuality = 0
-	PShoCut = 0
-	PShoHeels = 0
-	PShoStyle = 0
+
 	PCloDress = 0
 	PCloPanties = 0
 	PCloBra = 0
@@ -1830,6 +1837,8 @@ if $ARGS[0] = 'strip_code':
 	PCloStyle2 = 0
 	PCloStyle3 = 0
 	PCloBimbo = 0
+	PCloGoth = 0
+	PCloPunk = 0
 	PCloInhibit = 0
 	PCloOnePiece = 0
 	PCloswimwear = 0
@@ -1839,6 +1848,14 @@ if $ARGS[0] = 'strip_code':
 	PCloCoverTop = 4
 	PCloCoverBack = 4
 	PCloCoverFront = 4
+	PShoQuality = 0
+	PShoCut = 0
+	PShoHeels = 0
+	PShoStyle = 0
+	PShoBimbo = 0
+	PShoGoth = 0
+	PShoPunk = 0
+
 
 	gs 'clothing', 'exposure_calc'
 
@@ -1910,6 +1927,8 @@ if $ARGS[0] = 'wear':
 	if cheatVars['bimbo'] = 0:
 		PCloBimbo = CloBimbo
 	end
+	PCloGoth = CloGoth
+	PCloPunk = CloPunk
 
 	PCloCoverTop = CloCoverTop
 	PCloCoverBack = CloCoverBack

+ 266 - 371
locations/clothing_QV.qsrc

@@ -24,12 +24,12 @@ if $ARGS[0] = 'list':
 		end
 	end
 
-	'<center><TH><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''all''"><img src="images/system/icons/clothing/all_outfits.png"></a></TH></center>'
+	'<center><th><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''all''"><img src="images/system/icons/clothing/all_outfits.png"></a></th></center>'
 
 	if ARRSIZE('gm_outfits') > 0 or ARRSIZE('gm_dress'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
 
 	if ARRSIZE('gm_school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_school''"><img src="images/pc/items/gm/school.png"></a></center>'
- 
+
 	if ARRSIZE('gm_office') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_office''"><img src="images/pc/items/gm/officewear.png"></a></center>'
 
 	if ARRSIZE('gm_maid') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_maid''"><img src="images/pc/items/gm/maid.png"></a></center>'
@@ -739,7 +739,7 @@ if $ARGS[0] = 'clothing_list':
 		end
 		i += 1
 		if i <= ARRSIZE('eroto_dress'):jump 'looperoto_dress'
-	
+
 		i = 1
 		:looperoto_outfits
 		if eroto_outfits[i] = 1:
@@ -1151,8 +1151,8 @@ if $ARGS[0] = 'clothing_list':
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
-	
-	
+
+
 	if $args[1] = 'all':
 		clo_i += 1
 		if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -1273,7 +1273,14 @@ if $ARGS[0] = 'change':
 		end
 	end
 
-	if CloBimbo = 1 and cheatVars['bimbo'] = 0: 'This item is considered bimbo clothing.'
+	if CloBimbo = 1 and cheatVars['bimbo'] = 0: $temp_clo_text[] = 'bimbo'
+	if CloGoth = 1: $temp_clo_text[] = 'goth'
+	if CloPunk = 1: $temp_clo_text[] = 'punk'
+
+	if arrsize('$temp_clo_text') > 0:
+		'This item is considered <<func(''shortgs'', ''enumerate_list'', ''$temp_clo_text'')>> clothing.'
+	end
+	killvar '$temp_clo_text'
 
 	if CloStyle = 4:'This outfit can be used for prostitution.'
 
@@ -1295,11 +1302,11 @@ if $ARGS[0] = 'change':
 		if CloInhibit > 10:
 			if CloInhibit + 10 > pcs_inhib: 'You find this outfit more revealing than you are completely comfortable with but that makes it quite exciting too.'
 		end
-		
+
 		!!Therapist force exhibitionist clothing check
 		if hypnoClothes > 0:
-			if CloThinness >= 6 or CloStyle2 = 4 or $ARGS[1] = 'salacious_outfits' or $ARGS[1] = 'salacious_dress' _ 
-			or (($ARGS[1] = 'eroto_outfits' or $ARGS[1] = 'eroto_dress' or $ARGS[1] = 'eroto_strip') and CloThinness >= 3) _ 
+			if CloThinness >= 6 or CloStyle2 = 4 or $ARGS[1] = 'salacious_outfits' or $ARGS[1] = 'salacious_dress' _
+			or (($ARGS[1] = 'eroto_outfits' or $ARGS[1] = 'eroto_dress' or $ARGS[1] = 'eroto_strip') and CloThinness >= 3) _
 			or ($ARGS[1] = 'danilovich_outfits' and CloThinness >= 5):
 				act 'Wear this outfit':
 					gs 'clothing', 'wear', $ARGS[1], ARGS[2]
@@ -1313,7 +1320,7 @@ if $ARGS[0] = 'change':
 			else
 				act 'Wear this outfit':
 					cla
-					*clr		
+					*clr
 					'You pick up the outfit and think about trying them on... but you don''t really like wearing these type of outfits'
 					gs 'willpower', 'misc', 'resist', 'easy'
 					will_cost += hypnoTime
@@ -1339,7 +1346,7 @@ if $ARGS[0] = 'change':
 							gt 'clothing_QV', 'gym'
 						end
 					end
-				end	
+				end
 			end
 		else
 			act 'Wear this outfit':
@@ -1354,229 +1361,325 @@ if $ARGS[0] = 'change':
 	end
 end
 
+
+
 if $ARGS[0] = 'filter_header':
+	$temp_loc1 = $ward_list_file
+	$temp_loc2 = 'clothing_list'
+	$temp_loc3 = $ward_list_store
+
+	gs 'clothing_QV', 'filter_header_base', $ARGS[1]
+	killvar '$temp_loc1'
+	killvar '$temp_loc2'
+	killvar '$temp_loc3'
+end
 
-!!Exclude filters
-	$Headerstring = '<TD>'
+
+if $ARGS[0] = 'shop_filter_header':
+	$temp_loc1 = $loc
+	$temp_loc2 = $loc_arg
+	$temp_loc3 = ''
+
+	gs 'clothing_QV', 'filter_header_base', 'store'
+	killvar '$temp_loc1'
+	killvar '$temp_loc2'
+	killvar '$temp_loc3'
+end
+
+
+
+if $ARGS[0] = 'filter_header_base':
+!!sort by filters
+	temp_count[0] = 1
+	$Headerstring[0] = '<td>'
+	if clothingfilter['number'] = 0:
+		clothingfilter['quality'] = 1 & clothingfilter['inhibition'] = 1
+		$Headerstring[0] += '<img src="images/system/icons/clothing/number.png"></td>'
+	else
+		$Headerstring[0] += '<a href="exec:clothingfilter[''number''] = 0 & clothingfilter[''quality''] = 1 & clothingfilter[''inhibition''] = 1 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/number_off.png"></a></td>'
+	end
+
+	temp_count[0] += 1
+	$Headerstring[0] += '<td>'
+	if clothingfilter['quality'] = 0:
+		$Headerstring[0] += '<img src="images/system/icons/clothing/quality.png"></td>'
+	else
+		$Headerstring[0] += '<a href="exec:clothingfilter[''number''] = 1 & clothingfilter[''quality''] = 0 & clothingfilter[''inhibition''] = 1 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/quality_off.png"></a></td>'
+	end
+
+	temp_count[0] += 1
+	$Headerstring[0] += '<td>'
+	if clothingfilter['inhibition'] = 0:
+		$Headerstring[0] += '<img src="images/system/icons/clothing/inhibition.png"></td>'
+	else
+		$Headerstring[0] += '<a href="exec:clothingfilter[''number''] = 1 & clothingfilter[''quality''] = 1 & clothingfilter[''inhibition''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/inhibition_off.png"></a></td>'
+	end
+
+
+!! exclude filters
+	temp_count[1] = 1
+	$Headerstring[1] = '<td>'
 	if clothingfilter['prost'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''prost''] = 1 & clothingfilter[''prost_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/prostitute.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''prost''] = 1 & clothingfilter[''prost_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/prostitute.png"></a></td>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter[''prost''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/prostitute_off.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''prost''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/prostitute_off.png"></a></td>'
 	end
 
-	$Headerstring += '<TD>'
+	temp_count[1] += 1
+	$Headerstring[1] += '<td>'
 	if clothingfilter['stripper'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''stripper''] = 1 & clothingfilter[''stripper_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''stripper''] = 1 & clothingfilter[''stripper_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/stripper.png"></a></td>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter[''stripper''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''stripper''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/stripper_off.png"></a></td>'
 	end
 
-	$Headerstring += '<TD>'
+	temp_count[1] += 1
+	$Headerstring[1] += '<td>'
 	if clothingfilter['bimbo'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''bimbo''] = 1 & clothingfilter[''bimbo_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''bimbo''] = 1 & clothingfilter[''bimbo_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/bimbo.png"></a></td>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter[''bimbo''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''bimbo''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/bimbo_off.png"></a></td>'
 	end
 
-	$Headerstring += '<TD>'
+	temp_count[1] += 1
+	$Headerstring[1] += '<td>'
 	if clothingfilter['conservative'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''conservative''] = 1 & clothingfilter[''conservative_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/conservative.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''conservative''] = 1 & clothingfilter[''conservative_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/conservative.png"></a></td>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter[''conservative''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/conservative_off.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''conservative''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/conservative_off.png"></a></td>'
 	end
 
-	$Headerstring += '<TD>'
+	temp_count[1] += 1
+	$Headerstring[1] += '<td>'
 	if clothingfilter['risque'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''risque''] = 1 & clothingfilter[''risque_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/risque.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''risque''] = 1 & clothingfilter[''risque_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/risque.png"></a></td>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter[''risque''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/risque_off.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''risque''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/risque_off.png"></a></td>'
+	end
+
+	!! only 'shop_filter_header'
+	if $ARGS[1] = 'store':
+		temp_count[1] += 1
+		$Headerstring[1] += '<td>'
+		if clothingfilter['too_risque'] = 0:
+			$Headerstring[1] += '<a href="exec:clothingfilter[''too_risque''] = 1 & clothingfilter[''too_risque_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/too risque.png"></a></td>'
+		else
+			$Headerstring[1] += '<a href="exec:clothingfilter[''too_risque''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/too risque_off.png"></a></td>'
+		end
 	end
 
-	$Headerstring += '<TD>'
+	temp_count[1] += 1
+	$Headerstring[1] += '<td>'
 	if clothingfilter['loose'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''loose''] = 1 & clothingfilter[''loose_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/loose.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''loose''] = 1 & clothingfilter[''loose_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/loose.png"></a></td>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter[''loose''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/loose_off.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''loose''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/loose_off.png"></a></td>'
 	end
 
+	!! only 'filter_header'
 	if $ARGS[1] ! 'store':
-		$Headerstring += '<TD>'
+		temp_count[1] += 1
+		$Headerstring[1] += '<td>'
 		if clothingfilter['sport'] = 0:
-			$Headerstring += '<a href="exec:clothingfilter[''sport''] = 1 & clothingfilter[''sport_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/sport.png"></a></TD>'
+			$Headerstring[1] += '<a href="exec:clothingfilter[''sport''] = 1 & clothingfilter[''sport_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/sport.png"></a></td>'
 		else
-			$Headerstring += '<a href="exec:clothingfilter[''sport''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
+			$Headerstring[1] += '<a href="exec:clothingfilter[''sport''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/sport_off.png"></a></td>'
 		end
 	end
 
-	$Headerstring += '<TD>'
+	temp_count[1] += 1
+	$Headerstring[1] += '<td>'
 	if clothingfilter['school'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''school''] = 1 & clothingfilter[''school_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/school.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''school''] = 1 & clothingfilter[''school_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/school.png"></a></td>'
 	else
-		$Headerstring += '<a href="exec:clothingfilter[''school''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/school_off.png"></a></TD>'
+		$Headerstring[1] += '<a href="exec:clothingfilter[''school''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/school_off.png"></a></td>'
 	end
 
+	!! Only 'filter_header'
 	if $ARGS[1] ! 'store':
-		$Headerstring += '<TD>'
+		temp_count[1] += 1
+		$Headerstring[1] += '<td>'
 		if clothingfilter['maid'] = 0:
-			$Headerstring += '<a href="exec:clothingfilter[''maid''] = 1 & clothingfilter[''maid_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/maid.png"></a></TD>'
+			$Headerstring[1] += '<a href="exec:clothingfilter[''maid''] = 1 & clothingfilter[''maid_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/maid.png"></a></td>'
 		else
-			$Headerstring += '<a href="exec:clothingfilter[''maid''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/maid_off.png"></a></TD>'
+			$Headerstring[1] += '<a href="exec:clothingfilter[''maid''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/maid_off.png"></a></td>'
 		end
 
-		$Headerstring += '<TD>'
+		temp_count[1] += 1
+		$Headerstring[1] += '<td>'
 		if clothingfilter['server'] = 0:
-			$Headerstring += '<a href="exec:clothingfilter[''server''] = 1 & clothingfilter[''server_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/server.png"></a></TD>'
+			$Headerstring[1] += '<a href="exec:clothingfilter[''server''] = 1 & clothingfilter[''server_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/server.png"></a></td>'
 		else
-			$Headerstring += '<a href="exec:clothingfilter[''server''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/server_off.png"></a></TD>'
+			$Headerstring[1] += '<a href="exec:clothingfilter[''server''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/server_off.png"></a></td>'
 		end
 
 		if $ward_list_file = 'clothing':
-			$Headerstring += '<TD>'
+			temp_count[1] += 1
+			$Headerstring[1] += '<td>'
 			if clothingfilter['swim'] = 0:
-				$Headerstring += '<a href="exec:clothingfilter[''swim''] = 1 & clothingfilter[''swim_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/swim.png"></a></TD>'
+				$Headerstring[1] += '<a href="exec:clothingfilter[''swim''] = 1 & clothingfilter[''swim_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/swim.png"></a></td>'
 			else
-				$Headerstring += '<a href="exec:clothingfilter[''swim''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/swim_off.png"></a></TD>'
+				$Headerstring[1] += '<a href="exec:clothingfilter[''swim''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/swim_off.png"></a></td>'
 			end
 		end
 	end
 
-!!sort by filters
-	$Headerstring += '<TD>'
-	if clothingfilter['number'] = 0:
-		clothingfilter['quality'] = 1 & clothingfilter['inhibition'] = 1
-		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''number''] = 0 & clothingfilter[''quality''] = 1 & clothingfilter[''inhibition''] = 1 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/number_off.png"></a></TD>'
-	end
-	
-	$Headerstring += '<TD>'
-	if clothingfilter['quality'] = 0:
-		$Headerstring += '<img src="images/system/icons/clothing/quality.png"></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & clothingfilter[''number''] = 1 & clothingfilter[''inhibition''] = 1 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
-	end
-	
-	$Headerstring += '<TD>'
-	if clothingfilter['inhibition'] = 0:
-		$Headerstring += '<img src="images/system/icons/clothing/inhibition.png"></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''inhibition''] = 0 & clothingfilter[''quality''] = 1 & clothingfilter[''number''] = 1 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/inhibition_off.png"></a></TD>'
-	end
-	
 !! Show only filers
-	$Headerstring[1] = '<TD>'
+	temp_count[2] = 1
+	$Headerstring[2] = '<td>'
 	if clothingfilter['prost_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''prost_only''] = 1 & clothingfilter[''prost''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/prostitute_off.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''prost_only''] = 1 & clothingfilter[''prost''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/prostitute_off.png"></a></td>'
 	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''prost_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/prostitute.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''prost_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/prostitute.png"></a></td>'
 	end
 
-	$Headerstring[1] += '<TD>'
+	temp_count[2] += 1
+	$Headerstring[2] += '<td>'
 	if clothingfilter['stripper_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''stripper_only''] = 1 & clothingfilter[''stripper''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''stripper_only''] = 1 & clothingfilter[''stripper''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/stripper_off.png"></a></td>'
 	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''stripper_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''stripper_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/stripper.png"></a></td>'
 	end
 
-	$Headerstring[1] += '<TD>'
+	temp_count[2] += 1
+	$Headerstring[2] += '<td>'
 	if clothingfilter['bimbo_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''bimbo_only''] = 1 & clothingfilter[''bimbo''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''bimbo_only''] = 1 & clothingfilter[''bimbo''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/bimbo_off.png"></a></td>'
 	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''bimbo_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''bimbo_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/bimbo.png"></a></td>'
 	end
 
-	$Headerstring[1] += '<TD>'
+	temp_count[2] += 1
+	$Headerstring[2] += '<td>'
 	if clothingfilter['conservative_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''conservative_only''] = 1 & clothingfilter[''conservative''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/conservative_off.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''conservative_only''] = 1 & clothingfilter[''conservative''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/conservative_off.png"></a></td>'
 	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''conservative_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/conservative.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''conservative_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/conservative.png"></a></td>'
 	end
 
-	$Headerstring[1] += '<TD>'
+	temp_count[2] += 1
+	$Headerstring[2] += '<td>'
 	if clothingfilter['risque_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''risque_only''] = 1 & clothingfilter[''risque''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/risque_off.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''risque_only''] = 1 & clothingfilter[''risque''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/risque_off.png"></a></td>'
 	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''risque_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/risque.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''risque_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/risque.png"></a></td>'
 	end
 
-	$Headerstring[1] += '<TD>'
+	!! ONLY 'shop_filter_header'
+	if $ARGS[1] = 'store':
+		temp_count[2] += 1
+		$Headerstring[2] += '<td>'
+		if clothingfilter['too_risque_only'] = 0:
+			$Headerstring[2] += '<a href="exec:clothingfilter[''too_risque_only''] = 1 & clothingfilter[''too_risque''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/too risque_off.png"></a></td>'
+		else
+			$Headerstring[2] += '<a href="exec:clothingfilter[''too_risque_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/too risque.png"></a></td>'
+		end
+	end
+
+	temp_count[2] += 1
+	$Headerstring[2] += '<td>'
 	if clothingfilter['loose_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''loose_only''] = 1 & clothingfilter[''loose''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/loose_off.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''loose_only''] = 1 & clothingfilter[''loose''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/loose_off.png"></a></td>'
 	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''loose_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/loose.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''loose_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/loose.png"></a></td>'
 	end
 
+	!! ONLY 'filter_header'
 	if $ARGS[1] ! 'store':
-		$Headerstring[1] += '<TD>'
+		temp_count[2] += 1
+		$Headerstring[2] += '<td>'
 		if clothingfilter['sport_only'] = 0:
-			$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 1 & clothingfilter[''sport''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/sport_off.png"></a></TD>'
+			$Headerstring[2] += '<a href="exec:clothingfilter[''sport_only''] = 1 & clothingfilter[''sport''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/sport_off.png"></a></td>'
 		else
-			$Headerstring[1] += '<a href="exec:clothingfilter[''sport_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/sport.png"></a></TD>'
+			$Headerstring[2] += '<a href="exec:clothingfilter[''sport_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/sport.png"></a></td>'
 		end
 	end
 
-	$Headerstring[1] += '<TD>'
+	temp_count[2] += 1
+	$Headerstring[2] += '<td>'
 	if clothingfilter['school_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''school_only''] = 1 & clothingfilter[''school''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/school_off.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''school_only''] = 1 & clothingfilter[''school''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/school_off.png"></a></td>'
 	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''school_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/school.png"></a></TD>'
+		$Headerstring[2] += '<a href="exec:clothingfilter[''school_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/school.png"></a></td>'
 	end
 
+	!! ONLY 'filter_header'
 	if $ARGS[1] ! 'store':
-		$Headerstring[1] += '<TD>'
+		temp_count[2] += 1
+		$Headerstring[2] += '<td>'
 		if clothingfilter['maid_only'] = 0:
-			$Headerstring[1] += '<a href="exec:clothingfilter[''maid_only''] = 1 & clothingfilter[''maid''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/maid_off.png"></a></TD>'
+			$Headerstring[2] += '<a href="exec:clothingfilter[''maid_only''] = 1 & clothingfilter[''maid''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/maid_off.png"></a></td>'
 		else
-			$Headerstring[1] += '<a href="exec:clothingfilter[''maid_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/maid.png"></a></TD>'
+			$Headerstring[2] += '<a href="exec:clothingfilter[''maid_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/maid.png"></a></td>'
 		end
 
-		$Headerstring[1] += '<TD>'
+		temp_count[2] += 1
+		$Headerstring[2] += '<td>'
 		if clothingfilter['server_only'] = 0:
-			$Headerstring[1] += '<a href="exec:clothingfilter[''server_only''] = 1 & clothingfilter[''server''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/server_off.png"></a></TD>'
+			$Headerstring[2] += '<a href="exec:clothingfilter[''server_only''] = 1 & clothingfilter[''server''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/server_off.png"></a></td>'
 		else
-			$Headerstring[1] += '<a href="exec:clothingfilter[''server_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/server.png"></a></TD>'
+			$Headerstring[2] += '<a href="exec:clothingfilter[''server_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/server.png"></a></td>'
 		end
 
 		if $ward_list_file = 'clothing':
-			$Headerstring[1] += '<TD>'
+			temp_count[2] += 1
+			$Headerstring[2] += '<td>'
 			if clothingfilter['swim_only'] = 0:
-				$Headerstring[1] += '<a href="exec:clothingfilter[''swim_only''] = 1 & clothingfilter[''swim''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/swim_off.png"></a></TD>'
+				$Headerstring[2] += '<a href="exec:clothingfilter[''swim_only''] = 1 & clothingfilter[''swim''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/swim_off.png"></a></td>'
 			else
-				$Headerstring[1] += '<a href="exec:clothingfilter[''swim_only''] = 0 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/swim.png"></a></TD>'
+				$Headerstring[2] += '<a href="exec:clothingfilter[''swim_only''] = 0 & gt ''<<$temp_loc1>>'', ''<<$temp_loc2>>'', ''<<$temp_loc3>>''"><img src="images/system/icons/clothing/swim.png"></a></td>'
 			end
 		end
 	end
 
-	$Headerstring[2] = '<TH></TH><TH></TH><TH></TH>'
-	if $ARGS[1] ! 'store':
-		$Headerstring[2] += '<TH></TH>'
-	end
-	if $ward_list_file = 'clothing':
-		$Headerstring[2] += '<TH></TH>'
-	end
-	$Headerstring[2] += '<TH>Include</TH>'
-	if $ARGS[1] ! 'store':
-		$Headerstring[2] += '<TH></TH><TH></TH>'
-	end
-	$Headerstring[2] += '<TH></TH><TH></TH><TH></TH><TH></TH><TH>Sort by</TH><TH></TH>'
-
-	$Headerstring[3] = '<TH></TH><TH></TH><TH></TH>'
-	if $ARGS[1] ! 'store':
-		$Headerstring[3] += '<TH></TH>'
-	end
-	if $ward_list_file = 'clothing':
-		$Headerstring[3] += '<TH></TH>'
-	end
-	$Headerstring[3] += '<TH>Only show</TH>'
+	$Headerstring[3] = ''
+	$Headerstring[5] = ''
+	temp_cloth_i = 0
+	:headerstring_loop1
+		$Headerstring[3] += '<td></td>'
+		$Headerstring[5] += '<td></td>'
+		temp_cloth_i += 1
+	if temp_cloth_i < temp_count[1] / 2: jump 'headerstring_loop1'
+	$Headerstring[3] += '<th>Sort by</th>'
+	$Headerstring[5] += '<th>Include</th>'
+
+	$Headerstring[4] = ''
+	temp_cloth_i = 0
+	:headerstring_loop2
+		$Headerstring[4] += '<td></td>'
+		temp_cloth_i += 1
+	if temp_cloth_i < temp_count[1] / 2 - temp_count[0] / 2: jump 'headerstring_loop2'
+
+
+	$Headerstring[6] = ''
+	temp_cloth_i = 0
+	:headerstring_loop3
+		$Headerstring[6] += '<td></td>'
+		temp_cloth_i += 1
+	if temp_cloth_i < temp_count[2] / 2: jump 'headerstring_loop3'
+	$Headerstring[6] += '<th>Only show</th>'
+
+	$temp_table = '<center><table>'
+	$temp_table += '<tr>' + $Headerstring[3] + '</tr>'
+	$temp_table += '<tr>' + $Headerstring[4] + $Headerstring[0] + '</tr>'
+	$temp_table += '<tr>' + $Headerstring[5] + '</tr>'
+	$temp_table += '<tr>' + $Headerstring[1] + '</tr>'
+	$temp_table += '<tr>' + $Headerstring[6] + '</tr>'
+	$temp_table += '<tr>' + $Headerstring[2] + '</tr>'
+	$temp_table += '</table></center>'
+
+	'<<$temp_table>>'
+	killvar 'temp_table'
+	killvar 'headerstring'
+	killvar 'temp_cloth_i'
+	killvar 'temp_count'
+end
 
-	'<center><table><<$Headerstring[2]>>'
-	'<TR><border=1><<$Headerstring>>'
 
-	'<TR><border=0><<$Headerstring[3]>>'
-	'<TR><border=1><<$Headerstring[1]>></table></center>'
-end
+if $ARGS[0] = 'shop_filter':	gs 'clothing_QV', 'filters_base', 'shop'
+if $ARGS[0] = 'clo_filter':		gs 'clothing_QV', 'filters_base', 'home'
 
-if $ARGS[0] = 'clo_filter':
+if $ARGS[0] = 'filters_base':
 !!Exclude filters
 	clothingfilter['inc'] = 1
 	!!filters, if inc set to 0 they will not display
@@ -1601,264 +1704,56 @@ if $ARGS[0] = 'clo_filter':
 	if clothingfilter['school'] = 1 and CloStyle2 = 4:
 		clothingfilter['inc'] = 0
 	end
-	if clothingfilter['maid'] = 1 and CloStyle2 = 1:
-		clothingfilter['inc'] = 0
-	end
-	if clothingfilter['server'] = 1 and CloStyle2 = 2:
-		clothingfilter['inc'] = 0
+	if $ARGS[1] = 'shop':
+		if clothingfilter['too_risque'] = 1 and CloInhibit > pcs_inhib:
+			clothingfilter['inc'] = 0
+		end
+	else
+		if clothingfilter['maid'] = 1 and CloStyle2 = 1:
+			clothingfilter['inc'] = 0
+		end
+		if clothingfilter['server'] = 1 and CloStyle2 = 2:
+			clothingfilter['inc'] = 0
+		end
 	end
 
 !!only filters
-	clothingfilter['only'] = 0
+	clothingfilter['only'] = 1
 	!!filters, if only set to 1 they will only display those set
-	if clothingfilter['prost_only'] = 1 and CloStyle = 4:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['stripper_only'] = 1 and CloStyle2 = 3:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['bimbo_only'] = 1 and CloBimbo = 1:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['conservative_only'] = 1 and CloInhibit <= pcs_inhib - 10:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['risque_only'] = 1 and (CloInhibit > pcs_inhib - 10) and (CloInhibit <= pcs_inhib):
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['loose_only'] = 1 and CloStyle = 5:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['school_only'] = 1 and CloStyle2 = 4:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['maid_only'] = 1 and CloStyle2 = 1:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['server_only'] = 1 and CloStyle2 = 2:
-		clothingfilter['only'] += 1
-	end
-	!!Check total count to make sure it fits all groups selected
-	if clothingfilter['only'] = clothingfilter['prost_only'] + clothingfilter['stripper_only'] + clothingfilter['bimbo_only'] + clothingfilter['conservative_only'] + clothingfilter['risque_only'] + clothingfilter['loose_only'] + clothingfilter['school_only'] + clothingfilter['maid_only'] + clothingfilter['server_only']:
-		clothingfilter['only'] = 1
-	else
+	if clothingfilter['prost_only'] = 1 and CloStyle ! 4:
 		clothingfilter['only'] = 0
 	end
-end
-
-if $ARGS[0] = 'shop_filter_header':
-!! exclude filters
-	$Headerstring = '<TD>'
-	if clothingfilter['prost'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''prost''] = 1 & clothingfilter[''prost_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/prostitute.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''prost''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/prostitute_off.png"></a></TD>'
-	end
-
-	$Headerstring += '<TD>'
-	if clothingfilter['stripper'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''stripper''] = 1 & clothingfilter[''stripper_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''stripper''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
-	end
-
-	$Headerstring += '<TD>'
-	if clothingfilter['bimbo'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''bimbo''] = 1 & clothingfilter[''bimbo_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''bimbo''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
-	end
-
-	$Headerstring += '<TD>'
-	if clothingfilter['conservative'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''conservative''] = 1 & clothingfilter[''conservative_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/conservative.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''conservative''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/conservative_off.png"></a></TD>'
-	end
-
-	$Headerstring += '<TD>'
-	if clothingfilter['risque'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''risque''] = 1 & clothingfilter[''risque_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/risque.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''risque''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/risque_off.png"></a></TD>'
-	end
-
-	$Headerstring += '<TD>'
-	if clothingfilter['too_risque'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''too_risque''] = 1 & clothingfilter[''too_risque_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/too risque.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''too_risque''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/too risque_off.png"></a></TD>'
-	end
-
-	$Headerstring += '<TD>'
-	if clothingfilter['loose'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''loose''] = 1 & clothingfilter[''loose_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/loose.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''loose''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/loose_off.png"></a></TD>'
-	end
-
-	$Headerstring += '<TD>'
-	if clothingfilter['school'] = 0:
-		$Headerstring += '<a href="exec:clothingfilter[''school''] = 1 & clothingfilter[''school_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/school.png"></a></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''school''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/school_off.png"></a></TD>'
-	end
-
-!! sort by filters
-	$Headerstring += '<TD>'
-	if clothingfilter['number'] = 0:
-		clothingfilter['quality'] = 1 & clothingfilter['inhibition'] = 1
-		$Headerstring += '<img src="images/system/icons/clothing/number.png"></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''number''] = 0 & clothingfilter[''quality''] = 1 & clothingfilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/number_off.png"></a></TD>'
-	end
-	
-	$Headerstring += '<TD>'
-	if clothingfilter['quality'] = 0:
-		$Headerstring += '<img src="images/system/icons/clothing/quality.png"></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & clothingfilter[''number''] = 1 & clothingfilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
-	end
-	
-	$Headerstring += '<TD>'
-	if clothingfilter['inhibition'] = 0:
-		$Headerstring += '<img src="images/system/icons/clothing/inhibition.png"></TD>'
-	else
-		$Headerstring += '<a href="exec:clothingfilter[''inhibition''] = 0 & clothingfilter[''quality''] = 1 & clothingfilter[''number''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/inhibition_off.png"></a></TD>'
-	end
-
-!! Show only filers
-	$Headerstring[1] = '<TD>'
-	if clothingfilter['prost_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''prost_only''] = 1 & clothingfilter[''prost''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/prostitute_off.png"></a></TD>'
-	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''prost_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/prostitute.png"></a></TD>'
-	end
-
-	$Headerstring[1] += '<TD>'
-	if clothingfilter['stripper_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''stripper_only''] = 1 & clothingfilter[''stripper''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper_off.png"></a></TD>'
-	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''stripper_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/stripper.png"></a></TD>'
+	if clothingfilter['stripper_only'] = 1 and CloStyle2 ! 3:
+		clothingfilter['only'] = 0
 	end
-
-	$Headerstring[1] += '<TD>'
-	if clothingfilter['bimbo_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''bimbo_only''] = 1 & clothingfilter[''bimbo''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo_off.png"></a></TD>'
-	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''bimbo_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/bimbo.png"></a></TD>'
+	if clothingfilter['bimbo_only'] = 1 and CloBimbo ! 1:
+		clothingfilter['only'] = 0
 	end
-
-	$Headerstring[1] += '<TD>'
-	if clothingfilter['conservative_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''conservative_only''] = 1 & clothingfilter[''conservative''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/conservative_off.png"></a></TD>'
-	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''conservative_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/conservative.png"></a></TD>'
+	if clothingfilter['conservative_only'] = 1 and CloInhibit > pcs_inhib - 10:
+		clothingfilter['only'] = 0
 	end
-
-	$Headerstring[1] += '<TD>'
-	if clothingfilter['risque_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''risque_only''] = 1 & clothingfilter[''risque''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/risque_off.png"></a></TD>'
-	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''risque_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/risque.png"></a></TD>'
+	if clothingfilter['risque_only'] = 1 and ((CloInhibit <= pcs_inhib - 10) or (CloInhibit > pcs_inhib)):
+		clothingfilter['only'] = 0
 	end
-
-	$Headerstring[1] += '<TD>'
-	if clothingfilter['too_risque_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''too_risque_only''] = 1 & clothingfilter[''too_risque''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/too risque_off.png"></a></TD>'
-	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''too_risque_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/too risque.png"></a></TD>'
+	if clothingfilter['loose_only'] = 1 and CloStyle ! 5:
+		clothingfilter['only'] = 0
 	end
-
-	$Headerstring[1] += '<TD>'
-	if clothingfilter['loose_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''loose_only''] = 1 & clothingfilter[''loose''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/loose_off.png"></a></TD>'
-	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''loose_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/loose.png"></a></TD>'
+	if clothingfilter['school_only'] = 1 and CloStyle2 ! 4:
+		clothingfilter['only'] = 0
 	end
-
-	$Headerstring[1] += '<TD>'
-	if clothingfilter['school_only'] = 0:
-		$Headerstring[1] += '<a href="exec:clothingfilter[''school_only''] = 1 & clothingfilter[''school''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/school_off.png"></a></TD>'
+	if $ARGS[1] = 'shop':
+		if clothingfilter['too_risque_only'] = 1 and CloInhibit <= pcs_inhib:
+			clothingfilter['only'] = 0
+		end
 	else
-		$Headerstring[1] += '<a href="exec:clothingfilter[''school_only''] = 0 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/school.png"></a></TD>'
+		if clothingfilter['maid_only'] = 1 and CloStyle2 ! 1:
+			clothingfilter['only'] = 0
+		end
+		if clothingfilter['server_only'] = 1 and CloStyle2 ! 2:
+			clothingfilter['only'] = 0
+		end
 	end
-
-
-	$Headerstring[2] = '<TH></TH><TH></TH><TH></TH><TH>Include</TH><TH></TH><TH></TH><TH></TH><TH></TH><TH></TH><TH>Sort by</TH><TH></TH>'
-
-	$Headerstring[3] = '<TH></TH><TH></TH><TH></TH><TH>Only show</TH>'
-
-	'<center><table><<$Headerstring[2]>>'
-	'<TR><border=1><<$Headerstring>>'
-
-	'<TR><border=0><<$Headerstring[3]>>'
-	'<TR><border=1><<$Headerstring[1]>></table></center>'
 end
 
-if $ARGS[0] = 'shop_filter':
-!!Exclude filters
-	clothingfilter['inc'] = 1
-	!!filters, if inc set to 0 they will not display
-	if clothingfilter['prost'] = 1 and CloStyle = 4:
-		clothingfilter['inc'] = 0
-	end
-	if clothingfilter['stripper'] = 1 and CloStyle2 = 3:
-		clothingfilter['inc'] = 0
-	end
-	if clothingfilter['bimbo'] = 1 and CloBimbo = 1:
-		clothingfilter['inc'] = 0
-	end
-	if clothingfilter['conservative'] = 1 and CloInhibit <= pcs_inhib - 10:
-		clothingfilter['inc'] = 0
-	end
-	if clothingfilter['risque'] = 1 and (CloInhibit > pcs_inhib - 10) and (CloInhibit <= pcs_inhib):
-		clothingfilter['inc'] = 0
-	end
-	if clothingfilter['too_risque'] = 1 and CloInhibit > pcs_inhib:
-		clothingfilter['inc'] = 0
-	end
-	if clothingfilter['loose'] = 1 and CloStyle = 5:
-		clothingfilter['inc'] = 0
-	end
-	if clothingfilter['school'] = 1 and CloStyle2 = 4:
-		clothingfilter['inc'] = 0
-	end
-
-!!only filters
-	clothingfilter['only'] = 0
-	!!filters, if only set to 1 they will only display those set
-	if clothingfilter['prost_only'] = 1 and CloStyle = 4:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['stripper_only'] = 1 and CloStyle2 = 3:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['bimbo_only'] = 1 and CloBimbo = 1:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['conservative_only'] = 1 and CloInhibit <= pcs_inhib - 10:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['risque_only'] = 1 and (CloInhibit > pcs_inhib - 10) and (CloInhibit <= pcs_inhib):
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['too_risque_only'] = 1 and CloInhibit > pcs_inhib:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['loose_only'] = 1 and CloStyle = 5:
-		clothingfilter['only'] += 1
-	end
-	if clothingfilter['school_only'] = 1 and CloStyle2 = 4:
-		clothingfilter['only'] += 1
-	end
-	!!Check total count to make sure it fits all groups selected
-	if clothingfilter['only'] = clothingfilter['prost_only'] + clothingfilter['stripper_only'] + clothingfilter['bimbo_only'] + clothingfilter['conservative_only'] + clothingfilter['risque_only'] + clothingfilter['too_risque_only'] + clothingfilter['loose_only'] + clothingfilter['school_only']:
-		clothingfilter['only'] = 1
-	else
-		clothingfilter['only'] = 0
-	end
-end
 
 --- clothing_QV ---------------------------------
-

+ 68 - 62
locations/clothing_attributes.qsrc

@@ -19,17 +19,17 @@
 !!				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). 
+!!		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), 
+!!		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
 !!		Ex:		2 Your chest is not covered at all by the outfit, if you wear a bra that will be your top
@@ -37,11 +37,11 @@
 !!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) 
+!!		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)
@@ -53,42 +53,46 @@
 !!				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
+!! 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. 
+!!		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
 !!
 !! CloCoverFront:1-4 scale not required to be set must expose the vagina at least partially
-!!		Ex: 	4 Pussy not covered at all 
+!!		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 
+!!		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 
+!!		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			
+!!0:	dress:1					pants:1		top:2			thickness:2
 !!5:	dress:2					pants:3		top:2			thickness:3
 !!10:	dress:3					pants:4		top:2			thickness:4
 !!15:	dress:3					pants:4		top:3			thickness:4
 !!20:	dress:4 				pants:4		top:3			thickness:4
-!!25:	dress:4 and CloPanties	pants:5		top:4			thickness:5
+!!25:	dress:4 and Panties:1	pants:5		top:4			thickness:5
 !!30:	dress:5					pants:6		top: - CloBra	thickness:5									CloCoverTop:2
-!!35:	dress:6					pants:6		top: - CloBra	thickness:6			CloCoverFront:1			CloCoverTop:2
+!!35:	dress:6	and Panties:2	pants:6		top: - CloBra	thickness:6			CloCoverFront:1			CloCoverTop:2
 !!40:																			CloCoverFront:2			CloCoverTop:3
 !!45:																			CloCoverFront:3			CloCoverTop:4
 !!50:																			CloCoverFront:4
@@ -110,93 +114,95 @@ CloOnePiece = 0
 CloStyle = 0
 CloStyle2 = 0
 CloBimbo = 0
+CloGoth = 0
+CloPunk = 0
 CloInhibit = 0
 CloCoverFront = 0
 CloCoverBack = 0
 CloCoverTop = 0
 
 if $ARGS[0] = 'gm_outfits':
-	*P FUNC('$attributes_gm_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_gm_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'gm_dress':
-	*P FUNC('$attributes_gm_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_gm_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'misc_outfits':
-	*P FUNC('$attributes_misc_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_misc_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'cats_dress':
-	*P FUNC('$attributes_cats_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_cats_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'cats_outfits':
-	*P FUNC('$attributes_cats_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_cats_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'flamingos_outfits':
-	*P FUNC('$attributes_flamingos_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_flamingos_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'flamingos_dress':
-	*P FUNC('$attributes_flamingos_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_flamingos_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'coco_outfits':
-	*P FUNC('$attributes_coco_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_coco_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'coco_dress':
-	*P FUNC('$attributes_coco_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_coco_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'fashionista_dress':
-	*P FUNC('$attributes_fashionista_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_fashionista_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'fashionista_outfits':
-	*P FUNC('$attributes_fashionista_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_fashionista_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'moncheri_dress':
-	*P FUNC('$attributes_moncheri_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_moncheri_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'moncheri_gown':
-	*P FUNC('$attributes_moncheri_gown', $ARGS[0], ARGS[1])
+	gs '$attributes_moncheri_gown', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'gm_office':
-	*P FUNC('$attributes_office', $ARGS[0], ARGS[1])
+	gs '$attributes_office', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'gm_school':
-	*P FUNC('$attributes_school', $ARGS[0], ARGS[1])
+	gs '$attributes_school', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'danilovich_outfits':
-	*P FUNC('$attributes_danilovich_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_danilovich_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'eroto_dress':
-	*P FUNC('$attributes_eroto_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_eroto_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'eroto_outfits':
-	*P FUNC('$attributes_eroto_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_eroto_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'eroto_strip':
-	*P FUNC('$attributes_eroto_strip', $ARGS[0], ARGS[1])
+	gs '$attributes_eroto_strip', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'salacious_dress':
-	*P FUNC('$attributes_salacious_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_salacious_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'salacious_outfits':
-	*P FUNC('$attributes_salacious_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_salacious_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'gm_maid':
-	*P FUNC('$attributes_gm_maid', $ARGS[0], ARGS[1])
+	gs '$attributes_gm_maid', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'gm_server':
-	*P FUNC('$attributes_gm_server', $ARGS[0], ARGS[1])
+	gs '$attributes_gm_server', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'danilovich_swimsuit':
-	*P FUNC('$attributes_danilovich_swim_one', $ARGS[0], ARGS[1])
+	gs '$attributes_danilovich_swim_one', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'scandalicious_outfits':
-	*P FUNC('$attributes_scandalicious_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_scandalicious_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'scandalicious_dress':
-	*P FUNC('$attributes_scandalicious_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_scandalicious_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'scandalicious_swimsuit':
-	*P FUNC('$attributes_scandalicious_swim_one', $ARGS[0], ARGS[1])
+	gs '$attributes_scandalicious_swim_one', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'scandalicious_bikinis':
-	*P FUNC('$attributes_scandalicious_swim_two', $ARGS[0], ARGS[1])
+	gs '$attributes_scandalicious_swim_two', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'fancy_burlesque':
-	*P FUNC('$attributes_fancy_burlesque', $ARGS[0], ARGS[1])
+	gs '$attributes_fancy_burlesque', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'dolls_dress':
-	*P FUNC('$attributes_dolls_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_dolls_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'dolls_outfits':
-	*P FUNC('$attributes_dolls_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_dolls_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'bomba_dress':
-	*P FUNC('$attributes_bomba_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_bomba_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'bomba_outfits':
-	*P FUNC('$attributes_bomba_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_bomba_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'allure_swimsuit':
-	*P FUNC('$attributes_allure_swim_one', $ARGS[0], ARGS[1])
+	gs '$attributes_allure_swim_one', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'allure_bikinis':
-	*P FUNC('$attributes_allure_swim_two', $ARGS[0], ARGS[1])
+	gs '$attributes_allure_swim_two', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'market_outfits':
-	*P FUNC('$attributes_market_clothes', $ARGS[0], ARGS[1])
+	gs '$attributes_market_clothes', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'materinstvo_dress':
-	*P FUNC('$attributes_materinstvo_dress', $ARGS[0], ARGS[1])
+	gs '$attributes_materinstvo_dress', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'nerdvana_cosplay':
-	*P FUNC('$attributes_nerdvana_cosplay', $ARGS[0], ARGS[1])
+	gs '$attributes_nerdvana_cosplay', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'nerdvana_outfits':
-	*P FUNC('$attributes_nerdvana_outfits', $ARGS[0], ARGS[1])
+	gs '$attributes_nerdvana_outfits', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'nerdvana_bikinis':
-	*P FUNC('$attributes_nerdvana_swim_two', $ARGS[0], ARGS[1])
+	gs '$attributes_nerdvana_swim_two', $ARGS[0], ARGS[1]
 elseif $ARGS[0] = 'nerdvana_swimsuit':
-	*P FUNC('$attributes_nerdvana_swim_one', $ARGS[0], ARGS[1])
+	gs '$attributes_nerdvana_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':
@@ -280,6 +286,7 @@ 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
+
 !! This is the old version giving to drastic changes when the scal of CloTopCut is only 1-4
 !!if CloTopCut > 1:
 !!	if tits = 2 or tits = 3: CloTopCut += 1
@@ -289,4 +296,3 @@ if CloTopCut = 2 and tits >=6: CloTopCut = 3
 !!if CloTopCut > 4: CloTopCut = 4
 
 --- clothing_attributes ---------------------------------
-

+ 2 - 9
locations/core_library.qsrc

@@ -11,17 +11,10 @@ if $ARGS[0] = 'init':
 	!! Summer School
 
 	!! $start_type['cat'] is the mc backstry, mod_ballet[beta] is a test variable to initiate regardless
-	if $start_type['cat'] = 'dancer' or mod_ballet['beta'] = 1:
-		if daystart = 1:
-			mod_ballet['blocker'] = 1
-		end
+	if $start_type['cat'] = 'dancer':
 		!! Parents Home Triggers
 		if $loc = 'kuhrPar':
-			if daystart < 6 and mod_ballet['blocker'] = 1:
-				gs 'pushkin_ballet_init', 'init'
-			end
-
-			if ((daystart >= 6 and daystart <= 14) and mod_ballet['letter'] = 0) or (daystart >= 45 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

+ 4 - 4
locations/cum_call.qsrc

@@ -34,9 +34,9 @@ if $ARGS[0] ! 'precum':
 	if $boy ! $ARGS[1] and $ARGS[1] ! '': $boy = $ARGS[1]
 
 	!!This check if the name passed is not in the new MGX format
-	if $ARGS[1] = '' or (isnum(mid($ARGS[1],2,1)) and val(mid($ARGS[1],2,1)) > 10):
+	if $ARGS[1] = '' or isnum(mid($ARGS[1],2)) = 0:
 		if ARGS[2] = 0 or ARGS[2] = 2:
-			gs 'npcgeneratec', 0, $ARGS[1], rand(18,60)
+			gs 'npcgeneratec', 0, $ARGS[1], rand(18,60), 0, 1
 			gs 'boyStat', $npclastgenerated
 		elseif ARGS[2] = 1:
 			tempnpcid = arrpos('$npc_usedname', $ARGS[1])
@@ -53,7 +53,7 @@ if $ARGS[0] ! 'precum':
 	end
 
 	sexvolume  = iif(ARGS[5] ! 0,  ARGS[5], 40)
-	sexspecpot = iif(ARGS[4] ! 0,  ARGS[4], 0)
+	sexspecpot = ARGS[4]
 	sexcontra  = max(0, min(7, ARGS[3]), sexcontra)
 
 	sexpartkno = iif(npc_love[$boy] > 0, 1, 0)
@@ -120,7 +120,7 @@ else
 	tempSexspecpot = 0
 	if ARGS[4] > 0:
 		tempSexspecpot = ARGS[4] / 40
-	elseif npc_spermpot[$ARGS[1]] > 0: 
+	elseif npc_spermpot[$ARGS[1]] > 0:
 		tempSexspecpot = npc_spermpot[$ARGS[1]] / 40
 	else
 		tempSexspecpot = 10000 / 40

+ 184 - 32
locations/daystart.qsrc

@@ -1,44 +1,196 @@
 # daystart
 !! Calculate the number of the current day since the start of the game.
 
-!!sets daystart_start to current day and must be called only after start date is set
-if daystart_start = 0:
-	if month > 1:daystart_start += 31
-	if month > 2:
-		if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0):
-			daystart_start += 29
-		else
-			daystart_start += 28
+
+if $ARGS[0] = '':
+	gs 'daystart', 'to_date', daystart
+	day = dateVars['day']
+	month = dateVars['month']
+	$month = $dateVars['month_text']
+	year = dateVars['year']
+	week = dateVars['week']
+	odd_week = dateVars['odd_week']
+end
+
+if $ARGS[0] = 'init_monthnames':
+	$monthName[1] = 'January'
+	$monthName[2] = 'February'
+	$monthName[3] = 'March'
+	$monthName[4] = 'April'
+	$monthName[5] = 'May'
+	$monthName[6] = 'June'
+	$monthName[7] = 'July'
+	$monthName[8] = 'August'
+	$monthName[9] = 'September'
+	$monthName[10] = 'October'
+	$monthName[11] = 'November'
+	$monthName[12] = 'December'
+end
+
+if $ARGS[0] = 'init_monthends':
+	monthsend[1] = 31
+	if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0):
+		monthsend[2] = 29
+	else
+		monthsend[2] = 28
+	end
+	monthsend[3] = 31
+	monthsend[4] = 30
+	monthsend[5] = 31
+	monthsend[6] = 30
+	monthsend[7] = 31
+	monthsend[8] = 31
+	monthsend[9] = 30
+	monthsend[10] = 31
+	monthsend[11] = 30
+	monthsend[12] = 31
+end
+
+
+
+! ARGS[1] = daystart
+if $ARGS[0] = 'to_date':
+	!daystart = 1 -> 1 Jan 2016
+	!mod_daystart = 0 -> 1 Jan 2013
+
+	mod_daystart = ARGS[1] + 1094
+
+	dateVars['week'] = (mod_daystart + 2) mod 7
+	if dateVars['week'] = 0: dateVars['week'] = 7
+
+	dateVars['year'] = 2013
+	temp_4cycles = mod_daystart / 1461		& ! (cycle of 4 years)
+	dateVars['year'] += 4 * temp_4cycles
+
+	! The remaining years in this cycle of 4 years
+	if mod_daystart mod 1461 >= 1095:
+		temp_inner_years = 3
+	elseif mod_daystart mod 1461 >= 730:
+		temp_inner_years = 2
+	elseif mod_daystart mod 1461 >= 365:
+		temp_inner_years = 1
+	else
+		temp_inner_years = 0
+	end
+	dateVars['year'] += temp_inner_years	& ! The remaining years in this cycle of 4 years
+
+
+	temp_inner_days = mod_daystart - 1461 * temp_4cycles - 365 * temp_inner_years
+
+	temp_leapyear = 0
+	if ((dateVars['year'] mod 4) = 0 and (dateVars['year'] mod 100) ! 0) or (dateVars['year'] mod 400 = 0):
+		if temp_inner_days > 59:
+			temp_inner_days -= 1
+			temp_leapyear = 1
 		end
 	end
-	if month > 3:daystart_start += 31
-	if month > 4:daystart_start += 30
-	if month > 5:daystart_start += 31
-	if month > 6:daystart_start += 30
-	if month > 7:daystart_start += 31
-	if month > 8:daystart_start += 31
-	if month > 9:daystart_start += 30
-	if month > 10:daystart_start += 31
-	if month > 11:daystart_start += 30
-	if month > 12:daystart_start += 31
-	daystart_start += day
+
+	!temp_inner_days starts at 0!
+	if temp_inner_days < 31:
+		dateVars['month'] = 1
+	elseif temp_inner_days < 59:
+		dateVars['month'] = 2
+		temp_inner_days -= 31
+		temp_inner_days += temp_leapyear
+	elseif temp_inner_days < 90:
+		dateVars['month'] = 3
+		temp_inner_days -= 59
+	elseif temp_inner_days < 120:
+		dateVars['month'] = 4
+		temp_inner_days -= 90
+	elseif temp_inner_days < 151:
+		dateVars['month'] = 5
+		temp_inner_days -= 120
+	elseif temp_inner_days < 181:
+		dateVars['month'] = 6
+		temp_inner_days -= 151
+	elseif temp_inner_days < 212:
+		dateVars['month'] = 7
+		temp_inner_days -= 181
+	elseif temp_inner_days < 243:
+		dateVars['month'] = 8
+		temp_inner_days -= 212
+	elseif temp_inner_days < 273:
+		dateVars['month'] = 9
+		temp_inner_days -= 243
+	elseif temp_inner_days < 304:
+		dateVars['month'] = 10
+		temp_inner_days -= 273
+	elseif temp_inner_days < 334:
+		dateVars['month'] = 11
+		temp_inner_days -= 304
+	else
+		dateVars['month'] = 12
+		temp_inner_days -= 334
+	end
+	$dateVars['month_text'] = $monthName[dateVars['month']]
+
+	dateVars['day'] = 1 + temp_inner_days
+
+	dateVars['odd_week'] = ((mod_daystart + 8) / 7) mod 2
+
+
+	if $ARGS[2] = 'test':
+		*nl
+		'new_day: <<dateVars[''day'']>> | old_day: <<day>>'
+		'new_month: <<dateVars[''month'']>> | old_month: <<month>>'
+		'new_year: <<dateVars[''year'']>> | old_year: <<year>>'
+		'new_week: <<dateVars[''week'']>> | old_week: <<week>>'
+		'new_odd_week: <<dateVars[''odd_week'']>> | old_odd_week: <<odd_week>>'
+		*nl
+		'mod_daystart: <<mod_daystart>>'
+		'temp_inner_days: <<temp_inner_days>>'
+		'temp_leapyear: <<temp_leapyear>>'
+		'temp_4cycles: <<temp_4cycles>>'
+		'temp_inner_years: <<temp_inner_years>>'
+	end
+
+	killvar 'temp_inner_days'
+	killvar 'temp_leapyear'
+	killvar 'temp_4cycles'
+	killvar 'temp_inner_years'
+	killvar 'mod_daystart'
 end
 
-daystart = (year - 2016) * 365
-!! Leap year correction
-daystart += (year - 2013) / 4
 
-i=1
-:daystart
-if month > i:
-	daystart += monthsend[i]
-	i += 1
-	jump 'daystart'
+if $ARGS[0] = 'to_daystart':
+	dateVars['day']		= ARGS[1]
+	dateVars['month']	= ARGS[2]
+	dateVars['year']	= ARGS[3]
+
+
+	mod_daystart = (dateVars['year'] - 2013) * 365
+	mod_daystart += (dateVars['year'] - 2013) / 4
+
+	if dateVars['month'] > 1:	mod_daystart += 31
+	if dateVars['month'] > 2:
+		if ((dateVars['year'] mod 4 = 0) and (dateVars['year'] mod 100 ! 0)) or (dateVars['year'] mod 400 = 0):
+			mod_daystart += 29
+		else
+			mod_daystart += 28
+		end
+	end
+	if dateVars['month'] > 3:	mod_daystart += 31
+	if dateVars['month'] > 4:	mod_daystart += 30
+	if dateVars['month'] > 5:	mod_daystart += 31
+	if dateVars['month'] > 6:	mod_daystart += 30
+	if dateVars['month'] > 7:	mod_daystart += 31
+	if dateVars['month'] > 8:	mod_daystart += 31
+	if dateVars['month'] > 9:	mod_daystart += 30
+	if dateVars['month'] > 10:	mod_daystart += 31
+	if dateVars['month'] > 11:	mod_daystart += 30
+
+	mod_daystart += dateVars['day']
+
+	dateVars['daystart'] = (mod_daystart - 1095)
+
+	if $ARGS[4] = 'test':
+		'new_daystart <<dateVars[''daystart'']>> | old_daystart <<daystart>>'
+	end
+	killvar 'mod_daystart'
 end
 
-daystart += day
-daystart -= daystart_start
-daystart += 1
 
---- daystart ---------------------------------
+if mid($ARGS[0], 1, 2) ! 'to': killvar 'dateVars'
 
+--- daystart ---------------------------------

+ 118 - 97
locations/din_bad.qsrc

@@ -1,6 +1,10 @@
 # din_bad
 !2021/05/02
-$mobile_check = {
+!! Dynamic code has been translated to static code for performance and savegame size reasons.
+!! The dynamic variables still exist for compatibility reasons.
+!! Whenever possible, don''t use dynamic code (use "gs 'din_bad', 'xxx'" instead of "dynamic $xxx").
+$mobile_check = "gs 'din_bad', 'mobile_check'"
+if $ARGS[0] = 'mobile_check':
 	if menu_off = 0:
 		gs 'stat'
 		if vladimirQW['day'] ! daystart and hour >= 15 and hour <= 17:
@@ -54,33 +58,35 @@ $mobile_check = {
 		!! iterating all lovers
 		lover_number = 0
 		:loverloop
-		if pcs_lovers[lover_number] = 1 and loverday[lover_number] ! daystart and hour > 5 and hour < 20 and ringA = 0 and rand(1,7) > 5:
-			if pcs_apprnc < vneshlover[lover_number]:
-				loverrelation[lover_number] -= 1
-				if loverrelation[lover_number] = 0:
-					'<b><font color="red">Your lover hasn''t been calling you lately, they''ve probably grown tired of you.</font></b>'
+			$temp_npcid = $lover[lover_number]
+			if pcs_lovers[lover_number] = 1 and loverday[lover_number] ! daystart and hour > 5 and hour < 20 and ringA = 0 and rand(1,7) > 5:
+				if pcs_apprnc < vneshlover[lover_number]:
+					loverrelation[lover_number] -= 1
+					if loverrelation[lover_number] = 0:
+						'<b><font color="red">Your lover hasn''t been calling you lately, they''ve probably grown tired of you.</font></b>'
+					else
+						'Your lover <<$loverdesc[lover_number]>> has not called you.'
+					end
 				else
-					'Your lover <<$loverdesc[lover_number]>> has not called you.'
+					ring = 1
+					ringA = 1
+					'<b><font color="red">Your phone is ringing</font></b>'
+					PLAY 'sound/old_phone.mp3',30
+					$caller = '<<$loverdesc[lover_number]>>'
+					$callerid = $npc_pic[$temp_npcid]
+					gs 'telefon','phone_ring'
+					pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 				end
-			else
-				ring = 1
-				ringA = 1
-				'<b><font color="red">Your phone is ringing</font></b>'
-				PLAY 'sound/old_phone.mp3',30
-				$caller = '<<$loverdesc[lover_number]>>'
-				$callerid = 'images/characters/shared/headshots_generic/'+lover_picture[lover_number]+'.jpg'
-				gs 'telefon','phone_ring'
-				pl'<center><a href="exec:gt ''telefon'', ''lover'', <<lover_number>>"><img src="images/system/phone/call_accept.png"></a>			 <a href="exec:gt $loc, $loc_arg"><img src="images/system/phone/decline.png"></a></center>'
 			end
-		end
-		lover_number += 1
+			lover_number += 1
 		if lover_number < arrsize('pcs_lovers'): jump 'loverloop'
-
+		killvar '$temp_npc_id'
 		killvar 'lover_number'
 	end
-}
+end
 
-$d_salf = {
+$d_salf = "gs 'din_bad', 'd_salf'"
+if $ARGS[0] = 'd_salf':
 	*clr & cla
 	'<center><h1>Tissues</h1></center>'
 	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
@@ -95,9 +101,10 @@ $d_salf = {
 	if pcs_makeup ! 1 and cosmetic_tattoo = 0: '<a href="exec:mc_inventory[''makeup_wipes''] -= 1 & pcs_makeup = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''"><b>Remove your makeup</b></a>'
 	'<a href="exec:gs ''stat'' & gs ''din_bad'', ''d_bag''"><br><b>Put tissues away</b></a>'
 	'</td></tr></table></center>'
-}
-		
-$d_mouthwash =  {
+end
+
+$d_mouthwash = "gs 'din_bad', 'd_mouthwash'"
+if $ARGS[0] = 'd_mouthwash':
 	*clr & cla
 	'<center><h1>Mouth Wash</h1></center>'
 	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
@@ -112,7 +119,7 @@ $d_mouthwash =  {
 	''
 	act 'Done':gs 'stat' & gs 'din_bad', 'd_bag'
 	'</td></tr></table></center>'
-}
+end
 
 if $ARGS[0] = 'd_bag':
 	*clr & cla
@@ -123,20 +130,20 @@ if $ARGS[0] = 'd_bag':
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
 	if mc_inventory['makeup_wipes'] > 0: 'You have <b><<mc_inventory[''makeup_wipes'']>></b> wet wipes left in your purse. <a href="exec:dynamic $d_salf">Use a tissue</a>'
-	if mc_inventory['painkillers'] > 0 and pain['total'] > 0 and pain['killer'] = 0: 
+	if mc_inventory['painkillers'] > 0 and pain['total'] > 0 and pain['killer'] = 0:
 		'You have <b><<mc_inventory[''painkillers'']>></b> painkiller'+iif(mc_inventory['painkillers'] > 1, 's ', ' ')+'left in your purse. <a href="exec: gs ''drugs'', ''painkiller'' & gs ''din_bad'', ''d_bag''">Take One</a>'
 	elseif mc_inventory['painkillers'] > 0 and (pain['total'] = 0 or pain['killer'] > 0):
 		'You have <b><<mc_inventory[''painkillers'']>></b> painkiller'+iif(mc_inventory['painkillers'] > 1, 's ', ' ')+'left in your purse.'
 	end
-	if mc_inventory['mouthwash'] > 0 and (pcs_breath = 0 or cumloc[12] = 1): 
+	if mc_inventory['mouthwash'] > 0 and (pcs_breath = 0 or cumloc[12] = 1):
 		'There''s mouthwash in your purse. <b><<mc_inventory[''mouthwash'']>></b> uses remaining. <a href="exec:dynamic $d_mouthwash">Use mouthwash</a>'
 	elseif mc_inventory['mouthwash'] > 0 and pcs_breath = 1 and cumloc[12] = 0:
 		'There''s mouthwash in your purse. <b><<mc_inventory[''mouthwash'']>></b> uses remaining.'
 	end
-	if mc_inventory['travel_mirror'] =  1: 
+	if mc_inventory['travel_mirror'] =  1:
 		'You have a <a href="exec: cla & gt ''mirror'', ''d_bag_mirror''">compact mirror</a> in your purse'+iif(mc_inventory['travel_makeup']  >0, ' and some portable makeup.', '.')
 		if mc_inventory['lipbalm']  > 0 and pcs_lipbalm <= 0:
-			'You can apply some <a href="exec: cls & gs ''mirror'', ''applyLipbalm'' & act ''Return'':gs ''din_bad'', ''d_bag''">lip balm</a>'			
+			'You can apply some <a href="exec: cls & gs ''mirror'', ''applyLipbalm'' & act ''Return'':gs ''din_bad'', ''d_bag''">lip balm</a>'
 		end
 	elseif mc_inventory['travel_mirror'] =  0 and mc_inventory['travel_makeup']  >0:
 		'You have some portable makeup in your purse, but you need a compact mirror to apply it.'
@@ -152,9 +159,9 @@ if $ARGS[0] = 'd_bag':
 	end
 !! Hair options
 	*nl
-	if (mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1) and pcs_hairbsh = 0: 
+	if (mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1) and pcs_hairbsh = 0:
 		'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
-	elseif (mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1) and pcs_hairbsh = 1: 
+	elseif (mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1) and pcs_hairbsh = 1:
 		'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
 	end
 	if pcs_hairbsh > 0 and pcs_hairlng > 80 and hbraids = 0:
@@ -236,12 +243,12 @@ if $ARGS[0] = 'd_bag':
 	if mc_inventory['breastcream'] > 0:'<a href="exec: gs ''drugs'', ''breastcream'' & gs ''din_bad'', ''d_bag''">Apply breast cream.</a> You have <b><<mc_inventory[''breastcream'']>></b> cream left in your purse.'
 	if mc_inventory['aphrodisiac'] > 0:'<a href="exec: gs ''drugs'', ''aphrodisiac'' & gs ''din_bad'', ''d_bag'' & *pl $drugVars[''aphrodisiac_msg''] & *pl $min_arousal_msg & killvar ''$min_arousal_msg''">Chew aphrodisiac gum.</a> You have <b><<mc_inventory[''aphrodisiac'']>></b> gum left in your purse.'
 
-	if mc_inventory['refill_bottle_water'] = 4 and mc_inventory['refill_bottle'] >= 1: 
+	if mc_inventory['refill_bottle_water'] = 4 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s still completely full. <a href="exec: mc_inventory[''refill_bottle_water''] = 3 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
 	elseif mc_inventory['refill_bottle_water'] = 3 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s almost full. <a href="exec: mc_inventory[''refill_bottle_water''] = 2 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
 	elseif mc_inventory['refill_bottle_water'] = 2 and mc_inventory['refill_bottle'] >= 1:
-		'You carry your sports water bottle in your purse. It''s half full. <a href="exec: mc_inventory[''refill_bottle_water''] = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'	
+		'You carry your sports water bottle in your purse. It''s half full. <a href="exec: mc_inventory[''refill_bottle_water''] = 1 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
 	elseif mc_inventory['refill_bottle_water'] = 1 and mc_inventory['refill_bottle'] >= 1:
 		'You carry your sports water bottle in your purse. It''s almost empty. <a href="exec: mc_inventory[''refill_bottle_water''] = 0 & pcs_hydra += 75 & cumspclnt = 2 & gs ''cum_cleanup'' & gs ''stat'' & gs ''din_bad'', ''d_bag''">Drink</a>'
 	elseif mc_inventory['refill_bottle_water'] = 0 and mc_inventory['refill_bottle'] >= 1:
@@ -268,7 +275,8 @@ if $ARGS[0] = 'd_bag':
 	'</td></tr></table></center>'
 end
 
-$dinalkowin1 = {
+$dinalkowin1 = "gs 'din_bad', 'dinalkowin1'"
+if $ARGS[0] = 'dinalkowin1':
 	*clr & cla
 	alkowine = 1
 	minut += 5
@@ -278,9 +286,10 @@ $dinalkowin1 = {
 	*nl
 	'You take the wine bottle out of your purse and slowly drink half of it. You struggle quite a lot to put the cork back before being able to make it.'
 	act 'Continue':gs 'din_bad', 'd_bag'
-}
+end
 
-$dinalkowin2 = {
+$dinalkowin2 = "gs 'din_bad', 'dinalkowin2'"
+if $ARGS[0] = 'dinalkowin2':
 	*clr & cla
 	alkowine = 0
 	mc_inventory['food_wine'] = 0
@@ -291,9 +300,10 @@ $dinalkowin2 = {
 	*nl
 	'You take out the remaining half wine bottle out of your purse, slowly drinking the rest of it. As you finish you throw the empty bottle away.'
 	act 'Continue':gs 'din_bad', 'd_bag'
-}
+end
 
-$din_Switch_Condom_Menu = {
+$din_Switch_Condom_Menu = "gs 'din_bad', 'din_Switch_Condom_Menu'"
+if $ARGS[0] = 'din_Switch_Condom_Menu':
 	dynamic $din_Update_Condom_Counts
 	*clr & cla
 	'<center><h1>Condoms</h1></center>'
@@ -318,9 +328,10 @@ $din_Switch_Condom_Menu = {
 	*nl
 	act 'Return':gs 'din_bad', 'd_bag'
 	'</td></tr></table></center>'
-}
+end
 
-$din_Table_Condom_Menu = {
+$din_Table_Condom_Menu = "gs 'din_bad', 'din_Table_Condom_Menu'"
+if $ARGS[0] = 'din_Table_Condom_Menu':
 	dynamic $din_Update_Condom_Counts
 	*clr & cla
 	'<center><h1>Condoms</h1></center>'
@@ -347,7 +358,7 @@ $din_Table_Condom_Menu = {
 	end
 	*nl
 	act 'Return':gt 'stol', 'bc'
-}
+end
 
 !! Condom System
 !! mc_inventory['equipped_condoms']: Total number of condoms sveta is using (normal or damaged).
@@ -356,31 +367,32 @@ $din_Table_Condom_Menu = {
 !! preziktype: 0 - Use condoms / 1 - don''t use condoms / 2 - use damaged condoms
 !! to check if sveta wants to use a condom use if mc_inventory['equipped_condoms'] > 0:
 
-$din_Do_Condom_Counts = {
+$din_Do_Condom_Counts = "gs 'din_bad', 'din_Do_Condom_Counts', ARGS[0]"
+if $ARGS[0] = 'din_Do_Condom_Counts':
 	*clr & cla
 	'<center><h1>Condoms</h1></center>'
 	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 	'<td cellspacing="0" cellpadding="0" valign="top">'
-	if ARGS[0] = 1:
+	if ARGS[1] = 1:
 		'Use a condom the next time you have sex.'
 		if preziktype = 2: mc_inventory['sabotaged_condoms'] = mc_inventory['equipped_condoms']
 		mc_inventory['equipped_condoms'] = mc_inventory['normal_condoms']
 		mc_inventory['normal_condoms'] = 0
 		preziktype = 0
-	elseif ARGS[0] = 2:
+	elseif ARGS[1] = 2:
 		'You will not use a condom the next time you have sex.'
 		if preziktype = 0: mc_inventory['normal_condoms'] = mc_inventory['equipped_condoms']
 		if preziktype = 2: mc_inventory['sabotaged_condoms'] = mc_inventory['equipped_condoms']
 		mc_inventory['equipped_condoms'] = 0
 		preziktype = 1
-	elseif ARGS[0] = 3:
+	elseif ARGS[1] = 3:
 		'Use your sabotaged condom the next time you have sex.'
 		if preziktype = 0: mc_inventory['normal_condoms'] = mc_inventory['equipped_condoms']
 		mc_inventory['equipped_condoms'] = mc_inventory['sabotaged_condoms']
 		mc_inventory['sabotaged_condoms'] = 0
 		preziktype = 2
-	elseif ARGS[0] = 4:
+	elseif ARGS[1] = 4:
 		if preziktype ! 0 and mc_inventory['normal_condoms'] > 0:
 			mc_inventory['sabotaged_condoms'] +=1
 			mc_inventory['normal_condoms'] -= 1
@@ -399,9 +411,10 @@ $din_Do_Condom_Counts = {
 		dynamic $din_Table_Condom_Menu
 	end
 	'</td></tr></table></center>'
-}
+end
 
-$din_Update_Condom_Counts = {
+$din_Update_Condom_Counts = "gs 'din_bad', 'din_Update_Condom_Counts'"
+if $ARGS[0] = 'din_Update_Condom_Counts':
 	if mc_inventory['equipped_condoms'] + mc_inventory['normal_condoms'] + mc_inventory['sabotaged_condoms'] > 0: prezikmsg = 1
 	if preziktype = 0:
 		if mc_inventory['normal_condoms'] > 0:
@@ -437,9 +450,10 @@ $din_Update_Condom_Counts = {
 			preziktype = 0
 		end
 	end
-}
+end
 
-$d_tabletkied = {
+$d_tabletkied = "gs 'din_bad', 'd_tabletkied'"
+if $ARGS[0] = 'd_tabletkied':
 	*clr & cla
 	'<center><h1>Birth Control</h1></center>'
 	'<center><img <<$set_imgh>> src="<<FUNC(''$purse_image'',	$currentpursetype, currentpursenumber)>>"></center>'
@@ -450,7 +464,7 @@ $d_tabletkied = {
 		if tabletkiday < daystart: '<a href="exec:dynamic $d_tabletkieda, 1 & dynamic $d_tabletkied">Take the birth control pill now.</a>'
 
 		if tabletkicheck = 0:
-			if birth_control['remind_hour'] = 0: 
+			if birth_control['remind_hour'] = 0:
 				'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Set a reminder to take your birth control pills.</a>'
 			else
 				'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Change your birth control reminder.</a>'
@@ -474,9 +488,10 @@ $d_tabletkied = {
 	end
 	act 'Return':gs 'din_bad', 'd_bag'
 	'</td></tr></table></center>'
-}
+end
 
-$d_tabletkiedt = {
+$d_tabletkiedt = "gs 'din_bad', 'd_tabletkiedt'"
+if $ARGS[0] = 'd_tabletkiedt':
 	*clr & cla
 	'<center><h1>Birth Control</h1></center>'
 	if mc_inventory['desk'] = 0:
@@ -488,9 +503,9 @@ $d_tabletkiedt = {
 	tabloc = 1
 	if thinkpreg = 0 and knowpreg = 0:
 		if tabletkiday < daystart: '<a href="exec:*clr & dynamic $d_tabletkieda, 1 & dynamic $d_tabletkiedt">Take the birth control pill now.</a>'
-		
+
 		if tabletkicheck = 0:
-			if birth_control['remind_hour'] = 0: 
+			if birth_control['remind_hour'] = 0:
 				'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Set a reminder to take your birth control pills.</a>'
 			else
 				'<a href="exec:gs ''din_bad'', ''set_bc_reminder''">Change your birth control reminder.</a>'
@@ -504,10 +519,11 @@ $d_tabletkiedt = {
 	'<a href="exec:*clr & dynamic $d_tabletkieda, 4">Examine the birth control pills.</a>'
 	if tabletkioddk = 1: '<a href="exec:*clr & dynamic $d_tabletkieda, 5 & dynamic $d_tabletkiedt">Dump the strange pills.</a>'
 	act 'Return':gt 'stol', 'bc'
-}
+end
 
-$d_tabletkieda = {
-	if ARGS[0] = 1:
+$d_tabletkieda = "gs 'din_bad', 'd_tabletkieda', ARGS[0]"
+if $ARGS[0] = 'd_tabletkieda':
+	if ARGS[1] = 1:
 		tabletkipd += tabletkipt
 		if tabletkiday ! daystart:
 			gs 'din_bad','takepill'
@@ -522,16 +538,16 @@ $d_tabletkieda = {
 		dynamic $d_tabletkied
 		'You take your birth control pill.'
 		gs 'stat'
-	elseif ARGS[0] = 2:
+	elseif ARGS[1] = 2:
 		birth_control['remind_hour'] = 0
 		gs 'din_bad', 'set_auto_bc'
 		'You will do your best to remember to take your birth control pills every day.'
 		gs 'stat'
-	elseif ARGS[0] = 3:
+	elseif ARGS[1] = 3:
 		'You will take your birth control pills as you desire.'
 		tabletkicheck = 0
 		gs 'stat'
-	elseif ARGS[0] = 4:
+	elseif ARGS[1] = 4:
 		if pcs_intel + pilldays <= rand(30,95) or therapistFuckedPussyStage > 1:
 			'These pills appear to be normal birth control pills.'
 			tabletkioddk = 0
@@ -554,14 +570,14 @@ $d_tabletkieda = {
 				act 'Return':gt 'stol', 'bc'
 			end
 		end
-	elseif ARGS[0] = 5:
+	elseif ARGS[1] = 5:
 		'You get rid of the strange pills.'
 		tabletkioddk = 0
 		pillsleft[ptype] = 0
 		tabletkioddp = 0
 		gs 'stat'
 	end
-	
+
 	if mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 0:
 		msg 'That was your last birth control pill. You need to buy some more.'
 	end
@@ -571,7 +587,7 @@ $d_tabletkieda = {
 	else
 		act 'Return':gt 'stol', 'bc'
 	end
-}
+end
 
 if $ARGS[0] = 'set_auto_bc':
 	:invalid_auto_bc_loop
@@ -616,7 +632,8 @@ if $ARGS[0] = 'turn_off_bc_reminder':
 	end
 end
 
-$d_cycreport_choice = {
+$d_cycreport_choice = "gs 'din_bad', 'd_cycreport_choice'"
+if $ARGS[0] = 'd_cycreport_choice':
 	*clr & cla
 	'<center><h1>Fertility Cycle</h1></center>'
 	'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -663,11 +680,12 @@ $d_cycreport_choice = {
 	end
 	act 'Exit':gs 'stat' & gt $loc, $loc_arg
 	'</td></tr></table></center>'
-}
+end
 
-$d_cycreport_actor = {
+$d_cycreport_actor = "gs 'din_bad', 'd_cycreport_actor', ARGS[0]"
+if $ARGS[0] = 'd_cycreport_actor':
 	!! Svetlana has decided she is not pregnant
-	if ARGS[0] = 1:
+	if ARGS[1] = 1:
 		$cycreport_txt = 'It has been <<temp>> days since you last remember having a period.'
 		if knowpreg = 1:
 			denypreg = 1
@@ -680,22 +698,22 @@ $d_cycreport_actor = {
 		gs 'stat'
 		dynamic $d_cycreport_choice
 	!! Svetlana has decided she is pregnant.
-	elseif ARGS[0] = 2:
+	elseif ARGS[1] = 2:
 		thinkpreg = 1
 		denypreg = 0
 		dynamic $d_cycreport_update
 		gs 'stat'
 		dynamic $d_cycreport_choice
-	!! Svetlana is Menstrating. 
-	elseif ARGS[0] = 3:
+	!! Svetlana is Menstrating.
+	elseif ARGS[1] = 3:
 		thinkpreg = 0
 		denypreg = 0
 		daylastperiod = daystart
 		dynamic $d_cycreport_update
 		gs 'stat'
 		dynamic $d_cycreport_choice
-	!! Svetlana is remembering her last period. 
-	elseif ARGS[0] = 4:
+	!! Svetlana is remembering her last period.
+	elseif ARGS[1] = 4:
 		thinkpreg = 0
 		denypreg = 0
 		*clr & cla
@@ -709,7 +727,7 @@ $d_cycreport_actor = {
 		act 'Exit':gs 'stat' & gt $loc, $loc_arg
 		'</td></tr></table></center>'
 	!! Svetlana thinks she doesn''t have periods anymore. Good birth control has this effect (as does pregnancy.)
-	elseif ARGS[0] = 5:
+	elseif ARGS[1] = 5:
 		if knowpreg = 1:
 			denypreg = 1
 		else
@@ -720,7 +738,7 @@ $d_cycreport_actor = {
 		gs 'stat'
 		dynamic $d_cycreport_choice
 	!! Svetlana is trying to figure out her due date.
-	elseif ARGS[0] = 6:
+	elseif ARGS[1] = 6:
 		*clr & cla
 		'<center><h1>Fertility Cycle</h1></center>'
 		'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
@@ -732,12 +750,12 @@ $d_cycreport_actor = {
 		act 'Exit':gs 'stat' & gt $loc, $loc_arg
 		'</td></tr></table></center>'
 	!! Svetlana is trying to guess who is the babydaddy.
-	elseif ARGS[0] = 7:
+	elseif ARGS[1] = 7:
 		*clr & cla
 		'<center><h1>Fertility Cycle</h1></center>'
 		'<center><table cellspacing="0" cellpadding="20" valign="top"><tr>'
 		'<td width="500" cellspacing="0" cellpadding="0" valign="top">'
-		
+
 		potfather_temp[1] = arrsize('$wombpotfath')
 		if potfather_temp[1] > 0:
 			potfather_counter = 0
@@ -754,16 +772,16 @@ $d_cycreport_actor = {
 		else
 			'There are no potential fathers.'
 		end
-		
+
 		killvar 'potfather_counter'
 		killvar 'potfather_temp'
-		
+
 		'<br>  <a href="exec:dynamic $d_cycreport_choice & gs ''stat''">Accept</a>'
 		'</td></tr></table></center>'
-		
+
 		act 'Return':dynamic $d_cycreport_choice
 		act 'Exit':gs 'stat' & gt $loc, $loc_arg
-		
+
 		!! This is the old code that was broken, keeping it for now (julzor)
 		!! {
 		tempmax = arrsize('$cumfthname')-1
@@ -794,22 +812,23 @@ $d_cycreport_actor = {
 		killvar 'tempcurr'
 		}
 	!! Just recently lost a baby to abortion, miscarriage, or think you did because your period finally arrived.
-	elseif ARGS[0] = 8:
+	elseif ARGS[1] = 8:
 		thinkpreg = 0
 		$cycreport_txt = 'Your body is recovering from the trauma of pregnancy after your miscarrage.'
 		dynamic $d_cycreport_update
 		gs 'stat'
 		dynamic $d_cycreport_choice
 	!! Just recently gave birth.
-	elseif ARGS[0] = 10:
+	elseif ARGS[1] = 10:
 		temp = arrsize('Babyptype')
 		temp -= 1
 		$cycreport_txt = 'You are currently recovering from childbirth. You gave birth on <<monthkid[temp]>> / <<daykid[temp]>> / <<yearkid[temp]>>.'
 		gs 'stat'
 	end
-}
+end
 
-$d_cycreport_update = {
+$d_cycreport_update = "gs 'din_bad', 'd_cycreport_update'"
+if $ARGS[0] = 'd_cycreport_update':
 	killvar 'temp'
 	if thinkpreg = 1 or knowpreg = 1: dynamic $d_cycreport_upduedate
 	!! Vagblood in a future update to account for babydamage and miscarrages.
@@ -840,7 +859,7 @@ $d_cycreport_update = {
 				elseif birth_control['implant_status'] > 1 and pillcon2 >= 30000:
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>Your implant protects you from getting pregnant.</font>'
 				elseif birth_control['implant_status'] > 1 and pillcon2 < 30000:
-					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=red>Your implant is not yet effective.</font>'				
+					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=red>Your implant is not yet effective.</font>'
 				elseif pillcon2 > 0 and birth_control['think_safe'] = 1:
 					$cycreport_txt = 'It has been <<temp[1]>> days since the start of your last period. <font color=green>You are currently on the birth control pill.</font>'
 				elseif pillcon2 > 0 and ((FocH > (Foch_Max - 96)) or ovulate > 0) and birth_control['think_safe'] = 0 and birth_control['using_bc'] > 0:
@@ -929,24 +948,25 @@ $d_cycreport_update = {
 			end
 		end
 	end
-}
+end
 
 
-$d_cycreport_upduedate = {
+$d_cycreport_upduedate = "gs 'din_bad', 'd_cycreport_upduedate'"
+if $ARGS[0] = 'd_cycreport_upduedate':
 	!! implant_calc: Calculation of an implantation date in the uterus (Average is 5 days after ovulation)
 	implant_calc = daystart - lastovulation + 5
-	
+
 	!! Human gastation period: 280 days
 	gastation_time = 280 / (1 + cheatVars['preg_speed'])
-	
+
 	temp = gastation_time - implant_calc
 	pregdueday = day
 	pregduemonth = month
 	pregdueyear = year
-	
+
 	temp += pregdueday
 	pregdueday = 0
-	
+
 	:pregduedateloop
 	if pregduemonth = 1 and temp > 31:
 		pregduemonth += 1
@@ -1017,9 +1037,10 @@ $d_cycreport_upduedate = {
 		$pregduedate += 'Dec'
 	end
 	$pregduedate += ' <<pregdueyear>>'
-}
+end
 
-$d_pregmovement = {
+$d_pregmovement = "gs 'din_bad', 'd_pregmovement'"
+if $ARGS[0] = 'd_pregmovement':
 	if denypreg = 0 and pregchem > 0:
 		if thinkpreg > 0 and knowpreg = 0:
 			knowpreg = 1
@@ -1077,7 +1098,7 @@ $d_pregmovement = {
 			'You feel movement deep inside you. It''s probably just gas.'
 		end
 	end
-}
+end
 
 
 if $ARGS[0] = 'takepill':
@@ -1143,7 +1164,7 @@ if $ARGS[0] = 'takepill':
 			pcs_skin += 1
 			EggRH += rand(10,80)
 		end
-		
+
 		!!pillcon2 is the ideal state, PC considers this the believed pillcon value
 		pillcon2 += ((pillcon2 + 15000) / 25) + 4000
 		if pillcon2 > 40000: pillcon2 = 40000
@@ -1164,7 +1185,7 @@ if $ARGS[0] = 'quick_takepill':
 		pcs_health -= 1
 	end
 	pilldaychk = daystart
-	
+
 	if birth_control['message_skip'] ! daystart:
 		if mc_inventory['contraceptive_pill'] = 0 and pillsleft[ptype] = 0:
 			msg 'That was your last birth control pill. You need to buy some more.'

+ 410 - 393
locations/din_pav.qsrc

@@ -1,491 +1,508 @@
 # din_pav
 !!2021/04/15
-$pavserjil = {
+!! Dynamic code has been translated to static code for performance and savegame size reasons.
+!! The dynamic variables still exist for compatibility reasons.
+!! Whenever possible, don''t use dynamic code (use "gs 'din_pav', 'xxx'" instead of "dynamic $xxx").
+$pavserjil = "gs 'din_pav', 'pavserjil'"
+if $ARGS[0] = 'pavserjil':
 	menu_off = 1
 	*clr & cla
 	gs'stat'
-	
+
 	set pavserhom = 1
 	'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil2.jpg" ></center>'
 	'It is not clear why you you are drawn to him, but you can barely take you eyes off him.'
 	act 'Overnutsya': gt 'pushkin_parks', 'lug'
-}
+end
 
-$koncepodos = {
+$koncepodos = "gs 'din_pav', 'koncepodos'"
+if $ARGS[0] = 'koncepodos':
 	*clr & cla
 	menu_off = 1
 	gs'stat'
 	set koncepo = 0
 	pcs_mood -= 10
 	'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
-    act '"I''m inquiring about the apartment," You mumble. "On the advert outside"':
-        cls
-        '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
-        '"Sorry darling, but the apartment is not for rent" Says the old man, reluctantly.'
-        act 'Sorry, but why is there an ad on the door?':
-            cls
-            gs'stat'
-            set koncepo = 1
-            '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
-            '"Kids, on the wall too, writing stuff everywhere" The old man says gesticulating.'
-            act'Leave': gt 'dvor'
-        end              
-    end
-}
-
-$koncepodos1 = {
+	act '"I''m inquiring about the apartment," You mumble. "On the advert outside"':
+		cls
+		'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
+		'"Sorry darling, but the apartment is not for rent" Says the old man, reluctantly.'
+		act 'Sorry, but why is there an ad on the door?':
+			cls
+			gs'stat'
+			set koncepo = 1
+			'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
+			'"Kids, on the wall too, writing stuff everywhere" The old man says gesticulating.'
+			act'Leave': gt 'dvor'
+		end
+	end
+end
+
+$koncepodos1 = "gs 'din_pav', 'koncepodos1'"
+if $ARGS[0] = 'koncepodos1':
 	*clr & cla
 	menu_off = 1
-    minut += 5
-    set psiha = 0
+	minut += 5
+	set psiha = 0
 	pcs_mood -= 10
-    pcs_horny = 0
-    gs'stat'
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
-    'You walk into a large, dimly lit lobby. In the corner sits the concierge, an old man who looks at you with indifference.'
-    '"I''m inquiring about the apartment," You mumble. "On the advert outside"'
-    '"There''s an advert?" Asks the old man, seeming upset. "That''s odd, no one said anything to me about it being up for rent."'
-    '"So can I have a look at it?" You say, wondering why you''re having to work so hard in this conversation.'
-    '"You want to rent it"?'
-    '"I want to look at it first. If it''s too much hassle to do your job, I can leave."'
-    '"OK then you can go look at the apartment. It''s upstairs, room 17. I will not go with you, my legs ache."'
-    'What an unpleasant man. He has you sign a registrar and then says, "Follow me <<$pcs_firstname>>."'
-    'You follow him through the dimly lit lobby and down a corridor. You can hear barely discernible sounds from various apartments, merging into ghostly mutterings that set the hair on the back of your neck on end. You hear one that almost sounds like it''s whispering, "Run."'
-    'Stopping by an old dresser, the old man rummages through a drawer, "Looks like you are in luck my dear..."'
-    'The old man puts a key in your hand, "Here."'
-    'You instinctively jerk your hand away at the touch of his dry, cold, almost deathly fingers. The concierge grabs your arm and breaks into a mad smile, revealing dark, rotten teeth.'
-    '"So young and pretty...."'
-    'You break his grip and run toward the stairs, hearing his laughter behind you. Echoing up the stairwell, it sounds like a thousand doors creaking.'
-    
-    act 'Get out of here fast':pavserhom = 3 & psiha = 1 & gt'dvor'
-    act 'View apartment':gt 'koncepod1', 'krr2x1'
-}
-
-$pavser = {  
+	pcs_horny = 0
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/koncepod.jpg" ></center>'
+	'You walk into a large, dimly lit lobby. In the corner sits the concierge, an old man who looks at you with indifference.'
+	'"I''m inquiring about the apartment," You mumble. "On the advert outside"'
+	'"There''s an advert?" Asks the old man, seeming upset. "That''s odd, no one said anything to me about it being up for rent."'
+	'"So can I have a look at it?" You say, wondering why you''re having to work so hard in this conversation.'
+	'"You want to rent it"?'
+	'"I want to look at it first. If it''s too much hassle to do your job, I can leave."'
+	'"OK then you can go look at the apartment. It''s upstairs, room 17. I will not go with you, my legs ache."'
+	'What an unpleasant man. He has you sign a registrar and then says, "Follow me <<$pcs_firstname>>."'
+	'You follow him through the dimly lit lobby and down a corridor. You can hear barely discernible sounds from various apartments, merging into ghostly mutterings that set the hair on the back of your neck on end. You hear one that almost sounds like it''s whispering, "Run."'
+	'Stopping by an old dresser, the old man rummages through a drawer, "Looks like you are in luck my dear..."'
+	'The old man puts a key in your hand, "Here."'
+	'You instinctively jerk your hand away at the touch of his dry, cold, almost deathly fingers. The concierge grabs your arm and breaks into a mad smile, revealing dark, rotten teeth.'
+	'"So young and pretty...."'
+	'You break his grip and run toward the stairs, hearing his laughter behind you. Echoing up the stairwell, it sounds like a thousand doors creaking.'
+
+	act 'Get out of here fast':pavserhom = 3 & psiha = 1 & gt'dvor'
+	act 'View apartment':gt 'koncepod1', 'krr2x1'
+end
+
+$pavser = "gs 'din_pav', 'pavser'"
+if $ARGS[0] = 'pavser':
 	menu_off = 1
-    if pcs_hairbsh = 1:pcs_hairbsh = 0
+	if pcs_hairbsh = 1:pcs_hairbsh = 0
 	pcs_mood -= 10
-    gs'stat'
-    'For some reason when you enter the room, you decide to bow before graduating  and bow, after graduating from a deep curtsy.' 
-    'Shaking head, swept... hair... colors, came to the middle of the room and do a pirouette - slowly-slowly raised your hands in exaltation.'
-    'You blinded sunny <<$pcs_nickname>> rained out of the window and the shade seemed to get closer.'
-    'And then you notice him: a man sitting behind the couch against the wall, his face buried in his knees. You cry out and involuntarily raise your hand to your mouth, bit, fingers.'
+	gs'stat'
+	'For some reason when you enter the room, you decide to bow before graduating  and bow, after graduating from a deep curtsy.'
+	'Shaking head, swept... hair... colors, came to the middle of the room and do a pirouette - slowly-slowly raised your hands in exaltation.'
+	'You blinded sunny <<$pcs_nickname>> rained out of the window and the shade seemed to get closer.'
+	'And then you notice him: a man sitting behind the couch against the wall, his face buried in his knees. You cry out and involuntarily raise your hand to your mouth, bit, fingers.'
 	act 'Look closer':dynamic $pavser1
 	act 'Run away':pavserhom = 3 & psiha = 1 & gt'dvor'
-}
+end
 
-$pavser2 = {
+$pavser2 = "gs 'din_pav', 'pavser2'"
+if $ARGS[0] = 'pavser2':
 	menu_off = 1
-    psi1day = 0
-    'Closing the gray door, you''re prepared to see, well, anything. You find yourself in a terribly narrow and gloomy hallway.'
-    'The first thing you notice is the wallpaper. It''s covered in a rather strange pattern and clearly very old.'
-    'Then you notice the silence. The dead silence.'
-    '"No place is this quiet," you think to yourself. "It''s like I''m in a coffin."'
-    'You feel a chill run down your spine. A dark and empty place that even sound has left, dust lying everywhere. People clearly have not lived here in a long time.'
-    '"Maybe not just that," you think. "Maybe someone died here."'
-    '"No," you reassure yourself, "that''s just my imagination running wild."'
-    'Still with all these thoughts still spinning in your head, you hesitate, unsure whether you want to further look around.'
-    act 'Leave':pavserhom = 3 & psiha = 1 & gt'dvor' 
-}
-
-$pavser1 = {
+	psi1day = 0
+	'Closing the gray door, you''re prepared to see, well, anything. You find yourself in a terribly narrow and gloomy hallway.'
+	'The first thing you notice is the wallpaper. It''s covered in a rather strange pattern and clearly very old.'
+	'Then you notice the silence. The dead silence.'
+	'"No place is this quiet," you think to yourself. "It''s like I''m in a coffin."'
+	'You feel a chill run down your spine. A dark and empty place that even sound has left, dust lying everywhere. People clearly have not lived here in a long time.'
+	'"Maybe not just that," you think. "Maybe someone died here."'
+	'"No," you reassure yourself, "that''s just my imagination running wild."'
+	'Still with all these thoughts still spinning in your head, you hesitate, unsure whether you want to further look around.'
+	act 'Leave':pavserhom = 3 & psiha = 1 & gt'dvor'
+end
+
+$pavser1 = "gs 'din_pav', 'pavser1'"
+if $ARGS[0] = 'pavser1':
 	*clr & cla
 	menu_off = 1
-    psiho = 1
-    pcs_mana -= 30
-    gs'stat'
-    '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-    'Before you, appeared no longer a young man. From him it emanated a savage force and evidence were the dimensions of his body, barely distinguishable from-a beige raincoat and crumpled.'
-    act 'Who are you?':
-        *clr & cla        
-        pcs_mana -= 30
-        gs'stat'
+	psiho = 1
+	pcs_mana -= 30
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+	'Before you, appeared no longer a young man. From him it emanated a savage force and evidence were the dimensions of his body, barely distinguishable from-a beige raincoat and crumpled.'
+	act 'Who are you?':
+		*clr & cla
+		pcs_mana -= 30
+		gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-        '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-        'You exhale, slowly retreating to the door and trying to pull yourself together. "You scared me," you continue, trying to stop your voice from shaking. At this point, you have learned it:man in the park on the lawn - How did you get here? '
-        '"Through the door" he replies, his voice was deep and sonorous. You stopped at the door. Paul did not move; you have only to leave, but why-then hesitated.'
-        act 'I''m a fool Fool...':
-            *clr & cla            
-            gs'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+		'You exhale, slowly retreating to the door and trying to pull yourself together. "You scared me," you continue, trying to stop your voice from shaking. At this point, you have learned it:man in the park on the lawn - How did you get here? '
+		'"Through the door" he replies, his voice was deep and sonorous. You stopped at the door. Paul did not move; you have only to leave, but why-then hesitated.'
+		act 'I''m a fool Fool...':
+			*clr & cla
+			gs'stat'
 			'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-            '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-            '- Leave the door open. But I did not hear, you entered.'
-            '"I went before." His voice screeched a little.'
-            'As you arouse the curiosity - Like this? A key, and then you took it...'
-            '- He told me he gave it to me, - he corrected, continuing to look at you quizzically.'
-            'Her surprised, that it is so easy to communicate with him, and not gone directly from this Strange.'
-            act '- I draw old houses.':
-                *clr & cla
-                arnksg = 1
-                gs'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+			'- Leave the door open. But I did not hear, you entered.'
+			'"I went before." His voice screeched a little.'
+			'As you arouse the curiosity - Like this? A key, and then you took it...'
+			'- He told me he gave it to me, - he corrected, continuing to look at you quizzically.'
+			'Her surprised, that it is so easy to communicate with him, and not gone directly from this Strange.'
+			act '- I draw old houses.':
+				*clr & cla
+				arnksg = 1
+				gs'stat'
 				'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-                '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-                '- Rent an apartment in a house not too expensive, - He said,.'
-                '- Do you intend to rent an apartment? - You ask.'
-                '- And you? - Now his voice sounded hoarse.'
-                act '- I have not decided yet.':
-                    *clr & cla
-                    pcs_hairbsh = 1
-                    set psihb = 0
-                    
-                    gs'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+				'- Rent an apartment in a house not too expensive, - He said,.'
+				'- Do you intend to rent an apartment? - You ask.'
+				'- And you? - Now his voice sounded hoarse.'
+				act '- I have not decided yet.':
+					*clr & cla
+					pcs_hairbsh = 1
+					set psihb = 0
+
+					gs'stat'
 					'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-                    '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-                    'You purely mechanically straightened hair, Using the glass door instead of a mirror.'
-                    'And in my head I stirred instant thought - I''m a fool Fool... and here-It is instantly ulutuchilas.'
-                    '- Interesting, who lived here? - Did you notice.'
-                    'Paul calmly turned without answering and began farming inspection apartments.'
-                    'You both went to the bedroom, pretending, the apartment takes you more, than meeting.'
-                    act 'In the bedroom':gt 'koncepod1', 'bdr2x'
- 
-                end
-            end
-        end
-    end
-}
-
-$pavser3 = {
+					'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+					'You purely mechanically straightened hair, Using the glass door instead of a mirror.'
+					'And in my head I stirred instant thought - I''m a fool Fool... and here-It is instantly ulutuchilas.'
+					'- Interesting, who lived here? - Did you notice.'
+					'Paul calmly turned without answering and began farming inspection apartments.'
+					'You both went to the bedroom, pretending, the apartment takes you more, than meeting.'
+					act 'In the bedroom':gt 'koncepod1', 'bdr2x'
+
+				end
+			end
+		end
+	end
+end
+
+$pavser3 = "gs 'din_pav', 'pavser3'"
+if $ARGS[0] = 'pavser3':
 	menu_off = 1
-    'Condition Bedrooms more you plunged into a stupor. Quite ragged room with awkward standing in the midst of her perfectly preserved ancient, plush ottoman.'
-    act '- The chair would look good in a hall, - You dropped it withheld.':
-        *clr & cla
-        pcs_mana -= 50
-        pcs_horny += 20
-        gs'stat'
+	'Condition Bedrooms more you plunged into a stupor. Quite ragged room with awkward standing in the midst of her perfectly preserved ancient, plush ottoman.'
+	act '- The chair would look good in a hall, - You dropped it withheld.':
+		*clr & cla
+		pcs_mana -= 50
+		pcs_horny += 20
+		gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-        '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-        '– No, - He replied, - Ottoman will stand there, where there is a.'
-        'It sounded like an order. Rudely, firmly and clearly.'
-        'His answer made you stay away from him.'
-        'Xot you wanted to look at it more closely, review, he dressed, Why look-the eye, What is hidden in the shadow under the brow arrogant dome. You do not can not understand, Why all this gives you pleasure.'
-        'Examine your living room, you are in adjacent rooms, both pretended, that the apartment itself takes you to a greater extent, What is this improbable meeting, fraught with promise - or threat - of some interchanges.'
-        act 'Go to the kitchen':
-            psiho = 2
-            psihb = 0
-            psihc = 0
-            gt 'koncepod1','khr2x'
-        end
-
-        act 'Go into the corridor':
-            psiho = 2
-            psihb = 0
-            psihc = 0
-            gt 'koncepod1', 'krr2x'
-        end
-    end   
-}
-
-$pavser4 = {
-    *clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+		'- No, - He replied, - Ottoman will stand there, where there is a.'
+		'It sounded like an order. Rudely, firmly and clearly.'
+		'His answer made you stay away from him.'
+		'Xot you wanted to look at it more closely, review, he dressed, Why look-the eye, What is hidden in the shadow under the brow arrogant dome. You do not can not understand, Why all this gives you pleasure.'
+		'Examine your living room, you are in adjacent rooms, both pretended, that the apartment itself takes you to a greater extent, What is this improbable meeting, fraught with promise - or threat - of some interchanges.'
+		act 'Go to the kitchen':
+			psiho = 2
+			psihb = 0
+			psihc = 0
+			gt 'koncepod1','khr2x'
+		end
+
+		act 'Go into the corridor':
+			psiho = 2
+			psihb = 0
+			psihc = 0
+			gt 'koncepod1', 'krr2x'
+		end
+	end
+end
+
+$pavser4 = "gs 'din_pav', 'pavser4'"
+if $ARGS[0] = 'pavser4':
+	*clr & cla
 	menu_off = 1
-    pcs_mana = pcs_mana + 60
-    piss = piss + 1
-    
-    gs'stat'
-    '<center><img <<$set_imgh>> src="images/locations/shared/bathroom/sittingtoilet.jpg" ></center>'
-    'You went into the corridor and headed to the bathroom, waiting, he will move after, but by the sound of steps realized, that he stayed in the kitchen. Scattered look you ran about the bathroom, listening to, he wanders in the other end of the apartment. The room was bathed in light, which fell through the glass window with glass.'
-    'Finishing the old shell in harmony with frame oval mirror. You stayed in front of him to check his hair, Do not gone cosmetics.'
-    'Then, instantly deciding, she lifted her skirt, he pulled down her panties and sat on the toilet. Do you understand, resultinge herself slo, not only locked, but not even closing the bathroom door, and that he may at any time enter, but this-then you and excited. You become terribly, that it can catch in this position, you, However, I, to make it happen.'
-    'You were terribly, that it can catch in this position, you, However, I, to make it happen.'
-	
+	pcs_mana = pcs_mana + 60
+	piss = piss + 1
+
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/sittingtoilet.jpg" ></center>'
+	'You went into the corridor and headed to the bathroom, waiting, he will move after, but by the sound of steps realized, that he stayed in the kitchen. Scattered look you ran about the bathroom, listening to, he wanders in the other end of the apartment. The room was bathed in light, which fell through the glass window with glass.'
+	'Finishing the old shell in harmony with frame oval mirror. You stayed in front of him to check his hair, Do not gone cosmetics.'
+	'Then, instantly deciding, she lifted her skirt, he pulled down her panties and sat on the toilet. Do you understand, resultinge herself slo, not only locked, but not even closing the bathroom door, and that he may at any time enter, but this-then you and excited. You become terribly, that it can catch in this position, you, However, I, to make it happen.'
+	'You were terribly, that it can catch in this position, you, However, I, to make it happen.'
+
 	gs 'arousal', 'foreplay', 5, 'exhibitionism'
 	gs 'stat'
-	
-    if pcs_horny >= 95:
-        act 'Touch yourself':
-            *clr & cla
-            psi1day = 1
-            psiha = 1
-            gs'stat'
-            '<center><video autoplay loop src="images/locations/pushkin/vacanthouse/11684312.mp4"></video></center>'
-            'You koknulis his wet with excitement and urine pisichki.'
-            'From that sensation, that you''re caught for such indecent occupation, you further podstёguet. And you barely contained, not to publish and sound.'
-			
+
+	if pcs_horny >= 95:
+		act 'Touch yourself':
+			*clr & cla
+			psi1day = 1
+			psiha = 1
+			gs'stat'
+			'<center><video autoplay loop src="images/locations/pushkin/vacanthouse/11684312.mp4"></video></center>'
+			'You koknulis his wet with excitement and urine pisichki.'
+			'From that sensation, that you''re caught for such indecent occupation, you further podstёguet. And you barely contained, not to publish and sound.'
+
 			gs 'arousal', 'clit_finger', 5, 'masturbate'
 			gs 'stat'
-			
-            act 'Continue':
-                *clr & cla
+
+			act 'Continue':
+				*clr & cla
 				pcs_mood = 100
-                '<center><video autoplay loop src="images/locations/pushkin/vacanthouse/11684312.mp4"></video></center>'
+				'<center><video autoplay loop src="images/locations/pushkin/vacanthouse/11684312.mp4"></video></center>'
 				$orgasm_or = 'custom'
-                $orgasm_txt = 'Suddenly you if electric shock and abdomen began pleasant spasms, you squirm biting her lip, that would not scream with pleasure.'
+				$orgasm_txt = 'Suddenly you if electric shock and abdomen began pleasant spasms, you squirm biting her lip, that would not scream with pleasure.'
 				gs 'arousal', 'clit_finger', 5, 'masturbate'
 				gs 'arousal', 'end'
 				gs 'stat'
-				
-                act 'Freshen up':gt 'koncepod1', 'vnr2x'
-            end
-        end
-    end
-    
-    act 'Further':psihc = 1 & gt 'koncepod1', 'vnr2x'
-    
-
-}
-
-$pavser5 = {
+
+				act 'Freshen up':gt 'koncepod1', 'vnr2x'
+			end
+		end
+	end
+
+	act 'Further':psihc = 1 & gt 'koncepod1', 'vnr2x'
+
+
+end
+
+$pavser5 = "gs 'din_pav', 'pavser5'"
+if $ARGS[0] = 'pavser5':
 	menu_off = 1
-    'Putishestvuya the apartment you shocked assorted odtelki and its absence in the premises nekotoryz, And then there''s the kitchen. Well, at least clean.'
-    act 'Further':
+	'Putishestvuya the apartment you shocked assorted odtelki and its absence in the premises nekotoryz, And then there''s the kitchen. Well, at least clean.'
+	act 'Further':
 		*clr & cla
-        gs'stat'
-        '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-        'You enter the kitchen; it, in accordance with the requirements of politeness, you missed a little ahead and behind. Against the wall were piled bundles of yellowed newspapers.'
-        'You have a thought in my head slipped, that he always waits, How will you. You are immersed in their own emotional throwing,'
-        'you are attracted to him and at the same time you are afraid of it, and he decided, that will not help you or customized : He decides to let itself. And what will happen next - he does not care whether or not?'
-        'For he and you were two beings in ridiculous situation, devoid of purpose or meaning in life.'
-        act 'Further':
-            cla
-            *clr
-            psihb = 1
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+		'You enter the kitchen; it, in accordance with the requirements of politeness, you missed a little ahead and behind. Against the wall were piled bundles of yellowed newspapers.'
+		'You have a thought in my head slipped, that he always waits, How will you. You are immersed in their own emotional throwing,'
+		'you are attracted to him and at the same time you are afraid of it, and he decided, that will not help you or customized : He decides to let itself. And what will happen next - he does not care whether or not?'
+		'For he and you were two beings in ridiculous situation, devoid of purpose or meaning in life.'
+		act 'Further':
+			cla
+			*clr
+			psihb = 1
 			pcs_mood = 100
-            gs'stat'
-            '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-            'Coming out of his reverie, Did you catch yourself at his greedy, scrutiny. Looking hunter looking at the prey. Closer, cheeky suggestive feeling, that you just-that stripped and fucked.'
-            'You felt his eyes every cell of the body and chuvstvvuya awkward and at the same time as the-excitedly, if enjoy, that he have a little-just demeaning.'
-			
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+			'Coming out of his reverie, Did you catch yourself at his greedy, scrutiny. Looking hunter looking at the prey. Closer, cheeky suggestive feeling, that you just-that stripped and fucked.'
+			'You felt his eyes every cell of the body and chuvstvvuya awkward and at the same time as the-excitedly, if enjoy, that he have a little-just demeaning.'
+
 			gs 'arousal', 'vaginal', 10, 'sub'
 			gs 'stat'
-			
-            act 'In the corridor':gt 'koncepod1', 'krr2x'
-        end
-    end
-}
+
+			act 'In the corridor':gt 'koncepod1', 'krr2x'
+		end
+	end
+end
 
 
-$pavser6 = {
+$pavser6 = "gs 'din_pav', 'pavser6'"
+if $ARGS[0] = 'pavser6':
 	menu_off = 1
-    psihb = 1
-    psiho = 3
-    
-    'You are returned to the kitchen and missed, looking away from each other''s eyes, broke up into different rooms.'
-    'Both understanding - tightening the inspection of the apartment, you increase the likelihood, between you that-something will happen.'
-    'None of you especially do not wish to, and does not aspire to this, nevertheless he or, or you do not want to deviate from the chosen line of conduct.'
-    'As if someone-it painted for you all the movements and you feel like breaking the spirit of the play or destroy the atmosphere of predestination, arose in the walls of the house.'
-    *nl
-}
-
-$pavser7 = {
+	psihb = 1
+	psiho = 3
+
+	'You are returned to the kitchen and missed, looking away from each other''s eyes, broke up into different rooms.'
+	'Both understanding - tightening the inspection of the apartment, you increase the likelihood, between you that-something will happen.'
+	'None of you especially do not wish to, and does not aspire to this, nevertheless he or, or you do not want to deviate from the chosen line of conduct.'
+	'As if someone-it painted for you all the movements and you feel like breaking the spirit of the play or destroy the atmosphere of predestination, arose in the walls of the house.'
+	*nl
+end
+
+$pavser7 = "gs 'din_pav', 'pavser7'"
+if $ARGS[0] = 'pavser7':
 	menu_off = 1
-    'Then the phone rang inappropriate.'
-    act 'Answer':
-        *clr & cla
-        pcs_horny += 10
-        gs'stat'
-        '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/phone.jpg" ></center>'
-        'You raised the phone in the bedroom, he along with you - in the corridor. An unfamiliar voice came to nothing, the connection was lost, but you both continued to press the receiver to his ear, listening to each other''s breath.'
-        'You want, that he spoke with you, I went to some-a trifling concession - showed what-weakness, - And then you can just get up and leave. You were not able to lower the tube, although you desperately tempted to slap her blunder on the lever of the old machine.'
-        'This keeps you from his inflexible arrogance. Maybe, he knew about it, and proud of their power over you.'
-        *nl
-        act 'Listen tube':dynamic $pavser8
-    end
-}
-
-$pavser8 = {
+	'Then the phone rang inappropriate.'
+	act 'Answer':
+		*clr & cla
+		pcs_horny += 10
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/phone.jpg" ></center>'
+		'You raised the phone in the bedroom, he along with you - in the corridor. An unfamiliar voice came to nothing, the connection was lost, but you both continued to press the receiver to his ear, listening to each other''s breath.'
+		'You want, that he spoke with you, I went to some-a trifling concession - showed what-weakness, - And then you can just get up and leave. You were not able to lower the tube, although you desperately tempted to slap her blunder on the lever of the old machine.'
+		'This keeps you from his inflexible arrogance. Maybe, he knew about it, and proud of their power over you.'
+		*nl
+		act 'Listen tube':dynamic $pavser8
+	end
+end
+
+$pavser8 = "gs 'din_pav', 'pavser8'"
+if $ARGS[0] = 'pavser8':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-    pcs_horny +=10
-    pcs_mana = pcs_mana - 50
-    gs'stat'
-    '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-    'And then he appeared, you involuntarily held his tongue over the lip.'
-    '– Well, we choose? - I asked you to inadvertently break into the voice irritation. - Removes this apartment?'
-    '– Yes. It was decided from the outset.'
-    '- But now I hesitate, - He continued. - Do you like her?'
-    'He helped you get up and again asked, - Do you like her?'
-    '- I should think, - You said. You become anxious...'
-    '- So do not pull the cat by the balls, - He said, and this jargon turnover in his mouth sounded like a threat.'
-    'He left and slammed the door.'
-    'You stand rozmyshlyaya about what happened: and he can do with you now, he wants and you will not resisting. But why?'
-    'As well? But you do not know, Suddenly he began maniac and you now cut, and you are under hypnosis smotrelib him as a benefactor.'
-    act 'The Hall':
+	pcs_horny +=10
+	pcs_mana = pcs_mana - 50
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+	'And then he appeared, you involuntarily held his tongue over the lip.'
+	'- Well, we choose? - I asked you to inadvertently break into the voice irritation. - Removes this apartment?'
+	'- Yes. It was decided from the outset.'
+	'- But now I hesitate, - He continued. - Do you like her?'
+	'He helped you get up and again asked, - Do you like her?'
+	'- I should think, - You said. You become anxious...'
+	'- So do not pull the cat by the balls, - He said, and this jargon turnover in his mouth sounded like a threat.'
+	'He left and slammed the door.'
+	'You stand rozmyshlyaya about what happened: and he can do with you now, he wants and you will not resisting. But why?'
+	'As well? But you do not know, Suddenly he began maniac and you now cut, and you are under hypnosis smotrelib him as a benefactor.'
+	act 'The Hall':
 		*clr & cla
-        pcs_mana = manamax
-        pcs_horny += 20
-        gs'stat'
+		pcs_mana = manamax
+		pcs_horny += 20
+		gs'stat'
 		'<center><img <<$set_imgh>> src="'+FUNC('$face_image')+'"></center>'
-        '<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
-        '- I thought, You''ve gone.'
-        '- I locked the door.'
-        'He slowly walked to you, never taking his eyes from the light you wide-open-blue, moisture veiled eyes, in which there was more humility, than fear.'
-        '- I did not? - sprosilon.'
-        '– No, no, - You have answered, trying to catch his breath, - I just decided, that you left.- Your words came as an invitation to.'
-        'At the moment, he turned and darted near you.'
-        'You oyknula, but the words never sounded, they drowned in your own mind.'
-        act 'Oh':dynamic $pavser9
-    end
-}
-
-$pavser9 = {
-    *clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pushkin/pavser/pavserjil.jpg" ></center>'
+		'- I thought, You''ve gone.'
+		'- I locked the door.'
+		'He slowly walked to you, never taking his eyes from the light you wide-open-blue, moisture veiled eyes, in which there was more humility, than fear.'
+		'- I did not? - sprosilon.'
+		'- No, no, - You have answered, trying to catch his breath, - I just decided, that you left.- Your words came as an invitation to.'
+		'At the moment, he turned and darted near you.'
+		'You oyknula, but the words never sounded, they drowned in your own mind.'
+		act 'Oh':dynamic $pavser9
+	end
+end
+
+$pavser9 = "gs 'din_pav', 'pavser9'"
+if $ARGS[0] = 'pavser9':
+	*clr & cla
 	menu_off = 1
-    pcs_mood -= 40
-    gs'stat'
-    
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/kiss.jpg" ></center>'
-    'He took in the palm of your face and stared with a kiss on the lips. '
-    'In the living room all round stopped, Only in the sunlight dancing motes; dead silence broken only by their convulsive breathing.'
-    'Suddenly he picked you up and carried her across the living room to the partition window, I suffered with such ease, if you were a small child. You hugged his neck, feels the same mighty and strong, like a tree trunk, and began stroking the muscles, which sparkled on his back under the cloak of a-the smooth material.'
-    'From it was easy sour smell - sweat and then-else, that you could not recognize, - The smell of a man, male, none of your guys do not know the groin, and that smell strongly excites you.'
-    
+	pcs_mood -= 40
+	gs'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/kiss.jpg" ></center>'
+	'He took in the palm of your face and stared with a kiss on the lips. '
+	'In the living room all round stopped, Only in the sunlight dancing motes; dead silence broken only by their convulsive breathing.'
+	'Suddenly he picked you up and carried her across the living room to the partition window, I suffered with such ease, if you were a small child. You hugged his neck, feels the same mighty and strong, like a tree trunk, and began stroking the muscles, which sparkled on his back under the cloak of a-the smooth material.'
+	'From it was easy sour smell - sweat and then-else, that you could not recognize, - The smell of a man, male, none of your guys do not know the groin, and that smell strongly excites you.'
+
 	gs 'arousal', 'kiss', 5, 'sub'
 	gs 'stat'
-	
+
 	act 'Further':
-        *clr & cla
-        gs'stat'
-        '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/01.jpg" ></center>'
-        'He put you in the chair, but do not let go of the hands of the mighty, he ran your hand under her blouse and began to stroke your breasts.'
-        ''
-        ''
+		*clr & cla
+		gs'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/01.jpg" ></center>'
+		'He put you in the chair, but do not let go of the hands of the mighty, he ran your hand under her blouse and began to stroke your breasts.'
+		''
+		''
 		gs 'arousal', 'foreplay', 5, 'sub'
 		gs 'stat'
-		
-        act 'Further':
-            *clr & cla
-            gs'stat'
-            '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/02.jpg" ></center>'
-            'Picked up the chest, palms and thumbs had nipples. The rough skin on the balls of his fingers made her rush of desire, you clung to him.'
-            'At the end-all he bared your breasts and hot lips touched your nipples and wild heat sladotnogo madness began to rise from the bottom to the top of your body.'
-			
+
+		act 'Further':
+			*clr & cla
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/02.jpg" ></center>'
+			'Picked up the chest, palms and thumbs had nipples. The rough skin on the balls of his fingers made her rush of desire, you clung to him.'
+			'At the end-all he bared your breasts and hot lips touched your nipples and wild heat sladotnogo madness began to rise from the bottom to the top of your body.'
+
 			gs 'arousal', 'foreplay', 5, 'sub'
 			gs 'stat'
-		
-            act 'Further':
-                *clr & cla
-                gs'stat'
-                '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/03.jpg" ></center>'
-                'You neprozvolno cozero his pants and felt beneath the solid barrel member and frantically began to take off his pants while his cock did not seem near your face.'
-                'You smelled in the face of a mixture of smells: sour sweat and urine zpah...'
-                
+
+			act 'Further':
+				*clr & cla
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/03.jpg" ></center>'
+				'You neprozvolno cozero his pants and felt beneath the solid barrel member and frantically began to take off his pants while his cock did not seem near your face.'
+				'You smelled in the face of a mixture of smells: sour sweat and urine zpah...'
+
 				gs 'arousal', 'foreplay', 5, 'sub'
 				gs 'stat'
-		
-                act 'Further':
-                    *clr & cla
-			        pcs_mana = manamax
-                    gs'stat'
-                    '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/05.jpg" ></center>'
-                    'And while your brain is trying to digest what is happening, and you understand in general how do you take...'
-                    'You stand in front of him on his knees, I began to caress the tongue of its elastic trunk.'
-                    ''
-					
+
+				act 'Further':
+					*clr & cla
+					pcs_mana = manamax
+					gs'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/05.jpg" ></center>'
+					'And while your brain is trying to digest what is happening, and you understand in general how do you take...'
+					'You stand in front of him on his knees, I began to caress the tongue of its elastic trunk.'
+					''
+
 					gs 'arousal', 'hj', 5, 'sub'
 					gs 'stat'
-					
-                    act 'Further':
-                        *clr & cla
-                        gs'stat'
-                        '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/04.jpg" ></center>'
-                        'You were amazed to, what''s happening. You stand in front of a completely unfamiliar man half-naked, on his knees and his mouth furiously pleasuring, caressing his head tongue.'
-                        ''
-						
+
+					act 'Further':
+						*clr & cla
+						gs'stat'
+						'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/04.jpg" ></center>'
+						'You were amazed to, what''s happening. You stand in front of a completely unfamiliar man half-naked, on his knees and his mouth furiously pleasuring, caressing his head tongue.'
+						''
+
 						gs 'arousal', 'bj', 5, 'sub'
 						gs 'stat'
-						
-                        act 'Continue':
-                            *clr & cla
-			                pcs_mana = manamax
-			                gs 'underwear', 'remove'
-                            gs'stat'
-                            '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/06.jpg" ></center>'
-                            'And the passion rolls, like the waves on the shore peschanny, raising you all to a new level of bliss and you have not thought about the true test of what is happening, its causes, you become important to the investigation.'
-                            'And the result proved the presence of his grave, Hard, strong and rough fingers in their clitoris...'
-							
+
+						act 'Continue':
+							*clr & cla
+							pcs_mana = manamax
+							gs 'underwear', 'remove'
+							gs'stat'
+							'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/06.jpg" ></center>'
+							'And the passion rolls, like the waves on the shore peschanny, raising you all to a new level of bliss and you have not thought about the true test of what is happening, its causes, you become important to the investigation.'
+							'And the result proved the presence of his grave, Hard, strong and rough fingers in their clitoris...'
+
 							$orgasm_or = 'no'
 							gs 'arousal', 'vaginal_finger', 5, 'sub'
 							gs 'stat'
-							
-                            act 'Continue':
-                                *clr & cla
-                                gs'stat'
+
+							act 'Continue':
+								*clr & cla
+								gs'stat'
 								gs 'npcgeneratec', 0, 'Stranger', rand(19,45)
 								gs 'boyStat', $npclastgenerated
 								cumprecheck = 1
 								gs 'cum_manage'
-                                '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/07.jpg" ></center>'
-                                'Your consciousness fades in and out in the wild passionate dance...'
-                                'He thrusts in you wildly, roughly, furiously. You feel like you are being skewered by the force and depth of his cock...'
-								
+								'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/07.jpg" ></center>'
+								'Your consciousness fades in and out in the wild passionate dance...'
+								'He thrusts in you wildly, roughly, furiously. You feel like you are being skewered by the force and depth of his cock...'
+
 								gs 'arousal', 'vaginal', 10, 'sub'
 								gs 'stat'
-								
-                                act 'Continue':
-                                    *clr & cla
-			                        pcs_mana = manamax
-                                    gs'stat'
-                                    '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/08.jpg" ></center>'
-                                    '...'
-									
+
+								act 'Continue':
+									*clr & cla
+									pcs_mana = manamax
+									gs'stat'
+									'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/08.jpg" ></center>'
+									'...'
+
 									$orgasm_or = 'yes'
 									gs 'stat'
-									
-                                    act 'Continue':
-                                        *clr & cla
-                                        gs'stat'
-                                        '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/09.jpg" ></center>'
-                                        'Another enlightened it, when he put you back on the chair and raise your legs voshol in you and you feel a sharp pain in the uterus of a member of the strike...'
-                                        'Oh my pain...'
-                                        'But the sharp pain was replaced, as sharp blast of bliss and a new wave washed over you...'
-										
+
+									act 'Continue':
+										*clr & cla
+										gs'stat'
+										'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/09.jpg" ></center>'
+										'Another enlightened it, when he put you back on the chair and raise your legs voshol in you and you feel a sharp pain in the uterus of a member of the strike...'
+										'Oh my pain...'
+										'But the sharp pain was replaced, as sharp blast of bliss and a new wave washed over you...'
+
 										gs 'arousal', 'anal', 10, 'sub'
 										gs 'stat'
-										
-                                        act 'Continue':
-                                            *clr & cla
-                                            orgasm += 1
-				                            pcs_horny = 0
+
+										act 'Continue':
+											*clr & cla
+											orgasm += 1
+											pcs_horny = 0
 											pcs_mood = 100
-                                            gs'stat'
-                                            '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/10.jpg" ></center>'
-											
+											gs'stat'
+											'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/10.jpg" ></center>'
+
 											$orgasm_or = 'yes'
 											gs 'stat'
-									
-                                            act 'Continue':
-                                                *clr & cla
-                                                gs'stat'
-                                                '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/11.jpg" ></center>'
-                                                'Woke. The next wave rolled back and you feel at home on his stomach warm, with a strange smell, though vaguely familiar, sperm.'
-                                                'You fell exhausted on the floor and you have some piece while lying close to each other. You''re lying and embracing in the eerie silence only hear your breathing.'
-                                                'He was silent and you are grateful to him for that'
-												
-                                                act 'Rollback':dynamic $pavser10
-                                            end    
-                                        end        
-                                    end        
-                                end        
-                            end    
-                        end        
-                    end            
-                end                
-            end                    
-        end                
-    end           
-}
-
-$pavser10 = {
+
+											act 'Continue':
+												*clr & cla
+												gs'stat'
+												'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/sex/11.jpg" ></center>'
+												'Woke. The next wave rolled back and you feel at home on his stomach warm, with a strange smell, though vaguely familiar, sperm.'
+												'You fell exhausted on the floor and you have some piece while lying close to each other. You''re lying and embracing in the eerie silence only hear your breathing.'
+												'He was silent and you are grateful to him for that'
+
+												act 'Rollback':dynamic $pavser10
+											end
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+$pavser10 = "gs 'din_pav', 'pavser10'"
+if $ARGS[0] = 'pavser10':
 	*clr & cla
 	menu_off = 1
-    psi1day = 1
-    gs 'sweat', 'add', 20
-    spafinloc = 14
+	psi1day = 1
+	gs 'sweat', 'add', 20
+	spafinloc = 14
 	gs 'cum_manage'
-    guy += 1
-    vgape = 1
-    gs'stat'
-    '<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/13.jpg" ></center>'
-    'You rolled away and lay kakoeto time watching how he dressed and left in silence.'
-    act 'Get up and get dressed':
+	guy += 1
+	vgape = 1
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pushkin/vacanthouse/13.jpg" ></center>'
+	'You rolled away and lay kakoeto time watching how he dressed and left in silence.'
+	act 'Get up and get dressed':
 		if $clothingworntype = 'nude':gs 'clothing', 'wear_last_worn'
 		gs 'underwear', 'wear'
 		gt 'koncepod1', 'str2x'
-		
+
 		gs 'arousal', 'end'
 		gs 'stat'
 	end
-}
+end
 --- din_pav ---------------------------------
 

+ 130 - 90
locations/din_van.qsrc

@@ -1,5 +1,10 @@
 # din_van
 !2021/04/26
+
+!! Dynamic code has been translated to static code for performance and savegame size reasons.
+!! The dynamic variables still exist for compatibility reasons.
+!! Whenever possible, don''t use dynamic code (use "gs 'din_van', 'xxx'" instead of "dynamic $xxx").
+
 !!pcs_leghair = leg hair 0 - 3 for smooth <= 6 for stubble <= 9 for light after that hairy
 !!pcs_pubes = pubes 0 - 3 for smooth <= 10 for stubble <= 20 for light hair after that its hairy
 !!pubestyle = the style in which you have determined to shave your pubic hair
@@ -12,7 +17,8 @@ razors_to_use['all']   = min(3, max(1, (pcs_leghair*4 + max(0, pcs_pubes-shave_l
 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))
 
-$showerdin = {
+$showerdin = "gs 'din_van', 'showerdin'"
+if $ARGS[0] = 'showerdin':
 	menu_off = 1
 	if hypnoAddict = 0:
 		cumspclnt = 1
@@ -44,9 +50,11 @@ $showerdin = {
 			gs 'AppearanceSystem', 'UpdateBaseAppearance'
 		end
 	end
-}
+end
 
-$bteeth = {
+
+$bteeth = "gs 'din_van', 'bteeth'"
+if $ARGS[0] = 'bteeth':
 	if pcs_breath ! 1 or cumloc[12] = 1:
 		act 'Brush your teeth (0:03)':
 			menu_off = 1
@@ -67,28 +75,32 @@ $bteeth = {
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
-}
+end
 
-$dryOff = {
+
+$dryOff = "gs 'din_van', 'dryOff'"
+if $ARGS[0] = 'dryOff':
 	act 'Get out and dry off': mirror_steam = hour & gt $loc, $loc_arg
-}
+end
 
-$shower = {
+
+$shower = "gs 'din_van', 'shower'"
+if $ARGS[0] = 'shower':
 	act 'Take a shower (0:15)':
 		menu_off = 1
 		*clr & cla
 		minut += 15
 		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'albinahome' or $loc = 'LariskaHome' or hotelmc_inventory['shampoo'] =  1: noshampoo = 1
 		noshampoo_tmp = noshampoo
-		dynamic $showerdin
+		gs 'din_van', 'showerdin'
 
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></center>'
 		*nl
 		'You undress and turn on the water in the shower. When it hits the right temperature, you step into the shower and let the warm water rain down on you.'
-		if daystart < 10 and $start_type[1] = 'tg':
+		if daystart - daystart_start < 9 and $start_type[1] = 'tg':
 			pcs_horny += rand(6,10)
 			'It''s really arousing to see your new body with all its smooth curves, breasts with large nipples, wide hips and smooth legs. You begin to lather your body, noticing how soft and tender it feels. Once you''re sure you haven''t missed a single spot, you begin to wash yourself off, continuing to experience new and strange sensations.'
-		elseif daystart < 30 and $start_type[1] = 'tg':
+		elseif daystart - daystart_start < 29 and $start_type[1] = 'tg':
 			pcs_horny += rand(2,6)
 			'You''ve already gotten used to your feminine body and its softness doesn''t surprise you very much anymore, but you still let your hands wander a bit over your soft curves before you begin to wash yourself in earnest.'
 		else
@@ -142,7 +154,7 @@ $shower = {
 			lactation['pc_aware'] = 1
 		end
 
-		dynamic $dryOff
+		gs 'din_van', 'dryOff'
 		if rapeday = daystart and rape_shower ! daystart:
 			act'Cry (react to rape)':
 				cla & *clr
@@ -158,7 +170,7 @@ $shower = {
 				'You grab the soap again and scrub yourself again, but it still feels like something is there, coating your skin. You scrub and scrub and scrub but it just won''t go away until you finally cry out, throwing it into the corner. Tremors begin coursing through your body and you slowly sink down onto the shower floor, where you remain, sobbing while the water continues raining down on you.'
 
 
-				dynamic $dryOff
+				gs 'din_van', 'dryOff'
 			end
 		elseif pcs_horny >= 40:
 			act 'Use the showerhead on your pussy':
@@ -186,7 +198,7 @@ $shower = {
 					gs 'cum_cleanup'
 				end
 
-				dynamic $dryOff
+				gs 'din_van', 'dryOff'
 			end
 		end
 
@@ -197,7 +209,7 @@ $shower = {
 		act 'Take a selfie':
 			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
 		end
-		dynamic $brit
+		gs 'din_van', 'brit'
 
 		if vanr_lock = 0 and $loc = 'vanrPar':
 			*nl
@@ -207,9 +219,11 @@ $shower = {
 		end
 	end
 	killvar 'noshampoo_tmp'
-}
+end
 
-$bath = {
+
+$bath = "gs 'din_van', 'bath'"
+if $ARGS[0] = 'bath':
 	act 'Soak in the bath (0:30)':
 		menu_off = 1
 		*clr & cla
@@ -219,7 +233,7 @@ $bath = {
 		pcs_mood += 20
 		if $loc = 'vanrPar' or $loc = 'tanvanr' or $loc = 'LariskaHome' or hotelmc_inventory['shampoo'] =  1: noshampoo = 1
 		noshampoo_tmp = noshampoo
-		dynamic $showerdin
+		gs 'din_van', 'showerdin'
 
 		gs 'body', 'SkinGain', 'Bath'
 
@@ -228,11 +242,11 @@ $bath = {
 		*nl
 		'You undress while the bathtub fills up and dip a toe into the water. It is just the right temperature, so you climb in and let yourself sink into the warm water, moaning softly as you feel your muscles start to relax.'
 
-		if daystart < 10 and $start_type[1] = 'tg':
+		if daystart - daystart_start < 9 and $start_type[1] = 'tg':
 			pcs_horny += rand(6,10)
 			'You stare at the smooth, soft legs sticking out of the water. You''re still not used to this new body and the look of all this roundness.'
 			'As you start to soap yourself, you unwittingly turn your attention to your breasts. They''re so soft and big, and when you touch them you feel an unfamiliar but pleasant sensation. You take your time getting familiar with your new body, then you begin to wash yourself in earnest.'
-		elseif daystart < 30 and $start_type[1] = 'tg':
+		elseif daystart - daystart_start < 29 and $start_type[1] = 'tg':
 			pcs_horny += rand(2,6)
 			'You have become a little accustomed to your female body and casually soap up all these soft curves and rinse yourself off, rubbing your hands all over your feminine body to make sure you didn''t miss a spot.'
 		else
@@ -262,7 +276,7 @@ $bath = {
 			act 'Examine yourself closer while drying off and getting dressed...': gt 'din_van', 'buffpick'
 		end
 
-		dynamic $dryOff
+		gs 'din_van', 'dryOff'
 
 		act '"Wash" your pussy':
 			menu_off = 1
@@ -283,7 +297,7 @@ $bath = {
 			$orgasm_or = 'yes'
 			gs 'arousal', 'clit_vibe', 10, 'masturbate'
 			gs 'arousal', 'end'
-			dynamic $dryOff
+			gs 'din_van', 'dryOff'
 		end
 
 
@@ -293,12 +307,14 @@ $bath = {
 			gs 'telefon', 'Phone_selfie_image_bathing', 'bath'
 		end
 
-		dynamic $brit
+		gs 'din_van', 'brit'
 	end
 	killvar 'noshampoo_tmp'
-}
+end
+
 
-$SkinCare = {
+$SkinCare = "gs 'din_van', 'SkinCare'"
+if $ARGS[0] = 'SkinCare':
 	if mc_inventory['moisturiser']  > 0 and moisturiser_time <= totminut:
 		act 'Apply Moisturizer (0:05)':
 			mc_inventory['moisturiser'] -= 1
@@ -316,19 +332,21 @@ $SkinCare = {
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
-}
+end
+
 
-$brit = {
+$brit = "gs 'din_van', 'brit'"
+if $ARGS[0] = 'brit':
 	if lashair ! 1 and pcs_shave['free_razor'] + mc_inventory['razor'] > 0:
 		!! if shave_menu = 1: legs and pussy
 		if shave_menu = 1 and mc_inventory['razor'] >= razors_to_use['all']:
 			if pcs_leghair >= 3 or (pubestyle > 0 and pcs_pubes >= shave_trigger):
 				if pcs_leghair >= 3 and (pubestyle > 0 and pcs_pubes >= shave_trigger):
-					if daystart < 10 and $start_type[1] = 'tg':
+					if daystart - daystart_start < 9 and $start_type[1] = 'tg':
 						$shave_act = 'Shave your legs and pussy'
 						$shave_txt1 = 'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
 						$shave_txt2 = 'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
-					elseif daystart < 30 and $start_type[1] = 'tg':
+					elseif daystart - daystart_start < 29 and $start_type[1] = 'tg':
 						pcs_mood += 10
 						$shave_txt1 = 'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
 					elseif pubestyle = 1:
@@ -404,7 +422,7 @@ $brit = {
 							else
 								mc_inventory['razor'] -= razors_to_use['all']
 							end
-							dynamic $dryOff
+							gs 'din_van', 'dryOff'
 							gs 'selfplay', 'bathtub_dildo_check'
 							gs 'selfplay', 'shower_dildo_check'
 						end
@@ -486,7 +504,7 @@ $brit = {
 						'<<$shave_txt1>>'
 						*nl
 						'<<$shave_txt2>>'
-						dynamic $dryOff
+						gs 'din_van', 'dryOff'
 						gs 'selfplay', 'bathtub_dildo_check'
 						gs 'selfplay', 'shower_dildo_check'
 					end
@@ -513,25 +531,27 @@ $brit = {
 					!! if $locM = 'uni_dorm' and rand(0, 5) = 5:gt 'vann', 'brit1'
 					'<center><img <<$set_imgh>> src="images/shared/home/bathroom/shave.jpg"></center>'
 					*nl
-					if daystart < 10 and $start_type[1] = 'tg':
+					if daystart - daystart_start < 9 and $start_type[1] = 'tg':
 						'You can''t shake off the fact that you''re a girl now, so you decide it''d be best to shave your legs. You begin to lather your legs, still marveling at how soft and round they are. Then you take the razor in your hand and begin to shave your legs.'
 						'You feel really awkward, never having done this before as a guy. Luckily, you had more than enough experience with shaving your face and technically this isn''t really all that different. In the end, you get a pretty decent job done.'
-					elseif daystart < 30 and $start_type[1] = 'tg':
+					elseif daystart - daystart_start < 29 and $start_type[1] = 'tg':
 						pcs_mood += 10
 						'With a newfound routine you lather up your legs and start shaving, careful not to miss a spot. After washing away the foam you softly glide your hands over your smooth legs, feeling good to know that you don''t need to hide your legs in pants. Maybe you should wear a skirt tomorrow?'
 					else
 						'You lather your legs up with some soapy water and shave your legs. After a few swift movements, your legs are smooth as silk. The feeling of your smooth legs turns you on a little.'
 					end
-					dynamic $dryOff
+					gs 'din_van', 'dryOff'
 					gs 'selfplay', 'bathtub_dildo_check'
 					gs 'selfplay', 'shower_dildo_check'
 				end
 			end
 		end
 	end
-}
+end
+
 
-$tampon =  {
+$tampon = "gs 'din_van', 'tampon'"
+if $ARGS[0] = 'tampon':
 	if mc_inventory['sanitary_pads'] > 0 and (mesec > 0 or (placebopart > 0 and pillcon < 40000)) and isprok = 0 and isprokp = 0 and knowpreg = 0 and $pantyworntype ! 'none':
 		act 'Use a sanitary pad (0:02)':
 			menu_off = 1
@@ -560,9 +580,11 @@ $tampon =  {
 			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
-}
+end
+
 
-$quickwash = {
+$quickwash = "gs 'din_van', 'quickwash'"
+if $ARGS[0] = 'quickwash':
 	if cumsumbod-cumsumvag-cumsumass > 0:
 		act 'Quick wash (0:15)':
 			menu_off = 1
@@ -585,7 +607,7 @@ $quickwash = {
 	end
 
 	if cumloc[0]+cumloc[3] > 0 and hypnoAddict = 0:
-		if FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1:
+		if func('Cum_Manage', 'check_innards', 0) = 1 or func('Cum_Manage', 'check_innards', 3) = 1:
 			act 'Let the cum drain from you (0:10)':
 				menu_off = 1
 				*clr & cla
@@ -600,9 +622,11 @@ $quickwash = {
 		end
 	end
 	gs 'din_van', 'pblc_pee'
-}
+end
+
 
-$wearpan = {
+$wearpan = "gs 'din_van', 'wearpan'"
+if $ARGS[0] = 'wearpan':
 	if $pantyworntype = 'none':
 		act 'Wear panties (0:02)':
 			minut += 2
@@ -618,9 +642,11 @@ $wearpan = {
 			gt 'bras', 'view_bra_list', 'bathroom'
 		end
 	end
-}
+end
 
-$removepan = {
+
+$removepan = "gs 'din_van', 'removepan'"
+if $ARGS[0] = 'removepan':
 	if $pantyworntype ! 'none' and $braworntype ! 'none':
 		act 'Remove underwear (0:02)':
 			minut += 2
@@ -647,11 +673,13 @@ $removepan = {
 			gt $loc, $loc_arg
 		end
 	end
-}
+end
 
 !! Meant for non-home bathrooms. If you have a bag stashes the underwear in there and enables putting it back on later.
 !! purse_____ variables get wiped in ''wardrobe'', ''clothing'', ''panties'' and ''bra'' so there isn''t a chance of duplication
-$publicpan = {
+
+$publicpan = "gs 'din_van', 'publicpan', $ARGS[0]"
+if $ARGS[0] = 'publicpan':
 	if $pantyworntype ! 'none' and $braworntype ! 'none':
 		act 'Remove underwear'+iif(bag = 1, ' and put it in your purse ',' ') + '(0:02)':
 			minut += 2
@@ -720,7 +748,7 @@ $publicpan = {
 	end
 
 	!! Changing into a different outfit for prostitution
-	if prostitute['active'] = 1 and ARGS[1] ! 'no_prost' and $loc ! 'gschool_break':
+	if prostitute['active'] = 1 and $ARGS[1] ! 'no_prost' and $loc ! 'gschool_break':
 		gs 'prostitution_functions', 'work_clothes'
 		if  prostitute['work_clothes'] = 0 and prostitute['outfit_is_set']:
 			act 'Change into prostitute outfit': gt 'prostitution_functions', 'change_to_work', 'restroom'
@@ -728,9 +756,11 @@ $publicpan = {
 			act 'Change into your regular clothes': gt 'prostitution_functions', 'change_back', 'restroom'
 		end
 	end
-}
+end
 
-$basin = {
+
+$basin = "gs 'din_van', 'basin'"
+if $ARGS[0] = 'basin':
 	if cumloc[12] = 1:
 		act 'Rinse your mouth (0:05)':
 			menu_off = 1
@@ -835,7 +865,7 @@ $basin = {
 	end
 
 	if cumloc[0]+cumloc[3] > 0 and hypnoAddict = 0:
-		if FUNC('Cum_Manage', 'check_innards', 0) = 1 or FUNC('Cum_Manage', 'check_innards', 3) = 1:
+		if func('Cum_Manage', 'check_innards', 0) = 1 or func('Cum_Manage', 'check_innards', 3) = 1:
 			act 'Let the cum drain from you (0:10)':
 				menu_off = 1
 				*clr & cla
@@ -929,13 +959,17 @@ $basin = {
 			act 'Continue': menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
-}
+end
 
-$pirManage = {
+
+$pirManage = "gs 'din_van', 'pirManage'"
+if $ARGS[0] = 'pirManage':
 	gt 'piercing_management', 'main'
-}
+end
+
 
-$enema = {
+$enema = "gs 'din_van', 'enema'"
+if $ARGS[0] = 'enema':
 	if mc_inventory['enema_kit'] = 1 and (klismaday ! daystart or arrpos('sparrloc', 3) > 0):
 		act 'Give yourself an enema (0:05)':
 			menu_off = 1
@@ -970,9 +1004,11 @@ $enema = {
 			end
 		end
 	end
-}
+end
+
 
-$toymanage = {
+$toymanage = "gs 'din_van', 'toymanage'"
+if $ARGS[0] = 'toymanage':
 	if mc_inventory['buttplug'] = 1 and analplugin = 1:
 		act 'Remove your butt plug (0:05)':
 			menu_off = 1
@@ -1043,9 +1079,11 @@ $toymanage = {
 			act 'Finish':gt $loc, $loc_arg
 		end
 	end
-}
+end
+
 
-$palelady = {
+$palelady = "gs 'din_van', 'palelady'"
+if $ARGS[0] = 'palelady':
 	if mc_inventory['cocaine'] > 0:'You have enough cocaine for <<mc_inventory[''cocaine'']>> ' + iif(mc_inventory['cocaine'] = 1, ' line.', ' lines.')
 
 	if mc_inventory['cocaine'] > 0 and drugVars['cocaine_day'] ! daystart:
@@ -1065,7 +1103,7 @@ $palelady = {
 			act 'Continue': menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
-}
+end
 
 if $ARGS[0] = 'private':
 	menu_off = 0
@@ -1108,29 +1146,31 @@ if $ARGS[0] = 'private':
 
 
 	if $ARGS[1] = 'hotelroom':
-		dynamic $shower
-		if $ARGS[2] = 'bath': dynamic $bath
+		gs 'din_van', 'shower'
+		if $ARGS[2] = 'bath': gs 'din_van', 'bath'
 	elseif $loc = 'vanrPar':
 		'You can use your parent''s shampoo.'
-		dynamic $shower
-		dynamic $bath
+		gs 'din_van', 'shower'
+		gs 'din_van', 'bath'
 	elseif $loc = 'LariskaHome':
 		'You can use Lariska''s shampoo.'
-		dynamic $shower
-		dynamic $bath
+		gs 'din_van', 'shower'
+		gs 'din_van', 'bath'
 	elseif $loc = 'tanvanr':
 		'You can use Tanya''s shampoo.'
-		dynamic $shower
-		dynamic $bath
+		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.'
-		dynamic $shower
-		dynamic $bath
+		gs 'din_van', 'shower'
+		gs 'din_van', 'bath'
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 
-	dynamic $SkinCare
+	gs 'din_van', 'SkinCare'
 
 	if mc_inventory['painkillers'] > 0:
 		'You have <b><<mc_inventory[''painkillers'']>></b> painkiller'+iif(mc_inventory['painkillers'] > 1, 's.', '.')
@@ -1160,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 & dynamic $pirManage">Manage your piercings</a>'
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG > 0:'<a href="exec:*clr & cla & gs ''din_van'', ''pirManage''">Manage your piercings</a>'
 
 	if fillimplant = 1:
 		if siliconeBag >= 1:
@@ -1171,17 +1211,17 @@ if $ARGS[0] = 'private':
 			'<a href="exec:cls & bodyVars[''bust_silicone''] -= 10 & gt $loc, $loc_arg">Drain silicone from your breast implants.</a>'
 		end
 	end
-	dynamic $bteeth
+	gs 'din_van', 'bteeth'
 
-	dynamic $tampon
+	gs 'din_van', 'tampon'
 
 	act 'Change clothes and toys':
 		cla
 
 		act 'Return':menu_off = 0 & gt $loc, $loc_arg
 
-		dynamic $wearpan
-		dynamic $removepan
+		gs 'din_van', 'wearpan'
+		gs 'din_van', 'removepan'
 
 		if $curloc = 'vanrPar' and $clothingworntype = 'nude':
 			act 'Wear clothes (0:05)':
@@ -1204,21 +1244,21 @@ if $ARGS[0] = 'private':
 				act 'Return': menu_off = 0 & gt $loc, $loc_arg
 			end
 		end
-		dynamic $toymanage
+		gs 'din_van', 'toymanage'
 	end
 
 	'<a href="exec:msg ''<center>Your weight is <<pcs_weight[0]>>.<<pcs_weight[1]>> kg<br>Your body mass index (BMI) is <<pcs_bmi[0]>>.<<pcs_bmi[1]>>.<br><<$bodyVars[''bmi_desc'']>></center>''">Check weight on the scales</a>'
 
 	gs 'din_van', 'prvt_pee'
 
-	dynamic $basin
+	gs 'din_van', 'basin'
 
-	dynamic $brit
+	gs 'din_van', 'brit'
 
-	dynamic $enema
+	gs 'din_van', 'enema'
 
 
-	dynamic $palelady
+	gs 'din_van', 'palelady'
 
 
 	if mc_inventory['chafing_cream'] > 0 and mosol > 0 and mosal_time <= totminut:
@@ -1764,7 +1804,7 @@ if $ARGS[0] = 'shave_options':
 	menu_off = 1
 	*clr & cla
 	if shave_img_hgt = 0:shave_img_hgt = 100
-	!! images handled using FUNC(''$pube_image'')
+	!! images handled using func(''$body_image'', ''pubes'')
 	*p '<center><h3><b>Shaving optons</b></h3>'
 	'Here you can choose your style for pubic hair and which body parts you wish to shave.'
 	*nl
@@ -1815,16 +1855,16 @@ if $ARGS[0] = 'shave_options':
 		*p '<TR><TD><center><a href="exec:view''images/pc/body/pussy/hair/pussy.jpg''"><img Height = <<shave_img_hgt>> src="images/pc/body/pussy/hair/pussy.jpg"></a></center></TD>'
 
 
-		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 2)
+		$temp_pube_image = func('$body_image', 'pubes', 16, pcs_pubecol[2], 2)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
-		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 3)
+		$temp_pube_image = func('$body_image', 'pubes', 16, pcs_pubecol[2], 3)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
-		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 4)
+		$temp_pube_image = func('$body_image', 'pubes', 16, pcs_pubecol[2], 4)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
-		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 5)
+		$temp_pube_image = func('$body_image', 'pubes', 16, pcs_pubecol[2], 5)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD></TR>'
 
 	!! ROW 1: TEXT
@@ -1861,19 +1901,19 @@ if $ARGS[0] = 'shave_options':
 		*p '</center></TD></TR>'
 
 	!! ROW 2: IMAGES
-		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 6)
+		$temp_pube_image = func('$body_image', 'pubes', 16, pcs_pubecol[2], 6)
 		*p '<TR><TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
-		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 7)
+		$temp_pube_image = func('$body_image', 'pubes', 16, pcs_pubecol[2], 7)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
-		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 8)
+		$temp_pube_image = func('$body_image', 'pubes', 16, pcs_pubecol[2], 8)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
-		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 9)
+		$temp_pube_image = func('$body_image', 'pubes', 16, pcs_pubecol[2], 9)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
-		$temp_pube_image = FUNC('$pube_image', 26, pcs_pubecol[2], 10)
+		$temp_pube_image = func('$body_image', 'pubes', 26, pcs_pubecol[2], 10)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD></TR>'
 
 
@@ -1911,10 +1951,10 @@ if $ARGS[0] = 'shave_options':
 		*p '</center></TD></TR>'
 
 	!! ROW 3: IMAGES
-		$temp_pube_image = FUNC('$pube_image', 5, pcs_pubecol[2], 11)
+		$temp_pube_image = func('$body_image', 'pubes', 5, pcs_pubecol[2], 11)
 		*p '<TR><TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD>'
 
-		$temp_pube_image = FUNC('$pube_image', 16, pcs_pubecol[2], 12)
+		$temp_pube_image = func('$body_image', 'pubes', 16, pcs_pubecol[2], 12)
 		*p '<TD><center><a href="exec:view''<<$temp_pube_image>>''"><img Height = <<shave_img_hgt>> src="<<$temp_pube_image>>"></a></center></TD></TR>'
 
 	!! ROW 3: TEXT

+ 34 - 20
locations/dina.qsrc

@@ -1,6 +1,11 @@
 # dina
 
-$brodila = {
+!! Dynamic code has been translated to static code for performance and savegame size reasons.
+!! The dynamic variables still exist for compatibility reasons.
+!! Whenever possible, don''t use dynamic code (use "gs 'dina', 'xxx'" instead of "dynamic $xxx").
+
+$brodila = "gs 'dina', 'brodila'"
+if $ARGS[0] = 'brodila':
 	sexpartkno = 0
 	if accessible_property['city_apartment'] > 0:
 		gt 'korr', 'start'
@@ -9,9 +14,10 @@ $brodila = {
 	else
 		gt'city_residential', 'start'
 	end
-}
+end
 
-$brodilr = {
+$brodilr = "gs 'dina', 'brodilr'"
+if $ARGS[0] = 'brodilr':
 	if mid($start_type,1,2) = 'sg' and accessible_property['parents_home'] = 4:
 		gt 'pav_residential'
 	elseif accessible_property['old_town_apartment'] = 1:
@@ -19,9 +25,10 @@ $brodilr = {
 	else
 		gt 'city_residential', 'start'
 	end
-}
+end
 
-$brodilk = {
+$brodilk = "gs 'dina', 'brodilk'"
+if $ARGS[0] = 'brodilk':
 	if accessible_property['city_apartment'] > 0:
 		gt 'kuhr', 'start'
 	elseif accessible_property['old_town_apartment']= 1:
@@ -29,9 +36,10 @@ $brodilk = {
 	else
 		gt'city_residential', 'start'
 	end
-}
+end
 
-$brodils = {
+$brodils = "gs 'dina', 'brodils'"
+if $ARGS[0] = 'brodils':
 	if accessible_property['city_apartment'] > 0:
 		gt 'sitr', 'start'
 	elseif accessible_property['old_town_apartment'] = 1:
@@ -41,7 +49,7 @@ $brodils = {
 	else
 		gt'city_residential', 'start'
 	end
-}
+end
 
 !!This sets the default descriptors and folder names for each default image set
 $bodimgsets[0] = 'starving'
@@ -106,15 +114,18 @@ $week[5] = 'Friday'
 $week[6] = 'Saturday'
 $week[7] = 'Sunday'
 
-$dogpot = {
+$dogpot = "gs 'dina', 'dogpot'"
+if $ARGS[0] = 'dogpot':
 	gs 'boyStat', 'A191'
-}
+end
 
-$rexpot = {
+$rexpot = "gs 'dina', 'rexpot'"
+if $ARGS[0] = 'rexpot':
 	gs 'boyStat', 'A166'
-}
+end
 
-$hypnoDaychange = {
+$hypnoDaychange = "gs 'dina', 'hypnoDaychange'"
+if $ARGS[0] = 'hypnoDaychange':
 	!!if for some reason hypnoTime is too high
 	if hypnoTime > 15:hypnoTime = 15
 	timeTresh = 76 - 4*hypnoTime
@@ -146,9 +157,10 @@ $hypnoDaychange = {
 			end
 		end
 	end
-}
+end
 
-$hypnoAddiction = {
+$hypnoAddiction = "gs 'dina', 'hypnoAddiction'"
+if $ARGS[0] = 'hypnoAddiction':
 	if cumloc[0] = 1 or cumloc[3] = 1:
 		killvar 'missCum'
 		if hypnoAddict = 1:
@@ -181,11 +193,12 @@ $hypnoAddiction = {
 			end
 		end
 	end
-}
+end
 
 !!---------------
 
-$prezik = {
+$prezik = "gs 'dina', 'prezik'"
+if $ARGS[0] = 'prezik':
 	if mc_inventory['equipped_condoms'] > 0:
 		if mc_inventory['bad_condoms'] > 0:
 			if rand(1,mc_inventory['equipped_condoms']) <= mc_inventory['bad_condoms']: mc_inventory['bad_condoms'] -= 1 & noprotect = 1
@@ -196,9 +209,10 @@ $prezik = {
 	elseif mc_inventory['equipped_condoms'] < 0:
 		mc_inventory['equipped_condoms'] = 0
 	end
-}
+end
 
-$ferteggfather = {
+$ferteggfather = "gs 'dina', 'ferteggfather'"
+if $ARGS[0] = 'ferteggfather':
 	if fertegg > 0:
 		if thinkpreg = 0 and knowpreg = 0 and sparrppt[sparrtemp] > 0:
 			if cumarrkno[cumarrtemp] = 1:
@@ -215,7 +229,7 @@ $ferteggfather = {
 			end
 		end
 	end
-}
+end
 
 --- dina ---------------------------------
 

+ 28 - 16
locations/dinmother.qsrc

@@ -1,6 +1,11 @@
 # dinmother
 
-$d_mother[1]={
+!! Dynamic code has been translated to static code for performance and savegame size reasons.
+!! The dynamic variables still exist for compatibility reasons.
+!! Whenever possible, don''t use dynamic code (use "gs 'dinmother', 'xxx'" instead of "dynamic $xxx").
+
+$d_mother[1] = "gs 'dinmother', 'd_mother[1]'"
+if $ARGS[0] = 'd_mother[1]':
 	!scandal with my mother
 	'You try having a talk with your mother, but she dislikes you way too much to even pretend to be interested in what you have to say. After a while, you give up and leave her alone. Maybe she''ll be in a better mood later.'
 	if mothersorryday!daystart:
@@ -14,8 +19,9 @@ $d_mother[1]={
 			act 'Move away from her':gt $loc, $loc_arg
 		end
 	end
-}
-$d_mother[2]={
+end
+$d_mother[2] = "gs 'dinmother', 'd_mother[2]'"
+if $ARGS[0] = 'd_mother[2]':
 	!strained relations
 	'You try to have a talk with your mother, but her answers are really short and she sounds kind of annoyed. After a few minutes she cuts the conversation short, saying she has other things to do now.'
 	if mothersorryday!daystart:
@@ -29,8 +35,9 @@ $d_mother[2]={
 			act 'Move away from her':gt $loc, $loc_arg
 		end
 	end
-}
-$d_mother[3]={
+end
+$d_mother[3] = "gs 'dinmother', 'd_mother[3]'"
+if $ARGS[0] = 'd_mother[3]':
 	!good relationship
 	motherTalk = rand (1,10)
 	if motherTalk = 1:
@@ -65,31 +72,36 @@ $d_mother[3]={
 	if motherTalk = 10:
 		'You have a chat with your <<$npc_nickname[''A29'']>>, and she tells you she had to go to the tailor at the garment factory to get some clothes adjusted after she had went up a few sizes. She proudly added that she had to go back and have them readjusted again when she lost the weight a few months later.'
 	end
-}
-$d_mother[4] = {
+end
+$d_mother[4] = "gs 'dinmother', 'd_mother[4]'"
+if $ARGS[0] = 'd_mother[4]':
 	*clr
 	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/posuda'+rand(1,3)+'.jpg"></center><br>Your <a href="exec:gt ''mother''"><<$npc_nickname[''A29'']>></a> stands near the sink, washing dishes.'
-}
+end
 
-$d_mother[5] = {
+$d_mother[5] = "gs 'dinmother', 'd_mother[5]'"
+if $ARGS[0] = 'd_mother[5]':
 	*clr
 	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/gotovka.jpg"></center><br>Your <a href="exec:gt ''mother''"><<$npc_nickname[''A29'']>></a> is preparing meals.'
-}
+end
 
-$d_mother[6] = {
+$d_mother[6] = "gs 'dinmother', 'd_mother[6]'"
+if $ARGS[0] = 'd_mother[6]':
 	*clr
 	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/tea.jpg"></center><br>Your <a href="exec:gt ''mother''"><<$npc_nickname[''A29'']>></a> is drinking tea.'
-}
+end
 
-$d_mother[7] = {
+$d_mother[7] = "gs 'dinmother', 'd_mother[7]'"
+if $ARGS[0] = 'd_mother[7]':
 	*clr
 	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost'+rand(1,11)+'.jpg"></center><br>Your <a href="exec:gt ''mother''"><<$npc_nickname[''A29'']>></a> is busy in the kitchen and unaware of your presence.'
-}
+end
 
-$d_mother[8] = {
+$d_mother[8] = "gs 'dinmother', 'd_mother[8]'"
+if $ARGS[0] = 'd_mother[8]':
 	*clr
 	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka'+rand(1,3)+'.jpg"></center><br>Your <a href="exec:gt ''mother''"><<$npc_nickname[''A29'']>></a> is cleaning with a broom in her hand.'
-}
+end
 
 --- dinmother ---------------------------------
 

+ 27 - 21
locations/dinnpc.qsrc

@@ -1,7 +1,12 @@
 # dinnpc
 !2021/05/02
 
-$din_predlog_dima_bj = {
+!! Dynamic code has been translated to static code for performance and savegame size reasons.
+!! The dynamic variables still exist for compatibility reasons.
+!! Whenever possible, don''t use dynamic code (use "gs 'dinnpc', 'xxx'" instead of "dynamic $xxx").
+
+$din_predlog_dima_bj = "gs 'dinnpc', 'din_predlog_dima_bj'"
+if $ARGS[0] = 'din_predlog_dima_bj':
 	menu_off = 1
 	act 'Get down on your knees':
 		*clr & cla
@@ -24,7 +29,7 @@ $din_predlog_dima_bj = {
 
 			gs 'arousal', 'bj', 5, 'sub', 'rough'
 			gs 'stat'
-			
+
 			act 'Deepthroat him':
 				*clr & cla
 				pcs_throat += 2
@@ -37,17 +42,17 @@ $din_predlog_dima_bj = {
 				pcs_horny = 0
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/sex/blowjob/cocksucker3.jpg"></center>'
-				'Dimka firmly grabbed you by your hair and bucks his hips against you, causing his hard cock to go into your throat. Unprepared for his rough treatment, you choke and tears well up in your eyes but Dimka holds his member there for a few more seconds before he pulls back his member.' 
-				'Your throat finally clear, you cough and have to fight down a bout of nausea. He gives you short breather but that doesn''t last long and as soon as you stop coughing, he puts his hard cock back in your mouth, now with even less regard for you, if that''s even possible.' 
-				'He starts to literally fuck your mouth as hard as if it was a pussy and his cock goes deeper into your throat with every stroke. Snot flows from your nose, strands of saliva hang from your chin, tears keep streaming down your face - in short: You are a mess, and these various liquids drip and drip onto your clothes. Dimka does not let up, though, and fucks your mouth full force, treating you like his own personal sex toy. Your nose keeps hitting his crotch over and over, but then, when you hit it again, Dimka holds your face there, pressing it to his groin.' 
-				'You struggle to relax your throat which, after minutes of harsh treatment, feels like it''s on fire, but the lack of air doesn''t make it any easier.' 
+				'Dimka firmly grabbed you by your hair and bucks his hips against you, causing his hard cock to go into your throat. Unprepared for his rough treatment, you choke and tears well up in your eyes but Dimka holds his member there for a few more seconds before he pulls back his member.'
+				'Your throat finally clear, you cough and have to fight down a bout of nausea. He gives you short breather but that doesn''t last long and as soon as you stop coughing, he puts his hard cock back in your mouth, now with even less regard for you, if that''s even possible.'
+				'He starts to literally fuck your mouth as hard as if it was a pussy and his cock goes deeper into your throat with every stroke. Snot flows from your nose, strands of saliva hang from your chin, tears keep streaming down your face - in short: You are a mess, and these various liquids drip and drip onto your clothes. Dimka does not let up, though, and fucks your mouth full force, treating you like his own personal sex toy. Your nose keeps hitting his crotch over and over, but then, when you hit it again, Dimka holds your face there, pressing it to his groin.'
+				'You struggle to relax your throat which, after minutes of harsh treatment, feels like it''s on fire, but the lack of air doesn''t make it any easier.'
 				''
-				'"What do pigs like you like?", Dimka asks, tightening his grip on your hair. "Do you like getting fucked rough like that? You are my pig now - You''ll grunt and scream on my cock and take everything I have for you."' 
+				'"What do pigs like you like?", Dimka asks, tightening his grip on your hair. "Do you like getting fucked rough like that? You are my pig now - You''ll grunt and scream on my cock and take everything I have for you."'
 				'Without warning, he pulls his dick out of your mouth and furiously strokes it in front of your face.'
 
 				gs 'arousal', 'bj', 5, 'sub', 'rough', 'deepthroat'
 				gs 'stat'
-			
+
 				act 'Catch your breath':
 					*clr & cla
 					minut += 5
@@ -58,20 +63,21 @@ $din_predlog_dima_bj = {
 					dimasexday = daystart
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/cocksucker4.jpg"></center>'
-					'You fall back onto your haunches, panting, your face completely covered in snot, tears and drool, all but oblivious to what Dimka is doing until a jet of sperm erupts from his cock and hits your face, then another, and another. Your whole face is covered with a layer of mucus, a bizarre mix of four body fluids, and yet all you care about is catching your breath before Dimka has any other ideas. You seem to be in luck, though, because after he wipes his cock on your hair, he tucks it back into his pants.' 
+					'You fall back onto your haunches, panting, your face completely covered in snot, tears and drool, all but oblivious to what Dimka is doing until a jet of sperm erupts from his cock and hits your face, then another, and another. Your whole face is covered with a layer of mucus, a bizarre mix of four body fluids, and yet all you care about is catching your breath before Dimka has any other ideas. You seem to be in luck, though, because after he wipes his cock on your hair, he tucks it back into his pants.'
 					'"That wasn''t half bad - with a bit of guidance, you can suck some good dick. We have to do that again sometime." He gives you a strange, cold smile as he turns away. "Well, see you around." You watch as he walks back to the disco, leaving you in your pitiful state.'
 
 					gs 'arousal', 'end'
 					gs 'stat'
-					
+
 					act 'Leave as well':gt 'pav_commcenter'
 				end
 			end
 		end
 	end
-}
+end
 
-$din_dima_predlog = {
+$din_dima_predlog = "gs 'dinnpc', 'din_dima_predlog'"
+if $ARGS[0] = 'din_dima_predlog':
 	menu_off = 1
 	gs 'willpower', 'bj', 'self', 'medium'
 	if will_cost <= pcs_willpwr:
@@ -82,20 +88,20 @@ $din_dima_predlog = {
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
-			'You give Dimka a good, hard, resounding slap that causes him to yelp like a girl as he clutched his red cheek. His immediate reaction only adds to your satisfaction, but the look he gives you is one of pure hatred - one that makes you wonder if he''s going to hit you back now.' 
-			'But instead, he backs away from you, looking like an animal trapped in a corner. His voice is more of an angry hiss:' 
+			'You give Dimka a good, hard, resounding slap that causes him to yelp like a girl as he clutched his red cheek. His immediate reaction only adds to your satisfaction, but the look he gives you is one of pure hatred - one that makes you wonder if he''s going to hit you back now.'
+			'But instead, he backs away from you, looking like an animal trapped in a corner. His voice is more of an angry hiss:'
 			'"You''ll pay for this, sooner or later. Don''t ever come near me again, bitch! Get the hell away from me!"'
 			act 'He doesn''t have to tell you twice - Leave at once':gt $loc, $loc_arg
 		end
 	else
 		act 'Who does he think you are?! - Slap him (<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 '... is he serious? Think about what he said for a moment':
 		*clr & cla
 		gs 'stat'
 		'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
-		'Your eyes widen and you flush at his proposal - surely, he didn''t actually mean that you had to give him a blowjob right here, just so you could go out with him... right?' 
+		'Your eyes widen and you flush at his proposal - surely, he didn''t actually mean that you had to give him a blowjob right here, just so you could go out with him... right?'
 		'As if to answer your question, Dimka unbuttons his pants. "Come on, are you gonna keep me waiting all night long? Which is it? Are you brave and fun? Or just another prude?"'
 		gs 'willpower', 'bj', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -106,20 +112,20 @@ $din_dima_predlog = {
 				gs 'stat'
 				'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
-				'You give Dimka a good, hard, resounding slap that causes him to yelp like a girl as he clutched his red cheek. His immediate reaction only adds to your satisfaction, but the look he gives you is one of pure hatred - one that makes you wonder if he''s going to hit you back now.' 
-				'But instead, he backs away from you, looking like an animal trapped in a corner. His voice is more of an angry hiss:' 
+				'You give Dimka a good, hard, resounding slap that causes him to yelp like a girl as he clutched his red cheek. His immediate reaction only adds to your satisfaction, but the look he gives you is one of pure hatred - one that makes you wonder if he''s going to hit you back now.'
+				'But instead, he backs away from you, looking like an animal trapped in a corner. His voice is more of an angry hiss:'
 				'"You''ll pay for this, sooner or later. Don''t ever come near me again, bitch! Get the hell away from me!"'
 				act 'He doesn''t have to tell you twice - Leave at once':gt $loc, $loc_arg
 			end
 		else
 			act 'That does it! - Slap him (<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 '"And you promise not to tell anyone?"':
 			*clr & cla
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A1'']>> <<$npc_lastname[''A1'']>></font></b></center>'
             '<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
-			'You ask Dimka. You''re really not sure if you want to do this but you also don''t want him to think that you are a prude. You are fun... right? And as long as nobody finds out, as long as only he knows...' 
+			'You ask Dimka. You''re really not sure if you want to do this but you also don''t want him to think that you are a prude. You are fun... right? And as long as nobody finds out, as long as only he knows...'
 			''
 			'Dimka gives you a gentle smile and reassuringly touches your cheek. "No, of course I wouldn''t tell anybody. You''ll be my girlfriend - why would I tell somebody about what we are doing when we''re together?"'
 			dynamic $din_predlog_dima_bj
@@ -129,7 +135,7 @@ $din_dima_predlog = {
 	end
 
 	dynamic $din_predlog_dima_bj
-}
+end
 
 --- dinnpc ---------------------------------
 

+ 24 - 26
locations/dream_events.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 			if blackmailQW['stage'] >= 1 and daystart >= blackmailQW['dreamday']: gs 'blackmailer', 'blackmail_dreams'
 		end
 
-		gt 'dream_events', 'mod_sleepevents'
+		xgt 'dream_events', 'mod_sleepevents'
 	end
 
 	xgt 'dream_events', 'continue'
@@ -72,16 +72,16 @@ if $ARGS[0] = 'mod_sleepevents':
 	!! IT WILL ALMOST CERTIANLY END BADLY WHEN MORE THAN 1 MOD IS INVOLVED.
 
 	gs 'LOCA', 'dream_events', 'mod_sleepevents'
-	gt 'dream_events', 'event_handler'
+	xgt 'dream_events', 'event_handler'
 end
 
 
 if $ARGS[0] = 'event_handler':
 	if sleepVars['events_done'] < 1:
 		if arrsize('$sleep_events_priority') > 0:
-			xgt 'dream_events', 'event_handler2', 'priority'
+			gt 'dream_events', 'event_handler2', 'priority'
 		elseif arrsize('$sleep_events') > 0:
-			xgt 'dream_events', 'event_handler2'
+			gt 'dream_events', 'event_handler2'
 		end
 	end
 
@@ -104,7 +104,7 @@ if $ARGS[0] = 'event_handler2':
 	killvar 'temp_slev_id'
 	dynamic $temp_sleep_event_chosen
 
-	gs 'dream_events', 'event_end'
+	xgt 'dream_events', 'event_end'
 end
 
 
@@ -177,19 +177,17 @@ end
 
 
 if $ARGS[0] = 'no_dream':
-	if $start_type[1] = 'tg':
-		temp = rand(1,10)
-		if temp = 1:
+	if $start_type[1] ! 'tg' or rand(0, 9) > 2:
+		'You sleep without dreaming.'
+	else
+		temp = rand(0, 2)
+		if temp = 0:
 			'You have hazy dreams about your past.'
-		elseif temp = 2:
+		elseif temp = 1:
 			'You dream about the moon looking at the world with his one bloody eye.'
-		elseif temp = 3:
-			'You dream that you are a man again.'
 		else
-			'You sleep without dreaming.'
+			'You dream that you are a man again.'
 		end
-	else
-		'You sleep without dreaming.'
 	end
 	gs 'dream_events', 'event_end'
 end
@@ -211,7 +209,6 @@ if $ARGS[0] = 'erotic_dream_switch':
 		if pcs_vag = 0 and stat['think_virgin'] = 1 and pcs_ass = 0 and stat['anal'] = 0 and stat['bj'] = 0 and stat['hj'] = 0 and stat['cuni'] = 0 and girl = 0 and guy = 0:
 			!dreams only for virgin
 			ivrand = rand(1, 5)
-
 		else
 			ivrand = rand(1, 6 + succublvl)
 		end
@@ -240,18 +237,16 @@ end
 
 if $ARGS[0] = 'd_dream_switch':
 	!! Roll between 1 and 12 if ClownQW = 0 and between 1 and 13 if clownQW = 1.
-	if clownQW = 1:
-		gs 'dream_events', 'd_dreams', rand(1, 13)
-	else
-		gs 'dream_events', 'd_dreams', rand(1, 12)
-	end
+	gs 'dream_events', 'd_dreams', rand(1, iif(clownQW ! 0, 13, 12))
 	gs 'dream_events', 'event_end'
 end
 
 if $ARGS[0] = 'hypno_dream_switch':
 	if therapistFuckedPussyStage < 1:
+		gs 'arousal', 'erotic', -15
 		gs 'dream_events', 'hypno_dreams', rand(1, 2)
 	else
+		gs 'arousal', 'erotic', -20
 		gs 'dream_events', 'hypno_dreams', rand(1, 7)
 	end
 	gs 'dream_events', 'event_end'
@@ -328,7 +323,6 @@ if $ARGS[0] = 'hypno_dreams':
 		end
 	elseif ARGS[1] = 4:
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/hypnoRide4.mp4"></video></center>'
-		
 		if dreamedOfTherapistFucking = 2:
 			'You dream that you''re riding your therapist''s cock. You keep slaming your pussy onto his massive rod as hard as you can, his huge cock bumping against your cervix. It feels wonderful and you feel a deep craving to feel his seed pump into you.'
 		else
@@ -399,7 +393,8 @@ end
 
 if $ARGS[0] = 'sex_dreams':
 	!only vaginal sex
-	ivrand = rand(1,5)
+	gs 'arousal', 'erotic', -25
+	ivrand = rand(1, 5)
 	if ivrand = 1:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/sex1.jpg"></center>'
 		'You dream about having sex at the poolside of an expensive mansion with an attractive athletic man. You bounce up and down on his cock while he firmly grasps your ass. He starts to groan and tense up so you increase the speed of your bouncing and...'
@@ -412,8 +407,7 @@ if $ARGS[0] = 'sex_dreams':
 	elseif ivrand = 4:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/sex4.jpg"></center>'
 		'You dream that you''re bent over a couch with a man behind you pushing his cock in and out of you while firmly grasping your ass. You''re biting your lips from the pleasure.'
-		
-	elseif ivrand = 5:
+	else
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/sex5.jpg"></center>'
 		'You dream that you''re sitting on top of a guy, bouncing up and down on his cock.'
 	end
@@ -430,6 +424,7 @@ end
 
 if $ARGS[0] = 'anal_dreams':
 	!only anal sex
+	gs 'arousal', 'erotic', -25
 	if rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/anal1.jpg"></center>'
 		'You dream that you''re bent over as a man rhythmically pumps your ass with his cock while you caress your clit.'
@@ -437,7 +432,7 @@ if $ARGS[0] = 'anal_dreams':
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/anal2.jpg"></center>'
 		'You dream that you''re laying on your side as a guy fucks your ass. You moan loudly from the sensation.'
 	end
-	
+
 	if stat['anal'] = 0 and pcs_ass = 0:
 		'You wake up feeling strange and excited. Even though you''ve never had anal sex, the dream felt very real.'
 	elseif stat['anal'] = 0:
@@ -449,6 +444,7 @@ end
 
 if $ARGS[0] = 'bj_dreams':
 	!only Blowjob
+	gs 'arousal', 'erotic', -15
 	if rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/bj1.jpg"></center>'
 		'You dream about sucking a guy''s dick during sunset near the ocean.'
@@ -466,6 +462,7 @@ end
 
 if $ARGS[0] = 'ero_dreams':
 	!only erotica
+	gs 'arousal', 'erotic', -10
 	ivrand = rand(1, 5)
 	if ivrand = 1:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/ero1.jpg"></center>'
@@ -479,7 +476,7 @@ if $ARGS[0] = 'ero_dreams':
 	elseif ivrand = 4:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/ero4.jpg"></center>'
 		'You dream that you''re on a bed naked with a girl, kissing and caressing each other passionately,'
-	elseif ivrand = 5:
+	else
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/ero5.jpg"></center>'
 		'You dream that you''re naked while making out with a stranger.'
 	end
@@ -488,6 +485,7 @@ end
 
 if $ARGS[0] = 'gang_dreams':
 	!only Gangbang
+	gs 'arousal', 'erotic', -25
 	if rand(0, 1) = 0:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/gang1.jpg"></center>'
 		'You dream about two men fucking you. You''re lying between them sucking one of them while the other is fucking your ass.'

+ 51 - 31
locations/emp_functions.qsrc

@@ -127,20 +127,26 @@ if $ARGS[0] = 'gen_schedule':
 	!! Create navigaton bars
 	if (mod_max_hour + 8) <= 48:
 		set_hour = ARGS[1] + 8
-		$msg_forward = '<a href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Forward 4 hours</b></a>'
+		$msg_forward = ' | <a href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Forward 4 hours</b></a>'
 	else
-		$msg_forward = 'End of Day'
+		$msg_forward = ' | End of Day'
 	end
-	if (mod_max_hour - 8) >0 :
+	if hour + 8 < 24 and hour - 8 >= 0:
+		set_hour = hour * 2
+		$msg_centre = ' | <a href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Jump to current time</b></a>'
+	else
+		msg_centre = ''
+	end
+	if (mod_max_hour - 8) > 0:
 		set_hour = ARGS[1] - 8
 		$msg_back = '<a href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Back 4 hours</b></a>'
 	else
 		$msg_back = 'Start of day'
 	end
-
 	!! Start the table constuction
 	'<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
-	'<<$msg_back>> | <<$msg_forward>>'
+	'<<$msg_back>><<$msg_centre>><<$msg_forward>>'
+
 	killvar '$tablebody'
 	killvar '$tableheader'
 	killvar '$msg_back'
@@ -172,6 +178,33 @@ if $ARGS[0] = 'job_info':
 	killvar '$msg_body'
 end
 
+!! Helper QoL function show current job for the journal at right time slot and to deactivate stat_display icon when all jobs are finished
+if $ARGS[0] = 'job_alert':
+	!! loop indexes - internal
+	!! s_day - track day of week
+	s_day = week
+	!! s_hour - track hour
+	s_hour = 0
+	!! jmp_clear = end loop on qualification
+	jmp_clear = 0
+	!! reset job start and end hour for stat_display
+	job_start = 99
+	job_end = 99
+	!! Check if previous hour was booked - used to determine last working hour for stat_display
+	prev_hour = 99
+	:s_hour
+		if emp_rota_week['<<s_day>>_<<s_hour>>'] = 1:
+			prev_hour = s_hour
+			if job_start = 99: job_start = s_hour / 2
+		elseif emp_rota_week['<<s_day>>_<<s_hour>>'] = 0 and prev_hour ! 99:
+			if job_end = 99:
+				job_end = prev_hour / 2
+				jmp_clear = 1
+			end
+		end
+		s_hour += 1
+	if s_hour <= 24 and jmp_clear = 0: jump 's_hour'
+end
 !! --------------------- Event Generator
 
 !! Author - Hooded Silence
@@ -472,43 +505,30 @@ if $ARGS[0] = 'del_evt':
 end
 
 if $ARGS[0] = 'evt_day_suffix':
-
-	if ARGS[1] ! 0:
+	if ARGS[1] ! 0 or ARGS[1] < 32:
 		query_day = ARGS[1]
-	else
+	elseif transient_evt_day ! 0 or transient_evt_day < 32:
 		query_day = transient_evt_day
+	else
+		$debug['date_suffix'] = 'Failed to set date suffix. Required Vars not set - ARGS 1: <<ARGS[1]>> / Transient: <<transient_evt_day>> / Query Day: <<query_day>>'
 	end
 	if query_day => 20 and query_day < 30:
 		test_day = query_day - 20
 	else
 		test_day = query_day
 	end
-	if transient_evt_day ! 0:
-		if test_day => 4 and test_day <= 10:
-			$evt_suffix = 'th'
-		elseif test_day = 1 or test_day = 31:
-			$evt_suffix = 'st'
-		elseif test_day = 2:
-			$evt_suffix = 'nd'
-		elseif test_day= 3:
-			$evt_suffix = 'rd'
-		else
-			$evt_suffix = 'th'
-		end
-	end
-	if day => 4 and day <=10:
-		$date_suffix = 'th'
-	elseif day = 1 or day = 21 or day = 31:
-		$date_suffix = 'st'
-	elseif day = 2 or day = 22:
-		$date_suffix = 'nd'
+	if test_day => 4 and test_day <= 10:
+		$evt_suffix = 'th'
+	elseif test_day = 1 or test_day = 31:
+		$evt_suffix = 'st'
+	elseif test_day = 2:
+		$evt_suffix = 'nd'
 	elseif test_day= 3:
-		$date_suffix = 'rd'
+		$evt_suffix = 'rd'
 	else
-		$date_suffix = 'th'
+		$evt_suffix = 'th'
 	end
-
-
+	killvar 'transient_evt_day'
 	killvar 'test_day'
 	killvar 'query_day'
 end

+ 190 - 117
locations/flash.qsrc

@@ -1,27 +1,39 @@
 # flash
 !2020/10/16/Gwen
-!!Centralised flashing location
-!!For flashing events only, do not use for exposure leading to sex
-!!To be used in the following format
-!!gs 'flash', '[type]', '[location]', [time], [option]
-!![time] in minutes, default is 0
-!!Available options as follows
-!![type] - bra, butt, full, panties, pussy, tits
-!![location] - indoors, outdoors
-!![option]
-!!		- Nothing or 0 will clear the screen and give a standard text and randome picture, if you set $flash_image to image string this image will be used instead of a random one. 
-!!		- 1 will only advance time and set the diferent variables but not clear the screen, print text or picture.
-!!		- 2 will add the variabels an advance time and set the random picture, but not clear screen and print text.
-!!eg. gs 'flash', 'tits', 'outdoors', 15, 0
-!!There is no continue action so you must add this as required
-!!You should add checks for underwear before allowing the player to flash them but a non-event contingency is included
+!2024/03/25/Anjuna	- Rewrite of flash code
+!2024/07/23/Anjuna	- Added the option to enforce the
+
+!!	Centralised flashing location
+!!	For flashing events only, do not use for exposure leading to sex
+!!	To be used in the following format
+!!	gs 'flash', '[type]', '[location]', [time], [option]
+!!	[time] in minutes, default is 0
+!!	Available options as follows
+!!	[type] - bra, panty, pantyrear, tits, butt, pussy, full
+!!	[location] - indoors, outdoors
+!!	[option]
+!!		- Nothing or 0 will clear the screen and give a standard text and randome picture. flashVars will be deleted
+!!		- 1 will only advance time and set the diferent variables but not clear the screen, generate text or picture. Optional events will NOT trigger.
+!!			- flashVars['image'] contains the generated image
+!!			- flashVars['text_before'] contains the generated text of the flash itself before the arousal call
+!!			- flashVars['text_after'] contains the generated text of the covering up, after the arousal call
+!!		- 2 will add the variables and advance time and set the random picture, but not clear screen or generate text. flashVars will be deleted
+!!
+!!	You enforce the displayed text and image in the following way:
+!!		- $flash_image or $flash_video will set the image or video (if video is set, that will have priority)
+!!		- $flash_text[0] sets all of the flash itself, before the arousal call
+!!		- $flash_text[1] sets all of the covering up, after the arousal call
+
+!!	eg. gs 'flash', 'tits', 'outdoors', 15, 0
+!!	There is no continue action so you must add this as required
+!!	You should add checks for underwear before allowing the player to flash them but a non-event contingency is included
 
 if $ARGS[0] = 'panties': $ARGS[0] = 'panty'
 if $ARGS[0] = 'panties_rear': $ARGS[0] = 'pantyrear'
 if $ARGS[0] = 'butt' and analplugin = 1: $ARGS[0] = 'butt_plug'
 
 
-if $ARGS[0] = 'get_image' and $flash_image = '':
+if $ARGS[0] = 'get_image' and $flash_image = '' and $flash_video = '':
 	flashVars['dress_ind_bra'] = 3
 	flashVars['dress_ind_tits'] = 12
 	flashVars['dress_ind_panty'] = 4
@@ -31,7 +43,7 @@ if $ARGS[0] = 'get_image' and $flash_image = '':
 	flashVars['dress_ind_butt'] = 7
 	flashVars['dress_ind_full'] = 5
 	flashVars['dress_ind_full_hairy'] = 7
-	
+
 	flashVars['dress_out_bra'] = 4
 	flashVars['dress_out_tits'] = 20
 	flashVars['dress_out_panty'] = 18
@@ -42,7 +54,7 @@ if $ARGS[0] = 'get_image' and $flash_image = '':
 	flashVars['dress_out_butt_plug'] = 8
 	flashVars['dress_out_full'] = 13
 	flashVars['dress_out_full_hairy'] = 11
-	
+
 	flashVars['pants_ind_bra'] = 6
 	flashVars['pants_ind_tits'] = 19
 	flashVars['pants_ind_panty'] = 1
@@ -52,7 +64,7 @@ if $ARGS[0] = 'get_image' and $flash_image = '':
 	flashVars['pants_ind_butt'] = 6
 	flashVars['pants_ind_full'] = 1
 	flashVars['pants_ind_full_hairy'] = 1
-	
+
 	flashVars['pants_out_bra'] = 5
 	flashVars['pants_out_tits'] = 19
 	flashVars['pants_out_panty'] = 6
@@ -76,7 +88,7 @@ if $ARGS[0] = 'get_image' and $flash_image = '':
 		$flash_image += 'pants/'
 	end
 	if $ARGS[2] = 'inside' or $ARGS[2] = 'indoors':
-		$temp_id_text += 'ins_'
+		$temp_id_text += 'ind_'
 		$flash_image += 'inside/'
 	else
 		$temp_id_text += 'out_'
@@ -92,156 +104,192 @@ if $ARGS[0] = 'get_image' and $flash_image = '':
 	end
 
 	flashVars['rand'] = rand(1, flashVars[$temp_id_text])
-	$flash_image += str(flashVars['rand'])
+	$flash_image += str(flashVars['rand']) + '.jpg'
+
 	$flashVars['image'] = $flash_image
 
 	killvar 'temp_id_text'
 end
 
 
+if $ARGS[0] = 'display_image':
+	if $flash_video = '':
+		'<center><img <<$set_imgh>> src="<<$flash_image>>"></center>'
+	else
+		'<center><video autoplay loop src="<<$flash_video>>"></video></center>'
+	end
+end
+
+
+
+
+	!!=========================================================!!
+	!!                                                         !!
+	!!                          TYPES                          !!
+	!!                                                         !!
+	!!=========================================================!!
+
 
 if $ARGS[0] = 'bra':
 	if Exhibitionist_lvl < 1 or pcs_inhib < 40: gs 'flash', 'exhibitionism', 1
-	gs 'arousal', 'flashlite', ARGS[2]
-	gs 'arousal', 'end'
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+
+	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_after'] = 'You pull your top back down, feeling the thrill of excitement running down your spine.'
+
 	if ARGS[3] < 1:
 		*clr
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
-		'You glance around to see who all is in the area, then you pull up your top and expose your bra clad breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-		gs 'blackmailer', 'init_check', $ARGS[0], $ARGS[1]
-		'You pull your top back down, feeling the thrill of excitement running down your spine.'
-
-		$flash_image = ''
-	elseif ARGS[3] = 2:
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
+		$flash_text[0] = $flashVars['text_before']
+		$flash_text[1] = $flashVars['text_after']
 	end
 
-	if ARGS[3] ! 1: killvar 'flashVars'
+	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+	if ARGS[4] ! 1: gs 'flash', 'display_image'
+
+	if $flash_text[0] ! '': '<<$flash_text[0]>>'
+	gs 'arousal', 'flashlite', ARGS[2]
+	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
+	if $flash_text[1] ! '': '<<$flash_text[1]>>'
+	gs 'arousal', 'end'
+
+	gs 'flash', 'cleanup', ARGS[3]
 end
 
 if $ARGS[0] = 'tits':
 	gs 'flash', 'exhibitionism', 1
-	gs 'arousal', 'flashlite', ARGS[2]
-	gs 'arousal', 'end'
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+
+	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_before'] = 'You pull your top back down, feeling the thrill of excitement running down your spine.'
+
 	if ARGS[3] < 1:
-		*clr
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
-		'You glance around to see who all is in the area, then you pull up your top and expose your bare breasts to the world. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-		gs 'blackmailer', 'init_check', $ARGS[0], $ARGS[1]
-		'You pull your top back down, feeling the thrill of excitement running down your spine.'
-		$flash_text
-
-		$flash_text
-		$flash_image = ''
-	elseif ARGS[3] = 2:
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
+		$flash_text[0] = $flashVars['text_before']
+		$flash_text[1] = $flashVars['text_after']
 	end
 
-	if ARGS[3] ! 1: killvar 'flashVars'
+	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+	if ARGS[4] ! 1: gs 'flash', 'display_image'
+
+	if $flash_text[0] ! '': '<<$flash_text[0]>>'
+	gs 'arousal', 'flashlite', ARGS[2]
+	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
+	if $flash_text[1] ! '': '<<$flash_text[1]>>'
+	gs 'arousal', 'end'
+
+	gs 'flash', 'cleanup', ARGS[3]
 end
 
 if $ARGS[0] = 'panty' or $ARGS[0] = 'panties':
 	gs 'flash', 'exhibitionism', 2
-	gs 'arousal', 'flash', ARGS[2]
-	gs 'arousal', 'end'
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+
+	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you ' + iif(PCloSkirt > 0, 'lift the front of your skirt', 'pull down the front of your pants') + ' to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_before'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
+
 	if ARGS[3] < 1:
-		*clr
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
-		'You glance around to see who all is in the area, then you ' + iif(PCloSkirt > 0, 'lift the front of your skirt', 'pull down the front of your pants') + ' to show off your panties. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-		gs 'blackmailer', 'init_check', $ARGS[0], $ARGS[1]
-		'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
-
-		$flash_image = ''
-	elseif ARGS[3] = 2:
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
+		$flash_text[0] = $flashVars['text_before']
+		$flash_text[1] = $flashVars['text_after']
 	end
 
-	if ARGS[3] ! 1: killvar 'flashVars'
+	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+	if ARGS[4] ! 1: gs 'flash', 'display_image'
+
+	if $flash_text[0] ! '': '<<$flash_text[0]>>'
+	gs 'arousal', 'flash', ARGS[2]
+	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
+	if $flash_text[1] ! '': '<<$flash_text[1]>>'
+	gs 'arousal', 'end'
+
+	gs 'flash', 'cleanup', ARGS[3]
 end
 
 if $ARGS[0] = 'pantyrear' or $ARGS[0] = 'panties_rear':
 	gs 'flash', 'exhibitionism', 2
-	gs 'arousal', 'flash', ARGS[2]
-	gs 'arousal', 'end'
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+
+	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you pull ' + iif(PCloSkirt > 0, 'up your skirt', 'down the back of your pants') + ' to show off your panty-clad butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_before'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
+
 	if ARGS[3] < 1:
-		*clr
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
-		'You glance around to see who all is in the area, then you pull ' + iif(PCloSkirt > 0, 'up your skirt', 'down the back of your pants') + ' to show off your panty-clad butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-		gs 'blackmailer', 'init_check', $ARGS[0], $ARGS[1]
-		'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
-
-		$flash_image = ''
-	elseif ARGS[3] = 2:
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
+		$flash_text[0] = $flashVars['text_before']
+		$flash_text[1] = $flashVars['text_after']
 	end
 
-	if ARGS[3] ! 1: killvar 'flashVars'
-end
+	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+	if ARGS[4] ! 1: gs 'flash', 'display_image'
 
-if $ARGS[0] = 'pussy':
-	gs 'flash', 'exhibitionism', 3
+	if $flash_text[0] ! '': '<<$flash_text[0]>>'
 	gs 'arousal', 'flash', ARGS[2]
+	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
+	if $flash_text[1] ! '': '<<$flash_text[1]>>'
 	gs 'arousal', 'end'
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
-	if ARGS[3] < 1:
-		*clr
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
-		'You glance around to see who all is in the area, then you pull ' + iif(PCloSkirt > 0, 'up the front of your skirt', 'down the front of your pants') + ' to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-		gs 'blackmailer', 'init_check', $ARGS[0], $ARGS[1]
-		'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
-
-		$flash_image = ''
-	elseif ARGS[3] = 2:
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
-	end
 
-	if ARGS[3] ! 1: killvar 'flashVars'
+	gs 'flash', 'cleanup', ARGS[3]
 end
 
-
-
 if $ARGS[0] = 'butt' or $ARGS[0] = 'butt_plug':
 	gs 'flash', 'exhibitionism', 2
+
+	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you pull ' + iif(PCloSkirt > 0, 'up the back of your skirt', 'down the back of your pants') + ' to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_before'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
+
+	if ARGS[3] < 1:
+		$flash_text[0] = $flashVars['text_before']
+		$flash_text[1] = $flashVars['text_after']
+	end
+
+	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+	if ARGS[4] ! 1: gs 'flash', 'display_image'
+
+	if $flash_text[0] ! '': '<<$flash_text[0]>>'
 	gs 'arousal', 'flash', ARGS[2]
+	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
+	if $flash_text[1] ! '': '<<$flash_text[1]>>'
 	gs 'arousal', 'end'
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+
+	gs 'flash', 'cleanup', ARGS[3]
+end
+
+if $ARGS[0] = 'pussy':
+	gs 'flash', 'exhibitionism', 3
+
+	$flashVars['text_before'] = 'You glance around to see who  is in the area, then you pull ' + iif(PCloSkirt > 0, 'up the front of your skirt', 'down the front of your pants') + ' to show off your pussy. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
+	$flashVars['text_before'] = 'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
+
 	if ARGS[3] < 1:
-		*clr
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
-		'You glance around to see who all is in the area, then you pull ' + iif(PCloSkirt > 0, 'up the back of your skirt', 'down the back of your pants') + ' to show off your butt. Most people don''t notice but a few do, some smile, others frown or shake their head in disgust.'
-		gs 'blackmailer', 'init_check', $ARGS[0], $ARGS[1]
-		'You ' + iif(PCloSkirt > 0, 'lower the skirt back in place', 'pull your pants back up') + ', feeling the thrill of excitement running down your spine.'
-
-		$flash_image = ''
-	elseif ARGS[3] = 2:
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
+		$flash_text[0] = $flashVars['text_before']
+		$flash_text[1] = $flashVars['text_after']
 	end
 
-	if ARGS[3] ! 1: killvar 'flashVars'
+	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+	if ARGS[4] ! 1: gs 'flash', 'display_image'
+
+	if $flash_text[0] ! '': '<<$flash_text[0]>>'
+	gs 'arousal', 'flash', ARGS[2]
+	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
+	if $flash_text[1] ! '': '<<$flash_text[1]>>'
+	gs 'arousal', 'end'
+
+	gs 'flash', 'cleanup', ARGS[3]
 end
 
 if $ARGS[0] = 'full':
 	gs 'flash', 'exhibitionism', 3
-	gs 'arousal', 'flash', ARGS[2]
-	gs 'arousal', 'end'
-	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+
+	$flashflashVars['text_before'] = 'Making sure there are no children around and it''s not too busy you ' + iif(PCloSkirt > 0, 'lift your skirt and top', 'lower your pants and lift your top') + ' to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly.'
+	$flashVars['text_before'] = 'You quickly cover up again enjoying a buzz of excitement.'
+
 	if ARGS[3] < 1:
-		*clr
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
-		'Making sure there are no children around and it''s not too busy you ' + iif(PCloSkirt > 0, 'lift your skirt and top', 'lower your pants and lift your top') + ' to expose both your pussy and breasts. Most people who see you are shocked but some look at you admiringly.'
-		gs 'blackmailer', 'init_check', $ARGS[0], $ARGS[1]
-		'You quickly cover up again enjoying a buzz of excitement.'
-
-		$flash_image = ''
-	elseif ARGS[3] = 2:
-		'<center><img <<$set_imgh>> src="<<$flash_image>>.jpg"></center>'
+		$flash_text[0] = $flashVars['text_before']
+		$flash_text[1] = $flashVars['text_after']
 	end
 
-	if ARGS[3] ! 1: killvar 'flashVars'
+	gs 'flash', 'get_image', $ARGS[0], $ARGS[1]
+	if ARGS[4] ! 1: gs 'flash', 'display_image'
+
+	if $flash_text[0] ! '': '<<$flash_text[0]>>'
+	gs 'arousal', 'flash', ARGS[2]
+	if ARGS[4] ! 1: gs 'flash', 'events', $ARGS[1], $ARGS[2], ARGS[3], ARGS[4]
+	if $flash_text[1] ! '': '<<$flash_text[1]>>'
+	gs 'arousal', 'end'
+
+	gs 'flash', 'cleanup', ARGS[3]
 end
 
 !!For us only when Sveta chooses to flash
@@ -276,4 +324,29 @@ if $ARGS[0] = 'exhibitionism':
 	if pcs_exhib > 100: pcs_exhib = 100
 end
 
---- flash ---------------------------------
+
+if $ARGS[0] = 'cleanup':
+	if ARGS[1] ! 1: killvar 'flashVars'
+	killvar '$flash_image'
+	killvar '$flash_video'
+	killvar '$flash_text'
+end
+
+
+
+
+	!!=========================================================!!
+	!!                                                         !!
+	!!                         EVENTS                          !!
+	!!                                                         !!
+	!!=========================================================!!
+
+!! $ARGS[1] = type
+!! $ARGS[2] = location
+!!  ARGS[3] = time
+!!  ARGS[4] = option
+if $ARGS[0] = 'events':
+	gs 'blackmailer', 'init_check', $ARGS[0], $ARGS[1]
+end
+
+--- flash ---------------------------------

+ 169 - 184
locations/fuelstation_carwash.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 	if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
 		minut += 5
 		pcs_mood -= 5
-		gs 'fame', 'pav', 'sex', rand(0,2)
+		gs 'fame', 'pav', 'sex', rand(0, 2)
 
 		'The gas station worker chases you away. "At least wash yourself off first, whore!"'
 
@@ -35,7 +35,7 @@ if $ARGS[0] = 'wash':
 
 	! only wearing bimbo or prostitute clothing and looking good can get propositioned by a customer
 	if PCloBimbo = 1 or PCloStyle = 4:
-		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean' + rand(1,4) + '.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<rand(1, 4)>>.jpg"></center>'
 
 		minut += 60
 		pcs_mood -= 5
@@ -48,19 +48,18 @@ if $ARGS[0] = 'wash':
 
 			! min chance of 20 percent; max chance of 80 percent; percent chance scales with fame['city_slut'] or fame['pav_slut']
 			! as your reputation increases you will be asked more often
-			skimpyCustomerChance = rand(1, 100)
-			if skimpyCustomerChance <= min(max(20,slut_compare),80):
+			if rand(1, 100) <= min(max(20, slut_compare), 80):
 				'As you finish washing another car, the driver walks up to you to give you a tip. From the way he''s looking at you, it''s obvious he''s interested in something more as well.'
 				! starts off with always doing titsQ when rep is low, as rep increases they may skip a question since they know you will do it anyway
 				! also different people have different tastes so you wont be asked the same thing in the same order every time by every customer that walks up to you
 				carwashscene = rand(1, 100)
-				if carwashscene <= min(max(25,slut_compare),50) and carwashscene >= 25:
+				if carwashscene <= min(max(25, slut_compare), 50) and carwashscene >= 25:
 					gt 'fuelstation_carwash', 'assQ'
-				elseif carwashscene <= min(max(50,slut_compare),65) and carwashscene >= 50:
+				elseif carwashscene <= min(max(50, slut_compare), 65) and carwashscene >= 50:
 					gt 'fuelstation_carwash', 'pussyQ'
-				elseif carwashscene <= min(max(65,slut_compare),85) and carwashscene >= 65:
+				elseif carwashscene <= min(max(65, slut_compare), 85) and carwashscene >= 65:
 					gt 'fuelstation_carwash', 'handQ'
-				elseif carwashscene <= min(max(85,slut_compare),100) and carwashscene >= 85:
+				elseif carwashscene <= min(max(85, slut_compare), 100) and carwashscene >= 85:
 					gt 'fuelstation_carwash', 'blowQ'
 				else
 					gt 'fuelstation_carwash', 'titsQ'
@@ -81,7 +80,7 @@ if $ARGS[0] = 'wash':
 		gs 'sweat', 'add', 2
 		money += 60
 
-		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/regular' + rand(1,4) + '.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/regular<<rand(1, 4)>>.jpg"></center>'
 
 		! normal money just for the car washing
 		'You wash the windows of several cars and earn 60 <b>₽</b>.'
@@ -100,7 +99,7 @@ if $ARGS[0] = 'flash_passing':
 end
 
 if $ARGS[0] = 'titsQ':
-	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean' + rand(1,4) + '.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<rand(1, 4)>>.jpg"></center>'
 
 	'"Want to earn some more cash, girl? Show me your tits and I''ll give you 50 <b>₽</b>. It''s easy money."'
 
@@ -110,7 +109,7 @@ if $ARGS[0] = 'titsQ':
 end
 
 if $ARGS[0] = 'assQ':
-	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean' + rand(1,4) + '.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<rand(1, 4)>>.jpg"></center>'
 
 	'"What a nice ass you have there. Will 50 <b>₽</b> convince you to show it to me?"'
 
@@ -120,7 +119,7 @@ if $ARGS[0] = 'assQ':
 end
 
 if $ARGS[0] = 'pussyQ':
-	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean' + rand(1,4) + '.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<rand(1, 4)>>.jpg"></center>'
 
 	'"You look like a cool girl. Let me see your pussy and I''ll give you 50 <b>₽</b>."'
 
@@ -130,7 +129,7 @@ if $ARGS[0] = 'pussyQ':
 end
 
 if $ARGS[0] = 'handQ':
-	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean' + rand(1,4) + '.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<rand(1, 4)>>.jpg"></center>'
 
 	'"Could you help me out, girl? It''s getting tight down here in my pants just looking at you. How about you... help me out? I''ll pay you 200 <b>₽</b>."'
 
@@ -140,7 +139,7 @@ if $ARGS[0] = 'handQ':
 end
 
 if $ARGS[0] = 'blowQ':
-	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean' + rand(1,4) + '.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/bimboclean<<rand(1, 4)>>.jpg"></center>'
 
 	'"Looking hot today, girl! How about you put your mouth to good use? I''ll pay you 200 <b>₽</b>."'
 
@@ -151,7 +150,7 @@ end
 
 if $ARGS[0] = 'refuse':
 	! just being asked can slowly change your inhibitions which will enable a player to eventually agree to the questions above
-	if pcs_inhib < 35: inhib_exp += rand(1,2)
+	if pcs_inhib < 35: inhib_exp += rand(1, 2)
 	pcs_mood += 5
 	gs 'stat'
 
@@ -165,65 +164,55 @@ end
 ! $ARGS[1] = whether you got paid for this
 ! $ARGS[2] = whether this act came from a customer question or just flashing for passing cars
 if $ARGS[0] = 'titsFlash':
-	! reputation and money will depend on whether you were paid
-	if $ARGS[1] = 'Paid':
-		money += 50
-		if $region = 'city':
-			gs 'fame', 'city', 'prostitute', rand(0,1)
-		elseif $region = 'pav':
-			gs 'fame', 'pav', 'prostitute', rand(0,1)
-		end
-	elseif $ARGS[1] = 'Free':
-		gs 'flash', 'tits', 'outdoors', 1, 1
-	end
-	if pcs_inhib < 30: inhib_exp += rand(2,4)
-	pcs_mood += 5
-	gs 'stat'
-
 	! chance for using photos or videos
 	if rand(1,100) < 50:
-		i = rand(1,100)
 		! chance of using old pics since there are so many newer pics to choose from
-		if i < 15:
+		if rand(1,100) < 15:
 			if PCloPants > 0:
-				i = rand(1,2)
-				'<center><img <<$set_imgh>> src="images/locations/shared/carwash/pants/titsflash<<i>>.jpg"></center>'
-			elseif PCloSkirt > 0:
-				i = 1
-				'<center><img <<$set_imgh>> src="images/locations/shared/carwash/skirt/titsflash<<i>>.jpg"></center>'
+				$flash_image = 'images/locations/shared/carwash/pants/titsflash<<rand(1, 2)>>.jpg'
+			else
+				$flash_image = 'images/locations/shared/carwash/skirt/titsflash1.jpg'
 			end
 		else
 			! newer photos are more neatly organized into different folders so no looping needed
-			if PCloPants > 0:
-				'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/outside/tits/' + rand(1,14) + '.jpg"></center>'
-			elseif PCloSkirt > 0:
-				'<center><img <<$set_imgh>> src="images/pc/activities/flashing/dress/outside/tits/' + rand(1,12) + '.jpg"></center>'
-			end
+			!! Let the flash system handle it.
 		end
 	else
 		if PCloPants > 0:
-			i = rand(1,4)
-			'<center><video autoplay loop src="images/locations/shared/carwash/pants/titsflash<<i>>.mp4"></video></center>'
-		elseif PCloSkirt > 0:
-			i = rand(1,3)
-			'<center><video autoplay loop src="images/locations/shared/carwash/skirt/titsflash<<i>>.mp4"></video></center>'
+			$flash_video = 'images/locations/shared/carwash/pants/titsflash<<rand(1, 4)>>.mp4'
+		elsei
+			$flash_video = 'images/locations/shared/carwash/skirt/titsflash<<rand(1, 3)>>.mp4'
 		end
 	end
 
 	! text differences depending on whether you were paid, whether you are flashing for a customer or for the cars on the road, and what type of clothing you are wearing
 	if $ARGS[1] = 'Paid':
-		if PCloPants > 0: 'You lift up your top and show him your breasts for a few seconds before quickly covering up and taking your money.'
-		if PCloSkirt > 0: 'You pull down your top and show him your breasts for a few seconds before quickly covering up and taking your money.'
-	elseif $ARGS[1] = 'Free':
+		$flash_text[0] = 'You ' + iif(PCloSkirt > 0, 'pull down', 'lift up') + ' your top and show him your breasts for a few seconds.'
+		$flash_text[1] = 'You quickly cover up and take your money.'
+	else
 		if $ARGS[2] = 'Question':
-			if PCloPants > 0: 'You lift up your top and show him your breasts for a few seconds. You give your breasts a little shake for him before you cover up.'
-			if PCloSkirt > 0: 'You pull down your top and show him your breasts for a few seconds. You give your breasts a little shake for him before you cover up.'
-		elseif $ARGS[2] = 'Flash':
-			if PCloPants > 0: 'You lift up your top and expose your breasts to the road for a few seconds. A few cars pass by and honk in appreciation as you give your breasts a little shake before covering up.'
-			if PCloSkirt > 0: 'You pull down your top and expose your breasts to the road for a few seconds. A few cars pass by and honk in appreciation as you give your breasts a little shake before covering up.'
+			$flash_text[0] = 'You ' + iif(PCloSkirt > 0, 'pull down', 'lift up')   + ' your top and show him your breasts for a few seconds. You give your breasts a little shake for him.'
+			$flash_text[1] = 'You ' + iif(PCloSkirt > 0, 'lift up',   'pull down') + ' your top and cover up.'
+		else
+			$flash_text[0] = 'You ' + iif(PCloSkirt > 0, 'pull down', 'lift up')   + ' your top and expose your breasts to the road for a few seconds. A few cars pass by and honk in appreciation as you give your breasts a little shake.'
+			$flash_text[1] = 'You ' + iif(PCloSkirt > 0, 'lift up',   'pull down') + ' your top and cover up.'
 		end
 	end
-	gs 'arousal', 'flashlite', 5
+
+	gs 'flash', 'tits', 'outdoors', 1, 2
+
+	! reputation and money will depend on whether you were paid
+	if $ARGS[1] = 'Paid':
+		money += 50
+		if $region = 'city':
+			gs 'fame', 'city', 'prostitute', rand(0, 1)
+		elseif $region = 'pav':
+			gs 'fame', 'pav', 'prostitute', rand(0, 1)
+		end
+	end
+
+	if pcs_inhib < 30: inhib_exp += rand(2, 4)
+	pcs_mood += 5
 	gs 'stat'
 
 	! can only continue with more questions if flashing for a customer
@@ -254,68 +243,59 @@ end
 ! $ARGS[1] = whether you got paid for this
 ! $ARGS[2] = whether this act came from a customer question or just flashing for passing cars
 if $ARGS[0] = 'assFlash':
-	if $ARGS[1] = 'Paid':
-		money += 50
-		if $region = 'city':
-			gs 'fame', 'city', 'prostitute', rand(0,1)
-		elseif $region = 'pav':
-			gs 'fame', 'pav', 'prostitute', rand(0,1)
-		end
-	elseif $ARGS[1] = 'Free':
-		gs 'flash', 'butt', 'outdoors', 2, 1
-	end
-	if pcs_inhib < 30: inhib_exp += rand(2,4)
-	pcs_mood += 5
-	gs 'stat'
-
-	if rand(1,100) < 50:
-		i = rand(1,100)
+	if rand(1, 100) < 50:
+		i = rand(1, 100)
 		if i < 10:
 			if PCloPants > 0:
-				i = 1
-				'<center><img <<$set_imgh>> src="images/locations/shared/carwash/pants/assflash<<i>>.jpg"></center>'
-			elseif PCloSkirt > 0:
-				i = 1
-				'<center><img <<$set_imgh>> src="images/locations/shared/carwash/skirt/assflash<<i>>.jpg"></center>'
+				$flash_image = 'images/locations/shared/carwash/pants/assflash1.jpg'
+			else
+				$flash_image = 'images/locations/shared/carwash/skirt/assflash1.jpg'
 			end
 		else
-			if PCloPants > 0:
-				'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/outside/butt/' + rand(1,16) + '.jpg"></center>'
-			elseif PCloSkirt > 0:
-				'<center><img <<$set_imgh>> src="images/pc/activities/flashing/dress/outside/butt/' + rand(1,9) + '.jpg"></center>'
-			end
+			!! Let the flash system handle it
 		end
 	else
 		if PCloPants > 0:
-			i = rand(1,3)
-			'<center><video autoplay loop src="images/locations/shared/carwash/pants/assflash<<i>>.mp4"></video></center>'
-		elseif PCloSkirt > 0:
-			i = rand(1,2)
-			'<center><video autoplay loop src="images/locations/shared/carwash/skirt/assflash<<i>>.mp4"></video></center>'
+			$flash_video = 'images/locations/shared/carwash/pants/assflash<<rand(1, 3)>>.mp4'
+		else
+			$flash_video = 'images/locations/shared/carwash/skirt/assflash<<rand(1, 2)>>.mp4'
 		end
 	end
 
 	if $ARGS[1] = 'Paid':
-		if PCloPants > 0: 'You pull your pants down and show him your ass for a few seconds before quickly covering up and taking your money.'
-		if PCloSkirt > 0: 'You lift your skirt up and show him your ass for a few seconds before quickly covering up and taking your money.'
-	elseif $ARGS[1] = 'Free':
+		$flash_text[0] = 'You ' + iif(PCloSkirt > 0, 'lift your ' + iif(PCloDress = 1, 'dress', 'skirt') + ' up', 'pull your pants down') + ' and show him your ass for a few seconds.'
+		$flash_text[1] = 'You quickly cover up and take your money.'
+	else
 		if $ARGS[2] = 'Question':
-			if PCloPants > 0: 'You pull your pants down and show him your ass for a few seconds. You give your ass a little shake for him before covering up.'
-			if PCloSkirt > 0: 'You lift your skirt up and show him your ass for a few seconds. You give your ass a little shake for him before covering up.'
-		elseif $ARGS[2] = 'Flash':
-			if PCloPants > 0: 'You pull your pants down and expose your ass to the road for a few seconds. A few cars pass by and honk in appreciation as you give your ass a little shake before covering up.'
-			if PCloSkirt > 0: 'You lift your skirt up and expose your ass to the road for a few seconds. A few cars pass by and honk in appreciation as you give your ass a little shake before covering up.'
+			$flash_text[0] = 'You ' + iif(PCloSkirt > 0, 'lift your ' + iif(PCloDress = 1, 'dress', 'skirt') + ' up',   'pull your pants down') + ' and show him your ass for a few seconds. You give your ass a little shake for him before covering up.'
+			$flash_text[1] = 'You ' + iif(PCloSkirt > 0, 'pull your ' + iif(PCloDress = 1, 'dress', 'skirt') + ' down', 'pull your pants up')   + ' and cover up.'
+		else
+			$flash_text[0] = 'You ' + iif(PCloSkirt > 0, 'lift your ' + iif(PCloDress = 1, 'dress', 'skirt') + ' up',   'pull your pants down') + ' and expose your ass to the road for a few seconds. A few cars pass by and honk in appreciation as you give your ass a little shake.'
+			$flash_text[1] = 'You ' + iif(PCloSkirt > 0, 'pull your ' + iif(PCloDress = 1, 'dress', 'skirt') + ' down', 'pull your pants up')   + ' and cover up.'
+		end
+	end
+
+	gs 'flash', 'butt', 'outdoors', 2, 2
+
+	! reputation and money will depend on whether you were paid
+	if $ARGS[1] = 'Paid':
+		money += 50
+		if $region = 'city':
+			gs 'fame', 'city', 'prostitute', rand(0, 1)
+		elseif $region = 'pav':
+			gs 'fame', 'pav', 'prostitute', rand(0, 1)
 		end
 	end
-	gs 'arousal', 'flashlite', 5
+	if pcs_inhib < 30: inhib_exp += rand(2, 4)
+	pcs_mood += 5
 	gs 'stat'
 
 	!if (bimbolevel >= 1 or pcs_horny >= 10) and (PCloBimbo = 1 or PCloStyle = 4) and $ARGS[2] = 'Question':
 	if (bimbolevel >= 1 or pcs_horny >= 10) and (PCloBimbo = 1 or PCloStyle = 4) and $ARGS[2] = 'Question':
-		carwashscene = rand(1,100)
-		if carwashscene <= min(max(50,slut_compare),75) and carwashscene >= 50:
+		carwashscene = rand(1, 100)
+		if carwashscene <= min(max(50, slut_compare), 75) and carwashscene >= 50:
 			act 'Continue': gt 'fuelstation_carwash', 'handQ'
-		elseif carwashscene <= min(max(75,slut_compare),100) and carwashscene >= 75:
+		elseif carwashscene <= min(max(75, slut_compare), 100) and carwashscene >= 75:
 			act 'Continue': gt 'fuelstation_carwash', 'blowQ'
 		else
 			act 'Continue': gt 'fuelstation_carwash', 'pussyQ'
@@ -331,6 +311,23 @@ end
 ! $ARGS[1] = whether you got paid for this
 ! $ARGS[2] = whether this act came from a customer question or just flashing for passing cars
 if $ARGS[0] = 'pussyFlash':
+	!! Flash image is handled the the 'flash' function
+	if $ARGS[1] = 'Paid':
+		$flash_text[0] = 'You ' + iif(PCloSkirt > 0, 'lift your ' + iif(PCloDress = 1, 'dress', 'skirt') + ' up ', 'pull your pants down') + ' and show him your pussy for a few seconds.'
+		$flash_text[1] = 'You quickly cover up and take your money.'
+	else
+		if $ARGS[2] = 'Question':
+			$flash_text[0] = 'You ' + iif(PCloSkirt > 0, 'lift your ' + iif(PCloDress = 1, 'dress', 'skirt') + ' up',   'pull your pants down') + ' and show him your pussy for a few seconds, rubbing your clit a little for him.'
+			$flash_text[1] = 'You ' + iif(PCloSkirt > 0, 'pull your ' + iif(PCloDress = 1, 'dress', 'skirt') + ' down', 'pull your pants up')   + ' and cover up.'
+		else
+			$flash_text[0] = 'You ' + iif(PCloSkirt > 0, 'lift your ' + iif(PCloDress = 1, 'dress', 'skirt') + ' up',   'pull your pants down') + ' and expose your pussy to the road for a few seconds. A few cars pass by and honk in appreciation as you rub your clit a little.'
+			$flash_text[1] = 'You ' + iif(PCloSkirt > 0, 'pull your ' + iif(PCloDress = 1, 'dress', 'skirt') + ' down', 'pull your pants up')   + ' and cover up.'
+		end
+	end
+
+	gs 'flash', 'full', 'outdoors', 3, 2
+
+	! reputation and money will depend on whether you were paid
 	if $ARGS[1] = 'Paid':
 		money += 50
 		if $region = 'city':
@@ -338,38 +335,16 @@ if $ARGS[0] = 'pussyFlash':
 		elseif $region = 'pav':
 			gs 'fame', 'pav', 'prostitute', 1
 		end
-	elseif $ARGS[1] = 'Free':
-		gs 'flash', 'full', 'outdoors', 3, 1
-	end
-	if pcs_inhib < 40: inhib_exp += rand(4,6)
-	pcs_mood += 5
-	gs 'stat'
-
-	if PCloPants > 0:
-		'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/outside/pussy/' + rand(1,9) + '.jpg"></center>'
-	elseif PCloSkirt > 0:
-		'<center><img <<$set_imgh>> src="images/pc/activities/flashing/dress/outside/pussy/' + rand(1,13) + '.jpg"></center>'
 	end
 
-	if $ARGS[1] = 'Paid':
-		if PCloPants > 0: 'You pull your pants down and show him your pussy for a few seconds before quickly covering up and taking your money.'
-		if PCloSkirt > 0: 'You lift your skirt up and show him your pussy for a few seconds before quickly covering up and taking your money.'
-	elseif $ARGS[1] = 'Free':
-		if $ARGS[2] = 'Question':
-			if PCloPants > 0: 'You pull your pants down and show him your pussy for a few seconds. You rub your clit a little for him before you cover up.'
-			if PCloSkirt > 0: 'You lift your skirt up and show him your pussy for a few seconds. You rub your clit a little for him before you cover up.'
-		elseif $ARGS[2] = 'Flash':
-			if PCloPants > 0: 'You pull your pants down and expose your pussy to the road for a few seconds. A few cars pass by and honk in appreciation as you rub your clit a little before covering up.'
-			if PCloSkirt > 0: 'You lift your skirt up and expose your pussy to the road for a few seconds. A few cars pass by and honk in appreciation as you rub your clit a little before covering up.'
-		end
-	end
-	gs 'arousal', 'flashlite', 5
+	if pcs_inhib < 40: inhib_exp += rand(4, 6)
+	pcs_mood += 5
 	gs 'stat'
 
 	!if (bimbolevel >= 1 or pcs_horny >= 15) and (PCloBimbo = 1 or PCloStyle = 4) and $ARGS[2] = 'Question':
 	if (bimbolevel >= 1 or pcs_horny >= 15) and (PCloBimbo = 1 or PCloStyle = 4) and $ARGS[2] = 'Question':
-		carwashscene = rand(1,100)
-		if carwashscene <= min(max(60,slut_compare),100) and carwashscene >= 60:
+		carwashscene = rand(1, 100)
+		if carwashscene <= min(max(60, slut_compare), 100) and carwashscene >= 60:
 			act 'Continue': gt 'fuelstation_carwash', 'blowQ'
 		else
 			act 'Continue': gt 'fuelstation_carwash', 'handQ'
@@ -403,14 +378,13 @@ if $ARGS[0] = 'handjob':
 	gs 'stat'
 
 	if rand(1, 100) < 50:
-		i = rand(1,2)
-		if i = 1:
+		if rand(0, 1) = 0:
 			'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hand.jpg"></center>'
 		else
 			'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj.jpg"></center>'
 		end
 	else
-		i = rand(0,2)
+		i = rand(0, 2)
 		if i = 0:
 			'<center><video autoplay loop src="images/shared/sex/handjob/hj<<i>>.mp4"></video></center>'
 		else
@@ -437,7 +411,7 @@ end
 ! $ARGS[2] = whether this act came from a customer question or already giving a customer a handjob
 if $ARGS[0] = 'blowjob':
 	if $ARGS[2] = 'Question':
-		gs 'npcgeneratec', 0, 'gas station customer', rand(18,40)
+		gs 'npcgeneratec', 0, 'gas station customer', rand(18, 40)
 		gs 'boyStat', $npclastgenerated
 	end
 
@@ -451,14 +425,14 @@ if $ARGS[0] = 'blowjob':
 	elseif $ARGS[1] = 'Free':
 		gs 'fame', 'pav', 'sex', 2
 	end
-	if pcs_inhib < 50: inhib_exp += rand(6,8)
+	if pcs_inhib < 50: inhib_exp += rand(6, 8)
 	pcs_mood += 5
 	gs 'stat'
 
-	if rand(1,100) < 50:
-		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/blowjob' + rand(1,4) + '.jpg"></center>'
+	if rand(1, 100) < 50:
+		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/blowjob<<rand(1, 4)>>.jpg"></center>'
 	else
-		'<center><video autoplay loop src="images/locations/shared/carwash/sex/blowjob' + rand(1,3) + '.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/shared/carwash/sex/blowjob<<rand(1, 3)>>.mp4"></video></center>'
 	end
 
 	if $ARGS[2] = 'Question':
@@ -490,7 +464,7 @@ if $ARGS[0] = 'blowjob':
 			act 'Offer your ass': gt 'fuelstation_carwash', 'fuckAnal', 'Paid'
 		end
 	end
-	act 'Suck harder to make him cum':gt 'fuelstation_carwash', 'blowjobEndQ'
+	act 'Suck harder to make him cum': gt 'fuelstation_carwash', 'blowjobEndQ'
 end
 
 ! $ARGS[1] = whether you got paid for this
@@ -505,14 +479,14 @@ if $ARGS[0] = 'fuckPussy':
 	elseif $ARGS[1] = 'Free':
 		gs 'fame', 'pav', 'sex', 4
 	end
-	if pcs_inhib < 60: inhib_exp += rand(14,16)
+	if pcs_inhib < 60: inhib_exp += rand(14, 16)
 	pcs_mood += 10
 	gs 'stat'
 
-	if rand(1,100) < 50:
-		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/fuckpussy' + rand(1,4) + '.jpg"></center>'
+	if rand(1, 100) < 50:
+		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/fuckpussy<<rand(1, 4)>>.jpg"></center>'
 	else
-		'<center><video autoplay loop src="images/locations/shared/carwash/sex/fuckpussy' + rand(1,4) + '.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/shared/carwash/sex/fuckpussy<<rand(1, 4)>>.mp4"></video></center>'
 	end
 
 	if $ARGS[1] = 'Paid':
@@ -539,14 +513,14 @@ if $ARGS[0] = 'fuckAnal':
 	elseif $ARGS[1] = 'Free':
 		gs 'fame', 'pav', 'sex', 4
 	end
-	if pcs_inhib < 60: inhib_exp += rand(14,16)
+	if pcs_inhib < 60: inhib_exp += rand(14, 16)
 	pcs_mood += 10
 	gs 'stat'
 
-	if rand(1,100) < 50:
-		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/fuckanal' + rand(1,4) + '.jpg"></center>'
+	if rand(1, 100) < 50:
+		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/fuckanal<<rand(1, 4)>>.jpg"></center>'
 	else
-		'<center><video autoplay loop src="images/locations/shared/carwash/sex/fuckanal' + rand(1,4) + '.mp4"></video></center>'
+		'<center><video autoplay loop src="images/locations/shared/carwash/sex/fuckanal<<rand(1, 4)>>.mp4"></video></center>'
 	end
 
 	gs 'arousal', 'auto_lube', 'anal'
@@ -559,8 +533,8 @@ if $ARGS[0] = 'fuckAnal':
 	end
 	gs 'stat'
 
-	rapePussyChance = rand(1,100)
-	if rapePussyChance <= min(max(1,slut_compare),20):
+	rapePussyChance = rand(1, 100)
+	if rapePussyChance <= min(max(1, slut_compare), 20):
 		act 'Continue': gt 'fuelstation_carwash', 'rapePussy'
 	else
 		act 'Continue': gt 'fuelstation_carwash', 'analEndQ'
@@ -568,8 +542,7 @@ if $ARGS[0] = 'fuckAnal':
 end
 
 if $ARGS[0] = 'rapePussy':
-	i = rand(1,5)
-	'<center><video autoplay loop src="images/locations/shared/carwash/sex/hardanal<<i>>.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/shared/carwash/sex/hardanal<<rand(1, 5)>>.mp4"></video></center>'
 
 	'The man fucks your ass furiously, taking no heed of your painful moans. As you try to move away to limit the depth he can reach in your ass, he slaps your ass hard.'
 	'"Stop moving, bitch! Who do you think you are that you can tell me what to do?!" he shouts.'
@@ -577,8 +550,7 @@ if $ARGS[0] = 'rapePussy':
 	if pcs_vag = 0:
 		'He gropes your ass, lifts it up and suddenly spots your hymen.'
 		'"Wait, you''re a virgin?! Such a tease and still a virgin!"'
-		rapeAnyway = rand(1,100)
-		if rapeAnyway <= min(max(1,slut_compare),50):
+		if rand(1, 100) <= min(max(1, slut_compare), 50):
 			'"It would have happened sooner or later anyway, virgin slut. Now enjoy and remember this moment; I know I will!"'
 			act 'Continue': gt 'fuelstation_carwash', 'rapePussyYes', 'virgin'
 		else
@@ -592,9 +564,9 @@ end
 
 ! $ARGS[1] = whether you were a virgin before this or not
 if $ARGS[0] = 'rapePussyYes':
-	inhib_exp += rand(10,20)
+	inhib_exp += rand(10, 20)
 
-	'<center><video autoplay loop src="images/locations/shared/carwash/sex/pussytoanal' + rand(1,3) + '.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/shared/carwash/sex/pussytoanal<<rand(1, 3)>>.mp4"></video></center>'
 
 	if $ARGS[1] = 'virgin':
 		pcs_mood -= 30
@@ -627,13 +599,13 @@ end
 
 ! $ARGS[1] = whether this was rape or not
 if $ARGS[0] = 'vaginaCum':
-	if pcs_inhib < 40: inhib_exp += rand(4,6)
+	if pcs_inhib < 40: inhib_exp += rand(4, 6)
 	pcs_vag += 1
 	pain['vaginal'] += 4
 	gs 'cum_call', ''
 	gs 'stat'
 
-	'<center><video autoplay loop src="images/locations/shared/carwash/sex/cumpussy' + rand(1,5) + '.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/shared/carwash/sex/cumpussy<<rand(1, 5)>>.mp4"></video></center>'
 
 	if $ARGS[1] = 'consensual':
 		pcs_mood += 20
@@ -650,7 +622,7 @@ if $ARGS[0] = 'vaginaCum':
 end
 
 if $ARGS[0] = 'assCum':
-	if pcs_inhib < 40: inhib_exp += rand(4,6)
+	if pcs_inhib < 40: inhib_exp += rand(4, 6)
 	minut += 5
 	pcs_mood += 10
 	pcs_ass += 1
@@ -658,7 +630,7 @@ if $ARGS[0] = 'assCum':
 	gs 'cum_call', 'anus'
 	gs 'stat'
 
-	'<center><video autoplay loop src="images/locations/shared/carwash/sex/cumanal' + rand(1,2) + '.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/shared/carwash/sex/cumanal<<rand(1, 2)>>.mp4"></video></center>'
 	'You let him cum inside your ass. A pleasant warmth fills your insides as he shoots his load deep inside you. When he pulls out, some of it leaks out of you before you can tighten your worn out anus.'
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -674,15 +646,15 @@ if $ARGS[0] = 'handjobEndQ':
 end
 
 if $ARGS[0] = 'handjobEndHands':
-	if pcs_inhib < 30: inhib_exp += rand(2,4)
+	if pcs_inhib < 30: inhib_exp += rand(2, 4)
 	pcs_mood += 5
 	gs 'cum_call', 'hands'
 	gs 'stat'
 
-	if rand(1,100) < 30:
-		'<center><video autoplay loop src="images/shared/sex/cum/handjob/hand0,' + rand(0,1) + '.mp4"></video></center>'
+	if rand(1, 100) < 30:
+		'<center><video autoplay loop src="images/shared/sex/cum/handjob/hand0,<<rand(0, 1)>>.mp4"></video></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/shared/sex/cum/handjob/hand' + rand(1,2) + '.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/shared/sex/cum/handjob/hand<<rand(1, 2)>>.jpg"></center>'
 	end
 
 	'When the man starts cumming, you quickly point his cock away from your face. Your hands are covered in cum by the time he''s done.'
@@ -702,15 +674,15 @@ end
 
 ! $ARGS[1] = whether his cock was inside or outside of you before he cums on your face
 if $ARGS[0] = 'blowjobEndFace':
-	if pcs_inhib < 30: inhib_exp += rand(2,4)
+	if pcs_inhib < 30: inhib_exp += rand(2, 4)
 	pcs_mood += 5
 	gs 'cum_call', 'face'
 	gs 'stat'
 
-	if rand(1,100) < 30:
-		'<center><video autoplay loop src="images/locations/shared/carwash/sex/cumface' + rand(1,2) + '.mp4"></video></center>'
+	if rand(1, 100) < 30:
+		'<center><video autoplay loop src="images/locations/shared/carwash/sex/cumface<<rand(1,2)>>.mp4"></video></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/cumface' + rand(1,4) + '.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/cumface<<rand(1,4)>>.jpg"></center>'
 	end
 
 	if $ARGS[1] = 'outside':
@@ -730,8 +702,8 @@ if $ARGS[0] = 'blowjobEndMouth':
 	gs 'cum_call', 'mouth', $boy
 	gs 'stat'
 
-	if rand(1,100) < 60:
-		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/cummouth' + rand(1,4) + '.jpg"></center>'
+	if rand(1, 100) < 60:
+		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/cummouth<<rand(1, 4)>>.jpg"></center>'
 	else
 		'<center><video autoplay loop src="images/locations/shared/carwash/sex/cummouth1.mp4"></video></center>'
 	end
@@ -751,12 +723,12 @@ if $ARGS[0] = 'blowjobEndMouth':
 end
 
 if $ARGS[0] = 'blowjobEndMouthSwallow':
-	if pcs_inhib < 40: inhib_exp += rand(4,6)
+	if pcs_inhib < 40: inhib_exp += rand(4, 6)
 	swallow += 1
 	pcs_mood += 10
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/swallow' + rand(1,4) + '.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/swallow<<rand(1, 4)>>.jpg"></center>'
 	'You gulp down the mouthful of cum and present your tongue to him.'
 	'The man smiles and slaps you mildly on the face. "What a nice young slut you are. Next time I need a refill, I''ll be sure to stop by."'
 	stat['swallow'] += 1
@@ -767,11 +739,11 @@ if $ARGS[0] = 'blowjobEndMouthSwallow':
 end
 
 if $ARGS[0] = 'blowjobEndMouthSpit':
-	if pcs_inhib < 30: inhib_exp += rand(2,4)
+	if pcs_inhib < 30: inhib_exp += rand(2, 4)
 	gs 'stat'
 
-	if rand(1,100) > 50:
-		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/spit' + rand(1,3) + '.jpg"></center>'
+	if rand(1, 100) > 50:
+		'<center><img <<$set_imgh>> src="images/locations/shared/carwash/sex/spit<<rand(1, 3)>>.jpg"></center>'
 	else
 		'<center><video autoplay loop src="images/locations/shared/carwash/sex/spit1.mp4"></video></center>'
 	end
@@ -787,8 +759,7 @@ if $ARGS[0] = 'runback':
 	! runSuccess uses a simpler version of the formula used with carwashscene
 	! just based on strength and agility; uses whichever is higher to try and run away
 	! min 25 percent chance; max 75 percent chance for this initial getaway
-	runSuccess = rand(1,100)
-	if runSuccess <= min(max(25,pcs_stren,pcs_agil),75):
+	if rand(1, 100) <= min(max(25, pcs_stren, pcs_agil), 75):
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/turn_back.jpg"></center>'
 		'You manage to escape his grasp and take a quick look behind you to make sure he''s not following you before heading back to the gas station.'
 		gs 'arousal', 'end'
@@ -810,10 +781,13 @@ if $ARGS[0] = 'runback':
 		! these values are based off of the cheat menu values for players who turn off these stats as they can never go below 35
 		gs 'willpower', 'skill', 'resist', 'stren_lvl'
 		will_cost = (will_cost * 3) / 2
-		if will_cost <= pcs_willpwr:
-			act 'Push him off and escape (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'fuelstation_carwash', 'fight'
-		else
+		if pcs_willpwr < will_cost:
 			act 'Push him off and escape (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		else
+			act 'Push him off and escape (<<will_cost>> Willpower)':
+				gs 'willpower', 'pay', 'resist'
+				gt 'fuelstation_carwash', 'fight'
+			end
 		end
 	end
 end
@@ -832,7 +806,7 @@ end
 
 if $ARGS[0] = 'punish':
 	! once again punishType uses the same logic as carwashscene for dynamic choices
-	punishType = rand(1,100)
+	punishType = rand(1, 100)
 	if punishType <= min(max(50,slut_compare),75) and punishType >= 50:
 		gt 'fuelstation_carwash', 'punishAnal'
 	elseif punishType <= min(max(75,slut_compare),100) and punishType >= 75:
@@ -845,7 +819,7 @@ end
 if $ARGS[0] = 'punishSpank':
 	pcs_horny = 0
 	pcs_mood -= 10
-	inhib_exp += rand(2,4)
+	inhib_exp += rand(2, 4)
 	pain['asscheeks'] += 5
 	gs 'stat'
 
@@ -862,12 +836,11 @@ if $ARGS[0] = 'punishAnal':
 	pcs_horny = 0
 	pcs_mood -= 20
 	pain['asshole'] += 6
-	inhib_exp += rand(5,10)
+	inhib_exp += rand(5, 10)
 	gs 'cum_call', 'anus'
 	gs 'stat'
 
-	i = rand(1,3)
-	'<center><video autoplay loop src="images/locations/shared/carwash/sex/punishanal<<i>>.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/shared/carwash/sex/punishanal<<rand(1, 3)>>.mp4"></video></center>'
 	'The angry man drags you to a more secluded area, bends you over and sticks a finger in your ass.'
 	'Your anus fully exposed, he starts fucking it ruthlessly.'
 	'After half an hour of rough assfucking, he releases his grip on you so you can finally crawl away, your aching ass sore from the brutal penetration.'
@@ -883,7 +856,7 @@ if $ARGS[0] = 'punishPussyQ':
 	if pcs_vag = 0:
 		'"Wait, you''re a virgin?! Such a slutty tease and you''re still a virgin?"'
 
-		penetrate = rand (1,100)
+		penetrate = rand (1, 100)
 		if penetrate <= min(max(50,slut_compare),75) and penetrate >= 50:
 			'"I''ll spare your virginity, but you''re still getting fucked. Sluts have more than one hole for a reason, right?"'
 
@@ -907,11 +880,11 @@ end
 if $ARGS[0] = 'punishPussy':
 	pcs_horny = 0
 	pain['vaginal'] += 4
-	inhib_exp += rand(5,10)
+	inhib_exp += rand(5, 10)
 	gs 'cum_call', ''
 	gs 'stat'
 
-	'<center><video autoplay loop src="images/locations/shared/carwash/sex/punishpussy' + rand(1,5) + '.mp4"></video></center>'
+	'<center><video autoplay loop src="images/locations/shared/carwash/sex/punishpussy<<rand(1, 5)>>.mp4"></video></center>'
 
 	if $ARGS[1] = 'virgin':
 		'Your pussy fully exposed, he slowly inserts his cock inside you. He pushes right up against your hymen, savoring the moment. Suddenly, you feel your hymen break and know your virginity is now gone forever.'
@@ -931,8 +904,7 @@ end
 !! SM it was too hard to get abducted so remove old check against strength/agility, now only checks against slut reputation
 !! minimum chance of 1% maximum chance of 90% to be abducted
 if $ARGS[0] = 'punishEnd':
-	abductionChance = min(max(1,slut_compare),180)/2
-	if abductionChance >= rand(1,100):
+	if rand(1, 100) <= min(max(1, slut_compare), 180):
 		'Your perpetrator isn''t done with you, however.'
 		'He catches you again, drags you to his car and pushes you into the trunk...'
 		'You have a feeling this won''t go well for you...'
@@ -944,5 +916,18 @@ if $ARGS[0] = 'punishEnd':
 	end
 end
 
+
+
+
+
+
+
+!! cleanup
+killvar 'carwashscene'
+killvar 'punishType'
+killvar 'penetrate'
+
+
+
 --- fuelstation_carwash ---------------------------------
 

+ 6 - 4
locations/gad_church.qsrc

@@ -208,11 +208,13 @@ if $ARGS[0] = 'pray':
 		act 'Be naughty':
 			*clr & cla
 			menu_off = 1
-			gs 'fame', 'city', 'sex', 2
-			gs 'flash', 'butt', 'indoors', 2, 1
+			gs 'fame', 'gad', 'sex', 2
+
+			$flash_image = 'images/locations/pavlovsk/church/ch_prayingflash.jpg'
+			$flash_text[0] = 'While you''re praying, you get a devious idea. With a sly smile, you expose your ass, giving anyone that looks your way a naughty sight as you lower your head and pray in silence. You occasionally hear whispers behind you, causing you to smile.'
+			gs 'flash', 'butt', 'indoors', 2, 2
+
 			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/ch_prayingflash.jpg"></center>'
-			'While you''re praying, you get a devious idea. With a sly smile, you expose your ass, giving anyone that looks your way a naughty sight as you lower your head and pray in silence. You occasionally hear whispers behind you, causing you to smile.'
 			act 'Return to Narthex': gt 'gad_church', 'Narthex'
 		end
 	end

+ 6 - 1
locations/gad_gpbath.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'start':
 	'A small room with a low, smoky ceiling, a small stove, a couple of stainless steel water tanks, and a blackened wooden shelf.'
 	'Grandma''s enema bulb is hidden behind some stuff on the shelf.'
 	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight[0]>>.<<pcs_weight[1]>> kg<br>Your body mass index (BMI) is <<pcs_bmi[0]>>.<<pcs_bmi[1]>>.<br><<$bodyVars[''bmi_desc'']>></center>''">scales</a>.'
-	
+
 	gs 'stat'
 
 	gs 'gad_gpbath', 'set_leave_acts'
@@ -154,6 +154,10 @@ if $ARGS[0] = 'alone':
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash.</font>'
 	end
 
+	gs 'din_van', 'private'
+
+	!! This should all be contained in din_van
+	!{
 	dynamic $bteeth
 	gs 'din_van', 'prvt_pee'
 	dynamic $tampon
@@ -261,6 +265,7 @@ if $ARGS[0] = 'alone':
 			act 'Finish': gt 'gad_gpbath', 'start'
 		end
 	end
+	}
 end
 
 if $ARGS[0] = 'with_Mira':

+ 31 - 30
locations/gad_gpchores.qsrc

@@ -6,10 +6,10 @@
 !! Task initiator for the grandparents chores whilst Sveta is staying with grandparents.
 
 if $ARGS[0] =  'init':
-    if gp_chores['active'] > 1
-        gt 'gad_gpchores', 'active'
-    end
-    gs 'gp_chores', 'convo'
+	if gp_chores['active'] > 1:
+		gt 'gad_gpchores', 'active'
+	end
+	gs 'gp_chores', 'convo'
 end
 
 if $ARGS[0] = 'active':
@@ -17,31 +17,32 @@ end
 
 !! Conversations
 if $ARGS[0] = 'convo':
-    if gp_chores = 0:
-        'You approach your <relation> to ask if they have any jobs for you today.'
-        if gp_chores['mood'] < 0:
-            gp_chores['bonus'] = 0
-            'You are lazy {mc}, i am not sure if you can be trusted to do your share.'
-        elseif gp_chores['mood'] < 10:
-            'Your <relation gives you a hard stare, you are nothing about a layabout. Get out of my sight!'
-        elseif gp_chores['mood'] > 10:
-            gp_chores['bonus'] = 10
-            'You have been so helpful {mc}, it is wonderful to have you with us. Here''s a something little extra for you. '
-        elseif gp_chores['mood'] > 20:
-            gp_chores['bonus'] = 20
-            'Your <relation> face lights up when they see you. You have been such a hardworking girl, you''re mother will be so proud of how diligant you become. Here have a little extra cash for your efforts.'
+	if gp_chores = 0:
+		'You approach your <relation> to ask if they have any jobs for you today.'
+		if gp_chores['mood'] < 0:
+			gp_chores['bonus'] = 0
+			'You are lazy {mc}, i am not sure if you can be trusted to do your share.'
+		elseif gp_chores['mood'] < 10:
+			'Your <relation gives you a hard stare, you are nothing about a layabout. Get out of my sight!'
+		elseif gp_chores['mood'] > 10:
+			gp_chores['bonus'] = 10
+			'You have been so helpful {mc}, it is wonderful to have you with us. Here''s a something little extra for you. '
+		elseif gp_chores['mood'] > 20:
+			gp_chores['bonus'] = 20
+			'Your <relation> face lights up when they see you. You have been such a hardworking girl, you''re mother will be so proud of how diligant you become. Here have a little extra cash for your efforts.'
 
-            !! potential for helping in village with high rep?
-        elseif gp_chores['mood']
-
-    end
-    if gp_chores['active'] = -1:
-        gp_chores['failed'] += 1
-        gp_chores['mood'] -= 1
-    end
-    if gp_chores['active'] = 5:
-        gp_chores['completed'] += 1
-        gp_chores['mood'] += 1
-    end
+			!! potential for helping in village with high rep?
+		end
+	end
+	if gp_chores['active'] = -1:
+		gp_chores['failed'] += 1
+		gp_chores['mood'] -= 1
+	end
+	if gp_chores['active'] = 5:
+		gp_chores['completed'] += 1
+		gp_chores['mood'] += 1
+	end
 end
---- gad_gpchores ---------------------------------
+
+
+--- gad_gpchores ---------------------------------

+ 656 - 133
locations/gad_gphouse.qsrc

@@ -1,24 +1,30 @@
 # gad_gphouse
-!! Modified date:  June, 2024
-!! Version: 1.1 - initial refactor
-!! Author: Hooded Silence
+
+!! 2024/05/05	- Mira schedule introduced.
+!! 2024/06		- Version: 1.1 - Refactor by Myles Croft, code by Hooded Silence
 !!
 !! Sveta''s grandparents dacha in Gad
-!! use  gt ''gad_gphouse'', ''entry'', internal location and gs ''gad_gphouse'', ''exit'', leave_time to enter and leave dacha respectively, note time only increments on leaving with exit fnct
+!! Enter the location:
+!!		gt 'gad_gphouse', 'entry'
+!! Leave the location using
+!!		gs 'gad_gphouse', 'exit'
+!!		gt 'loc', 'loc_arg'
 !!
 !! 2024/05/05 - Mira schedule introduced.
 !! 2024/06/15 - scales moved to bathroom, full refactor of location, grandparents schedules, and addition of the kitchenette
 !!
 !! locat['A60'] = Mira''s location. See 'miroslava_schedule'
-!! locat['A31'] = Mira''s location. See 'gp_elene_schedule'
-!! locat['A32'] = Zlatek''s location. See 'gp_Zlatek_schedule'
+!! $locat['A31'] = Elene''s location. See 'gp_elene_schedule'
+!! $locat['A32'] = Zlatek''s location. See 'gp_Zlatek_schedule'
 
 !! Init location - one time use to set up unique variables or call settings
 
-if $ARGS[0] = 'entry':
-	$default_img_path = 'locations/gadukino/gp_dacha'
+if $ARGS[0] = 'entry' or $ARGS[0] = 'start':
 	$loc = 'gad_gphouse'
 	gs 'homes_properties', 'give_access', 'grandparents_house'
+	gs 'gad_gphouse', 'nudity_trouble_limit'
+	gs 'gad_gphouse', 'enter_events'
+
 	if ARGS[1] ! '':
 		gt $loc, $ARGS[1]
 	else
@@ -26,14 +32,17 @@ if $ARGS[0] = 'entry':
 	end
 end
 
+
 !! Set up location
 
 if $ARGS[0] = 'setup':
 	*clr & cla
+	$default_img_path = 'locations/gadukino/gp_dacha'
 	$setloc['StageTitle'] = '<<$room_title>>'
-	$setloc['StageImage'] =   '<<$default_img_path>>/<<$room_image>>'
+	$setloc['StageImage'] = '<<$default_img_path>>/<<$room_image>>'
 	$location_type = 'public_indoors'
-	gs 'shortgs', 'setloc', $loc, $ARGS[0]
+	$region = 'gad'
+	gs 'shortgs', 'setloc', $loc, $ARGS[1]
 	gs 'themes', 'indoors'
 	gs 'shortgs', 'clothing_status'
 	gs 'stat'
@@ -42,32 +51,34 @@ if $ARGS[0] = 'setup':
 	!! check locations and chores on each scene change
 	!! gs $loc, 'boniface'
 	!! gs 'gad_gp_chores', 'start'
-	!! gs 'locat', 'A60'
-	gs 'miroslava_schedule'
-	gs 'gp_elene_schedule'
-	gs 'gp_zlatek_schedule'
+	gs 'schedule', 'A31', 'A32', 'A60'
 
 	!! Job Tracker
 	!! gs 'gad_gpchores', 'init'
 	if gp_debug = 1:
-    !! test tracker
-		$locat['elene']
-		$locat['zlatek']
+		!! test tracker
+		locat['A31']
+		locat['A32']
 	end
+
+	killvar '$default_img_path'
+	killvar '$room_image'
+	killvar '$room_title'
+	killvar '$setloc'
 end
 
-!! leave location - reset vars and other housekeeping functions
+!! leave location - Stage events here for leaving the location
 
 if $ARGS[0] = 'exit':
-	minut += leave_time
-	if $ARGS[1] ! $loc:
-		killvar '$setloc'
-		killvar 'leave_time'
-		killvar '$rooom_image'
-		killvar '$room_title'
-		killvar '$locat'
-	end
-	gt $ARGS[1], $ARGS[2]
+	!! $prevloc, $prevarg is where Sveta came from
+	!! $loc, $loc_arg is where Sveta is going to
+
+	temp_rand = rand(0, 10)
+	if temp_rand = 0:
+		gt 'gad_gphouse', 'grandma_leave_event'
+	elseif temp_rand = 1:
+		gt 'gad_gphouse', 'grandpa_leave_event'
+	end
 end
 
 !! Start location content
@@ -77,35 +88,46 @@ if $ARGS[0] = 'main':
 	menu_off = 0
 	$room_title = 'Your Grandparents'' Cottage'
 	$room_image = 'izba.jpg'
-	gs $loc, 'setup'
+	gs $loc, 'setup', $ARGS[0]
 	*nl
 	'A fairly simple cottage in the village of Gadukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>. You share this with your grandparents to store anything that won''t fit in your chest.'
 	'There is an old <a href="exec:gt ''TV'',''gad''">television</a> in the living room. It''s positioned next to a body length <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
 	'Your grandfather''s <a href="exec: newspaperVars[''dbag''] = 0 & gs ''newspaper'', ''start''">newspaper</a> is lying to the side.'
 
-	if $locat['elene'] = 'lounge':
-		loc_rnd = rand(1,4)
-		*nl
-		if loc_rnd = 1:
-			'You see your grandmother relaxing on the couch reading a book.'
-		elseif loc_rnd = 2:
-			'You see your grandmother relaxing on the couch watching TV.'
-		elseif loc_rnd:
-			'You see your grandmother sittinng on the couch repairing some clothes.'
+	gs 'gad_gphouse', 'villagecat_string'
+
+	if locat['A31'] = 111:
+		'You see your <a href="exec: gt ''gp_elene'', ''talk'' ">grandmother</a> relaxing on the couch reading a book.'
+	elseif locat['A31'] = 112:
+		'You see your <a href="exec: gt ''gp_elene'', ''talk'' ">grandmother</a> relaxing on the couch watching TV.'
+	elseif locat['A31'] = 113:
+		'You see your <a href="exec: gt ''gp_elene'', ''talk'' ">grandmother</a> sittinng on the couch repairing some clothes.'
+	elseif locat['A31'] = 114:
+		'You see your <a href="exec: gt ''gp_elene'', ''talk'' ">grandmother</a> sitting on the couch knitting.'
+	end
+
+	!! MIRA
+	if locat['A60'] = 21:
+		if MiraVars['guest'] = 0:
+			if MiraVars['follow_time'] < 1: MiraVars['follow_time'] = 1
+			gt 'gad_gphouse', 'entry'
 		else
-			'You see your grandmother sitting on the couch knitting.'
+			MiraVars['follow_time'] = 0
+			'<a href="exec: gt ''miroslava'', ''start''">Mira</a> is sitting next to you.'
 		end
-		killvar 'loc_rnd'
 	end
 
-	if rand(0,2) ! 0: gs 'din_bad' & dynamic $mobile_check
+
+	if rand(0, 2) ! 0: gs 'din_bad' & dynamic $mobile_check
 	gs 'prostitution_functions', 'prostitute_outfit_at_home'
 
 	!! Set up actions:
 	if $apparel['status'] ! 'nude' or $apparel['status'] ! 'pantyless' or $apparel['status'] ! 'braless':
 		act 'Go outside':
-			leave_time = 2
-			gt $loc, 'exit', 'gad_gpyard', 'start'
+			minut += 2
+			gs 'shortgs', 'setloc', 'gad_gpyard', 'start'
+			gs $prevloc, 'exit'
+			gt $loc, $loc_arg
 		end
 
 	!!Disable leaving nude - awaiting global punishment system?
@@ -137,8 +159,13 @@ if $ARGS[0] = 'main':
 	!!		act 'Continue': gt 'gad_gpyard', 'start'
 	!!	end
 	end
-	act 'Go to your room': leave_time = 2  & gt $loc, 'exit', 'gad_gpbarn', 'barn_room'
-	act 'Go to the kitchen': leave_time = 2  & gt $loc, 'exit', $loc, 'kitchen'
+	act 'Go to your room':
+		minut += 2
+		gs 'shortgs', 'setloc', 'gad_gpbarn', 'barn_room'
+		!gs $prevloc, 'exit'
+		gt $loc, $loc_arg
+	end
+	act 'Go to the kitchen': minut += 2 & gt $loc, 'kitchen'
 end
 
 !! Small roughshod kitchenette attached to the building.
@@ -147,19 +174,20 @@ if $ARGS[0] = 'kitchen':
 	$locclass = 'kitchen'
 	$room_title = 'Your Grandparents'' Kitchenette'
 	$room_image = 'gp_kitchen.jpg'
-	gs $loc, 'setup'
+	gs $loc, 'setup', $ARGS[0]
 	*nl
 	'A small area seperated from the rest of the dacha reserved for cooking and eating meals.'
 
-	if $locat['elene'] = 'kitchen':
+	if locat['A31'] = 120:
 		*nl
-		'You see your grandmother in the kitchen preparing a meal.'
+		'You see your <a href="exec: gt ''gp_elene'', ''talk'' ">grandmother</a> in the kitchen preparing a meal.'
 	end
-	if $locat['zlatek'] = 'kitchen':
+	if locat['A32'] = 120:
 		*nl
-		'You see your grandfather in the kitchen reading a newspaper.'
+		'You see your <a href="exec: gt ''gp_zlatek'', ''talk'' ">grandfather</a> in the kitchen reading a newspaper.'
 	end
-	act 'Return to the living room': leave_time = 1  & gs $loc, 'exit', $loc, 'main'
+
+	act 'Return to the living room': minut += 1 & gt $loc, 'main'
 	act 'Eat a hearty meal (0:20)': gs 'food', 'l_meal'
 	act 'Eat a normal meal (0:15)': gs 'food', 'm_meal'
 	act 'Eat a light meal (0:10)': gs 'food', 's_meal'
@@ -248,100 +276,595 @@ if $ARGS[0] = 'to_gadukino':
 	act 'Go to your grandparents house': gt 'gad_gphouse', 'entry'
 end
 
-!! game start code - do not touch
 
-if $ARGS[0] = 'intro':
-	cla & *clr
-	$loc = 'gad_gphouse'
-	$loc_arg = ''
-	gs 'homes_properties', 'give_access',  'grandparents_house'
-	gs 'homes_properties', 'set_home', 'grandparents_house'
-	$temp_nickname = '<<$npc_nickname[''A29'']>>'
+if $ARGS[0] = 'enter_events':
+	if hour >= 6 and hour < 20:
+		if gadstay = 1 and (kanikuli = 4 or kanikuli = 5) and month = 8 and day >= 27:
+			gt 'gad_gphouse', 'school_start'
+		elseif lost_girl = 1:
+			if daystart > forest_lostday:
+				lost_girl = 0
+				gt 'gad_gphouse', 'was_lost_yesterday'
+			else
+				lost_girl = 0
+				gt 'gad_gphouse', 'main'
+			end
+		elseif grandmaQW['nudity_trouble_limit'] = 50:
+			gt 'gad_gphouse', 'nudity_trouble_kicked'
+		elseif grandmaQW['nudity_trouble'] = grandmaQW['nudity_trouble_limit']:
+			gt 'gad_gphouse', 'nudity_trouble'
+		elseif grandpaQW['disappointment'] = 1:
+			gt 'gad_gphouse', 'grandpa_disapointment'
+		elseif grandmaQW['disappointment'] = 1:
+			gt 'gad_gphouse', 'grandma_disapointment'
+		elseif grandmaQW['first_visit'] = 0 and hour >= 6 and hour < 20:
+			gt 'gad_gphouse', 'first_visit'
+		elseif grandmaQW['last_month_paid'] ! month and hour >= 6 and hour < 20:
+			gt 'gad_gphouse', 'chores_pay'
+		elseif locat['A60'] = 21 and locat['A60_prev'] ! 21:
+			gt 'gad_gphouse', 'mira_visit'
+		end
+	else
+		if lost_girl = 1:
+			lost_girl = 0
+			gt 'gad_gphouse', 'main'
+		end
+	end
+end
+
+
+
+if $ARGS[0] = 'nudity_trouble_limit':
+	if grandmaQW['nudity_trouble_base'] = 0 or grandmaQW['nudity_trouble_limit'] = 0:
+		grandmaQW['nudity_trouble_base'] = 10
+		grandmaQW['nudity_trouble_limit'] = grandmaQW['nudity_trouble_base']
+	else
+		grandmaQW['nudity_trouble_limit'] = grandmaQW['nudity_trouble_base']
+	end
+
+	if SchoolBlock = 1: grandmaQW['nudity_trouble_limit'] += 5
+	if momKnowsKolka = 1: grandmaQW['nudity_trouble_limit'] += 10
+	if momKnowsVladimir = 1: grandmaQW['nudity_trouble_limit'] += 10
+	if momslut < 2:
+		if motherKnowWhore > 0: grandmaQW['nudity_trouble_limit'] += 3
+		if motherKnowSpravka > 0: grandmaQW['nudity_trouble_limit'] += 2
+	end
+	if brotherSex < 6:
+		if brotherknowslut > 1: grandmaQW['nudity_trouble_limit'] += 3
+		if brotherknowslut > 0: grandmaQW['nudity_trouble_limit'] += 2
+	end
+	if sisterQW['roma3block'] = 1:
+		if sisterknowslut > 1 and sisboypartyQW > 1: grandmaQW['nudity_trouble_limit'] += 3
+		if sisterknowslut > 0: grandmaQW['nudity_trouble_limit'] += 2
+	end
+	if GadBoy['river_gang'] = 2:
+		grandmaQW['nudity_trouble_limit'] += 5
+	else
+		if npc_QW['A63'] >= 11: grandmaQW['nudity_trouble_limit'] += 3
+		if MiraVars['QW'] >= 15: grandmaQW['nudity_trouble_limit'] += 2
+	end
+end
+
+
+
+if $ARGS[0] = 'school_start':
+	menu_off = 1
+	minut += 5
+	money += 75
+	gs 'stat'
+
+	'<center><b><font color="maroon">Your grandmother</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
+	*nl
+	'"<<$pcs_firstname>>, your mother called. School starts soon, and you must head back to Pavlovsk to get ready."'
+	'"As much as we loved having you around and seeing you more, this is it for now."'
+	'"You are always welcome to come and visit on weekends or breaks from school."'
+	'"And if you want to, you can always stay with us again next summer."'
+
+	if grandmaQW['help_amount'] > 0:
+		'Before leaving, your grandma hugs you and gives you <<25 * grandmaQW[''help_amount'']>> rubles for your help with chores.'
+		money += 25 * grandmaQW['help_amount']
+		grandmaQW['help_amount'] = 0
+		gs 'stat'
+	else
+		'Before leaving, your grandma gives you a big hug goodbye.'
+	end
+
+	'As you turn to leave, she stops you, "One last thing, here are some rubles for the train ticket to get you back to Pavlovsk."'
+
+	act 'Leave': gadstay = 0 & gt 'gad_gpyard', 'start'
+end
+
+if $ARGS[0] = 'was_lost_yesterday':
+	menu_off = 1
+	grandmaQW['disappointment'] = 0
+	grandpaQW['disappointment'] = 0
+	grandmaQW['last_day_helped'] = daystart
+	grandpaQW['last_day_helped'] = daystart
+	minut += 5
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/babushka.jpg"></center>'
+	*nl
+	'"<<$pcs_firstname>>, your grandfather and I were so worried when you didn''t come home from the forest."'
+	'"We are so glad you are back safe and sound. Go have a hot meal and shower and relax."'
+	'"Also, don''t worry about any chores today. Just focus on recovering."'
+
+	act 'Continue': gt 'gad_gphouse', 'main'
+end
+
+
+if $ARGS[0] = 'nudity_trouble_kicked':
+	menu_off = 1
+	gs 'homes_properties', 'block_access', 'grandparents_house'
+	grandmaQW['help_amount'] = 0
+	grandmaQW['block'] = 1
+	minut += 5
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+	*nl
+	'Your grandmother looks at you coldly from across the room. She is speaking softly, but somehow that is more unnerving than usual, "I''ve been more than fair to you, <<$pcs_firstname>>, and given you more chances than maybe even your mother."'
+	'"If you won''t at least try to act like a decent lady around here, you are no longer welcome. So take your things and leave. Come back when you''ve learned at least some basic decency."'
+
+	act 'Leave': gadstay = 0 & gt 'gadukino'
+end
+
+if $ARGS[0] = 'nudity_trouble':
+	menu_off = 1
+	if grandmaQW['nudity_trouble'] > grandmaQW['help_amount']:
+		grandmaQW['help_amount'] = 0
+	else
+		grandmaQW['help_amount'] = grandmaQW['help_amount'] - grandmaQW['nudity_trouble']
+	end
+	grandmaQW['nudity_trouble'] = 0
+	grandmaQW['nudity_trouble_base'] += 1
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/babushka.jpg"></center>'
+	*nl
+	'Suddenly your grandmother approaches you with a disappointed look on her face. "I had higher expectations of you, young lady! You should be ashamed of yourself for running around outdoors without clothes. You have embarrassed your grandfather and me! Our friends have seen you around naked, as have your grandfather and I, so don''t even try to hide it."'
+	'"This will be reflected in your allowance, don''t act surprised at the beginning of the month."'
+	'"Unlike you, we have to live in this village and get along with its people. If you keep this up, I''ll be cutting your time here short and sending you back to your mother, and she can deal with your sinful behaviour. We better not hear any more about this!" She then walks off before you can even respond.'
+
+	act 'Continue': gt 'gad_gphouse', 'main'
+end
+
+if $ARGS[0] = 'grandpa_disapointment':
+	menu_off = 1
+	grandpaQW['disappointment'] = 0
+	grandmaQW['help_amount'] -= 1
+	minut += 5
+	pcs_mood -= 5
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
+	*nl
+	'Your grandfather scowls at you as you walk by.'
+	'<br>"<<$pcs_firstname>>. I am disappointed in you," he says flatly.'
+	'"What? Why?" you ask, taken aback a bit by his demeanour.'
+	'"Yesterday, I asked you to help me, and you agreed. And here we are today, and I find that you did not."'
+	'"Oh n-no, Grandpa," you stutter, "I forgot all about it! I''m sorry!"'
+	'"Quiet, child. I wasn''t done speaking. You promised to help and did not, which means you lied."'
+	'<br>You stare at him, crestfallen.'
+	'<br>"And I don''t want your apologies. A <<$pcs_lastname>> keeps their word, or their word is worth nothing."'
+	'Your eyes tear up a bit as your grandfather berates you. "Yes, sir," you mumble quietly.'
+	'"I would rather you tell me flat-out if you do not want to help, <<$pcs_firstname>>. At least that makes you honest, even if lazy."'
+	'"Grandpa, I honestly just forg-" you begin, but he cuts you off.'
+	'"Hush, child. I don''t care for excuses. Now go on. Some of us have work to do."'
+	'<br>You silently turn and walk away, feeling guilty.'
+
+	act 'Continue': gt 'gad_gphouse', 'main'
+end
+
+if $ARGS[0] = 'grandma_disapointment':
+	menu_off = 1
+	grandmaQW['disappointment'] = 0
+	grandmaQW['help_amount'] -= 1
+	minut += 5
+	pcs_mood -= 5
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+	*nl
+	'Grandma frowns at you as you walk by. "<<$pcs_nickname>>, you said you would help me yesterday, and you did not."'
+	'You cringe as you remember what you told her you would do. "I''m sorry, Grandma, I forgot all about it..."'
+	'"I am an old woman, child. It is difficult for me to do many things I once could. But I can still do them if I know I have to."'
+	'Feeling guilty, you look at the ground as she continues, "But it is even harder for me if I expected help and did not receive it."'
+	'"Sorry, Grandma," you mumble again.'
+	'She softens a little, finally. "It''s okay, child," she says. "But it makes it harder for me to give you your allowance for sweets if you cannot follow through on your promises."'
+	'"Yes, ma''am," you nod.'
+	'"All right, child," she says, patting your shoulder softly. "Go on now. I am sure you have things to do."'
+
+	act 'Continue': gt 'gad_gphouse', 'main'
+end
+
+if $ARGS[0] = 'first_visit':
+	menu_off = 1
+	grandmaQW['first_visit'] = 1
+	money += 3000
+	minut += 5
+	pcs_mood += 10
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
+	*nl
+	'Upon entering the house, you let out a screech as you catch sight of your grandmother, throwing yourself at her, wrapping your arms around her neck. She embraces you tightly. She starts by saying "Dear <<$pcs_nickname>>, you''re only skin and bones, but don''t worry, a few months here and you''ll be looking your usual self again ."'
+	'"But look at you, you sure have grown up. A young woman." she says proudly. She continues "Grandpa and I keep getting older and older and need some help around the house. What do you say youngling? You will not have to do much. Here''s the deal, you lend us a helping hand on the farm as much as possible, and we will pay you for each chore you do. It will be a great life lesson, you will learn about hard work. What do you say?"'
+	'"Of course I''ll help out, Grandma." you answer.'
+	'"I''m glad to hear that <<$pcs_nickname>>, here is little something anyways just for visiting," Grandma says and gives you 3000 rubles.'
+	'"Thanks Babushka!" you kiss her on the cheek before you head on out.'
+
+	if (kanikuli = 4 or kanikuli = 5) and ((month = 6 or month = 7) or (month = 8 and day <= 25)):
+		'"Will you be staying with us during the summer or will you be traveling back and forth with your parents?" she asks.'
+
+		act 'Stay with your grandparents': gadstay = 1 & gt 'gad_gphouse', 'main'
+		act 'Stay in Pavlovsk': gadstay = 0 & gt 'gad_gphouse', 'main'
+	else
+		act 'Continue': gt 'gad_gphouse', 'main'
+	end
+end
+
+if $ARGS[0] = 'chores_pay':
+	menu_off = 1
 	grandmaQW['last_month_paid'] = month
-	display_bb = 1
+	if grandmaQW['help_amount'] > 0: money += (grandmaQW['help_amount'] * 25)
+	minut += 5
+	pcs_mood += 5
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
+	*nl
+	'Your grandmother calls you over to her, "I imagine you''ve spent all your allowance so lets see what we can do to give you some more pocket money, hmmmm?" she says as she opens her purse.'
+	if grandmaQW['help_amount'] > 0:
+		'"You were quite helpful over the last few weeks, so here''s <<grandmaQW[''help_amount''] * 25>> rubles." She starts to hand you the money, then lifts it away with a stern look, "But you can always do more work, young lady!" she scolds gently then smiles as she gives you the money.'
+		grandmaQW['help_amount'] = 0
+	else
+		'"We really could have used your help last month," she says mournfully as she counts out some bills. "Maybe this month you''ll do more to help us?" She looks at you sternly as she puts her purse away.'
+	end
+
+	act 'Continue': gt 'gad_gphouse', 'main'
+end
+
+if $ARGS[0] = 'mira_visit':
+	menu_off = 1
+	MiraVars['guestday'] = daystart + 1
+	MiraVars['guest'] = 1
+	minut += 5
+	gs 'stat'
+
+	gs 'miroslava', 'miraclothes'
+	*nl
+	'You notice Mira coming towards your grandparents home.'
+	'You step out on the porch and greet Mira. She replies "Hi <<$pcs_nickname>>, I was really bored being all alone at home. Do you want to do something?"'
+
+	act 'Continue': gt 'gad_gphouse', 'main'
+end
+
+
+
+if $ARGS[0] = 'villagecat_string':
+	if hour < 8:
+		temp = rand(0, 9)
+		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a>is curled up, sleeping peacefully.'
+	elseif hour >= 8 and hour < 12 and sunWeather = 1:
+		temp = rand(0, 2)
+		if temp = 1: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is busy cleaning himself with his tongue on the table by the window.'
+		if temp = 2: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> lies lazily on the table by the window, soaking up some sunshine rays.'
+	elseif hour >= 8 and hour < 12 and sunWeather = 0:
+		temp = rand(0, 1)
+		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
+		if temp = 1: 'On the table by the window, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> stares in disgust at the rain outside.'
+	elseif hour >= 12 and hour < 18:
+		temp = rand(0, 5)
+		if temp = 3: 'Next to the table by the window, <a href="exec:feedcat = 1 & gt ''gad_gphouse'',''villagecat''">Boniface</a> stretches and meows loudly. It''s time for dinner.'
+		if temp = 4 and sunWeather = 1: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> lies lazily on the table by the window, soaking up some sunshine rays.'
+		if temp = 4 and sunWeather = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
+	elseif hour >= 18 and hour < 22 and catout ! 2:
+		temp = rand(0, 3)
+		if temp = 0:'<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is stalking around the main floor, looking for a nice juicy mouse to play with.'
+		if temp = 1 and catout = 0: catout = 1 &'<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> twines around your ankles, then goes to the door, meowing pitifully.'
+	elseif hour >= 22:
+		temp = rand(0, 2)
+		if temp = 1:'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
+	end
+end
+
+
+if $ARGS[0] = 'villagecat':
+	*clr & cla
 	menu_off = 1
-	hour = 6
+	minut += 2
 	gs 'stat'
-	music_loop = 0
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat.jpg"></center>'
+	'Your grandparents'' fat tomcat, Boniface, is aware of you approaching him, even though his eyes are closed. He tracks you with his ears and simply ignores you.'
+
+	act 'Leave Boniface alone':minut += 2 & gt 'gad_gphouse', 'entry'
+
+	act 'Pet Boniface':
+		*clr & cla
+		minut += 5
+		pcs_mood += RAND(1,4)
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/villcat1.jpg"></center>'
+		'You gently pet Boniface, giving him a good scratch behind the ears. You hear him start to purr. As soon as you stop scratching him, the purring stops too. That lazy bastard... he''s living the good life!'
+
+		act 'Continue':minut += 2 & gt 'gad_gphouse', 'entry'
+	end
+
+	if feedcat = 1:
+		act 'Feed Boniface':
+			*clr & cla
+			minut +=5
+			gs 'stat'
+			feedcat = 2
+			'<center><video autoplay loop src="images/locations/gadukino/grandparents/feedboniface.mp4"></video></center>'
+			'When Boniface sees you moving towards the cupboard, he jumps off the table and runs to his food dish. He obviously feels that you are moving far too slowly and rattles his bowl to make sure you understand that he is starving while you dawdle.'
+			act 'Continue': gt 'gad_gphouse', 'entry'
+		end
+	end
+
+	if catout = 1:
+		act 'Let Boniface Out':
+			if sunWeather = 0:
+				*clr & cla
+				minut += 10
+				gs 'stat'
+				'You open the door for Boniface, who saunters around you only to stop in the doorway as he becomes aware that it is raining. He glares up at you as if the rain was your fault. He stares out into the wet for another moment, then sedately turns around and returns to his box.'
+				act 'Continue': gt 'gad_gphouse', 'entry'
+			else
+				*clr & cla
+				minut +=10
+				gs 'stat'
+				catout = 2
+				'You open the door for Boniface, who saunters around you only to stop in the doorway as he stops to consider if he really wants to go outside. After considering all the pros and cons, he finally decides to go out.'
+				act 'Continue': gt 'gad_gphouse', 'entry'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'grandma_leave_event':
+	menu_off = 1
+	gs 'stat'
+	'As you''re leaving the house, you grandmother gives you a big hug and tells you to be safe.'
+	act 'Leave': minut += 1 & gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'grandpa_leave_event':
+	menu_off = 1
+	gs 'stat'
+	'As you''re leaving the house, you grandfather tells watch out for yourself and be safe.'
+	act 'Leave': minut += 1 & gt $loc, $loc_arg
+end
+
+
+
+
+
+
+	!!=============================================================================================!!
+	!!                                                                                             !!
+	!!                                       INACTIVE BACKUP                                       !!
+	!!                                                                                             !!
+	!!=============================================================================================!!
+
+
+if $ARGS[0] = 'start':
+	gt 'gad_gphouse', 'entry'
+
+
+
+	*clr & cla
 	CLOSE ALL
+	$location_type = 'indoors'
+	$region = 'gad'
+	gs 'shortgs', 'setloc', 'gad_gphouse', 'start'
+	menu_off = 1
+	gs 'miroslava_schedule'
+	$locclass = 'singleroom'
+	frost = 0
+
+	gs 'homes_properties', 'give_access', 'grandparents_house'
+	gs 'gad_gphouse', 'nudity_trouble_limit'
+	gs 'gad_gphouse', 'enter_events'
+	gt 'gad_gphouse', 'main'
+end
+
+if $ARGS[0] = 'old_main':
+	gs 'shortgs', 'setloc', 'gad_gphouse', 'main'
+	$locclass = 'livingr'
+	menu_off = 0
+	*clr & cla
+	gs 'family_schedule'
+	gs 'stat'
 	'<center><H4>Your Grandparents'' Cottage</H4></center>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
 	*nl
-	'Suddenly, you hear a familiar voice yell, "<<$pcs_nickname>>, time to get up. You can''t spend the whole day lying around!"'
-	wait 2000
-	$npc_nickname['A29'] = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
-	if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
-	killvar '$temp_nickname'
-
-	act 'Continue':
-		cla & *clr
-		minut += 2
-		gs 'stat'
-		'<center><H4>Your Grandparents'' Cottage</H4></center>'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-		*nl
-		'You tiredly open your eyes, seeing your <<$npc_nickname[''A29'']>> standing over you, "Fifteen more minutes..."'
-		'Your <<$npc_nickname[''A29'']>> lets out a loud sigh, "No, up now!" as she yanks the cover off...'
-		'"<<$npc_nickname[''A29'']>>!" you exclaim, as you feel a slight cold breeze hit your body.'
-		if month = 6:
-			'"Listen! I''m heading back to Pavlovsk this morning, and I don''t want to hear excuses, <<$pcs_nickname>> You said you''d help out your grandparents during the summer holidays. So, from now on, set your alarm, so you can wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
+	'A fairly simple cottage in the village of Gadukino which your grandparents call home. In the main room there is a huge <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
+	'There is an old <a href="exec:gt ''TV'',''gad''">television</a> in the living room. It''s positioned next to a body length <a href="exec:gt ''mirror'', ''start''">mirror</a>.'
+	'You can check your weight on your grandma''s old mechanical <a href="exec:msg ''<center>Your weight is <<pcs_weight[0]>>.<<pcs_weight[1]>> kg<br>Your body mass index (BMI) is <<pcs_bmi[0]>>.<<pcs_bmi[1]>>.<br><<$bodyVars[''bmi_desc'']>></center>''">scales</a>.'
+	'Your grandfather''s <a href="exec: newspaperVars[''dbag''] = 0 & gs ''newspaper'', ''start''">newspaper</a> is lying to the side.'
+
+	if hour < 8:
+		temp = rand(0,9)
+		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a>is curled up, sleeping peacefully.'
+	elseif hour >= 8 and hour < 12 and sunWeather = 1:
+		temp = rand(0,2)
+		if temp = 1: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is busy cleaning himself with his tongue on the table by the window.'
+		if temp = 2: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> lies lazily on the table by the window, soaking up some sunshine rays.'
+	elseif hour >= 8 and hour < 12 and sunWeather = 0:
+		temp = rand(0,1)
+		if temp = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
+		if temp = 1: 'On the table by the window, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> stares in disgust at the rain outside.'
+	elseif hour >= 12 and hour < 18:
+		temp = rand(0,5)
+		if temp = 3: 'Next to the table by the window, <a href="exec:feedcat = 1 & gt ''gad_gphouse'',''villagecat''">Boniface</a> stretches and meows loudly. It''s time for dinner.'
+		if temp = 4 and sunWeather = 1: '<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> lies lazily on the table by the window, soaking up some sunshine rays.'
+		if temp = 4 and sunWeather = 0: 'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
+	elseif hour >= 18 and hour < 22 and catout ! 2:
+		temp = rand(0,3)
+		if temp = 0:'<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is stalking around the main floor, looking for a nice juicy mouse to play with.'
+		if temp = 1 and catout = 0: catout = 1 &'<a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> twines around your ankles, then goes to the door, meowing pitifully.'
+	elseif hour >= 22:
+		temp = rand(0,2)
+		if temp = 1:'In a box filled with scraps of cloth, <a href="exec: gt ''gad_gphouse'', ''villagecat''">Boniface</a> is curled up, sleeping peacefully.'
+	end
+
+	if hour >= 6 and hour < 8:
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> is puttering around in the kitchen, making breakfast.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> sits at the kitchen table, drinking a black cup of coffee.'
+	elseif hour >= 8 and hour < 10:
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> is slowly wandering through the house, tidying up as she goes along.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> is sitting in his recliner, watching the morning news.'
+	elseif hour >= 10 and hour < 11:
+		'Your grandmother is napping on the sofa, curled up under a heavy quilt.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> is sitting in his recliner, watching the morning news.'
+	elseif hour >= 11 and hour < 12:
+		'Your grandmother is napping on the sofa, curled up under a heavy quilt.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> sits next to her, stroking her hair and faintly smiling.'
+	elseif hour >= 12 and hour < 13:
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> is in the kitchen, making a sandwich, while your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> waits at the kitchen table.'
+	elseif hour >= 13 and hour < 15:
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> is sitting by the window, '+iif(sunWeather = 0, 'watching the rain','looking outside')+'.'
+		'Your grandfather is leaning back in his recliner, fast asleep.'
+	elseif hour >= 15 and hour < 17:
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> and <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> are watching an old-timey-looking show on the TV.'
+	elseif hour >= 17 and hour < 18:
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> is puttering around in the kitchen, making dinner.'
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> sits at the kitchen table, waiting for grandma to bring his food.'
+	elseif hour >= 18 and hour < 20:
+		'Your <a href="exec: gt ''gad_gphouse'', ''grandma'' ">grandmother</a> and <a href="exec: gt ''gad_gphouse'', ''grandpa'' ">grandfather</a> are watching the evening news on TV.'
+	else
+		'Your grandparents are asleep. They sleep in separate beds, which is strange since they''re still madly in love.'
+	end
+
+	if locat['A60'] = 21:
+		if MiraVars['guest'] = 0:
+			if MiraVars['follow_time'] < 1: MiraVars['follow_time'] = 1
+			gt 'gad_gphouse', 'start'
 		else
-			'"Listen! I''m heading back to Pavlovsk this morning, and I don''t want to hear excuses, <<$pcs_nickname>>. The summer holidays will be over soon, and you need to get used to waking up early for when school starts. So, set your alarm, so you can wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
+			MiraVars['follow_time'] = 0
+			'<a href="exec: gt ''miroslava'', ''start''">Mira</a> is sitting next to you.'
 		end
-		act 'Get up':
-			cla & *clr
-			minut += 2
+	end
+
+	gs 'stat'
+	gs 'themes', 'indoors'
+	gs 'kit_din'
+
+	gs 'gad_gphouse', 'family_trip'
+
+	if $clothingworntype ! 'nude':
+		act 'Go outside':minut += 1 & gt 'gad_gpyard', 'start'
+	elseif $clothingworntype = 'nude':
+		act 'Go outside naked':
+			*clr & cla
+			menu_off = 1
+			minut += 1
+			inhib_exp += rand(0,2)
+			grandmaQW['nudity_trouble'] += rand(0,2)
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>'
+			'It''s undoubtedly risky leaving the house like this. But, while it''s unlikely anyone saw you go outside naked, there''s a thrill in almost getting caught.'
+			gs 'arousal', 'flash', 10, 'exhibitionism'
+			gs 'arousal', 'end'
 			gs 'stat'
-			'<center><H4>Your Grandparents'' Cottage</H4></center>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-			*nl
-			if month = 6:
-				'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "The work around the farm normally gets done in the morning, so you can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you, she misses you rolling your eyes.'
-			else
-				'As soon as you get off your now coverless bed, <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is almost over. You can''t sleep in anymore, not even for another fifteen minutes." Of course, she''s not even looking at you while she talks, but luckily for you, she misses you rolling your eyes.'
-			end
-			'"What are you going to do when school starts, or when you get a job? You better get into the habit of setting your alarm so you can wake up bright and early."'
-			act 'Continue':
-				cla & *clr
-				minut += 2
-				gs 'stat'
-				'<center><H4>Your Grandparents'' Cottage</H4></center>'
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-				*nl
-				'You release an exasperated sigh, "Yeah, I know, you told me that already. So, how early are we talking?"'
-				if month = 6:
-					'Your <<$npc_nickname[''A29'']>> shoots you a sharp look, and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right... Anya used to wake up at 06:00 when she used to sleep here. Besides, while staying at your grandparents'' house, you should be up extra early helping them tend to the farm. This isn''t a holiday camp!"'
-				else
-					'Your <<$npc_nickname[''A29'']>> shoots you a sharp look, and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right... Anya used to wake up at 06:00 for school. Besides, while staying at your grandparents'' house, you should be up extra early helping them tend to the farm. This isn''t a holiday camp!"'
-				end
-				act 'Continue':
-					cla & *clr
-					minut += 2
-					gs 'stat'
-					'<center><H4>Your Grandparents'' Cottage</H4></center>'
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-					*nl
-					'"You want me to wake up that early?!" You huff. "Can''t I wake up at like... 07:00?"'
-					if month = 6:
-						'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners, or your grandparents will have started work without you, and I won''t be having any of that," she warns you before making her way outside.'
-						if pcs_vag = 0: '"Oh, don''t forget; when you get back to Pavlovsk, you need to head to the clinic and see the gynaecologist for a check-up. Not just once, but every month," she adds quickly.'
-					else
-						'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns you before making her way outside.'
-						if pcs_vag = 0: '"Oh, don''t forget; when you get back to Pavlovsk, you need to head to the clinic and see the gynaecologist for a check-up. Not just once, but every month," she adds quickly.'
-					end
-					act 'But why do I--':
-						cla & *clr
-						minut += 2
-						gs 'stat'
-						'<center><H4>Your Grandparents'' Cottage</H4></center>'
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-						*nl
-						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms off towards your grandparent''s outside door. "Don''t forget to talk to your grandparents and ask if they need help!" she shouts. Then, without waiting for your response, she closes the door, and with that, she''s gone.'
-						act 'I understand...': $menu_loc = 'gad_gphouse' & $menu_arg = 'entry' & gt 'alarmclock', 'start'
-					end
-				end
+			act 'Continue': gt 'gad_gpyard', 'start'
+		end
+	elseif $clothingworntype = 'nude' and ($pantyworntype ! 'none' or $braworntype ! 'none'):
+		act 'Go outside in your underwear':
+			*clr & cla
+			menu_off = 1
+			minut += 1
+			inhib_exp += rand(0,1)
+			grandmaQW['nudity_trouble'] += rand(0,1)
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/gaddvor_nude.jpg"></center>''It''s undoubtedly risky leaving the hosue like this, and while it''s unlikely anyone saw you go outside in your underwear, there''s a thrill in almost getting caught'
+			gs 'arousal', 'flashlite', 10, 'exhibitionism'
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Continue': gt 'gad_gpyard', 'start'
+		end
+	end
+	act 'Go to your room': gt 'gad_gpbarn', 'barn_room'
+	if grandmaQW['chore_clean_floor'] = 1:
+		act 'Clean the floor for Grandma (1:00)':
+			*clr & cla
+			minut += 60
+			grandmaQW['chore_clean_floor'] = 2
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
+			'You grab a bucket and a rag, get down on your knees and begin scrubbing the floor. Within the hour, the floor shines, and you are satisfied with your work. You put the cleaning supplies into a corner and continue your day.'
+
+			act 'Continue':gt 'gad_gphouse', 'start'
+			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
+		end
+	end
+
+	if grandmaQW['chore_wash_clothes'] = 1:
+		act 'Wash Grandpa''s clothes for Grandma (1:00)':
+			*clr & cla
+			minut += 60
+			grandmaQW['chore_wash_clothes'] = 2
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
+			'You pick up your grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
+
+			act 'Hang the laundry':
+				*clr & cla
+				minut += 10
+				gs'stat'
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
+				'Once done with the washing, you walk to the clothesline, where you carefully hang the clothes to dry.'
+
+				act 'Continue': gt 'gad_gpyard', 'start'
+				act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
 			end
 		end
 	end
+
+	if (hour >= 6 and hour < 10) or (hour >= 12 and hour < 20): act 'Talk to Grandma': gt 'gad_gphouse', 'grandma'
+	if (hour >= 6 and hour < 13) or (hour >= 15 and hour < 20): act 'Talk to Grandpa': gt 'gad_gphouse', 'grandpa'
+	act 'Eat a hearty meal (0:20)':gs 'food', 'l_meal'
+	act 'Eat a normal meal (0:15)':gs 'food', 'm_meal'
+	act 'Eat a light meal (0:10)':gs 'food', 's_meal'
+
+	dynamic $edasnack
+	dynamic $sandwich
+	dynamic $driwater
+	dynamic $dritea
+	dynamic $fill_bottle
+	dynamic $edaD
+	dynamic $fatdel
+	dynamic $lekarstvo
+	dynamic $vitamin
+
+	gs 'events', 'read'
+	gs 'subkid'
+
+	if mc_inventory['tapestry'] > 0:'You have <<gobelen>> completed tapestries.'
+	if pcs_sewng >= 40 and mc_inventory['sewing_fabric'] > 0:
+		'You have enough fabric for <<mc_inventory[''sewing_fabric'']>> lessons.'
+	end
+	if mc_inventory['sewing_fabric'] <= 0:'You do not have any fabric.'
+
+	if pcs_sewng >= 80:
+		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.'
+			act 'Work on the tapestry': gt 'sewing', 'tapestry'
+		end
+
+	end
+
+	if rand(0,2) ! 0: gs 'din_bad' & dynamic $mobile_check
+	gs 'prostitution_functions', 'prostitute_outfit_at_home'
 end
---- gad_gphouse ---------------------------------
+
+
+
+
+--- gad_gphouse ---------------------------------

+ 18 - 15
locations/gad_market.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 
 	'<center><h2>Farmers Market</h2></center>'
-	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/farmersmarket.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/main.jpg"></center>'
 	'A small and modest farmers market, a few small shops fill the space.'
 	*nl
 
@@ -69,7 +69,7 @@ if $ARGS[0] = 'hunter_stand':
 		exit
 	end
 
-
+	'<center><img <<$set_imgh>> src="images/location/gadukino/market/hunter_stand.jpg"></center>'
 	'A small stand selling dried meat'
 
 	if hunters_were_met = 1: act 'Talk to one of the hunters': gt 'gad_market', 'hunter_talk'
@@ -85,6 +85,8 @@ if $ARGS[0] = 'hunter_cart':
 	$args_s = 'hunter_cart'
 	gs 'stat'
 
+	$backimage='images/location/gadukino/market/hunter_stand.jpg'
+
 	if hour < 8 or hour > 20:
 		'The shop is currently closed.'
 
@@ -106,6 +108,7 @@ if $ARGS[0] = 'clothing_stand':
 	$loc_s = 'gad_market'
 	$args_s = 'clothing_stand'
 
+	'<center><img <<$set_imgh>> src="images/location/gadukino/market/clothing_stand.jpg"></center>'
 	'A small stand selling cheap clothes'
 
 	if hour < 8 or hour > 20:
@@ -129,7 +132,6 @@ if $ARGS[0] = 'clothing_cart':
 	gs 'stat'
 
 	'<center><b><font color="maroon">Clothes</font></b></center>'
-	'You inspect what cheap clothing the stall has to offer.'
 
 	if hour < 8 or hour > 20:
 		'The shop is currently closed.'
@@ -183,7 +185,6 @@ if $ARGS[0] = 'swimsuit_cart':
 	gs 'stat'
 
 	'<center><b><font color="maroon">Swimsuits</font></b></center>'
-	'You inspect what cheap swimsuits the stall has to offer.'
 
 	if hour < 8 or hour > 20:
 		'The shop is currently closed.'
@@ -277,7 +278,7 @@ if $ARGS[0] = 'build_stand':
 	menu_off = 1
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/build_stand.jpg"></center>'
 	'It takes you roughly an hour to setup your stand.'
 
 	act 'Continue':
@@ -291,7 +292,7 @@ if $ARGS[0] = 'breakdown_stand':
 	menu_off = 1
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/build_stand.jpg"></center>'
 	'It takes you roughly half an hour to break down your stand.'
 
 	act 'Continue':
@@ -307,7 +308,7 @@ if $ARGS[0] = 'your_stand':
 	gs 'stat'
 
 	'<center><b><font color="maroon">Your Stand</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/your_stand.png"></center>'
 	gs 'gad_market', 'see_stored'
 
 	act 'Try and sell your wares': gt 'gad_market', 'sell_wares'
@@ -319,6 +320,8 @@ if $ARGS[0] = 'sell_wares':
 	gs 'stat'
 
 	if hour < 8 or hour > 20:
+		'<center><b><font color="maroon">Your Stand</font></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/market/your_stand.png"></center>'
 		'The market is closed, you should break down your stand.'
 		act 'Break down your stand': gt 'gad_market', 'breakdown_stand'
 		exit
@@ -350,7 +353,7 @@ if $ARGS[0] = 'sell_nobody':
 	minut += 10
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/sell_nobody.jpg"></center>'
 	gs 'gad_market', 'see_stored'
 
 
@@ -363,7 +366,7 @@ elseif $ARGS[0] = 'sell_mushrooms':
 	minut += 10
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/sell_mushrooms1.jpg"></center>'
 	gs 'gad_market', 'see_stored'
 	'Somebody wants to buy a kg of mushrooms!'
 
@@ -373,7 +376,7 @@ elseif $ARGS[0] = 'sell_mushrooms':
 		boletus_stored -= 1
 		gs 'stat'
 
-		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/market/sale<<rand(1, 4)>>.jpg"></center>'
 		gs 'gad_market', 'see_stored'
 		'You sell 1 kg of stored mushrooms'
 
@@ -385,7 +388,7 @@ elseif $ARGS[0] = 'sell_mushrooms':
 elseif $ARGS[0] = 'sell_berries':
 	minut += 10
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/sell_berries1.jpg"></center>'
 
 	gs 'gad_market', 'see_stored'
 
@@ -397,7 +400,7 @@ elseif $ARGS[0] = 'sell_berries':
 		bilberry_stored -= 1
 		gs 'stat'
 
-		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/market/sale<<rand(1, 4)>>.jpg"></center>'
 		gs 'gad_market', 'see_stored'
 		'You sell 1 kg of stored berries'
 
@@ -409,7 +412,7 @@ elseif $ARGS[0] = 'sell_fish':
 	minut += 10
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/sell_fish1.jpg"></center>'
 	gs 'gad_market', 'see_stored'
 	'Somebody wants to buy a kg of preserved fish!'
 
@@ -419,7 +422,7 @@ elseif $ARGS[0] = 'sell_fish':
 		fish_stored -= 1
 		gs 'stat'
 
-		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/market/sale<<rand(1, 4)>>.jpg"></center>'
 		gs 'gad_market', 'see_stored'
 		'You sell 1 kg of preserved fish'
 
@@ -431,7 +434,7 @@ elseif $ARGS[0] = 'sell_talk':
 	minut += 10
 	gs 'stat'
 
-	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/market/sell_talk.jpg"></center>'
 	gs 'gad_market', 'see_stored'
 	'A couple of people walk up to your stand and you spend tem minutes making some small-talk.'
 

+ 5 - 1
locations/gad_miroslava_home.qsrc

@@ -43,7 +43,11 @@ if $ARGS[0] = 'start':
 		end
 	else
 		*nl
-		if hour > 22 or hour < 3: 'It''s too late. Most of Mira''s family is asleep. No need to wake them up unnecessarily.' else 'It''s too early. Most of Mira''s family is still asleep. No need to wake them up unnecessarily.'
+		if hour > 22 or hour < 3:
+			'It''s too late. Most of Mira''s family is asleep. No need to wake them up unnecessarily.'
+		else
+			'It''s too early. Most of Mira''s family is still asleep. No need to wake them up unnecessarily.'
+		end
 		act 'Go back to the village center': gt 'gadukino'
 	end
 end

+ 1 - 1
locations/gdktoilet_mens.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'mens_entrance_events':
 				act 'Leave': gt 'gdktoilet', 'start'
 			end
 		end
-	elseif temp >= 50 and temp <=79 and soniaPS >= 1 and hour >= 20 and hour <=23:
+	elseif temp >= 50 and temp <=79 and soniaQW['slut'] >= 1 and hour >= 20 and hour <=23:
 		pcs_horny += 5
 		minut += 5
 		*clr & cla

+ 32 - 49
locations/gopskver.qsrc

@@ -2,19 +2,20 @@
 !2021/05/02
 
 if $ARGS[0] = '':
-	$loc_arg = $ARGS[0]
-	$prevloc = $loc
-	$loc = 'gopskver'
-	$location_type = 'event_outdoors'
-
 	*clr & cla
 	menu_off = 1
+
+	if strpos($location_type, 'outdoors') > 0:
+		$location_type = 'event_outdoors'
+	else
+		$location_type = 'event_indoors'
+	end
 	gs 'stat'
 
 	gs 'dinsexFX'
-	if $prevloc = 'gkafe':
+	if $loc = 'gkafe':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/cafe/gkafe2.jpg"></center>'
-	elseif $prevloc = 'pav_train_hall':
+	elseif $loc = 'pav_train_hall':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/trainstation/vokzal.jpg"></center>'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/skver.jpg"></center>'
@@ -23,16 +24,16 @@ if $ARGS[0] = '':
 
 	if kotovLoveQW > 0:
 		if hour < 20:
-			if $prevloc = 'gkafe':
+			if $loc = 'gkafe':
 				'Vitek Kotov sees you entering the cafe and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and asks you to join them.'
-			elseif $prevloc = 'pav_train_hall':
+			elseif $loc = 'pav_train_hall':
 				'Vitek Kotov sees you entering the train station and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and asks you to join them.'
 			else
 				'Vitek Kotov sees you walking in the park, and tells you to come over. When you approach him, he explains he''s drinking some beer with his friends, and asks you to join them.'
 			end
 
 			act 'Decline and leave':
-				if $prevloc = 'gkafe':
+				if $loc = 'gkafe':
 					gt 'gkafe'
 				else
 					gt 'pav_park', 'deeper_park'
@@ -48,7 +49,7 @@ if $ARGS[0] = '':
 				'The guys pour one for you, and you enjoy a nice cold beer in their company.'
 
 				act 'Continue':
-					if $prevloc = 'gkafe':
+					if $loc = 'gkafe':
 						gt 'gkafe'
 					else
 						gt 'pav_park', 'deeper_park'
@@ -78,7 +79,7 @@ if $ARGS[0] = '':
 					minut += 15
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big9.jpg"></center>'
-					'You take Vitek by the hand and almost feel like he''s showing you off, ' + iif($prevloc='gkafe','when he walks you to the exit of the cafe. You take a little walk','when you walk across the park square towards the exit.  You leave the park') + ' and Vitek guides you to where he lives. It''s a rather worn-down house from the outside, and the inside doesn''t look much better. Crumpled heaps of clothes lie everywhere, and the floor is littered with empty bottles.'
+					'You take Vitek by the hand and almost feel like he''s showing you off, ' + iif($loc='gkafe','when he walks you to the exit of the cafe. You take a little walk','when you walk across the park square towards the exit.  You leave the park') + ' and Vitek guides you to where he lives. It''s a rather worn-down house from the outside, and the inside doesn''t look much better. Crumpled heaps of clothes lie everywhere, and the floor is littered with empty bottles.'
 
 					act 'Continue':gt 'kotovSex'
 				end
@@ -89,7 +90,7 @@ if $ARGS[0] = '':
 					'Sorry, babe. I didn''t mean to tease, but have to get going.'
 
 					act 'Continue':
-						if $prevloc = 'gkafe':
+						if $loc = 'gkafe':
 							gt 'gkafe'
 						else
 							gt 'pav_park', 'deeper_park'
@@ -139,7 +140,7 @@ if $ARGS[0] = '':
 					minut += 15
 					gs 'stat'
 					'You''re walking down the street, feeling a bit wobbly from the alcohol while Dan supports your weight. He tells you funny stories and anecdotes along the way, and before you know it you''re at your apartment building. When you open the door and enter the building, Dan suddenly pulls you to the side. He''s quite rough about it, and shoves you into a dark corner of the stairwell. He takes your hand by the chin and whispers in your ear: "Your turn to make me feel good, slut. Otherwise I''m telling everyone."'
-					act 'Do as he says':gt 'gopskver', 'dan_blowjob'
+					act 'Do as he says': xgt 'gopskver', 'dan_blowjob'
 					gs 'willpower', 'bj', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:
 						act 'Push him away(<<will_cost>> Willpower)':
@@ -192,7 +193,7 @@ if $ARGS[0] = '':
 						pcs_horny += 10
 						gs 'stat'
 						'You return his kiss, unsure why he''s kissing you... he never seemed to be that interested in you. Then you feel his hands on your shoulders, and Dan firmly presses down on them trying to get you to drop to your knees. He whispers reassuringly: "Don''t worry, <<$pcs_nickname>>... I didn''t tell anyone about all the things you did. Do a good job, and your secret will stay safe."'
-						act 'Do as he says':gt 'gopskver', 'dan_blowjob'
+						act 'Do as he says': xgt 'gopskver', 'dan_blowjob'
 						gs 'willpower', 'bj', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
 							act 'Push him away(<<will_cost>> Willpower)':
@@ -253,7 +254,7 @@ if $ARGS[0] = '':
 				end
 			end
 		elseif hour < 20:
-			iif($prevloc = 'gkafe','You see Vitek, Dan and Vasily sitting at a table, drinking some beers','You see Vitek, Dan and Vasily sitting on a park bench, drinking some beers.')
+			iif($loc = 'gkafe','You see Vitek, Dan and Vasily sitting at a table, drinking some beers','You see Vitek, Dan and Vasily sitting on a park bench, drinking some beers.')
 
 			temp_fame = func('cardgame_durak', 'get_mod_fame')
 			if temp_fame >= 250:
@@ -271,12 +272,12 @@ if $ARGS[0] = '':
 				'Vasily grins and shouts as he sees you walk by: "Look guys, it''s our favourite slut! <<$shultextrand>>" His friends laugh loudly at your expense.'
 				killvar 'shultextrand'
 
-				if $prevloc = 'gkafe':
-					act 'Blush and quickly leave the cafe': gt $prevloc
-				elseif $prevloc = 'pav_train_hall':
-					act 'Blush and quickly leave the train station': gt $prevloc
+				if $loc = 'gkafe':
+					act 'Blush and quickly leave the cafe': gt $loc
+				elseif $loc = 'pav_train_hall':
+					act 'Blush and quickly leave the train station': gt $loc
 				else
-					act 'Blush and keep walking':gt 'pav_park', 'deeper_park'
+					act 'Blush and keep walking': gt 'pav_park', 'deeper_park'
 					if BjBeerQW >= 5:
 						act 'Approach the guys': gt 'zsoft_gopskverGorSlut', '1'
 					elseif BjBeerQW < 5:
@@ -295,15 +296,9 @@ if $ARGS[0] = '':
 				end
 			else
 				if alko < 6:
-					iif($prevloc = 'gkafe','The boys ordered some extra beers ','The boys have some extra beers with them,') + 'and invite you to have a seat and join them.'
+					iif($loc = 'gkafe','The boys ordered some extra beers ','The boys have some extra beers with them,') + 'and invite you to have a seat and join them.'
 
-					act 'Decline the beer and leave':
-						if $prevloc = 'gkafe' or $prevloc = 'pav_train_hall':
-							gt $prevloc
-						else
-							gt 'pav_park', 'deeper_park'
-						end
-					end
+					act 'Decline the beer and leave': gt $loc, $loc_arg
 
 					act 'Drink beer with the guys':
 						*clr & cla
@@ -314,15 +309,9 @@ if $ARGS[0] = '':
 						gs 'drugs', 'alcohol', 'beer'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/drunk_ev/beer3.jpg"></center>'
-						'The guys cheer and pour out a beer for you. Vasily gives you ' + iif($prevloc = 'gkafe','a glass','the cup') +' while the others propose a toast, already having beers in their hands. You happily join them in their toast, and spend the next 15 minutes chatting with them and having sips of your cold beer.'
+						'The guys cheer and pour out a beer for you. Vasily gives you ' + iif($loc = 'gkafe', 'a glass', 'the cup') + ' while the others propose a toast, already having beers in their hands. You happily join them in their toast, and spend the next 15 minutes chatting with them and having sips of your cold beer.'
 
-						act 'Continue':
-							if $prevloc = 'gkafe' or $prevloc = 'pav_train_hall':
-								gt $prevloc
-							else
-								gt 'pav_park', 'deeper_park'
-							end
-						end
+						act 'Continue': gt $loc, $loc_arg
 						if hour = 20:
 							*nl
 							if week = 5 or week = 6:
@@ -345,18 +334,12 @@ if $ARGS[0] = '':
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big11.jpg"></center>'
 							'Vasily puts his hand on your shoulder and tells you that his friends aren''t the kind of guys a nice girl should be getting drunk with and sends you on your way.'
 
-							act 'Continue':
-								if $prevloc = 'gkafe' or $prevloc = 'pav_train_hall':
-									gt $prevloc
-								else
-									gt 'pav_park', 'deeper_park'
-								end
-							end
+							act 'Continue': gt $loc, $loc_arg
 						end
 					elseif temp_fame < 200:
-						if $prevloc = 'gkafe':
+						if $loc = 'gkafe':
 							'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
-						elseif $prevloc = 'pav_train_hall':
+						elseif $loc = 'pav_train_hall':
 							'Vasily suggests to the guys to leave the train station and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
 						end
 						'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you''re a huge tease, is that true?"'
@@ -367,7 +350,7 @@ if $ARGS[0] = '':
 							'You smile and nod at him: "I like getting guys all worked up with my body, that''s true. Why?"'
 							'Vasily stutters for a moment, and then manages to say: "Oh n- no reason, I was just curious is all."'
 
-							act 'Thank them for the beer and leave':gt 'pav_park', 'deeper_park'
+							act 'Thank them for the beer and leave': gt 'pav_park', 'deeper_park'
 						end
 
 						act '"What? No!"':
@@ -376,10 +359,10 @@ if $ARGS[0] = '':
 							'You raise your voice a little and act surprised: "What? No way! Whoever told you that was lying!"'
 							'However, Dan doesn''t fall for your act, and matter-of-factly says: "<<$pcs_nickname>>, you''re a slut. We''ve all seen you, the whole town knows it. Why are you even trying to deny it? You''re such a terrible liar..."'
 
-							act 'Leave':gt 'pav_park', 'deeper_park'
+							act 'Leave': gt 'pav_park', 'deeper_park'
 						end
 					else
-						if $prevloc = 'gkafe':'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
+						if $loc = 'gkafe':'Vasily suggests to the guys to leave the cafe and continue drinking in the park. You are too drunk to resist so you just follow them to the park'
 						'At one point, Vasily sits down next to you and says: "Hey <<$pcs_nickname>>... I''ve heard from someone that you like sucking dicks... is that true?"'
 
 						act '"Yes, that''s true"':

+ 1054 - 0
locations/gp_elene.qsrc

@@ -0,0 +1,1054 @@
+# gp_elene
+
+!! Quest Variables - Grandma
+!! -------------------------
+!! grandmaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
+!!
+!! For all of the Grandma chores where 0/1/2/3 are possible values:
+!! 0 = not active
+!! 1 = assigned but not done yet
+!! 2 = done but not turned in/reported yet
+!! 3 = not done in time, triggers Grandma disappointment. cikl takes any chore in state 1 or 2 and turns it into state 3.
+!!
+!! grandmaQW['chore_clean_floor']				0/1/2/3 - is the "clean the floor" quest active?
+!! grandmaQW['chore_collect_fruit']				0/1/2/3 - is the "collect fruit" quest active?
+!! grandmaQW['chore_collect_strawberries']		0/1/2/3 - is the "collect strawberries" quest active?
+!! grandmaQW['chore_feed_chickens']				0/1/2/3 - is the "feed the chickens" quest active?
+!! grandmaQW['chore_harvest_garden']			0/1/2/3 - is the "harvest veggies from the garden" quest active?
+!! grandmaQW['chore_milk_cow']					0/1/2/3 - is the "milk the cow" quest active?
+!! grandmaQW['chore_wash_clothes']				0/1/2/3 - is the "wash Grandpa's clothes" quest active?
+!! grandmaQW['chore_water_garden']				0/1/2/3 - is the "water the garden" quest active?
+!! grandmaQW['chore_work_in_garden']			0/1/2/3 - is the "work in the garden" quest active?
+!! grandmaQW['chore_mushrooms_given']			How many kg of mushrooms has Sveta collected for Grandma? Used with chore_can_mushrooms.
+!! grandmaQW['chore_berries_given']				How many kg of berries has Sveta collected for Grandma? Used with chore_can_berries.
+!! grandmaQW['chore_harvest_done']				Has Sveta harvested veggies from the garden? Used with chore_can_veggies.
+!! grandmaQW['chore_gather_mushrooms']			0/1/2/3 - is the "gather mushrooms" quest active?
+!! grandmaQW['chore_gather_berries']			0/1/2/3 - is the "gather berries" quest active?
+!! grandmaQW['chore_gather_both']				0/1/2/3 - is the "gather mushrooms and berries" quest active?
+!! grandmaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandma want?
+!! grandmaQW['chore_berry_quantity']			How many kg of berries does Grandma want?
+
+!! Other Variables - Grandma
+!! -------------------------
+!! grandmaQW['help_amount']						Semi-abstract representation of how helpful Sveta has been. Longer, more arduous tasks get more points. Affects monthly allowance.
+!! grandmaQW['last_day_asked_for_story']		The most recent day Sveta asked Grandma to tell her a story. Checked against daystart (i.e. was it today?)
+!! grandmaQW['last_day_helped']					The most recent day Sveta asked Grandma if she could help her with anything.
+!! grandmaQW['last_day_talked']					The most recent day Sveta chatted with Grandma.
+!! grandmaQW['last_hour_talked']				The most recent hour Sveta chatted with Grandma. Checked against hour, allows for several chats through the day.
+!! grandmaQW['last_month_paid']					The most recent month Grandma paid Sveta for her help (i.e. was it the current month?)
+!! grandmaQW['nudity_trouble']					Semi-abstract representation of how annoyed Grandma is by Svetas exhibitionism. grandmaQW['nudity_trouble'] is subtracted from grandmaQW['help_amount'] and then reset to 0
+!! grandmaQW['nudity_trouble_limit']			Limit based on fame/reputation before Grandma reprimands Sveta about her behavior
+!! grandmaQW['nudity_trouble_base']				Base based on how many times Sveta has been reprimanded by Grandma about her behavior. Starts at 10. Goes up by 1 each time grandmaQW['nudity_trouble'] hits grandmaQW['nudity_trouble_limit']
+!! grandmaQW['block']							0/1 - has Sveta been caught sinning so much Grandma kicks her out
+!! grandmaQW['talked_about_gadukino']			0/1 - has Sveta asked Grandma about Gadukino? Makes the "Ask about Gadukino" option a one-time thing.
+!! grandmaQW['disappointment']					0/1 - marks if you failed a chore and Grandma is disappointed in you. Causes a lecture and -1 to help_amount
+!! grandmaQW['first_visit']						0/1 - triggers first converstion and gift from Grandma. Only get free money from Grandma once. Monthly payments are now only based on grandmaQW['help_amount']
+
+
+if $ARGS[0] = 'talk':
+	menu_off = 1
+	minut += 2
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+	'Your grandma is extremely old and seldom leaves the house. Most of the time, she sits on her bed watching TV or slowly cleans.'
+	if $clothingworntype = 'nude':
+		'Grandma looks a little shocked, but it''s nothing she hasn''t seen before.'
+		'"Go put some clothes on, dear. You''ll give your poor grandpa a heart attack if he sees you."'
+
+		act 'Maybe you should get dressed before talking to her': gt $loc, $loc_arg
+		exit
+	end
+
+	act 'Leave her alone': gt $loc, $loc_arg
+
+	if grigory_flower > 0 and grigory_flower < 10: act 'Talk to her about the flowers': gt 'grigory', 'flower4'
+
+	gs 'gp_elene', 'set_report_chores_acts'
+	gs 'gp_elene', 'get_random_chore_act'
+	gs 'gp_elene', 'set_talk_acts'
+end
+
+
+
+
+
+	!!===========================================================!!
+	!!                                                           !!
+	!!                          EVENTS                           !!
+	!!                                                           !!
+	!!===========================================================!!
+
+
+
+	!!-------------------- ASKING FOR CHORES END --------------------!!
+
+if $ARGS[0] = 'get_random_chore_act':
+	if daystart ! grandmaQW['last_day_helped']:
+		act 'Offer to help out':
+			menu_off = 1
+			grandmaQW['last_day_helped'] = daystart
+			frost = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
+			'You ask your grandmother if there is anything you could help out with. Your grandmother turns to you and says:'
+
+			if month <= 4 or month >= 10:
+				grandmaQW['chore_type'] = rand(0, 6)
+			elseif month = 5:
+				grandmaQW['chore_type'] = rand(0, 9)
+			elseif month >= 6 and month <= 9:
+				grandmaQW['chore_type'] = rand(0, 14)
+			end
+
+			if grandmaQW['chore_type'] = 0:
+				gt 'gp_elene', 'chore_cleanfloor'
+			elseif grandmaQW['chore_type'] = 1:
+				gt 'gp_elene', 'chore_washclothes'
+			elseif grandmaQW['chore_type'] = 2 and hour < 9 and hour > 20:
+				gt 'gp_elene', 'chore_milkcows'
+			elseif grandmaQW['chore_type'] = 3:
+				gt 'gp_elene', 'chore_groceries'
+			elseif grandmaQW['chore_type'] = 4 and boletus_stored >= 5:
+				gt 'gp_elene', 'chore_can_mushrooms'
+			elseif grandmaQW['chore_type'] = 5 and bilberry_stored >= 5:
+				gt 'gp_elene', 'chore_can_berries'
+			elseif grandmaQW['chore_type'] = 6 and grandmaQW['chore_harvest_done'] = 1:
+				gt 'gp_elene', 'chore_can_veggies'
+			elseif grandmaQW['chore_type'] = 7:
+				gt 'gp_elene', 'chore_feedchickens'
+			elseif grandmaQW['chore_type'] = 8 and sunWeather = 1:
+				gt 'gp_elene', 'chore_checkplants'
+			elseif grandmaQW['chore_type'] = 9 and sunWeather = 1:
+				gt 'gp_elene', 'chore_waterplants'
+			elseif grandmaQW['chore_type'] = 10 and sunWeather = 1 and month >= 6 and month <= 9:
+				gt 'gp_elene', 'chore_harvest'
+			elseif grandmaQW['chore_type'] = 11 and boletus_stored <= 18:
+				gt 'gp_elene', 'chore_pickforest_mushrooms'
+			elseif grandmaQW['chore_type'] = 12 and bilberry_stored <= 18:
+				gt 'gp_elene', 'chore_pickforest_berries'
+			elseif grandmaQW['chore_type'] = 13 and ((boletus_stored + bilberry_stored) <= 16):
+				gt 'gp_elene', 'chore_pickforest_both'
+			end
+
+			'"There is nothing to do today, <<$pcs_nickname>>. Take the day off.'
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'chore_cleanfloor':
+	'"There is always something to do, <<$pcs_nickname>>. I''ve gotten quite old, and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
+
+	grandmaQW['chore_clean_floor'] = 1
+	act 'Tell her you will do it soon': gt 'gp_elene', 'talk'
+	act 'Agree and start cleaning (1:00)':
+		*clr & cla
+		minut += 60
+		grandmaQW['chore_clean_floor'] = 2
+		grandmaQW['help_amount'] += 1
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
+		'You grab a bucket and a rag, get down on your knees and begin scrubbing the floor. Within the hour, the floor shines, and you are satisfied with your work. You put the cleaning supplies into a corner and continue your day.'
+
+		act 'Continue': gt $loc, $loc_arg
+		act 'Return back to your grandmother': minut += 1 & gt 'gp_elene', 'talk'
+	end
+end
+
+if $ARGS[0] = 'chore_washclothes':
+	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfather''s dirty clothes?"'
+
+	grandmaQW['chore_wash_clothes'] = 1
+	act 'Tell her you will wash them in a little bit': gt 'gp_elene', 'talk'
+	act 'Agree and start washing (1:00)':
+		*clr & cla
+		minut += 60
+		grandmaQW['chore_wash_clothes'] = 2
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
+		'You pick up grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
+
+		act 'Hang the Laundry':
+			*clr & cla
+			minut += 10
+			gs'stat'
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
+			'Once done with the washing, you walk to the clothesline, where you carefully hang the clothes to dry.'
+
+			act 'Continue': gt 'gad_gpyard', 'start'
+			act 'Return back to your grandmother': minut += 1 & gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'chore_milkcows':
+	'"<<$pcs_nickname>>, go to the barn and milk the cows."'
+
+	grandmaQW['chore_milk_cow'] = 1
+	act 'Tell her you will do it in a bit': gt 'gp_elene', 'talk'
+	act 'Agree and go to the barn (0:10)':
+		*clr & cla
+		minut += 10
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+		'You walk over to the barn where the cows are kept.'
+
+		act 'Continue': gt 'gad_gpbarn', 'cow'
+	end
+end
+
+if $ARGS[0] = 'chore_groceries':
+	'"Oh yes, <<$pcs_nickname>>. I was going to go down to the store today to buy some groceries, but my knees are aching. Do you think you could go down there and get them for me? I have a list of what we need, and the grocer will come by later to collect the money."'
+
+	grandmaQW['chore_groceries'] = 1
+	act 'Tell her you will go to the store later': gt 'gp_elene', 'talk'
+	act 'Agree and go to the store (0:15)':
+		*clr & cla
+		minut += 15
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
+		'Your grandmother shuffles around, looking for her list for a few minutes, finally finding it and giving it to you. You grab a basket and set out for the store.'
+		act 'Continue': gt 'gad_store'
+	end
+end
+
+if $ARGS[0] = 'chore_can_mushrooms':
+	'"I need to get some of these mushrooms canned, <<$pcs_nickname>>, so we can store them. Can you please help me prepare them?"'
+
+	grandmaQW['chore_can_mushrooms'] = 1
+	act 'Tell her you will help her in a little while': gt 'gp_elene', 'talk'
+	gs 'gp_elene', 'set_help_can_mushrooms_act'
+end
+
+if $ARGS[0] = 'chore_can_berries':
+	'"It is time to can these berries, <<$pcs_nickname>>. Can you please help me? My fingers aren''t as spry as they used to be."'
+
+	grandmaQW['chore_can_berries'] = 1
+	act 'Tell her you will help her in a little while': gt 'gp_elene', 'talk'
+	gs 'gp_elene', 'set_help_can_berries_act'
+end
+
+if $ARGS[0] = 'chore_can_veggies':
+	'"We have had good luck with the garden this year, <<$pcs_nickname>>. But now we need to can these vegetables before they spoil. Can you help me, please?"'
+
+	grandmaQW['chore_can_veggies'] = 1
+	act 'Tell her you will help her in a little while': gt 'gp_elene', 'talk'
+	gs 'gp_elene', 'set_help_can_veggies_act'
+end
+
+if $ARGS[0] = 'chore_feedchickens':
+	'"Of course, <<$pcs_nickname>>. Would you be kind and feed the chickens?"'
+
+	grandmaQW['chore_feed_chickens'] = 1
+	act 'Tell her you will do it in a little while': gt 'gp_elene', 'talk'
+	act 'Agree and go to the yard (0:10)':
+		*clr & cla
+		minut += 10
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
+		'You take the grain mix for the chickens and walk to the yard.'
+
+		act 'Continue': gt 'gad_gpyard', 'chickens'
+	end
+end
+
+if $ARGS[0] = 'chore_checkplants':
+	'"<<$pcs_nickname>>, can you please go work in the garden?"'
+
+	grandmaQW['chore_work_in_garden'] = 1
+	act 'Tell her you will get to it later': gt 'gp_elene', 'talk'
+	act 'Agree and go to the garden (0:10)':
+		*clr & cla
+		minut += 10
+		gs'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+		'You go to the garden.'
+
+		act 'Continue': gt 'gad_gpyard', 'garden'
+	end
+end
+
+if $ARGS[0] = 'chore_waterplants':
+	'"Dear <<$pcs_nickname>>, could you go and water the plants in the garden?"'
+
+	grandmaQW['chore_water_garden'] = 1
+	act 'Tell her you will do it after a while': gt 'gp_elene', 'talk'
+	act 'Agree and go to the garden (0:10)':
+		*clr & cla
+		minut += 10
+		gs 'stat'
+
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+		'You bring a watering can along with you to the garden.'
+
+		act 'Continue': gt 'gad_gpyard', 'garden'
+	end
+end
+
+if $ARGS[0] = 'chore_harvest':
+	if month = 7:
+		'"<<$pcs_nickname>> dear, the strawberries are ripe for picking. Could you go over to the plot and pick them today?"'
+
+		grandmaQW['chore_collect_strawberries'] = 1
+		act 'Tell her you will do it in a little bit': gt 'gp_elene', 'talk'
+		act 'Agree and go to the strawberry plot (0:10)':
+			*clr & cla
+			minut += 10
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+			'You bring a basket with you and walk to the strawberry plot in the garden.'
+
+			act 'Continue': gt 'gad_gpyard', 'strawberry'
+		end
+	elseif month = 8 or month = 9:
+		'"<<$pcs_nickname>> dear, the fruits are ripe, and it is time to start collecting them. Could you go and do it today?"'
+
+		grandmaQW['chore_collect_fruit'] = 1
+		act 'Tell her you will do it in a little bit': gt 'gp_elene', 'talk'
+		act 'Agree and go to the orchard (0:10)':
+			*clr & cla
+			minut += 10
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+			'You bring a basket with you and walk to the fruit garden.'
+
+			act 'Continue': gt 'gad_gpyard', 'fruit_garden'
+		end
+	elseif month = 6:
+		'"<<$pcs_nickname>> dear, could you go to the garden today? It''s time to collect the harvest."'
+
+		grandmaQW['chore_harvest_garden'] = 1
+		act 'Tell her you will do it in a little bit': gt 'gp_elene', 'talk'
+		act 'Agree and go to the garden (0:10)':
+			*clr & cla
+			minut += 10
+			gs'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+			'You bring the harvest tools with you and go over to the garden.'
+
+			act 'Continue': gt 'gad_gpyard', 'garden'
+		end
+	end
+end
+
+if $ARGS[0] = 'chore_pickforest_mushrooms':
+	grandmaQW['chore_gather_mushrooms'] = 1
+	grandmaQW['chore_mushroom_quantity'] = rand(1,2)
+	'"<<$pcs_nickname>>, it''s mushroom season. Would you mind going into the forest to pick some for us?"'
+	'"How much do we need, Grandma?" you ask.'
+	'"Oh, I would say you should be able to find at least <<grandmaQW[''chore_mushroom_quantity'']>> kilos," Grandma replies.'
+
+	act 'Tell her you will go get some soon': gt 'gp_elene', 'talk'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
+		minut += 60
+		act 'Continue': gt 'gad_forest', 'forest_edge'
+	end
+end
+
+if $ARGS[0] = 'chore_pickforest_berries':
+	grandmaQW['chore_gather_berries'] = 1
+	grandmaQW['chore_berry_quantity'] = rand(1,2)
+	'"<<$pcs_nickname>>, the wild berries are ripe for picking. We should gather them now while we can."'
+	'"How much do you want, Grandma?" you ask.'
+	'"<<grandmaQW[''chore_berry_quantity'']>> kilos will be a good start," Grandma replies.'
+
+	act 'Tell her you will go get some soon': gt 'gp_elene', 'talk'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You decide now is as good a time as any to do it. So you grab a basket and head out, walking to the forest.'
+		minut += 60
+		act 'Continue': gt 'gad_forest', 'forest_edge'
+	end
+end
+
+if $ARGS[0] = 'chore_pickforest_both':
+	grandmaQW['chore_gather_both'] = 1
+	grandmaQW['chore_mushroom_quantity'] = rand(1,2)
+	grandmaQW['chore_berry_quantity'] = rand(1,2)
+	'"This is the time of year that the forest provides us with its gifts, <<$pcs_nickname>>. Can you go and harvest some mushrooms and berries for us?"'
+	'"How much of each should I get?" you ask.'
+	'"If you could, try to find <<grandmaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandmaQW[''chore_berry_quantity'']>> kilos of berries," Grandma replies. "It is important to stock up while we can."'
+
+	act 'Tell her you will go get some soon': gt 'gp_elene', 'talk'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You decide now is as good a time as any to do it. So you grab a basket and head out, walking to the forest.'
+		minut += 60
+		act 'Continue': gt 'gad_forest', 'forest_edge'
+	end
+end
+
+
+	!!-------------------- ASKING FOR CHORES END --------------------!!
+
+
+
+
+
+	!!-------------------- TURNING IN CHORES START --------------------!!
+
+if $ARGS[0] = 'set_help_can_mushrooms_act':
+	if grandmaQW['chore_can_mushrooms'] = 1:
+		act 'Help Grandma can mushrooms (2:00)':
+			*clr & cla
+			minut += 45
+			boletus_stored -= 5
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_mushrooms.jpg"></center>'
+			'You tell Grandma you are ready to help her can mushrooms now.'
+			'She smiles and gives you a basket of mushrooms. You spend a while cleaning them, washing them, and cutting them up in preparation for canning.'
+
+			act 'Continue':
+				*clr & cla
+				minut += 60
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+				'Once they are prepared, you help put them in glass jars. Once they are ready, Grandma places the jars in her canner and boils them for an hour.'
+				act 'Continue':
+					*clr & cla
+					minut += 15
+					gs 'stat'
+
+					grandmaQW['chore_can_mushrooms'] = 0
+					grandmaQW['help_amount'] += 2
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
+					'Finally, you help Grandma take them out of the canner and set them aside to cool.'
+					'"Thank you, <<$pcs_nickname>>," she says. "It is important to save food up for the hard winter months. Sure, now you can walk to the store and get whatever you want, but it wasn''t always that way!"'
+
+					act 'Finish': gt $loc, $loc_arg
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'set_help_can_berries_act':
+	if grandmaQW['chore_can_berries'] = 1:
+		act 'Help Grandma can berries (2:00)':
+			*clr & cla
+			minut += 45
+			bilberry_stored -= 5
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_berries.jpg"></center>'
+			'Grandma gives you a basket of berries, and you spend a while cleaning them, removing stems, and picking out any shrivelled or bad ones.'
+			act 'Continue':
+				*clr & cla
+				minut += 60
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+				'Once they are prepared, you help pour them into glass jars. Once they are ready, Grandma places the jars in her canner and boils them for an hour.'
+				act 'Continue':
+					*clr & cla
+					minut += 15
+					grandmaQW['chore_can_berries'] = 0
+					grandmaQW['help_amount'] += 2
+					gs 'stat'
+
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_berries.jpg"></center>'
+					'Finally, you help Grandma take them out of the canner and set them aside to cool.'
+					'"There, now we will have berries for the winter," she says. "I think your grandfather could live off of these berries alone! He will be very grateful that you helped me."'
+
+					act 'Finish': gt $loc, $loc_arg
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'set_help_can_veggies_act':
+	if grandmaQW['chore_can_veggies'] = 1:
+		act 'Help Grandma can veggies (3:00)':
+			*clr & cla
+			minut += 75
+			gs'stat'
+
+			grandmaQW['chore_harvest_done'] = 0
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_veggies.jpg"></center>'
+			'You and Grandma spend some time sorting out all the vegetables from the garden. Once they are sorted, you begin cleaning them, cutting them up, removing stems and leaves, and preparing them for canning.'
+			act 'Continue':
+				*clr & cla
+				minut += 90
+				gs'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
+				'It is a tedious process, but eventually, you finish and help Grandma put them all in jars. Then, you stand by while she boils the jars, helping her remove them from the canner when needed and replacing them with others.'
+				act 'Continue':
+					*clr & cla
+					minut += 15
+					gs'stat'
+
+					grandmaQW['chore_can_veggies'] = 0
+					grandmaQW['help_amount'] += 3
+					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_veggies.jpg"></center>'
+					'Finally, you help Grandma take the last jars out of the canner and set them aside to cool.'
+					'"You know, <<$pcs_nickname>>, if you know how to can your own food, you can survive years of poor harvests," she says.'
+					'"Your grandfather and I had many hard times when we were younger, but saving our crops when we could, kept us from starving to death in the bad times. You would do well to remember that, young lady!"'
+					act 'Finish': gt $loc, $loc_arg
+				end
+			end
+		end
+	end
+end
+
+
+
+
+
+if $ARGS[0] = 'set_report_chores_acts':
+	gs 'gp_elene', 'set_help_can_mushrooms_act'
+	gs 'gp_elene', 'set_help_can_berries_act'
+	gs 'gp_elene', 'set_help_can_veggies_act'
+
+	gs 'gp_elene', 'set_report_cleaned_floor_act'
+	gs 'gp_elene', 'set_report_washed_clothes_act'
+	gs 'gp_elene', 'set_report_milked_cow_act'
+	gs 'gp_elene', 'set_report_groceries_act'
+	gs 'gp_elene', 'set_report_fed_chickens_act'
+	gs 'gp_elene', 'set_report_worked_garden_act'
+	gs 'gp_elene', 'set_report_watered_garden_act'
+	gs 'gp_elene', 'set_report_collected_strawberries_act'
+	gs 'gp_elene', 'set_report_collected_fruit_act'
+	gs 'gp_elene', 'set_report_harvested_garden_act'
+	gs 'gp_elene', 'set_report_gathered_mushrooms_act'
+	gs 'gp_elene', 'set_report_gathered_berries_act'
+	gs 'gp_elene', 'set_report_gathered_both_act'
+end
+
+
+if $ARGS[0] = 'set_report_cleaned_floor_act':
+	if grandmaQW['chore_clean_floor'] = 2:
+		act 'Tell her you cleaned the floor':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 2
+			grandmaQW['chore_clean_floor'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'"Grandma, the floors are all clean!" you say proudly.'
+			'"Thank you, child," your grandmother says, "You have saved my hands and knees a great deal of aching."'
+			'You give her a warm smile and continue on with your day.'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'set_report_washed_clothes_act':
+	if grandmaQW['chore_wash_clothes'] = 2:
+		act 'Tell her you washed the clothes':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 2
+			grandmaQW['chore_wash_clothes'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'"Grandma, I finished washing Grandpa''s dirty clothes," you tell her.'
+			'"Thank you, <<$pcs_nickname>>. I have no idea how that man gets so dirty!"'
+			'You and your grandmother share a laugh, and you give her a hug before moving on.'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_milked_cow_act':
+	if grandmaQW['chore_milk_cow'] = 2:
+		act 'Tell her you milked the cow':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 2
+			grandmaQW['chore_milk_cow'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'"Grandma, I milked Dawn and put the milk away," you tell her.'
+			'"Thank you, <<$pcs_nickname>>. She''s such a sweet thing, isn''t she?" your grandmother asks fondly.'
+			'"Um, yes, she is very nice for a cow," you smile. "She''s the nicest cow I know."'
+			'Grandma nods sagely at that, and you grin and continue on with your day.'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_groceries_act':
+	if grandmaQW['chore_groceries'] = 2:
+		act 'Give her the groceries':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 2
+			grandmaQW['chore_groceries'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'You show Grandma your sacks of groceries and tell her the grocer will be by later.'
+			'"Thank you, <<$pcs_nickname>>. He''s a nice young man. I''ve known him since he was a child, you know."'
+			'"Yes, he''s very nice," you say, "but where do you want me to put this stuff?"'
+			'"Oh yes, yes," she says as if she forgot you were standing there with arms full of groceries. "Just put them in the kitchen, little one. I will put them away in a minute."'
+			'You lug the bags into the kitchen and heft them on the table before returning to Grandma.'
+			'"Anything else you need, Grandma?" you ask.'
+			'"No, that is all, <<$pcs_nickname>>," she says and gives you a gentle pat on the back.'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_fed_chickens_act':
+	if grandmaQW['chore_feed_chickens'] = 2:
+		act 'Tell her you fed the chickens':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 2
+			grandmaQW['chore_feed_chickens'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'"I fed the chickens, Grandma," you tell her.'
+			'"Good, thank you, <<$pcs_nickname>>," she says. "A fat chicken is a happy chicken, and happy chickens lay the best eggs."'
+			'She nods to herself as if she has said something sagacious.'
+			'"Um, well, I''m happy to help, Grandma," you say and hug her quickly.'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_worked_garden_act':
+	if grandmaQW['chore_work_in_garden'] = 2:
+		act 'Tell her you worked in the garden':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 4
+			grandmaQW['chore_work_in_garden'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'"I finished working in the garden, Grandma."'
+			'"Good, thank you, <<$pcs_nickname>>," she says. "Did you pull out all the weeds?"'
+			'"Yes, I did," you say, "and I watered all the plants and checked for pests and everything."'
+			'"Good, good," she nods. "It is crucial to take care of your garden, <<$pcs_nickname>>. It is how we provide for ourselves when no one else will."'
+			'You nod at her advice, and she smiles.'
+			'"You know, you remind me very much of your mother," she says. "She and Luda always talked about the garden when they were your age."'
+			if npc_QW['A29'] < 2:
+				'"Really?" you ask, trying to picture your mother working in the old garden.'
+				'"Oh yes, yes," Grandma says. "Your mother especially. Natasha would say, ''Luda, Luda, I have to go to the garden,'' and Luda would say, ''But sister, you were just in the garden yesterday!"'
+				'She purses her lips and continues, "She wasn''t very good at gardening, I''m afraid. As much time as she seemed to spend there, I would still find weeds and pests all the time."'
+			else
+				'You struggle to contain your laughter. "Oh yeah, <<$npc_nickname[''A29'']>> has told me all about the ''garden'', Grandma. Like mother, like daughter, I guess!"'
+				'Grandma nods. "Yes, I suppose that is true. She wasn''t much of a gardener though - I always found weeds and pests, no matter how much time she spent there."'
+			end
+			'You grin, thinking of how <<$npc_nickname[''A29'']>> must have been at your age.'
+			'"Anyway," she continues, "thank you for doing that for me, <<$pcs_nickname>>. My old bones complain when I do it."'
+			'She gives you a peck on the cheek and sends you on your way.'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_watered_garden_act':
+	if grandmaQW['chore_water_garden'] = 2:
+		act 'Tell her you watered the garden':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 2
+			grandmaQW['chore_water_garden'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'"I watered all the plants in the garden, Grandma," you tell her.'
+			'"Thank you, <<$pcs_nickname>>," she says. "A healthy plant is always thirsty. So you should have some water, too, if you want to be a healthy girl."'
+			'"Maybe I will. Is there anything else you need?"'
+			'"No, sweet child. That is enough for today," she says and gives you a gentle pat on the arm.'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'set_report_collected_strawberries_act':
+	if grandmaQW['chore_collect_strawberries'] = 2:
+		act 'Give her the strawberries you picked':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 2
+			grandmaQW['chore_collect_strawberries'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'You walk up to Grandma and give her the basket of strawberries.'
+			'"I picked all the strawberries I could find, Grandma," you say.'
+			'"Oh, <<$pcs_nickname>>," she exclaims, "don''t these just look wonderful? They are plump and juicy this year."'
+			'You smile and say, "They taste pretty good too!"'
+			'Your grandmother gives you a rueful look and says, "I don''t remember asking you to eat the strawberries, child."'
+			'She cannot hold the charade, though, and breaks into a smile. "I never could resist eating a few fresh off the plant either."'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_collected_fruit_act':
+	if grandmaQW['chore_collect_fruit'] = 2:
+		act 'Give her the fruit you collected':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 2
+			grandmaQW['chore_collect_fruit'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'You walk up to Grandma and give her the basket of fruit.'
+			'"I gathered all the fruits I could reach," you say.'
+			'"Thank you, <<$pcs_nickname>>," she says. "I cannot reach or bend like I used to, so you have done me a great favor."'
+			'You smile and hug your grandmother and go on about your day.'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_harvested_garden_act':
+	if grandmaQW['chore_harvest_garden'] = 2:
+		act 'Give her the vegetables from the garden':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 2
+			grandmaQW['chore_harvest_garden'] = 0
+			grandmaQW['chore_harvest_done'] = 1
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'You bring the baskets of vegetables from the garden into the kitchen and set them on the table, then go back to your grandmother.'
+			'"I think I got everything I could out of the garden, Grandma," you tell her. "There was so much!"'
+			'"Yes, child," she says. "We have been blessed with a healthy garden this year. But, unfortunately, there were many times in the past we were not so lucky."'
+			'Your smile falters a bit, unsure of how to take that.'
+			'"Oh, don''t worry yourself, little <<$pcs_nickname>>," she says, cupping your cheek with her hand. "Forgive an old woman of her thoughtful ways. We are lucky to have such a kind granddaughter to help us bring in the harvest."'
+			'You place your youthful hand over her wizened old one and smile at her. "I am happy to help, Grandma. Is there anything else you need?"'
+			'"No, child, you have done more than your fair share today. Of course, soon, we will have to preserve these vegetables to keep them from spoiling, but for now, you can rest."'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_gathered_mushrooms_act':
+	if grandmaQW['chore_gather_mushrooms'] = 2 and boletus >= grandmaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 20:
+		if grandmaQW['disappointment'] = 2:
+			act 'Give Grandma the mushrooms she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				boletus -= grandmaQW['chore_mushroom_quantity']
+				boletus_stored += grandmaQW['chore_mushroom_quantity']
+				grandmaQW['chore_gather_mushrooms'] = 0
+				grandmaQW['chore_mushroom_quantity'] = 0
+				grandmaQW['disappointment'] = 0
+				minut += 5
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You bring the basket of mushrooms to your grandmother and say, "Grandma, here are the mushrooms you wanted!"'
+				'She takes them from you. "Thank you, my sweet girl. Better late than never. I hope you were OK in the forest. They will have to go down in the root cellar until we are ready to can them."'
+				'"Do you think that will be enough?"'
+				'She laughs. "Oh, with your grandfather around, it is never enough!"'
+				'"I can get more if you want me to."'
+				'"No need for that, little one," she clucks. "You''ve done enough for now."'
+				'You give her a quick hug in response and carry on.'
+
+				act 'Continue': gt 'gp_elene', 'talk'
+			end
+		else
+			act 'Give Grandma the mushrooms she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				boletus -= grandmaQW['chore_mushroom_quantity']
+				boletus_stored += grandmaQW['chore_mushroom_quantity']
+				grandmaQW['chore_gather_mushrooms'] = 0
+				grandmaQW['chore_mushroom_quantity'] = 0
+				minut += 5
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You bring the basket of mushrooms to your grandmother and say, "Grandma, here are the mushrooms you wanted!"'
+				'She smiles and takes them from you. "Thank you, my sweet girl. They will have to go down in the root cellar until we are ready to can them."'
+				'"Do you think that will be enough?"'
+				'She laughs. "Oh, with your grandfather around, it is never enough!"'
+				'"I can get more if you want me to."'
+				'"No need for that, little one," she clucks. "You''ve done enough for one day."'
+				'You give her a quick hug in response and carry on.'
+
+				act 'Continue': gt 'gp_elene', 'talk'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_gathered_berries_act':
+	if grandmaQW['chore_gather_berries'] = 2 and bilberry >= grandmaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+		if grandmaQW['disappointment'] = 2:
+			act 'Give Grandma the berries she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				bilberry -= grandmaQW['chore_berry_quantity']
+				bilberry_stored += grandmaQW['chore_berry_quantity']
+				grandmaQW['chore_gather_berries'] = 0
+				grandmaQW['chore_berry_quantity'] = 0
+				grandmaQW['disappointment'] = 0
+				minut += 5
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You walk over to Grandma and set the heavy basket of berries on the ground next to her.'
+				'"Grandma, I got all the berries!"'
+				'"Oh, thank you, <<$pcs_nickname>>," Grandma replied. "Those look fine if a little late. They will have to go down in the root cellar until we are ready to can them."'
+				'You heft the basket up and carry it into the kitchen. Then, walking back to Grandma, you ask, "Do you think that will be enough for the winter?"'
+				'"Oh no, dear," your Grandma says, "the winter is long and cold, and you must gather as much as you can while you can."'
+				'Seeing the dismayed look on your face, she adds, "But that is enough for today! I know it is harder work than it seems. You can rest now, child."'
+				'Relieved, you give your grandmother a peck on the cheek and move on.'
+
+				act 'Continue': gt 'gp_elene', 'talk'
+			end
+		else
+			act 'Give Grandma the berries she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				bilberry -= grandmaQW['chore_berry_quantity']
+				bilberry_stored += grandmaQW['chore_berry_quantity']
+				grandmaQW['chore_gather_berries'] = 0
+				grandmaQW['chore_berry_quantity'] = 0
+				minut += 5
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You walk over to Grandma and set the heavy basket of berries on the ground next to her.'
+				'"Grandma, I got all the berries!"'
+				'"Oh, thank you, <<$pcs_nickname>>," Grandma replied. "Those look perfect. They will have to go down in the root cellar until we are ready to can them."'
+				'You heft the basket up and carry it into the kitchen. Then, walking back over to Grandma, you ask, "Do you think that will be enough for the winter?"'
+				'"Oh no, dear," your Grandma says, "the winter is long and cold, and you must gather as much as you can while you can."'
+				'Seeing the dismayed look on your face, she adds, "But that is enough for today! I know it is harder work than it seems. You can rest now, child."'
+				'Relieved, you give your grandmother a peck on the cheek and move on.'
+
+				act 'Continue': gt 'gp_elene', 'talk'
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'set_report_gathered_both_act':
+	if grandmaQW['chore_gather_both'] = 2 and boletus >= grandmaQW['chore_mushroom_quantity'] and bilberry >= grandmaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+		if grandmaQW['disappointment'] = 2:
+			act 'Give Grandma the mushrooms and berries she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				boletus -= grandmaQW['chore_mushroom_quantity']
+				bilberry -= grandmaQW['chore_berry_quantity']
+				boletus_stored += grandmaQW['chore_mushroom_quantity']
+				bilberry_stored += grandmaQW['chore_berry_quantity']
+				grandmaQW['chore_gather_berries'] = 0
+				grandmaQW['chore_berry_quantity'] = 0
+				grandmaQW['chore_gather_both'] = 0
+				grandmaQW['chore_gather_mushrooms'] = 0
+				grandmaQW['chore_mushroom_quantity'] = 0
+				grandmaQW['disappointment'] = 0
+				minut += 5
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You bring your basket, heavy with mushrooms and berries from the forest, over to your grandmother.'
+				'"Grandma, here are the mushrooms and berries, just like you asked!"'
+				'"Oh, thank you, <<$pcs_nickname>>. I was starting to think you had forgotten about me. They will have to go down in the root cellar until we are ready to can them," your Grandma replied.'
+				'"Do I need to go out on another run, or do you think that''s enough?"'
+				'"Well, little one," your Grandma says, "There is a difference between enough and enough for today."'
+				'"Oh..." you say, unsure what to make of her response.'
+				'She smiles gently and pats your head. "You''ve done enough for today, child."'
+				'You smile back awkwardly, still unsure, but give your Grandma a smooch on the cheek and go on with your day.'
+
+				act 'Continue': gt 'gp_elene', 'talk'
+			end
+		else
+			act 'Give Grandma the mushrooms and berries she asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				boletus -= grandmaQW['chore_mushroom_quantity']
+				bilberry -= grandmaQW['chore_berry_quantity']
+				boletus_stored += grandmaQW['chore_mushroom_quantity']
+				bilberry_stored += grandmaQW['chore_berry_quantity']
+				grandmaQW['chore_gather_berries'] = 0
+				grandmaQW['chore_berry_quantity'] = 0
+				grandmaQW['chore_gather_both'] = 0
+				grandmaQW['chore_gather_mushrooms'] = 0
+				grandmaQW['chore_mushroom_quantity'] = 0
+				grandmaQW['disappointment'] = 0
+				minut += 5
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+				'You bring your basket, heavy with mushrooms and berries from the forest, over to your grandmother.'
+				'"Grandma, here are the mushrooms and berries, just like you asked!"'
+				'"Oh, thank you very much, <<$pcs_nickname>>. They will have to go down in the root cellar until we are ready to can them," your Grandma replied.'
+				'"Do I need to go out on another run, or do you think that''s enough?"'
+				'"Well, little one," your Grandma says, "There is a difference between enough and enough for today."'
+				'"Oh..." you say, unsure what to make of her response.'
+				'She smiles gently and pats your head. "You''ve done enough for today, child."'
+				'You smile back awkwardly, still unsure, but give your Grandma a smooch on the cheek and go on with your day.'
+
+				act 'Continue': gt 'gp_elene', 'talk'
+			end
+		end
+	end
+end
+
+	!!-------------------- TURNING IN CHORES END --------------------!!
+
+
+if $ARGS[0] = 'set_talk_acts':
+	if grandmaQW['talked_about_gadukino'] = 0:
+		act 'Ask about the village (0:10)':
+			*clr & cla
+			grandmaQW['talked_about_gadukino'] = 1
+			minut += 10
+			pcs_mood += 5
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'You sit next to grandma, eager to have her tell you more about the village.'
+			'"Don''t you remember Sveta? You''ve visited us many times," said grandma.'
+			'"The last time I visited here, I was really young. Of course, I remember some of the houses, but the clearest memory I have is going swimming with Mitka," you reply.'
+			'"And look how big you''ve become! Just look at you." grandma smiled.'
+			'She begins telling you about the village.'
+			'"The village is small, as you know. You''ll probably find Mitya by the river or the beach where you can go swimming and sunbathe. There are still some fishermen here in the village. If you want to go fishing, ask around after Stepan, he''ll lend you a fishing rod."'
+			'"Nothing is interesting in the village itself. Oh yes... I just remembered... recently, a new family moved in, a single parent with his daughter. Could you imagine someone new moving in? The girl is about your age. Her father works in the city, and from the rumors I''ve heard, he''s hardly here because his work forces him to stay in the city most of the time. You''ll probably meet her while you take a walk in the village."'
+			'"In the outskirts of the village is the field where the cattle graze and the forest beyond the field. You''ll usually find our local hunter Andrei in the forest. He often brings his friends to hunt, who often stay there for days. They say he built a hut somewhere in the forest. So, if you meet Andrei and his friends out there, don''t be afraid. If you want to go to the forest, ask grandfather first."'
+			'"If you like running, you can take a run on the road leading into the forest. Or you can take a ride on our old bike. I''m pretty sure the bike is in the shed. Make sure to look for it if you''re interested. And if you want to watch your figure, go to the garden, and have some fruit. It''s as healthy as the diet meals you''re eating, if not healthier."'
+			'"That''s about it, my dear granddaughter. Now run along, don''t bother me anymore. My soap opera "Santa Barbara" is about to begin. I don''t want to miss a second of it."'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+
+	if 24 * (daystart - grandmaQW['last_day_talked']) + (hour - grandmaQW['last_hour_talked']) >= 3:
+		act 'Chat with your grandmother (0:10)':
+			*clr & cla
+			grandmaQW['last_hour_talked'] = hour
+			grandmaQW['last_day_talked'] = daystart
+			minut += 10
+			pcs_mood += RAND(5, 10)
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandma.jpg"></center>'
+			'You spend some time talking with your grandmother. She''s sometimes challenging to understand. Her nearly toothless mouth makes the pronunciation of words difficult for her. But most of what she says boils down to the same thing, life is much more fun when you''re young!'
+
+			act 'Continue': gt 'gp_elene', 'talk'
+		end
+	end
+
+	if grandmaQW['last_day_asked_for_story'] ! daystart:
+		act 'Ask her to tell you a story (0:20)':
+			*clr & cla
+			grandmaQW['last_day_asked_for_story'] = daystart
+			minut += 20
+			pcs_mood += rand(10,15)
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/babushka.jpg"></center>'
+			'She mumbles something when you ask your grandmother to tell you a story. Nevertheless, after a brief second or two, she decides on a story to share with you today and begins to talk slowly.'
+
+			temp = rand(0, 7)
+
+			if temp = 0:
+				'"There was this one time my parents allowed me to stay at my friend''s home for the night. During the night, a lot of snow fell... and we heard a soft knock on the door!" she says in an ominous voice.'
+				'"We listened more closely but could only hear the wind whistling through the trees... so we decided to go back to sleep. Then we heard the knocking again!"'
+				'""We dashed to the window but couldn''t see anything other than snow. Finally, the knocking became more persistent, and the voice of a small girl begged us to open the door! My friend and I moved to the middle of the room, tightly hugging one another... we were terrified!"'
+				'"The knocking continued into the morning, even when the blizzard stopped. It sounded like someone was panicking, but when we told her parents in the morning, they didn''t believe us. When we went outside... there were no tracks on the snow! As if it never happened!"'
+				'"We never heard the voice or the knocking again after that, but I still feel bad for not going downstairs to answer the door. What if some girl was actually there, begging for our help? I hope she''s okay..."'
+			elseif temp = 1:
+				'"I had a friend when I was younger," she says in an ominous voice. "Her husband died at her house. He was a drunken bastard. He got drunk one day and died of alcohol poisoning in the very same house."'
+				'"One day, she came home from work, and the floorboards suddenly started creaking! And through the glass panes in the hallway door, she could see the silhouette of a man. It looked remarkably like her late husband!"'
+				'"She was terrified! She quickly left her house and only returned when I promised to go with her... but of course, we found nothing. Do you believe in ghosts, <<$pcs_nickname>>? Because ever since then, I do..."'
+			elseif temp = 2:
+				'"I wasn''t born in Gadukino. I grew up in a different village", your grandmother begins. "This is a true story, by the way!"'
+				'"When I was still a little girl, one of our neighbours died. Then, less than two weeks later, one of his brothers died too! And as the legend goes, death comes in threes..."'
+				'"His one surviving sister was terrified. She was a friend, but her parents wouldn''t let her leave the house."'
+				'"It was well into the winter then, and people could only go to other towns by sleigh. So for forty days, they waited... just when they were about to accept that the legend might not be true, they found one of her relatives. Dead. Muzhik, I believe his name was, was found frozen solid, basically a block of ice! He''d tried to attend his cousin''s funeral, but it cost him his life!"'
+				'"Death is not to be trifled with, <<$pcs_nickname>>... her parents were smart to hide her. Otherwise, she might''ve died instead!"'
+			elseif temp = 3:
+				'"This really happened!" your grandmother reassures you. "When I was young, your age... it was just after the war. Then, no one believed in superstition or anything like that. Those were tough times. All anyone cared about was how to get their next meal on the table for their family."'
+				'"We all went to bed, but our cat kept meowing at me! It just wouldn''t let me sleep for hours and hours!"'
+				'"When I finally caught some sleep and woke up the next morning, my father was beside my bed. He said when he cleaned out the furnace of ashes, he found the remains of our dead cat in there!"'
+				'You see her eyes tear up. "No one knew how she got there... no one noticed anything! Except for me. To this day, I believe she was trying to warn me, asking for my help..."'
+				'Your grandmother shrugs, wiping a tear from her eye. You reassuringly put your hand on her knee but don''t know what to say to comfort her.'
+			!125s
+			elseif temp = 4:
+				'"I will tell you a story about an event in the village where I was brought up. One day a woman from a place far up in the northern Soviet Union moved to our village."'
+				'"The woman lived alone with this gorgeous dog. It was a white colour, quite large and quiet as a mouse. But, the dog died after a while, and the woman didn''t want to bury it."'
+				'"She always said it''s a shame to throw away the pelt since it was so furry. So she thought about what she could make of this pelt. After a while, she decided to make a fur collar of the pelt."'
+				'"It took about two months, and she got really sick... I, among others, visited her, and everything looked fine at first glance. But as soon as I closed the door, she started acting erratic and hallucinating. These were the characteristics of rabies. Unfortunately, since she was living alone, no one noticed it before it was too late to save her life..."'
+			elseif temp = 5:
+				'"One evening during the Christmas holidays in my younger days, I was hanging out with my girlfriends in the kitchen. But, of course, it was my school friends, so we were always up to some mischief."'
+				'"We were home alone, and one of my friends persuaded us to do a séance. She tells us that a fortune-teller had explained how one could summon a spirit. So we lit some candles and began chanting for the spirits to show themself."'
+				'"I managed to summon the profile of a male figure. He was holding something resembling a bouquet of flowers. My second friend summoned a kettle-looking object, while my last friend managed to summon an infant, which frightened us."'
+				'"Not being discouraged, we decided to try again, excited by what we would manage to summon this time. This time I summoned a large steamer. My second friend didn''t summon anything special, but my third friend summoned the same infant again. The difference this time was that the infant was in a stroller."'
+				'"We ended the séance and went back to doing ordinary stuff. Suddenly we heard a knock on the door, the young man from the séance. He pulled out a beautiful bouquet of roses and gave them to me. I asked him what the reason was, but he just answered that he felt he should deliver flowers to a girl in this village. After that, I got the chills because I remembered the man with a bouquet of flowers from the séance."'
+				'"The most interesting thing that happened was a few months after our séance, my friend that summoned the baby got pregnant. And by the end of the year, she had a baby by age 15. So beware, when you meet a fortune-teller, you never know what might happen..."'
+			elseif temp = 6:
+				'"I remember sitting down as we are right now," your grandma starts, but suddenly as if she remembered something, she sadly sighs. "There are no more matches..."'
+				'You look at her perplexed, questioning what she''s talking about. "We do have matches in the kitchen, or if you want, I can run over to the store to buy some."'
+				'"You don''t get it, <<$pcs_nickname>>. The matches today are not as good as those made long ago. I miss those matches we had during the Great Patriotic War before they had to move the factory to the far east... Those matches were magical, not like this crap we have now... Ugh..."'
+
+			!Keep the word brigade if you want to change the text. It''s what the people working on the kolkhoz were called.
+			elseif temp = 7:
+				'"One day, my mother, rest her soul, sent us four siblings out to the forest for berry gathering", your grandma begins. "We took our berry collectors and headed out. We reached the forest entrance quickly and decided that it would be best to split up to complete the task faster. Since we were familiar with the area, we all dispersed to our cherished spots and began gathering berries."'
+				'"My favourite spot was a plot surrounded by dense bushes, and in the middle of the plot, there was a huge stump. It was a great spot, and as I approached, I noticed a vast number of ripe strawberries. I rejoiced over the thought that I would gather more than my brothers, slowly gathering the berries and putting them in my berry collector. Then, suddenly, I hear some rustling behind the bushes. I turn towards the sound, but I''m met with silence. I didn''t notice anyone, but I still couldn''t get rid of the eerie feeling."'
+				'"I shook off the eerie feeling and returned to gathering strawberries again. All of a sudden, I get this strange feeling... I look up, and I see a person squatting on the stump. He''s completely still and just stares at me. I got terrified and ran away, screaming and crying towards my brothers. They tried to stop and calm me down, but I kept running. My brothers started running after me, trying to keep up. I could hear my oldest brother shouting to run towards the kolkhoz. You see <<$pcs_firstname>>, a long time ago we had central collective farms called kolkhoz."'
+				'"We were lucky that the farms were close to the forest and didn''t have to run through the woods for long. I kept looking back to see if this person was following us, but there was no sign of him. We knew we were safe when we saw the brigade''s farmers. My brothers and I ran to the foreman and explained what had happened. He immediately grabbed the phone and called someone. The other farmers reassured us that we were safe now. After we had calmed down, we got sent home. Our mother met us at home. She fed us and comforted me."'
+				'"The following day, we were informed that some people found dismantled railroad rails not far from the train station Ratomka. Apparently, it was done by the man I encountered in the forest. I didn''t know it then, but before the war, our area was prone to sabotage by infiltrators. Staying hidden was easy, as the territory is covered by forest, stretching to the border."'
+				'"Ever since that day, the fear I experienced never disappeared, as I''ve felt it throughout my life. I''ll carry on this fear for the remaining days of my life..."'
+			end
+			!125e
+			act 'Thank her for the story': gt 'gp_elene', 'talk'
+		end
+	end
+end
+
+
+--- gp_elene ---------------------------------------------

+ 157 - 40
locations/gp_elene_schedule.qsrc

@@ -5,54 +5,171 @@
 !!
 !! Sveta''s Grandmother in Gad npc id A31
 !!
-$locat['elene'] = ''
+
+	!locat['A31'] tells us where Elene is Located
+	!----------------------------------------------
+	!locat['A31'] = 100		Bedroom
+
+	!locat['A31'] = 110		Livingroom
+	!locat['A31'] = 111		Livingroom - Reading a book
+	!locat['A31'] = 112		Livingroom - Watching tv
+	!locat['A31'] = 113		Livingroom - Repearing some clothes
+	!locat['A31'] = 114		Livingroom - knitting
+
+	!locat['A31'] = 120		Kitchen - Cooking
+	!locat['A31'] = 121		Kitchen - Reading?
+
+	!locat['A31'] = 200		Garden - gardening
+
+	!locat['A31'] = 210		Sauna - Bathing
+
+	!locat['A31'] = 300		Village
+
+	!locat['A31'] = 310		Church
+
+
 
 !! scheduled weekday events.
 
-if week <= 7:
-    if (hour > 5 and hour < 7) or (hour = 12 or hour = 13) or hour = 18:
-        $locat['elene'] = 'kitchen'
-    end
-    if day ! 7 and hour = 13:
-        $locat['elene'] = 'sauna'
-    end
-    if (hour >= 14 and  hour <= 17) or (hour >= 19 and hour <= 20):
-        $locat['elene'] = 'lounge'
-    end
-    if hour >= 21 or hour  <= 5:
-        $locat['elene'] = 'bed'
-    end
+if $ARGS[0] = 'cikl':
+	locat['A31_rand'] = rand(0, 839)
+end
+
+if $ARGS[0] = '':
+	locat['A31_prev'] = locat['A31']
+	gs 'gp_elene_schedule', 'update_locat'
 end
-if day <= 3 and (hour >= 8 and hour <= 11):
-    loc_switch = rand(0,1)
-    if loc_switch = 0 and sunWeather = 1:
-        $locat['elene'] = 'garden'
-    else
-        $locat['elene'] = 'lounge'
-    end
-    killvar 'loc_switch'
+
+if $ARGS[0] = 'update_locat':
+	locat['A31'] = 0
+
+	gs 'gp_elene_schedule', 'get_base_schedule'
+
+	if SunWeather = 0:
+		if locat['A31'] = 200: locat['A31'] = 110
+	end
+
+	gs 'gp_elene_schedule', 'get_random_schedule'
 end
-if week = 6 or week = 7:
-    if day = 6 and (hour = 19 or hour = 20):
-        $locat['elene'] = 'church'
-    end
-    if  day = 7 and (hour >= 9 or hour <= 11):
-        $locat['elene'] = 'church'
-    end
-    if day =  7 and (hour  = 13 or hour = 14):
-        $locat['elene'] = 'kitchen'
-    end
+
+if $ARGS[0] = 'get_base_schedule':
+	if hour <= 5:
+		locat['A31'] = 100
+	elseif hour = 6:
+		locat['A31'] = 120
+	elseif hour = 7:
+		locat['A31'] = 110
+	elseif hour = 8:
+		if week <= 3:
+			locat['A31'] = 0
+		elseif week => 5:
+			locat['A31'] = 300
+		else
+			locat['A31'] = 110
+		end
+	elseif hour <= 11:
+		if week <= 3:
+			locat['A31'] = 0
+		elseif week = 5 or week = 6:
+			locat['A31'] = 300
+		elseif week = 7:
+			locat['A31'] = 310
+		else
+			locat['A31'] = 110
+		end
+	elseif hour = 12:
+		locat['A31'] = 120
+	elseif hour = 13:
+		if week = 7:
+			locat['A31'] = 120
+		else
+			locat['A31'] = 210
+		end
+	elseif hour = 14:
+		if week = 7:
+			locat['A31'] = 120
+		else
+			locat['A31'] = 110
+		end
+	elseif hour <= 17:
+		locat['A31'] = 110
+	elseif hour = 18:
+		locat['A31'] = 120
+	elseif hour <= 20:
+		if week = 6:
+			locat['A31'] = 310
+		else
+			locat['A31'] = 110
+		end
+	else
+		locat['A31'] = 100
+	end
 end
 
-if (day = 5 or day = 6) and (hour >= 8 or hour <= 11):
-    $locat['elene'] = 'village'
-elseif day = 7 and hour = 8:
-    $locat['elene'] = 'village'
+
+
+if $ARGS[0] = 'get_random_schedule':
+	if locat['A31'] = 0:
+		if hour / 2 mod 2 = 0:
+			if locat['A31_rand'] mod 2 = 0:
+				locat['A31'] = 110
+			else
+				locat['A31'] = 200
+			end
+		else
+			if locat['A31_rand'] / 2 mod 2 = 0:
+				locat['A31'] = 110
+			else
+				locat['A31'] = 200
+			end
+		end
+	end
+
+	if locat['A31'] = 110:
+		if hour <= 8:
+			temp_subloc = locat['A31_rand'] / 4 mod 4
+		elseif hour <= 10:
+			temp_subloc = locat['A31_rand'] / 16 mod 4
+		elseif hour <= 12:
+			temp_subloc = locat['A31_rand'] / 12 mod 4
+		elseif hour <= 14:
+			temp_subloc = locat['A31_rand'] / 48 mod 4
+		elseif hour <= 16:
+			temp_subloc = locat['A31_rand'] / 20 mod 4
+		elseif hour <= 18:
+			temp_subloc = locat['A31_rand'] / 80 mod 4
+		elseif hour <= 20:
+			temp_subloc = locat['A31_rand'] / 28 mod 4
+		end
+		locat['A31'] = 111 + temp_subloc
+		killvar 'temp_subloc'
+	end
 end
 
-!! Debug failsafe if npc has not been set a location.
 
-if $locat['elene'] = '':
-    $locat['elene'] = 'Unknown'
+if $ARGS[0] = 'getLocation':
+	gs 'gp_elene_schedule', 'update_locat'
+
+	if locat['A31'] / 10 = 10:
+		$npcLocation['A31'] = 'Your grandmother is in her bedroom'
+
+	elseif locat['A31'] / 10 = 11:
+		$npcLocation['A31'] = 'Your grandmother is in her livingroom'
+	elseif locat['A31'] / 10 = 12:
+		$npcLocation['A31'] = 'Your grandmother is in her kitcher'
+
+	elseif locat['A31'] / 10 = 20:
+		$npcLocation['A31'] = 'Your grandmother is in her garden'
+	elseif locat['A31'] / 10 = 21:
+		$npcLocation['A31'] = 'Your grandmother is bathing in her sauna'
+
+	elseif locat['A31'] / 10 = 30:
+		$npcLocation['A31'] = 'Your grandmother is out and about in Gadukino'
+	elseif locat['A31'] / 10 = 31:
+		$npcLocation['A31'] = 'Your grandmother is at her church'
+
+	end
 end
---- gp_elene_schedule ---------------------------------
+
+
+--- gp_elene_schedule ---------------------------------

+ 888 - 0
locations/gp_zlatek.qsrc

@@ -0,0 +1,888 @@
+# gp_zlatek
+
+!! Quest Variables - Grandpa
+!! -------------------------
+!! grandpaQW['chore_type']						Variable for storage of the rand() that picks which chore to assign.
+!!
+!! grandpaQW['chore_bale_hay']					0/1 - is the "bale hay in the field" quest active?
+!! grandpaQW['chore_bathe_horse']				0/1 - is the "bathe the horse in the river" quest active?
+!! grandpaQW['chore_bathe_horse_prog']			0/1/2 - progress of "bathe the horse in the river" quest
+!! grandpaQW['chore_brush_horse']				0/1 - is the "brush the horse" quest active?
+!! grandpaQW['chore_clean_yard']				0/1 - is the "clean the yard" quest active?
+!! grandpaQW['chore_feed_boar']					0/1 - is the "feed the pig" quest active?
+!! grandpaQW['chore_feed_cow']					0/1 - is the "feed the cow" quest active?
+!! grandpaQW['chore_feed_horse']				0/1 - is the "feed the horse" quest active?
+!! grandpaQW['chore_fetch_firewood']			0/1 - is the "fetch firewood from the barn" quest active?
+!! grandpaQW['chore_herd_cattle']				0/1 - is the "herd cows in the field" quest active?
+!! grandpaQW['chore_herd_cattle_experience']	Has Sveta ever done the "herd cows in the field" quest before? (Practically useless, barely changes a couple of action descriptions.)
+!! grandpaQW['chore_lead_cow_to_field']			0/1 - is the "just take the cow to the field and drop it off there" quest active?
+!! grandpaQW['chore_lead_horse_to_field']		0/1 - is the "take the horse to the field" quest active?
+!!
+!! grandpaQW['chore_gather_mushrooms']			0/1 - is the "gather mushrooms" quest active?
+!! grandpaQW['chore_gather_berries']			0/1 - is the "gather berries" quest active?
+!! grandpaQW['chore_gather_both']				0/1 - is the "gather mushrooms and berries" quest active?
+!! grandpaQW['chore_mushroom_quantity']			How many kg of mushrooms does Grandpa want?
+!! grandpaQW['chore_berry_quantity']			How many kg of berries does Grandpa want?
+!!
+!!
+!! Other Variables - Grandpa
+!! -------------------------
+!! grandpaQW['last_day_helped']					The most recent day Sveta asked Grandpa if she could help him with anything.
+!! grandpaQW['last_day_talked']					The most recent day Sveta chatted with Grandpa.
+!! grandpaQW['last_hour_talked']				The most recent hour Sveta chatted with Grandpa. Checked against hour, allows for several chats through the day.
+!! grandpaQW['talked_about_forest']				0/1 - has Sveta asked Grandpa about the forest? Makes the "Ask about forest" option a one-time thing.
+!! grandmaQW['disappointment']					0/1/2 - marks if you failed a chore and Grandpa is disappointed in you. Causes a lecture and -1 to help_amount. 2 is time extension to next day for berry and mushroom collecting in the forest
+
+
+if $ARGS[0] = 'talk':
+	*clr & cla
+	menu_off = 1
+	minut += 2
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa.jpg"></center>'
+	'Your grandfather is a grumpy old man who is always complaining about the village elders and how they have neglected the village to barely being fit to live in. He can walk but requires a cane. So he doesn''t leave the house anymore unless he really has to.'
+	if $clothingworntype = 'nude':
+		'Grandpa looks shocked, but it doesn''t stop him from having a good look at you.'
+		'"My God, <<$pcs_nickname>>! Are you trying to give me a heart attack? Go and put some clothes on!"'
+
+		act 'Maybe you should get dressed before talking to him': gt $loc, $loc_arg
+		exit
+	end
+
+	act 'Leave him alone': gt $loc, $loc_arg
+
+	if grigory_flower > 0 and grigory_flower < 10: act 'Talk to him about the flowers': gt 'grigory', 'flower3'
+
+	if grandpaQW['chore_gather_mushrooms'] = 1:
+		'You promised to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg of mushrooms.'
+	elseif grandpaQW['chore_gather_berries'] = 1:
+		'You promised to bring grandpa <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
+	elseif grandpaQW['chore_gather_both'] = 1:
+		'You promised to bring grandpa <<grandpaQW[''chore_mushroom_quantity'']>> kg mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kg of berries.'
+	end
+
+
+	gs 'gp_zlatek', 'set_report_chores_acts'
+	gs 'gp_zlatek', 'get_random_chore_act'
+	gs 'gp_zlatek', 'set_talk_acts'
+end
+
+
+
+
+
+
+	!!===========================================================!!
+	!!                                                           !!
+	!!                          EVENTS                           !!
+	!!                                                           !!
+	!!===========================================================!!
+
+
+if $ARGS[0] = 'get_random_chore_act':
+	if grandpaQW['last_day_helped'] ! daystart:
+		act 'Offer to help':
+			menu_off = 1
+			grandpaQW['last_day_helped'] = daystart
+			frost = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'You walk up to your grandfather and ask if he needs any help. Grandpa thinks for a moment and says:'
+
+			if month <= 4 or month >= 10:
+				grandpaQW['chore_type'] = rand(0,5)
+			elseif month = 5:
+				grandpaQW['chore_type'] = rand(3,8)
+			elseif month >= 6 and month <= 9:
+				grandpaQW['chore_type'] = rand(3,14)
+			end
+
+			if grandpaQW['chore_type'] = 0:
+				gt 'gp_zlatek', 'chore_fetch_firewood'
+			elseif grandpaQW['chore_type'] = 1:
+				gt 'gp_zlatek', 'chore_feed_horse'
+			elseif grandpaQW['chore_type'] = 2:
+				gt 'gp_zlatek', 'chore_feed_cow'
+			elseif grandpaQW['chore_type'] = 3:
+				gt 'gp_zlatek', 'chore_clean_yard'
+			elseif grandpaQW['chore_type'] = 4:
+				gt 'gp_zlatek', 'chore_brush_horse'
+			elseif grandpaQW['chore_type'] = 5:
+				gt 'gp_zlatek', 'chore_feed_boar'
+			elseif grandpaQW['chore_type'] = 6 and hour >= 6 and hour < 9:
+				gt 'gp_zlatek', 'chore_lead_horse_to_field'
+			elseif grandpaQW['chore_type'] = 7 and hour >= 6 and hour < 9:
+				gt 'gp_zlatek', 'chore_lead_cow_to_field'
+			elseif grandpaQW['chore_type'] = 8 and hour >= 6 and hour < 9:
+				gt 'gp_zlatek', 'chore_herd_cattle'
+			elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5 and func('changingroom', 'count_swim_item') > 0:
+				gt 'gp_zlatek', 'chore_bathe_horse'
+			elseif grandpaQW['chore_type'] = 10 and boletus_stored <= 18:
+				gt 'gp_zlatek', 'chore_pickforest_mushrooms'
+			elseif grandpaQW['chore_type'] = 11 and bilberry_stored <= 18:
+				gt 'gp_zlatek', 'chore_pickforest_berries'
+			elseif grandpaQW['chore_type'] = 12 and ((boletus_stored + bilberry_stored) <= 16):
+				gt 'gp_zlatek', 'chore_pickforest_both'
+			elseif grandpaQW['chore_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
+				gt 'gp_zlatek', 'chore_bale_hay'
+			end
+
+			if hour >= 9:
+				randmsg = rand(0, 5)
+				if randmsg = 0:
+					'"You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
+				elseif randmsg = 1:
+					'"You can rest today child, there is nothing to do."'
+				elseif randmsg = 2:
+					'"You can rest today <<$pcs_nickname>>, there is nothing to do."'
+				elseif randmsg = 3:
+					'"There''s no work today <<$pcs_nickname>>, go and rest up."'
+				elseif randmsg = 4:
+					'"You can rest today my dear granddaughter."'
+				else
+					'"You can take the day off to rest up."'
+				end
+			else
+				randmsg = rand(0, 1)
+				if randmsg = 0:
+					'"You don''t need to help out today, <<$pcs_nickname>>."'
+				else
+					'"You can take the day off."'
+				end
+			end
+			killvar 'randmsg'
+
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+
+if $ARGS[0] = 'chore_fetch_firewood':
+	grandpaQW['chore_fetch_firewood'] = 1
+
+	'"<<$pcs_nickname>>, could you run out to the barn and bring firewood for the stove?"'
+	act 'Tell him you will go get some in just a bit': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to fetch firewood (0:20)':
+		*clr & cla
+		if month >= 4 and month <= 10:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
+		end
+		'You put on warm clothes and run to the barn to collect firewood.'
+		'"I''ve brought some firewood, grandfather," you said to your grandfather.'
+		'"You are very quick, <<$pcs_nickname>>," he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
+		grandpaQW['chore_fetch_firewood'] = 0
+		minut += 20
+		grandmaQW['help_amount'] += 1
+		gs 'stat'
+
+		act 'Continue': gt $loc, $loc_arg
+	end
+end
+
+if $ARGS[0] = 'chore_feed_horse':
+	grandpaQW['chore_feed_horse'] = 1
+
+	'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
+	act 'Tell him that you will get to it in a little bit': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the barn (0:10)':
+		*clr & cla
+		if month >= 4 and month <= 10:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
+		end
+		'You walk over to the barn where Desperado is kept.'
+		minut += 10
+		gs'stat'
+
+		act 'Continue': gt 'gad_gpbarn', 'horse'
+	end
+end
+
+if $ARGS[0] = 'chore_feed_cow':
+	grandpaQW['chore_feed_cow'] = 1
+
+	'"<<$pcs_nickname>>, go to the barn and feed the cow."'
+	act 'Tell him that you will do it in a little while': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the barn (0:10)':
+		*clr & cla
+		if month >= 4 and month <= 10:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
+		end
+		'You walk over to the barn where the cows are kept.'
+		minut += 10
+		gs'stat'
+
+		act 'Continue': gt 'gad_gpbarn', 'cow'
+	end
+end
+
+if $ARGS[0] = 'chore_clean_yard':
+	grandpaQW['chore_clean_yard'] = 1
+
+	'"Of course, <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
+	act 'Tell him that you''ll do it in a minute': gt 'gp_zlatek', 'talk'
+	act 'Agree and go clean up the yard (1:00)':
+		*clr & cla
+		if month >= 4 and month <= 10:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
+			'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
+			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself, seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
+		end
+		minut += 60
+		grandpaQW['chore_clean_yard'] = 2
+		if month >= 4 and month <= 10:
+			fat -= rand(1,3)
+		else
+			gs 'exp_gain', 'stren', 1
+			fat -= rand(1,5)
+		end
+		gs'stat'
+
+		act 'Continue': gt 'gad_gpyard'
+		act 'Return back to your grandfather': minut += 1 & gt 'gp_zlatek', 'talk'
+	end
+end
+
+if $ARGS[0] = 'chore_feed_boar':
+	grandpaQW['chore_feed_boar'] = 1
+
+	'"<<$pcs_nickname>>, could you go to the barn and feed the hog?"'
+	act 'Tell him you will get to it soon':gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the barn (0:10)':
+		*clr & cla
+		if month >= 4 and month <= 10:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
+		end
+		'You walk over to the barn where the hogs are kept.'
+		minut += 10
+		gs'stat'
+
+		act 'Continue': gt 'gad_gpbarn', 'boar'
+	end
+end
+
+if $ARGS[0] = 'chore_bathe_horse':
+	grandpaQW['chore_bathe_horse'] = 1
+
+	'"It''s good weather today. Take Desperado to the river and give him a bath."'
+	act 'Tell him you will do it in a little while': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the barn (0:10)':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+		'You walk over to the barn where Desperado is kept.'
+		minut += 10
+		gs'stat'
+
+		act 'Continue': gt 'gad_gpbarn', 'horse'
+	end
+end
+
+if $ARGS[0] = 'chore_brush_horse':
+	grandpaQW['chore_brush_horse'] = 1
+
+	'"Of course, <<$pcs_nickname>>, I need your help to groom Desperado."'
+	act 'Tell him you will do it in a bit': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the barn (0:10)':
+		*clr & cla
+		if month >= 4 and month <= 10:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
+		end
+		'You walk over to the barn where Desperado is kept.'
+		minut += 10
+		gs'stat'
+
+		act 'Continue': gt 'gad_gpbarn', 'horse'
+	end
+end
+
+if $ARGS[0] = 'chore_lead_horse_to_field':
+	grandpaQW['chore_lead_horse_to_field'] = 1
+
+	'"<<$pcs_nickname>>, take Desperado to the field. My legs hurt, so I need to rest for a bit. I''ll retrieve the horse in the evening."'
+	act 'Tell him you will do it soon': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the barn (0:10)':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+		'You walk over to the barn where Desperado is kept.'
+		minut += 10
+		gs 'stat'
+
+		act 'Continue': gt 'gad_gpbarn', 'horse'
+	end
+end
+
+if $ARGS[0] = 'chore_herd_cattle':
+	grandpaQW['chore_herd_cattle'] = 1
+
+	if grandpaQW['chore_herd_cattle_experience'] = 0:
+		'"<<$pcs_nickname>>, we need to let the cows graze on the field today. So grab something to eat and lead the herd to the field. I''ll meet you there."'
+	else
+		'"<<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
+	end
+
+	act 'Tell him you will meet him there': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the field (0:40)':
+		*clr & cla
+		if grandpaQW['chore_herd_cattle_experience'] = 0:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+			'You take a little nibble of a sandwich and go to the shed where the herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_field.jpg"></center>'
+			'You have a quick bite and go to the field where the village herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
+		end
+		pcs_mood += 20
+		pcs_health += 10
+		minut += 40
+		if mc_inventory['food_water'] = 0: mc_inventory['food_water'] = 1
+		if mc_inventory['food_sandwich'] = 0: mc_inventory['food_sandwich'] = 1
+		gs 'stat'
+
+		act 'Continue': gt 'gad_field', 'cow'
+	end
+end
+
+if $ARGS[0] = 'chore_lead_cow_to_field':
+	grandpaQW['chore_lead_cow_to_field'] = 1
+
+	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter, could you lead the cow to the field and tell the herders to drive her home at the end of the day?"'
+	act 'Tell him you will soon': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the barn (0:10)':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
+		'You walk over to the barn where the cows are kept.'
+		minut += 10
+		gs 'stat'
+
+		act 'Continue': gt 'gad_gpbarn', 'cow'
+	end
+end
+
+if $ARGS[0] = 'chore_pickforest_mushrooms':
+	grandpaQW['chore_gather_mushrooms'] = 1
+	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
+
+	'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
+	'"How much should I pick, grandpa?" you ask.'
+	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos will be enough," grandfather replies. "Be careful so you don''t get lost."'
+
+	act 'Tell him you will go get some soon': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
+		minut += 60
+		act 'Continue': gt 'gad_forest', 'forest_edge'
+	end
+end
+
+if $ARGS[0] = 'chore_pickforest_berries':
+	grandpaQW['chore_gather_berries'] = 1
+	grandpaQW['chore_berry_quantity'] = rand(1,2)
+
+	'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
+	'"How much should I pick, grandpa?" you ask.'
+	'"<<grandpaQW[''chore_berry_quantity'']>> kilos will be enough," grandfather replies. "Just be careful so you don''t get lost."'
+
+	act 'Tell him you will go get some soon': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
+		minut += 60
+		act 'Continue': gt 'gad_forest', 'forest_edge'
+	end
+end
+
+if $ARGS[0] = 'chore_pickforest_both':
+	grandpaQW['chore_gather_both'] = 1
+	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
+	grandpaQW['chore_berry_quantity'] = rand(1,2)
+
+	'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and I am craving some fresh berries."'
+	'"How much should I pick, grandpa?"'
+	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kilos of berries will be enough," grandfather replies. "Just don''t get lost."'
+
+	act 'Tell him you will go get some soon': gt 'gp_zlatek', 'talk'
+	act 'Agree and go to the forest (1:00)':
+		*clr & cla
+		if hour >= 6 and hour < 22:
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
+		end
+		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
+		minut += 60
+		act 'Continue': gt 'gad_forest', 'forest_edge'
+	end
+end
+
+if $ARGS[0] = 'chore_bale_hay':
+	grandpaQW['chore_bale_hay'] = 1
+
+	'"<<$pcs_nickname>>, we need to help with baling hay today, so we have to go to the field to meet the others."'
+	'"Okay, grandfather," you replied.'
+	act 'Tell him you will head over there soon': gt 'gp_zlatek', 'talk'
+	act 'Grab a rake and head to the field (0:40)':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
+		'With the rake in your hand, you meet up with the other local residents at the field.'
+		minut += 40
+		gs 'stat'
+
+		act 'Continue': gt 'gad_field', 'field'
+	end
+end
+
+
+
+	!!-------------------- TURNING IN CHORES START --------------------!!
+
+
+if $ARGS[0] = 'set_report_chores_acts':
+	gs 'gp_zlatek', 'set_report_fetched_firewood_act'
+	gs 'gp_zlatek', 'set_report_fed_horse_act'
+	gs 'gp_zlatek', 'set_report_fed_cow_act'
+	gs 'gp_zlatek', 'set_report_cleaned_yard_act'
+	gs 'gp_zlatek', 'set_report_brushed_horse_act'
+	gs 'gp_zlatek', 'set_report_fed_boar_act'
+	gs 'gp_zlatek', 'set_report_led_horse_field_act'
+	gs 'gp_zlatek', 'set_report_led_cow_field_act'
+	gs 'gp_zlatek', 'set_report_washed_horse_act'
+	gs 'gp_zlatek', 'set_report_gathered_mushrooms_act'
+	gs 'gp_zlatek', 'set_report_gathered_berries_act'
+	gs 'gp_zlatek', 'set_report_gathered_both_act'
+	gs 'gp_zlatek', 'set_report_baled_hay_act'
+end
+
+if $ARGS[0] = 'set_report_fetched_firewood_act':
+	if grandpaQW['chore_fetch_firewood'] = 2:
+		act 'Tell him you got the firewood':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 5
+			grandpaQW['chore_fetch_firewood'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'"I''ve brought in some firewood, Grandpa," you say to your grandfather.'
+			'"Thank you very much, <<$pcs_nickname>>," he replies with a smile. "Just set it down over there."'
+			'You put down the heavy wood gratefully. "Is there anything else you need?"'
+			'"No, that is all I have for you today," he says.'
+
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_fed_horse_act':
+	if grandpaQW['chore_feed_horse'] = 2:
+		act 'Tell him you fed Desperado':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 5
+			grandpaQW['chore_feed_horse'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'"I fed the horse, Grandpa."'
+			'"Thank you, <<$pcs_nickname>>," he says. "It is imperative to make sure a horse is well fed. They are hard workers and deserve their meals."'
+			'You smile in agreement. "I am sure Desperado is a very hard worker."'
+			'"He may not be the young stallion he once was," your grandfather says, "but he is a trusted friend."'
+			'He obviously cares a great deal about his horse.'
+
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_fed_cow_act':
+	if grandpaQW['chore_feed_cow'] = 2:
+		act 'Tell him you fed Dawn':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 5
+			grandpaQW['chore_feed_cow'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'You tell your grandfather, "I fed Dawn her hay, Grandpa."'
+			'"Excellent, <<$pcs_nickname>>," he says. "I presume she acted like we were starving her to death?"'
+			'"Well, she was definitely excited," you say with a laugh.'
+			'"She always is when it comes to eating," he says.'
+
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_cleaned_yard_act':
+	if grandpaQW['chore_clean_yard'] = 2:
+		act 'Tell him you cleaned up the yard':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 5
+			grandpaQW['chore_clean_yard'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'"I finished cleaning the yard, Grandpa," you say as you stretch your sore arms.'
+			'"Very good," he says. "It is more work than it seems, isn''t it?"'
+			'"Yes sir, it is," you agree. "Is there anything else you need me to do?"'
+			'"No, that is all for today, <<$pcs_nickname>>."'
+
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_brushed_horse_act':
+	if grandpaQW['chore_brush_horse'] = 2:
+		act 'Tell him you finished grooming Desperado':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 5
+			grandpaQW['chore_brush_horse'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'"I brushed the horse, Grandpa," you tell your grandfather.'
+			'"You scrubbed him down with the curry brush?" he asks.'
+			'"Yes sir, I did," you say.'
+			'"Even his belly?"'
+			'"Yes, even his belly."'
+			'"Did you wash his face and comb his mane and tail?"'
+			'"Ugh, yes, Grandpa, I did everything just like you showed me when I was a kid."'
+			'"Don''t sass me, <<$pcs_firstname>>," your grandfather says with a scowl. "Properly brushing a horse is very important for their health."'
+			'The rebuke stings a little. "Sorry, Grandpa."'
+			'His face softens when he sees he upset you. "...no, child, I''m sorry. You did me a favor, and here I am berating you for it. Thank you for brushing the horse, <<$pcs_nickname>>."'
+			'"It''s okay, Grandpa. I know Desperado is important to you," you say.'
+			'He smiles and rubs your shoulder. "Thank you again. You may rest now. There is nothing else to do today."'
+
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_fed_boar_act':
+	if grandpaQW['chore_feed_boar'] = 2:
+		act 'Tell him you fed Nickle':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 5
+			grandpaQW['chore_feed_boar'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'You walk up to your grandfather and tell him, "I fed the pig, Grandpa."'
+			'"Thank you, <<$pcs_nickname>>," he says.'
+			'"You''re welcome! Is there anything else you need?"'
+			'"No, you can take the rest of the day off, granddaughter."'
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_led_horse_field_act':
+	if grandpaQW['chore_lead_horse_to_field'] = 2:
+		act 'Tell him you took Desperado to the field':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 5
+			grandpaQW['chore_lead_horse_to_field'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'"Hey, Grandpa, I took Desperado out to the field."'
+			'"Good, good," he says. "Horses need the freedom to run."'
+			'You nod. "He seemed pretty happy to be able to run around."'
+			'Your grandfather smiles at that. "Thank you, <<$pcs_nickname>>. You can rest for now."'
+
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_led_cow_field_act':
+	if grandpaQW['chore_lead_cow_to_field'] = 2:
+		act 'Tell him you took Dawn to the field':
+			*clr & cla
+			grandmaQW['help_amount'] += 1
+			minut += 5
+			grandpaQW['chore_lead_cow_to_field'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'"Hi, Grandpa!" you say. "I took Dawn out to the field."'
+			'"Were the others there?" he asks.'
+			'You nod. "Yes, sir. I asked them to drive her home later - they seemed fine with that."'
+			'"Yes, here in the country, we all must help one another. Soon it will be our turn to watch the cattle."'
+			'"All of them? For the whole village? Just us?" you ask incredulously.'
+			'"No child, there will be a few others with us. But don''t look so surprised - it does not take many people to herd cows."'
+			'You think of the stories you have heard of a few herders driving thousands of cattle. "Hmm, I guess that''s true..."'
+			'Your grandfather smiles and ruffles your hair. "But that is not a problem for today. Go and take the rest of the day off."'
+
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_washed_horse_act':
+	if grandpaQW['chore_bathe_horse'] = 2:
+		act 'Tell him you bathed Desperado':
+			*clr & cla
+			grandmaQW['help_amount'] += 2
+			minut += 5
+			grandpaQW['chore_bathe_horse'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'You walk up to your grandfather and tell him, "I gave Desperado a bath in the river, Grandpa."'
+			'"Thank you, <<$pcs_nickname>>," he says. "Grooming him is all well and good, but sometimes it''s not enough."'
+			'"You''re welcome! It was actually a lot of fun. Is there anything else you need?"'
+			'"No, you can take the rest of the day off, granddaughter."'
+
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_gathered_mushrooms_act':
+	if grandpaQW['chore_gather_mushrooms'] = 2 and boletus >= grandpaQW['chore_mushroom_quantity'] and hour >= 6 and hour < 20:
+		if grandpaQW['disappointment'] = 2:
+			act 'Give him the mushrooms he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				boletus -= grandpaQW['chore_mushroom_quantity']
+				boletus_stored += grandpaQW['chore_mushroom_quantity']
+				grandpaQW['disappointment'] = 0
+				minut += 5
+				grandpaQW['chore_mushroom_quantity'] = 0
+				grandpaQW['chore_gather_mushrooms'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"Grandpa, here are the mushrooms!"'
+				'"Thank you, <<$pcs_nickname>>, you''ve made an old man happy," your grandfather replies with a smile. "The mushrooms are in a part of the forest that is difficult to reach, so no wonder it took you so long."'
+				'"I can still go and gather more mushrooms if you want?"'
+				'"There''s no need <<$pcs_nickname>>," said your grandfather. "But if I need some help, I''ll let you know. They will have to go down in the root cellar until your grandmother is ready to can them."'
+				'You kiss your grandfather on the cheek and get on with your day.'
+
+				act 'Continue': gt $loc, $loc_arg
+			end
+		else
+			act 'Give him the mushrooms he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				boletus -= grandpaQW['chore_mushroom_quantity']
+				boletus_stored += grandpaQW['chore_mushroom_quantity']
+				minut += 5
+				grandpaQW['chore_mushroom_quantity'] = 0
+				grandpaQW['chore_gather_mushrooms'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"Grandpa, here are the mushrooms!"'
+				'"Thank you, <<$pcs_nickname>>, you''ve made an old man very happy," your grandfather replies with a smile. "The mushrooms are in a part of the forest that is difficult to reach."'
+				'"I can still go and gather more mushrooms if you want?"'
+				'"There''s no need, <<$pcs_nickname>>," said your grandfather. "But if I need some help, I''ll let you know. They will have to go down in the root cellar until your grandmother is ready to can them."'
+				'You kiss your grandfather on the cheek and get on with your day.'
+
+				act 'Continue': gt $loc, $loc_arg
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_gathered_berries_act':
+	if grandpaQW['chore_gather_berries'] = 2 and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+		if grandpaQW['disappointment'] = 2:
+			act 'Give him the berries he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 1
+				bilberry -= grandpaQW['chore_berry_quantity']
+				bilberry_stored += grandpaQW['chore_berry_quantity']
+				grandpaQW['disappointment'] = 0
+				minut += 5
+				grandpaQW['chore_berry_quantity'] = 0
+				grandpaQW['chore_gather_berries'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"Grandpa, here are the berries!"'
+				'"Oh, thank you, I thought I asked for these yesterday," Grandpa replied. "It''s hard to keep track of things as you get older, just as it is for your grandmother to gather the berries, and she needs them so she can make jam for the winter."'
+				'"If you need some more berries, I''ll be glad to go out and gather more."'
+				'There''s no need, <<$pcs_nickname>>," your grandfather said. "But if your grandma needs some more berries, I''ll let you know. They will have to go down in the root cellar until your grandmother is ready to can them."'
+				'You kiss your grandfather on the cheek and go on with your business.'
+
+				act 'Continue': gt $loc, $loc_arg
+			end
+		else
+			act 'Give him the berries he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				bilberry -= grandpaQW['chore_berry_quantity']
+				bilberry_stored += grandpaQW['chore_berry_quantity']
+				minut += 5
+				grandpaQW['chore_berry_quantity'] = 0
+				grandpaQW['chore_gather_berries'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"Grandpa, here are the berries!"'
+				'"Oh, thank you, nicely done," Grandpa replied. "It''s hard for your grandmother to gather the berries, and she needs them so she can make jam for the winter."'
+				'"If you need some more berries, I''ll be glad to go out and gather more."'
+				'"There''s no need <<$pcs_nickname>>," your grandfather said. "But if your grandma needs some more berries, I''ll let you know. They will have to go down in the root cellar until your grandmother is ready to can them."'
+				'You kiss your grandfather on the cheek and go on with your business.'
+
+				act 'Continue': gt $loc, $loc_arg
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_gathered_both_act':
+	if grandpaQW['chore_gather_both'] = 2 and boletus >= grandpaQW['chore_mushroom_quantity'] and bilberry >= grandpaQW['chore_berry_quantity'] and hour >= 6 and hour < 20:
+		if grandpaQW['disappointment'] = 2:
+			act 'Give him the mushrooms and berries he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				boletus -= grandpaQW['chore_mushroom_quantity']
+				bilberry -= grandpaQW['chore_berry_quantity']
+				boletus_stored += grandpaQW['chore_mushroom_quantity']
+				bilberry_stored += grandpaQW['chore_berry_quantity']
+				grandpaQW['disappointment'] = 0
+				minut += 5
+				grandpaQW['chore_berry_quantity'] = 0
+				grandpaQW['chore_mushroom_quantity'] = 0
+				grandpaQW['chore_gather_both'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"Grandpa, here are the mushrooms and berries!"'
+				'"Oh, thank you, <<$pcs_nickname>>, better late than never," your grandfather replied.'
+				'"If you want, I can go out for another run."'
+				'"You don''t need to do that, <<$pcs_nickname>>," your grandfather said. "But I''ll let you know if something comes up. They will have to go down in the root cellar until your grandmother is ready to can them."'
+				'You give him a smooch on the cheek and go on with your day.'
+
+				act 'Continue': gt $loc, $loc_arg
+			end
+		else
+			act 'Give him the mushrooms and berries he asked for':
+				*clr & cla
+				grandmaQW['help_amount'] += 3
+				boletus -= grandpaQW['chore_mushroom_quantity']
+				bilberry -= grandpaQW['chore_berry_quantity']
+				boletus_stored += grandpaQW['chore_mushroom_quantity']
+				bilberry_stored += grandpaQW['chore_berry_quantity']
+				minut += 5
+				grandpaQW['chore_berry_quantity'] = 0
+				grandpaQW['chore_mushroom_quantity'] = 0
+				grandpaQW['chore_gather_both'] = 0
+				gs 'stat'
+
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+				'You walk up to Grandpa with your basket.'
+				'"Grandpa, here are the mushrooms and berries!"'
+				'"Oh, thank you, <<$pcs_nickname>>," your grandfather replied.'
+				'"If you want, I can go out for another run."'
+				'"You don''t need to do that, <<$pcs_nickname>>," your grandfather said. "But I''ll let you know if something comes up. They will have to go down in the root cellar until your grandmother is ready to can them."'
+				'You give him a smooch on the cheek and go on with your day.'
+
+				act 'Continue': gt $loc, $loc_arg
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'set_report_baled_hay_act':
+	if grandpaQW['chore_bale_hay'] = 2:
+		act 'Tell him you helped the townspeople bale hay':
+			*clr & cla
+			grandmaQW['help_amount'] += 3
+			minut += 5
+			grandpaQW['chore_bale_hay'] = 0
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'"I spent all day helping with the hay, Grandpa," you tell him, stretching your sore muscles.'
+			'He smiles proudly at you and says, "Yes, I was there too, <<$pcs_nickname>>. I saw you working hard."'
+			'"That was a lot of work!" you exclaim. "I''m completely exhausted."'
+			'"Yes, yes it is," he says. "I have worn myself out. I won''t be able to do it much longer, but you are still young and strong. I am very proud that my granddaughter is such a hard worker."'
+			'Maybe it''s just the exhaustion, but your eyes tear up slightly at that. Your grandfather is usually pretty sparing with his praise.'
+			'"Thank you, Grandpa," you say, giving him a tight hug, which he returns with surprising strength for his age.'
+			'After a few moments, he lets go and tells you, "Go and get some rest, child. You have earned it."'
+
+			act 'Continue': gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+	!!-------------------- TURNING IN CHORES END --------------------!!
+
+
+if $ARGS[0] = 'set_talk_acts':
+	if grandpaQW['talked_about_forest'] = 0:
+		act 'Ask about the forest (0:10)':
+			*clr & cla
+			grandpaQW['talked_about_forest'] = 1
+			minut += 10
+			pcs_mood += 5
+			goforest += 1
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'"Listen carefully, <<$pcs_nickname>>. You want to explore the forest, and that''s great. But be sure of your surroundings. Without having any knowledge of the forest, you may easily get lost. Don''t explore too deep in the forest because mushrooms and berries can be found at the forest''s edge. If you choose to explore the forest, you''ll find a swamp in the middle of the forest. You can find mushrooms and berries there too... Going into the forest at night is not recommended. Wild boars may attack, and you might end up really hurt."'
+			'"If you manage to get lost and can''t find your way out of the forest before it gets dark, then light a fire and sit still until morning. The beasts in the forest are afraid of the fire, so they won''t approach you."'
+			'"There''s one more thing... While you''re in the woods, avoid dressing yourself up in fancy clothes. You might damage them. It''s better to dress in more comfortable clothes instead..."'
+			'"Well, I think that''s everything, <<$pcs_nickname>>, run along now and remember what I''ve told you."'
+
+			act 'Continue':gt 'gp_zlatek', 'talk'
+		end
+	end
+
+	if 24 * (daystart - grandpaQW['last_day_talked']) + (hour - grandpaQW['last_hour_talked']) >= 3:
+		act 'Chat with your grandfather (0:10)':
+			*clr & cla
+			grandpaQW['last_hour_talked'] = hour
+			grandpaQW['last_day_talked'] = daystart
+			minut += 10
+			pcs_mood += RAND(5,10)
+			gs 'stat'
+
+			'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
+			'Your grandfather stops complaining and smiles at you. He loves telling stories. He has lived a rich and eventful life, and you enjoy listening to his stories and talking to him. He mostly reminisces about his past and reflects on his earlier life.'
+
+			act 'Continue':gt 'gp_zlatek', 'talk'
+		end
+	end
+end
+
+
+--- gp_zlatek ---------------------------------------------

+ 209 - 47
locations/gp_zlatek_schedule.qsrc

@@ -5,58 +5,220 @@
 !!
 !! Sveta''s Grandfather in Gad npc id A32
 !!
-$locat['zlatek'] = ''
-
-!! scheduled weekday events.
-
-if week <= 7:
-    if (hour > 5 and hour < 7) or (hour = 12 or hour = 13) or hour = 18:
-        $locat['zlatek'] = 'kitchen'
-    end
-    if day ! 7 and hour = 13:
-        $locat['zlatek'] = 'sauna'
-    end
-    if (hour >= 14 and  hour <= 17) or (hour >= 19 and hour <= 20):
-        $locat['zlatek'] = 'lounge'
-    end
-    if hour >= 21 or hour  <= 5:
-        $locat['zlatek'] = 'bed'
-    end
+
+	!locat['A32'] tells us where Zlatek is Located
+	!----------------------------------------------
+	!locat['A32'] = 100		Bedroom
+
+	!locat['A32'] = 110		Livingroom
+	!locat['A32'] = 111		Livingroom - Reading a book
+	!locat['A32'] = 112		Livingroom - Watching tv
+
+	!locat['A32'] = 120		Kitchen - Reading
+
+	!locat['A32'] = 200		Garden - gardening
+
+	!locat['A32'] = 210		Sauna - Bathing
+
+	!locat['A32'] = 220		Stables
+
+
+	!locat['A32'] = 300		Village
+
+	!locat['A32'] = 310		Church
+
+	!locat['A32'] = 320		River - Fishing
+
+	!locat['A32'] = 330		Fields
+
+if $ARGS[0] = 'cikl':
+	locat['A32_rand'] = rand(0, 239)
 end
-if day <= 3 and (hour >= 8 and hour <= 11):
-    loc_switch = rand(0,3)
-    if loc_switch = 0 and sunWeather = 1:
-        $locat['zlatek'] = 'garden'
-    elseif loc_switch = 1 and sunWeather = 1:
-        $locat['zlatek'] = 'fishing'
-    elseif loc_switch = 2:
-        $locat['zlatek'] = 'stables'
-    else
-        $locat['zlatek'] = 'lounge'
-    end
-    killvar 'loc_switch'
+
+if $ARGS[0] = '':
+	locat['A32_prev'] = locat['A32']
+	gs 'gp_zlatek_schedule', 'update_locat'
 end
-if week = 6 or week = 7:
-    if day = 6 and (hour = 19 or hour = 20):
-        $locat['zlatek'] = 'church'
-    end
-    if  day = 7 and (hour >= 9 or hour <= 11):
-        $locat['zlatek'] = 'church'
-    end
-    if day =  7 and (hour  = 13 or hour = 14):
-        $locat['zlatek'] = 'kitchen'
-    end
+
+
+if $ARGS[0] = 'update_locat':
+	!! scheduled weekday events.
+	locat['A32'] = 0
+
+	gs 'gp_zlatek_schedule', 'get_base_schedule'
+
+	if SunWeather = 0:
+		if locat['A32'] = 200 or locat['A32'] = 320 or locat['A32'] = 330: locat['A32'] = 110
+	end
+
+	gs 'gp_zlatek_schedule', 'get_random_schedule'
+end
+
+if $ARGS[0] = 'get_base_schedule':
+	if hour <= 5:
+		locat['A32'] = 100
+	elseif hour = 6:
+		locat['A32'] = 120
+	elseif hour = 7:
+		locat['A32'] = 110
+	elseif hour = 8:
+		if day <= 3:
+			locat['A32'] = 0
+		elseif day => 5:
+			locat['A32'] = 330
+		else
+			locat['A32'] = 110
+		end
+	elseif hour = 9:
+		if day <= 3:
+			locat['A32'] = 0
+		elseif day = 5 or day = 6:
+			locat['A32'] = 330
+		elseif day = 7:
+			locat['A32'] = 310
+		else
+			locat['A32'] = 110
+		end
+	elseif hour = 10:
+		if day <= 3:
+			locat['A32'] = 0
+		elseif day = 5 or day = 6:
+			locat['A32'] = 330
+		elseif day = 7:
+			locat['A32'] = 310
+		else
+			locat['A32'] = 110
+		end
+	elseif hour = 11:
+		if day <= 3:
+			locat['A32'] = 0
+		elseif day = 5 or day = 6:
+			locat['A32'] = 330
+		elseif day = 7:
+			locat['A32'] = 310
+		else
+			locat['A32'] = 110
+		end
+	elseif hour = 12:
+		locat['A32'] = 120
+	elseif hour = 13:
+		if day ! 7:
+			locat['A32'] = 210
+		else
+			locat['A32'] = 120
+		end
+	elseif hour = 14:
+		if day ! 7:
+			locat['A32'] = 110
+		else
+			locat['A32'] = 120
+		end
+	elseif hour = 15:
+		locat['A32'] = 110
+	elseif hour = 16:
+		locat['A32'] = 110
+	elseif hour = 17:
+		locat['A32'] = 110
+	elseif hour = 18:
+		locat['A32'] = 120
+	elseif hour = 19:
+		if day = 6:
+			locat['A32'] = 310
+		else
+			locat['A32'] = 110
+		end
+	elseif hour = 20:
+		if day = 6:
+			locat['A32'] = 310
+		else
+			locat['A32'] = 110
+		end
+	else
+		locat['A32'] = 100
+	end
 end
 
-if (day = 5 or day = 6) and (hour >= 8 or hour <= 11):
-    $locat['zlatek'] = 'fields'
-elseif day = 7 and hour = 8:
-    $locat['zlatek'] = 'fields'
+
+if $ARGS[0] = 'get_random_schedule':
+	if locat['A32'] = 0:
+		if hour / 2 mod 2 = 0:
+			if locat['A32_rand'] mod 4 = 0:
+				locat['A32'] = 110
+			elseif locat['A32_rand'] mod 4 = 1:
+				locat['A32'] = 200
+			elseif locat['A32_rand'] mod 4 = 2:
+				locat['A32'] = 220
+			else
+				locat['A32'] = 320
+			end
+		else
+			if locat['A32_rand'] / 4 mod 4 = 0:
+				locat['A32'] = 110
+			elseif locat['A32_rand'] / 4 mod 4 = 1:
+				locat['A32'] = 200
+			elseif locat['A32_rand'] / 4 mod 4 = 2:
+				locat['A32'] = 220
+			else
+				locat['A32'] = 320
+			end
+		end
+	end
+
+	if locat['A32'] = 110:
+		if hour <= 8:
+			temp_subloc = locat['A32_rand'] / 16 mod 2
+		elseif hour <= 10:
+			temp_subloc = locat['A32_rand'] / 32 mod 2
+		elseif hour <= 12:
+			temp_subloc = locat['A32_rand'] / 64 mod 2
+		elseif hour <= 14:
+			temp_subloc = locat['A32_rand'] / 128 mod 2
+		elseif hour <= 16:
+			temp_subloc = locat['A32_rand'] / 48 mod 2
+		elseif hour <= 18:
+			temp_subloc = locat['A32_rand'] / 96 mod 2
+		elseif hour <= 20:
+			temp_subloc = locat['A32_rand'] / 80 mod 2
+		end
+		locat['A32'] = 111 + temp_subloc
+		killvar 'temp_subloc'
+	end
 end
 
-!! Debug failsafe if npc has not been set a location.
 
-if $locat['zlatek'] = '':
-    $locat['zlatek'] = 'Unknown'
+
+if $ARGS[0] = 'getLocation':
+	gs 'gp_zlatek_schedule', 'update_locat'
+
+	if locat['A32'] / 10 = 10:
+		$npcLocation['A32'] = 'Your grandfather is in his bedroom'
+
+	elseif locat['A32'] / 10 = 11:
+		$npcLocation['A32'] = 'Your grandfather is in his livingroom'
+	elseif locat['A32'] / 10 = 12:
+		$npcLocation['A32'] = 'Your grandfather is in his kitcher'
+
+	elseif locat['A31'] / 10 = 20:
+		$npcLocation['A31'] = 'Your grandfather is in his garden'
+	elseif locat['A31'] / 10 = 21:
+		$npcLocation['A31'] = 'Your grandfather is bathing in his sauna'
+	elseif locat['A31'] / 10 = 22:
+		$npcLocation['A31'] = 'Your grandfather is at his stables'
+
+	elseif locat['A31'] / 10 = 30:
+		$npcLocation['A31'] = 'Your grandfather is out and about in Gadukino'
+	elseif locat['A31'] / 10 = 31:
+		$npcLocation['A31'] = 'Your grandfather is at his church'
+	elseif locat['A31'] / 10 = 32:
+		$npcLocation['A31'] = 'Your grandfather is fishing at the river'
+	elseif locat['A31'] / 10 = 33:
+		$npcLocation['A31'] = 'Your grandfather is at the field'
+
+	end
 end
---- gp_zlatek_schedule ---------------------------------
+
+
+
+
+
+--- gp_zlatek_schedule ---------------------------------

+ 0 - 411
locations/grandmahelp.qsrc

@@ -1,411 +0,0 @@
-# grandmahelp
-
-menu_off = 1
-gs 'stat'
-
-frost = 0
-
-'<center><img <<$set_imgh>> src="images/locations/gadukino/village/grandmahelp.jpg"></center>'
-
-'You ask your grandmother if there is anything you could help out with. Your grandmother turns to you and says:'
-
-if $ARGS[0] = 'start':
-	if month <= 4 or month >= 10:
-		grandmaQW['chore_type'] = rand(0,6)
-	elseif month = 5:
-		grandmaQW['chore_type'] = rand(0,9)
-	elseif month >= 6 and month <= 9:
-		grandmaQW['chore_type'] = rand(0,14)
-	end
-
-	if grandmaQW['chore_type'] = 0:
-		gt 'grandmahelp', 'cleanfloor'
-	elseif grandmaQW['chore_type'] = 1:
-		gt 'grandmahelp', 'washclothes'
-	elseif grandmaQW['chore_type'] = 2 and hour < 9 and hour > 20:
-		gt 'grandmahelp', 'milkcows'
-	elseif grandmaQW['chore_type'] = 3:
-		gt 'grandmahelp', 'groceries'
-	elseif grandmaQW['chore_type'] = 4 and boletus_stored >= 5:
-		gt 'grandmahelp', 'can_mushrooms'
-	elseif grandmaQW['chore_type'] = 5 and bilberry_stored >= 5:
-		gt 'grandmahelp', 'can_berries'
-	elseif grandmaQW['chore_type'] = 6 and grandmaQW['chore_harvest_done'] = 1:
-		gt 'grandmahelp', 'can_veggies'
-	elseif grandmaQW['chore_type'] = 7:
-		gt 'grandmahelp', 'feedchickens'
-	elseif grandmaQW['chore_type'] = 8 and sunWeather = 1:
-		gt 'grandmahelp', 'checkplants'
-	elseif grandmaQW['chore_type'] = 9 and sunWeather = 1:
-		gt 'grandmahelp', 'waterplants'
-	elseif grandmaQW['chore_type'] = 10 and sunWeather = 1 and month >= 6 and month <= 9:
-		gt 'grandmahelp', 'harvest'
-	elseif grandmaQW['chore_type'] = 11 and boletus_stored <= 18:
-		gt 'grandmahelp', 'pickforest_mushrooms'
-	elseif grandmaQW['chore_type'] = 12 and bilberry_stored <= 18:
-		gt 'grandmahelp', 'pickforest_berries'
-	elseif grandmaQW['chore_type'] = 13 and ((boletus_stored + bilberry_stored) <= 16):
-		gt 'grandmahelp', 'pickforest_both'
-	else
-		'"There is nothing to do today, <<$pcs_nickname>>. take the day off.'
-		act 'Continue': gt 'gad_gphouse', 'grandma'
-	end
-end
-
-if $ARGS[0] = 'cleanfloor':
-	'"There is always something to do, <<$pcs_nickname>>. I''ve gotten quite old, and my strength is not what it used to be. Could you help me out by cleaning the floor?"'
-
-	grandmaQW['chore_clean_floor'] = 1
-	act 'Tell her you will do it soon': gt 'gad_gphouse', 'grandma'
-	act 'Agree and start cleaning (1:00)':
-		*clr & cla
-		minut += 60
-		grandmaQW['chore_clean_floor'] = 2
-		grandmaQW['help_amount'] += 1
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washfloor.jpg"></center>'
-		'You grab a bucket and a rag, get down on your knees and begin scrubbing the floor. Within the hour, the floor shines, and you are satisfied with your work. You put the cleaning supplies into a corner and continue your day.'
-
-		act 'Continue': gt 'gad_gphouse', 'start'
-		act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
-	end
-end
-
-if $ARGS[0] = 'washclothes':
-	'"Of course, <<$pcs_nickname>>, you can help me wash your grandfather''s dirty clothes?"'
-
-	grandmaQW['chore_wash_clothes'] = 1
-	act 'Tell her you will wash them in a little bit': gt 'gad_gphouse', 'grandma'
-	act 'Agree and start washing (1:00)':
-		*clr & cla
-		minut += 60
-		grandmaQW['chore_wash_clothes'] = 2
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes1.jpg"></center>'
-		'You pick up grandfather''s dirty clothes and take them with you outside, where you soak them in the metal basin for an hour.'
-
-		act 'Hang the Laundry':
-		    *clr & cla
-		    minut += 10
-		    gs'stat'
-		    '<center><img <<$set_imgh>> src="images/locations/gadukino/village/washclothes2.jpg"></center>'
-		    'Once done with the washing, you walk to the clothesline, where you carefully hang the clothes to dry.'
-
-		    act 'Continue': gt 'gad_gpyard', 'start'
-			act 'Return back to your grandmother': minut += 1 & gt 'gad_gphouse', 'grandma'
-		end
-	end
-end
-
-if $ARGS[0] = 'milkcows':
-	'"<<$pcs_nickname>>, go to the barn and milk the cows."'
-
-	grandmaQW['chore_milk_cow'] = 1
-	act 'Tell her you will do it in a bit': gt 'gad_gphouse', 'grandma'
-	act 'Agree and go to the barn (0:10)':
-		*clr & cla
-		minut += 10
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You walk over to the barn where the cows are kept.'
-
-		act 'Continue': gt 'gad_gpbarn', 'cow'
-	end
-end
-
-if $ARGS[0] = 'groceries':
-	'"Oh yes, <<$pcs_nickname>>. I was going to go down to the store today to buy some groceries, but my knees are aching. Do you think you could go down there and get them for me? I have a list of what we need, and the grocer will come by later to collect the money."'
-
-	grandmaQW['chore_groceries'] = 1
-	act 'Tell her you will go to the store later': gt 'gad_gphouse', 'grandma'
-	act 'Agree and go to the store (0:15)':
-		*clr & cla
-		minut += 15
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/izba.jpg"></center>'
-		'Your grandmother shuffles around, looking for her list for a few minutes, finally finding it and giving it to you. You grab a basket and set out for the store.'
-		act 'Continue': gt 'gad_store'
-	end
-end
-
-if $ARGS[0] = 'can_mushrooms':
-	'"I need to get some of these mushrooms canned, <<$pcs_nickname>>, so we can store them. Can you please help me prepare them?"'
-
-	grandmaQW['chore_can_mushrooms'] = 1
-	act 'Tell her you will help her in a little while': gt 'gad_gphouse', 'grandma'
-	act 'Agree to help her right now (2:00)':
-		*clr & cla
-		minut += 45
-		gs'stat'
-
-		boletus_stored -= 5
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_mushrooms.jpg"></center>'
-		'Grandma gives you a basket of mushrooms, and you spend a while cleaning them, washing them, and cutting them up in preparation for canning.'
-		act 'Continue':
-			*clr & cla
-			minut += 60
-			gs'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
-			'Once they are prepared, you help put them in glass jars. Once they are ready, Grandma places the jars in her canner and boils them for an hour.'
-			act 'Continue':
-				*clr & cla
-				minut += 15
-				gs'stat'
-
-				grandmaQW['chore_can_mushrooms'] = 0
-				grandmaQW['help_amount'] += 2
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_mushrooms.jpg"></center>'
-				'Finally, you help Grandma take them out of the canner and set them aside to cool.'
-				'"Thank you, <<$pcs_nickname>>," she says. "It is important to save food up for the hard winter months. Sure, now you can walk to the store and get whatever you want, but it wasn''t always that way!"'
-				act 'Finish': gt 'gad_gphouse','start'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'can_berries':
-	'"It is time to can these berries, <<$pcs_nickname>>. Can you please help me? My fingers aren''t as spry as they used to be."'
-
-	grandmaQW['chore_can_berries'] = 1
-	act 'Tell her you will help her in a little while': gt 'gad_gphouse', 'grandma'
-	act 'Agree to help her right now (2:00)':
-		*clr & cla
-		minut += 45
-		gs'stat'
-
-		bilberry_stored -= 5
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_berries.jpg"></center>'
-		'Grandma gives you a basket of berries, and you spend a while cleaning them, removing stems, and picking out any shrivelled or bad ones.'
-		act 'Continue':
-			*clr & cla
-			minut += 60
-			gs'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
-			'Once they are prepared, you help pour them into glass jars. Once they are ready, Grandma places the jars in her canner and boils them for an hour.'
-			act 'Continue':
-				*clr & cla
-				minut += 15
-				gs'stat'
-
-				grandmaQW['chore_can_berries'] = 0
-				grandmaQW['help_amount'] += 2
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_berries.jpg"></center>'
-				'Finally, you help Grandma take them out of the canner and set them aside to cool.'
-				'"There, now we will have berries for the winter," she says. "I think your grandfather could live off of these berries alone! He will be very grateful that you helped me."'
-				act 'Finish': gt 'gad_gphouse','start'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'can_veggies':
-	'"We have had good luck with the garden this year, <<$pcs_nickname>>. But now we need to can these vegetables before they spoil. Can you help me, please?"'
-
-	grandmaQW['chore_can_veggies'] = 1
-	act 'Tell her you will help her in a little while': gt 'gad_gphouse', 'grandma'
-	act 'Agree to help her right now (3:00)':
-		*clr & cla
-		minut += 75
-		gs'stat'
-
-		grandmaQW['chore_harvest_done'] = 0
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cleaning_veggies.jpg"></center>'
-		'You and Grandma spend some time sorting out all the vegetables from the garden. Once they are sorted, you begin cleaning them, cutting them up, removing stems and leaves, and preparing them for canning.'
-		act 'Continue':
-			*clr & cla
-			minut += 90
-			gs'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canning.jpg"></center>'
-			'It is a tedious process, but eventually, you finish and help Grandma put them all in jars. Then, you stand by while she boils the jars, helping her remove them from the canner when needed and replacing them with others.'
-			act 'Continue':
-				*clr & cla
-				minut += 15
-				gs'stat'
-
-				grandmaQW['chore_can_veggies'] = 0
-				grandmaQW['help_amount'] += 3
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/canned_veggies.jpg"></center>'
-				'Finally, you help Grandma take the last jars out of the canner and set them aside to cool.'
-				'"You know <<$pcs_nickname>>, if you know how to can your own food, you can survive years of poor harvests," she says.'
-				'"Your grandfather and I had many hard times when we were younger, but saving our crops during the good times kept us from starving to death in the bad times. You would do well to remember that, young lady!"'
-				act 'Finish': gt 'gad_gphouse','start'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'feedchickens':
-	'"Of course, <<$pcs_nickname>>. Would you be kind and feed the chickens?"'
-
-	grandmaQW['chore_feed_chickens'] = 1
-	act 'Tell her you will do it in a little while': gt 'gad_gphouse', 'grandma'
-	act 'Agree and go to the yard (0:10)':
-		*clr & cla
-		minut += 10
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/feed_chickens.jpg"></center>'
-		'You take the grain mix for the chickens and walk to the yard.'
-
-		act 'Continue': gt 'gad_gpyard','chickens'
-
-	end
-end
-
-if $ARGS[0] = 'checkplants':
-	'"<<$pcs_nickname>>, can you please go work in the garden?"'
-
-	grandmaQW['chore_work_in_garden'] = 1
-	act 'Tell her you will get to it later': gt 'gad_gphouse', 'grandma'
-	act 'Agree and go to the garden (0:10)':
-		*clr & cla
-		minut += 10
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You go to the garden.'
-
-		act 'Continue': gt 'gad_gpyard', 'garden'
-	end
-end
-
-if $ARGS[0] = 'waterplants':
-	'"Dear <<$pcs_nickname>>, could you go and water the plants in the garden?"'
-
-	grandmaQW['chore_water_garden'] = 1
-	act 'Tell her you will do it after a while': gt 'gad_gphouse', 'grandma'
-	act 'Agree and go to the garden (0:10)':
-		*clr & cla
-		minut += 10
-		gs'stat'
-
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You bring a watering can along with you to the garden.'
-
-		act 'Continue': gt 'gad_gpyard', 'garden'
-	end
-end
-
-if $ARGS[0] = 'harvest':
-	if month = 7:
-		'"<<$pcs_nickname>> dear, the strawberries are ripe for picking. Could you go over to the plot and pick them today?"'
-
-		grandmaQW['chore_collect_strawberries'] = 1
-		act 'Tell her you will do it in a little bit': gt 'gad_gphouse', 'grandma'
-		act 'Agree and go to the strawberry plot (0:10)':
-			*clr & cla
-			minut += 10
-			gs'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-			'You bring a basket with you and walk to the strawberry plot in the garden.'
-
-			act 'Continue': gt 'gad_gpyard', 'strawberry'
-		end
-	elseif month = 8 or month = 9:
-		'"<<$pcs_nickname>> dear, the fruits are ripe, and it is time to start collecting them. Could you go and do it today?"'
-
-		grandmaQW['chore_collect_fruit'] = 1
-		act 'Tell her you will do it in a little bit': gt 'gad_gphouse', 'grandma'
-		act 'Agree and go to the orchard (0:10)':
-			*clr & cla
-			minut += 10
-			gs'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-			'You bring a basket with you and walk to the fruit garden.'
-
-			act 'Continue': gt 'gad_gpyard', 'fruit_garden'
-		end
-	elseif month = 6:
-		'"<<$pcs_nickname>> dear, could you go to the garden today? It''s time to collect the harvest."'
-
-		grandmaQW['chore_harvest_garden'] = 1
-		act 'Tell her you will do it in a little bit': gt 'gad_gphouse', 'grandma'
-		act 'Agree and go to the garden (0:10)':
-			*clr & cla
-			minut += 10
-			gs'stat'
-
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-			'You bring the harvest tools with you and go over to the garden.'
-
-			act 'Continue': gt 'gad_gpyard', 'garden'
-		end
-	end
-end
-
-if $ARGS[0] = 'pickforest_mushrooms':
-	grandmaQW['chore_gather_mushrooms'] = 1
-	grandmaQW['chore_mushroom_quantity'] = rand(1,2)
-	'"<<$pcs_nickname>>, it''s mushroom season. Would you mind going into the forest to pick some for us?"'
-	'"How much do we need, Grandma?" you ask.'
-	'"Oh, I would say you should be able to find at least <<grandmaQW[''chore_mushroom_quantity'']>> kilos," Grandma replies.'
-
-	act 'Tell her you will go get some soon': gt 'gad_gphouse', 'grandma'
-	act 'Agree and go to the forest (1:00)':
-		*clr & cla
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
-		end
-		'You decide that now is as good a time as any to do it. You grab a basket and head out, walking to the forest.'
-		minut += 60
-		act 'Continue': gt 'gad_forest', 'forest_edge'
-	end
-end
-
-if $ARGS[0] = 'pickforest_berries':
-	grandmaQW['chore_gather_berries'] = 1
-	grandmaQW['chore_berry_quantity'] = rand(1,2)
-	'"<<$pcs_nickname>>, the wild berries are ripe for picking. We should gather them now while we can."'
-	'"How much do you want, Grandma?" you ask.'
-	'"<<grandmaQW[''chore_berry_quantity'']>> kilos will be a good start," Grandma replies.'
-
-	act 'Tell her you will go get some soon': gt 'gad_gphouse', 'grandma'
-	act 'Agree and go to the forest (1:00)':
-		*clr & cla
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
-		end
-		'You decide now is as good a time as any to do it. So you grab a basket and head out, walking to the forest.'
-		minut += 60
-		act 'Continue': gt 'gad_forest', 'forest_edge'
-	end
-end
-
-if $ARGS[0] = 'pickforest_both':
-	grandmaQW['chore_gather_both'] = 1
-	grandmaQW['chore_mushroom_quantity'] = rand(1,2)
-	grandmaQW['chore_berry_quantity'] = rand(1,2)
-	'"This is the time of year that the forest provides us with its gifts, <<$pcs_nickname>>. Can you go and harvest some mushrooms and berries for us?"'
-	'"How much of each should I get?" you ask.'
-	'"If you could, try to find <<grandmaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandmaQW[''chore_berry_quantity'']>> kilos of berries," Grandma replies. "It is important to stock up while we can."'
-
-	act 'Tell her you will go get some soon': gt 'gad_gphouse', 'grandma'
-	act 'Agree and go to the forest (1:00)':
-		*clr & cla
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
-		end
-		'You decide now is as good a time as any to do it. So you grab a basket and head out, walking to the forest.'
-		minut += 60
-		act 'Continue': gt 'gad_forest', 'forest_edge'
-	end
-end
-
-
---- grandmahelp ---------------------------------
-

+ 0 - 352
locations/grandpahelp.qsrc

@@ -1,352 +0,0 @@
-# grandpahelp
-
-killvar '$locclass'
-menu_off = 1
-*clr & cla
-gs'stat'
-'<center><img <<$set_imgh>> src="images/locations/gadukino/grandparents/grandpa1.jpg"></center>'
-'You walk up to your grandfather and ask if he needs any help. Grandpa thinks for a moment and says:'
-
-if $ARGS[0] = 'start':
-	if month <= 4 or month >= 10:
-		grandpaQW['chore_type'] = rand(0,5)
-	elseif month = 5:
-		grandpaQW['chore_type'] = rand(3,8)
-	elseif month >= 6 and month <= 9:
-		grandpaQW['chore_type'] = rand(3,14)
-	end
-
-	if grandpaQW['chore_type'] = 0:
-		'"<<$pcs_nickname>>, could you run out to the barn and bring firewood for the stove?"'
-
-		grandpaQW['chore_fetch_firewood'] = 1
-		act 'Tell him you will go get some in just a bit': gt 'gad_gphouse', 'grandpa'
-		act 'Agree and go to fetch firewood (0:20)':
-			*clr & cla
-			if month >= 4 and month <= 10:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/firewood_winter.jpg"></center>'
-			end
-			'You put on warm clothes and run to the barn to collect firewood.'
-			'"I''ve brought some firewood, grandfather," you said to your grandfather.'
-			'"You are very quick, <<$pcs_nickname>>," he replies with a smile. "That''s today''s youth for ya. There is no more work today."'
-			grandpaQW['chore_fetch_firewood'] = 0
-			minut += 20
-			grandmaQW['help_amount'] += 1
-			gs'stat'
-
-			act 'Continue': gt 'gad_gphouse', 'start'
-		end
-	elseif grandpaQW['chore_type'] = 1:
-		'"<<$pcs_nickname>>, I need you to go to the barn and feed Desperado."'
-
-		grandpaQW['chore_feed_horse'] = 1
-		act 'Tell him that you will get to it in a little bit': gt 'gad_gphouse', 'grandpa'
-		act 'Agree and go to the barn (0:10)':
-			*clr & cla
-			if month >= 4 and month <= 10:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
-			end
-			'You walk over to the barn where Desperado is kept.'
-			minut += 10
-			gs'stat'
-
-			act 'Continue': gt 'gad_gpbarn', 'horse'
-		end
-	elseif grandpaQW['chore_type'] = 2:
-		'"<<$pcs_nickname>>, go to the barn and feed the cow."'
-
-		grandpaQW['chore_feed_cow'] = 1
-		act 'Tell him that you will do it in a little while': gt 'gad_gphouse', 'grandpa'
-		act 'Agree and go to the barn (0:10)':
-			*clr & cla
-			if month >= 4 and month <= 10:
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-			else
-				'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
-			end
-			'You walk over to the barn where the cows are kept.'
-			minut += 10
-			gs'stat'
-
-			act 'Continue': gt 'gad_gpbarn', 'cow'
-		end
-	elseif grandpaQW['chore_type'] = 3:
-		gt 'grandpahelp', 'cleanyard'
-	elseif grandpaQW['chore_type'] = 4:
-		gt 'grandpahelp', 'groomhorse'
-	elseif grandpaQW['chore_type'] = 5:
-		gt 'grandpahelp', 'feedhogs'
-	elseif grandpaQW['chore_type'] = 6 and hour >= 6 and hour < 9:
-		gt 'grandpahelp', 'grazehorse'
-	elseif grandpaQW['chore_type'] = 7 and hour >= 6 and hour < 9:
-		gt 'grandpahelp', 'leadcows'
-	elseif grandpaQW['chore_type'] = 8 and hour >= 6 and hour < 9:
-		gt 'grandpahelp', 'grazecows'
-	elseif grandpaQW['chore_type'] = 9 and temper >= 15 and sunWeather = 1 and week > 5 and func('changingroom','count_swim_item') > 0:
-		gt 'grandpahelp', 'washhorse'
-	elseif grandpaQW['chore_type'] = 10 and boletus_stored <= 18:
-		gt 'grandpahelp', 'pickforest_mushrooms'
-	elseif grandpaQW['chore_type'] = 11 and bilberry_stored <= 18:
-		gt 'grandpahelp', 'pickforest_berries'
-	elseif grandpaQW['chore_type'] = 12 and ((boletus_stored + bilberry_stored) <= 16):
-		gt 'grandpahelp', 'pickforest_both'
-	elseif grandpaQW['chore_type'] = 13 and temper >= 15 and sunWeather = 1 and hour >= 6 and hour < 9:
-		'"<<$pcs_nickname>>, we need to help with baling hay today, so we have to go to the field to meet the others."'
-		'"Okay, grandfather," you replied.'
-
-		grandpaQW['chore_bale_hay'] = 1
-		act 'Tell him you will head over there soon': gt 'gad_gphouse', 'grandpa'
-		act 'Grab a rake and head to the field (0:40)':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_gadfield.jpg"></center>'
-			'With the rake in your hand, you meet up with the other local residents at the field.'
-			minut += 40
-			gs'stat'
-
-			act 'Continue': gt'gad_field', 'field'
-		end
-	else
-		if hour >= 9:
-			randmsg = rand(0,5)
-			if randmsg = 0:
-				'"You can rest today <<$pcs_nickname>>, you don''t need to help me today."'
-			elseif randmsg = 1:
-				'"You can rest today child, there is nothing to do."'
-			elseif randmsg = 2:
-				'"You can rest today <<$pcs_nickname>>, there is nothing to do."'
-			elseif randmsg = 3:
-				'"There''s no work today <<$pcs_nickname>>, go and rest up."'
-			elseif randmsg = 4:
-				'"You can rest today my dear granddaughter."'
-			else
-				'"You can take the day off to rest up."'
-			end
-		else
-			randmsg = rand(0,1)
-			if randmsg = 0:
-				'"You don''t need to help out today, <<$pcs_nickname>>."'
-			else
-				'"You can take the day off."'
-			end
-		end
-		act 'Continue': gt 'gad_gphouse', 'grandpa'
-	end
-end
-
-if $ARGS[0] = 'cleanyard':
-	'"Of course, <<$pcs_nickname>>, I need your help in the yard. Bring a garden tool with you."'
-
-	grandpaQW['chore_clean_yard'] = 1
-	act 'Tell him that you''ll do it in a minute': gt 'gad_gphouse', 'grandpa'
-	act 'Agree and go clean up the yard (1:00)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard1.jpg"></center>'
-			'Armed with a rake, you begin cleaning the yard. You''re pleased seeing the yard clean. You return the rake to the shed and continue on with your business.'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/clean_yard2.jpg"></center>'
-			'Armed with a shovel, you begin clearing the yard of snow. You''re pleased with yourself, seeing the courtyard is free of snow. You return the shovel to the shed and continue on with your business.'
-		end
-		minut += 60
-		grandpaQW['chore_clean_yard'] = 2
-		if month >= 4 and month <= 10:
-			fat -= rand(1,3)
-		else
-			gs 'exp_gain', 'stren', 1
-			fat -= rand(1,5)
-		end
-		gs'stat'
-
-		act 'Continue': gt 'gad_gpyard'
-		act 'Return back to your grandfather': minut += 1 & gt 'gad_gphouse', 'grandpa'
-	end
-end
-
-if $ARGS[0] = 'feedhogs':
-	'"<<$pcs_nickname>>, could you go to the barn and feed the hog?"'
-
-	grandpaQW['chore_feed_boar'] = 1
-	act 'Tell him you will get to it soon':gt 'gad_gphouse', 'grandpa'
-	act 'Agree and go to the barn (0:10)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
-		end
-		'You walk over to the barn where the hogs are kept.'
-		minut += 10
-		gs'stat'
-
-		act 'Continue': gt 'gad_gpbarn', 'boar'
-	end
-end
-
-if $ARGS[0] = 'washhorse':
-	'"It''s good weather today. Take Desperado to the river and give him a bath."'
-
-	grandpaQW['chore_bathe_horse'] = 1
-	act 'Tell him you will do it in a little while': gt 'gad_gphouse', 'grandpa'
-	act 'Agree and go to the barn (0:10)':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You walk over to the barn where Desperado is kept.'
-		minut += 10
-		gs'stat'
-
-		act 'Continue': gt 'gad_gpbarn', 'horse'
-	end
-end
-
-if $ARGS[0] = 'groomhorse':
-	'"Of course, <<$pcs_nickname>>, I need your help to groom Desperado."'
-
-	grandpaQW['chore_brush_horse'] = 1
-	act 'Tell him you will do it in a bit': gt 'gad_gphouse', 'grandpa'
-	act 'Agree and go to the barn (0:10)':
-		*clr & cla
-		if month >= 4 and month <= 10:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard_winter.jpg"></center>'
-		end
-		'You walk over to the barn where Desperado is kept.'
-		minut += 10
-		gs'stat'
-
-		act 'Continue': gt 'gad_gpbarn', 'horse'
-	end
-end
-
-if $ARGS[0] = 'grazehorse':
-	'"<<$pcs_nickname>>, take Desperado to the field. My legs hurt, so I need to rest for a bit. I''ll retrieve the horse in the evening."'
-
-	grandpaQW['chore_lead_horse_to_field'] = 1
-	act 'Tell him you will do it soon': gt 'gad_gphouse', 'grandpa'
-	act 'Agree and go to the barn (0:10)':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You walk over to the barn where Desperado is kept.'
-		minut += 10
-		gs'stat'
-
-		act 'Continue': gt 'gad_gpbarn','horse'
-	end
-end
-
-if $ARGS[0] = 'grazecows':
-	if grandpaQW['chore_herd_cattle_experience'] = 0:
-		'"<<$pcs_nickname>>, we need to let the cows graze on the field today. So grab something to eat and lead the herd to the field. I''ll meet you there."'
-	else
-		'"<<$pcs_nickname>>, it''s our turn to look out for the cows grazing on the field today. So grab something to eat quickly, and stop by the field where the herd is. I''ll bring them back home."'
-	end
-
-	grandpaQW['chore_herd_cattle'] = 1
-	act 'Tell him you will meet him there': gt 'gad_gphouse', 'grandpa'
-	act 'Agree and go to the field (0:40)':
-		*clr & cla
-		if grandpaQW['chore_herd_cattle_experience'] = 0:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-			'You take a little nibble of a sandwich and go to the shed where the herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/cow_go_field.jpg"></center>'
-			'You have a quick bite and go to the field where the village herd is. Your grandmother put a sandwich and a bottle of water in the bag for lunch.'
-		end
-		pcs_mood += 20
-		pcs_health += 10
-		minut += 40
-		if mc_inventory['food_water'] = 0: mc_inventory['food_water'] = 1
-		if mc_inventory['food_sandwich'] = 0: mc_inventory['food_sandwich'] = 1
-		gs'stat'
-
-		act 'Continue': gt'gad_field', 'cow'
-	end
-end
-
-if $ARGS[0] = 'leadcows':
-	'"I have sore feet today, <<$pcs_nickname>>. My dear granddaughter, could you lead the cow to the field and tell the herders to drive her home at the end of the day?"'
-
-	grandpaQW['chore_lead_cow_to_field'] = 1
-	act 'Tell him you will soon': gt 'gad_gphouse', 'grandpa'
-	act 'Agree and go to the barn (0:10)':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/locations/gadukino/village/go_yard.jpg"></center>'
-		'You walk over to the barn where the cows are kept.'
-		minut += 10
-		gs'stat'
-
-		act 'Continue': gt 'gad_gpbarn', 'cow'
-	end
-end
-
-if $ARGS[0] = 'pickforest_mushrooms':
-	grandpaQW['chore_gather_mushrooms'] = 1
-	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
-	'"<<$pcs_nickname>>, could you go to the forest and pick mushrooms? I''m craving fried mushrooms."'
-	'"How much should I pick, grandpa?" you ask.'
-	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos will be enough," grandfather replies. "Be careful so you don''t get lost."'
-
-	act 'Tell him you will go get some soon': gt 'gad_gphouse', 'grandpa'
-	act 'Agree and go to the forest (1:00)':
-		*clr & cla
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
-		end
-		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
-		minut += 60
-		act 'Continue': gt 'gad_forest', 'forest_edge'
-	end
-end
-
-if $ARGS[0] = 'pickforest_berries':
-	grandpaQW['chore_gather_berries'] = 1
-	grandpaQW['chore_berry_quantity'] = rand(1,2)
-	'"<<$pcs_nickname>>, could you go to the forest to pick some berries? Grandma wants to make homemade fruit jam."'
-	'"How much should I pick, grandpa?" you ask.'
-	'"<<grandpaQW[''chore_berry_quantity'']>> kilos will be enough," grandfather replies. "Just be careful so you don''t get lost."'
-
-	act 'Tell him you will go get some soon': gt 'gad_gphouse', 'grandpa'
-	act 'Agree and go to the forest (1:00)':
-		*clr & cla
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
-		end
-		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
-		minut += 60
-		act 'Continue': gt 'gad_forest', 'forest_edge'
-	end
-end
-
-if $ARGS[0] = 'pickforest_both':
-	grandpaQW['chore_gather_both'] = 1
-	grandpaQW['chore_mushroom_quantity'] = rand(1,2)
-	grandpaQW['chore_berry_quantity'] = rand(1,2)
-	'"<<$pcs_nickname>>, can you go to the forest and pick some berries and mushrooms? Your grandmother wants to make a mushroom soup, and I am craving some fresh berries."'
-	'"How much should I pick, grandpa?"'
-	'"<<grandpaQW[''chore_mushroom_quantity'']>> kilos of mushrooms and <<grandpaQW[''chore_berry_quantity'']>> kilos of berries will be enough," grandfather replies. "Just don''t get lost."'
-
-	act 'Tell him you will go get some soon': gt 'gad_gphouse', 'grandpa'
-	act 'Agree and go to the forest (1:00)':
-		*clr & cla
-		if hour >= 6 and hour < 22:
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad.jpg"></center>'
-		else
-			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/gadroad_night.jpg"></center>'
-		end
-		'You agree to help your grandfather, grabbing a basket and setting out on the road to the forest.'
-		minut += 60
-		act 'Continue': gt 'gad_forest', 'forest_edge'
-	end
-end
-
-
---- grandpahelp ---------------------------------
-

+ 10 - 10
locations/grigory.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = 'meet':
 
 				act 'Return': gt 'gad_field', 'field'
 			end
-			
+
 			gs 'willpower', 'misc', 'self', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Hug him goodbye (<<will_cost>> Willpower)':
@@ -83,7 +83,7 @@ if $ARGS[0] = 'meet':
 				end
 			else
 				act 'Hug him goodbye (<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
@@ -112,7 +112,7 @@ if $ARGS[0] = 'barn':
 
 		act 'Talk for a bit': gt 'grigory', 'barn_stand'
 	end
-	
+
 	gs 'willpower', 'misc', 'self', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Flirt (<<will_cost>> Willpower)':
@@ -127,7 +127,7 @@ if $ARGS[0] = 'barn':
 			'You can see a hint of a smile touch his lips, "Well you''re a sight for sore eyes there Kotenok," He replies, reaching into his back pocket before taking a sip, "You wouldn''t be trying to distract me with your feminine wiles would you?"'
 			'You put a hand to your chest in mock offence, unable to keep a smile off your face, "Would I do something like that?"'
 			'He laughs softly, shaking his head then starting to walk towards you. He stops just a couple of steps short of where you are, leaning against a piece of farm equipment.'
-			
+
 			gs 'willpower', 'misc', 'self'
 			if will_cost <= pcs_willpwr:
 				act 'Move closer to him (<<will_cost>> Willpower)':
@@ -138,13 +138,13 @@ if $ARGS[0] = 'barn':
 				end
 			else
 				act 'Move closer to him (<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 'Chat with Grigory': gt 'grigory', 'barn_stand'
 		end
 	else
 		act 'Flirt (<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] = 'barn_closer':
@@ -226,7 +226,7 @@ if $ARGS[0] = 'barn_closer':
 			act 'Continue': gt 'gad_gpbarn'
 		end
 	end
-	
+
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Resist his advances (<<will_cost>> Willpower)':
@@ -482,7 +482,7 @@ if $ARGS[0] = 'flower3':
 	'"But how do I find out who did it? Did you maybe see someone in the yard this morning?"'
 	'Grandfather barks a little laugh, "Even if I knew, and I don''t, I wouldn''t tell you." He shakes his head, "Got to make the man work for it."'
 	'Waving dismissively, you know grandfather is done talking about it.'
-	act 'Continue': gt 'gad_gphouse', 'start'
+	act 'Continue': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'flower4':
@@ -494,7 +494,7 @@ if $ARGS[0] = 'flower4':
 	'"But I don''t know who it is," You say, feeling a little overwhelmed.'
 	'"But that is the magic of it!" Grandmother says, clearly overjoyed by the situation. She leans forward, kissing your cheek, "Whoever this boy is, he will reveal himself if you just let him."'
 	'Not feeling much better, you thank her.'
-	act 'Continue': gt 'gad_gphouse', 'start'
+	act 'Continue': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'flower5':
@@ -1045,7 +1045,7 @@ if $ARGS[0] = 'romantic_event':
 		act 'Lets go':
 			'"Where were you thinking?" You ask.'
 			'"I can walk you back to your Grandparent''s home, or you could come back to mine," He looks you in the eye, a hopeful look on his face.'
-			
+
 			if grandmaQW['block'] = 0:
 				act 'Grandparents Home':
 					'"I should probably get back to my Grandparent''s place," You say.'

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно